|
From: Gordon M. <gm...@us...> - 2001-03-02 21:50:57
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.131 1.132=20=20=20=20=20=20=20=20=20=20=20
bt_proc.c 1.19 1.20=20=20=20=20=20=20=20=20=20=20=20=20
btdebug.c 1.16 1.17=20=20=20=20=20=20=20=20=20=20=20=20
btmem.c 1.36 1.37=20=20=20=20=20=20=20=20=20=20=20=20
hci.c 1.121 1.122=20=20=20=20=20=20=20=20=20=20=20
rfcomm.c 1.90 1.91=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
--Fixed some annoying compiler warnings.
The diff of the modified file(s):
--- bluetooth.c 2001/03/02 15:37:49 1.131
+++ bluetooth.c 2001/03/02 21:52:15 1.132
@@ -2468,7 +2468,7 @@
/*---------------------------------------------------------------------=
*/
if ( bt_ctrl.session[line].sdpRequestResponseData )
{
- DSYS("bt_unregister_sdp: Free request data 0x%x\n", (u32 *)bt_ctrl.s=
ession[line].sdpRequestResponseData);
+ DSYS("bt_unregister_sdp: Free request data 0x%x\n", (unsigned int)bt=
_ctrl.session[line].sdpRequestResponseData);
kfree(bt_ctrl.session[line].sdpRequestResponseData);
bt_ctrl.session[line].sdpRequestResponseData =3D NULL;
bt_ctrl.session[line].sdpRequestResponseDataLength =3D 0;
--- bt_proc.c 2001/02/28 19:01:25 1.19
+++ bt_proc.c 2001/03/02 21:52:15 1.20
@@ -124,6 +124,7 @@
/* Read internal variables used for debugging */
=20
#ifdef __KERNEL__
+extern s32 bt_sprintf_status(u8 *buf);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
s32 bt_read_internal(char *buf, char **start, off_t offset,=20
int len, int unused)
--- btdebug.c 2001/02/15 16:27:33 1.16
+++ btdebug.c 2001/03/02 21:52:15 1.17
@@ -78,7 +78,7 @@
}
else
{=20=20
- len =3D sprintf(buf, "[%d,%d]", tv.tv_sec, tv.tv_usec);
+ len =3D sprintf(buf, "[%d,%d]", (int)tv.tv_sec, (int)tv.tv_usec);
buf[len]=3D0;
}
return buf;
--- btmem.c 2001/02/15 16:27:33 1.36
+++ btmem.c 2001/03/02 21:52:15 1.37
@@ -473,8 +473,8 @@
D_ERR("pid : %d (tx:0x%x - send:0x%x=3D%d) send:%ld free:%ld\n",
current->pid, (uint)tx, (uint)bt_buf.send,
(int)tx - (int)bt_buf.send,
- bt_buf.send - bt_buf.head,
- bt_buf.free - bt_buf.head);
+ (long int)(bt_buf.send - bt_buf.head),
+ (long int)(bt_buf.free - bt_buf.head));
=20=09=09
D_ERR("count:%d nbr_bufs:%d count:%d\n" ,
bt_buf.count, bt_buf.nbr_bufs, bt_buf.count);
--- hci.c 2001/03/02 10:50:44 1.121
+++ hci.c 2001/03/02 21:52:15 1.122
@@ -318,7 +318,7 @@
=20
static s32 test_hci_hdl;
=20
-static u8 do_send =3D 0;
+
=20
/****************** FUNCTION DEFINITION SECTION **************************=
***/
=20
@@ -467,10 +467,10 @@
}
}
=20
- //if (do_send) {
+
host_nbrcompleted_packets(hci_hdl, 1);
- //}
- //do_send =3D !do_send;
+
+
=20
/* When we change state we reset data_index,
because we are using separate buffers for
@@ -634,7 +634,7 @@
=20
case INQUIRY_RESULT:
{
- s32 i, j, k;
+ s32 i, j;
u8 tmp_bd[6];
=20
D_CMD(__FUNCTION__", INQUIRY_RESULT\n");
--- rfcomm.c 2001/03/02 10:50:44 1.90
+++ rfcomm.c 2001/03/02 21:52:15 1.91
@@ -823,7 +823,7 @@
{
#define FNC "rfcomm_disconnect_ind: "
rfcomm_con *rfcomm;
- s32 i;
+
D_CTRL(FNC"remote cid %d\n", l2cap->remote_cid);
=20
rfcomm =3D ((rfcomm_con*) l2cap->upper_con);
@@ -852,7 +852,7 @@
rfcomm_disconnect_cfm(l2cap_con *l2cap)
{
#define FNC "rfcomm_disconnect_cfm: "
- s32 i;
+
rfcomm_con *rfcomm;
=20=20=20
D_CTRL(FNC" disconnected\n");
|