Menu
▾
▴
openbt-commit
|
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: Marcus A. S. <mar...@us...> - 2001-02-28 19:00:15
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.h 1.34 1.35=20=20=20=20=20=20=20=20=20=20=20=20
btcommon.h 1.62 1.63=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added 2.4 kernel support.
The diff of the modified file(s):
--- bluetooth.h 2001/02/27 17:15:32 1.34
+++ bluetooth.h 2001/02/28 19:01:26 1.35
@@ -86,11 +86,15 @@
s32 bt_sprint_status(u8 *buf);
=20
/* Handles wakeup of failed blocking function calls */
-
+#ifdef __KERNEL__
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
+void start_wq_timer(struct timer_list *wq_timer,
+ u32 timeout, wait_queue_head_t *wq);
+#else
void start_wq_timer(struct timer_list *wq_timer,
u32 timeout, struct wait_queue **wq);
-static void release_wq_timer(struct timer_list *wq_timer);
-static void wq_timeout(unsigned long ptr);
+#endif /* LINUX_VERSION_CODE */
+#endif /* __KERNEL__ */
=20
#endif
/****************** END OF FILE bluetooth.h ******************************=
***/
--- btcommon.h 2001/02/28 13:31:00 1.62
+++ btcommon.h 2001/02/28 19:01:26 1.63
@@ -50,6 +50,10 @@
#include <linux/bluetooth/btdebug.h>
#include <linux/bluetooth/btconfig.h>
#include <linux/timer.h>
+#include <linux/module.h>
+#include <linux/config.h>
+#include <linux/sched.h>
+#include <linux/version.h>
#else
#include "local.h"
#include "btdebug.h"
@@ -421,6 +425,20 @@
#define ANY_LINE 255
#define NO_LINE 256
=20
+#ifdef __KERNEL__
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
+typedef struct bt_ctrl_struct {
+ struct bt_session session[BT_NBR_PORTS];
+ wait_queue_head_t connect_wq[BT_NBR_PORTS];=20
+ wait_queue_head_t any_wq;
+ s32 nbr_active;
+ s32 nbr_upper;
+ s32 ctrl_tty_count; /* number of open file descriptors to ttyBTC */
+ s32 tty_last_unthrottled; /* indicated which line that was woken=20
+ up last time buffers were below the=20
+ unthrottle level */
+} bt_ctrl_struct;
+#else
typedef struct bt_ctrl_struct {
struct bt_session session[BT_NBR_PORTS];
struct wait_queue *connect_wq[BT_NBR_PORTS];=20
@@ -432,6 +450,8 @@
up last time buffers were below the=20
unthrottle level */
} bt_ctrl_struct;
+#endif /* LINUX_VERSION_CODE */
+#endif /* __KERNEL__ */
=20
typedef struct bt_stat_struct
{
|
|
From: Gordon M. <gm...@us...> - 2001-03-04 17:53:51
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btconfig.h 1.18 1.19=20=20=20=20=20=20=20=20=20=20=20=20
hci_internal.h 1.11 1.12=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
--Modified the config macros to be compatible with the Linux kernel config =
system.
The diff of the modified file(s):
--- btconfig.h 2001/03/02 15:56:18 1.18
+++ btconfig.h 2001/03/04 17:54:54 1.19
@@ -39,6 +39,13 @@
*
*/
=20
+/*
+ * When the stack is included as part of the kernel source tree, this macro
+ * is defined, and we can use the standard Linux kernel config instead of
+ * this next section. See Config.in in the source directory.
+ * --gmcnutt
+ */
+#ifndef CONFIG_BLUETOOTH
/******************
* General *
******************/
@@ -47,10 +54,10 @@
//#define USE_TCI
=20
/* use of /proc files to read status information */
-#define BT_USE_PROC
+#define CONFIG_BLUETOOTH_PROC
=20
/* Used to decrease overruns on serial port (see bluetooth.c) */
-#undef BT_USEINBUFFER
+#undef CONFIG_BLUETOOTH_USEINBUFFER
=20
#ifdef __CRIS__
#define USE_SECURITY_MANAGER
@@ -61,19 +68,13 @@
/* Bluetooth HW defines used to setup different HW and to cope with=20
limitations in HW */
=20
-#define HW_NOINIT 0
-#define HW_ERICSSON 1
-#define HW_DIGIANSWER 2
-#define HW_CSR 3
-#define HW_GENERIC 4
-#define HW_USBMODULE 5 /* Not implemented */
-
/* This sets current HW */
-#define HW_CURRENT HW_ERICSSON
-//#define HW_CURRENT HW_CSR
-//#define HW_CURRENT HW_GENERIC
-
-#define HW_USED(x) (HW_CURRENT =3D=3D x)
+#undef CONFIG_BLUETOOTH_CSR=20=20=20=20=20=20=20=20
+#undef CONFIG_BLUETOOTH_NOINIT=20=20=20=20=20
+#undef CONFIG_BLUETOOTH_DIGIANSWER=20
+#undef CONFIG_BLUETOOTH_USBMODULE /* Not implemented */
+#undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20
+#define CONFIG_BLUETOOTH_ERICSSON
=20
/***************
* HCI *
@@ -89,7 +90,7 @@
//#define HCI_EMULATION
=20
/* This should be defined if you are using the Ericsson P9A firmware */
-#define P9A
+#define CONFIG_BLUETOOTH_ERICSSON_P9A
=20
/* This define is used during test of the host flow control */
//#define HOST_FLOW_CTRL
@@ -102,14 +103,14 @@
//#define EMC_TEST_DATA_SIZE 678
#endif
=20
-#define HCI_USEUSB
+#define CONFIG_BLUETOOTH_HCI_USB
=20
/****************
* L2CAP *
****************/
=20
-#define L2CAP_USETIMERS
-#define DEF_ALLOWCONLESS 0
+#define CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#undef CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
=20
/*****************
* RFCOMM *
@@ -120,3 +121,5 @@
/***************
* SDP *
***************/
+
+#endif /* CONFIG_BLUETOOTH */
--- hci_internal.h 2001/03/03 13:59:14 1.11
+++ hci_internal.h 2001/03/04 17:54:55 1.12
@@ -342,7 +342,7 @@
u8 local_bd[6];
s32 active_connection;
hci_con con[MAX_NBR_OF_CONNECTIONS];
-} __attribute__ ((packed)) hci_controller;
+} hci_controller;
=20
/****************** EXPORTED FUNCTION DECLARATION SECTION ****************=
***/
=20
|
|
From: 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: Gordon M. <gm...@us...> - 2001-03-12 15:53:05
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
hci.h 1.46 1.47=20=20=20=20=20=20=20=20=20=20=20=20
local.h 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
--The other part of Matthias Fuchs big-endian patch
The diff of the modified file(s):
--- hci.h 2001/03/02 10:55:03 1.46
+++ hci.h 2001/03/12 15:55:02 1.47
@@ -75,11 +75,10 @@
u8 data[256];
} __attribute__ ((packed)) cmd_pkt;
=20
-#define hci_put_opcode(ocf, ogf)(((ocf) & 0x03ff) | ((ogf) << 10 & 0xfc00))
-#define hci_put_le16(buf, val) { *((char*)buf) =3D (val) & 0xff; *((char*)=
buf + 1) =3D (val) >> 8; }
-#define hci_get_ocf(opcode) ((opcode) & 0x3ff)
-#define hci_get_ogf(opcode) (((opcode) & 0xfc00) >> 10)=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20
-
+#define hci_put_opcode(ocf, ogf)(cpu_to_le16(((ocf) & 0x03ff) | ((ogf) << =
10 & 0xfc00)))
+//#define hci_put_le16(buf, val) { *((char*)buf) =3D (val) & 0xff; *((char=
*)buf + 1) =3D (val) >> 8; }
+#define hci_get_ocf(opcode) (cpu_to_le16((opcode) & 0x3ff))
+#define hci_get_ogf(opcode) (cpu_to_le16(((opcode) & 0xfc00) >> 10))
=20
/****************** EXPORTED FUNCTION DECLARATION SECTION ****************=
***/
=20
--- local.h 2001/02/15 16:28:47 1.3
+++ local.h 2001/03/12 15:55:02 1.4
@@ -46,6 +46,43 @@
=20
/****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
+#include <asm/byteorder.h>
+/* In kernel mode either __LITTLE_ENDIAN or __BIG_ENDIAN is defined, but i=
n user usermode
+ * both are defined. In usermode __BYTE_ORDER contains the correct endiane=
ss. So let's undefine
+ * one of them.
+ * __LITTLE_ENDIAN_BITTFIELD and __BIG_ENDIAN_BITFIELD do not cause such p=
roblems.
+ */
+#ifndef __KERNEL__
+# if (__BYTE_ORDER =3D=3D __LITTLE_ENDIAN)
+# undef __BIG_ENDIAN
+# endif
+# if (__BYTE_ORDER =3D=3D __BIG_ENDIAN)
+# undef __LITTLE_ENDIAN
+# endif
+#endif
+=20
+#ifdef BTD_USERSTACK
+=20
+# ifdef __LITTLE_ENDIAN
+# define cpu_to_le16(x) (x)
+# define cpu_to_le32(x) (x)
+# define cpu_to_be16(x) htons((x))
+# define cpu_to_be32(x) htonl((x))
+# else
+# define cpu_to_be16(x) (x)
+# define cpu_to_be32(x) (x)
+ extern inline __u16 cpu_to_le16(__u16 x) { return (x<<8) | (x>>8);}
+ extern inline __u32 cpu_to_le32(__u32 x) { return((x>>24) |
+ ((x>>8)&0xff00) | ((x<<8)&0xff0000) | (x<<24));}
+# endif
+=20
+# define le16_to_cpu(x) cpu_to_le16(x)
+# define le32_to_cpu(x) cpu_to_le32(x)
+# define be16_to_cpu(x) cpu_to_be16(x)
+# define be32_to_cpu(x) cpu_to_be32(x)
+=20
+#endif
+
/****************** TYPE DEFINITION SECTION ******************************=
***/
=20
typedef short s16;=20
|
|
From: Mattias A. <mat...@us...> - 2001-04-27 10:16:10
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- l2cap.h 1.37 1.38=20=20=20=20=20=20=20=20=20=20=20=20 l2cap_con.h 1.6 1.7=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * moved declarations of l2ca_wait/wakeup to l2cap.h * some cleanup The diff of the modified file(s): --- l2cap.h 2001/03/30 09:44:15 1.37 +++ l2cap.h 2001/04/27 10:16:09 1.38 @@ -376,17 +376,11 @@ s32 l2ca_ping(BD_ADDR bd, u8 *opt_data, u16 len); s32 l2cap_echo_req(l2cap_con *con, u8 *opt_data, u16 opt_len); =20 - s32 l2ca_getinfo(BD_ADDR bd, u16 infotype); s32 l2cap_info_req(l2cap_con *con, u16 info_type); =20 -/**************************************************************/ -/* (E5) Timer events */ -/**********************/ - -/* FIXME */ -/* RTX timer */ -/* ERTX timer */ +void l2ca_wait(const char *str, l2cap_con *con); +void l2ca_wakeup(const char *str, l2cap_con *con); =20 /*******************************************************************/ /*-------------------------- ACTIONS ------------------------------*/ @@ -429,8 +423,7 @@ void l2ca_disconnect_ind(l2cap_con *con); void l2ca_disconnect_cfm(l2cap_con *con); =20 -/* FIXME */ -void l2ca_timeout_ind(l2cap_con *con); +void l2ca_timeoutind(l2cap_con *con); =20 /* FIXME */ void l2ca_qos_violation_ind(l2cap_con *con); @@ -447,7 +440,6 @@ /***********************/ =20 /* GROUP functions not implemented */ -/* INFO functions not implemented */ /* CONNECTIONLESS functions not implemented */ =20 =20=20 --- l2cap_con.h 2001/04/19 10:31:34 1.6 +++ l2cap_con.h 2001/04/27 10:16:09 1.7 @@ -108,9 +108,6 @@ void show_list(void); s32 count_con(u16 hci_hdl); =20 -void l2ca_wait(const char *str, l2cap_con *con); -void l2ca_wakeup(const char *str, l2cap_con *con); - =20 #if L2CAP_SELFTEST void test_conlist(void); |
|
From: Mats F. <ma...@us...> - 2001-05-15 14:37:52
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bcsp.h 1.1 Added bcsp_debug.h 1.1 Added The accompanying log: Initial version |
|
From: Peter K. <pk...@us...> - 2001-05-17 15:35:43
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
hci.h 1.56 1.57=20=20=20=20=20=20=20=20=20=20=20=20
hci_internal.h 1.15 1.16=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Moved declaration of hci_receive_hq() and hci_receive_bcsp() to
hci.h from hci_internal.h
The diff of the modified file(s):
--- hci.h 2001/05/15 15:08:00 1.56
+++ hci.h 2001/05/17 15:35:42 1.57
@@ -98,6 +98,8 @@
#ifdef CONFIG_BLUETOOTH_USE_BCSP
void hci_receive_event(u8 *data, s32 count);
void hci_receive_acl(u8 *data, s32 count);
+void hci_receive_hq(u8 *data, u32 count);
+void hci_receive_bcsp(u8 *data, u32 count);
#endif
=20
s32 lp_connect_req(u8 bd_addr[]);
--- hci_internal.h 2001/05/15 15:21:16 1.15
+++ hci_internal.h 2001/05/17 15:35:42 1.16
@@ -352,11 +352,6 @@
s32 send_cmd(u8 *cmd, u8 len);
s32 send_cmd_block(u8 *cmd, u8 len);
=20
-#ifdef CONFIG_BLUETOOTH_USE_BCSP
-void hci_receive_hq(u8 *data, u32 count);
-void hci_receive_bcsp(u8 *data, u32 count);
-#endif
-
/*
Called from hci.c.
Implemented in hci_vendor.c
@@ -365,4 +360,5 @@
void process_vendor_event(u8 *buf, u32 len, u32 event_code);
s32 hci_set_buffer_sizes(u16 len, u16 num);
#endif
+
/****************** END OF FILE hci_internal.h ***************************=
***/
|
|
From: Mats F. <ma...@us...> - 2001-06-19 06:13:02
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.76 1.77=20=20=20=20=20=20=20=20=20=20=20=20 btmem.h 1.18 1.19=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: We need to keep track of how many bytes there are in the BT-buf for each li= ne The diff of the modified file(s): --- btcommon.h 2001/06/15 12:31:55 1.76 +++ btcommon.h 2001/06/19 06:13:01 1.77 @@ -224,6 +224,7 @@ u32 hci_hdl; /* The destination hci connection handle */ u8 pb_flag; /* Packet boundary flag */ u8 bc_flag; /* Broadcast flag */ + s32 line; /* -1 means that the buffer isn't allocated for a line */ =20 /* 'Filled in' data length (up to this point) when creating object. Also used when sending data to mark how much that has been sent --- btmem.h 2001/02/15 16:28:46 1.18 +++ btmem.h 2001/06/19 06:13:01 1.19 @@ -82,7 +82,7 @@ s32 buf_count(void); =20 /* Returns total number of bytes in buffer (fragmented) */ -s32 buf_byte_count(void); +s32 buf_byte_count(s32 line); =20 /* Returns unfragmented buffer space */=20 s32 buf_write_room(void); |
|
From: Peter K. <pk...@us...> - 2001-07-31 16:50:42
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.h 1.42 1.43=20=20=20=20=20=20=20=20=20=20=20=20 local.h 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Check for __KERNEL__ instead of BTD_USERSTACK. The diff of the modified file(s): --- bluetooth.h 2001/06/13 12:13:50 1.42 +++ bluetooth.h 2001/07/31 16:50:41 1.43 @@ -42,7 +42,7 @@ #ifndef BLUETOOTH_H #define BLUETOOTH_H =20 -#ifndef BTD_USERSTACK +#ifdef __KERNEL__ #include <linux/bluetooth/btcommon.h> #else #include "btcommon.h" --- local.h 2001/03/12 15:55:02 1.4 +++ local.h 2001/07/31 16:50:41 1.5 @@ -61,7 +61,7 @@ # endif #endif =20=20 -#ifdef BTD_USERSTACK +#ifndef __KERNEL__ =20=20 # ifdef __LITTLE_ENDIAN # define cpu_to_le16(x) (x) |
|
From: Peter K. <pk...@us...> - 2001-07-31 17:50:56
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.h 1.43 1.44=20=20=20=20=20=20=20=20=20=20=20=20 hci.h 1.62 1.63=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Corrected a CONFIG_BLUETOOTH_USE_BCSP to CONFIG_BLUETOOTH_SUPPORT_BCSP. The diff of the modified file(s): --- bluetooth.h 2001/07/31 16:50:41 1.43 +++ bluetooth.h 2001/07/31 17:50:55 1.44 @@ -50,7 +50,7 @@ =20 /* glue functions */ s32 bt_write_lower_driver(u8 *data, s32 len); -#ifdef CONFIG_BLUETOOTH_USE_BCSP +#ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP s32 bt_write_lower_driver_real(u8 *data, s32 len); #endif s32 bt_receive_top(u32 con_id, u8 *data, s32 len); --- hci.h 2001/07/06 06:56:08 1.62 +++ hci.h 2001/07/31 17:50:55 1.63 @@ -97,7 +97,7 @@ void hci_receive_data(u8* data, u32 count); s32 hci_send_data(bt_tx_buf *tx_buf); =20 -#ifdef CONFIG_BLUETOOTH_USE_BCSP +#ifdef CONFIG_BLUETOOTH_SUPPORT_BCSP void hci_receive_event(u8 *data, s32 count); void hci_receive_acl(u8 *data, s32 count); void hci_receive_hq(u8 *data, u32 count); |
|
From: Peter K. <pk...@us...> - 2001-08-16 13:01:23
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bcsp.h 1.7 1.8=20=20=20=20=20=20=20=20=20=20=20=20=20 bcsp_debug.h 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Made the BCSP files at least compile for user mode. The diff of the modified file(s): --- bcsp.h 2001/06/06 15:01:11 1.7 +++ bcsp.h 2001/08/16 13:01:22 1.8 @@ -44,7 +44,11 @@ =20 /****************** INCLUDE FILES SECTION ********************************= ***/ =20 +#ifdef __KERNEL__ #include <linux/types.h> +#else +#include "local.h" +#endif =20 /****************** CONSTANT AND MACRO SECTION ***************************= ***/ =20 --- bcsp_debug.h 2001/06/13 12:14:44 1.4 +++ bcsp_debug.h 2001/08/16 13:01:22 1.5 @@ -44,7 +44,11 @@ =20 /****************** INCLUDE FILES SECTION ********************************= ***/ =20 +#ifdef __KERNEL__ #include <linux/bluetooth/btdebug.h> +#else +#include "btdebug.h" +#endif =20 /****************** CONSTANT AND MACRO SECTION ***************************= ***/ =20 |
|
From: Peter K. <pk...@us...> - 2001-10-05 12:06:43
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- hci.h 1.71 1.72=20=20=20=20=20=20=20=20=20=20=20=20 rfcomm.h 1.39 1.40=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * Some initialization needs to be done at module start time, not when the stack is initialized. * Initialize (part of) hci even when in DFU mode. The diff of the modified file(s): --- hci.h 2001/10/02 13:44:49 1.71 +++ hci.h 2001/10/05 12:06:43 1.72 @@ -95,6 +95,7 @@ =20 s32 hci_trig_send(void); s32 hci_acl_num_cnt(void); +s32 hci_module_init(void); s32 hci_init(void); void hci_shutdown(void); void hci_clear_buffer(u32 con_hdl); @@ -112,7 +113,7 @@ =20 s32 hci_read_dfu(u8* data, u32 count); =20 -void hci_init_dfu(void); +void hci_dfu_module_init(void); void hci_shutdown_dfu(void); #endif =20 --- rfcomm.h 2001/07/31 17:18:44 1.39 +++ rfcomm.h 2001/10/05 12:06:43 1.40 @@ -189,6 +189,7 @@ =20 /****************** EXPORTED FUNCTION DECLARATION SECTION ****************= ***/ =20 +s32 rfcomm_module_init(void); void rfcomm_init(void); void rfcomm_close(void); s32 rfcomm_connect_req(u8* bd_addr, u8 server_chan, u8 line); |
|
From: Anders J. <and...@us...> - 2001-11-22 14:06:20
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
bluetooth.h 1.47 1.48=20=20=20=20=20=20=20=20=20=20=20=20
btcommon.h 1.89 1.90=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Added bt_timer_obj.
* Removed some not used vars in l2cap_con-obj.
* All structures which use timers should now use the new bt_timer_obj.
The diff of the modified file(s):
--- bluetooth.h 2001/11/15 15:02:37 1.47
+++ bluetooth.h 2001/11/22 14:06:20 1.48
@@ -101,14 +101,14 @@
/* Handles wakeup of failed blocking function calls */
#ifdef __KERNEL__
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
-void start_wq_timer(struct timer_list *wq_timer,
+void start_wq_timer(struct bt_timer_obj *wq_bt_timer,
u32 timeout, wait_queue_head_t *wq);
#else
-void start_wq_timer(struct timer_list *wq_timer,
+void start_wq_timer(struct bt_timer_obj *wq_bt_timer,
u32 timeout, struct wait_queue **wq);
=20
#endif /* LINUX_VERSION_CODE */
-void release_wq_timer(struct timer_list *wq_timer);
+void release_wq_timer(struct bt_timer_obj *wq_bt_timer);
#endif /* __KERNEL__ */
=20
#endif
--- btcommon.h 2001/10/22 12:57:13 1.89
+++ btcommon.h 2001/11/22 14:06:20 1.90
@@ -299,6 +299,17 @@
#define RFCOMM_TX_HDRSIZE sizeof(rfcomm_tx_buf)
#define SDP_TX_HDRSIZE sizeof(sdp_tx_buf)
=20
+/****************** Definitiion of common bt_timer_obj struct ************=
***/
+typedef struct bt_timer_obj=20
+{
+ u8 inuse;
+#ifdef __KERNEL__
+ struct timer_list timer;
+#else
+ int timer;
+#endif
+} bt_timer_obj;
+
/****************** Some typedefs used in the l2cap_con struct ***********=
***/
=20
typedef u8 BD_ADDR[6];
@@ -320,20 +331,12 @@
/* FIXME -- move all layer specific structs into each layers .h file=20
and fix include order ! */
=20
-/* RTX Actions */
-#define RTX_ACTION_DISCONNECT 0 /* default */
-#define RTX_ACTION_START_ERTX 1 /* during con*/
-#define RTX_ACTION_TERMINATE 2 /* if we tried to disconnect and got no res=
p */
-
-#define ERTX_ACTION_DISCONNECT 0xf0 /* default */
-#define ERTX_ACTION_TERMINATE 0xf1
-
typedef struct l2cap_timer_obj
{
#ifdef __KERNEL__
- struct timer_list rtx;
- struct timer_list ertx;
- struct timer_list crtx; /* Maximum negotiation time 120 sec */
+ struct bt_timer_obj rtx;
+ struct bt_timer_obj ertx;
+ struct bt_timer_obj crtx; /* Maximum negotiation time 120 sec */
#else
/* dummy */
int rtx;
@@ -341,15 +344,6 @@
int crtx; /* Maximum negotiation time 120 sec */
#endif
u16 rtx_no; /* nbr retries */
- u16 rtx_action; /* preferred action when rtx expires */=09
- u16 rtx_inuse; /* to avoid concurrent use */
-
- u16 ertx_action; /* preferred action when ertx expires */=09
- u16 ertx_inuse;
-
-=20=20
-
- //struct timeval caller_id; /* used to identify caller */
} __attribute__ ((packed)) l2cap_timer_obj;
=20
typedef struct l2cap_con {
@@ -385,7 +379,7 @@
s32 conf_rsp_ready; /* indicates if we replied pos on a config req */
=20
/* Fixme -- fix multicall */
- struct l2cap_timer_obj timer;
+ struct l2cap_timer_obj timers;
=20
/* Fixme -- fix all return values according this system */
s32 c_result; /* returns result to higher layers, used together with
@@ -521,23 +515,16 @@
#define NO_LINE 256
=20
#ifdef __KERNEL__
-#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
typedef struct bt_ctrl_struct {
struct bt_session session[BT_NBR_PORTS];
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
wait_queue_head_t connect_wq[BT_NBR_PORTS];=20
wait_queue_head_t any_wq;
- s32 nbr_active;
- s32 nbr_upper;
- s32 ctrl_tty_count; /* number of open file descriptors to ttyBTC */
- s32 tty_last_unthrottled; /* indicated which line that was woken=20
- up last time buffers were below the=20
- unthrottle level */
-} bt_ctrl_struct;
#else
-typedef struct bt_ctrl_struct {
- struct bt_session session[BT_NBR_PORTS];
struct wait_queue *connect_wq[BT_NBR_PORTS];=20
struct wait_queue *any_wq;
+#endif
+ struct bt_timer_obj bt_timer[BT_NBR_PORTS];
s32 nbr_active;
s32 nbr_upper;
s32 ctrl_tty_count; /* number of open file descriptors to ttyBTC */
@@ -545,7 +532,6 @@
up last time buffers were below the=20
unthrottle level */
} bt_ctrl_struct;
-#endif /* LINUX_VERSION_CODE */
#endif /* __KERNEL__ */
=20
typedef struct bt_stat_struct
@@ -574,6 +560,9 @@
u32 serport_name_length;
u8 serport_name[64];
} serport_profile_info;
+
+
+
=20
#endif
/****************** END OF FILE btcommon.h *******************************=
***/
|
|
From: Anders J. <and...@us...> - 2002-01-24 16:10:00
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bnep.h 1.1 Added bnep_internal.h 1.1 Added The accompanying log: * Intital versions for BNEP. |
|
From: Fredrik S. <fre...@us...> - 2002-02-13 10:04:35
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- hci.h 1.74 1.75=20=20=20=20=20=20=20=20=20=20=20=20 hci_internal.h 1.22 1.23=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Change default link supervision timeout from 20 sec to 5 sec. The diff of the modified file(s): --- hci.h 6 Feb 2002 11:19:58 -0000 1.74 +++ hci.h 13 Feb 2002 10:04:34 -0000 1.75 @@ -169,7 +169,7 @@ s32 hci_read_encryption_mode(void); s32 hci_write_encryption_mode(u8 mode); s32 hci_read_link_supervision_to(u32 hdl); -s32 hci_write_link_supervision_to(u32 hdl, u32 link_to); +s32 hci_write_link_supervision_to(u32 hdl, u32 link_to, s32 block); s32 hci_write_class_of_device(u8 *class_of_device); s32 hci_set_event_filter(u8 *data); s32 hci_read_power_transmit_level(u32 con_hdl, unsigned char type); --- hci_internal.h 12 Feb 2002 10:57:41 -0000 1.22 +++ hci_internal.h 13 Feb 2002 10:04:34 -0000 1.23 @@ -292,6 +292,10 @@ #define DEFAULT_TIMEOUT 2=20 #define LONG_TIMEOUT 15 =20 +/* How long the baseband waits after link loss until disconnecting + the client. Measured in baseband slots (0.625 msec). */ +#define DEFAULT_LINK_SUPERVISION_TIMEOUT (5000000/625) /* 5 sec */ + /****************** TYPE DEFINITION SECTION ******************************= ***/ =20 /* Struct used to keep track of the current number of buffers, and the siz= es |
|
From: Anders J. <and...@us...> - 2002-02-28 20:09:29
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.93 1.94=20=20=20=20=20=20=20=20=20=20=20=20 hci.h 1.75 1.76=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * set_event_filter now handle any type of filter. The diff of the modified file(s): --- btcommon.h 6 Feb 2002 11:19:58 -0000 1.93 +++ btcommon.h 28 Feb 2002 20:09:27 -0000 1.94 @@ -186,7 +186,7 @@ #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]) +#define HCISET_EVENT_FILTER _IOW(BT_IOC_MAGIC, 0x3f, u8[255]) #define HCIREADTRANSMITPOWERLEVEL _IOWR(BT_IOC_MAGIC, 0x40, u8) =20 /* Informational Parameters */ --- hci.h 13 Feb 2002 10:04:34 -0000 1.75 +++ hci.h 28 Feb 2002 20:09:27 -0000 1.76 @@ -171,7 +171,7 @@ s32 hci_read_link_supervision_to(u32 hdl); s32 hci_write_link_supervision_to(u32 hdl, u32 link_to, s32 block); s32 hci_write_class_of_device(u8 *class_of_device); -s32 hci_set_event_filter(u8 *data); +s32 hci_set_event_filter(u8 *data, u16 len); s32 hci_read_power_transmit_level(u32 con_hdl, unsigned char type); s32 hci_write_page_to(u32 page_to); s32 hci_write_hold_mode_activity(u32 hma); |
|
From: Alain P. <apa...@us...> - 2002-05-10 12:27:53
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- btconfig.h 1.33 1.34=20=20=20=20=20=20=20=20=20=20=20=20=20=20 btdebug.h 1.44 1.45=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added settings and functions for new bluetooth hardware from Texas Instrume= nts. The diff of the modified file(s): --- btconfig.h 19 Nov 2001 11:29:29 -0000 1.33 +++ btconfig.h 10 May 2002 12:27:51 -0000 1.34 @@ -64,6 +64,7 @@ #define CONFIG_BLUETOOTH_ERICSSON #undef CONFIG_BLUETOOTH_INFINEON_BMI #undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20 +#undef CONFIG_BLUETOOTH_TEXASINSTRUMENTS #undef CONFIG_BLUETOOTH_USBMODULE /* Not implemented */ =20 /* Use TCI layer or not */ --- btdebug.h 24 Jan 2002 12:37:17 -0000 1.44 +++ btdebug.h 10 May 2002 12:27:51 -0000 1.45 @@ -72,7 +72,7 @@ =20 /***************** Bluetooth Debug defines *******************************= ****/ =20 -#define BT_DATA_DEBUG 0 +#define BT_DATA_DEBUG 1 #define BT_DATADUMP_DEBUG 0 /* print each byte */ =20 #define BT_DRIVER_DEBUG 1 @@ -105,7 +105,7 @@ #define DEBUG_HCI_CTRL 0 /* Enables / disables debug for the HCI control and signaling */ =20 -#define DEBUG_HCI_CMD 0 +#define DEBUG_HCI_CMD 1 /* Enables / disables debug for the HCI commands */ =20 #define HCI_DBG_STR "HCI: " |
|
From: Peter K. <pk...@us...> - 2002-11-19 14:11:43
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- btcommon.h 1.97 1.98=20=20=20=20=20=20=20=20=20=20=20=20=20=20 hci.h 1.78 1.79=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added BTREADREMOTENAME ioctl to get the Bluetooth name of a remote client. The diff of the modified file(s): --- btcommon.h 27 Sep 2002 12:54:12 -0000 1.97 +++ btcommon.h 19 Nov 2002 14:11:42 -0000 1.98 @@ -1,7 +1,7 @@ /* * btcommon.h -- Contains common object structs/defines for bluetooth stack * - * Copyright (C) 2000, 2001 Axis Communications AB + * Copyright (C) 2000, 2001, 2002 Axis Communications AB * * Authors: Mattias Agren <mat...@ax...> * Mats Friden <mat...@ax...> @@ -149,6 +149,7 @@ #define BT_SDP_REQUEST _IOW(BT_IOC_MAGIC, 0x0F, bt_sdp_request) #define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x10, u8[22]) #define BTDISCONNECT_BB _IOW(BT_IOC_MAGIC, 0x11, u8[6]) +#define BTREADREMOTENAME _IOWR(BT_IOC_MAGIC, 0x12, u8[BT_NAME_LENGTH]) =20 /* Ioctls executing HCI commands */ =20 --- hci.h 8 Apr 2002 10:14:07 -0000 1.78 +++ hci.h 19 Nov 2002 14:11:43 -0000 1.79 @@ -2,7 +2,7 @@ * hci.c -- Implementation of Bluetooth Host Controller Interface following * the UART transport layer=20 * - * Copyright (C) 2000, 2001 Axis Communications AB + * Copyright (C) 2000, 2001, 2002 Axis Communications AB * * Author: Mats Friden <mat...@ax...> * @@ -188,7 +188,6 @@ s32 hci_read_num_broadcast_restransmissions(void); s32 hci_write_num_broadcast_restransmissions(u8 num_broadcast_retran); =20=20 - /* Informational Parameters */ s32 hci_read_local_bd(u8 *bd); s32 hci_read_local_version_info(s32 block); @@ -200,6 +199,7 @@ /* Internal */ /* FIXME -- add parameter to choose from different devices */ s32 get_remote_bd(int line, u8 *bd); +s32 get_remote_name(int line, u8 *name, u32 length); =20 void update_ncp(u8 nbr_of_hdl, u8 *pkt); =20 |
|
From: Anders J. <and...@us...> - 2003-01-13 19:49:22
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
btcommon.h 1.98 1.99=20=20=20=20=20=20=20=20=20=20=20=20=20=20
l2cap.h 1.44 1.45=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Added support to get class of device.
The diff of the modified file(s):
--- btcommon.h 19 Nov 2002 14:11:42 -0000 1.98
+++ btcommon.h 13 Jan 2003 19:48:37 -0000 1.99
@@ -150,6 +150,7 @@
#define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x10, u8[22])
#define BTDISCONNECT_BB _IOW(BT_IOC_MAGIC, 0x11, u8[6])
#define BTREADREMOTENAME _IOWR(BT_IOC_MAGIC, 0x12, u8[BT_NAME_LENGTH])
+#define BTREADREMOTECLASSOFDEV _IOWR(BT_IOC_MAGIC, 0x13, u8[6])
=20
/* Ioctls executing HCI commands */
=20
@@ -342,6 +343,8 @@
=20
typedef u16 CID;
=20
+typedef u8 CLASS_OF_DEVICE[3];
+
typedef struct flow {
u8 flags; /* default 0 */
u8 service; /* default 0x01 (best effort) */
@@ -368,6 +371,7 @@
typedef struct l2cap_con {
s32 magic;
BD_ADDR remote_bd; /* 6 bytes */
+ CLASS_OF_DEVICE remote_class_of_dev;
u16 hci_hdl;
=20
/* FIXME - add multiple HCI handles for group=20
--- l2cap.h 25 Feb 2002 14:09:05 -0000 1.44
+++ l2cap.h 13 Jan 2003 19:48:39 -0000 1.45
@@ -311,10 +311,10 @@
s32 lp_connect_cfm(u8 *bd_addr, u32 status, u16 con_hdl);
=20
/* Indicates the lower protocol has successfully established connection */
-void lp_connect_ind(BD_ADDR bd_addr);
+void lp_connect_ind(BD_ADDR bd_addr, CLASS_OF_DEVICE remote_class);
=20
/* called from hci when baseband is up (server) */
-void l2cap_create_con(BD_ADDR bd);
+void l2cap_create_con(BD_ADDR bd, CLASS_OF_DEVICE remote_class);
=20
/* Indicates the baseband has been shutdown */
s32 lp_disconnect_ind(u32 con_hdl);
|
|
From: Anders J. <and...@us...> - 2003-02-06 15:36:53
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- bluetooth.h 1.49 1.50=20=20=20=20=20=20=20=20=20=20=20=20=20=20 hci.h 1.79 1.80=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: get_remote_name and get_remote_bd now uses hci_hdl to refer to a connection as bt_ctrl.session[line] !=3D hci_ctrl[line] !!=20=20 The diff of the modified file(s): --- bluetooth.h 31 Jul 2002 08:21:16 -0000 1.49 +++ bluetooth.h 6 Feb 2003 15:36:22 -0000 1.50 @@ -67,6 +67,7 @@ s32 bt_init(void); #endif =20 +s32 bt_get_conhdl_from_line(s32 line); s32 bt_register_rfcomm(rfcomm_con *rfcomm, u8 dlci); s32 bt_unregister_rfcomm(s32 line); s32 bt_register_sdp(u8 line, u8 sdpID); --- hci.h 19 Nov 2002 14:11:43 -0000 1.79 +++ hci.h 6 Feb 2003 15:36:22 -0000 1.80 @@ -198,8 +198,8 @@ =20 /* Internal */ /* FIXME -- add parameter to choose from different devices */ -s32 get_remote_bd(int line, u8 *bd); -s32 get_remote_name(int line, u8 *name, u32 length); +s32 get_remote_bd(u16 con_hdl, u8 *bd); +s32 get_remote_name(u16 con_hdl, u8 *name, u32 length); =20 void update_ncp(u8 nbr_of_hdl, u8 *pkt); =20 |
|
From: Anders J. <and...@us...> - 2003-04-14 08:45:36
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- btcommon.h 1.99 1.100=20=20=20=20=20=20=20=20=20=20=20=20=20 hci.h 1.80 1.81=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added role to the l2cap_con struct to allow us to keep track on our current role for a specific connection. The diff of the modified file(s): --- btcommon.h 13 Jan 2003 19:48:37 -0000 1.99 +++ btcommon.h 14 Apr 2003 08:45:34 -0000 1.100 @@ -252,6 +252,8 @@ =20 #define BTSETMAXCONNECTIONS _IOW(BT_IOC_MAGIC, 0xfa, u8) =20 +#define BTDONTALLOWSLAVE _IOW(BT_IOC_MAGIC, 0xfb, u8) + /* NOTE ! * N_BT should be defined in /include/asm/termios.h=20 * However, if you are compiling this source standalone, the following def= ine @@ -372,6 +374,7 @@ s32 magic; BD_ADDR remote_bd; /* 6 bytes */ CLASS_OF_DEVICE remote_class_of_dev; + u8 role; u16 hci_hdl; =20 /* FIXME - add multiple HCI handles for group=20 --- hci.h 6 Feb 2003 15:36:22 -0000 1.80 +++ hci.h 14 Apr 2003 08:45:34 -0000 1.81 @@ -127,7 +127,7 @@ =20 s32 lp_connect_req(u8 bd_addr[]); s32 lp_connect_rsp(u8 bd_addr[], u32 cfm); -s32 lp_disconnect(u32 con_hdl); +s32 lp_disconnect(u32 con_hdl, u8 block); =20 u8* get_err_msg(u32 err_code); s32 get_client_bd_addr(u8 *bd); |
|
From: Anders J. <and...@us...> - 2003-11-05 17:12:06
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
bnep.h 1.8 1.9=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20
bnep_internal.h 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20
The accompanying log:
Added bnep role parameters.
The diff of the modified file(s):
--- bnep.h 2003/11/05 15:22:54 1.8
+++ bnep.h 2003/11/05 17:05:59 1.9
@@ -331,7 +331,8 @@ int bnep_init_module(void);
void bnep_exit_module(void);
void bnep_init(void);
void bnep_shutdown(void);
-u32 bnep_connect_req(u8* bd_addr, bt_pincode *pincode);
+u32 bnep_connect_req(u8* bd_addr, bt_pincode *pincode, u16 src_role,=20
+ u16 dst_role);
u32 bnep_disconnect_req(u8* bd_addr);
u32 bnep_test(u8 *p);
void bnep_set_mac_address_all(u8 *addr);
--- bnep_internal.h 2002/04/08 10:04:44 1.3
+++ bnep_internal.h 2003/11/05 17:05:59 1.4
@@ -81,6 +81,8 @@ typedef struct net_local=20
struct macaddr mc_list[BNEP_MAX_MULTI];
u8 proc_msg_buf[256];
u8 bd_addr[6];
+ u16 role;
+ u16 remote_role;
} __attribute__ ((packed)) net_local;
=20
extern struct net_device dev_bnep[7];=20=20
|
|
From: Anders J. <and...@us...> - 2003-11-06 19:13:28
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- btcommon.h 1.102 1.103=20=20=20=20=20=20=20=20=20=20=20=20=20 hci.h 1.82 1.83=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added IOCTL:s to write/read pincode type.=20 The diff of the modified file(s): --- btcommon.h 2003/11/05 19:03:45 1.102 +++ btcommon.h 2003/11/06 19:13:26 1.103 @@ -204,6 +204,8 @@ #define HCIWRITENUMBROADCASTRETRANSMISSIONS _IOWR(BT_IOC_MAGIC, 0x56, u8) #define HCIWRITEPAGETO _IOW(BT_IOC_MAGIC, 0x54, u32) #define HCIWRITELINKSUPERVISIONTO _IOW(BT_IOC_MAGIC, 0x58, u32[2]) +#define HCIWRITEPINTYPE _IOWR(BT_IOC_MAGIC, 0x60, s32) +#define HCIREADPINTYPE _IOWR(BT_IOC_MAGIC, 0x61, s32) =20 /* Informational Parameters */ #define HCIREADCOUNTRYCODE _IOR(BT_IOC_MAGIC, 0x43, s32) --- hci.h 2003/11/05 15:22:54 1.82 +++ hci.h 2003/11/06 19:13:26 1.83 @@ -187,6 +187,8 @@ s32 hci_read_clock_offset(u32 hdl); s32 hci_read_rssi(u32 hdl); s32 hci_read_num_broadcast_restransmissions(void); s32 hci_write_num_broadcast_restransmissions(u8 num_broadcast_retran); +s32 hci_read_pin_type(void); +s32 hci_write_pin_type(u8 type); =20 /* Informational Parameters */ s32 hci_read_local_bd(u8 *bd); |
|
From: Anders J. <and...@us...> - 2004-01-09 15:29:06
|
The following files were modified in linux/include/linux/bluetooth:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
btcommon.h 1.104 1.105=20=20=20=20=20=20=20=20=20=20=20=20=20
sdp.h 1.29 1.30=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added IOCTL and structs used for SDP-queries.
The diff of the modified file(s):
--- btcommon.h 2003/11/17 14:57:54 1.104
+++ btcommon.h 2004/01/09 15:28:59 1.105
@@ -146,13 +146,14 @@
#define BTWAITFORCONNECTION _IOW(BT_IOC_MAGIC, 0x0C, s32)
#define BTWAITNEWCONNECTIONS _IO(BT_IOC_MAGIC, 0x0D)
#define BTISLOWERCONNECTED _IOW(BT_IOC_MAGIC, 0x0E, s32)
-#define BT_SDP_REQUEST _IOW(BT_IOC_MAGIC, 0x0F, bt_sdp_request)
+#define BT_SDP_REQUEST _IOWR(BT_IOC_MAGIC, 0x0F, bt_sdp_request)
#define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x10, u8[22])
#define BTDISCONNECT_BB _IOW(BT_IOC_MAGIC, 0x11, u8[6])
#define BTREADREMOTENAME _IOWR(BT_IOC_MAGIC, 0x12, u8[BT_NAME_LENGTH])
#define BTREADREMOTECLASSOFDEV _IOWR(BT_IOC_MAGIC, 0x13, u8[6])
#define BTDISCONNECT_ALL _IO(BT_IOC_MAGIC, 0x14)
#define BTLEDSTATUS _IOW(BT_IOC_MAGIC, 0x15, s32)
+#define SDPCONNECT _IOW(BT_IOC_MAGIC, 0x16, bt_connection)
=20
/* Ioctls executing HCI commands */
=20
@@ -486,13 +487,30 @@ typedef struct rfcomm_con{
/****************** SDP connection object ****************************/
=20
enum sdp_states{SDP_DISCONNECTED, SDP_CONNECTING, SDP_CONNECTED};
+enum sdp_request_states{SDP_REQUEST_IDLE, SDP_REQUEST_SENT, SDP_REQUEST_RE=
SPONSE};
+
+typedef struct bt_sdp_request
+{
+ u16 len;
+ u16 allocated;
+ u8 bd[6];
+ u8 data[0];
+} __attribute__ ((packed)) bt_sdp_request;
=20
typedef struct sdp_con{
l2cap_con *l2cap;
u32 initiator;
enum sdp_states state;
u32 id;
- u8 line;
+ bt_timer_obj timer;
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
+ wait_queue_head_t waitqueue;
+#else
+ struct wait_queue *waitqueue;
+#endif
+ s32 status;
+ bt_sdp_request *request;
+ s32 request_status;
} __attribute__ ((packed)) sdp_con;
=20
/****************** BT connection object ********************************/
@@ -515,17 +533,7 @@ typedef struct bt_connection{
bt_pincode pincode;
u16 bnep_src_uuid;
u16 bnep_dst_uuid;
-} bt_connection;
-
-typedef struct bt_sdp_request
-{
- u32 conID;
- u8 sdpCommand;
- u8 pduPayload[256];
- int pduLength;
- u8 requestResponse[256];
- int responseLength;
-} bt_sdp_request;
+} __attribute__ ((packed)) bt_connection;
=20
/****************** Other structures used in the stack *******************=
***/
=20
@@ -546,13 +554,6 @@ typedef struct bt_session
rfcomm_con *rfcomm;
u8 dlci;
s32 state;
-
- /* sdp */
- u8 *sdpRequestResponseData;
- u16 sdpRequestResponseDataLength;
- int sdpID;
-
- /* tcs ? */
} bt_session;
=20
#define ANY_LINE 255
--- sdp.h 2003/11/05 15:22:54 1.29
+++ sdp.h 2004/01/09 15:29:03 1.30
@@ -82,7 +82,8 @@ void sdp_shutdown(void);
s32 sdp_create_proc_file(void);
s32 sdp_remove_proc_file(void);
#endif
-s32 sdp_connect_req(u8* bd_addr, u8 line, bt_pincode *pincode);
+s32 sdp_connect(u8* bd_addr, bt_pincode *pincode);
+s32 sdp_connect_req(u8* bd_addr, bt_pincode *pincode);
void sdp_connect_ind(l2cap_con *l2cap);
void sdp_connect_pnd(l2cap_con *l2cap, int status);
void sdp_connect_cfm(l2cap_con *l2cap, s32 status);
@@ -93,6 +94,8 @@ 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);
+s32 sdp_query(bt_sdp_request *request);
+
=20
#ifdef __KERNEL__
s32 sdpStartRequest(u8 sdpIndex, u8 sdpCommand, u8 *pduData, u16 pduLength=
);
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X