CVS: 2 files have been modified in linux/drivers/char/bluetooth.

[Peter K. <pk...@us...>]

The following files were modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
Config.in       1.10            1.11=20=20=20=20=20=20=20=20=20=20=20=20
hci.c           1.143           1.144=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Set CONFIG_BLUETOOTH_EARLY_MSSWITCH in Config.in instead.


The diff of the modified file(s):

--- Config.in	2001/03/30 11:31:55	1.10
+++ Config.in	2001/04/26 16:43:56	1.11
@@ -6,16 +6,7 @@
=20
 tristate 'Bluetooth driver' CONFIG_BLUETOOTH
=20
-if [ "$CONFIG_BLUETOOTH" !=3D "n" ]; then
-
-  bool '  Bluetooth proc entries'     CONFIG_BLUETOOTH_PROC
-  bool '  Input buffering'            CONFIG_BLUETOOTH_USE_INBUFFER
-  bool '  Use Security Manager'       CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
-  bool '  Use L2CAP timers'           CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
-  bool '  Allow connectionless L2CAP' CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
-  bool '  Enable TCI'                 CONFIG_BLUETOOTH_USE_TCI
-  bool '  Enable M/S Switch'          CONFIG_BLUETOOTH_ENABLE_MSSWITCH
-  bool '  Force M/S Switch as server' CONFIG_BLUETOOTH_FORCE_MSSWITCH
+if [ "$CONFIG_BLUETOOTH" =3D "y" -o "$CONFIG_BLUETOOTH" =3D "m" ]; then
=20
   choice '  Bluetooth hardware type'	            \
 	 "None		CONFIG_BLUETOOTH_NOINIT     \
@@ -29,12 +20,31 @@
     bool '  Block when setting baudrate' CONFIG_BLUETOOTH_SET_BAUDRATE_BLO=
CKING
   fi
=20
+  bool '  Bluetooth proc entries'     CONFIG_BLUETOOTH_PROC
+  bool '  Input buffering'            CONFIG_BLUETOOTH_USE_INBUFFER
+  bool '  Use Security Manager'       CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
+  bool '  Use L2CAP timers'           CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
+  bool '  Allow connectionless L2CAP' CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
+  bool '  Enable TCI'                 CONFIG_BLUETOOTH_USE_TCI
+  bool '  Enable M/S Switch'          CONFIG_BLUETOOTH_ENABLE_MSSWITCH
+
+  if [ "$CONFIG_BLUETOOTH_ENABLE_MSSWITCH" =3D "y" ]; then
+    bool '    Force M/S Switch as server' CONFIG_BLUETOOTH_FORCE_MSSWITCH
+
+    # CSR can't do scatternet yet, so we need to do M/S switch=20
+    # as early as in lp_connect_rsp()
+    if [ "$CONFIG_BLUETOOTH_CSR" =3D "y" ]; then
+      define_bool CONFIG_BLUETOOTH_EARLY_MSSWITCH y
+    fi
+  fi
+
   choice '  Bluetooth reset pin'                    \
 	 "None		CONFIG_BLUETOOTH_RESET_NONE \
 	  Port_PA_Bit_7	CONFIG_BLUETOOTH_RESET_PA7  \
 	  Port_PB_Bit_5	CONFIG_BLUETOOTH_RESET_PB5  \
 	  Port_G_Bit_10	CONFIG_BLUETOOTH_RESET_G10  \
 	  Port_G_Bit_11	CONFIG_BLUETOOTH_RESET_G11" None
+
 fi
=20
 endmenu
--- hci.c	2001/04/25 16:54:47	1.143
+++ hci.c	2001/04/26 16:43:56	1.144
@@ -1743,12 +1743,6 @@
 #ifdef CONFIG_BLUETOOTH_ENABLE_MSSWITCH
 	DSYS("M/S switch enabled\n");
=20
-#ifdef CONFIG_BLUETOOTH_CSR
-	/* CSR can't do scatternet yet, so we need to do m/s switch=20
-	   as early as in lp_connect_rsp */
-#define CONFIG_BLUETOOTH_EARLY_MSSWITCH
-#endif
-
 #ifdef CONFIG_BLUETOOTH_FORCE_MSSWITCH
 	hci_force_msswitch(1);
 #else