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

[Olov H. <ol...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci_vendor.c    1.47            1.48=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Added timeout value to cmdtimer

The diff of the modified file(s):

--- hci_vendor.c	2001/06/20 13:46:07	1.47
+++ hci_vendor.c	2001/07/05 10:53:18	1.48
@@ -132,7 +132,7 @@
 	pkt[3] =3D 0x06;
 	memcpy(pkt + 4, tmp_bd, 6);
=20=20=20
-	return send_cmd_block(pkt, 10);
+	return send_cmd_block(pkt, 10, DEFAULT_TIMEOUT);
 }
=20=20
 s32
@@ -143,7 +143,7 @@
 	c_pkt.opcode =3D hci_put_opcode(0xf, 0x3f) ;
 	c_pkt.len =3D 0;
=20
-	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
);
+	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
, DEFAULT_TIMEOUT);
 }
=20
 s32=20
@@ -176,7 +176,7 @@
 	}
=20
 #ifdef CONFIG_BLUETOOTH_SET_BAUDRATE_BLOCKING
-	send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN);
+	send_cmd_block((u8*) &c_pekt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN, DEFA=
ULT_TIMEOUT);
 #else
 	if (hci_ctrl.hc_buf.cmd_num < 1) {
 		DSYS(__FUNCTION__ VENDOR  ": sleeping\n");
@@ -691,14 +691,10 @@
 	/* wait for command status */
 	while (hci_ctrl.hc_buf.cmd_num =3D=3D 0)
 	{
-		current->state =3D TASK_INTERRUPTIBLE;
-#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,2,0)
-		schedule_timeout(HZ/100);
-#else
 		current->timeout =3D HZ/100;
+		current->state =3D TASK_INTERRUPTIBLE;
 		schedule();
 		current->timeout =3D 0;
-#endif
 	}
 }
=20
@@ -751,7 +747,7 @@
 	memset(ps_retbuf, 0, PSRETBUF_SIZE*2);
=20
 	tmp =3D send_cmd_block((u8*) &c_pkt,=20
-			     c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN);
+			     c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN, DEFAULT_TIMEOUT);
=20=09=20
 	if (rw_mode =3D=3D CSR_MSGTYPE_GETREQ)
 	  memcpy(retb, ps_retbuf, n_pars*sizeof(u16));
@@ -801,7 +797,7 @@
 	ps->ps_val[2] =3D (u16)bd[2];
 	ps->ps_val[3] =3D (((u16)bd[0] << 8) | ((u16)bd[1]));
=20
-	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
);
+	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
, DEFAULT_TIMEOUT);
 }
=20
 s32=20
@@ -842,7 +838,7 @@
=20
 	ps->ps_val[0] =3D num;
=20
-	ret =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N);
+	ret =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N, DEFAULT_TIMEOUT);
 	if (ret < 0)
 		return ret;
=20=09
@@ -850,7 +846,7 @@
 	ps->ps_key =3D CSR_PS_MAX_ACL_PKT_LEN;
 	ps->ps_val[0] =3D len;
=20
-	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
);
+	return send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
, DEFAULT_TIMEOUT);
 }
=20
 s32
@@ -883,21 +879,21 @@
 	cmd->status =3D CSR_STATUS_OK; /* always OK in GETREQ */
 	memset(cmd->payload, 0, 6*sizeof(u16));
=20
-	tmp =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N);
+	tmp =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N, DEFAULT_TIMEOUT);
 	if (tmp < 0)
 		return tmp;
=20
 	cmd->seq =3D csr_count++;
 	cmd->var_id =3D CSR_CMD_CHIP_VER;
 	memset(cmd->payload, 0, 6*sizeof(u16));
-	tmp =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N);
+	tmp =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N, DEFAULT_TIMEOUT);
 	if (tmp < 0)
 		return tmp;
=20
 	cmd->seq =3D csr_count++;
 	cmd->var_id =3D CSR_CMD_CHIP_REV;
 	memset(cmd->payload, 0, 6*sizeof(u16));
-	tmp =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N);
+	tmp =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N, DEFAULT_TIMEOUT);
=20
 	return tmp;
 }
@@ -1194,7 +1190,7 @@
 	c_pkt.len =3D 0;
=20
 	return send_cmd_block((u8*) &c_pkt,
-			      c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN);
+			      c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN, DEFAULT_TIMEOUT);
 }
=20
 s32