Menu
▾
▴
openbt-commit — CVS commits to the AXIS OpenBT Stack
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
(44) |
Mar
(202) |
Apr
(134) |
May
(89) |
Jun
(94) |
Jul
(58) |
Aug
(58) |
Sep
(56) |
Oct
(75) |
Nov
(26) |
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(24) |
Feb
(30) |
Mar
(15) |
Apr
(49) |
May
(12) |
Jun
(6) |
Jul
(11) |
Aug
(20) |
Sep
(19) |
Oct
(3) |
Nov
(13) |
Dec
(1) |
| 2003 |
Jan
(7) |
Feb
(4) |
Mar
(7) |
Apr
(5) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
(2) |
Nov
(51) |
Dec
(1) |
| 2004 |
Jan
(11) |
Feb
(5) |
Mar
|
Apr
(5) |
May
(2) |
Jun
|
Jul
(21) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Mattias ?g. <mat...@us...> - 2001-03-05 11:14:19
|
The following file was modified in apps/bluetooth/btd:
Name Old version New version Comment
---- ----------- ----------- -------
btd.c 1.83 1.84=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
only reply CONNECT... (without OK) when receiving ATD... string in=20
modem emulator
The diff of the modified file(s):
--- btd.c 2001/03/04 17:54:54 1.83
+++ btd.c 2001/03/05 11:15:55 1.84
@@ -1843,8 +1843,6 @@
#ifdef PALM_FIX
sleep(2); /* wait for client */
#endif
- syslog(LOG_INFO, "Write : %s", ok);
- bt_write_top(ok, strlen(ok), 0);=20
syslog(LOG_INFO, "Write : %s", connect);
bt_write_top(connect, strlen(connect), 0);=20=20=20
syslog(LOG_INFO, "Modem connected !");
@@ -1914,8 +1912,6 @@
#ifdef PALM_FIX
sleep(2); /* wait for client */
#endif
- syslog(LOG_INFO, "Write : %s", ok);
- write(bt_fd, ok, strlen(ok));=20
syslog(LOG_INFO, "Write : %s", connect);
write(bt_fd, connect, strlen(connect));=20=20=20
syslog(LOG_INFO, "Modem connected !");
|
|
From: Gordon M. <gm...@us...> - 2001-03-04 17:53:51
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btconfig.h 1.18 1.19=20=20=20=20=20=20=20=20=20=20=20=20
hci_internal.h 1.11 1.12=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
--Modified the config macros to be compatible with the Linux kernel config =
system.
The diff of the modified file(s):
--- btconfig.h 2001/03/02 15:56:18 1.18
+++ btconfig.h 2001/03/04 17:54:54 1.19
@@ -39,6 +39,13 @@
*
*/
=20
+/*
+ * When the stack is included as part of the kernel source tree, this macro
+ * is defined, and we can use the standard Linux kernel config instead of
+ * this next section. See Config.in in the source directory.
+ * --gmcnutt
+ */
+#ifndef CONFIG_BLUETOOTH
/******************
* General *
******************/
@@ -47,10 +54,10 @@
//#define USE_TCI
=20
/* use of /proc files to read status information */
-#define BT_USE_PROC
+#define CONFIG_BLUETOOTH_PROC
=20
/* Used to decrease overruns on serial port (see bluetooth.c) */
-#undef BT_USEINBUFFER
+#undef CONFIG_BLUETOOTH_USEINBUFFER
=20
#ifdef __CRIS__
#define USE_SECURITY_MANAGER
@@ -61,19 +68,13 @@
/* Bluetooth HW defines used to setup different HW and to cope with=20
limitations in HW */
=20
-#define HW_NOINIT 0
-#define HW_ERICSSON 1
-#define HW_DIGIANSWER 2
-#define HW_CSR 3
-#define HW_GENERIC 4
-#define HW_USBMODULE 5 /* Not implemented */
-
/* This sets current HW */
-#define HW_CURRENT HW_ERICSSON
-//#define HW_CURRENT HW_CSR
-//#define HW_CURRENT HW_GENERIC
-
-#define HW_USED(x) (HW_CURRENT =3D=3D x)
+#undef CONFIG_BLUETOOTH_CSR=20=20=20=20=20=20=20=20
+#undef CONFIG_BLUETOOTH_NOINIT=20=20=20=20=20
+#undef CONFIG_BLUETOOTH_DIGIANSWER=20
+#undef CONFIG_BLUETOOTH_USBMODULE /* Not implemented */
+#undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20
+#define CONFIG_BLUETOOTH_ERICSSON
=20
/***************
* HCI *
@@ -89,7 +90,7 @@
//#define HCI_EMULATION
=20
/* This should be defined if you are using the Ericsson P9A firmware */
-#define P9A
+#define CONFIG_BLUETOOTH_ERICSSON_P9A
=20
/* This define is used during test of the host flow control */
//#define HOST_FLOW_CTRL
@@ -102,14 +103,14 @@
//#define EMC_TEST_DATA_SIZE 678
#endif
=20
-#define HCI_USEUSB
+#define CONFIG_BLUETOOTH_HCI_USB
=20
/****************
* L2CAP *
****************/
=20
-#define L2CAP_USETIMERS
-#define DEF_ALLOWCONLESS 0
+#define CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#undef CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
=20
/*****************
* RFCOMM *
@@ -120,3 +121,5 @@
/***************
* SDP *
***************/
+
+#endif /* CONFIG_BLUETOOTH */
--- hci_internal.h 2001/03/03 13:59:14 1.11
+++ hci_internal.h 2001/03/04 17:54:55 1.12
@@ -342,7 +342,7 @@
u8 local_bd[6];
s32 active_connection;
hci_con con[MAX_NBR_OF_CONNECTIONS];
-} __attribute__ ((packed)) hci_controller;
+} hci_controller;
=20
/****************** EXPORTED FUNCTION DECLARATION SECTION ****************=
***/
=20
|
|
From: Gordon M. <gm...@us...> - 2001-03-04 17:53:51
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Config.in 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20
README 1.25 1.26=20=20=20=20=20=20=20=20=20=20=20=20
bluetooth.c 1.133 1.134=20=20=20=20=20=20=20=20=20=20=20
hci_vendor.c 1.12 1.13=20=20=20=20=20=20=20=20=20=20=20=20
l2cap.c 1.86 1.87=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
--Modified the config macros to be compatible with the Linux kernel config =
system.
The diff of the modified file(s):
--- Config.in 2001/03/02 21:10:41 1.1
+++ Config.in 2001/03/04 17:54:54 1.2
@@ -1,5 +1,34 @@
#---------------------------------------------------------------------
# Bluetooth driver configuration
#---------------------------------------------------------------------
+mainmenu_option next_comment
+comment 'Bluetooth'
=20
tristate 'Bluetooth driver' CONFIG_BLUETOOTH
+
+if [ "$CONFIG_BLUETOOTH" !=3D "n" ]; then
+
+ bool 'Bluetooth proc entry' CONFIG_BLUETOOTH_PROC
+ bool 'Input buffering' CONFIG_BLUETOOTH_USEINBUFFER
+ bool 'HCI USB' CONFIG_BLUETOOTH_HCI_USB
+ bool 'Allow connectionless L2CAP' CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
+ bool 'Use L2CAP timers' CONFIG_BLUETOOTH_L2CAP_USETIMERS
+
+ choice 'Bluetooth hardware type' \
+ "CSR CONFIG_BLUETOOTH_CSR \
+ None CONFIG_BLUETOOTH_NOINIT \
+ Digianswer CONFIG_BLUETOOTH_DIGIANSWER \
+ USB CONFIG_BLUETOOTH_USBMODULE \
+ Generic CONFIG_BLUETOOTH_GENERIC \
+ Ericsson CONFIG_BLUETOOTH_ERICSSON" Ericsson
+
+ if [ "$CONFIG_BLUETOOTH_ERICSSON" =3D "y" ]; then
+ bool 'Ericsson P9A firmware' CONFIG_BLUETOOTH_ERICSSON_P9A
+ fi
+fi
+
+endmenu
+# Don't know why I need this one again, but things don't work right in the=
char
+# menu if I don't put it in.
+# --gmcnutt
+endmenu
\ No newline at end of file
--- README 2001/01/08 16:44:38 1.25
+++ README 2001/03/04 17:54:54 1.26
@@ -300,7 +300,7 @@
=20
There are two files that needs to be changed
=20
-Kernel : btconfig.h, set HW_CURRENT to whatever you are using
+Kernel : btconfig.h, set CONFIG_BLUETOOTH_<hardware> to whatever you are u=
sing
=20
Usermode app : btd.c, set HW_CURRENT to whatever you are using=20
=20
--- bluetooth.c 2001/03/04 15:55:03 1.133
+++ bluetooth.c 2001/03/04 17:54:54 1.134
@@ -64,7 +64,7 @@
#include <linux/bluetooth/tci.h>
#endif
=20
-#ifdef BT_USE_PROC
+#ifdef CONFIG_BLUETOOTH_PROC
#include <linux/bluetooth/bt_proc.h>
#endif
=20
@@ -120,7 +120,7 @@
=20
/****************** TYPE DEFINITION SECTION ******************************=
***/
=20
-#ifdef BT_USEINBUFFER
+#ifdef CONFIG_BLUETOOTH_USEINBUFFER
=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 BT_USEINBUFFER
+#ifdef CONFIG_BLUETOOTH_USEINBUFFER
struct tq_struct bt_receive_task;
bt_inbuffer hci_data;
static void hci_receive_data_task(void);
@@ -598,7 +598,7 @@
case BTRESETPHYSICALHW:
#ifdef __CRIS__
=20
-#if HW_USED(HW_CSR)
+#ifdef CONFIG_BLUETOOTH_CSR
#define CONFIG_BLUETOOTH_RESET_ACTIVE_HIGH
#else
#undef CONFIG_BLUETOOTH_RESET_ACTIVE_HIGH
@@ -1243,13 +1243,13 @@
=20
bt_flash_led();=20=20
=20
-#ifdef BT_USEINBUFFER
+#ifdef CONFIG_BLUETOOTH_USEINBUFFER
/* 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 /* BT_USEINBUFFER */
+#endif /* CONFIG_BLUETOOTH_USEINBUFFER */
}
=20
=20
@@ -1410,7 +1410,7 @@
#undef FNC
}
=20
-#ifdef BT_USEINBUFFER
+#ifdef CONFIG_BLUETOOTH_USEINBUFFER
static void bt_handle_indata(const __u8 *data, s32 count)
{
s32 free;
@@ -1501,7 +1501,7 @@
hci_receive_data(getTemp, size_end);
}
}
-#endif /* BT_USEINBUFFER */
+#endif /* CONFIG_BLUETOOTH_USEINBUFFER */
=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
@@ -1836,7 +1836,9 @@
{
static struct tty_ldisc bt_ldisc;
s32 status;
+#ifdef CONFIG_BLUETOOTH_PROC
s32 procfs_status =3D -1;
+#endif
=20
show_bt_version();
=20
@@ -1922,7 +1924,7 @@
=20=09
sertty =3D NULL;
=20
-#ifdef BT_USE_PROC
+#ifdef CONFIG_BLUETOOTH_PROC
DSYS("Registering BT proc files\n");
=20=20
#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
@@ -2090,12 +2092,12 @@
}
#endif /* USE_TCI */
=20=09
-#endif /* BT_USE_PROC */
+#endif /* CONFIG_BLUETOOTH_PROC */
=20
DSYS("Bluetooth Driver Using ttyBT[0-%d] (data), ttyBTC (ctrl [%d])\n",
BT_NBR_DATAPORTS-1, BT_NBR_PORTS-1);
=20
-#ifdef BT_USEINBUFFER
+#ifdef CONFIG_BLUETOOTH_USEINBUFFER
DSYS("Using BT Inbuffers [%d]\n", BT_INBUFFER_SIZE);
/* Init hci inbuffer */
hci_data.head =3D &hci_data.data[0];
@@ -2645,7 +2647,7 @@
if (bt_stack_initiated)
bt_shutdown();
=20=09
-#ifdef BT_USE_PROC
+#ifdef CONFIG_BLUETOOTH_PROC
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
remove_proc_entry(bt_status.name, &proc_root);
remove_proc_entry(bt_internal_info.name, &proc_root);
@@ -2669,7 +2671,7 @@
proc_unregister(&proc_root, tci_proc_entry.low_ino);
#endif /* USE_TCI */
#endif /* LINUX_VERSION_CODE */
-#endif /* BT_USE_PROC */
+#endif /* CONFIG_BLUETOOTH_PROC */
=20=09
DSYS("Bluetooth Driver unregistered\n");
}
--- hci_vendor.c 2001/03/02 10:50:44 1.12
+++ hci_vendor.c 2001/03/04 17:54:54 1.13
@@ -53,7 +53,7 @@
#include <linux/bluetooth/bluetooth.h>
#include <linux/bluetooth/btmem.h>
#include <linux/delay.h>
-#ifdef HCI_USEUSB
+#ifdef CONFIG_BLUETOOTH_HCI_USB
#include <linux/interrupt.h>
#endif
#else /* user mode */
@@ -68,7 +68,7 @@
=20
/****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-#if HW_USED(HW_ERICSSON)
+#if defined(CONFIG_BLUETOOTH_ERICSSON)
/* Ericsson defines */
#define ERICSSON_SET_UART_BAUD_RATE 0x9
#define ERICSSON_WRITE_BD_ADDR 0xd
@@ -79,7 +79,7 @@
#define ERICSSON_TX_TEST 0x19
#endif
=20
-#if HW_USED(HW_DIGIANSWER)
+#if defined(CONFIG_BLUETOOTH_DIGIANSWER)
/* Digianswer defines */
#endif
=20
@@ -104,7 +104,7 @@
=20
/****************** FUNCTION DEFINITION SECTION **************************=
***/
=20
-#if HW_USED(HW_ERICSSON)
+#if defined(CONFIG_BLUETOOTH_ERICSSON)
/*************************************************************************=
****/
/********************** Ericsson functions *******************************=
****/
/*************************************************************************=
****/
@@ -170,7 +170,7 @@
D_ERR(__FUNCTION__": Baudrate not supported\n");
break;=09
}
-#ifndef P9A
+#ifndef CONFIG_BLUETOOTH_ERICSSON_P9A
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) {
@@ -197,7 +197,7 @@
=20=20=20=20=20
case ERICSSON_SET_UART_BAUD_RATE:
D_CMD(__FUNCTION__" Ericsson baudrate set\n");
-#ifndef P9A
+#ifndef CONFIG_BLUETOOTH_ERICSSON_P9A
// no wake up, since hci_set_baudrate() is non-blocking
release_cmd_timer();
wake_up_interruptible(&hci_wq);
@@ -270,7 +270,7 @@
}
=20
=20
-#elif HW_USED(HW_DIGIANSWER)
+#elif defined(CONFIG_BLUETOOTH_DIGIANSWER)
/*************************************************************************=
****/
/************************* Digianswer functions **************************=
****/
/*************************************************************************=
****/
@@ -403,7 +403,7 @@
}
#endif
=20
-#elif HW_USED(HW_CSR)
+#elif defined(CONFIG_BLUETOOTH_CSR)
/*************************************************************************=
****/
/****************************** CSR functions ****************************=
****/
/*************************************************************************=
****/
--- l2cap.c 2001/03/02 10:50:44 1.86
+++ l2cap.c 2001/03/04 17:54:54 1.87
@@ -223,7 +223,7 @@
#endif /* LINUX_VERSION_CODE */
#endif /* __KERNEL__ */
=20
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
#define MAX_NO_RTX 0
#define RTX_TIMEOUT 5 /* sec */
#define ERTX_TIMEOUT 60 /* sec */
@@ -315,7 +315,11 @@
#if L2CAP_SELFTEST
test_conlist();
#endif
- l2cap->allow_conless =3D DEF_ALLOWCONLESS;
+#ifdef BLUETOOTH_CONFIG_L2CAP_CONNECTIONLESS
+ l2cap->allow_conless =3D 1;
+#else
+ l2cap->allow_conless =3D 0;
+#endif
l2cap->initiated =3D 1;
return 0;
}
@@ -978,7 +982,7 @@
return;
}
=20=20=20=20=20=20=20=20=20=20
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
disable_rtx(con);
#endif
=20
@@ -992,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 L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
/* Disable RTX timer and start ERTX */
//start_ertx();
#endif
@@ -1030,7 +1034,7 @@
Disable RTX/ERTX timers
(New state : CLOSED)
*/
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
disable_rtx(con);
//disable_ertx(con);
#endif
@@ -1071,7 +1075,7 @@
=20=09
case CONF_SUCCESS:
=20=20=20=20=20=20=20=20=20=20
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
disable_rtx(con);
#endif
=20
@@ -1121,7 +1125,7 @@
=20
/* If we end up here, config failed */
=20
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
disable_rtx(con);
#endif
=20
@@ -1166,7 +1170,7 @@
return;
}
=20
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
disable_rtx(con);
#endif=09
=20
@@ -1368,7 +1372,7 @@
sleep(3);
#endif
=20
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
do_cmd_backup(con, SIG_CONREQ, 0, NULL, 0, 0, 0);
#endif
/* baseband is up, now initiate l2cap */
@@ -1422,7 +1426,7 @@
/* flag phys link as down */
con->link_up =3D FALSE;
=20
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
/* cancel any outstanding timers */
disable_rtx(con);
//disable_ertx(con);
@@ -1561,7 +1565,7 @@
con->link_up =3D 1;
ENTERSTATE(con, W4_L2CAP_CONNECT_RSP);
PRINTSTATE(con);
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
do_cmd_backup(con, SIG_CONREQ, 0, NULL, 0, 0, 0);
#endif
l2cap_connect_req(con, psm);
@@ -1594,7 +1598,7 @@
=20
/* local mtu is set in l2cap_config_req */
=20
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
do_cmd_backup(con, SIG_CONFREQ, in_mtu, outflow,=20
flush_timeout, link_to, 0);
#endif=09=09
@@ -1620,7 +1624,7 @@
=20
con->conf_req_ready =3D FALSE;
con->conf_rsp_ready =3D FALSE;
-#ifdef L2CAP_USETIMERS=09=09
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS=09=09
do_cmd_backup(con, SIG_CONFREQ, in_mtu, outflow,=20
flush_timeout, link_to, 0);
#endif
@@ -1649,7 +1653,7 @@
=20
if (con->current_state =3D=3D OPEN || con->current_state =3D=3D CONFIG) {
=20
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
do_cmd_backup(con, SIG_DISCREQ, 0, NULL,0, 0, 0);
#endif
result =3D l2cap_disconnect_req(con);
@@ -1899,7 +1903,7 @@
tx->cur_len =3D L2CAP_HDRSIZE + payload_len; /* Increased as lower layers=
=20
add header data */=20=20
=20=09
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
/* start retransmission timer */
start_rtx(con, RTX_TIMEOUT);
#endif
@@ -2021,7 +2025,7 @@
SIGCMD_HDRSIZE + CONF_REQSIZE);
=20=09
print_data("l2cap options : ", (char*)opt , opt_len);
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
/* start retransmission timer */
start_rtx(con, RTX_TIMEOUT);
#endif
@@ -2065,7 +2069,7 @@
tx->bc_flag =3D NO_BROADCAST;
tx->cur_len =3D L2CAP_HDRSIZE + payload_len;
=20
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
/* start retransmission timer */
start_rtx(con, RTX_TIMEOUT);
#endif
@@ -2113,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 L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
start_rtx(con, RTX_TIMEOUT);
#endif
return hci_send_data(tx);
@@ -2200,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 L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
start_rtx(con, RTX_TIMEOUT);
#endif
return hci_send_data(tx);
@@ -2666,7 +2670,7 @@
/* use existing handle */
D_STATE("l2ca_ping : using existing handle\n");
con->ping_sent=3D1;
-#ifdef L2CAP_USETIMERS=09=09
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS=09=09
do_cmd_backup(con, SIG_ECHOREQ, 0, NULL, 0, 0, 0);
#endif
l2cap_echo_req(con, NULL, 0);
@@ -2721,7 +2725,7 @@
con->inforeq_sent =3D 1;
con->initiator =3D 1;
insert_con(con);
-#ifdef L2CAP_USETIMERS=09=09
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS=09=09
do_cmd_backup(con, SIG_INFOREQ, 0, NULL, 0, 0, infotype);
#endif
/* l2cap_echo_req is called in lp_connect_cfm */
@@ -2732,7 +2736,7 @@
/* use existing handle */
D_STATE("l2ca_getinfo : using existing handle\n");
con->inforeq_sent =3D 1;
-#ifdef L2CAP_USETIMERS=09=09
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS=09=09
do_cmd_backup(con, SIG_INFOREQ, 0, NULL, 0, 0, infotype);
#endif
l2cap_info_req(con, infotype);
@@ -2804,7 +2808,7 @@
=20=20=20
/* FIXME -- send l2ca_timeoutind() */
=20
-#ifdef L2CAP_USETIMERS
+#ifdef CONFIG_BLUETOOTH_L2CAP_USETIMERS
if (MAX_NO_RTX =3D=3D 0)
{
/* no retransmissions, shutdown connection */
|
|
From: Gordon M. <gm...@us...> - 2001-03-04 17:53:51
|
The following files were modified in apps/bluetooth/btd: Name Old version New version Comment ---- ----------- ----------- ------- btd.c 1.82 1.83=20=20=20=20=20=20=20=20=20=20=20=20 btd.h 1.33 1.34=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: --Modified the config macros to be compatible with the Linux kernel config = system. The diff of the modified file(s): --- btd.c 2001/03/04 15:49:23 1.82 +++ btd.c 2001/03/04 17:54:54 1.83 @@ -304,7 +304,7 @@ /* Misc */ static void show_menu(void); =20 -#if HW_USED(HW_ERICSSON)&&defined(__CRIS__) +#if defined(CONFIG_BLUETOOTH_ERICSSON)&&defined(__CRIS__) #define ECS_TEST_FUNCTIONS #endif =20 @@ -3062,7 +3062,7 @@ /****************** Vendor dependent functions ***********************/ /*********************************************************************/ =20 -#if HW_USED(HW_ERICSSON) +#if defined(CONFIG_BLUETOOTH_ERICSSON) =20 /* Set the phys device to Ericsson default speed, 57600 */ void init_phys(int fd) @@ -3121,7 +3121,7 @@ #endif } =20 -#elif HW_USED(HW_DIGIANSWER) +#elif defined(CONFIG_BLUETOOTH_DIGIANSWER) /*********************************************************************/ /*********************************************************************/ =20 @@ -3151,7 +3151,7 @@ #endif } =20 -#elif HW_USED(HW_CSR) +#elif defined(CONFIG_BLUETOOTH_CSR) /*********************************************************************/ /*********************************************************************/ =20 @@ -3195,7 +3195,7 @@ #endif } =20 -#elif HW_USED(HW_GENERIC) +#elif defined(CONFIG_BLUETOOTH_GENERIC) /*********************************************************************/ /*********************************************************************/ =20 @@ -3224,7 +3224,7 @@ #endif } =20 -#elif HW_USED(HW_NOINIT) +#elif defined(CONFIG_BLUETOOTH_NOINIT) /*********************************************************************/ /*********************************************************************/ =20 --- btd.h 2001/02/27 15:46:44 1.33 +++ btd.h 2001/03/04 17:54:54 1.34 @@ -46,20 +46,22 @@ =20 /****************** CONSTANT AND MACRO SECTION ***************************= ***/ =20 +/* + * I had to change this section to match btconfig.h, which was modified + * to suit Linux kernel configuration. It's unfortunate I had to influence + * the apps directory with a kernel change, but the user stack uses the + * kernel module configs and the btd.c source. + * --gmcnutt + */ /* HW init defines */ - -#define HW_NOINIT 0 -#define HW_ERICSSON 1 -#define HW_DIGIANSWER 2 -#define HW_CSR 3 -#define HW_GENERIC 4 -#define HW_USBMODULE 5 /* Not implemented */ - +#undef CONFIG_BLUETOOTH_CSR=20=20=20=20=20=20=20=20 +#undef CONFIG_BLUETOOTH_NOINIT=20=20=20=20=20 +#undef CONFIG_BLUETOOTH_DIGIANSWER=20 +#undef CONFIG_BLUETOOTH_USBMODULE /* Not implemented */ +#undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20 /* This sets current HW */ -#define HW_CURRENT HW_ERICSSON -//#define HW_CURRENT HW_CSR +#define CONFIG_BLUETOOTH_ERICSSON =20 -#define HW_USED(x) (HW_CURRENT =3D=3D x) =20 /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */ =20 |
|
From: Peter K. <pk...@us...> - 2001-03-04 15:57:50
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btdebug.h 1.36 1.37=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Removed SDP_DEBUG_MEM as it is no longer used.
The diff of the modified file(s):
--- btdebug.h 2001/03/02 16:57:50 1.36
+++ btdebug.h 2001/03/04 15:59:23 1.37
@@ -153,8 +153,6 @@
/* Enables/disables debug for functions used during connection and
disconnecting i sdp */
=20
-#define SDP_DEBUG_MEM 0
-
#define SDP_DEBUG_PROC 0
=20
#define SDP_PRINT_DATA 0
|
|
From: Peter K. <pk...@us...> - 2001-03-04 15:55:30
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
sdp.c 1.63 1.64=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Removed unnecessary kmalloc() and memcpy().
The diff of the modified file(s):
--- sdp.c 2001/03/04 13:04:35 1.63
+++ sdp.c 2001/03/04 15:56:54 1.64
@@ -85,12 +85,6 @@
#define D_MISC(fmt...)
#endif
=20
-#if SDP_DEBUG_MEM
-#define D_MEM(fmt...) printk(fmt)
-#else
-#define D_MEM(fmt...)
-#endif
-
#if SDP_DEBUG_PROC
#define D_PROC(fmt...) printk(fmt)
#else
@@ -630,7 +624,7 @@
/*---------------------------------------------------*/
l2cap_send_data(tx_buf, sdp_con_list[sdpIndex].l2cap);
DSYS(__FUNCTION__"Client finished sending data.\n");
- returnValue =3D 1;=20
+ returnValue =3D 0;=20
}
} else {
/*-----------------------------------------------------------*/
@@ -747,7 +741,6 @@
{
sdp_con *sdp;
data_struct *db_hdl;
- s32 tmp_len;
=20
D_REC(__FUNCTION__"\n");
=20
@@ -782,27 +775,20 @@
} else
#endif
{
- tmp_len =3D len + sizeof(data_struct);
-=09
- db_hdl =3D (data_struct*) kmalloc(tmp_len, GFP_ATOMIC);
- D_MEM("---> kmalloc %d bytes at 0x%08x\n", tmp_len, (s32) db_hdl);
+ db_hdl =3D (data_struct*)database_query.query;
=20
db_hdl->sdp_con_id =3D sdp->id;
db_hdl->len =3D len;
memcpy(db_hdl->data, data, len);
-
- database_query.count =3D tmp_len;
- memcpy(database_query.query, db_hdl, tmp_len);
=20
- D_MEM("<--- kfree 0x%08x\n", (s32) db_hdl);
- kfree(db_hdl);
+ database_query.count =3D sizeof(data_struct) + len;
=20
#ifdef __KERNEL__
D_PROC("wake_up process %i (%s) awakening\n", current->pid, current->com=
m);
wake_up_interruptible(&database_wq);
D_PROC("wake_up process %i (%s) woke up\n", current->pid, current->comm);
#else
- sdp_doquery(sdp_sock, (u8*) &database_query.query, tmp_len);
+ sdp_doquery(sdp_sock, database_query.query, database_query.count);
#endif
}
}
@@ -816,8 +802,8 @@
u32 sdp_frame_len;
u32 pdu_len;
=20
- /* Since we not send any error information the pdu length is just the
- size of the error code length, whoch is two bytes */
+ /* Since we do not send any error information the pdu length is just
+ the size of the error code length, which is two bytes */
pdu_len =3D 2;
sdp_frame_len =3D SDP_HDR_SIZE + pdu_len;
=20
@@ -864,8 +850,7 @@
char * buf, s32 count)
#endif
{
-=09
- s32 tmp;
+ s32 len;
=20=09
D_PROC(__FUNCTION__" Someone is trying to read %d bytes from sdp proc-fil=
e\n",
count);
@@ -876,18 +861,23 @@
}
sti();
=20
- tmp =3D MIN(count, database_query.count);
+ len =3D MIN(count, database_query.count);
=20
#ifdef __KERNEL__
- copy_to_user(buf, database_query.query, tmp);
+ copy_to_user(buf, database_query.query, len);
#else
- memcpy(buf, database_query.query, tmp);
+ memcpy(buf, database_query.query, len);
#endif
=20
- database_query.count -=3D tmp;
- D_PROC(__FUNCTION__"Returning %d bytes\n",tmp);
+ if (database_query.count > len) {
+ memmove(database_query.query,
+ database_query.query + len,
+ database_query.count - len);
+ }
+ database_query.count -=3D len;
+ D_PROC(__FUNCTION__ " Returning %d bytes\n", len);
=20
- return tmp;
+ return len;
}
=20
#ifdef USE_NEW_PROC
|
|
From: Peter K. <pk...@us...> - 2001-03-04 15:53:40
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.132 1.133=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Corrected the indentation and cleaned up some of the code.
The diff of the modified file(s):
--- bluetooth.c 2001/03/02 21:52:15 1.132
+++ bluetooth.c 2001/03/04 15:55:03 1.133
@@ -110,15 +110,6 @@
=20
/****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-#define BT_PORT_0 /* Should be set from Config.in */
-
-#ifdef BT_PORT_0
-#define BT_PORT 0x3F8=20
-#define BT_IRQ 4
-#else
-/* ??? */
-#endif
-
#define BLUETOOTH_TYPE_DATA 1
#define BLUETOOTH_TYPE_DATA_VOICE 2
=20
@@ -131,8 +122,8 @@
=20
#ifdef BT_USEINBUFFER
=20
-/* This buffer is used decrease overruns on serial port. Copies data in in=
terrupt context
- and schedules a task which consumes data at 'safe' time */
+/* 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 */
=20
#define BT_INBUFFER_SIZE 4000
=20
@@ -163,7 +154,6 @@
static void bt_handle_indata(const __u8 *data, s32 count);
#endif
=20
-
static void bt_init_stack(void);
static s32 bt_ctrl_init(void);
static s32 bt_connect(u8 *bd_addr, u32 con_id);
@@ -189,12 +179,11 @@
/*
* LINUX 2.2.X SPECIFIC CODE
*/
-static ssize_t
-bt_tty_read(struct tty_struct *tty, struct file *file, u8 *buf, size_t nr);
+static ssize_t bt_tty_read(struct tty_struct *tty, struct file *file,
+ u8 *buf, size_t nr);
=20
-static ssize_t
-bt_tty_write(struct tty_struct *tty, struct file *file, const u8 *buf,
- size_t nr);
+static ssize_t bt_tty_write(struct tty_struct *tty, struct file *file,
+ const u8 *buf, size_t nr);
=20
static u32 bt_tty_poll(struct tty_struct *tty, struct file *file,
struct poll_table_struct *wait);
@@ -367,8 +356,6 @@
=20
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -=20
=20
-
-
*/
=20
=20
@@ -379,11 +366,9 @@
static s32
bt_open(struct tty_struct *tty, struct file * filp)
{
- s32 line;
+ s32 line =3D GET_TTYLINE(tty);
s32 ret_val;
=20=09
- line =3D GET_TTYLINE(tty);
-
BT_DRIVER("bt_open on line %d\n", line);=09
=20=09
ret_val =3D bt_register_tty(tty) ;
@@ -400,9 +385,7 @@
static void
bt_close(struct tty_struct *tty, struct file * filp)
{
- s32 line;
-
- line =3D GET_TTYLINE(tty);
+ s32 line =3D GET_TTYLINE(tty);
=20
BT_DRIVER("bt_close on line %d \n", line);
=20
@@ -415,15 +398,11 @@
MOD_DEC_USE_COUNT;
}
=20
-=20
-
static void
bt_put_char(struct tty_struct *tty, u8 ch)
{
- u8 c;
- c =3D ch;
- BT_DRIVER("bt_put_char %c\n", c);
- bt_write_top(tty, 0, &c, 1);
+ BT_DRIVER("bt_put_char %c\n", ch);
+ bt_write_top(tty, 0, &ch, 1);
}
=20
static void
@@ -438,8 +417,8 @@
static s32=20
bt_write_room(struct tty_struct *tty)
{
- s32 n;
- n=3Dbuf_write_room();
+ s32 n =3D buf_write_room();
+
BT_DRIVER("bt_write_room : %d\n", n);
return n;
}
@@ -447,19 +426,19 @@
static s32
bt_chars_in_buffer(struct tty_struct *tty)
{
- u16 n;
- n=3Dbuf_byte_count();
+ u16 n =3D buf_byte_count();
+
BT_DRIVER("bt_chars_in_buffer : %d\n", n);=20=20
return n;
}
=20
-
/* Must flush the buffer, otherwise chars_in_buffer returns nonzero
and pppd hangs on the exit while doing the set line disc ioctl */
static void
bt_flush_buffer(struct tty_struct *tty)
{
bt_tx_buf* tx_buf;
+
BT_DRIVER("bt_flush_buffer\n");
=20=09
while((tx_buf =3D get_bt_buf())){
@@ -509,39 +488,34 @@
}
=20=09
switch (cmd) {
-
case BT_SDP_REQUEST:
{
bt_sdp_request sdpRequest;
int returnValue =3D -1;
=20
- /*---------------------------------------------------------*/
+ /*-----------------------------------------------------------*/
/* Copy arguments to kernel space. */
- /*---------------------------------------------------------*/
+ /*-----------------------------------------------------------*/
BT_DRIVER(FNC"Copying arguments from user to kernel space\n");
copy_from_user(&sdpRequest, (s32*)arg, size);
=20
- /*---------------------------------------------------------*/
+ /*-----------------------------------------------------------*/
/* Now execute the request. */
- /*---------------------------------------------------------*/
+ /*-----------------------------------------------------------*/
BT_DRIVER(FNC"Executing bt_execute_sdp_request\n");
=20=20=20=20=20=20=20
- if ( (returnValue =3D bt_execute_sdp_request(&sdpRequest)) >=3D 0 )
- {
- /*---------------------------------------------------------*/
+ if ((returnValue =3D bt_execute_sdp_request(&sdpRequest)) >=3D 0) {
+ /*---------------------------------------------------*/
/* Copy the data back to user space and return. */
- /*---------------------------------------------------------*/
+ /*---------------------------------------------------*/
BT_DRIVER(FNC"Copying data back to user space\n");
copy_to_user((s32*)arg, &sdpRequest, size);
}
=20
return returnValue;
-
} /* End of BT_SDP_REQUEST */
=20
-
case BTCONNECT:
-
/* argument is an object with all info to start a remote=20
connection */
=20
@@ -559,7 +533,6 @@
return bt_disconnect(con_id);
}
=20
-
case BTWAITFORCONNECTION:
{
s32 line;
@@ -590,10 +563,7 @@
{
s32 line;=09=20=20
copy_from_user(&line, (s32*)arg, size);
- if (SESSIONSTATE(line) =3D=3D BT_LOWERCONNECTED)
- return 1;
- else
- return 0;
+ return (SESSIONSTATE(line) =3D=3D BT_LOWERCONNECTED);
}
=20=09
case BTSETSPEED:
@@ -892,8 +862,7 @@
=20
case HCIREAD_AUTHENTICATION_ENABLE:
{
- s32 result;
- result =3D hci_read_authentication_enable();
+ s32 result =3D hci_read_authentication_enable();
put_user(result, (s32*)arg);
break;
}
@@ -913,8 +882,7 @@
=20=09=09
case HCIREAD_ENCRYPTION_MODE:
{
- s32 result=3D0;
- result =3D hci_read_encryption_mode();
+ s32 result =3D hci_read_encryption_mode();
put_user(result, (s32*)arg);
break;
}
@@ -948,6 +916,7 @@
BT_DRIVER(FNC"HCIREADLOCALBDADDR\n");
=20=09=09
hci_read_local_bd(bd_addr);
+
{
BD_ADDR rev_bd;
u16 i;
@@ -1151,7 +1120,6 @@
}
#endif
=20
-
static s32
bt_tty_open (struct tty_struct *tty)
{
@@ -1223,8 +1191,7 @@
{
#define FNC "bt_write_lower_driver: "
=20
- if (len < 0) /* (!) */
- {
+ if (len < 0) { /* (!) */
D_ERR("Can't write neg length...\n");
return 0;
}
@@ -1295,27 +1262,22 @@
const u8 *buf, s32 count)
{
#define FNC "bt_write_top"
- s32 line;
+ s32 line =3D GET_TTYLINE(tty);
s32 bytes_sent;
u32 rfcomm_conid;
struct bt_session *bt;
=20=09
-=09
- line =3D GET_TTYLINE(tty);
-
BT_DATA(" |X|<-- %3d [%d]\n", count, line);
=20
bt =3D (bt_session *)tty->driver_data;
=20=09
- if ((bt->rfcomm !=3D NULL) && (bt->rfcomm->magic !=3D RFCOMM_MAGIC))
- {
+ if ((bt->rfcomm !=3D NULL) && (bt->rfcomm->magic !=3D RFCOMM_MAGIC)) {
D_ERR(FNC": rfcomm magic failed (0x%x !=3D 0x%x)\n",=20
bt->rfcomm->magic, RFCOMM_MAGIC);
return 0;
}
=20
- if (SESSIONSTATE(line) !=3D BT_ACTIVE)
- {
+ if (SESSIONSTATE(line) !=3D BT_ACTIVE) {
D_WARN("bt_write_top : line %d is not in active state\n",
line);
return 0;
@@ -1421,8 +1383,7 @@
}
=20
/* found an active */
- BT_DATA("bt_feedstack : wakeup line %d !\n",=20
- check_line);
+ BT_DATA("bt_feedstack : wakeup line %d !\n", check_line);
upper_tty =3D GET_UPPERTTY(check_line);
bt_ctrl.tty_last_unthrottled =3D check_line;
=20=09=09
@@ -1431,8 +1392,8 @@
return;
}
=20=09
- if ((upper_tty->flags & (1 << TTY_DO_WRITE_WAKEUP))
- && upper_tty->ldisc.write_wakeup) {
+ if ((upper_tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
+ upper_tty->ldisc.write_wakeup) {
BT_DATA(" |X|<<*** [%d]\n", check_line);
=20=09=09
/* TTY_DO_WRITE_WAKEUP bit is cleared in=20
@@ -1440,8 +1401,7 @@
will be able to write more data */
=20
(upper_tty->ldisc.write_wakeup)(upper_tty);
- }
- else if (!upper_tty->ldisc.write_wakeup) {=20=20=20=20=20
+ } else if (!upper_tty->ldisc.write_wakeup) {=20=20=20=20=20
/* if no wake_up function is defined (N_TTY ldisc)
wake up wait queue */
BT_DATA(" |X|<<*** [%d] (n_tty)\n", check_line);
@@ -1474,9 +1434,7 @@
/* check for overruns... */
if ( hci_data.put + count - BT_INBUFFER_SIZE >=3D hci_data.get ) {
D_ERR("bt_handle_indata : buffer overrun!\n");
- }
- else
- {
+ } else {
/* Calculate how much space there is left at the end=20
of the buffer */
free =3D hci_data.tail - hci_data.put + 1;
@@ -1484,21 +1442,18 @@
/* normal case, data fits in buffer */
if ( count < free ) {
memcpy(hci_data.put, (u8*)data, count);
- }
+ } else {
/* wrap buffer */
- else {
memcpy(hci_data.put, (u8*)data, free);
memcpy(hci_data.head, (u8*)(data + free), count - free);=20=20=20=20
}
- }
}
- else {=20
+ } else {=20
/* hci_data.put < hci_data.get */
/* check for overruns ... */
if ( hci_data.put + count >=3D hci_data.get ) {
D_ERR("bt_handle_indata: buffer overrun!\n");
- }
- else {
+ } else {
/* Copy the data to the buffer */
memcpy(hci_data.put, (u8*)data, count);
}
@@ -1520,8 +1475,7 @@
if ( hci_data.get =3D=3D hci_data.put ) {
sti();
return;
- }
- else if ( hci_data.get > hci_data.put ) {
+ } else if (hci_data.get > hci_data.put) {
/* buffer is wrapped */
size_end =3D hci_data.tail - hci_data.get + 1;
size_start =3D hci_data.put - hci_data.head;
@@ -1598,51 +1552,48 @@
int sdp_connection_id =3D -1;
int return_value;
=20
- /*------------------------------------------------------------------=
----*/
+ /*-----------------------------------------------------------*/
/* Get the line to use for SDP communication. =
*/
- /*------------------------------------------------------------------=
----*/
+ /*-----------------------------------------------------------*/
line =3D GET_SDPLINE(con_id);
=20=20=20=20=20=20=20
- /*------------------------------------------------------------------=
----*/
+ /*-----------------------------------------------------------*/
/* Check the line to assure no other connections on it. =
*/
- /*------------------------------------------------------------------=
----*/
- if ((SESSIONSTATE(line) =3D=3D BT_LOWERCONNECTED)|| (SESSIONSTATE(line) =
=3D=3D BT_ACTIVE))
- {
- D_WARN("already got connection on line %d\n", GET_SDPLINE(con_id));=20
+ /*-----------------------------------------------------------*/
+ if ((SESSIONSTATE(line) =3D=3D BT_LOWERCONNECTED) ||
+ (SESSIONSTATE(line) =3D=3D BT_ACTIVE)) {
+ D_WARN("already got connection on line %d\n",
+ GET_SDPLINE(con_id));=20
return -1;
}=20
=20
- /*------------------------------------------------------------------=
----*/
+ /*-----------------------------------------------------------*/
/* Initiate the connection. =
*/
- /*------------------------------------------------------------------=
----*/
+ /*-----------------------------------------------------------*/
BT_DRIVER(FNC"Connecting SDP on line %d\n", line);
PRINTPKT("Remote BD : ", bd_addr, 6);
- if ( (sdp_connection_id =3D sdp_connect_req(bd_addr, line)) >=3D 0 )
- {
- /*---------------------------------------------------------------=
--------*/
- /* If here, we've successfully created a SDP connection entry and=
are */
- /* starting the sequence of opening a l2cap connection. =
*/
- /* Allow the bottom half to process the request and get back to u=
s. */
- /*---------------------------------------------------------------=
--------*/
+ if ((sdp_connection_id =3D sdp_connect_req(bd_addr, line)) >=3D 0) {
+ /*---------------------------------------------------*/
+ /* If here, we have successfully created an SDP */
+ /* connection entry and are starting the sequence of */
+ /* opening an l2cap connection. Allow the bottom */
+ /* half to process the request and get back to us. */
+ /*---------------------------------------------------*/
BT_DRIVER(FNC"sleep on line %d\n", line);
interruptible_sleep_on(&bt_ctrl.connect_wq[line]);
=20
- /*---------------------------------------------------------------=
--------*/
- /* If the connect_status is >=3D 0, then the lower stack did not =
have a */
- /* problem handling the request. Therefore return the sdp_connec=
tion_id */
- /*---------------------------------------------------------------=
--------*/
+ /*---------------------------------------------------*/
+ /* If the connect_status is >=3D 0, then the lower */
+ /* stack did not have a problem handling the request.*/
+ /* Therefore return the sdp_connection_id */
+ /*---------------------------------------------------*/
BT_DRIVER(FNC"Wake up - line %d\n", line);
- if ( bt_ctrl.session[line].connect_status >=3D 0 )
- {
+ if (bt_ctrl.session[line].connect_status >=3D 0) {
return_value =3D sdp_connection_id;
- }
- else
- {
+ } else {
return_value =3D bt_ctrl.session[line].connect_status;
- }
}
- else
- {
+ } else {
return_value =3D sdp_connection_id;
}
=20
@@ -1652,6 +1603,7 @@
=20
default:=20=20=20=20
BT_DRIVER(FNC"PSM %d not supported as client\n", GET_PSM(con_id));
+ break;
}
return -1;
#undef FNC
@@ -1659,56 +1611,50 @@
=20
static s32 bt_execute_sdp_request(bt_sdp_request *sdpRequest)
{
- int line, sdpIndex;
- s32 returnValue =3D -1;
+ int line =3D GET_SDPLINE(sdpRequest->conID);
+ int sdpIndex =3D GET_SDPINDEX(sdpRequest->conID);
=20
- /*-------------------------------------------------------------*/
- /* Initiate the request. */
- /*-------------------------------------------------------------*/
- line =3D GET_SDPLINE(sdpRequest -> conID);
- sdpIndex =3D GET_SDPINDEX(sdpRequest -> conID);
- if ( SESSIONSTATE(line) =3D=3D BT_ACTIVE )
- {
- BT_DRIVER("bt_execute_sdp_request: line %d SDP index %d\n", line, sd=
pIndex);
- if ( sdpStartRequest(sdpIndex, sdpRequest->sdpCommand, sdpRequest->p=
duPayload, sdpRequest->pduLength) > 0 )
- {
+ if (SESSIONSTATE(line) !=3D BT_ACTIVE) {
+ /*-----------------------------------------------------------*/
+ /* SDP connection not active! Don't issue the request. */
+ /*-----------------------------------------------------------*/
+ BT_DRIVER("bt_execute_sdp_request: line %d does not have an active conne=
ction!\n", line);
+ return -1;
+ }
+
+ BT_DRIVER("bt_execute_sdp_request: line %d SDP index %d\n",
+ line, sdpIndex);
+ if (sdpStartRequest(sdpIndex,
+ sdpRequest->sdpCommand,
+ sdpRequest->pduPayload,
+ sdpRequest->pduLength) < 0)
+ return -1;
+
/*---------------------------------------------------------------=
----*/
/* Sleep on this line while the response is going through. =
*/
/*---------------------------------------------------------------=
----*/
printk("bt_execute_sdp_request: sleep on line %d\n", line);
interruptible_sleep_on(&bt_ctrl.connect_wq[line]);
=20
- /*---------------------------------------------------------------=
-------*/
- /* If we're back, there may be data to send back. Copy into sdpR=
equest */
- /* and return. =
*/
- /*---------------------------------------------------------------=
-------*/
- if ( bt_ctrl.session[line].sdpRequestResponseData )
- {
+ /*-------------------------------------------------------------------*/
+ /* If we're back, there may be data to send back. */
+ /* Copy into sdpRequest and return. */
+ /*-------------------------------------------------------------------*/
+ if (bt_ctrl.session[line].sdpRequestResponseData) {
BT_DRIVER("bt_execute_sdp_request: sdpRequestResponseData 0x%x=
- copying\n", (int)bt_ctrl.session[line].sdpRequestResponseData);
- memcpy(sdpRequest->requestResponse, bt_ctrl.session[line].sdpR=
equestResponseData,=20
+ memcpy(sdpRequest->requestResponse,
+ bt_ctrl.session[line].sdpRequestResponseData,=20
bt_ctrl.session[line].sdpRequestResponseDataLength);
sdpRequest->responseLength =3D bt_ctrl.session[line].sdpReques=
tResponseDataLength;
}
- returnValue =3D 1;
- }
- }
- else
- {
- /*-----------------------------------------------------------*/
- /* SDP connection not active! Don't issue the request. */
- /*-----------------------------------------------------------*/
- BT_DRIVER("bt_execute_sdp_request: line %d does not have an active c=
onnection!\n", line);
- }
-
- return returnValue;
=20
+ return 0;
} /* End of bt_execute_sdp_request() */
=20
void
bt_connect_ind(u32 con_id)=20
{
- DSYS("Got connect indication on PSM %d\n",=20
- GET_PSM(con_id));
+ DSYS("Got connect indication on PSM %d\n", GET_PSM(con_id));
}
=20
void
@@ -1722,7 +1668,6 @@
=20=09
switch (psm) {
case RFCOMM_LAYER:
- {=09
BT_DRIVER("bt_connect_cfm [%s]\n", psmname(psm));
line =3D GET_RFCOMMLINE(con_id);
CHECK_RFCOMM(con_id);
@@ -1734,30 +1679,28 @@
}
=20
bt_ctrl.session[line].connect_status =3D status;
- BT_DRIVER("bt_connect_cfm, line %d [%s]\n", GET_RFCOMMLINE(con_id), psmn=
ame(psm));
+ BT_DRIVER("bt_connect_cfm, line %d [%s]\n",
+ GET_RFCOMMLINE(con_id), psmname(psm));
release_wq_timer(&bt_timer);
wake_up_interruptible(&bt_ctrl.connect_wq[line]);
wake_up_interruptible(&bt_ctrl.any_wq);
break;
- }
=20=09
case SDP_LAYER:
- {
BT_DRIVER("bt_connect_cfm [%s]\n", psmname(psm));
line =3D GET_SDPLINE(con_id);
=20
- /*---------------------------------------------------------------*/
+ /*-----------------------------------------------------------*/
/* Check incomming line for validity. */
- /*---------------------------------------------------------------*/
- if ( (line < 0) || (line > BT_NBR_DATAPORTS))
- {
+ /*-----------------------------------------------------------*/
+ if ( (line < 0) || (line > BT_NBR_DATAPORTS)) {
D_ERR("bt_connect_cfm on invalid line (%d)\n", line);
return;
}
=20
- /*---------------------------------------------------------------*/
+ /*-----------------------------------------------------------*/
/* Record the connection status for bt_connect() to process. */
- /*---------------------------------------------------------------*/
+ /*-----------------------------------------------------------*/
bt_ctrl.session[line].connect_status =3D status;
BT_DRIVER("bt_connect_cfm, line %d [%s]\n", GET_SDPLINE(con_id), psmname=
(psm));
printk("wake up line %d\n", line);
@@ -1765,11 +1708,11 @@
wake_up_interruptible(&bt_ctrl.connect_wq[line]);
wake_up_interruptible(&bt_ctrl.any_wq);
break;
- }
=20=09=09
case TCS_LAYER:
BT_DRIVER("bt_connect_cfm [%s]\n", psmname(psm));
break;
+
default:
D_ERR("bt_connect_cfm : unknown layer %d\n", psm);
break;
@@ -1781,8 +1724,7 @@
/*----------------------------------------------------------*/
/* Check the line for validity. */
/*----------------------------------------------------------*/
- if (line > BT_NBR_DATAPORTS)=20
- {
+ if (line > BT_NBR_DATAPORTS) {
D_ERR("bt_connect_cfm on invalid line (%d)\n", line);
return;
}
@@ -1796,8 +1738,7 @@
/*----------------------------------------------------------*/
/* If previous data, deallocate it. */
/*----------------------------------------------------------*/
- if ( bt_ctrl.session[line].sdpRequestResponseData )
- {
+ if (bt_ctrl.session[line].sdpRequestResponseData) {
D_WARN("bt_send_sdp_data_received: sdpRequestResponseData set - deal=
locate\n");
kfree(bt_ctrl.session[line].sdpRequestResponseData);
bt_ctrl.session[line].sdpRequestResponseData =3D NULL;
@@ -1808,7 +1749,6 @@
bt_ctrl.session[line].sdpRequestResponseDataLength =3D len;
wake_up_interruptible(&bt_ctrl.connect_wq[line]);
return;
-
} /* End of bt_send_sdp_data_received() */
=20
static s32 bt_disconnect(u32 con_id)
@@ -1832,14 +1772,14 @@
void
bt_disconnect_ind(u32 con_id)=20
{
- DSYS("Got disconnect indication on PSM %d\n",=20
- GET_PSM(con_id));
+ DSYS("Got disconnect indication on PSM %d\n",GET_PSM(con_id));
}
=20
void
bt_disconnect_cfm(u32 con_id, s32 status)=20
{
u32 line =3D GET_RFCOMMLINE(con_id);
+
DSYS("Got disconnect confirm on PSM %d status %d\n",=20
GET_PSM(con_id), status);
wake_up_interruptible(&bt_ctrl.connect_wq[line]);
@@ -1887,7 +1827,6 @@
}
#endif
=20
-
/**********************************/
/* Bluetooth Stack Initialization */
/**********************************/
@@ -1899,7 +1838,6 @@
s32 status;
s32 procfs_status =3D -1;
=20=09
-
show_bt_version();
=20
/* Initialize the tty_driver structure */
@@ -1985,17 +1923,19 @@
sertty =3D NULL;
=20
#ifdef BT_USE_PROC
-
DSYS("Registering BT proc files\n");
=20=20
#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
procfs_status =3D -1;
- if ( create_proc_info_entry(bt_status.name, bt_status.mode, &proc_root,=
bt_status.get_info) )
+ if (create_proc_info_entry(bt_status.name,
+ bt_status.mode,
+ &proc_root,
+ bt_status.get_info))
procfs_status =3D 1;
}
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) && (LINUX_VERSION_CODE =
> KERNEL_VERSION(2,2,0))
+#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,2,0)
procfs_status =3D proc_register(&proc_root, &bt_status);
#else
procfs_status =3D proc_register_dynamic(&proc_root, &bt_status);
@@ -2014,10 +1954,13 @@
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
procfs_status =3D -1;
- if ( create_proc_info_entry(bt_internal_info.name, bt_internal_info.mod=
e, &proc_root, bt_internal_info.get_info) )
+ if (create_proc_info_entry(bt_internal_info.name,
+ bt_internal_info.mode,
+ &proc_root,
+ bt_internal_info.get_info))
procfs_status =3D 1;
}
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) && (LINUX_VERSION_CODE =
> KERNEL_VERSION(2,2,0))
+#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,2,0)
procfs_status =3D proc_register(&proc_root, &bt_internal_info);
#else
procfs_status =3D proc_register_dynamic(&proc_root, &bt_internal_info);
@@ -2036,18 +1979,19 @@
{
struct proc_dir_entry *entry;
procfs_status =3D -1;
- if ( (entry =3D create_proc_entry(sdp_proc_entry.name, sdp_proc_entry.m=
ode, &proc_root)) )
- {
- /*------------------------------------------------------------*/
- /* If the proc entry was registered successfully, then set */
- /* all the necessary structure information. */
- /*------------------------------------------------------------*/
+ if ((entry =3D create_proc_entry(sdp_proc_entry.name,
+ sdp_proc_entry.mode,
+ &proc_root))) {
+ /*---------------------------------------------------*/
+ /* If the proc entry was registered successfully, */
+ /* then set all the necessary structure information. */
+ /*---------------------------------------------------*/
entry->proc_iops =3D sdp_proc_entry.proc_iops;
entry->proc_fops =3D sdp_proc_entry.proc_fops;
procfs_status =3D 1;
}
}
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) && (LINUX_VERSION_CODE =
> KERNEL_VERSION(2,2,0))
+#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,2,0)
procfs_status =3D proc_register(&proc_root, &sdp_proc_entry);
#else
procfs_status =3D proc_register_dynamic(&proc_root, &sdp_proc_entry);
@@ -2067,19 +2011,20 @@
{
struct proc_dir_entry *entry;
procfs_status =3D -1;
- if ( (entry =3D create_proc_entry(sec_man_proc_entry.name, sec_man_proc=
_entry.mode, &proc_root)) )
- {
- /*------------------------------------------------------------*/
- /* If the proc entry was registered successfully, then set */
- /* all the necessary structure information. */
- /*------------------------------------------------------------*/
+ if ((entry =3D create_proc_entry(sec_man_proc_entry.name,
+ sec_man_proc_entry.mode,
+ &proc_root))) {
+ /*---------------------------------------------------*/
+ /* If the proc entry was registered successfully, */
+ /* then set all the necessary structure information. */
+ /*---------------------------------------------------*/
entry->proc_iops =3D sec_man_proc_entry.proc_iops;
entry->proc_fops =3D sec_man_proc_entry.proc_fops;
entry->get_info =3D sec_man_proc_entry.get_info;
procfs_status =3D 1;
}
}
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) && (LINUX_VERSION_CODE =
> KERNEL_VERSION(2,2,0))
+#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,2,0)
procfs_status =3D proc_register(&proc_root, &sec_man_proc_entry);
#else
procfs_status =3D proc_register_dynamic(&proc_root, &sec_man_proc_entry);
@@ -2098,10 +2043,13 @@
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
procfs_status =3D -1;
- if ( create_proc_info_entry(bt_proc_doit.name, bt_proc_doit.mode, &proc=
_root, bt_proc_doit.get_info) )
+ if (create_proc_info_entry(bt_proc_doit.name,
+ bt_proc_doit.mode,
+ &proc_root,
+ bt_proc_doit.get_info))
procfs_status =3D 1;
}
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) && (LINUX_VERSION_CODE =
> KERNEL_VERSION(2,2,0))
+#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,2,0)
procfs_status =3D proc_register(&proc_root, &bt_proc_doit);
#else
procfs_status =3D proc_register_dynamic(&proc_root, &bt_proc_doit);
@@ -2121,10 +2069,13 @@
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
procfs_status =3D -1;
- if ( create_proc_info_entry(tci_proc_entry.name, tci_proc_entry.mode, &=
proc_root, tci_proc_entry.get_info) )
+ if (create_proc_info_entry(tci_proc_entry.name,
+ tci_proc_entry.mode,
+ &proc_root,
+ tci_proc_entry.get_info))
procfs_status =3D 1;
}
-#elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)) && (LINUX_VERSION_CODE =
> KERNEL_VERSION(2,2,0))
+#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,2,0)
procfs_status =3D proc_register(&proc_root, &tci_proc_entry);
#else
procfs_status =3D proc_register_dynamic(&proc_root, &tci_proc_entry);
@@ -2162,7 +2113,6 @@
return bt_stack_initiated;
}
=20
-
void
bt_init_stack()
{
@@ -2233,8 +2183,7 @@
if ((line!=3Dtty_linebuf.line) && (tty_linebuf.line!=3DTTY_NOLINE)) {
D_ERR("Line %d not active and linebuf busy, silent discard...\n", line);
return;
- }
- else if (tty_linebuf.line =3D=3D TTY_NOLINE)
+ } else if (tty_linebuf.line =3D=3D TTY_NOLINE)
tty_linebuf.line =3D line;
=20
/* is there room for data ? */
@@ -2263,8 +2212,7 @@
NULL, tty_linebuf.cur_len);=20=20
=20
bt_reset_linebuf();
- }
- else
+ } else
DSYS("bt_linebuf_empty : no data sent\n");
}
#endif /* BT_USELINEBUF */
@@ -2329,7 +2277,6 @@
}
}
=20
-
s32 bt_sprintf_status(u8 *buf)
{
s32 pos =3D 0;
@@ -2363,17 +2310,13 @@
s32
bt_register_rfcomm(struct rfcomm_con *rfcomm, u8 dlci)
{
- s32 line;
+ s32 line =3D rfcomm->line;
s32 found =3D -1;
=20
- line =3D rfcomm->line;
-=09
if ((SESSIONSTATE(line) =3D=3D BT_INACTIVE) ||=20
- (SESSIONSTATE(line) =3D=3D BT_UPPERCONNECTED))=20
- {
+ (SESSIONSTATE(line) =3D=3D BT_UPPERCONNECTED)) {
/* now register ! */
- DSYS("bt_register_rfcomm : dlci %d on line %d\n",=20
- dlci, line);
+ DSYS("bt_register_rfcomm : dlci %d on line %d\n", dlci, line);
=20=09=09
bt_ctrl.session[line].rfcomm =3D rfcomm;=20
bt_ctrl.session[line].dlci =3D dlci;
@@ -2397,8 +2340,7 @@
{
s32 found =3D 0;
=20
- if (!bt_stack_initiated)
- {
+ if (!bt_stack_initiated) {
D_WARN("bt_register_sdp : Bluetooth stack not initialized\n");
return -1;=09
}
@@ -2406,13 +2348,11 @@
/*-------------------------------------------------------------*/
/* Better not have any sdp data pending for this connection */
/*-------------------------------------------------------------*/
- if ( bt_ctrl.session[line].sdpRequestResponseData )
- {
+ if (bt_ctrl.session[line].sdpRequestResponseData) {
D_WARN("bt_register_sdp: Pending SDP data for this new connection @ =
line %d\n", line);
}
=20
- if ( SESSIONSTATE(line) =3D=3D BT_INACTIVE )
- {
+ if (SESSIONSTATE(line) =3D=3D BT_INACTIVE) {
/* now register ! */
DSYS("bt_register_sdp : line %d\n", line);
SESSIONSTATE(line) =3D BT_ACTIVE;
@@ -2441,11 +2381,9 @@
BT_DRIVER("Upper tty still open...\n");
SESSIONSTATE(line) =3D BT_UPPERCONNECTED;
NBR_ACTIVE--;
- }
- else if (SESSIONSTATE(line) =3D=3D BT_LOWERCONNECTED) {
+ } else if (SESSIONSTATE(line) =3D=3D BT_LOWERCONNECTED) {
bt_reset_session(line);
- }
- else {
+ } else {
D_WARN("bt_unregister_rfcomm : inactive session\n");
return -1;
}
@@ -2456,26 +2394,24 @@
{
BT_DRIVER("bt_unregister_sdp : line %d\n", line);=09
=20
- if (!bt_stack_initiated)
- {
+ if (!bt_stack_initiated) {
D_WARN("bt_unregister_sdp : Bluetooth stack not initialized\n");
return -1;=09
}
=20
- /*---------------------------------------------------------------------=
*/
- /* Part of unregistering SDP is to deallocate any sdp request response =
*/
- /* data AND clear length and pointer. =
*/=20
- /*---------------------------------------------------------------------=
*/
- if ( bt_ctrl.session[line].sdpRequestResponseData )
- {
- DSYS("bt_unregister_sdp: Free request data 0x%x\n", (unsigned int)bt=
_ctrl.session[line].sdpRequestResponseData);
+ /*-------------------------------------------------------------------*/
+ /* Part of unregistering SDP is to deallocate any sdp request */
+ /* response data AND clear length and pointer. */
+ /*-------------------------------------------------------------------*/
+ if (bt_ctrl.session[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;
}
=20
- if (SESSIONSTATE(line) =3D=3D BT_ACTIVE)=20
- {
+ if (SESSIONSTATE(line) =3D=3D BT_ACTIVE) {
SESSIONSTATE(line) =3D BT_INACTIVE;
bt_ctrl.session[line].sdpID =3D -1;
}
@@ -2486,15 +2422,12 @@
s32
bt_register_tty(struct tty_struct *tty)
{
- s32 line;
-
- line =3D GET_TTYLINE(tty);
+ s32 line =3D GET_TTYLINE(tty);
=20=20
DSYS("Registering tty on line %d\n", line);
=20=09
/* Allow multiple open for ttyBTC */
if (line =3D=3D (BT_NBR_PORTS-1)) {
-
NBR_CTRL_FDS++;
=20=09=09
DSYS("Now %d open fd:s for ttyBTC\n",=20
@@ -2511,7 +2444,6 @@
=20
if ((SESSIONSTATE(line) =3D=3D BT_LOWERCONNECTED) ||
(SESSIONSTATE(line) =3D=3D BT_INACTIVE)) {
-=09=09
NBR_UPPER++;
bt_ctrl.session[line].upper_tty =3D tty;
tty->driver_data =3D &bt_ctrl.session[line];
@@ -2581,8 +2513,7 @@
=20
/* disconnect all active connections */
for (i =3D 0; i < BT_NBR_DATAPORTS;i++) {
-=09=09
- bt =3D &(bt_ctrl.session[i]);
+ bt =3D &bt_ctrl.session[i];
if ((bt->state =3D=3D BT_ACTIVE) ||=20
(bt->state =3D=3D BT_LOWERCONNECTED)) {
DSYS("Disconnecting dlci %d on line %d\n",=20
@@ -2593,7 +2524,6 @@
}
}
=20
-=09
rfcomm_close();
sdp_shutdown();
tcs_shutdown();
@@ -2611,7 +2541,6 @@
#endif
}
=20
-
static inline s32
bt_paranoia_check(struct tty_driver *bt_tty, kdev_t device, const u8 *rout=
ine)
{
@@ -2654,7 +2583,8 @@
start_wq_timer(struct timer_list *wq_timer,
u32 timeout, wait_queue_head_t *wq)
#else
-void start_wq_timer(struct timer_list *wq_timer,
+void
+start_wq_timer(struct timer_list *wq_timer,
u32 timeout, struct wait_queue **wq)
#endif /* LINUX_VERSION_CODE */
{
@@ -2684,7 +2614,7 @@
wake_up_interruptible(wq);
}
=20
-/************************ MODULE STUFF ***********************************=
*****/
+/************************ MODULE STUFF ***********************************=
***/
#ifdef MODULE
s32
init_module(void)
|
|
From: Peter K. <pk...@us...> - 2001-03-04 15:47:59
|
The following file was modified in apps/bluetooth/btd:
Name Old version New version Comment
---- ----------- ----------- -------
btd.c 1.81 1.82=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
No longer needed to pass any arguments to sdp_server. The default
values should work.
The diff of the modified file(s):
--- btd.c 2001/03/01 10:36:22 1.81
+++ btd.c 2001/03/04 15:49:23 1.82
@@ -281,7 +281,9 @@
static int open_socket(char *name, int role);
=20
static int sdpsrv_pid =3D 0;
+#ifndef BTD_USERSTACK
static void start_sdp_server(void);
+#endif
=20
/* misc */
#ifndef BTD_USERSTACK
@@ -859,25 +861,21 @@
}
}
=20
+#ifndef BTD_USERSTACK
static void start_sdp_server(void)
{
-#ifndef BTD_USERSTACK
- char *args[] =3D { SDPSRV_CMD, "/etc/sdp.xml", "/proc/sdp_srv", NULL };
-#else=20
- char *args[] =3D { SDPSRV_CMD, "/etc/sdp.xml", NULL };
-#endif
-=20=20
syslog(LOG_INFO, "Starting SDP server\n");
=20=20=20
if (!(sdpsrv_pid =3D vfork()))
{
- execvp(SDPSRV_CMD, args);
+ execlp(SDPSRV_CMD, SDPSRV_CMD);
=20
fprintf(stderr, "%s: no such file or directory\n", SDPSRV_CMD);
=20
_exit(0);
}
}
+#endif
=20
static void start_pppd(void)
{
|
|
From: Peter K. <pk...@us...> - 2001-03-04 15:44:45
|
The following files were modified in apps/bluetooth/sdp_server:
Name Old version New version Comment
---- ----------- ----------- -------
sdp_parser.c 1.9 1.10=20=20=20=20=20=20=20=20=20=20=20=20
sdp_parser.h 1.2 1.3=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Made the SDP server wait until the stack is initiated before it
tries to read from the /proc/sdp_srv file. This was necessitated
by the change of how the wait queue is initialised in the stack.
* Unified the main() function for both kernel and user mode.
* Some minor code clean-ups.
The diff of the modified file(s):
--- sdp_parser.c 2001/02/27 15:32:14 1.9
+++ sdp_parser.c 2001/03/04 15:46:08 1.10
@@ -51,6 +51,7 @@
#include <unistd.h>
#include <sys/socket.h>
#include <sys/un.h>
+#include <sys/ioctl.h>
=20
#include "sdp_server.h"
#include "sdp_parser.h"
@@ -65,7 +66,6 @@
#define SDP_PRINT_DATA 0
=20
#ifdef BTD_USERSTACK
-
#define syslog(x, fmt...) printf(fmt)
#endif
=20
@@ -121,6 +121,9 @@
#define UUID32_HDR 0x1a
#define UUID128_HDR 0x1c
=20
+#define BT_IOC_MAGIC 'B'
+#define BTISINITIATED _IOR(BT_IOC_MAGIC, 0x09, unsigned int)
+
/****************** TYPE DEFINITION SECTION ******************************=
***/
=20
/****************** LOCAL FUNCTION DECLARATION SECTION *******************=
***/
@@ -185,7 +188,8 @@
switch (id)
{
case SDP_ERROR_RSP:
- switch (CHAR2INT16(db_hdl->data[5], db_hdl->data[6])) {
+ switch (CHAR2INT16(db_hdl->data[5], db_hdl->data[6]))
+ {
case 0x0001: D_ERR(FNC"Got Invalid/unsupported SDP version\n");
break;
case 0x0002: D_ERR(FNC"Got Invalid Service Record Handle\n");
@@ -275,7 +279,8 @@
cur_pos +=3D *new_pos;
D_MISC(FNC"des_len: %d, new_pos:%d\n",des_len, *new_pos);
=20=09
- if (des_len > (len - DES_HDR_LEN)) {
+ if (des_len > (len - DES_HDR_LEN))
+ {
D_REC(FNC"Incorrect packet: Incorrect length field or whole packet was=
not received\n");
/* Send an error msg with error code Invalid request syntax */
send_error_rsp(sdp_con_id, trans_id, 3);
@@ -286,7 +291,8 @@
i =3D 0;
while (tmp_pos < des_len)
{
- if (i >=3D 12) {
+ if (i >=3D 12)
+ {
D_REC(FNC"More than 12 UUID in one request\n");
/* Send an error msg with error code Invalid request
syntax */
@@ -556,7 +562,8 @@
cur_pos +=3D *new_pos;
D_MISC(FNC"des_len: %d, new_pos:%d\n",des_len, *new_pos);
=20=09
- if (des_len > (len - DES_HDR_LEN)) {
+ if (des_len > (len - DES_HDR_LEN))
+ {
D_REC(FNC"Incorrect packet: Incorrect length field or whole packet was=
not received\n");
/* Send an error msg with error code Invalid request syntax */
send_error_rsp(sdp_con_id, trans_id, 3);
@@ -565,7 +572,8 @@
=20=20=20
tmp_pos =3D 0;
i =3D 0;
- while (tmp_pos < des_len) {
+ while (tmp_pos < des_len)
+ {
if (i >=3D 12)
{
D_REC(FNC"More than 12 UUID in one request\n");
@@ -822,52 +830,54 @@
}
=20
#ifndef BTD_USERSTACK
-int
-main(int argc, char **argv)
+static void
+wait_till_stack_is_initiated()
{
- char *xml_file, *proc_file;
- int len, i;
- int xml_fd;
- char buf[256];
- char *arg[2];
-
- arg[0] =3D "/etc/sdp.xml";
- arg[1] =3D "/proc/sdp_srv";
+ int bt_cfd;
+ int stack_initiated =3D 0;
=20
- if (argc > 3) {
- fprintf(stderr, "Syntax: sdp_server <xml_file> <proc_file>\n");
+ if ((bt_cfd =3D open("/dev/ttyBTC", O_RDWR, 0)) < 0)
+ {
+ perror("Can't open TTY");
exit(1);
}
=20=20=20
- for (i =3D 1; i < argc; i ++)
+ while (!stack_initiated)
{
- arg[i - 1] =3D argv[i];
+ if (ioctl(bt_cfd, BTISINITIATED, &stack_initiated) < 0)
+ {
+ perror("Checking BT stack initiated");
+ exit(1);
}
-=20=20
- xml_file =3D arg[0];
- proc_file =3D arg[1];
+ if (!stack_initiated)
+ {
+ sleep(1);
+ }
+ }
=20=20=20
- xml_fd =3D open(xml_file, O_RDONLY);
- if(xml_fd < 0) {
- perror(xml_file);
- exit(1);
+ close(bt_cfd);
}
=20
- init_sdp_server(xml_fd);
+void
+start_srvsock(char *name)
+{
+ wait_till_stack_is_initiated();
=20=20=20
- stack_if_fd =3D open(proc_file, O_RDWR);
- if(stack_if_fd < 0) {
- perror(proc_file);
+ stack_if_fd =3D open(name, O_RDWR);
+ if (stack_if_fd < 0)
+ {
+ perror("Could not open proc file");
exit(1);
}
=20
while (1)
{
- len =3D read(stack_if_fd, buf, 256);
+ char buf[256];
+ int len =3D read(stack_if_fd, buf, 256);
=20=20=20=20=20
if (len < 0)
{
- fprintf(stderr, "Error, len:%d\n",len);
+ perror("Read error");
}
else if (len =3D=3D 0)
{
@@ -878,8 +888,6 @@
sdp_parse_data(buf, len);
}
}
-
- return 0;
}
=20
#else
@@ -901,7 +909,7 @@
=20=20=20=20=20
if (FD_ISSET(clnt_fd, &rfd))
{
- int len =3D read(clnt_fd, &databuf, 256);
+ int len =3D read(clnt_fd, databuf, 256);
=20=20=20=20=20=20=20
if (len > 0)
{
@@ -927,7 +935,6 @@
int sdp_srv_sock;
int sdp_clnt_sock;
=20
-
syslog(LOG_INFO, "Opening server socket %s\n", name);
=20
/* remove any old socket */
@@ -950,8 +957,9 @@
syslog(LOG_INFO, "SDP Server listens...\n");
listen(sdp_srv_sock, 5);
=20=20=20=20=20
- sdp_clnt_sock =3D accept(sdp_srv_sock,=20
- (struct sockaddr*) &(client_address), &client_len=
);
+ client_len =3D sizeof(client_address);
+ sdp_clnt_sock =3D
+ accept(sdp_srv_sock, (struct sockaddr*)&client_address, &client_len);
=20
stack_if_fd =3D sdp_clnt_sock;
=20=20=20=20=20
@@ -959,36 +967,36 @@
close(sdp_clnt_sock);
}
}
+#endif /* BTD_USERSTACK */
=20
int
main(int argc, char **argv)
{
char *xml_file;
+ char *proc_file;
int xml_fd;
=20=20=20
- if (argc !=3D 2)
+ if (argc > 3)
{
- fprintf(stderr, "Syntax: sdp_server <xml_file>\n");
+ fprintf(stderr, "Syntax: sdp_server [<xml file> [<proc file>]]\n");
exit(1);
}
- else
- {
- xml_file =3D argv[1];
- }
=20=20=20=20=20
+ xml_file =3D (argc >=3D 2 ? argv[1] : SDP_XML_FILE);
+ proc_file =3D (argc >=3D 3 ? argv[2] : SDP_PROC_FILE);
+=20=20
xml_fd =3D open(xml_file, O_RDONLY);
- if(xml_fd < 0) {
- perror(xml_file);
+ if (xml_fd < 0)
+ {
+ perror("Could not open xml file");
exit(1);
}
=20
init_sdp_server(xml_fd);
=20
- start_srvsock(SDP_SRV_SOCK);
+ start_srvsock(proc_file);
=20
- return 0;
+ exit(0);
}
-
-#endif /* BTD_USERSTACK */
=20
/****************** END OF FILE sdp_parser.c *****************************=
***/
--- sdp_parser.h 2001/02/15 16:31:02 1.2
+++ sdp_parser.h 2001/03/04 15:46:08 1.3
@@ -46,7 +46,12 @@
=20
/****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-#define SDP_SRV_SOCK "/tmp/sdp_sock"
+#define SDP_XML_FILE "/etc/sdp.xml"
+#ifndef BTD_USERSTACK
+#define SDP_PROC_FILE "/proc/sdp_srv"
+#else
+#define SDP_PROC_FILE "/tmp/sdp_sock"
+#endif
=20
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
@@ -64,6 +69,7 @@
((unsigned int)((c2) & 0xff) << 16) + \
((unsigned int)((c1) & 0xff) << 8) + \
(unsigned int)((c0) &0xff))
+
/****************** TYPE DEFINITION SECTION ******************************=
***/
=20
typedef struct data_struct {
|
|
From: Peter K. <pk...@us...> - 2001-03-04 13:03:12
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- sdp.c 1.62 1.63=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Corrected indentation. Made local functions static. |
|
From: Marcus A. S. <mar...@us...> - 2001-03-04 05:25:23
|
The following files were modified in apps/bluetooth/BluetoothPN:
Name Old ver=
sion New version Comment
---- -------=
---- ----------- -------
apps/bluetooth/BluetoothPN/BluetoothPN.cxx =
Added
apps/bluetooth/BluetoothPN/BluetoothPN.h =
Added
apps/bluetooth/BluetoothPN/Makefile =
Added
apps/bluetooth/BluetoothPN/README =
Added
apps/bluetooth/BluetoothPN/fltk/Fl_Toggle_Node.cxx =
Added
apps/bluetooth/BluetoothPN/fltk/Fl_Toggle_Node_Base.cxx =
Added
apps/bluetooth/BluetoothPN/fltk/Fl_Toggle_Tree.cxx =
Added
apps/bluetooth/BluetoothPN/fltk/Fl_Toggle_Tree_Base.cxx =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/Fl_Toggle_Button.H =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/Fl_Toggle_Light_Button.H =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/Fl_Toggle_Node.H =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/Fl_Toggle_Node_Base.H =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/Fl_Toggle_Round_Button.H =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/Fl_Toggle_Tree.H =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/Fl_Toggle_Tree_Base.H =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/bluetooth.xpm =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/closed_icon.xpm =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/file_small.xpm =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/folder_small.xpm =
Added
apps/bluetooth/BluetoothPN/fltk/include/FL/open_icon.xpm =
Added
apps/bluetooth/BluetoothPN/main.cxx =
Added
The accompanying log:
Checking in the Bluetooth Piconet Neighborhood FLTK application.
|
|
From: Marcus A. S. <mar...@us...> - 2001-03-04 05:14:45
|
The following files were modified in BluetoothPN/fltk/include/FL: Name Old version New version Comment ---- ----------- ----------- ------- Fl_Toggle_Button.H 1.1.1.1 Removed Fl_Toggle_Light_Button.H 1.1.1.1 Removed Fl_Toggle_Node.H 1.1.1.1 Removed Fl_Toggle_Node_Base.H 1.1.1.1 Removed Fl_Toggle_Round_Button.H 1.1.1.1 Removed Fl_Toggle_Tree.H 1.1.1.1 Removed Fl_Toggle_Tree_Base.H 1.1.1.1 Removed bluetooth.xpm 1.1.1.1 Removed closed_icon.xpm 1.1.1.1 Removed file_small.xpm 1.1.1.1 Removed folder_small.xpm 1.1.1.1 Removed open_icon.xpm 1.1.1.1 Removed The accompanying log: Screwed up an import. Removing evidence. |
|
From: Marcus A. S. <mar...@us...> - 2001-03-04 05:14:45
|
The following files were modified in BluetoothPN/fltk: Name Old version New version Comment ---- ----------- ----------- ------- Fl_Toggle_Node.cxx 1.1.1.1 Removed Fl_Toggle_Node_Base.cxx 1.1.1.1 Removed Fl_Toggle_Tree.cxx 1.1.1.1 Removed Fl_Toggle_Tree_Base.cxx 1.1.1.1 Removed The accompanying log: Screwed up an import. Removing evidence. |
|
From: Marcus A. S. <mar...@us...> - 2001-03-04 05:14:44
|
The following files were modified in BluetoothPN: Name Old version New version Comment ---- ----------- ----------- ------- BluetoothPN.cxx 1.1.1.1 Removed BluetoothPN.h 1.1.1.1 Removed Makefile 1.1.1.1 Removed README 1.1.1.1 Removed main.cxx 1.1.1.1 Removed The accompanying log: Screwed up an import. Removing evidence. |
|
From: Marcus A. S. <mar...@us...> - 2001-03-04 05:05:39
|
The following files were modified in BluetoothPN:
Name Old version New ve=
rsion Comment
---- ----------- ------=
----- -------
BluetoothPN/BluetoothPN.cxx =
Added
BluetoothPN/BluetoothPN.h =
Added
BluetoothPN/Makefile =
Added
BluetoothPN/README =
Added
BluetoothPN/fltk/Fl_Toggle_Node.cxx =
Added
BluetoothPN/fltk/Fl_Toggle_Node_Base.cxx =
Added
BluetoothPN/fltk/Fl_Toggle_Tree.cxx =
Added
BluetoothPN/fltk/Fl_Toggle_Tree_Base.cxx =
Added
BluetoothPN/fltk/include/FL/Fl_Toggle_Button.H =
Added
BluetoothPN/fltk/include/FL/Fl_Toggle_Light_Button.H =
Added
BluetoothPN/fltk/include/FL/Fl_Toggle_Node.H =
Added
BluetoothPN/fltk/include/FL/Fl_Toggle_Node_Base.H =
Added
BluetoothPN/fltk/include/FL/Fl_Toggle_Round_Button.H =
Added
BluetoothPN/fltk/include/FL/Fl_Toggle_Tree.H =
Added
BluetoothPN/fltk/include/FL/Fl_Toggle_Tree_Base.H =
Added
BluetoothPN/fltk/include/FL/bluetooth.xpm =
Added
BluetoothPN/fltk/include/FL/closed_icon.xpm =
Added
BluetoothPN/fltk/include/FL/file_small.xpm =
Added
BluetoothPN/fltk/include/FL/folder_small.xpm =
Added
BluetoothPN/fltk/include/FL/open_icon.xpm =
Added
BluetoothPN/main.cxx =
Added
The accompanying log:
Import Bluetooth Piconet Neighborhood into apps/bluetooth directory.
|
|
From: Peter K. <pk...@us...> - 2001-03-03 15:33:26
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.14 1.15=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Should work with both 2.0.x and 2.2.x as well as 2.4.x kernel builds now. The diff of the modified file(s): --- Makefile 2001/03/02 21:10:41 1.14 +++ Makefile 2001/03/03 15:34:47 1.15 @@ -2,14 +2,30 @@ # Makefile for the Bluetooth device driver. # =20 +# This would have worked had it not been for test.c which is not to be +# included by default +#OBJS =3D $(patsubst %.c, %.o, $(wildcard *.c)) + +OBJS =3D bluetooth.o bt_proc.o btdebug.o btmem.o hci.o hci_vendor.o \ + l2cap.o l2cap_con.o l2cap_sec.o rfcomm.o rfcomm_sec.o \ + sec_client.o sdp.o tcs.o=20 =20 ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make)) =20 #--------------------------------------------------------------------- -# Kernel makefile rules (2.4.x) +# Kernel makefile rules. They should work with both old style makefiles +# for 2.0.x and 2.2.x, and with the new style makefiles from 2.4.x #--------------------------------------------------------------------- + O_TARGET :=3D bt.o -obj-$(CONFIG_BLUETOOTH) +=3D $(patsubst %.c, %.o, $(wildcard *.c)) + +# For 2.4.x +obj-$(CONFIG_BLUETOOTH) +=3D $(OBJS) + +# For 2.0.x and 2.2.x +O_OBJS =3D $(OBJS) +M_OBJS =3D $(O_TARGET) + include $(TOPDIR)/Rules.make =20 else @@ -18,17 +34,19 @@ # Standalone makefile rules #--------------------------------------------------------------------- =20 +# The INCLUDEDIR variable allows LSB compliant distros to be able to compi= le +# the module correctly. Use 'make INCLUDEDIR=3D/usr/src/linux/include' whe= re +# /usr/src/linux/include is the directory that was used to build the kerne= l. +INCLUDEDIR =3D /usr/include + O_TARGET :=3D bt.o -O_OBJS =3D bluetooth.o btdebug.o btmem.o hci.o l2cap.o rfcomm.o sdp.o t= cs.o bt_proc.o hci_vendor.o l2cap_con.o sec_client.o l2cap_sec.o rfcomm_sec= .o -M_OBJS =3D $(O_TARGET) =20 -INCLUDEDIR =3D /usr/include MODFLAGS =3D -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h CFLAGS =3D -D__KERNEL__ -DMODULE -I../../../include -I$(INCLUDEDIR) -Wal= l -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce $(MODFL= AGS) =20 all: $(O_TARGET) =20 -$(O_TARGET): $(O_OBJS) +$(O_TARGET): $(OBJS) $(LD) -r -o $@ $^ =20 install: all |
|
From: Peter K. <pk...@us...> - 2001-03-03 15:31:39
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- sec_client.c 1.11 1.12=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: The proc interface was changed already in version 2.2.14, so check for that version instead of 2.4.0 |
|
From: Peter K. <pk...@us...> - 2001-03-03 13:57:54
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
hci_internal.h 1.10 1.11=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Corrected a typo (packet -> packed).
The diff of the modified file(s):
--- hci_internal.h 2001/03/02 10:55:03 1.10
+++ hci_internal.h 2001/03/03 13:59:14 1.11
@@ -342,7 +342,7 @@
u8 local_bd[6];
s32 active_connection;
hci_con con[MAX_NBR_OF_CONNECTIONS];
-} __attribute__ ((packet)) hci_controller;
+} __attribute__ ((packed)) hci_controller;
=20
/****************** EXPORTED FUNCTION DECLARATION SECTION ****************=
***/
=20
|
|
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");
|
|
From: Gordon M. <gm...@us...> - 2001-03-02 21:09:22
|
The following files were modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Config.in 1.1 Added Makefile 1.13 1.14=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: --Tweaked the Makefile so that I can drop this directory into a 2.4 kernel = source tree. Tested standalone to make sure I didn't break that. --Added an initial Config.in for kernel configuration. The diff of the modified file(s): --- Makefile 2001/03/02 10:50:44 1.13 +++ Makefile 2001/03/02 21:10:41 1.14 @@ -2,18 +2,27 @@ # Makefile for the Bluetooth device driver. # =20 -INCLUDEDIR =3D /usr/include - -O_TARGET :=3D bt.o -O_OBJS =3D bluetooth.o btdebug.o btmem.o hci.o l2cap.o rfcomm.o sdp.o t= cs.o bt_proc.o hci_vendor.o l2cap_con.o sec_client.o l2cap_sec.o rfcomm_sec= .o -M_OBJS =3D $(O_TARGET) =20 ifeq ($(TOPDIR)/Rules.make,$(wildcard $(TOPDIR)/Rules.make)) =20 +#--------------------------------------------------------------------- +# Kernel makefile rules (2.4.x) +#--------------------------------------------------------------------- +O_TARGET :=3D bt.o +obj-$(CONFIG_BLUETOOTH) +=3D $(patsubst %.c, %.o, $(wildcard *.c)) include $(TOPDIR)/Rules.make =20 else =20 +#--------------------------------------------------------------------- +# Standalone makefile rules +#--------------------------------------------------------------------- + +O_TARGET :=3D bt.o +O_OBJS =3D bluetooth.o btdebug.o btmem.o hci.o l2cap.o rfcomm.o sdp.o t= cs.o bt_proc.o hci_vendor.o l2cap_con.o sec_client.o l2cap_sec.o rfcomm_sec= .o +M_OBJS =3D $(O_TARGET) + +INCLUDEDIR =3D /usr/include MODFLAGS =3D -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h CFLAGS =3D -D__KERNEL__ -DMODULE -I../../../include -I$(INCLUDEDIR) -Wal= l -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce $(MODFL= AGS) =20 |
|
From: Peter K. <pk...@us...> - 2001-03-02 16:56:32
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btdebug.h 1.35 1.36=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Turned off debug that Marcus had accidentally turned on.
The diff of the modified file(s):
--- btdebug.h 2001/03/02 15:15:08 1.35
+++ btdebug.h 2001/03/02 16:57:50 1.36
@@ -72,8 +72,8 @@
=20
/***************** Bluetooth Debug defines *******************************=
****/
=20
-#define BT_DATA_DEBUG 1
-#define BT_DATAFLOW_DEBUG 1 /* print pkt */
+#define BT_DATA_DEBUG 0
+#define BT_DATAFLOW_DEBUG 0 /* print pkt */
=20
#define BT_DRIVER_DEBUG 1
=20
@@ -143,21 +143,21 @@
=20
/***************** SDP Debug defines *************************************=
****/
=20
-#define SDP_DEBUG_XMIT 1
+#define SDP_DEBUG_XMIT 0
/* Enables/disables the debug when sdp is transmitting data */
=20
-#define SDP_DEBUG_REC 1
+#define SDP_DEBUG_REC 0
/* Enables/disables the debug when sdp is receiving data */
=20
-#define SDP_DEBUG_MISC 1
+#define SDP_DEBUG_MISC 0
/* Enables/disables debug for functions used during connection and
disconnecting i sdp */
=20
-#define SDP_DEBUG_MEM 1
+#define SDP_DEBUG_MEM 0
=20
-#define SDP_DEBUG_PROC 1
+#define SDP_DEBUG_PROC 0
=20
-#define SDP_PRINT_DATA 1
+#define SDP_PRINT_DATA 0
=20
#define SDP_DBG_STR " SDP "
=20
|
|
From: Peter K. <pk...@us...> - 2001-03-02 15:55:00
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btconfig.h 1.17 1.18=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Actually, we only want USE_SECURITY_MANAGER on by default
when compiling for CRIS.
The diff of the modified file(s):
--- btconfig.h 2001/03/02 15:16:17 1.17
+++ btconfig.h 2001/03/02 15:56:18 1.18
@@ -52,7 +52,11 @@
/* Used to decrease overruns on serial port (see bluetooth.c) */
#undef BT_USEINBUFFER
=20
+#ifdef __CRIS__
#define USE_SECURITY_MANAGER
+#else
+#undef USE_SECURITY_MANAGER
+#endif
=20
/* Bluetooth HW defines used to setup different HW and to cope with=20
limitations in HW */
|
|
From: Olov H. <ol...@us...> - 2001-03-02 15:36:33
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.c 1.130 1.131=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added initiation of LED timer The diff of the modified file(s): --- bluetooth.c 2001/03/01 00:31:05 1.130 +++ bluetooth.c 2001/03/02 15:37:49 1.131 @@ -2211,6 +2211,7 @@ =20 #ifdef __CRIS__ /* start led timer */ + init_timer(&bt_clear_led_timer); bt_clear_led_timer.function =3D &bt_clear_led; bt_clear_led_timer.expires =3D jiffies + 10; add_timer(&bt_clear_led_timer); |
|
From: Peter K. <pk...@us...> - 2001-03-02 15:15:00
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btconfig.h 1.16 1.17=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
USE_SECURITY_MANAGER has to be on by default for now.
The diff of the modified file(s):
--- btconfig.h 2001/03/02 10:55:03 1.16
+++ btconfig.h 2001/03/02 15:16:17 1.17
@@ -52,7 +52,7 @@
/* Used to decrease overruns on serial port (see bluetooth.c) */
#undef BT_USEINBUFFER
=20
-//#define USE_SECURITY_MANAGER
+#define USE_SECURITY_MANAGER
=20
/* Bluetooth HW defines used to setup different HW and to cope with=20
limitations in HW */
|
|
From: Peter K. <pk...@us...> - 2001-03-02 15:13:52
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btdebug.h 1.34 1.35=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Turned off debug that David accidentally turned on.
The diff of the modified file(s):
--- btdebug.h 2001/03/02 10:55:03 1.34
+++ btdebug.h 2001/03/02 15:15:08 1.35
@@ -84,41 +84,41 @@
/****************** HCI Debug defines ************************************=
****/
/* Possibility to turn on/off debug for separate sections, in the hci laye=
r */
=20
-#define DEBUG_HCI_QUEUEING 1
+#define DEBUG_HCI_QUEUEING 0
/* Debug for the queueing when sending data */
=20
-#define DEBUG_HCI_INDATA 1
+#define DEBUG_HCI_INDATA 0
/* Prints out how many characters that is received by hci_recieve_data() */
=20
-#define DEBUG_HCI_STATE 1
+#define DEBUG_HCI_STATE 0
/* Will enable/disable debug for the receive states (WAIT_FOR_xxx) */
=20
-#define DEBUG_HCI_RECEIVING_PROCESS 1
+#define DEBUG_HCI_RECEIVING_PROCESS 0
/* Will enable/disable debug during the receiving process */
=20
-#define DEBUG_HCI_SEND_PROCESS 1
+#define DEBUG_HCI_SEND_PROCESS 0
/* Will enable/disable debug during the sending process (only data, no cmd=
s) */
=20
-#define DEBUG_DATAFLOW 1
+#define DEBUG_DATAFLOW 0
/* Enables / disables the printing of the bytes thar are sent/received */
=20
-#define DEBUG_HCI_CTRL 1
+#define DEBUG_HCI_CTRL 0
/* Enables / disables debug for the HCI control and signaling */
=20
-#define DEBUG_HCI_CMD 1
+#define DEBUG_HCI_CMD 0
/* Enables / disables debug for the HCI commands */
=20
#define HCI_DBG_STR "HCI: "
=20
/***************** L2CAP Debug defines ***********************************=
****/
=20
-#define L2CAP_DEBUG_STATE 1
-#define L2CAP_DEBUG_TIMER 1
-#define L2CAP_DEBUG_CON 1
-#define L2CAP_DEBUG_RCV 1
-#define L2CAP_DEBUG_XMIT 1
-#define L2CAP_DEBUG_MISC 1
-#define L2CAP_DEBUG_DATA 1
+#define L2CAP_DEBUG_STATE 0
+#define L2CAP_DEBUG_TIMER 0
+#define L2CAP_DEBUG_CON 0
+#define L2CAP_DEBUG_RCV 0
+#define L2CAP_DEBUG_XMIT 0
+#define L2CAP_DEBUG_MISC 0
+#define L2CAP_DEBUG_DATA 0
=20
#define L2CAP_DBG_STR " L2CAP "
=20
@@ -126,17 +126,17 @@
=20
/* Possibility to turn on/off debug for seperate sections in RFCOMM*/
=20
-#define DEBUG_RFCOMM_RECEIVE_FLOW 1
+#define DEBUG_RFCOMM_RECEIVE_FLOW 0
/* Will enable/disable debug during the receiving process */
=20
-#define DEBUG_RFCOMM_SEND_PROCESS 1
+#define DEBUG_RFCOMM_SEND_PROCESS 0
/* Will enable/disable debug during the sending process */
=20
-#define DEBUG_RFCOMM_INTERNAL_SIGNALING 1
+#define DEBUG_RFCOMM_INTERNAL_SIGNALING 0
/* Will enable/disable debug for the internal signaling between the RFCOMM
layers on two differnet BT-units */
=20
-#define PRINT_DATA_ENABLE 1
+#define PRINT_DATA_ENABLE 0
/* Enables /disables the printing of the send and received data */
=20
#define RFCOMM_DBG_STR " RFCOMM "
|
2 messages has been excluded from this view by a project administrator.
