Menu
▾
▴
CVS: 4 files have been modified in linux/drivers/char/bluetooth.
|
From: Peter K. <pk...@us...> - 2001-03-05 15:37:35
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Config.in 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
bluetooth.c 1.134 1.135=20=20=20=20=20=20=20=20=20=20=20
hci_vendor.c 1.14 1.15=20=20=20=20=20=20=20=20=20=20=20=20
l2cap.c 1.87 1.88=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Renamed CONFIG_BLUETOOTH_USEINBUFFER to CONFIG_BLUETOOTH_USE_INBUFFER,
CONFIG_BLUETOOTH_L2CAP_USETIMERS to CONFIG_BLUETOOTH_L2CAP_USE_TIMERS, and
CONFIG_BLUETOOTH_ERICSSON_P9A to CONFIG_BLUETOOTH_SET_BAUDRATE_BLOCKING
(inverted meaning).
The diff of the modified file(s):
--- Config.in 2001/03/05 15:12:21 1.3
+++ Config.in 2001/03/05 15:39:07 1.4
@@ -8,21 +8,21 @@
=20
if [ "$CONFIG_BLUETOOTH" !=3D "n" ]; then
=20
- bool 'Bluetooth proc entry' CONFIG_BLUETOOTH_PROC
- bool 'Input buffering' CONFIG_BLUETOOTH_USEINBUFFER
+ bool ' Bluetooth proc entries' CONFIG_BLUETOOTH_PROC
+ bool ' Input buffering' CONFIG_BLUETOOTH_USE_INBUFFER
+ bool ' Use L2CAP timers' CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
bool 'Allow connectionless L2CAP' CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
- bool 'Use L2CAP timers' CONFIG_BLUETOOTH_L2CAP_USETIMERS
=20
choice 'Bluetooth hardware type' \
- "CSR CONFIG_BLUETOOTH_CSR \
- None CONFIG_BLUETOOTH_NOINIT \
+ "None CONFIG_BLUETOOTH_NOINIT \
+ CSR CONFIG_BLUETOOTH_CSR \
Digianswer CONFIG_BLUETOOTH_DIGIANSWER \
- USB CONFIG_BLUETOOTH_USBMODULE \
+ Ericsson CONFIG_BLUETOOTH_ERICSSON \
Generic CONFIG_BLUETOOTH_GENERIC \
- Ericsson CONFIG_BLUETOOTH_ERICSSON" Ericsson
+ USB CONFIG_BLUETOOTH_USBMODULE" Ericsson
=20
if [ "$CONFIG_BLUETOOTH_ERICSSON" =3D "y" ]; then
- bool 'Ericsson P9A firmware' CONFIG_BLUETOOTH_ERICSSON_P9A
+ bool ' Block when setting baudrate' CONFIG_BLUETOOTH_SET_BAUDRATE_BLO=
CKING
fi
fi
=20
--- bluetooth.c 2001/03/04 17:54:54 1.134
+++ bluetooth.c 2001/03/05 15:39:07 1.135
@@ -120,7 +120,7 @@
=20
/****************** TYPE DEFINITION SECTION ******************************=
***/
=20
-#ifdef CONFIG_BLUETOOTH_USEINBUFFER
+#ifdef CONFIG_BLUETOOTH_USE_INBUFFER
=20
/* This buffer is used decrease overruns on serial port. Copies data in
interrupt context and schedules a task which consumes data at 'safe' ti=
me */
@@ -147,7 +147,7 @@
#endif
static void bt_flash_led(void);
=20
-#ifdef CONFIG_BLUETOOTH_USEINBUFFER
+#ifdef CONFIG_BLUETOOTH_USE_INBUFFER
struct tq_struct bt_receive_task;
bt_inbuffer hci_data;
static void hci_receive_data_task(void);
@@ -1243,13 +1243,13 @@
=20
bt_flash_led();=20=20
=20
-#ifdef CONFIG_BLUETOOTH_USEINBUFFER
+#ifdef CONFIG_BLUETOOTH_USE_INBUFFER
/* store in bt inbuffer and schedule a hci receive task if none is starte=
d */
bt_handle_indata(data, count);
#else
/* process data right away */
hci_receive_data((u8*)data, count);
-#endif /* CONFIG_BLUETOOTH_USEINBUFFER */
+#endif /* CONFIG_BLUETOOTH_USE_INBUFFER */
}
=20
=20
@@ -1410,7 +1410,7 @@
#undef FNC
}
=20
-#ifdef CONFIG_BLUETOOTH_USEINBUFFER
+#ifdef CONFIG_BLUETOOTH_USE_INBUFFER
static void bt_handle_indata(const __u8 *data, s32 count)
{
s32 free;
@@ -1501,7 +1501,7 @@
hci_receive_data(getTemp, size_end);
}
}
-#endif /* CONFIG_BLUETOOTH_USEINBUFFER */
+#endif /* CONFIG_BLUETOOTH_USE_INBUFFER */
=20
/* Opens a connection to the selected PSM, layer specific is the same as t=
he
* lowest part on the connection ID, in RFCOMM this is line | dlci, each o=
ne
@@ -2097,7 +2097,7 @@
DSYS("Bluetooth Driver Using ttyBT[0-%d] (data), ttyBTC (ctrl [%d])\n",
BT_NBR_DATAPORTS-1, BT_NBR_PORTS-1);
=20
-#ifdef CONFIG_BLUETOOTH_USEINBUFFER
+#ifdef CONFIG_BLUETOOTH_USE_INBUFFER
DSYS("Using BT Inbuffers [%d]\n", BT_INBUFFER_SIZE);
/* Init hci inbuffer */
hci_data.head =3D &hci_data.data[0];
--- hci_vendor.c 2001/03/05 15:12:21 1.14
+++ hci_vendor.c 2001/03/05 15:39:07 1.15
@@ -66,7 +66,7 @@
=20
/****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-#if defined(CONFIG_BLUETOOTH_ERICSSON)
+#ifdef CONFIG_BLUETOOTH_ERICSSON
/* Ericsson defines */
#define ERICSSON_SET_UART_BAUD_RATE 0x9
#define ERICSSON_WRITE_BD_ADDR 0xd
@@ -77,7 +77,7 @@
#define ERICSSON_TX_TEST 0x19
#endif
=20
-#if defined(CONFIG_BLUETOOTH_DIGIANSWER)
+#ifdef CONFIG_BLUETOOTH_DIGIANSWER
/* Digianswer defines */
#endif
=20
@@ -102,7 +102,7 @@
=20
/****************** FUNCTION DEFINITION SECTION **************************=
***/
=20
-#if defined(CONFIG_BLUETOOTH_ERICSSON)
+#ifdef CONFIG_BLUETOOTH_ERICSSON
/*************************************************************************=
****/
/********************** Ericsson functions *******************************=
****/
/*************************************************************************=
****/
@@ -168,7 +168,7 @@
D_ERR(__FUNCTION__": Baudrate not supported\n");
break;=09
}
-#ifndef CONFIG_BLUETOOTH_ERICSSON_P9A
+#ifdef CONFIG_BLUETOOTH_SET_BAUDRATE_BLOCKING
tmp =3D send_cmd_block((u8*) &c_pkt ,c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N);
#else
if (hci_ctrl.hc_buf.cmd_num < 1) {
@@ -195,8 +195,7 @@
=20=20=20=20=20
case ERICSSON_SET_UART_BAUD_RATE:
D_CMD(__FUNCTION__" Ericsson baudrate set\n");
-#ifndef CONFIG_BLUETOOTH_ERICSSON_P9A
- // no wake up, since hci_set_baudrate() is non-blocking
+#ifdef CONFIG_BLUETOOTH_SET_BAUDRATE_BLOCKING
release_cmd_timer();
wake_up_interruptible(&hci_wq);
#endif
--- l2cap.c 2001/03/04 17:54:54 1.87
+++ l2cap.c 2001/03/05 15:39:07 1.88
@@ -223,7 +223,7 @@
#endif /* LINUX_VERSION_CODE */
#endif /* __KERNEL__ */
=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
#define MAX_NO_RTX 0
#define RTX_TIMEOUT 5 /* sec */
#define ERTX_TIMEOUT 60 /* sec */
@@ -315,7 +315,7 @@
#if L2CAP_SELFTEST
test_conlist();
#endif
-#ifdef BLUETOOTH_CONFIG_L2CAP_CONNECTIONLESS
+#ifdef CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
l2cap->allow_conless =3D 1;
#else
l2cap->allow_conless =3D 0;
@@ -982,7 +982,7 @@
return;
}
=20=20=20=20=20=20=20=20=20=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
disable_rtx(con);
#endif
=20
@@ -996,7 +996,7 @@
=20=20=20=20=20=20=20=20=20=20=20=20
case RES_PENDING:
l2ca_connect_pnd(con, conrsp->status);
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
/* Disable RTX timer and start ERTX */
//start_ertx();
#endif
@@ -1034,7 +1034,7 @@
Disable RTX/ERTX timers
(New state : CLOSED)
*/
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
disable_rtx(con);
//disable_ertx(con);
#endif
@@ -1075,7 +1075,7 @@
=20=09
case CONF_SUCCESS:
=20=20=20=20=20=20=20=20=20=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
disable_rtx(con);
#endif
=20
@@ -1125,7 +1125,7 @@
=20
/* If we end up here, config failed */
=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
disable_rtx(con);
#endif
=20
@@ -1170,7 +1170,7 @@
return;
}
=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
disable_rtx(con);
#endif=09
=20
@@ -1372,7 +1372,7 @@
sleep(3);
#endif
=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
do_cmd_backup(con, SIG_CONREQ, 0, NULL, 0, 0, 0);
#endif
/* baseband is up, now initiate l2cap */
@@ -1426,7 +1426,7 @@
/* flag phys link as down */
con->link_up =3D FALSE;
=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
/* cancel any outstanding timers */
disable_rtx(con);
//disable_ertx(con);
@@ -1565,7 +1565,7 @@
con->link_up =3D 1;
ENTERSTATE(con, W4_L2CAP_CONNECT_RSP);
PRINTSTATE(con);
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
do_cmd_backup(con, SIG_CONREQ, 0, NULL, 0, 0, 0);
#endif
l2cap_connect_req(con, psm);
@@ -1598,7 +1598,7 @@
=20
/* local mtu is set in l2cap_config_req */
=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
do_cmd_backup(con, SIG_CONFREQ, in_mtu, outflow,=20
flush_timeout, link_to, 0);
#endif=09=09
@@ -1624,7 +1624,7 @@
=20
con->conf_req_ready =3D FALSE;
con->conf_rsp_ready =3D FALSE;
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS=09=09
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS=09=09
do_cmd_backup(con, SIG_CONFREQ, in_mtu, outflow,=20
flush_timeout, link_to, 0);
#endif
@@ -1653,7 +1653,7 @@
=20
if (con->current_state =3D=3D OPEN || con->current_state =3D=3D CONFIG) {
=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
do_cmd_backup(con, SIG_DISCREQ, 0, NULL,0, 0, 0);
#endif
result =3D l2cap_disconnect_req(con);
@@ -1903,7 +1903,7 @@
tx->cur_len =3D L2CAP_HDRSIZE + payload_len; /* Increased as lower layers=
=20
add header data */=20=20
=20=09
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
/* start retransmission timer */
start_rtx(con, RTX_TIMEOUT);
#endif
@@ -2025,7 +2025,7 @@
SIGCMD_HDRSIZE + CONF_REQSIZE);
=20=09
print_data("l2cap options : ", (char*)opt , opt_len);
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
/* start retransmission timer */
start_rtx(con, RTX_TIMEOUT);
#endif
@@ -2069,7 +2069,7 @@
tx->bc_flag =3D NO_BROADCAST;
tx->cur_len =3D L2CAP_HDRSIZE + payload_len;
=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
/* start retransmission timer */
start_rtx(con, RTX_TIMEOUT);
#endif
@@ -2117,7 +2117,7 @@
tx->bc_flag =3D NO_BROADCAST;
tx->cur_len =3D L2CAP_HDRSIZE + payload_len; /* Increased when lower
layers add header data */
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
start_rtx(con, RTX_TIMEOUT);
#endif
return hci_send_data(tx);
@@ -2204,7 +2204,7 @@
tx->bc_flag =3D NO_BROADCAST;
tx->cur_len =3D L2CAP_HDRSIZE + payload_len; /* Increased when lower
layers add header data */
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
start_rtx(con, RTX_TIMEOUT);
#endif
return hci_send_data(tx);
@@ -2670,7 +2670,7 @@
/* use existing handle */
D_STATE("l2ca_ping : using existing handle\n");
con->ping_sent=3D1;
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS=09=09
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS=09=09
do_cmd_backup(con, SIG_ECHOREQ, 0, NULL, 0, 0, 0);
#endif
l2cap_echo_req(con, NULL, 0);
@@ -2725,7 +2725,7 @@
con->inforeq_sent =3D 1;
con->initiator =3D 1;
insert_con(con);
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS=09=09
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS=09=09
do_cmd_backup(con, SIG_INFOREQ, 0, NULL, 0, 0, infotype);
#endif
/* l2cap_echo_req is called in lp_connect_cfm */
@@ -2736,7 +2736,7 @@
/* use existing handle */
D_STATE("l2ca_getinfo : using existing handle\n");
con->inforeq_sent =3D 1;
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS=09=09
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS=09=09
do_cmd_backup(con, SIG_INFOREQ, 0, NULL, 0, 0, infotype);
#endif
l2cap_info_req(con, infotype);
@@ -2808,7 +2808,7 @@
=20=20=20
/* FIXME -- send l2ca_timeoutind() */
=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
if (MAX_NO_RTX =3D=3D 0)
{
/* no retransmissions, shutdown connection */
|
