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

[Mats F. <ma...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci_vendor.c    1.38            1.39=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* Don't disable parity for BCSP
* Corrected length of set baudrate command


The diff of the modified file(s):

--- hci_vendor.c	2001/05/18 07:13:37	1.38
+++ hci_vendor.c	2001/05/18 13:50:07	1.39
@@ -55,6 +55,7 @@
 #include <linux/bluetooth/btmem.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+
 #else /* user mode */
 #include <stdlib.h>
 #include <string.h>
@@ -863,7 +864,7 @@
 	c_pkt.type =3D CMD_PKT;
 	c_pkt.opcode =3D hci_put_opcode(0x00, 0x3f);
 #ifdef SET_BAUD_RATE_TEMPORARILY
-	c_pkt.len =3D 1 + 5*sizeof(u16) + 6*sizeof(u16);
+	c_pkt.len =3D 1 + 5*sizeof(u16) + 4*sizeof(u16);
 #else
 	c_pkt.len =3D 1 + 5*sizeof(u16) + 3*sizeof(u16) + 1*sizeof(u16);
 #endif
@@ -879,18 +880,22 @@
=20
 #ifdef SET_BAUD_RATE_TEMPORARILY
 	cmd->type =3D CSR_MSGTYPE_SETREQ;
-	cmd->len =3D 5 + 6;
+	cmd->len =3D 5 + 4;
 	cmd->seq =3D csr_count++;
 	cmd->var_id =3D CSR_CMD_CONFIG_UART;
 	cmd->status =3D CSR_STATUS_OK; /* always OK in SETREQ */
=20
-	memset(cmd->payload, 0, 6*sizeof(u16));
+	memset(cmd->payload, 0, 4*sizeof(u16));
+#ifdef CONFIG_BLUETOOTH_USE_BCSP
+	cmd->payload[0] =3D baud_divider | CSR_UART_EVEN_PARITY | CSR_UART_ONE_ST=
OP_BIT;
+#else
 	cmd->payload[0] =3D baud_divider | CSR_UART_NO_PARITY | CSR_UART_ONE_STOP=
_BIT;
-
+#endif
 	if (hci_ctrl.hc_buf.cmd_num < 1) {
 		DSYS(__FUNCTION__ VENDOR  ": sleeping\n");
 		interruptible_sleep_on(&set_baudrate_wq);
 	}
+
 	tmp =3D bt_write_lower_driver((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI=
_HDR_LEN);
=20=20=20
 	hci_ctrl.hc_buf.cmd_num--;