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: Gordon M. <gm...@us...> - 2001-03-07 17:50:11
|
The following file was modified in apps/bluetooth/BluetoothPN: Name Old version New version Comment ---- ----------- ----------- ------- Makefile 1.1.1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: --Added a -I flag so the compiler can find the bluetooth headers. The diff of the modified file(s): --- Makefile 2001/03/04 05:26:45 1.1.1.1 +++ Makefile 2001/03/07 17:51:23 1.2 @@ -11,6 +11,10 @@ =20 CFILES =3D=20 =20 +# Need this to find the bluetooth headers. +# --gmcnutt +CXXFLAGS +=3D -I../../../linux/include + CLEAN =3D ./fltk/lib/libtoggletree.a =20 OBJECTS =3D $(CPPFILES:.cxx=3D.o) $(CFILES:.c=3D.o) |
|
From: Olov H. <ol...@us...> - 2001-03-07 16:51:11
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.140 1.141=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Rearranged so that debug print is done before write to serial port. Prevent=
s a racing condition.
The diff of the modified file(s):
--- bluetooth.c 2001/03/06 11:04:15 1.140
+++ bluetooth.c 2001/03/07 16:52:52 1.141
@@ -1210,8 +1210,8 @@
return 0;
} else {
bt_flash_led();
- sent =3D sertty->driver.write(sertty, 0, data, len);
PRINTPKT("bt_write_lower_driver :", (u8*)data, len);
+ sent =3D sertty->driver.write(sertty, 0, data, len);
}
=20=09=09
if (sent !=3D len) {
|
|
From: Peter K. <pk...@us...> - 2001-03-06 11:05:59
|
The following file was modified in apps/bluetooth/sdp_server:
Name Old version New version Comment
---- ----------- ----------- -------
sdp_parser.c 1.10 1.11=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
The sdp_server no longer needs to wait for the bluetooth stack
to be initialised.
The diff of the modified file(s):
--- sdp_parser.c 2001/03/04 15:46:08 1.10
+++ sdp_parser.c 2001/03/06 11:07:37 1.11
@@ -121,9 +121,6 @@
#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 *******************=
***/
@@ -830,39 +827,9 @@
}
=20
#ifndef BTD_USERSTACK
-static void
-wait_till_stack_is_initiated()
-{
- int bt_cfd;
- int stack_initiated =3D 0;
-
- if ((bt_cfd =3D open("/dev/ttyBTC", O_RDWR, 0)) < 0)
- {
- perror("Can't open TTY");
- exit(1);
- }
-=20=20
- while (!stack_initiated)
- {
- if (ioctl(bt_cfd, BTISINITIATED, &stack_initiated) < 0)
- {
- perror("Checking BT stack initiated");
- exit(1);
- }
- if (!stack_initiated)
- {
- sleep(1);
- }
- }
-
- close(bt_cfd);
-}
-
void
start_srvsock(char *name)
{
- wait_till_stack_is_initiated();
-=20=20
stack_if_fd =3D open(name, O_RDWR);
if (stack_if_fd < 0)
{
|
|
From: Peter K. <pk...@us...> - 2001-03-06 11:04:46
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
sdp.c 1.66 1.67=20=20=20=20=20=20=20=20=20=20=20=20
sec_client.c 1.15 1.16=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added some missing void's.
The diff of the modified file(s):
--- sdp.c 2001/03/06 11:04:15 1.66
+++ sdp.c 2001/03/06 11:06:24 1.67
@@ -410,7 +410,7 @@
=20
#ifdef __KERNEL__
s32
-sdp_create_proc_file()
+sdp_create_proc_file(void)
{
s32 procfs_status =3D -ENOENT;
=20
@@ -453,7 +453,7 @@
}
=20
s32
-sdp_remove_proc_file()
+sdp_remove_proc_file(void)
{
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
remove_proc_entry(sdp_proc_entry.name, &proc_root);
--- sec_client.c 2001/03/06 11:04:15 1.15
+++ sec_client.c 2001/03/06 11:06:24 1.16
@@ -266,7 +266,7 @@
=20
#ifdef __KERNEL__
s32
-sec_man_create_proc_file()
+sec_man_create_proc_file(void)
{
s32 procfs_status =3D -ENOENT;
=20
@@ -309,7 +309,7 @@
}
=20
s32
-sec_man_remove_proc_file()
+sec_man_remove_proc_file(void)
{
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
remove_proc_entry(sec_man_proc_entry.name, &proc_root);
|
|
From: Peter K. <pk...@us...> - 2001-03-06 11:03:44
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
sdp.h 1.24 1.25=20=20=20=20=20=20=20=20=20=20=20=20
sec_client.h 1.6 1.7=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added prototypes for sdp_create_proc_file(), sdp_remove_proc_file(),
sec_man_create_proc_file() and sec_man_remove_proc_file().
The diff of the modified file(s):
--- sdp.h 2001/03/01 00:31:05 1.24
+++ sdp.h 2001/03/06 11:05:23 1.25
@@ -76,6 +76,10 @@
=20
void sdp_init(s32 server);
void sdp_shutdown(void);
+#ifdef __KERNEL__
+s32 sdp_create_proc_file(void);
+s32 sdp_remove_proc_file(void);
+#endif
s32 sdp_connect_req(u8* bd_addr, u8 line);
void sdp_connect_ind(l2cap_con *l2cap);
void sdp_connect_pnd(l2cap_con *l2cap, int status);
--- sec_client.h 2001/02/15 16:28:47 1.6
+++ sec_client.h 2001/03/06 11:05:23 1.7
@@ -76,6 +76,11 @@
=20
void sec_man_init(enum security_requests user);
=20
+#ifdef __KERNEL__
+s32 sec_man_create_proc_file(void);
+s32 sec_man_remove_proc_file(void);
+#endif
+
void sec_man_check(enum security_requests user, BD_ADDR bd_addr,
u32 service_data, u32 user_data);
=20
|
|
From: Peter K. <pk...@us...> - 2001-03-06 11:02:37
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.139 1.140=20=20=20=20=20=20=20=20=20=20=20
sdp.c 1.65 1.66=20=20=20=20=20=20=20=20=20=20=20=20
sec_client.c 1.14 1.15=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Moved creation of the sdp_srv and the sec_srv proc-files to
sdp.c and sec_client.c. Also made sure they are always created
independent of CONFIG_BLUETOOTH_PROC.
* Initialise the wait queues for the sdp_srv and the sec_srv proc-files
before the files are created.
The diff of the modified file(s):
--- bluetooth.c 2001/03/06 10:13:49 1.139
+++ bluetooth.c 2001/03/06 11:04:15 1.140
@@ -1923,9 +1923,9 @@
=20=09
sertty =3D NULL;
=20
-#ifdef CONFIG_BLUETOOTH_PROC
DSYS("Registering BT proc files\n");
=20=20
+#ifdef CONFIG_BLUETOOTH_PROC
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
procfs_status =3D -1;
@@ -1968,64 +1968,7 @@
=20
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
- struct proc_dir_entry *entry;
- procfs_status =3D -1;
- 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,2,0)
- procfs_status =3D proc_register(&proc_root, &sdp_proc_entry);
-#else
- procfs_status =3D proc_register_dynamic(&proc_root, &sdp_proc_entry);
-#endif /* LINUX_VERSION_CODE */
-
- if (procfs_status < 0) {
- D_ERR("Couldn't register proc file for sdp database %d\n",
- procfs_status);
- }
-
-#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
-#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
- {
- 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. */
- /*---------------------------------------------------*/
- 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,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);
-#endif /* LINUX_VERSION_CODE */
-
- if (procfs_status < 0) {
- D_ERR("Couldn't register proc file for security manager %d\n",
- procfs_status);
- }
-#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
-
-#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,
@@ -2042,6 +1985,7 @@
D_ERR("Couldn't register proc file bt_status %d\n",=20
procfs_status);
}
+#endif /* CONFIG_BLUETOOTH_PROC */
=20
#ifdef CONFIG_BLUETOOTH_USE_TCI
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
@@ -2065,7 +2009,11 @@
}
#endif /* CONFIG_BLUETOOTH_USE_TCI */
=20=09
-#endif /* CONFIG_BLUETOOTH_PROC */
+ sdp_create_proc_file();
+
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
+ sec_man_create_proc_file();
+#endif
=20
DSYS("Bluetooth Driver Using ttyBT[0-%d] (data), ttyBTC (ctrl [%d])\n",
BT_NBR_DATAPORTS-1, BT_NBR_PORTS-1);
@@ -2618,26 +2566,23 @@
if (bt_stack_initiated)
bt_shutdown();
=20=09
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
+ sec_man_remove_proc_file();
+#endif
+ sdp_remove_proc_file();
+=09
#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);
- remove_proc_entry(sdp_proc_entry.name, &proc_root);
remove_proc_entry(bt_proc_doit.name, &proc_root);
-#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
- remove_proc_entry(sec_man_proc_entry.name, &proc_root);
-#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
#ifdef CONFIG_BLUETOOTH_USE_TCI
remove_proc_entry(tci_proc_entry.name, &proc_root);
#endif /* CONFIG_BLUETOOTH_USE_TCI */
#else
proc_unregister(&proc_root, bt_status.low_ino);
proc_unregister(&proc_root, bt_internal_info.low_ino);
- proc_unregister(&proc_root, sdp_proc_entry.low_ino);
proc_unregister(&proc_root, bt_proc_doit.low_ino);
-#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
- proc_unregister(&proc_root, sec_man_proc_entry.low_ino);
-#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
#ifdef CONFIG_BLUETOOTH_USE_TCI
proc_unregister(&proc_root, tci_proc_entry.low_ino);
#endif /* CONFIG_BLUETOOTH_USE_TCI */
--- sdp.c 2001/03/06 10:13:49 1.65
+++ sdp.c 2001/03/06 11:04:15 1.66
@@ -225,7 +225,7 @@
* proc directories can do almost nothing..
*/
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-struct inode_operations sdp_proc_inode_operations =3D {
+static struct inode_operations sdp_proc_inode_operations =3D {
&sdp_procfile_operation, /* default net file-ops */
NULL, /* create */
NULL, /* lookup */
@@ -245,7 +245,7 @@
NULL /* permission */
};
#else
-struct inode_operations sdp_proc_inode_operations =3D {
+static struct inode_operations sdp_proc_inode_operations =3D {
NULL, /* create */
NULL, /* lookup */
NULL, /* link */
@@ -266,7 +266,7 @@
#endif
=20
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-struct proc_dir_entry sdp_proc_entry =3D {
+static struct proc_dir_entry sdp_proc_entry =3D {
0,
7, "sdp_srv",
S_IFREG | S_IRUGO | S_IWUSR,
@@ -276,7 +276,7 @@
sdp_proc_dir_entry_read,
};
#else
-struct proc_dir_entry sdp_proc_entry =3D {
+static struct proc_dir_entry sdp_proc_entry =3D {
0,
7, "sdp_srv",
S_IFREG | S_IRUGO | S_IWUSR,
@@ -348,7 +348,7 @@
printf("Socket connected to %s\n", server_address.sun_path);
return client_sockfd;
}
-#endif
+#endif /* !__KERNEL__ */
=20
void=20
sdp_init(s32 srv)
@@ -393,16 +393,6 @@
DSYS(__FUNCTION__ ", Init sdp as client\n");
role =3D 0;
}
-
-#ifdef __KERNEL__
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
- database_wq =3D NULL;
- sdp_disc_wq =3D NULL;
-#else
- init_waitqueue_head(&database_wq);
- init_waitqueue_head(&sdp_disc_wq);
-#endif /* LINUX_VERSION_CODE */
-#endif /* __KERNEL__ */
}
=20
void=20
@@ -417,6 +407,62 @@
}
}=20=20
}
+
+#ifdef __KERNEL__
+s32
+sdp_create_proc_file()
+{
+ s32 procfs_status =3D -ENOENT;
+
+ /* The database_wq wait queue must be initialised before anyone tries
+ to read from the /proc/sdp_srv file, so we initialise the wait
+ queues here */
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
+ init_waitqueue_head(&database_wq);
+ init_waitqueue_head(&sdp_disc_wq);
+#endif /* LINUX_VERSION_CODE */
+
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
+ {
+ struct proc_dir_entry *entry;
+
+ 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 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);
+#endif /* LINUX_VERSION_CODE */
+
+ if (procfs_status < 0) {
+ D_ERR("Couldn't register proc file for sdp database %d\n",
+ procfs_status);
+ }
+
+ return procfs_status;
+}
+
+s32
+sdp_remove_proc_file()
+{
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
+ remove_proc_entry(sdp_proc_entry.name, &proc_root);
+#else
+ proc_unregister(&proc_root, sdp_proc_entry.low_ino);
+#endif
+ return 0;
+}
+#endif /* __KERNEL__ */
=20
s32=20
sdp_connect_req(u8* bd_addr, u8 line)
--- sec_client.c 2001/03/06 10:13:49 1.14
+++ sec_client.c 2001/03/06 11:04:15 1.15
@@ -167,7 +167,7 @@
*/
=20
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-struct inode_operations sec_man_proc_inode_operations =3D {
+static struct inode_operations sec_man_proc_inode_operations =3D {
&sec_man_procfile_operation, /* default net file-ops */
NULL, /* create */
NULL, /* lookup */
@@ -187,7 +187,7 @@
NULL /* permission */
};
#else
-struct inode_operations sec_man_proc_inode_operations =3D {
+static struct inode_operations sec_man_proc_inode_operations =3D {
NULL, /* create */
NULL, /* lookup */
NULL, /* link */
@@ -208,7 +208,7 @@
#endif
=20
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-struct proc_dir_entry sec_man_proc_entry =3D {
+static struct proc_dir_entry sec_man_proc_entry =3D {
0,
7, "sec_srv",
S_IFREG | S_IRUGO | S_IWUSR,
@@ -218,7 +218,7 @@
sec_man_proc_dir_entry_read,
};
#else
-struct proc_dir_entry sec_man_proc_entry =3D {
+static struct proc_dir_entry sec_man_proc_entry =3D {
0,
7, "sec_srv",
S_IFREG | S_IRUGO | S_IWUSR,
@@ -263,6 +263,62 @@
/* To indicate that nothing is ready */
security_query.originator =3D SEC_CLIENT;=20
}
+
+#ifdef __KERNEL__
+s32
+sec_man_create_proc_file()
+{
+ s32 procfs_status =3D -ENOENT;
+
+ /* The sec_man_wq wait queue must be initialised before anyone tries
+ to read from the /proc/sec_srv file, so we initialise the wait
+ queue here */
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
+ init_waitqueue_head(&sec_man_wq);
+#endif /* LINUX_VERSION_CODE */
+
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
+ {
+ 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. */
+ /*---------------------------------------------------*/
+ 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 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);
+#endif /* LINUX_VERSION_CODE */
+
+ if (procfs_status < 0) {
+ D_ERR("Couldn't register proc file for security manager %d\n",
+ procfs_status);
+ }
+
+ return procfs_status;
+}
+
+s32
+sec_man_remove_proc_file()
+{
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
+ remove_proc_entry(sec_man_proc_entry.name, &proc_root);
+#else
+ proc_unregister(&proc_root, sec_man_proc_entry.low_ino);
+#endif
+ return 0;
+}
+#endif /* __KERNEL__ */
=20
/* fixme -- add return value for calling functions to indicate status of=
=20
check */
|
|
From: Peter K. <pk...@us...> - 2001-03-06 10:47:30
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
hci_vendor.c 1.16 1.17=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
EINVAL does not exist when compiling the userstack. Just return -1
in that case.
The diff of the modified file(s):
--- hci_vendor.c 2001/03/05 23:08:39 1.16
+++ hci_vendor.c 2001/03/06 10:49:09 1.17
@@ -154,7 +154,6 @@
c_pkt.opcode =3D hci_put_opcode(ERICSSON_SET_UART_BAUD_RATE, 0x3f) ;
c_pkt.len =3D 1;
switch (baudrate) {
-=20=20=20=20
case 57600: c_pkt.data[0] =3D 0x03;
break;
case 115200: c_pkt.data[0] =3D 0x02;
@@ -165,8 +164,13 @@
break;
default:
D_ERR(__FUNCTION__": Baudrate not supported\n");
+#ifdef __KERNEL__
return -EINVAL;
+#else
+ return -1;
+#endif
}
+
#ifdef CONFIG_BLUETOOTH_SET_BAUDRATE_BLOCKING
send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN);
#else
|
|
From: Peter K. <pk...@us...> - 2001-03-06 10:12:10
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.138 1.139=20=20=20=20=20=20=20=20=20=20=20
sdp.c 1.64 1.65=20=20=20=20=20=20=20=20=20=20=20=20
sec_client.c 1.13 1.14=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Removed checks to see if KERNEL_VERSION() is defined, as it is now
guaranteed to be available.
The diff of the modified file(s):
--- bluetooth.c 2001/03/05 23:08:39 1.138
+++ bluetooth.c 2001/03/06 10:13:49 1.139
@@ -1926,7 +1926,6 @@
#ifdef CONFIG_BLUETOOTH_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;
@@ -1941,17 +1940,12 @@
#else
procfs_status =3D proc_register_dynamic(&proc_root, &bt_status);
#endif /* LINUX_VERSION_CODE */
-#else /* KERNEL_VERSION */
=20
- procfs_status =3D proc_register_dynamic(&proc_root, &bt_status);
-#endif/* KERNEL_VERSION */
-
if (procfs_status < 0) {
D_ERR("Couldn't register proc file bt_status %d\n",=20
procfs_status);
}
=20=09
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
procfs_status =3D -1;
@@ -1966,16 +1960,12 @@
#else
procfs_status =3D proc_register_dynamic(&proc_root, &bt_internal_info);
#endif /* LINUX_VERSION_CODE */
-#else /* KERNEL_VERSION */
- procfs_status =3D proc_register_dynamic(&proc_root, &bt_internal_info);
-#endif/* KERNEL_VERSION */
=20
if (procfs_status < 0) {
D_ERR("Couldn't register proc file bt_internal_info %d\n",
procfs_status);
}
=20
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
struct proc_dir_entry *entry;
@@ -1997,9 +1987,6 @@
#else
procfs_status =3D proc_register_dynamic(&proc_root, &sdp_proc_entry);
#endif /* LINUX_VERSION_CODE */
-#else /* KERNEL_VERSION */
- procfs_status =3D proc_register_dynamic(&proc_root, &sdp_proc_entry);
-#endif/* KERNEL_VERSION */
=20
if (procfs_status < 0) {
D_ERR("Couldn't register proc file for sdp database %d\n",
@@ -2007,7 +1994,6 @@
}
=20
#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
struct proc_dir_entry *entry;
@@ -2030,9 +2016,6 @@
#else
procfs_status =3D proc_register_dynamic(&proc_root, &sec_man_proc_entry);
#endif /* LINUX_VERSION_CODE */
-#else /* KERNEL_VERSION */
- procfs_status =3D proc_register_dynamic(&proc_root, &sec_man_proc_entry);
-#endif/* KERNEL_VERSION */
=20
if (procfs_status < 0) {
D_ERR("Couldn't register proc file for security manager %d\n",
@@ -2040,7 +2023,6 @@
}
#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
=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;
@@ -2055,18 +2037,13 @@
#else
procfs_status =3D proc_register_dynamic(&proc_root, &bt_proc_doit);
#endif /* LINUX_VERSION_CODE */
-#else /* KERNEL_VERSION */
=20
- procfs_status =3D proc_register_dynamic(&proc_root, &bt_proc_doit);
-#endif/* KERNEL_VERSION */
-
if (procfs_status < 0) {
D_ERR("Couldn't register proc file bt_status %d\n",=20
procfs_status);
}
=20
#ifdef CONFIG_BLUETOOTH_USE_TCI
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
procfs_status =3D -1;
@@ -2081,9 +2058,6 @@
#else
procfs_status =3D proc_register_dynamic(&proc_root, &tci_proc_entry);
#endif /* LINUX_VERSION_CODE */
-#else /* KERNEL_VERSION */
- procfs_status =3D proc_register_dynamic(&proc_root, &tci_proc_entry);
-#endif/* KERNEL_VERSION */
=20
if (procfs_status < 0) {
D_ERR("Couldn't register proc file for tci database %d\n",
--- sdp.c 2001/03/04 15:56:54 1.64
+++ sdp.c 2001/03/06 10:13:49 1.65
@@ -99,10 +99,8 @@
=20
/****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,2,14)
#define USE_NEW_PROC
-#endif
#endif
=20
#ifndef __KERNEL__
--- sec_client.c 2001/03/05 15:52:52 1.13
+++ sec_client.c 2001/03/06 10:13:49 1.14
@@ -88,10 +88,8 @@
=20
/****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,2,14)
#define USE_NEW_PROC
-#endif
#endif
=20
#ifndef __KERNEL__
|
|
From: Peter K. <pk...@us...> - 2001-03-06 10:09:55
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.65 1.66=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added definition of KERNEL_VERSION() if it is not already defined, so we can rely on it being defined. The diff of the modified file(s): --- btcommon.h 2001/03/02 10:55:03 1.65 +++ btcommon.h 2001/03/06 10:11:34 1.66 @@ -66,6 +66,13 @@ #define FALSE 0 #define TRUE 1 =20 +/* KERNEL_VERSION() is not defined in all 2.0.x versions of the linux kern= el. + Define it here so we can use it in the code without having to check whe= ther + it is defined or not */ +#ifndef KERNEL_VERSION +#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) +#endif + #ifndef __KERNEL__ #define kmalloc(size,prio) malloc((size)) #define kfree(obj) free((obj)) |
|
From: Gordon M. <gm...@us...> - 2001-03-05 23:07:02
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.137 1.138=20=20=20=20=20=20=20=20=20=20=20
hci_vendor.c 1.15 1.16=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
--Modified Ericcson's hci_set_baudrate to return -EINVAL if the baud rate i=
s not supported and 0 otherwise.
--Modified bt_ioctl to pass this return value on to its caller.
The diff of the modified file(s):
--- bluetooth.c 2001/03/05 16:41:44 1.137
+++ bluetooth.c 2001/03/05 23:08:39 1.138
@@ -943,8 +943,7 @@
GET_USER(tmp, (s32*)arg);
BT_DRIVER(FNC"Setting baudrate in host controller to %d\n", tmp);
=20=09=09
- hci_set_baudrate(tmp);
- break;
+ return hci_set_baudrate(tmp);
=20
case HCIWRITEBDADDR:
copy_from_user(&bd_addr, (s32*)arg, size);
--- hci_vendor.c 2001/03/05 15:39:07 1.15
+++ hci_vendor.c 2001/03/05 23:08:39 1.16
@@ -148,7 +148,6 @@
/* Due to the fact that the Ericsson module after P9A sends the reply
on the new baudrate, this function can not block (Since btd sets the
new physical device speed when this function returns). */=20=20
- s32 tmp;
=20=20=20
D_CMD(__FUNCTION__"(%d baud)\n", baudrate);
c_pkt.type =3D CMD_PKT;
@@ -166,20 +165,22 @@
break;
default:
D_ERR(__FUNCTION__": Baudrate not supported\n");
- break;=09
+ return -EINVAL;
}
#ifdef CONFIG_BLUETOOTH_SET_BAUDRATE_BLOCKING
- tmp =3D send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LE=
N);
+ send_cmd_block((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN);
#else
if (hci_ctrl.hc_buf.cmd_num < 1) {
DSYS(__FUNCTION__": sleeping\n");
interruptible_sleep_on(&set_baudrate_wq);
}
- tmp =3D bt_write_lower_driver((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI=
_HDR_LEN);
+ bt_write_lower_driver((u8*) &c_pkt, c_pkt.len + CMD_HDR_LEN + HCI_HDR_LEN=
);
=20=20=20
hci_ctrl.hc_buf.cmd_num -=3D 1;=20=20
#endif
- return tmp;
+ /* We don't really know if the card accepted the change, but we did
+ succeed in trying to send it. --gmcnutt */
+ return 0;
}
=20
=20
|
|
From: Peter K. <pk...@us...> - 2001-03-05 16:56:17
|
The following file was modified in apps/bluetooth/btd: Name Old version New version Comment ---- ----------- ----------- ------- btd.h 1.34 1.35=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: If CONFIG_BLUETOOTH is defined when btd.h is included, then rely on that CONFIG_BLUETOOTH_<hardware> is defined too. The diff of the modified file(s): --- btd.h 2001/03/04 17:54:54 1.34 +++ btd.h 2001/03/05 16:57:54 1.35 @@ -46,22 +46,21 @@ =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 */ -#undef CONFIG_BLUETOOTH_CSR=20=20=20=20=20=20=20=20 + +/* Let us assume that if CONFIG_BLUETOOTH is definend (from the kernel + includes), then CONFIG_BLUETOOTH_<hardware> is also defined correctly */ +#ifndef CONFIG_BLUETOOTH + +/* Define the one of these that matches the used hardware */ #undef CONFIG_BLUETOOTH_NOINIT=20=20=20=20=20 +#undef CONFIG_BLUETOOTH_CSR=20=20=20=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 CONFIG_BLUETOOTH_ERICSSON +#undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20 +#undef CONFIG_BLUETOOTH_USBMODULE /* Not implemented */ =20 +#endif CONFIG_BLUETOOTH =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-05 16:55:08
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
hci.c 1.123 1.124=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Removed a compiler warning.
The diff of the modified file(s):
--- hci.c 2001/03/05 16:42:57 1.123
+++ hci.c 2001/03/05 16:56:45 1.124
@@ -186,7 +186,9 @@
static void send_cmd_queue(void);
static void update_nhcp(s32 nhcp);
static s32 send_inq_cmd_block(u8 *cmd, u8 len);
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
static u8* get_bd(u16 con_hdl);
+#endif
static s32 get_con_hdl(u8 *bd);
=20
/* Link Control Commands */
@@ -2679,6 +2681,7 @@
}
}
=20
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
u8*
get_bd(u16 con_hdl)
{
@@ -2697,7 +2700,7 @@
return hci_ctrl.con[i].bd;
}
}
-
+#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
=20
/*
* This function will return the value of the active bd address, i.e. the
|
|
From: Peter K. <pk...@us...> - 2001-03-05 16:41:21
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
hci.c 1.122 1.123=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added checks for CONFIG_BLUETOOTH_USE_SECURITY_MANAGER around
all calls to sec_man_event().
The diff of the modified file(s):
--- hci.c 2001/03/02 21:52:15 1.122
+++ hci.c 2001/03/05 16:42:57 1.123
@@ -731,13 +731,14 @@
=20
case AUTHENTICATION_COMPLETE:
DSYS(__FUNCTION__", AUTHENTICATION_COMPLETE\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
if (buf[0]) {
D_ERR(__FUNCTION__", AUTHENTICATION_COMPLETE: %s\n", get_err_msg(buf[0]=
));
=20=09=09=09
}
=20=09=09
sec_man_event(HCI, get_bd(CHAR2INT12(buf[2], buf[1])), AUTHENTICATION_CO=
MPLETE, buf, 1);
-=09=09
+#endif
break;
=20
case REMOTE_NAME_REQUEST_COMPLETE:
@@ -755,19 +756,21 @@
break;
=20
case ENCRYPTION_CHANGE:
- {
- u8 tmp[2];
DSYS(__FUNCTION__", ENCRYPTION_CHANGE\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
if (buf[0]) {
D_ERR(__FUNCTION__", ENCRYPTION_CHANGE: %s\n", get_err_msg(buf[0]));
}
=20
+ {
+ u8 tmp[2];
tmp[0] =3D buf[0];
tmp[1] =3D buf[4];
=20=09=09
sec_man_event(HCI, get_bd(CHAR2INT12(buf[2], buf[1])), ENCRYPTION_CHANGE=
, tmp, 2);
- break;
}
+#endif
+ break;
=20=09
case CHANGE_CONNECTION_LINK_KEY_COMPLETE:
DSYS(__FUNCTION__", CHANGE_CONNECTION_LINK_KEY_COMPLETE Not implemented!=
\n");
@@ -855,9 +858,10 @@
break;
=20
case RETURN_LINK_KEYS:
+ D_CMD(__FUNCTION__", RETURN_LINK_KEYS event\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
{
u8 tmp_str[23];
- D_CMD(__FUNCTION__", RETURN_LINK_KEYS event\n");
=20=09=09
for (i =3D 0; i < buf[0]; i++) {
D_CMD("%d: ",i);
@@ -866,24 +870,29 @@
memcpy(tmp_str + 7, (buf + 1) + (buf[0] * 6) + (i * 16), 16);
sec_man_event(HCI, buf + 1, RETURN_LINK_KEYS, tmp_str, 17);
}
-=09=09
- break;
}
+#endif
+ break;
=20=09
case PIN_CODE_REQUEST:
D_CMD(__FUNCTION__", PIN_CODE_REQUEST forwarding event to security manag=
er\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
sec_man_event(HCI, buf, PIN_CODE_REQUEST, NULL, 0);
+#endif
break;
=20=09
case LINK_KEY_REQUEST:
-=09
D_CMD(__FUNCTION__", LINK_KEY_REQUEST\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
sec_man_event(HCI, buf, LINK_KEY_REQUEST, NULL, 0);
+#endif
break;
=20
case LINK_KEY_NOTIFICATION:
D_CMD(__FUNCTION__", LINK_KEY_NOTIFICATION forwarding event to security =
manager\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
sec_man_event(HCI, buf, LINK_KEY_NOTIFICATION, buf + 6, 16);
+#endif
break;
=20
case LOOPBACK_COMMAND:
|
|
From: Peter K. <pk...@us...> - 2001-03-05 16:40:09
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.136 1.137=20=20=20=20=20=20=20=20=20=20=20
l2cap.c 1.90 1.91=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Code clean-up.
The diff of the modified file(s):
--- bluetooth.c 2001/03/05 15:52:52 1.136
+++ bluetooth.c 2001/03/05 16:41:44 1.137
@@ -1033,8 +1033,8 @@
/*************************************************************************=
****/
/* LINUX 2.0.X SPECIFIC CODE =
*/
/*************************************************************************=
****/
-static s32 bt_tty_read (struct tty_struct *tty, struct file *file, __u8 * =
buf,
- u32 nr)
+static s32 bt_tty_read(struct tty_struct *tty, struct file *file,
+ __u8 * buf, u32 nr)
#else
/*************************************************************************=
****/
/* LINUX 2.2.X SPECIFIC CODE =
*/
@@ -1894,7 +1894,7 @@
* Register the tty discipline
*/
=20=09
- (void) memset (&bt_ldisc, 0, sizeof (bt_ldisc));
+ memset(&bt_ldisc, 0, sizeof(bt_ldisc));
bt_ldisc.magic =3D TTY_LDISC_MAGIC;
bt_ldisc.open =3D bt_tty_open;
bt_ldisc.close =3D bt_tty_close;
@@ -2483,9 +2483,7 @@
=20=09
if ((SESSIONSTATE(line) =3D=3D BT_ACTIVE) ||=20
(SESSIONSTATE(line) =3D=3D BT_UPPERCONNECTED)) {
-=09
if (SESSIONSTATE(line) =3D=3D BT_ACTIVE) {
-=09=09=09
SESSIONSTATE(line) =3D BT_LOWERCONNECTED;
NBR_ACTIVE--;
}
--- l2cap.c 2001/03/05 16:39:35 1.90
+++ l2cap.c 2001/03/05 16:41:45 1.91
@@ -159,8 +159,7 @@
=20
const u8* psm2str(u16 psm)
{
- switch (psm)
- {
+ switch (psm) {
case 1:
return "SDP";
break;
@@ -190,7 +189,6 @@
}
}
=20
-
const u8* cmdrej_reason[] =3D {
"Command not understood",
"Signalling MTU exceeded",
@@ -516,7 +514,6 @@
PRINTPKT("l2cap_receive_data : ", data, len);
=20
if (*l2cap_len =3D=3D 0) {
-=09=09
/* Start of a new frame received,=20
parse header and set l2cap_len */
=20=09=09
@@ -536,9 +533,7 @@
/* check length */
if (!(pkt->len =3D=3D (len - L2CAP_HDRSIZE)))
return;
-
} else if (len !=3D *l2cap_len) {
-
/* Not recieved full frame yet or BIG packet */
=20=09=09
if (len > *l2cap_len) {
@@ -553,7 +548,6 @@
=20
switch (pkt->cid) {
case CIDSIG:
-=09
/* Signalling channel */
D_RCV("l2cap_receive_data : Signal data !\n");
=20=09=09
@@ -562,7 +556,6 @@
break;
=20=20=20=20=20
case CIDRCVCONLESS:
-
if (!l2cap->allow_conless) {
D_WARN("Connection less data not allowed\n");
return;
@@ -579,7 +572,6 @@
break;
=20=20=20=20=20
default:
-=09=09
/* Data channel */
con =3D get_lcon(pkt->cid);
=20=20=20=20=20
@@ -624,7 +616,6 @@
}=20=20
=20
while (pos < len) {
-=20=20=20=20
D_RCV(FNC"got packet (%d bytes) with ID : %d\n",
cmd->len, cmd->id);
=20=20=20=20=20
@@ -662,9 +653,7 @@
(used to detect corrupt packets) */
=20
switch (req->code) {
-=09=09
- case SIG_CONREQ: {
-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20
+ case SIG_CONREQ:
/* Request for connection */
conreq =3D (sig_conreq *)req->data;
=20=09=09
@@ -718,20 +707,16 @@
#else
l2ca_connect_ind(con);
#endif
-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20
- }
break; /* SIG_CONREQ*/
-=09
- case SIG_CONFREQ: {
=20
+ case SIG_CONFREQ:
/* Request for configuration */
confreq =3D (sig_confreq *)req->data;
=20=09=09
D_STATE(FNC"config request cid:%d flags: 0x%x\n",=20
confreq->dst_cid, confreq->flags);
=20=09=09
- if ((con =3D get_lcon(confreq->dst_cid)) =3D=3D NULL)
- {
+ if ((con =3D get_lcon(confreq->dst_cid)) =3D=3D NULL) {
D_ERR("Couldn't find local CID\n");
/* send back response ? */
l2cap_cmdrej(con->hci_hdl, CMDREJ_INVALIDCID, NULL, 0);
@@ -739,16 +724,12 @@
}
=20=09=09
switch (con->current_state) {
-
case CLOSED:
-
/* FIXME - send peer=20
'l2cap_config_rsp_neg' */
-=09=09=20=20
break;
=20=09=09=09
- case CONFIG:
- {
+ case CONFIG: {
s32 result =3D CONF_SUCCESS;
/* Parse remote options and store it in con */
=20
@@ -758,7 +739,6 @@
}
=20
if (result !=3D CONF_SUCCESS) {
-=09=09=09=09
/* we didn't like the options... */
DSYS("parse_options failed, send neg rsp\n");
=20
@@ -772,11 +752,10 @@
con->sig_id_rcv =3D req->id;
=20
l2ca_config_ind(con);=20=20=20=20=20=20=20=20=20=20=20
- }
break;
+ }
=20=09=09
- case OPEN:
- {=09
+ case OPEN: {=09
s32 result =3D CONF_SUCCESS;
=20
/*=20
@@ -817,8 +796,8 @@
con->conf_req_ready=3DFALSE;
=20=09=09=09
l2ca_config_ind(con);
- }
break;
+ }
=20=20=20=20=20=20=20=20=20=20=20=20
default:
D_ERR("Got config req in invalid state! [%s]\n",
@@ -826,11 +805,9 @@
PRINTSTATE(con);
break;
}=20=20
- }=20=20=20=20=20=20=20=20
break; /* SIG_CONFREQ*/
-=09=09=09
- case SIG_DISCREQ: {
=20=20=20=20=20=20=20=20=20=20
+ case SIG_DISCREQ:
discreq =3D (sig_discreq *)req->data;
=20
D_STATE(FNC"disconnection request id %d\n",=20
@@ -857,7 +834,6 @@
PRINTSTATE(con);
=20=20=20=20=20=20=20=20=20=20
l2ca_disconnect_ind(con);=20=20=20=20=20=20=20=20=20=20
- }=20
break; /* SIG_DISCREQ */
=20=20=20=20=20=20=20=20
case SIG_ECHOREQ: {
@@ -868,8 +844,8 @@
=20
l2cap_echo_rsp(hci_handle, req->id,=20
req->data, req->len- sizeof(sig_echo_pkt));
- }
break;
+ }
=20=20=20=20=20=20=20=20
case SIG_INFOREQ: {
/* Implementation specific */
@@ -879,33 +855,30 @@
info =3D (sig_info_req*)(req->data);
=20=09=09
switch(info->type) {
-
case INFO_CONNLESS_MTU:
DSYS("Request for connectionless MTU\n");
=20=09=09=09
l2cap_info_rsp(hci_handle, req->id, info->type,
NULL, 0, 1 /* not supported */);
-=09=09=09
break;
+
default:
D_ERR("Unknown info request : type 0x%x\n", info->type);
l2cap_cmdrej(con->hci_hdl, CMDREJ_NOTUNDERSTOOD,
NULL, 0);
break;=09=09
}
- }=20=20=20=20
break;
+ }=20=20=20=20
=20=20=20=20=20=20=20=20
case SIG_RESERVED:
D_STATE(FNC"Reserved !\n");
break;
=20=20=20=20=20=20=20=20=20
- default: {
+ default:
/* Not a valid command */
DSYS(FNC"Invalid command (code 0x%x)s\n", req->code);
- l2cap_cmdrej(con->hci_hdl, CMDREJ_NOTUNDERSTOOD,
- NULL, 0);
- }
+ l2cap_cmdrej(con->hci_hdl, CMDREJ_NOTUNDERSTOOD, NULL, 0);
break;
}
#undef FNC
@@ -932,8 +905,7 @@
(used to detect corrupt packets) */
=20
switch (rsp->code) {
- case SIG_CMDREJECT: {
-
+ case SIG_CMDREJECT:
D_STATE(FNC"Command reject - \n");
=20=20=20=20=20=20=20=20=20=20
cmdreject =3D (sig_cmdreject*)rsp->data;
@@ -959,11 +931,9 @@
if (opt_len > 0)
print_data(FNC"optional data : ",=20
cmdreject->data, rsp->len-2);
- }
break;
=20=20=20=20=20=20=20=20
- case SIG_CONRSP: {=20
-
+ case SIG_CONRSP:
/* client */
D_STATE(FNC"Got connection response\n");
conrsp =3D (sig_conrsp *)rsp->data;
@@ -987,7 +957,6 @@
#endif
=20
switch (conrsp->result) {
-
case RES_SUCCESS:
ENTERSTATE(con, CONFIG);
PRINTSTATE(con);
@@ -1028,7 +997,6 @@
}
=20=20=20=20=20=20=20=20=20=20
if (failure) {
-
/* Connection refused=20
FIXME -
Disable RTX/ERTX timers
@@ -1044,11 +1012,9 @@
ENTERSTATE(con, CLOSED);
delete_con(con);
}
- }=20=20=20=20=20=20
break;
=20=20=20=20=20=20=20=20
- case SIG_CONFRSP: {
-
+ case SIG_CONFRSP:
D_STATE(FNC"Got configuration response\n");
confrsp =3D (sig_confrsp *)rsp->data;
opt_len =3D rsp->len - sizeof(sig_confrsp);
@@ -1072,9 +1038,7 @@
}
=20
switch (confrsp->result) {
-=09
case CONF_SUCCESS:
-=20=20=20=20=20=20=20=20=20
#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
disable_rtx(con);
#endif
@@ -1085,14 +1049,11 @@
=20=20=20=20=20=20=20=20=20=20=20=20
con->conf_req_ready =3D TRUE;
=20
- if (!con->conf_rsp_ready)
- {
+ if (!con->conf_rsp_ready) {
/* Upper layers still haven't replied pos */
DSYS("Still haven't replied pos on other sides conf req\n");
return ;
- }
- else {=09=09=09=09
-=09=09=09=09
+ } else {=09=09=09=09
ENTERSTATE(con, OPEN);
PRINTSTATE(con);
DSYS("l2cap channel (%d,%d) [%s] connected\n",=20
@@ -1122,7 +1083,6 @@
break;
}
=20=20=20=20=20=20
-
/* If we end up here, config failed */
=20
#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
@@ -1144,12 +1104,9 @@
/* For now we simply disconnect if params failed */
l2ca_config_cfm(con, confrsp->result);
l2ca_disconnect_req(con);
-
- }
break;
=20=20=20=20=20=20=20=20=20
- case SIG_DISCRSP: {
-=09
+ case SIG_DISCRSP:
D_STATE(FNC"Got disconnect response\n");
discrsp =3D (sig_discrsp *)rsp->data;
PRINTPKT(FNC"disconnect response", rsp->data, rsp->len);
@@ -1175,8 +1132,6 @@
#endif=09
=20
l2ca_disconnect_cfm(con);
-
- }
break;
=20=20=20=20=20=20=20=20
case SIG_ECHORSP: {=20
@@ -1207,23 +1162,18 @@
printk("DO NOT disconnect after doing ping...\n");
//lp_disconnect(hci_handle);
}
- }=20=20=20=20
break;
+ }=20=20=20=20
=20=20=20=20=20=20=20=20
- case SIG_INFORSP: {=20=20
+ case SIG_INFORSP:
info =3D (sig_info_rsp *)(rsp->data);
D_STATE(FNC"Got info response : result %d\n", info->result);
- }=20=20=20=20
break;
-=20=20=20=20=20=20=20
- default: {
=20=20=20=20=20=20=20=20=20
+ default:
/* Not a valid command */
DSYS(FNC"Invalid command 0x%x\n", rsp->code);
- l2cap_cmdrej(con->hci_hdl, CMDREJ_NOTUNDERSTOOD,
- NULL, 0);
- }
-=20=20=20=20=20=20=20
+ l2cap_cmdrej(con->hci_hdl, CMDREJ_NOTUNDERSTOOD, NULL, 0);
break;
}
=20=09
@@ -1330,7 +1280,6 @@
}
=20=09
if (status =3D=3D 0) {
-=09=09
/* pos cfm */
con->hci_hdl =3D con_hdl;
con->link_up =3D TRUE;
@@ -1353,11 +1302,9 @@
}
=20=09=09
if (!(con->initiator)) {=09=09
-=09=09=09
D_STATE("we are server\n");
/* now wait for a connection request */
} else {
-=09=09=09
D_STATE("we are client\n");
PRINTPKT("lp_connect_cfm : HCI connected to ",=20
bd_addr,6);
@@ -1379,7 +1326,6 @@
l2cap_connect_req(con, con->psm);
}
} else {
-=09=09=20
/* neg cfm */
D_STATE("lp_connect_cfm : (neg) %s\n",get_err_msg(status));
con->link_up =3D FALSE;
@@ -1416,7 +1362,6 @@
SHOW_LIST();
=20
while (((con =3D get_con_hcihdl(con_hdl)) !=3D NULL)) {
-
D_STATE("l2cap connection (%d:%d) found on handle %d\n",=20
con->local_cid, con->remote_cid, con_hdl);
D_STATE("now closing it...\n");
@@ -1474,7 +1419,6 @@
{=20=20
PRINTPKT("process_frame : ", data, len);
=20
-=09
if (len > (con->local_mtu)) {
DSYS("l2cap process_frame : len > local_mtu (%d/%d)\n",=20
len- L2CAP_HDRSIZE, con->local_mtu);
@@ -1483,7 +1427,6 @@
return;
}=20
=20
-=09
get_upper(con->psm)->receive_data(con, data, len);
}
=20
@@ -1524,7 +1467,6 @@
return -1;
}
=20=09
-
/* bd is big endian, reverse byte order to little endian */
for (i =3D 0;i<6;i++) {
rev_bd[5-i] =3D bd[i];
@@ -1559,7 +1501,6 @@
=20
/* if this physical bd link exist for another l2cap con, use that!*/
if (tmpcon) {
-
D_STATE("l2ca_connect_req : hci handle already exist.\n");
con->hci_hdl =3D tmpcon->hci_hdl;
con->link_up =3D 1;
@@ -1595,7 +1536,6 @@
/* should already be in CONFIG state */
=20
if (con->current_state =3D=3D CONFIG) {=20=20
-
/* local mtu is set in l2cap_config_req */
=20
#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
@@ -1606,14 +1546,12 @@
flush_timeout, link_to);=20=20
=20
} else if (con->current_state =3D=3D CLOSED) {
-
l2ca_config_cfm(con, CONF_REJ);
return -1;
} else if (con->current_state =3D=3D OPEN) {
-
printk("l2ca_config_req: state OPEN, reconfiguration !\n");
=20
- /* Fixme -=20
+ /* FIXME -=20
Is data automatically suspended while reconfiguring ?
*/
=20
@@ -1632,7 +1570,6 @@
flush_timeout, link_to);=20=20
return -1;
} else {
-
D_ERR("l2cap_config_req : invalid state\n");
PRINTSTATE(con);
return -1;
@@ -1696,18 +1633,13 @@
result =3D l2cap_connect_rsp(con, response, status);
=20=09
if (response =3D=3D RES_SUCCESS) {=20=20
-
ENTERSTATE(con, CONFIG);
PRINTSTATE(con);
-
}=20
else if (response =3D=3D RES_PENDING){
-=09=09
/* remain in */
-
}
else if (response >=3D RES_PSMNEG) {
-
/* 'l2ca_connect_rsp_neg()' */
ENTERSTATE(con, CLOSED);
PRINTSTATE(con);
@@ -1789,7 +1721,6 @@
SHOW_CON("disconnecting : ", con);
=20
if (con->current_state =3D=3D W4_L2CA_DISCONNECT_RSP) {
-
/* if we got a link down unexpectedly we cannot send=20
back a response, send nothing... */
if (con->link_up)
@@ -1910,7 +1841,6 @@
return hci_send_data(tx);
}
=20
-
/* only specify inparam if it differs from default value */
s32=20
l2cap_config_req(l2cap_con *con, u16 in_mtu, flow *outflow,
@@ -2074,7 +2004,6 @@
start_rtx(con, RTX_TIMEOUT);
#endif
return hci_send_data(tx);
-
}
=20
s32=20
@@ -2123,8 +2052,6 @@
return hci_send_data(tx);
}
=20
-
-
s32=20
l2cap_echo_rsp(s32 hci_hdl, s32 id, u8 *opt_data, s32 opt_len)
{
@@ -2307,8 +2234,7 @@
/****************************/
=20
s32=20
-l2cap_connect_rsp(l2cap_con* con, u16 response,=20
- u16 status)
+l2cap_connect_rsp(l2cap_con* con, u16 response, u16 status)
{
bt_tx_buf *tx;=20
l2cap_tx_buf *l2cap_buf; /* Entire l2cap frame + lower layer hdrs */
@@ -2338,8 +2264,7 @@
=20
if ((rsp->result =3D response) =3D=3D RES_PENDING)
rsp->status =3D status;
- else=20=20
- {
+ else {
printk("Result not pending, force status =3D no further info\n");
rsp->status =3D STAT_NOINFO;
}
@@ -2356,11 +2281,10 @@
tx->cur_len =3D L2CAP_HDRSIZE + payload_len; /* Increased when lower
layers add header data */
return hci_send_data(tx);=20=20
-};
+}
=20=20
s32=20
-l2cap_config_rsp(l2cap_con* con, u32 out_mtu,=20
- flow *in_flow)
+l2cap_config_rsp(l2cap_con* con, u32 out_mtu, flow *in_flow)
{
bt_tx_buf *tx;=20
l2cap_tx_buf *l2cap_buf; /* Entire l2cap frame + lower layer hdrs */
@@ -2371,8 +2295,7 @@
D_XMIT("l2cap_config_rsp : rcid : %d, out_mtu: %d \n",=20
con->remote_cid, out_mtu);
#if 0
- if (result !=3D RES_SUCCESS)
- {
+ if (result !=3D RES_SUCCESS) {
/* FIXME -- send back negative response */
DSYS("FIXME !!!!!!!!!!!!!!!!!!!!!!!! neg config rsp\n");
}
@@ -2413,8 +2336,7 @@
layers add header data */
PRINTPKT("config rsp : ", l2cap_buf, L2CAP_HDRSIZE + payload_len);
return hci_send_data(tx);
-
-};
+}
=20
s32=20
l2cap_disconnect_rsp(l2cap_con* con /*FIXME - , u16 status*/)
@@ -2469,14 +2391,12 @@
D_XMIT("l2cap_send_data : hdl : %d, rcid : %d, len:%d \n",
con->hci_hdl, con->remote_cid, tx->cur_len);
=20=09
- if (PARANOIA_CHECKCON(con))
- {
+ if (PARANOIA_CHECKCON(con)) {
D_ERR("%s l.%d NULL/magic failed\n", __FILE__, __LINE__);
return -1;
}
=20
- if (tx->cur_len > con->remote_mtu)
- {
+ if (tx->cur_len > con->remote_mtu) {
D_ERR("%s tries to send more than remote mtu, ignore\n",=20
psm2str(con->psm));
=20=09=20=20=20=20
@@ -2487,8 +2407,7 @@
}
=20
/* Only send on an OPEN channel */
- if (con->current_state!=3DOPEN)
- {
+ if (con->current_state !=3D OPEN) {
D_ERR("l2cap_send_data : not in open state\n");
D_ERR("SETTING FLUSHED ON THIS BUFFER !!!\n");
tx->flushed=3D1;
@@ -2522,7 +2441,6 @@
D_STATE("l2ca_connect_ind : remote cid : %d psm 0x%x\n",=20
con->remote_cid, con->psm);
=20
-
if (get_upper(con->psm) =3D=3D &default_protocol) {
D_STATE("l2ca_connect_ind : PSM not registered\n");
l2ca_connect_rsp(con, RES_PSMNEG, STAT_NOINFO);
@@ -2546,7 +2464,6 @@
get_upper(con->psm)->con_pnd(con, status);=20
}
=20
-
void=20
l2ca_connect_cfm(l2cap_con *con, s32 result)
{
@@ -2561,7 +2478,6 @@
get_upper(con->psm)->con_cfm(con, result);=20
}
=20
-
void=20
l2ca_config_ind(l2cap_con* con)
{=20=20
@@ -2570,7 +2486,6 @@
get_upper(con->psm)->conf_ind(con);=20
}
=20
-
/* according to spec this could be sent to upper layers after=20
receiving a config req but some stacks send their conf req=20
before sending their response we don't send cfm upwards
@@ -2627,8 +2542,6 @@
#endif
}
=20
-=20
-
s32 l2ca_ping(BD_ADDR bd)
{
l2cap_con *con;
@@ -2646,13 +2559,11 @@
=20=09
con =3D get_con(rev_bd, ANY_STATE);
=20
- if (!con)
- {
+ if (!con) {
D_STATE("l2ca_ping : create new baseband link\n");
con =3D create_con(0/* not yet set */,=20
get_cid(), 0/* not yet set */);
- if (con =3D=3D NULL)
- {
+ if (con =3D=3D NULL) {
D_ERR("l2ca_ping : no connection created");
return -1;
}
@@ -2664,9 +2575,7 @@
insert_con(con);
/* l2cap_echo_req is called in lp_connect_cfm */
return lp_connect_req(con->remote_bd);
- }
- else
- {
+ } else {
/* use existing handle */
D_STATE("l2ca_ping : using existing handle\n");
con->ping_sent=3D1;
@@ -2709,13 +2618,11 @@
=20=09
con =3D get_con(rev_bd, ANY_STATE);
=20
- if (!con)
- {
+ if (!con) {
D_STATE("l2ca_getinfo : create new baseband link\n");
con =3D create_con(0/* not yet set */,=20
get_cid(), 0/* not yet set */);
- if (con =3D=3D NULL)
- {
+ if (con =3D=3D NULL) {
D_ERR("l2ca_getinfo : no connection created");
return -1;
}
@@ -2730,9 +2637,7 @@
#endif
/* l2cap_echo_req is called in lp_connect_cfm */
return lp_connect_req(con->remote_bd);
- }
- else
- {
+ } else {
/* use existing handle */
D_STATE("l2ca_getinfo : using existing handle\n");
con->inforeq_sent =3D 1;
@@ -2782,12 +2687,10 @@
=20=20
// return;
=20=20=20
- if (timer_cancelled)
- {
+ if (timer_cancelled) {
D_TIM("RTX timer already cancelled\n");
return;
}
-
#endif
=20
/* do some paranoia checks */
@@ -2809,15 +2712,12 @@
=20=20=20
/* FIXME -- send l2ca_timeoutind() */
=20
- if (MAX_NO_RTX =3D=3D 0)
- {
+ if (MAX_NO_RTX =3D=3D 0) {
/* no retransmissions, shutdown connection */
printk("NO retransmissions, lets shutdown connection...\n");
l2ca_disconnect_req(con);
return;
- }=20=20
- else if (con->last_cmd.nbr_resends =3D=3D MAX_NO_RTX)
- {
+ } else if (con->last_cmd.nbr_resends =3D=3D MAX_NO_RTX) {
/* notify upper layers that link is going down */
=20=09=20=20
/* FIXME l2ca_disconnect_ind */
@@ -2835,7 +2735,6 @@
=20
/* now resend command */
switch(con->last_cmd.type) {
-
case SIG_CONREQ:
D_TIM("resending connection request\n");
l2cap_connect_req(con, con->psm);
@@ -2864,7 +2763,6 @@
case SIG_INFOREQ:
/* FIXME */
D_TIM("resending echo request NOT\n");
-=09=20=20
break;
=20=20=20
default:
@@ -2897,10 +2795,8 @@
printk("use NO timer...\n");
return;
#else
-
struct itimerval t =3D {{0,0},{timeout, 0}};
=20=20=20
-=20=20
D_TIM("Starting RTX timer (%d sec)\n", timeout);
=20
if (timeout_con)
@@ -2999,7 +2895,6 @@
opt =3D (l2cap_option*)(data + pos);
switch (opt->type) {
case OPT_MTU:
-
con->remote_mtu =3D *((u16*)opt->option_data);
=20
if ((con->remote_mtu < MTU_MIN) &&=20
@@ -3017,11 +2912,9 @@
con->local_cid, con->remote_cid,=20
con->remote_mtu);
found_option =3D 1;
-=09=09=09
break;
=20=20=20=20=20=20=20
case OPT_FLUSH:
-
con->flush_timeout =3D *((u16*)opt->option_data);
=20
/* FIXME -- return error code if not accepted */
@@ -3035,7 +2928,6 @@
break;
=20=20=20=20=20=20=20
case OPT_QOS:
-
memcpy((u8*)&con->remote_qos, opt->option_data,=20
sizeof(struct flow));
=20=09=09=09
@@ -3089,7 +2981,6 @@
return l2cap->id_count++;
};
=20
-
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -=
- */
=20
s32 l2cap_sprint_bd(u8 *buf, BD_ADDR bd)=20
@@ -3128,7 +3019,6 @@
printk("NULL !\n");
return;
} else {
-=09=09
printk("flow:\n");
printk("flags:%d service:%d token_rate:%d\n",
f->flags, f->service, (int) f->token_rate);
|
|
From: Peter K. <pk...@us...> - 2001-03-05 16:37:58
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
l2cap.c 1.89 1.90=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Made user stack version compile without CONFIG_BLUETOOTH_L2CAP_USE_TIMERS.
The diff of the modified file(s):
--- l2cap.c 2001/03/05 15:52:52 1.89
+++ l2cap.c 2001/03/05 16:39:35 1.90
@@ -2768,6 +2768,7 @@
}
=20
=20
+#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
#ifdef __KERNEL__
void
l2cap_rtx_timeout(unsigned long ptr)
@@ -2808,7 +2809,6 @@
=20=20=20
/* FIXME -- send l2ca_timeoutind() */
=20
-#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
if (MAX_NO_RTX =3D=3D 0)
{
/* no retransmissions, shutdown connection */
@@ -2832,7 +2832,6 @@
delete_con(con);
return;
}
-#endif
=20
/* now resend command */
switch(con->last_cmd.type) {
@@ -2917,7 +2916,7 @@
timer_cancelled =3D 0;
#endif
}
-#endif
+#endif /* __KERNEL__ */
=20
void
disable_rtx(l2cap_con *con)
@@ -2931,7 +2930,6 @@
#endif
}
=20
-
void
l2cap_ertx_timeout(unsigned long ptr)
{
@@ -2950,8 +2948,6 @@
/* if sending new request start RTX again */
=20
/* terminate for now */
-=09
-=09
}
=20
void
@@ -2965,8 +2961,7 @@
{
D_TIM("Disabling ERTX timer\n");
}
-
-
+#endif /* CONFIG_BLUETOOTH_L2CAP_USE_TIMERS */
=20
/***************************************************************/
/*--------------------- MISCELLANEOUS ------------------------ */
|
|
From: Peter K. <pk...@us...> - 2001-03-05 16:31:59
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btconfig.h 1.22 1.23=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Moved configuration options that cannot be set using the kernel
configurator to be outside the check for CONFIG_BLUETOOTH.
The diff of the modified file(s):
--- btconfig.h 2001/03/05 15:53:03 1.22
+++ btconfig.h 2001/03/05 16:33:36 1.23
@@ -80,30 +80,10 @@
* HCI *
***************/
=20
-/*=20
- HCI emulation enables using the stack without any bluetooth hardware.=
=20
- With this option defined you can test the stack by connecting two Linux=
=20
- machines with a nullmodem cabel. (If you are defining this you must sta=
rt=20
- btd with no hw init)=20
-*/
-
-//#define HCI_EMULATION
-
/* This should be defined if you are using Ericsson firmware that is
older than P9A */
#undef CONFIG_BLUETOOTH_SET_BAUDRATE_BLOCKING
=20
-/* This define is used during test of the host flow control */
-//#define HOST_FLOW_CTRL
-
-#ifdef __KERNEL__
-/* Don't define these four, they are only used for AXIS internal tests */
-//#define EMC_TEST
-//#define EMC_TEST_INITIATOR
-//#define EMC_LISTNER_ADDR 0x1810ce
-//#define EMC_TEST_DATA_SIZE 678
-#endif
-
/****************
* L2CAP *
****************/
@@ -119,3 +99,26 @@
* SDP *
***************/
#endif /* CONFIG_BLUETOOTH */
+
+/*************************************************************************=
**/
+
+/* The following configurations cannot be set using the kernel
+ configuration tools */
+
+/* HCI emulation enables using the stack without any bluetooth hardware.=
=20
+ With this option defined you can test the stack by connecting two Linux=
=20
+ machines with a nullmodem cabel. (If you are defining this you must sta=
rt=20
+ btd with no hw init) */
+
+//#define HCI_EMULATION
+
+/* This define is used during test of the host flow control */
+//#define HOST_FLOW_CTRL
+
+#ifdef __KERNEL__
+/* Don't define these four, they are only used for AXIS internal tests */
+//#define EMC_TEST
+//#define EMC_TEST_INITIATOR
+//#define EMC_LISTNER_ADDR 0x1810ce
+//#define EMC_TEST_DATA_SIZE 678
+#endif
|
|
From: Peter K. <pk...@us...> - 2001-03-05 15:56:46
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Config.in 1.6 1.7=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added configuration option to specify which pin on the ETRAX 100 to
use when resetting the Bluetooth hardware.
The diff of the modified file(s):
--- Config.in 2001/03/05 15:56:44 1.6
+++ Config.in 2001/03/05 15:58:22 1.7
@@ -26,6 +26,12 @@
if [ "$CONFIG_BLUETOOTH_ERICSSON" =3D "y" ]; then
bool ' Block when setting baudrate' CONFIG_BLUETOOTH_SET_BAUDRATE_BLO=
CKING
fi
+
+ choice ' Bluetooth reset pin' \
+ "None CONFIG_BLUETOOTH_RESET_NONE \
+ Port_PA_Bit_7 CONFIG_BLUETOOTH_RESET_PA7 \
+ Port_PB_Bit_5 CONFIG_BLUETOOTH_RESET_PB5 \
+ Port_G_Bit_10 CONFIG_BLUETOOTH_RESET_G10" None
fi
=20
endmenu
|
|
From: Peter K. <pk...@us...> - 2001-03-05 15:55:08
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Config.in 1.5 1.6=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Removed the extra endmenu. It was obviously incorrect, and it prevented make menuconfig from working for me. The diff of the modified file(s): --- Config.in 2001/03/05 15:52:52 1.5 +++ Config.in 2001/03/05 15:56:44 1.6 @@ -29,7 +29,3 @@ fi =20 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 |
|
From: Peter K. <pk...@us...> - 2001-03-05 15:51:26
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btconfig.h 1.21 1.22=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Made it possible to configure the use of a Security Manager and TCI using the kernel configuration. The diff of the modified file(s): --- btconfig.h 2001/03/05 15:40:30 1.21 +++ btconfig.h 2001/03/05 15:53:03 1.22 @@ -51,7 +51,7 @@ ******************/ =20 /* Use TCI layer or not */ -//#define USE_TCI +#undef CONFIG_BLUETOOTH_USE_TCI =20 /* use of /proc files to read status information */ #define CONFIG_BLUETOOTH_PROC @@ -60,9 +60,9 @@ #undef CONFIG_BLUETOOTH_USE_INBUFFER =20 #ifdef __CRIS__ -#define USE_SECURITY_MANAGER +#define CONFIG_BLUETOOTH_USE_SECURITY_MANAGER #else -#undef USE_SECURITY_MANAGER +#undef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER #endif =20 /* Bluetooth HW defines used to setup different HW and to cope with=20 |
|
From: Peter K. <pk...@us...> - 2001-03-05 15:51:16
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Config.in 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
bluetooth.c 1.135 1.136=20=20=20=20=20=20=20=20=20=20=20
l2cap.c 1.88 1.89=20=20=20=20=20=20=20=20=20=20=20=20
rfcomm.c 1.91 1.92=20=20=20=20=20=20=20=20=20=20=20=20
sec_client.c 1.12 1.13=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Made it possible to configure the use of a Security Manager and
TCI using the kernel configuration.
The diff of the modified file(s):
--- Config.in 2001/03/05 15:39:07 1.4
+++ Config.in 2001/03/05 15:52:52 1.5
@@ -10,8 +10,10 @@
=20
bool ' Bluetooth proc entries' CONFIG_BLUETOOTH_PROC
bool ' Input buffering' CONFIG_BLUETOOTH_USE_INBUFFER
+ bool ' Use Security Manager' CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
bool ' Use L2CAP timers' CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
bool ' Allow connectionless L2CAP' CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
+ bool ' Enable TCI' CONFIG_BLUETOOTH_USE_TCI
=20
choice ' Bluetooth hardware type' \
"None CONFIG_BLUETOOTH_NOINIT \
--- bluetooth.c 2001/03/05 15:39:07 1.135
+++ bluetooth.c 2001/03/05 15:52:52 1.136
@@ -60,7 +60,7 @@
#include <linux/bluetooth/tcs.h>
#include <linux/bluetooth/sdp.h>
#include <linux/bluetooth/sec_client.h>
-#ifdef USE_TCI
+#ifdef CONFIG_BLUETOOTH_USE_TCI
#include <linux/bluetooth/tci.h>
#endif
=20
@@ -2007,7 +2007,7 @@
procfs_status);
}
=20
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
@@ -2039,7 +2039,7 @@
D_ERR("Couldn't register proc file for security manager %d\n",
procfs_status);
}
-#endif /* USE_SECURITY_MANAGER */
+#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
=20
#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
@@ -2066,7 +2066,7 @@
procfs_status);
}
=20
-#ifdef USE_TCI
+#ifdef CONFIG_BLUETOOTH_USE_TCI
#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
@@ -2090,7 +2090,7 @@
D_ERR("Couldn't register proc file for tci database %d\n",
procfs_status);
}
-#endif /* USE_TCI */
+#endif /* CONFIG_BLUETOOTH_USE_TCI */
=20=09
#endif /* CONFIG_BLUETOOTH_PROC */
=20
@@ -2146,7 +2146,7 @@
hci_init();
l2cap_init();
=20
-#ifdef USE_TCI
+#ifdef CONFIG_BLUETOOTH_USE_TCI
tci_init();
#else
rfcomm_init();
@@ -2653,23 +2653,23 @@
remove_proc_entry(bt_internal_info.name, &proc_root);
remove_proc_entry(sdp_proc_entry.name, &proc_root);
remove_proc_entry(bt_proc_doit.name, &proc_root);
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
remove_proc_entry(sec_man_proc_entry.name, &proc_root);
-#endif /* USE_SECURITY_MANAGER */
-#ifdef USE_TCI
+#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
+#ifdef CONFIG_BLUETOOTH_USE_TCI
remove_proc_entry(tci_proc_entry.name, &proc_root);
-#endif /* USE_TCI */
+#endif /* CONFIG_BLUETOOTH_USE_TCI */
#else
proc_unregister(&proc_root, bt_status.low_ino);
proc_unregister(&proc_root, bt_internal_info.low_ino);
proc_unregister(&proc_root, sdp_proc_entry.low_ino);
proc_unregister(&proc_root, bt_proc_doit.low_ino);
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
proc_unregister(&proc_root, sec_man_proc_entry.low_ino);
-#endif /* USE_SECURITY_MANAGER */
-#ifdef USE_TCI
+#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
+#ifdef CONFIG_BLUETOOTH_USE_TCI
proc_unregister(&proc_root, tci_proc_entry.low_ino);
-#endif /* USE_TCI */
+#endif /* CONFIG_BLUETOOTH_USE_TCI */
#endif /* LINUX_VERSION_CODE */
#endif /* CONFIG_BLUETOOTH_PROC */
=20=09
--- l2cap.c 2001/03/05 15:39:07 1.88
+++ l2cap.c 2001/03/05 15:52:52 1.89
@@ -307,7 +307,7 @@
#endif /* LINUX_VERSION_CODE */
#endif /* __KERNEL__ */
=20
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
/* Initialize security */
l2cap_sec_man_init();
#endif
@@ -713,7 +713,7 @@
con->conf_req_ready=3DFALSE;
con->conf_rsp_ready=3DFALSE;
=20
-#ifdef USE_SECURITY_MANAGER=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20
l2cap_check_allowed_security(con->psm, con->remote_bd, con=
);
#else
l2ca_connect_ind(con);
--- rfcomm.c 2001/03/02 21:52:15 1.91
+++ rfcomm.c 2001/03/05 15:52:52 1.92
@@ -484,7 +484,7 @@
rpn_val.xoff_u8 =3D 0x13;
memset(&rpn_val.pm, 0 , 2); /* Set the mask to zero */
=20=20=20=20=20=20=20=20=20
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
rfcomm_sec_man_init();
#endif
}
@@ -924,7 +924,7 @@
D_REC(FNC"setting server channel %d\n",
short_pkt->h.addr.server_chn);
=20
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
rfcomm_check_allowed_security(rfcomm->l2cap->remot=
e_bd,
tmp_dlci, rfcomm);
#else
@@ -949,7 +949,7 @@
D_CTRL(FNC"sending back UA - other channel\n");
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20
send_ua(rfcomm, tmp_dlci);
-#endif /* USE_SECURITY_MANAGER */
+#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
} else {
=20
D_CTRL(FNC"no server on channel %d, sending DM\n",
--- sec_client.c 2001/03/03 15:33:00 1.12
+++ sec_client.c 2001/03/05 15:52:52 1.13
@@ -282,8 +282,9 @@
__FILE__, __LINE__);
=20
/* *** NOTE ***=20
- * define USE_SECURITY_MANAGER to 0 in btconfig.h if you=20
- * don't know what this is...
+ * Make sure CONFIG_BLUETOOTH_USE_SECURITY_MANAGER is
+ * undefined (either in kernel configuration or in btconfig.h)
+ * if you don't know what this is...
*/
=20
}
|
|
From: Peter K. <pk...@us...> - 2001-03-05 15:38:54
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btconfig.h 1.20 1.21=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):
--- btconfig.h 2001/03/05 15:13:14 1.20
+++ btconfig.h 2001/03/05 15:40:30 1.21
@@ -57,7 +57,7 @@
#define CONFIG_BLUETOOTH_PROC
=20
/* Used to decrease overruns on serial port (see bluetooth.c) */
-#undef CONFIG_BLUETOOTH_USEINBUFFER
+#undef CONFIG_BLUETOOTH_USE_INBUFFER
=20
#ifdef __CRIS__
#define USE_SECURITY_MANAGER
@@ -69,12 +69,12 @@
limitations in HW */
=20
/* This sets current HW */
-#undef CONFIG_BLUETOOTH_CSR=20=20=20=20=20=20=20=20
#undef CONFIG_BLUETOOTH_NOINIT=20=20=20=20=20
+#undef CONFIG_BLUETOOTH_CSR=20=20=20=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
+#undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20
+#undef CONFIG_BLUETOOTH_USBMODULE /* Not implemented */
=20
/***************
* HCI *
@@ -89,8 +89,9 @@
=20
//#define HCI_EMULATION
=20
-/* This should be defined if you are using the Ericsson P9A firmware */
-#define CONFIG_BLUETOOTH_ERICSSON_P9A
+/* This should be defined if you are using Ericsson firmware that is
+ older than P9A */
+#undef CONFIG_BLUETOOTH_SET_BAUDRATE_BLOCKING
=20
/* This define is used during test of the host flow control */
//#define HOST_FLOW_CTRL
@@ -107,17 +108,14 @@
* L2CAP *
****************/
=20
-#define CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#define CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
#undef CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
=20
/*****************
* RFCOMM *
*****************/
=20
-
-
/***************
* SDP *
***************/
-
#endif /* CONFIG_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 */
|
|
From: Peter K. <pk...@us...> - 2001-03-05 15:11:37
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btconfig.h 1.19 1.20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Removed CONFIG_BLUETOOTH_HCI_USB. The diff of the modified file(s): --- btconfig.h 2001/03/04 17:54:54 1.19 +++ btconfig.h 2001/03/05 15:13:14 1.20 @@ -103,8 +103,6 @@ //#define EMC_TEST_DATA_SIZE 678 #endif =20 -#define CONFIG_BLUETOOTH_HCI_USB - /**************** * L2CAP * ****************/ |
|
From: Peter K. <pk...@us...> - 2001-03-05 15:10:45
|
The following files were modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- Config.in 1.2 1.3=20=20=20=20=20=20=20=20=20=20=20=20=20 hci_vendor.c 1.13 1.14=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Removed CONFIG_BLUETOOTH_HCI_USB. The diff of the modified file(s): --- Config.in 2001/03/04 17:54:54 1.2 +++ Config.in 2001/03/05 15:12:21 1.3 @@ -10,7 +10,6 @@ =20 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 =20 --- hci_vendor.c 2001/03/04 17:54:54 1.13 +++ hci_vendor.c 2001/03/05 15:12:21 1.14 @@ -53,9 +53,7 @@ #include <linux/bluetooth/bluetooth.h> #include <linux/bluetooth/btmem.h> #include <linux/delay.h> -#ifdef CONFIG_BLUETOOTH_HCI_USB #include <linux/interrupt.h> -#endif #else /* user mode */ #include <stdlib.h> #include <string.h> |
|
From: Mattias ?g. <mat...@us...> - 2001-03-05 11:15:48
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Comment
---- ----------- ----------- -------
modememul.c 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Only reply CONNECT (without OK) when receiving ATD... in modem emulator
The diff of the modified file(s):
--- modememul.c 2001/03/02 10:59:57 1.1
+++ modememul.c 2001/03/05 11:17:24 1.2
@@ -198,8 +198,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 !");
|
2 messages has been excluded from this view by a project administrator.
