CVS: The file 'linux/drivers/char/bluetooth/hci.c' has been modified.

[Mattias A. <mat...@us...>]

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.153           1.154=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* Always include bcsp code if CONFIG_BLUETOOTH_SUPPORT_BCSP is set
* Don't initialize cmd num if using bcsp, is updated after syncronizing
* Changed cmd timeout to 2 secs
* Minor changes


The diff of the modified file(s):

--- hci.c	2001/06/05 09:48:16	1.153
+++ hci.c	2001/06/06 14:53:11	1.154
@@ -138,7 +138,7 @@
 #endif
=20
 #define USE_NCPTIMER=20
-#define NCP_TIMEOUT (3*HZ)
+#define NCP_TIMEOUT (2*HZ)
=20
 /****************** TYPE DEFINITION SECTION ******************************=
***/
=20
@@ -585,7 +585,7 @@
 	}
 }
=20
-#ifdef CONFIG_BLUETOOTH_USE_BCSP
+#ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP
 void
 hci_receive_event(u8 *data, s32 count)
 {
@@ -1836,15 +1836,26 @@
 	init_cmd_buf();
=20
 	hci_ctrl.nbr_of_connections =3D 0;
+
+#ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP
+	/* After syncing BCSP we receive a command status with cmd num */
+	if (!bt_use_bcsp(-1))
 	hci_ctrl.hc_buf.cmd_num =3D 1;
=20
+	  /* don't touch cmd num when using bcsp, is updated=20
+	     from command status event after syncronizing */
+
+#else
+	hci_ctrl.hc_buf.cmd_num =3D 1;
+#endif
+
 #ifdef __KERNEL__
 	send_data_task.routine =3D (void*)send_acl_data_task;
 	send_data_task.data =3D NULL;
 #endif
=20
 	/* always... */
-	DSYS(__FUNCTION__", Reading buffer sizes in the module...\n");
+	DSYS(__FUNCTION__": Reading buffer sizes in HW module\n");
 	hci_read_buffer_size(HCI_BLOCK);
         hci_read_firmware_rev_info();=09
=20