Menu
▾
▴
openbt-commit
|
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: Peter K. <pk...@us...> - 2001-03-05 16:56:17
|
The following file was modified in apps/bluetooth/btd: Name Old version New version Comment ---- ----------- ----------- ------- btd.h 1.34 1.35=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: If CONFIG_BLUETOOTH is defined when btd.h is included, then rely on that CONFIG_BLUETOOTH_<hardware> is defined too. The diff of the modified file(s): --- btd.h 2001/03/04 17:54:54 1.34 +++ btd.h 2001/03/05 16:57:54 1.35 @@ -46,22 +46,21 @@ =20 /****************** CONSTANT AND MACRO SECTION ***************************= ***/ =20 -/* - * I had to change this section to match btconfig.h, which was modified - * to suit Linux kernel configuration. It's unfortunate I had to influence - * the apps directory with a kernel change, but the user stack uses the - * kernel module configs and the btd.c source. - * --gmcnutt - */ /* HW init defines */ -#undef CONFIG_BLUETOOTH_CSR=20=20=20=20=20=20=20=20 + +/* Let us assume that if CONFIG_BLUETOOTH is definend (from the kernel + includes), then CONFIG_BLUETOOTH_<hardware> is also defined correctly */ +#ifndef CONFIG_BLUETOOTH + +/* Define the one of these that matches the used hardware */ #undef CONFIG_BLUETOOTH_NOINIT=20=20=20=20=20 +#undef CONFIG_BLUETOOTH_CSR=20=20=20=20=20=20=20=20 #undef CONFIG_BLUETOOTH_DIGIANSWER=20 -#undef CONFIG_BLUETOOTH_USBMODULE /* Not implemented */ -#undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20 -/* This sets current HW */ #define CONFIG_BLUETOOTH_ERICSSON +#undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20 +#undef CONFIG_BLUETOOTH_USBMODULE /* Not implemented */ =20 +#endif CONFIG_BLUETOOTH =20 /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */ =20 |
|
From: Ulf H. <ul...@us...> - 2001-04-26 14:02:18
|
The following file was modified in apps/bluetooth/btd: Name Old version New version Comment ---- ----------- ----------- ------- btd.h 1.36 1.37=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Corrected HCIREADSTOREDLINKKEY definition Added definition for BT_GETCACHEDLINKKEY The diff of the modified file(s): --- btd.h 2001/04/20 16:12:14 1.36 +++ btd.h 2001/04/26 14:02:18 1.37 @@ -65,6 +65,8 @@ #define BTISINITIATED _IOR(BT_IOC_MAGIC, 0x09, int) #define BTHWVENDOR _IOR(BT_IOC_MAGIC, 0x0A, char[20]) =20 +#define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x0e, unsigned char[22]) + /* ioctls executing HCI commands */ =20 /* Link Control Command */ @@ -83,7 +85,7 @@ #define HCIRESET _IO(BT_IOC_MAGIC, 0x30) #define HCIFLUSH _IO(BT_IOC_MAGIC, 0x31) #define HCICREATE_NEW_UNIT_KEY _IO(BT_IOC_MAGIC, 0x32) -#define HCIREADSTOREDLINKKEY _IOWR(BT_IOC_MAGIC, 0x33, unsigned char[6]) +#define HCIREADSTOREDLINKKEY _IOWR(BT_IOC_MAGIC, 0x33, unsigned char[7]) #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]) @@ -126,7 +128,6 @@ =20 #define INQUIRY_SCAN_ENABLE 1 #define PAGE_SCAN_ENABLE 2 - #define SDP_LAYER 1 #define RFCOMM_LAYER 3 #define TCS_LAYER 5 |
|
From: Peter K. <pk...@us...> - 2001-06-19 10:36:14
|
The following file was modified in apps/bluetooth/btd: Name Old version New version Comment ---- ----------- ----------- ------- btd.h 1.38 1.39=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Renumbered a couple of ioctls as BTHWVENDOR and BTWAITFORCONNECTION had accidentally gotten the same number... The diff of the modified file(s): --- btd.h 2001/06/15 12:43:16 1.38 +++ btd.h 2001/06/19 10:36:14 1.39 @@ -50,11 +50,10 @@ =20 #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, unsigned int) =20 -#define BTWAITFORCONNECTION _IOW(BT_IOC_MAGIC, 0x0a, int) - #define BTSETSPEED _IOW(BT_IOC_MAGIC, 0x02, int) #define BTINITSTACK _IO(BT_IOC_MAGIC, 0x03) #define BTSETSERTTY _IO(BT_IOC_MAGIC, 0x04) @@ -64,22 +63,28 @@ #define BTRESETPHYSICALHW _IO(BT_IOC_MAGIC, 0x08) #define BTISINITIATED _IOR(BT_IOC_MAGIC, 0x09, int) #define BTHWVENDOR _IOR(BT_IOC_MAGIC, 0x0A, char[20]) +#define BTFIRMWAREINFO _IOR(BT_IOC_MAGIC, 0x0B, char[80]) =20 -#define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x0e, unsigned char[22]) +#define BTWAITFORCONNECTION _IOW(BT_IOC_MAGIC, 0x0C, int) +#define BTWAITNEWCONNECTIONS _IO(BT_IOC_MAGIC, 0x0D) +#define BTISLOWERCONNECTED _IOW(BT_IOC_MAGIC, 0x0E, int) + +//#define BT_SDP_REQUEST _IOW(BT_IOC_MAGIC, 0x0F, bt_sdp_request) +#define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x10, unsigned char[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, unsigned char[22]) -#define HCILINKKEYNEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x12, unsigned char[6]) -#define HCIPINCODEREPLY _IOWR(BT_IOC_MAGIC, 0x13, unsigned char[23]) -#define HCIPINCODENEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x14, unsigned char[6]) -#define HCIAUTHENTICATION_REQUESTED _IOW(BT_IOC_MAGIC, 0x15, unsigned char= [6]) -#define HCISETCONNECTION_ENCRYPTION _IOW(BT_IOC_MAGIC, 0x16, unsigned char= [7]) +#define HCIINQUIRY _IOWR(BT_IOC_MAGIC, 0x20, inquiry_results) +#define HCILINKKEYREPLY _IOWR(BT_IOC_MAGIC, 0x21, unsigned char[22]) +#define HCILINKKEYNEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x22, unsigned char[6]) +#define HCIPINCODEREPLY _IOWR(BT_IOC_MAGIC, 0x23, unsigned char[23]) +#define HCIPINCODENEGATIVEREPLY _IOWR(BT_IOC_MAGIC, 0x24, unsigned char[6]) +#define HCIAUTHENTICATION_REQUESTED _IOW(BT_IOC_MAGIC, 0x25, unsigned char= [6]) +#define HCISETCONNECTION_ENCRYPTION _IOW(BT_IOC_MAGIC, 0x26, unsigned char= [7]) =20 /* Link Policy Commands */ -#define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x20, unsigned char[7]) +#define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, unsigned char[7]) =20 /* Host Controler & Basband Commands */ #define HCIRESET _IO(BT_IOC_MAGIC, 0x30) |
|
From: Peter K. <pk...@us...> - 2001-06-20 11:10:15
|
The following file was modified in apps/bluetooth/btd: Name Old version New version Comment ---- ----------- ----------- ------- btd.h 1.39 1.40=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Corrected HCISENDRAWDATA. The diff of the modified file(s): --- btd.h 2001/06/19 10:36:14 1.39 +++ btd.h 2001/06/20 11:10:15 1.40 @@ -116,7 +116,7 @@ /* ioctls vendor specific HCI commands */ #define HCISETBAUDRATE _IOW(BT_IOC_MAGIC, 0x70, int) #define HCIWRITEBDADDR _IOW(BT_IOC_MAGIC, 0x71, unsigned char[6]) -#define HCISENDRAWDATA _IOW(BT_IOC_MAGIC, 0x72, unsigned char[64]) +#define HCISENDRAWDATA _IOW(BT_IOC_MAGIC, 0x72, unsigned char[261]) =20 /* other ioctls used for testing */ #define BTSENDTESTDATA _IOW(BT_IOC_MAGIC, 0xf0, int[2]) |
Thanks for helping keep SourceForge clean.
X