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-02-27 17:08:00
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.c 1.127 1.128=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * added generic wait queue timer which wakes up a blocking call if there=20 is no response. * added call to start_wq_timer before going to sleep in bt_connect and bt_disconnect * added bt_disconnect_cfm * added debug for reset pins * removed some debug * minor changes |
|
From: Mats F. <ma...@us...> - 2001-02-27 16:40:37
|
The following file was modified in apps/bluetooth/btd:
Name Old version New version Comment
---- ----------- ----------- -------
btd.c 1.78 1.79=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Removed change in modem_emulator
The diff of the modified file(s):
--- btd.c 2001/02/27 15:53:01 1.78
+++ btd.c 2001/02/27 16:41:46 1.79
@@ -1795,7 +1795,7 @@
return SEND_OK;
}
else
- return DO_PPP;
+ return SEND_OK;
}
=20
void modem_emulator(int bt_fd, char *data, int len)
|
|
From: Mats F. <ma...@us...> - 2001-02-27 15:51:52
|
The following file was modified in apps/bluetooth/btd: Name Old version New version Comment ---- ----------- ----------- ------- btd.c 1.77 1.78=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added parameters for the inquiry command Made some changes in the modem emulator, that solved some client problems |
|
From: Mats F. <ma...@us...> - 2001-02-27 15:45:35
|
The following file was modified in apps/bluetooth/btd:
Name Old version New version Comment
---- ----------- ----------- -------
btd.h 1.32 1.33=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added IOCTL for read scan enable
Added parameter for inquiry time
The diff of the modified file(s):
--- btd.h 2001/02/15 16:31:01 1.32
+++ btd.h 2001/02/27 15:46:44 1.33
@@ -103,14 +103,15 @@
#define HCIWRITESTOREDLINKKEY _IOWR(BT_IOC_MAGIC, 0x34, unsigned char[22])
#define HCIDELETESTOREDLINKKEY _IOWR(BT_IOC_MAGIC, 0x35, unsigned char[7])
#define HCISETLOCALNAME _IOW(BT_IOC_MAGIC, 0x36, unsigned char[248])
-#define HCIWRITESCANENABLE _IOW(BT_IOC_MAGIC, 0x37, unsigned int)
-#define HCIWRITEPAGESCANACTIVITY _IOW(BT_IOC_MAGIC, 0x38, unsigned int[2])
-#define HCIWRITECLASSOFDEVICE _IOW(BT_IOC_MAGIC, 0x39, unsigned char[3])
-#define HCIREAD_AUTHENTICATION_ENABLE _IOR(BT_IOC_MAGIC, 0x3a, int)
-#define HCIWRITE_AUTHENTICATION_ENABLE _IOWR(BT_IOC_MAGIC, 0x3b, int)
-#define HCIREAD_ENCRYPTION_MODE _IOR(BT_IOC_MAGIC, 0x3c, int)
-#define HCIWRITE_ENCRYPTION_MODE _IOWR(BT_IOC_MAGIC, 0x3d, int)
-#define HCISET_EVENT_FILTER _IOW(BT_IOC_MAGIC, 0x3e, unsigned char[3])
+#define HCIREADSCANENABLE _IOR(BT_IOC_MAGIC, 0x37, int)
+#define HCIWRITESCANENABLE _IOW(BT_IOC_MAGIC, 0x38, int)
+#define HCIWRITEPAGESCANACTIVITY _IOW(BT_IOC_MAGIC, 0x39, unsigned int[2])
+#define HCIWRITECLASSOFDEVICE _IOW(BT_IOC_MAGIC, 0x3a, unsigned char[3])
+#define HCIREAD_AUTHENTICATION_ENABLE _IOR(BT_IOC_MAGIC, 0x3b, int)
+#define HCIWRITE_AUTHENTICATION_ENABLE _IOWR(BT_IOC_MAGIC, 0x3c, int)
+#define HCIREAD_ENCRYPTION_MODE _IOR(BT_IOC_MAGIC, 0x3d, int)
+#define HCIWRITE_ENCRYPTION_MODE _IOWR(BT_IOC_MAGIC, 0x3e, int)
+#define HCISET_EVENT_FILTER _IOW(BT_IOC_MAGIC, 0x3f, unsigned char[3])
=20
/* Informational Parameters */
#define HCIREADLOCALBDADDR _IOR(BT_IOC_MAGIC, 0x45, unsigned char[6])
@@ -159,6 +160,7 @@
=20
typedef struct inquiry_results {
unsigned int nbr_of_units;
+ unsigned int inq_time;
unsigned char bd_addr[0];
} inquiry_results;
=20
|
|
From: Mats F. <ma...@us...> - 2001-02-27 15:32:45
|
The following file was modified in apps/bluetooth/userstack: Name Old version New version Comment ---- ----------- ----------- ------- unplug_test.c 1.12 1.13=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added some sdp tests |
|
From: Mats F. <ma...@us...> - 2001-02-27 15:31:08
|
The following files were modified in apps/bluetooth/sdp_server: Name Old version New version Comment ---- ----------- ----------- ------- sdp_parser.c 1.8 1.9=20=20=20=20=20=20=20=20=20=20=20=20=20 sdp_server.c 1.16 1.17=20=20=20=20=20=20=20=20=20=20=20=20 sdp_server.h 1.6 1.7=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Fixed problem with to many DES in SA response Fixed problem with multiple services Fixed problem with return of empty attribute in SSA response |
|
From: Mats F. <ma...@us...> - 2001-02-27 15:27:47
|
The following file was modified in apps/bluetooth/sdp_server: Name Old version New version Comment ---- ----------- ----------- ------- sdp.xml 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added service classes for=20 * ServiceDiscoveryServerServiceClassID * BrowseGroupDescriptorServiceClassID * DigianswerNetwork |
|
From: Mats F. <ma...@us...> - 2001-02-27 15:24:01
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- hci_vendor.c 1.9 1.10=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Changed char to u8 The diff of the modified file(s): --- hci_vendor.c 2001/02/15 16:27:33 1.9 +++ hci_vendor.c 2001/02/27 15:25:10 1.10 @@ -91,7 +91,7 @@ extern struct wait_queue *set_baudrate_wq; extern hci_controller hci_ctrl; =20 -char bt_hw_firmware_info[255]; +u8 bt_hw_firmware_info[255]; =20 /****************** FUNCTION DEFINITION SECTION **************************= ***/ =20 |
|
From: Mats F. <ma...@us...> - 2001-02-27 15:23:11
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.c 1.126 1.127=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Do not include tci.h, when TCI isn't in use The diff of the modified file(s): --- bluetooth.c 2001/02/27 15:03:50 1.126 +++ bluetooth.c 2001/02/27 15:24:20 1.127 @@ -59,8 +59,10 @@ #include <linux/bluetooth/rfcomm.h> #include <linux/bluetooth/tcs.h> #include <linux/bluetooth/sdp.h> -#include <linux/bluetooth/tci.h> #include <linux/bluetooth/sec_client.h> +#ifdef USE_TCI +#include <linux/bluetooth/tci.h> +#endif =20 #ifdef BT_USE_PROC #include <linux/bluetooth/bt_proc.h> |
|
From: Mats F. <ma...@us...> - 2001-02-27 15:10:25
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- sdp.h 1.22 1.23=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added parameter to init SDP as client or server The diff of the modified file(s): --- sdp.h 2001/02/15 16:28:47 1.22 +++ sdp.h 2001/02/27 15:11:33 1.23 @@ -63,7 +63,7 @@ =20 extern struct proc_dir_entry sdp_proc_entry; =20 -void sdp_init(void); +void sdp_init(s32 server); void sdp_shutdown(void); s32 sdp_connect_req(u8* bd_addr); void sdp_connect_ind(l2cap_con *l2cap); @@ -75,6 +75,7 @@ void sdp_disconnect_ind(l2cap_con *l2cap); void sdp_disconnect_cfm(l2cap_con *l2cap); void sdp_receive_data(l2cap_con *l2cap, u8* data, u32 len); +s32 sdp_send_data(sdp_con *sdp, u8 *data, u32 len); =20 #endif /****************** END OF FILE sdp.h ************************************= ***/ |
|
From: Mats F. <ma...@us...> - 2001-02-27 15:08:00
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
hci.h 1.44 1.45=20=20=20=20=20=20=20=20=20=20=20=20
hci_internal.h 1.8 1.9=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Moved typedef of cmp_pkt to hci.c
The diff of the modified file(s):
--- hci.h 2001/02/15 16:28:46 1.44
+++ hci.h 2001/02/27 15:09:09 1.45
@@ -62,6 +62,21 @@
/* check in l2cap that MTU doesn't exceed this value */
#define HCI_IN_SIZE 800
=20
+
+/* Struct defining a HCI command packet, the meaning of the type field is
+ decribed in part H:4 chapter 2 in the baseband core specification. The
+ other fields are described in section H:1 chapter 4.4.1 in the baseband
+ core specification */=20
+
+typedef struct cmd_pkt {
+ u32 type:8;
+ u32 ocf:10;
+ u32 ogf:6;
+ u32 len:8;
+=20=20=20=20=20=20=20=20
+ u8 data[256];
+} cmd_pkt;
+
/****************** EXPORTED FUNCTION DECLARATION SECTION ****************=
***/
=20
void hci_init(void);
@@ -106,6 +121,7 @@
s32 hci_write_stored_link_key(u8 *bd, u8* link_key);
s32 hci_delete_stored_link_key(u8 *bd, u8 flag);
s32 hci_change_local_name(u8 *new_name);
+s32 hci_read_scan_enable(void);
s32 hci_write_scan_enable(u32 enable);
s32 hci_write_pagescan_activity(u32 interval, u32 wind);
s32 hci_read_authentication_enable(void);
--- hci_internal.h 2001/02/15 16:28:47 1.8
+++ hci_internal.h 2001/02/27 15:09:09 1.9
@@ -291,20 +291,6 @@
=20
/****************** TYPE DEFINITION SECTION ******************************=
***/
=20
-/* Struct defining a HCI command packet, the meaning of the type field is
- decribed in part H:4 chapter 2 in the baseband core specification. The
- other fields are described in section H:1 chapter 4.4.1 in the baseband
- core specification */=20
-
-typedef struct cmd_pkt {
- u32 type:8;
- u32 ocf:10;
- u32 ogf:6;
- u32 len:8;
-=20=20=20=20=20=20=20=20
- u8 data[256];
-} cmd_pkt;
-
/* Struct used to keep track of the current number of buffers, and the siz=
es
of the buffers in the bluetooth module. There are two buffers for data =
in
the modul, ACL buffers for ordinary data and SCO buffers for audion dat=
a.
|
|
From: Mats F. <ma...@us...> - 2001-02-27 15:07:15
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btconfig.h 1.14 1.15=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added define for using TCI The diff of the modified file(s): --- btconfig.h 2001/02/15 16:28:46 1.14 +++ btconfig.h 2001/02/27 15:08:24 1.15 @@ -43,6 +43,9 @@ * General * ******************/ =20 +/* Use TCI layer or not */ +//#define USE_TCI + /* use of /proc files to read status information */ #define BT_USE_PROC =20 |
|
From: Mats F. <ma...@us...> - 2001-02-27 15:06:28
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btcommon.h 1.60 1.61=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added IOCTL for Read Scan Enable
Moved sdp_con
The diff of the modified file(s):
--- btcommon.h 2001/02/16 14:24:29 1.60
+++ btcommon.h 2001/02/27 15:07:36 1.61
@@ -142,14 +142,15 @@
#define HCIWRITESTOREDLINKKEY _IOWR(BT_IOC_MAGIC, 0x34, u8[22])
#define HCIDELETESTOREDLINKKEY _IOWR(BT_IOC_MAGIC, 0x35, u8[7])
#define HCISETLOCALNAME _IOW(BT_IOC_MAGIC, 0x36, u8[248])
-#define HCIWRITESCANENABLE _IOW(BT_IOC_MAGIC, 0x37, u32)
-#define HCIWRITEPAGESCANACTIVITY _IOW(BT_IOC_MAGIC, 0x38, u32[2])
-#define HCIWRITECLASSOFDEVICE _IOW(BT_IOC_MAGIC, 0x39, u8[3])
-#define HCIREAD_AUTHENTICATION_ENABLE _IOR(BT_IOC_MAGIC, 0x3a, s32)
-#define HCIWRITE_AUTHENTICATION_ENABLE _IOWR(BT_IOC_MAGIC, 0x3b, s32)
-#define HCIREAD_ENCRYPTION_MODE _IOR(BT_IOC_MAGIC, 0x3c, s32)
-#define HCIWRITE_ENCRYPTION_MODE _IOWR(BT_IOC_MAGIC, 0x3d, s32)
-#define HCISET_EVENT_FILTER _IOW(BT_IOC_MAGIC, 0x3e, u8[3])
+#define HCIREADSCANENABLE _IOR(BT_IOC_MAGIC, 0x37, s32)
+#define HCIWRITESCANENABLE _IOW(BT_IOC_MAGIC, 0x38, s32)
+#define HCIWRITEPAGESCANACTIVITY _IOW(BT_IOC_MAGIC, 0x39, u32[2])
+#define HCIWRITECLASSOFDEVICE _IOW(BT_IOC_MAGIC, 0x3a, u8[3])
+#define HCIREAD_AUTHENTICATION_ENABLE _IOR(BT_IOC_MAGIC, 0x3b, s32)
+#define HCIWRITE_AUTHENTICATION_ENABLE _IOWR(BT_IOC_MAGIC, 0x3c, s32)
+#define HCIREAD_ENCRYPTION_MODE _IOR(BT_IOC_MAGIC, 0x3d, s32)
+#define HCIWRITE_ENCRYPTION_MODE _IOWR(BT_IOC_MAGIC, 0x3e, s32)
+#define HCISET_EVENT_FILTER _IOW(BT_IOC_MAGIC, 0x3f, u8[3])
=20
/* Informational Parameters */
#define HCIREADLOCALBDADDR _IOR(BT_IOC_MAGIC, 0x45, u8[6])
@@ -201,6 +202,14 @@
u8 data[0]; /* The actual data segment to send */
} bt_tx_buf;
=20
+/* TCI layer object */
+typedef struct tci_tx_buf{
+ u8 hci_hdr[5];=20
+ u8 l2cap_hdr[4];
+ u8 frame[0];
+} tci_tx_buf;
+
+
/* SDP layer object */
typedef struct sdp_tx_buf{
u8 hci_hdr[5];=20
@@ -358,6 +367,17 @@
l2cap_con *l2cap;
} rfcomm_con;
=20
+/****************** SDP connection object ****************************/
+enum sdp_states{SDP_DISCONNECTED, SDP_CONNECTING, SDP_CONNECTED};
+
+typedef struct sdp_con{
+ l2cap_con *l2cap;
+ u32 initiator;
+ enum sdp_states state;
+ u32 id;
+}sdp_con;
+
+
/****************** BT connection object ********************************/
=20
/* Connection id (32 bits) |PSM(16 bits)|layer_specific(16 bits)|=A0*/
@@ -425,6 +445,7 @@
=20
typedef struct inquiry_results {
u32 nbr_of_units;
+ u32 inq_time;
u8 bd_addr[0];
} inquiry_results;
=20
@@ -435,7 +456,7 @@
} serport_profile_info;
=20
extern s32 bt_current_hw;
-extern char bt_hw_firmware_info[255];
+extern u8 bt_hw_firmware_info[255];
=20
/* unique status codes 32 bits : | layer 16 bits | code 16 bits | */
=20
|
|
From: Mats F. <ma...@us...> - 2001-02-27 15:04:53
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- sdp.c 1.59 1.60=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Changed FNC to __FUNCTION__ Disconnect all SDP connections when shutting down stack Added sdp_send_data function |
|
From: Mats F. <ma...@us...> - 2001-02-27 15:02:41
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.c 1.125 1.126=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Removed dupplicated declaration of function psmname The diff of the modified file(s): --- bluetooth.c 2001/02/27 14:58:02 1.125 +++ bluetooth.c 2001/02/27 15:03:50 1.126 @@ -219,8 +219,6 @@ void bt_linebuf_send(s32 line); #endif =20 -const u8* psmname(u16 psm); - /****************** GLOBAL VARIABLE DECLARATION SECTION ******************= ***/ =20 /****************** LOCAL VARIABLE DECLARATION SECTION *******************= ***/ |
|
From: Mats F. <ma...@us...> - 2001-02-27 15:00:36
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- rfcomm.c 1.87 1.88=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Fixed multipoint problem when setting default values to rfcomm_con Added check for incorrect length fields in UIH packets |
|
From: Mats F. <ma...@us...> - 2001-02-27 14:59:08
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
l2cap.c 1.82 1.83=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added l2cap_register_default_upper function, to be used by TCI
The diff of the modified file(s):
--- l2cap.c 2001/02/16 14:25:59 1.82
+++ l2cap.c 2001/02/27 15:00:16 1.83
@@ -322,6 +322,12 @@
prot->next_layer =3D NULL;
}
=20
+void=20
+l2cap_register_default_upper(struct protocol_layer *prot)
+{
+ memcpy(&default_protocol, prot, sizeof(protocol_layer));
+}
+
s32=20
l2cap_shutdown(void)
{
@@ -341,6 +347,8 @@
}
=20
/* is called with a struct of functions to handle incoming data */
+
+
s32=20
l2cap_register_upper(u16 psm, struct protocol_layer *prot)=20
{
@@ -1456,6 +1464,7 @@
return;
}=20
=20
+=09
get_upper(con->psm)->receive_data(con, data, len);
}
=20
@@ -2428,8 +2437,6 @@
layers add header data */
return hci_send_data(tx);
}
-
-
=20=20
/*******************************************************************/
/* (A3) l2cap to l2cap data transmission */
|
|
From: Mats F. <ma...@us...> - 2001-02-27 14:58:07
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- hci.c 1.118 1.119=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added function for Read Scan Enable Corrected host_nbr_of_completed_packets function |
|
From: Mats F. <ma...@us...> - 2001-02-27 14:56:54
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.124 1.125=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added Read Scan Enable IOCTL
Added parameters for time and nbr of units in inquiry
Added parameter to initiate sdp as server or client
The diff of the modified file(s):
--- bluetooth.c 2001/02/27 12:51:12 1.124
+++ bluetooth.c 2001/02/27 14:58:02 1.125
@@ -59,6 +59,7 @@
#include <linux/bluetooth/rfcomm.h>
#include <linux/bluetooth/tcs.h>
#include <linux/bluetooth/sdp.h>
+#include <linux/bluetooth/tci.h>
#include <linux/bluetooth/sec_client.h>
=20
#ifdef BT_USE_PROC
@@ -218,6 +219,8 @@
void bt_linebuf_send(s32 line);
#endif
=20
+const u8* psmname(u16 psm);
+
/****************** GLOBAL VARIABLE DECLARATION SECTION ******************=
***/
=20
/****************** LOCAL VARIABLE DECLARATION SECTION *******************=
***/
@@ -653,14 +656,14 @@
=20
case HCIINQUIRY:
{=20
- s32 max_nbr_of_units;
+ s32 in_param[2];
u8 lap[3];
=20=09=09
BT_DRIVER(FNC"HCINQUIRY\n");
=20=09=09
- copy_from_user(&max_nbr_of_units, (s32*)arg, 4);
- inq_res =3D hci_inquiry(lap, 10 , max_nbr_of_units);
- copy_to_user((s32*)arg, inq_res, size + 6 * max_nbr_of_units);
+ copy_from_user(in_param, (s32*)arg, 8);
+ inq_res =3D hci_inquiry(lap, in_param[1] , in_param[0]);
+ copy_to_user((s32*)arg, inq_res, size + 6 * inq_res->nbr_of_units);
break;
}
=20=09
@@ -810,6 +813,13 @@
break;
}
=20=09
+ case HCIREADSCANENABLE:
+ BT_DRIVER("Reading scan enable\n");
+
+ tmp =3D hci_read_scan_enable();
+ put_user(tmp, (s32*)arg);
+ break;
+=09
case HCIWRITESCANENABLE:
GET_USER(tmp, (s32*)arg);
BT_DRIVER("setting write scan enable : [0x%x]\n", tmp);
@@ -1842,6 +1852,22 @@
procfs_status);
}
=20=09
+#ifdef USE_TCI
+#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
+#if 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);
+#endif /* LINUX_VERSION_CODE */
+#else /* KERNEL_VERSION */
+ procfs_status =3D proc_register_dynamic(&proc_root, &tci_proc_entry);
+#endif/* KERNEL_VERSION */
+
+ if (procfs_status < 0) {
+ D_ERR("Couldn't register proc file for tci database %d\n",
+ procfs_status);
+ }
+#endif /* USE_TCI */
=20
#endif /* BT_USE_PROC */
=20
@@ -1898,9 +1924,13 @@
hci_init();
l2cap_init();
=20
+#ifdef USE_TCI
+ tci_init();
+#else
rfcomm_init();
- sdp_init();
+ sdp_init(1); /* For now always init as server */
tcs_init();
+#endif
btmem_init();
bt_stack_initiated =3D 1;
bt_stat.bytes_received =3D 0;
|
|
From: Peter K. <pk...@us...> - 2001-02-27 12:50:04
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.c 1.123 1.124=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Made psmname() static.
The diff of the modified file(s):
--- bluetooth.c 2001/02/16 14:21:40 1.123
+++ bluetooth.c 2001/02/27 12:51:12 1.124
@@ -165,6 +165,7 @@
static s32 bt_ctrl_init(void);
static s32 bt_connect(u8 *bd_addr, u32 con_id);
static s32 bt_disconnect(u32 con_id);
+static const u8* psmname(u16 psm);
=20
#ifdef __USE_OLD_SYMTAB__
/*
@@ -2044,7 +2045,6 @@
return pos;
}
=20
-
/*
* FIXME -- make this register function more general i.e
* enable registering any layer.=20
@@ -2258,7 +2258,8 @@
}
=20
=20
-const u8* psmname(u16 psm)
+static const u8*
+psmname(u16 psm)
{
switch(psm)
{
|
|
From: Peter K. <pk...@us...> - 2001-02-27 12:40:28
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- sec_client.c 1.9 1.10=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Debug defines are now in btdebug.h The diff of the modified file(s): --- sec_client.c 2001/02/15 16:27:34 1.9 +++ sec_client.c 2001/02/27 12:41:36 1.10 @@ -62,13 +62,14 @@ #include "include/rfcomm_sec.h" #include "include/sec_client.h" #include "include/btmem.h" +#include "include/btdebug.h" #endif =20 /****************** DEBUG CONSTANT AND MACRO SECTION *********************= ***/ =20 #if SEC_CLIENT_DEBUG_MISC /* Misc */ -#define D_MISC(fmt...) printk(L2CAP_DBG_STR fmt) +#define D_MISC(fmt...) printk(SEC_DBG_STR fmt) #else #define D_MISC(fmt...) #endif |
|
From: Peter K. <pk...@us...> - 2001-02-27 12:37:12
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btdebug.h 1.31 1.32=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added defines for debug of the security client communication. The diff of the modified file(s): --- btdebug.h 2001/02/15 16:28:46 1.31 +++ btdebug.h 2001/02/27 12:38:19 1.32 @@ -124,7 +124,6 @@ =20 /***************** RFCOMM Debug defines **********************************= ****/ =20 - /* Possibility to turn on/off debug for seperate sections in RFCOMM*/ =20 #define DEBUG_RFCOMM_RECEIVE_FLOW 0 @@ -174,6 +173,14 @@ #define BTMEM_DEBUG 0 =20 #define BTMEM_DBG_STR " BTMEM " + +/***************** Security Debug defines ********************************= ****/ + +#define SEC_CLIENT_DEBUG_MISC 0 +#define SEC_CLIENT_DEBUG_PROC 0 +#define SEC_CLIENT_PRINT_DATA 0 + +#define SEC_DBG_STR " SEC " =20 /***************** Function declaration section **************************= ****/ =20 |
|
From: Peter K. <pk...@us...> - 2001-02-27 11:31:11
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
rfcomm_sec.c 1.7 1.8=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Minor clean-up.
The diff of the modified file(s):
--- rfcomm_sec.c 2001/02/26 16:12:17 1.7
+++ rfcomm_sec.c 2001/02/27 11:32:19 1.8
@@ -68,23 +68,18 @@
=20
/****************** DEBUG CONSTANT AND MACRO SECTION *********************=
***/
=20
-
/****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-
/****************** TYPE DEFINITION SECTION ******************************=
***/
=20
-
/****************** LOCAL FUNCTION DECLARATION SECTION *******************=
***/
=20
/****************** GLOBAL VARIABLE DECLARATION SECTION ******************=
***/
=20
/****************** LOCAL VARIABLE DECLARATION SECTION *******************=
***/
=20
-
/****************** FUNCTION DEFINITION SECTION **************************=
***/
=20=20=20
-
void=20
rfcomm_sec_man_init(void)
{
@@ -107,7 +102,6 @@
=20=09
switch (result) {
case SECURITY_OK:=20
- {
rfcon->dlci[tmp_dlci].state =3D CONNECTED;
=20
if (valid_dlci(tmp_dlci))
@@ -115,6 +109,7 @@
=20=09=09=09
bt_register_rfcomm(rfcon, tmp_dlci);
bt_connect_cfm(CREATE_RFCOMM_ID(rfcon->line, tmp_dlci), 0 /* status ok*=
/ );=09=09=09
+
#if 0
/* This part was taken from rfcomm.c and should perhaps
reside there */
@@ -139,38 +134,31 @@
printk("rfcomm_process_sec_man_response : invalid dlci [%d]\n", tmp_dlc=
i);
}
break;
- }
+
case UNKNOWN_REQUEST_TYPE:
case UNKNOWN_REQUEST_VALUE:
- {
/* send negative connection response */
rfcon->dlci[tmp_dlci].state =3D DISCONNECTED;
rfcomm_dm_msg(rfcon,tmp_dlci);
-
break;
- }
+
case PSM_SECURITY_BLOCK:
case AUTHENTICATION_FAILURE:
case ENCRYPTION_FAILURE:
- {
/* send negative connection response */
rfcon->dlci[tmp_dlci].state =3D DISCONNECTED;
rfcomm_dm_msg(rfcon,tmp_dlci);
-
break;
- }
+
case GENERAL_FAILURE:
- {
/* send negative connection response */
rfcon->dlci[tmp_dlci].state =3D DISCONNECTED;
rfcomm_dm_msg(rfcon,tmp_dlci);
-
break;
- }
+
default:
- {
/* Print error message */
- }
+ break;
}
}
=20
|
|
From: Mattias ?g. <mat...@us...> - 2001-02-26 16:27:25
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
rfcomm.c 1.86 1.87=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* moved function valid_dlci to rfcomm.h
The diff of the modified file(s):
--- rfcomm.c 2001/02/15 16:27:33 1.86
+++ rfcomm.c 2001/02/26 16:28:30 1.87
@@ -372,7 +372,6 @@
static u32 crc_check(u8 *data, u32 length, u8 check_sum);
static u8 crc_calc(u8 *data, u32 length);
static void create_crctable(u8 table[]);
-static s32 valid_dlci(u8 dlci);
static rfcomm_con* get_new_rfcomm_con(void);
static rfcomm_con* get_rfcomm_con(u8 line);
static s32 get_connected_dlci(rfcomm_con *rfcomm);
@@ -983,6 +982,7 @@
=20
/* registers in bt driver */
bt_register_rfcomm(rfcomm, tmp_dlci);
+=20
/* wake up any blocking connect/waits */=20
bt_connect_cfm(CREATE_RFCOMM_ID(rfcomm->line, tmp_dlci), 0 /* status ok=
*/ );
=20
|
|
From: Mattias ?g. <mat...@us...> - 2001-02-26 16:25:06
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- rfcomm.h 1.32 1.33=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * moved function valid_dlci from rfcomm.c The diff of the modified file(s): --- rfcomm.h 2001/02/15 16:28:47 1.32 +++ rfcomm.h 2001/02/26 16:26:12 1.33 @@ -166,6 +166,6 @@ s32 rfcomm_pn_msg(rfcomm_con *rfcomm, u8 dlci, u8 credits, u32 frame_size); s32 rfcomm_crap_msg(rfcomm_con *rfcomm); s32 rfcomm_send_credits(rfcomm_con *rfcomm, u8 dlci, u8 credits); - +s32 valid_dlci(u8 dlci); #endif /****************** END OF FILE rfcomm.h *********************************= ***/ |
2 messages has been excluded from this view by a project administrator.
