Menu
▾
▴
openbt-commit
|
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: Mattias ?g. <mat...@us...> - 2001-02-28 13:29:48
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btcommon.h 1.61 1.62=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* fixed incorrect flow structure, used type/len in option data
* minor changes
The diff of the modified file(s):
--- btcommon.h 2001/02/27 15:07:36 1.61
+++ btcommon.h 2001/02/28 13:31:00 1.62
@@ -249,8 +249,6 @@
typedef u16 CID;
=20
typedef struct flow {
- u8 type; /* =3D 0x3 or 0x4 ??? */
- u8 len; /* =3D 22 (0x16) */
u8 flags; /* default 0 */
u8 service; /* default 0x01 (best effort) */
u32 token_rate;
|
|
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: Mattias A. <mat...@us...> - 2001-03-30 09:40:55
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btcommon.h 1.66 1.67=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* added blocking calls on l2cap messages
* rewrote rtx/ertx timer handling
* added result and internal connection status in l2cap con obj
* added ping_struct used to send ping via ioctl
* removed l2cap command backup, use blocking calls instead when=20
resending lost l2cap messages.
* added ioctls for enabling m/s switch, sending test cmd and do ping
* minor changes
The diff of the modified file(s):
--- btcommon.h 2001/03/06 10:11:34 1.66
+++ btcommon.h 2001/03/30 09:40:53 1.67
@@ -176,12 +176,22 @@
/* ioctls vendor specific HCI commands */
#define HCISETBAUDRATE _IOW(BT_IOC_MAGIC, 0x70, s32)
#define HCIWRITEBDADDR _IOW(BT_IOC_MAGIC, 0x71, u8[6])
-#define HCISENDRAWDATA _IOW(BT_IOC_MAGIC, 0x72, u8[64])
+
+/* | len 1 byte | 4 bytes hci header | data (max 256) | */
+#define HCISENDRAWDATA _IOW(BT_IOC_MAGIC, 0x72, u8[261])
=20
/* other ioctls used for testing */
#define BTSENDTESTDATA _IOW(BT_IOC_MAGIC, 0xf0, s32[2])
#define HCITESTCONNECTREQ _IOW(BT_IOC_MAGIC, 0xf1, u8[6])
+#define BTTESTCOMMAND _IOW(BT_IOC_MAGIC, 0xf2, u8[261])
+#define BTSETMSSWITCH _IOW(BT_IOC_MAGIC, 0xf3, u8)
=20
+/* | BD(6) | len(2) | data |*/
+#define BTPING _IOW(BT_IOC_MAGIC, 0x73, ping_struct)
+
+/* | BD(6) | type (2) |*/
+#define BTGETINFO _IOW(BT_IOC_MAGIC, 0x74, u8[8])
+
/* NOTE !
* N_BT should be defined in /include/asm/termios.h=20
* However, if you are compiling this source standalone
@@ -276,18 +286,32 @@
/* FIXME -- move all layer specific structs into each layers .h file=20
and fix include order ! */
=20
-/* used to resend lost l2cap commands */
-typedef struct l2cap_cmd_backup {
- u8 type; /* conreq/confreq/discreq */=09
- u8 nbr_resends;
- /* params for config req */
- u16 in_mtu;
- u16 flush_timeout;
- u16 link_to;
- flow *outflow; /* danger if this is deallocated in upper layers */
- u16 inforeq_type;
-} l2cap_cmd_backup;
+/* 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
=20
+typedef struct l2cap_timer_obj
+{
+#ifdef __KERNEL__
+ struct timer_list rtx;
+ struct timer_list ertx;
+#else
+ /* fixme */
+#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;
+
+ //struct timeval caller_id; /* used to identify caller */
+} __attribute__ ((packed)) l2cap_timer_obj;
+
typedef struct l2cap_con {
s32 magic;
BD_ADDR remote_bd; /* 6 bytes */
@@ -302,33 +326,38 @@
u16 psm;
u16 local_mtu;
=20
- /* remote options temp stored when receiving config req */
+ /* Config options from remote peer */
u16 remote_mtu;
u16 flush_timeout;
flow remote_qos;
+ u16 remote_flags; /* more config options to come */
=20
+ u16 local_flags; /* indicates more config options to be sent */
+
u8 initiator;
=20
u8 link_up;=20=20
u8 sig_id_sent; /* last sent command id */
u8 sig_id_rcv; /* last received command id*/
=20=09
-
- u8 ping_sent;
- u8 inforeq_sent;
-
- s32 reconfiguring; /* indicates if we are currently reconfiguring */
-=09
s32 conf_req_ready; /* indicates if we received pos rsp on our req */
s32 conf_rsp_ready; /* indicates if we replied pos on a config req */
=20
-#ifdef __KERNEL__
- struct timer_list rtx_timer;
- struct timer_list ertx_timer;
+ /* Fixme -- fix multicall */
+ struct l2cap_timer_obj timer;
+
+ /* Fixme -- fix all return values according this system */
+ s32 c_result; /* returns result to higher layers, used together with
+ MSGCODE macro */
+ s32 c_status; /* used to indicate status up caller */
+ u32 c_flags; /* internal connection flags see l2cap_con.h for=20
+ flag codes */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+ struct wait_queue *wq;
#else
- /* timers for usermode is in l2cap.c */
-#endif
- struct l2cap_cmd_backup last_cmd; /* used to resend signals */
+ wait_queue_head_t wq;
+#endif /* LINUX_VERSION_CODE */
=20
/* stats packets sent/received/lost etc*/
=20
@@ -429,8 +458,8 @@
{
/* general */
struct tty_struct *upper_tty;
- s32 connect_status;
-
+ volatile s32 connect_status;
+ volatile s32 disconnect_status;
/* hci link */
=20
/* rfcomm */
@@ -491,6 +520,13 @@
u8 bd_addr[0];
} inquiry_results;
=20
+typedef struct ping_struct
+{
+ u8 bd[6];
+ u16 len;
+ u8 data[1024];
+} ping_struct;
+
typedef struct serport_profile_info {
s32 rfcomm_serv_chan;
u32 serport_name_length;
@@ -499,18 +535,6 @@
=20
extern s32 bt_current_hw;
extern u8 bt_hw_firmware_info[255];
-
-/* unique status codes 32 bits : | layer 16 bits | code 16 bits | */
-
-#define MSG_LAYER_HCI 0
-#define MSG_LAYER_L2CAP 1
-#define MSG_LAYER_RFCOMM 2
-#define MSG_LAYER_SDP 4
-#define MSG_LAYER_TCS 8
-
-/* unique status codes 32 bits : | layer 16 bits | code 16 bits | */
-
-#define MSGCODE(layer, msgcode) ((((layer)<<16)&0xffff0000) | ((msgcode)&0=
xffff))
=20
#endif
/****************** END OF FILE btcommon.h *******************************=
***/
|
|
From: Mattias A. <mat...@us...> - 2001-04-11 20:23:57
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btcommon.h 1.68 1.69=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
fixed blocking calls in usermode stack
added conf_req_sent in l2cap_con struct
The diff of the modified file(s):
--- btcommon.h 2001/04/10 12:26:41 1.68
+++ btcommon.h 2001/04/11 20:23:57 1.69
@@ -68,6 +68,7 @@
/* 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
@@ -75,8 +76,8 @@
#ifndef __KERNEL__
#define kmalloc(size,prio) malloc((size))
#define kfree(obj) free((obj))
-#define wake_up_interruptible(p)
-#define interruptible_sleep_on(p) sleep(1)
+#define wake_up_interruptible(p) do {*(p) =3D 0;} while (0)
+#define interruptible_sleep_on(p) do {(int)*(p)=3D1; while (*(p)){ usleep(=
10000);}; } while (0)
#define cli()
#define sti()
#endif
@@ -339,6 +340,7 @@
u8 sig_id_sent; /* last sent command id */
u8 sig_id_rcv; /* last received command id*/
=20=09
+ s32 conf_req_sent;
s32 conf_req_ready; /* indicates if we received pos rsp on our req */
s32 conf_rsp_ready; /* indicates if we replied pos on a config req */
=20
|
|
From: Mattias A. <mat...@us...> - 2001-04-12 15:14:50
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.69 1.70=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * added dummy for usermode timers The diff of the modified file(s): --- btcommon.h 2001/04/11 20:23:57 1.69 +++ btcommon.h 2001/04/12 15:14:50 1.70 @@ -300,7 +300,9 @@ struct timer_list rtx; struct timer_list ertx; #else - /* fixme */ + /* dummy */ + int rtx; + int ertx; #endif u16 rtx_no; /* nbr retries */ u16 rtx_action; /* preferred action when rtx expires */=09 |
|
From: Peter K. <pk...@us...> - 2001-04-20 14:33:08
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.71 1.72=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added ioctl (BTHWVENDOR) to retrieve the vendor of the hardware. The diff of the modified file(s): --- btcommon.h 2001/04/17 16:06:49 1.71 +++ btcommon.h 2001/04/20 14:33:07 1.72 @@ -126,6 +126,7 @@ #define BTREADREMOTEBDADDR _IOR(BT_IOC_MAGIC, 0x07, u8[6]) #define BTRESETPHYSICALHW _IO(BT_IOC_MAGIC, 0x08) #define BTISINITIATED _IOR(BT_IOC_MAGIC, 0x09, s32) +#define BTHWVENDOR _IOR(BT_IOC_MAGIC, 0x0A, char[20]) =20 #define BTWAITFORCONNECTION _IOW(BT_IOC_MAGIC, 0x0a, s32) #define BTWAITNEWCONNECTIONS _IO(BT_IOC_MAGIC, 0x0b) |
|
From: Mattias A. <mat...@us...> - 2001-04-25 17:52:03
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btcommon.h 1.72 1.73=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* added pid in bt_session struct
* added ioctl define for reading transmit power level
* cleanup
The diff of the modified file(s):
--- btcommon.h 2001/04/20 14:33:07 1.72
+++ btcommon.h 2001/04/25 17:52:02 1.73
@@ -134,7 +134,7 @@
#define BT_SDP_REQUEST _IOW(BT_IOC_MAGIC, 0x0d, bt_sdp_request)
=20
=20
-/* ioctls executing HCI commands */
+/* Ioctls executing HCI commands */
=20
/* Link Control Command */
#define HCIINQUIRY _IOWR(BT_IOC_MAGIC, 0x10, inquiry_results)
@@ -148,7 +148,7 @@
/* Link Policy Commands */
#define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x20, u8[7])
=20
-/* Host Controler & Basband Commands */
+/* Host Controller & Baseband Commands */
#define HCIRESET _IO(BT_IOC_MAGIC, 0x30)
#define HCIFLUSH _IO(BT_IOC_MAGIC, 0x31)
#define HCICREATE_NEW_UNIT_KEY _IOR(BT_IOC_MAGIC, 0x32, s32)
@@ -165,6 +165,7 @@
#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 HCIREADTRANSMITPOWERLEVEL _IOWR(BT_IOC_MAGIC, 0x40, u8)
=20
/* Informational Parameters */
#define HCIREADLOCALBDADDR _IOR(BT_IOC_MAGIC, 0x45, u8[6])
@@ -462,6 +463,7 @@
{
/* general */
struct tty_struct *upper_tty;
+ unsigned int pid;
volatile s32 connect_status;
volatile s32 disconnect_status;
/* hci link */
|
|
From: Ulf H. <ul...@us...> - 2001-04-26 13:23:29
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.73 1.74=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added function to read the cached link key via ioctl The diff of the modified file(s): --- btcommon.h 2001/04/25 17:52:02 1.73 +++ btcommon.h 2001/04/26 13:23:28 1.74 @@ -132,7 +132,7 @@ #define BTWAITNEWCONNECTIONS _IO(BT_IOC_MAGIC, 0x0b) #define BTISLOWERCONNECTED _IOW(BT_IOC_MAGIC, 0x0c, s32) #define BT_SDP_REQUEST _IOW(BT_IOC_MAGIC, 0x0d, bt_sdp_request) - +#define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x0e, u8[22]) =20 /* Ioctls executing HCI commands */ =20 |
|
From: Mattias A. <mat...@us...> - 2001-06-06 14:58:45
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.74 1.75=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * Added ioctls for setting bcsp mode, read/write csr ps key=20 and initializing BCSP The diff of the modified file(s): --- btcommon.h 2001/04/26 13:23:28 1.74 +++ btcommon.h 2001/06/06 14:58:45 1.75 @@ -188,6 +188,15 @@ #define BTTESTCOMMAND _IOW(BT_IOC_MAGIC, 0xf2, u8[261]) #define BTSETMSSWITCH _IOW(BT_IOC_MAGIC, 0xf3, u8) =20 +#define BTSETBCSPMODE _IOW(BT_IOC_MAGIC, 0xf4, u8) + +#define CSR_PSKEY_MSGHDR_SIZE 3 +#define CSR_PSKEY_MAXPARAMS 10 + +#define BT_CSR_PSKEY _IOWR(BT_IOC_MAGIC, 0xf5, u16[CSR_PSKEY_MSGHDR_SIZE = + CSR_PSKEY_MAXPARAMS]) + +#define BTINITBCSP _IO(BT_IOC_MAGIC, 0xf6) + /* | BD(6) | len(2) | data |*/ #define BTPING _IOW(BT_IOC_MAGIC, 0x73, ping_struct) =20 |
|
From: Peter K. <pk...@us...> - 2001-06-19 10:34:04
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.77 1.78=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * Added BTFIRMWAREINFO ioctl. * Renumbered a couple of ioctls as BTHWVENDOR and BTWAITFORCONNECTION had accidentally gotten the same number... The diff of the modified file(s): --- btcommon.h 2001/06/19 06:13:01 1.77 +++ btcommon.h 2001/06/19 10:34:03 1.78 @@ -116,6 +116,7 @@ /* Define the ioctls to the bt driver */ #define BT_IOC_MAGIC 'B' /* Use B as a magic number */ #define BT_IOC_MAXNR 255 + #define BTCONNECT _IOW(BT_IOC_MAGIC, 0x00, bt_connection) #define BTDISCONNECT _IOW(BT_IOC_MAGIC, 0x01, u32) #define BTSETSPEED _IOW(BT_IOC_MAGIC, 0x02, s32) @@ -127,26 +128,26 @@ #define BTRESETPHYSICALHW _IO(BT_IOC_MAGIC, 0x08) #define BTISINITIATED _IOR(BT_IOC_MAGIC, 0x09, s32) #define BTHWVENDOR _IOR(BT_IOC_MAGIC, 0x0A, char[20]) - -#define BTWAITFORCONNECTION _IOW(BT_IOC_MAGIC, 0x0a, s32) -#define BTWAITNEWCONNECTIONS _IO(BT_IOC_MAGIC, 0x0b) -#define BTISLOWERCONNECTED _IOW(BT_IOC_MAGIC, 0x0c, s32) -#define BT_SDP_REQUEST _IOW(BT_IOC_MAGIC, 0x0d, bt_sdp_request) -#define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x0e, u8[22]) +#define BTFIRMWAREINFO _IOR(BT_IOC_MAGIC, 0x0B, char[80]) +#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_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x10, u8[22]) =20 /* Ioctls executing HCI commands */ =20 /* Link Control Command */ -#define HCIINQUIRY _IOWR(BT_IOC_MAGIC, 0x10, inquiry_results) -#define HCILINKKEYREPLY _IOWR(BT_IOC_MAGIC, 0x11, u8[22]) -#define HCILINKKEYNEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x12, u8[6]) -#define HCIPINCODEREPLY _IOWR(BT_IOC_MAGIC, 0x13, u8[23]) -#define HCIPINCODENEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x14, u8[6]) -#define HCIAUTHENTICATION_REQUESTED _IOW(BT_IOC_MAGIC, 0x15, u8[6]) -#define HCISETCONNECTION_ENCRYPTION _IOW(BT_IOC_MAGIC, 0x16, u8[7]) +#define HCIINQUIRY _IOWR(BT_IOC_MAGIC, 0x20, inquiry_results) +#define HCILINKKEYREPLY _IOWR(BT_IOC_MAGIC, 0x21, u8[22]) +#define HCILINKKEYNEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x22, u8[6]) +#define HCIPINCODEREPLY _IOWR(BT_IOC_MAGIC, 0x23, u8[23]) +#define HCIPINCODENEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x24, u8[6]) +#define HCIAUTHENTICATION_REQUESTED _IOW(BT_IOC_MAGIC, 0x25, u8[6]) +#define HCISETCONNECTION_ENCRYPTION _IOW(BT_IOC_MAGIC, 0x26, u8[7]) =20 /* Link Policy Commands */ -#define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x20, u8[7]) +#define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, u8[7]) =20 /* Host Controller & Baseband Commands */ #define HCIRESET _IO(BT_IOC_MAGIC, 0x30) |
|
From: Olov H. <ol...@us...> - 2001-07-10 12:57:46
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.78 1.79=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added constant to support to max number of BT connections The diff of the modified file(s): --- btcommon.h 2001/06/19 10:34:03 1.78 +++ btcommon.h 2001/07/10 12:57:45 1.79 @@ -191,12 +191,14 @@ =20 #define BTSETBCSPMODE _IOW(BT_IOC_MAGIC, 0xf4, u8) =20 + #define CSR_PSKEY_MSGHDR_SIZE 3 #define CSR_PSKEY_MAXPARAMS 10 =20 #define BT_CSR_PSKEY _IOWR(BT_IOC_MAGIC, 0xf5, u16[CSR_PSKEY_MSGHDR_SIZE = + CSR_PSKEY_MAXPARAMS]) =20 #define BTINITBCSP _IO(BT_IOC_MAGIC, 0xf6) +#define BTSETMAXCONNECTIONS _IOW(BT_IOC_MAGIC, 0xf7, u8) =20 /* | BD(6) | len(2) | data |*/ #define BTPING _IOW(BT_IOC_MAGIC, 0x73, ping_struct) |
|
From: Mattias A. <mat...@us...> - 2001-08-01 09:50:16
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.79 1.80=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * added comment * added ioctl for HCIREADCOUNTRYCODE The diff of the modified file(s): --- btcommon.h 2001/07/10 12:57:45 1.79 +++ btcommon.h 2001/08/01 09:50:15 1.80 @@ -169,6 +169,7 @@ #define HCIREADTRANSMITPOWERLEVEL _IOWR(BT_IOC_MAGIC, 0x40, u8) =20 /* Informational Parameters */ +#define HCIREADCOUNTRYCODE _IOR(BT_IOC_MAGIC, 0x43, s32) #define HCIREADLOCALBDADDR _IOR(BT_IOC_MAGIC, 0x45, u8[6]) =20 /* Status Parameters */ @@ -186,7 +187,10 @@ /* other ioctls used for testing */ #define BTSENDTESTDATA _IOW(BT_IOC_MAGIC, 0xf0, s32[2]) #define HCITESTCONNECTREQ _IOW(BT_IOC_MAGIC, 0xf1, u8[6]) + +/* | len (1) | test string | -- used for unplug tests */ #define BTTESTCOMMAND _IOW(BT_IOC_MAGIC, 0xf2, u8[261]) + #define BTSETMSSWITCH _IOW(BT_IOC_MAGIC, 0xf3, u8) =20 #define BTSETBCSPMODE _IOW(BT_IOC_MAGIC, 0xf4, u8) |
|
From: Peter K. <pk...@us...> - 2001-08-29 09:34:45
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.81 1.82=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: The BTSETBCSPMODE ioctl can now return the old mode. The diff of the modified file(s): --- btcommon.h 2001/08/17 09:19:00 1.81 +++ btcommon.h 2001/08/29 09:34:44 1.82 @@ -184,6 +184,12 @@ /* | len 1 byte | 4 bytes hci header | data (max 256) | */ #define HCISENDRAWDATA _IOW(BT_IOC_MAGIC, 0x72, u8[261]) =20 +/* | BD(6) | len(2) | data |*/ +#define BTPING _IOW(BT_IOC_MAGIC, 0x73, ping_struct) + +/* | BD(6) | type (2) |*/ +#define BTGETINFO _IOW(BT_IOC_MAGIC, 0x74, u8[8]) + /* other ioctls used for testing */ #define BTSENDTESTDATA _IOW(BT_IOC_MAGIC, 0xf0, s32[2]) #define HCITESTCONNECTREQ _IOW(BT_IOC_MAGIC, 0xf1, u8[6]) @@ -193,7 +199,7 @@ =20 #define BTSETMSSWITCH _IOW(BT_IOC_MAGIC, 0xf3, u8) =20 -#define BTSETBCSPMODE _IOW(BT_IOC_MAGIC, 0xf4, u8) +#define BTSETBCSPMODE _IOWR(BT_IOC_MAGIC, 0xf4, s32) =20 =20 #define CSR_PSKEY_MSGHDR_SIZE 3 @@ -202,13 +208,8 @@ #define BT_CSR_PSKEY _IOWR(BT_IOC_MAGIC, 0xf5, u16[CSR_PSKEY_MSGHDR_SIZE = + CSR_PSKEY_MAXPARAMS]) =20 #define BTINITBCSP _IO(BT_IOC_MAGIC, 0xf6) -#define BTSETMAXCONNECTIONS _IOW(BT_IOC_MAGIC, 0xf7, u8) - -/* | BD(6) | len(2) | data |*/ -#define BTPING _IOW(BT_IOC_MAGIC, 0x73, ping_struct) =20 -/* | BD(6) | type (2) |*/ -#define BTGETINFO _IOW(BT_IOC_MAGIC, 0x74, u8[8]) +#define BTSETMAXCONNECTIONS _IOW(BT_IOC_MAGIC, 0xf7, u8) =20 /* NOTE ! * N_BT should be defined in /include/asm/termios.h=20 |
|
From: Peter K. <pk...@us...> - 2001-09-18 12:14:35
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
btcommon.h 1.83 1.84=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Added GET_BITS() and SET_BITS() to get and set a number of bits
from a variable.
The diff of the modified file(s):
--- btcommon.h 2001/09/10 10:16:22 1.83
+++ btcommon.h 2001/09/18 12:14:35 1.84
@@ -85,12 +85,20 @@
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
=20
+#define GET_BITS(var, bit, bits) (((var) >> (bit)) & ((1UL << (bits)) - 1))
+#define SET_BITS(var, bit, bits, x) \
+ do { \
+ (var) =3D ((var) & ~(((1UL << (bits)) - 1) << (bit))) | \
+ (((x) & ((1UL << (bits)) - 1)) << (bit)); \
+ } while (0)
+
#define CHAR2INT10(c1,c0) (((u32)((c1) & 0x03) << 8) + (u32)((c0) & 0xff))
#define CHAR2INT12(c1,c0) (((u32)((c1) & 0x0f) << 8) + (u32)((c0) & 0xff))
#define CHAR2INT16(c1,c0) (((u32)((c1) & 0xff) << 8) + (u32)((c0) & 0xff))
#define CHAR2INT32(c3,c2,c1,c0) (((u32)((c3) & 0xff) << 24) + \
((u32)((c2) & 0xff) << 16) + \
((u32)((c1) & 0xff) << 8) + (u32)((c0) &0xff))
+
/* extract line number from tty */
#define GET_TTYLINE(tty) (MINOR(tty->device) - tty->driver.minor_start)
=20
|
|
From: Peter K. <pk...@us...> - 2001-09-21 12:51:07
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.84 1.85=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Replaces CHAR2INTx() macros with get_unaligned() and leXX_to_cpu(). The diff of the modified file(s): --- btcommon.h 2001/09/18 12:14:35 1.84 +++ btcommon.h 2001/09/21 12:51:06 1.85 @@ -92,13 +92,6 @@ (((x) & ((1UL << (bits)) - 1)) << (bit)); \ } while (0) =20 -#define CHAR2INT10(c1,c0) (((u32)((c1) & 0x03) << 8) + (u32)((c0) & 0xff)) -#define CHAR2INT12(c1,c0) (((u32)((c1) & 0x0f) << 8) + (u32)((c0) & 0xff)) -#define CHAR2INT16(c1,c0) (((u32)((c1) & 0xff) << 8) + (u32)((c0) & 0xff)) -#define CHAR2INT32(c3,c2,c1,c0) (((u32)((c3) & 0xff) << 24) + \ - ((u32)((c2) & 0xff) << 16) + \ - ((u32)((c1) & 0xff) << 8) + (u32)((c0) &0xff)) - /* extract line number from tty */ #define GET_TTYLINE(tty) (MINOR(tty->device) - tty->driver.minor_start) =20 |
|
From: Peter K. <pk...@us...> - 2001-10-05 11:54:26
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.85 1.86=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Increased CSR_PSKEY_MAXPARAMS to 40. The diff of the modified file(s): --- btcommon.h 2001/09/21 12:51:06 1.85 +++ btcommon.h 2001/10/05 11:54:24 1.86 @@ -204,7 +204,7 @@ =20 =20 #define CSR_PSKEY_MSGHDR_SIZE 3 -#define CSR_PSKEY_MAXPARAMS 10 +#define CSR_PSKEY_MAXPARAMS 40 =20 #define BT_CSR_PSKEY _IOWR(BT_IOC_MAGIC, 0xf5, u16[CSR_PSKEY_MSGHDR_SIZE += CSR_PSKEY_MAXPARAMS]) =20 |
|
From: Anders J. <and...@us...> - 2001-10-10 15:00:43
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.86 1.87=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * Defined GET_LINE macro. The diff of the modified file(s): --- btcommon.h 2001/10/05 11:54:24 1.86 +++ btcommon.h 2001/10/10 15:00:42 1.87 @@ -94,7 +94,6 @@ =20 /* extract line number from tty */ #define GET_TTYLINE(tty) (MINOR(tty->device) - tty->driver.minor_start) - /****************** Defines realted to the bluetooth implementation ******= ***/ =20 #define SERIAL_PORT_PROFILE 0 @@ -106,9 +105,14 @@ #define PICONET_BROADCAST 2 =20 #define MAX_NBR_OF_CONNECTIONS 7 + +/* Macro to extract the linenumber in a conid used by applications/stack. = */ +#define GET_LINE(conID) ( ((conID & 0xff00) >> 8) ) + /* Define to control usage of the security manager */=20=20 =20 /****************** Defines realated to the management of the bt-driver **= ***/ + =20 #define BT_NBR_DATAPORTS 7 #define BT_NBR_CTRLPORTS 1 |
|
From: Peter K. <pk...@us...> - 2001-10-16 14:57:22
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.87 1.88=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Moved definitions of le16_to_cpuu() and le32_to_cpuu() macros to btcommon.h The diff of the modified file(s): --- btcommon.h 2001/10/10 15:00:42 1.87 +++ btcommon.h 2001/10/16 14:57:10 1.88 @@ -94,6 +94,12 @@ =20 /* extract line number from tty */ #define GET_TTYLINE(tty) (MINOR(tty->device) - tty->driver.minor_start) + +/* These two macros are the same as le16_to_cpup() and le32_to_cpup() + only that they work with unaligned addresses */ +#define le16_to_cpuu(addr) (le16_to_cpu(get_unaligned((u16 *)addr))) +#define le32_to_cpuu(addr) (le32_to_cpu(get_unaligned((u32 *)addr))) + /****************** Defines realted to the bluetooth implementation ******= ***/ =20 #define SERIAL_PORT_PROFILE 0 |
|
From: Fredrik S. <fre...@us...> - 2002-01-18 12:50:33
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.91 1.92=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Corrected parameter type for BNEPADDMULTICASTFILTER. The diff of the modified file(s): --- btcommon.h 2001/12/04 10:01:27 1.91 +++ btcommon.h 2002/01/18 12:50:32 1.92 @@ -163,7 +163,7 @@ #define BNEPCONNECT _IOW(BT_IOC_MAGIC, 0x29, u8[6]) #define BNEPTEST _IOW(BT_IOC_MAGIC, 0x2a, u8[5]) #define BNEPADDPROTOCOLFILTER _IOW(BT_IOC_MAGIC, 0x2b, u32[2]) -#define BNEPADDMULTICASTFILTER _IOW(BT_IOC_MAGIC, 0x2c, u32[2]) +#define BNEPADDMULTICASTFILTER _IOW(BT_IOC_MAGIC, 0x2c, u8[12]) =20 /* Host Controller & Baseband Commands */ #define HCIRESET _IO(BT_IOC_MAGIC, 0x30) |
|
From: Willy S. <sag...@us...> - 2002-04-08 16:43:54
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- btcommon.h 1.94 1.95=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added new commands SNIFF,PARK,HOLD .... The diff of the modified file(s): --- btcommon.h 28 Feb 2002 20:09:27 -0000 1.94 +++ btcommon.h 8 Apr 2002 10:07:45 -0000 1.95 @@ -160,15 +160,23 @@ #define HCIAUTHENTICATION_REQUESTED _IOW(BT_IOC_MAGIC, 0x25, u8[6]) #define HCISETCONNECTION_ENCRYPTION _IOW(BT_IOC_MAGIC, 0x26, u8[7]) #define HCIREMOTENAME_REQUEST _IOW(BT_IOC_MAGIC, 0x27, u8[255]) +#define HCIREADCLOCKOFFSET _IOWR(BT_IOC_MAGIC, 0x53, u32) =20 /* Link Policy Commands */ #define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, u8[7]) +#define HCIPARKMODE _IOW(BT_IOC_MAGIC, 0x51, u8[6]) +#define HCIEXITPARKMODE _IOW(BT_IOC_MAGIC, 0x52, u32) +#define HCISNIFFMODE _IOW(BT_IOC_MAGIC, 0x59, u8[8]) +#define HCIEXITSNIFFMODE _IOW(BT_IOC_MAGIC, 0x5a, u8[4]) +#define HCIWRITELINKPOLICYSETTINGS _IOW(BT_IOC_MAGIC, 0x5b, u8[4]) +#define HCIHOLDMODE _IOW(BT_IOC_MAGIC, 0x5c, u8[6]) =20 /* BNEP Control Commands */ -#define BNEPCONNECT _IOW(BT_IOC_MAGIC, 0x29, u8[6]) +#define BNEPCONNECT _IOWR(BT_IOC_MAGIC, 0x29, u8[6]) #define BNEPTEST _IOW(BT_IOC_MAGIC, 0x2a, u8[5]) #define BNEPADDPROTOCOLFILTER _IOW(BT_IOC_MAGIC, 0x2b, u32[2]) #define BNEPADDMULTICASTFILTER _IOW(BT_IOC_MAGIC, 0x2c, u8[12]) +#define BNEPDISCONNECT _IOWR(BT_IOC_MAGIC, 0x2d, u8[6]) =20 /* Host Controller & Baseband Commands */ #define HCIRESET _IO(BT_IOC_MAGIC, 0x30) @@ -187,7 +195,11 @@ #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[255]) -#define HCIREADTRANSMITPOWERLEVEL _IOWR(BT_IOC_MAGIC, 0x40, u8) +#define HCIREADTRANSMITPOWERLEVEL _IOWR(BT_IOC_MAGIC, 0x57, u8[3]) +#define HCIREADNUMBROADCASTRETRANSMISSIONS _IOWR(BT_IOC_MAGIC, 0x55, u8[2]) +#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]) =20 /* Informational Parameters */ #define HCIREADCOUNTRYCODE _IOR(BT_IOC_MAGIC, 0x43, s32) |
|
From: Anders J. <and...@us...> - 2002-08-06 17:53:31
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- btcommon.h 1.95 1.96=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * Added BTDISCONNECT_BB The diff of the modified file(s): --- btcommon.h 8 Apr 2002 10:07:45 -0000 1.95 +++ btcommon.h 6 Aug 2002 17:53:30 -0000 1.96 @@ -148,6 +148,7 @@ #define BTISLOWERCONNECTED _IOW(BT_IOC_MAGIC, 0x0E, s32) #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]) =20 /* Ioctls executing HCI commands */ =20 |
|
From: Peter K. <pk...@us...> - 2002-09-27 12:54:13
|
The following file was modified in linux/include/linux/bluetooth:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
btcommon.h 1.96 1.97=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Made the user stack compile again (I am pretty sure it does not
work, but at least it compiles).
The diff of the modified file(s):
--- btcommon.h 6 Aug 2002 17:53:30 -0000 1.96
+++ btcommon.h 27 Sep 2002 12:54:12 -0000 1.97
@@ -358,16 +358,9 @@
=20
typedef struct l2cap_timer_obj
{
-#ifdef __KERNEL__
struct bt_timer_obj rtx;
struct bt_timer_obj ertx;
struct bt_timer_obj crtx; /* Maximum negotiation time 120 sec */
-#else
- /* dummy */
- int rtx;
- int ertx;
- int crtx; /* Maximum negotiation time 120 sec */
-#endif
u16 rtx_no; /* nbr retries */
} __attribute__ ((packed)) l2cap_timer_obj;
=20
|
|
From: Anders J. <and...@us...> - 2003-11-05 19:10:45
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- btcommon.h 1.101 1.102=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added BT_DISCONNECT_ALL The diff of the modified file(s): --- btcommon.h 2003/11/05 15:22:54 1.101 +++ btcommon.h 2003/11/05 19:03:45 1.102 @@ -151,6 +151,7 @@ #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) =20 /* Ioctls executing HCI commands */ =20 |
|
From: Anders J. <and...@us...> - 2003-11-17 14:58:38
|
The following file was modified in linux/include/linux/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- btcommon.h 1.103 1.104=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added IOCTL to enable/disable on-board LED, only for CRIS. The diff of the modified file(s): --- btcommon.h 2003/11/06 19:13:26 1.103 +++ btcommon.h 2003/11/17 14:57:54 1.104 @@ -152,6 +152,7 @@ #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) =20 /* Ioctls executing HCI commands */ =20 |
Thanks for helping keep SourceForge clean.
X