From: Mattias A. <mat...@us...> - 2001-03-21 17:29:56
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.1 1.2=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: added return value on bt_disconnect changed defines for l2cap error codes changed ioctl define for sending raw hci data minor changes The diff of the modified file(s): --- bt_if.h 2001/03/02 10:59:57 1.1 +++ bt_if.h 2001/03/21 17:29:55 1.2 @@ -92,10 +92,12 @@ #define MSG_LAYER_TCS 8 =20 /* Result in responses in L2CAP */ -#define RES_PSMNEG 0x02 -#define RES_SECNEG 0x03 -#define RES_NOSRC 0x04 +#define L2CAP_PSMNEG 0x02 +#define L2CAP_SECNEG 0x03 +#define L2CAP_NOSRC 0x04 =20 +#define L2CAP_CON_UNRESPONSIVE 0xf1 + /* =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 */ /* IF Macros */ =20 @@ -185,8 +187,10 @@ =20 #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[256]) =20 +/* | len 1 byte | 4 bytes hci header | data (max 256) | */ +#define HCISENDRAWDATA _IOW(BT_IOC_MAGIC, 0x72, unsigned char[261]) + /* Used to calculate opcode for HCI commands using raw interface */ #define OPCODE_MSB(ocf, ogf) ((ocf) & 0xff) #define OPCODE_LSB(ocf, ogf) (((ocf) >> 8) | (((ogf) & 0x3f) << 2)) @@ -245,21 +249,23 @@ */ =20 int bt_connect(int bt_fd, unsigned char *bd, unsigned int con_id); -void bt_disconnect(int bt_fd, unsigned int con_id); +int bt_disconnect(int bt_fd, unsigned int con_id); =20 void bt_waitline(int bt_fd, int line); void bt_waitconnection(int bt_fd, int line); void bt_waitnewconnections(int bt_fd); int bt_isconnected(int bt_cfd, int line); int bt_send(int fd, int len, int repeat); +void bt_showstatus(void); =20 /*=20 * HCI command functions=20 */ =20 +int bt_send_raw_hci(int bt_cfd, unsigned char *data, char len); void bt_inquiry(int bt_cfd, int nbr_rsp, int t); int bt_set_baudrate(int bt_cfd, int spd); -void bt_set_bd_addr(int bt_cfd, int* bd); +void bt_set_bd_addr(int bt_cfd, unsigned char *bd); void read_local_bd(int bt_cfd, unsigned char *bd_addr); void read_remote_bd(int bt_cfd, unsigned char *bd_addr); void role_switch(int bt_cfd, unsigned char *bd_addr, int role); @@ -270,6 +276,9 @@ unsigned char major_class,=20 unsigned char minor_class,=20 unsigned char format); + +void enable_dut(int bt_cfd); + =20 /* Sets friendly name in HW to hostname */ void set_local_name(int bt_cfd, const char *local_name); |
From: Mattias A. <mat...@us...> - 2001-03-30 12:32:49
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.3 1.4=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: added includes ueed when running with usermode stack The diff of the modified file(s): --- bt_if.h 2001/03/26 15:33:13 1.3 +++ bt_if.h 2001/03/30 12:32:47 1.4 @@ -43,8 +43,11 @@ #ifndef __BT_IF_H__ #define __BT_IP_H__ =20 -#include <pthread.h> #include "btd.h" +#ifdef BT_USERSTACK +#include <pthread.h> +#include "include/rfcomm.h" +#endif =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 */ /* General defines */=20 @@ -76,12 +79,19 @@ /* SDP server */ =20 #define PID_FILE "/var/run/btd.pid" + +#ifdef BT_USERSTACK +#define SDPSRV_CMD "sdp_user" +#define SDPSRV_PROC "/tmp/sdp_sock" +#else #define SDPSRV_CMD "sdp_server" -#define SDPSRV_CONF "/etc/sdp.xml" #define SDPSRV_PROC "/proc/sdp_srv" +#endif =20 +#define SDPSRV_CONF "/etc/sdp.xml" + /* =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 */ -/* Return code defines */ +/* Return code defines (see bt_errno.h in kernel)*/ =20 /* unique message status codes 32 bits : | layer 16 bits | code 16 bits | = */ =20 @@ -91,13 +101,20 @@ #define MSG_LAYER_SDP 4 #define MSG_LAYER_TCS 8 =20 +#define L2CAP_SUCCESS 0x0 +#define L2CAP_CON_PENDING 0x1 + /* Result in responses in L2CAP */ #define L2CAP_PSMNEG 0x02 #define L2CAP_SECNEG 0x03 #define L2CAP_NOSRC 0x04 =20 +#define L2CAP_FAILED 0xf0 #define L2CAP_CON_UNRESPONSIVE 0xf1 =20 + +#ifndef BT_USERSTACK + /* =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 */ /* IF Macros */ =20 @@ -192,11 +209,14 @@ #define HCISENDRAWDATA _IOW(BT_IOC_MAGIC, 0x72, unsigned char[261]) =20 /* | BD(6) | len(2) | data(max 256) |*/ -#define BTPING _IOW(BT_IOC_MAGIC, 0x73, unsigned char[264]) +#define BTPING _IOW(BT_IOC_MAGIC, 0x73, ping_struct) + +/* | BD(6) | type (2) |*/ +#define BTGETINFO _IOW(BT_IOC_MAGIC, 0x74, unsigned char[8]) =20 /* Used to calculate opcode for HCI commands using raw interface */ -#define OPCODE_MSB(ocf, ogf) ((ocf) & 0xff) -#define OPCODE_LSB(ocf, ogf) (((ocf) >> 8) | (((ogf) & 0x3f) << 2)) +#define OPCODE_LSB(ocf, ogf) ((ocf) & 0xff) +#define OPCODE_MSB(ocf, ogf) (((ocf) >> 8) | (((ogf) & 0x3f) << 2)) =20 /* HCI packet types */ #define CMD_PKT 0x01 @@ -217,6 +237,8 @@ =20 #define BTSENDTESTDATA _IOW(BT_IOC_MAGIC, 0xf0, int[2]) #define HCITESTCONNECTREQ _IOW(BT_IOC_MAGIC, 0xf1, unsigned char[6]) +#define BTTESTCOMMAND _IOW(BT_IOC_MAGIC, 0xf2, unsigned char[261]) +#define BTSETMSSWITCH _IOW(BT_IOC_MAGIC, 0xf3, unsigned char) =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 */ /* Structs */ @@ -232,7 +254,14 @@ unsigned char bd_addr[0]; } inquiry_results; =20 +typedef struct ping_struct +{ + unsigned char bd[6]; + unsigned short len; + unsigned char data[1024]; +} ping_struct; =20 +#endif /* BT_USERSTACK */ /* =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 */ /* Functions common to both usermode and kernel stack */ =20 @@ -260,6 +289,7 @@ int bt_isconnected(int bt_cfd, int line); int bt_send(int fd, int len, int repeat); void bt_showstatus(void); +int bt_force_msswitch_as_server(int bt_cfd, int enable); =20 /*=20 * HCI command functions=20 @@ -268,6 +298,8 @@ int bt_send_raw_hci(int bt_cfd, unsigned char *data, char len); int bt_ping(int bt_cfd, unsigned char bd[6],=20 unsigned char *data, unsigned short len); +int bt_getinfo(int bt_cfd, unsigned char bd[6], unsigned short type); +int bt_testcmd(int bt_cfd, unsigned char *cmd); =20 void bt_inquiry(int bt_cfd, int nbr_rsp, int t); int bt_set_baudrate(int bt_cfd, int spd); @@ -276,8 +308,10 @@ void read_remote_bd(int bt_cfd, unsigned char *bd_addr); void role_switch(int bt_cfd, unsigned char *bd_addr, int role); =20 -int bt_set_event_filter(int bt_cfd, int filter); -int bt_set_writescanenable(int bt_cfd, int flags); +int bt_set_event_filter(int bt_cfd, unsigned int filter); +int bt_write_scan_enable(int bt_cfd, unsigned int flags); +void bt_write_pagescan_activity(int bt_cfd, unsigned int interval,=20 + unsigned int wind); void bt_set_classofdevice(int bt_cfd, unsigned short service_class,=20 unsigned char major_class,=20 unsigned char minor_class,=20 @@ -303,13 +337,11 @@ =20 =20 =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 */ /* Functions only used in usermode stack */ =20 #ifdef BT_USERSTACK + const char* psmname(unsigned short psm); int bt_write_lower_driver(unsigned char *data, int len); int bt_write_top(char *buf, int count, int line); @@ -318,14 +350,15 @@ void bt_sdp_connection_ready(int status); int bt_initiated(void); extern int bt_read_proc(char *buf, int len); +void init_userstack(); =20 +#ifdef BT_USERSTACK +int bt_register_rfcomm(struct rfcomm_con *rfcomm, unsigned char dlci); +void bt_connect_cfm(unsigned int con_id, int status); +#endif =20 /* FIXME<1> clean this up !!! */ bt_stat_struct bt_stat; -int bt_initdone =3D 0; -int ready_for_ppp =3D 0; -rfcomm_con *test_rfcomm; -int test_dlci; =20 /* Thread used to read data on "physical" device i.e where BT HW sits */ pthread_t read_thread; |
From: Mattias A. <mat...@us...> - 2001-04-26 10:53:17
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.5 1.6=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * changed inparam to bt_set_event_filter The diff of the modified file(s): --- bt_if.h 2001/04/20 15:29:21 1.5 +++ bt_if.h 2001/04/26 10:53:17 1.6 @@ -310,7 +310,7 @@ void read_remote_bd(int bt_cfd, unsigned char *bd_addr); void role_switch(int bt_cfd, unsigned char *bd_addr, int role); =20 -int bt_set_event_filter(int bt_cfd, unsigned int filter); +int bt_set_event_filter(int bt_cfd, unsigned char filter[3]); int bt_write_scan_enable(int bt_cfd, unsigned int flags); void bt_write_pagescan_activity(int bt_cfd, unsigned int interval,=20 unsigned int wind); |
From: Ulf H. <ul...@us...> - 2001-04-26 14:07:12
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.6 1.7=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Corrected definition HCIREADSTOREDLINKKEY Added definition BT_GETCACHEDLINKKEY The diff of the modified file(s): --- bt_if.h 2001/04/26 10:53:17 1.6 +++ bt_if.h 2001/04/26 14:07:10 1.7 @@ -148,7 +148,7 @@ #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 BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x0e, unsigned char[22]) /* =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 */ /* Ioctls for executing HCI commands */ =20 @@ -171,7 +171,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]) |
From: Mattias A. <mat...@us...> - 2001-06-06 15:01:42
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.10 1.11=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): --- bt_if.h 2001/05/29 10:04:12 1.10 +++ bt_if.h 2001/06/06 15:01:41 1.11 @@ -235,6 +235,17 @@ #define HCITESTCONNECTREQ _IOW(BT_IOC_MAGIC, 0xf1, unsigned char[6]) #define BTTESTCOMMAND _IOW(BT_IOC_MAGIC, 0xf2, unsigned char[261]) #define BTSETMSSWITCH _IOW(BT_IOC_MAGIC, 0xf3, unsigned char) +#define BTSETBCSPMODE _IOW(BT_IOC_MAGIC, 0xf4, unsigned char) + +#define CSR_PSKEY_MSGHDR_SIZE 3 +#define CSR_PSKEY_MAXPARAMS 10 + +/*=20 + * | ps_key (u16) | rw_mode (u16) | len (u16) | params (u16[])|=20 + */ +#define BT_CSR_PSKEY _IOWR(BT_IOC_MAGIC, 0xf5, unsigned short[CSR_PSKEY_MS= GHDR_SIZE + CSR_PSKEY_MAXPARAMS]) + +#define BTINITBCSP _IO(BT_IOC_MAGIC, 0xf6) =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 */ /* Structs */ |
From: Peter K. <pk...@us...> - 2001-06-08 09:38:40
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.11 1.12=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Removed declaration of open_socket() (it is in bt_misc.h). The diff of the modified file(s): --- bt_if.h 2001/06/06 15:01:41 1.11 +++ bt_if.h 2001/06/08 09:38:39 1.12 @@ -344,7 +344,6 @@ =20 int open_device(char* dev, int flags, int role); void close_device(int fd); -int open_socket(char *name, int role); const char *error_msg(int err); int start_sdp_server(void); =20 |
From: Mattias A. <mat...@us...> - 2001-06-13 12:25:03
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.12 1.13=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * added return val in init_stack * minor change The diff of the modified file(s): --- bt_if.h 2001/06/08 09:38:39 1.12 +++ bt_if.h 2001/06/13 12:25:02 1.13 @@ -147,7 +147,8 @@ #define BTREADREMOTEBDADDR _IOR(BT_IOC_MAGIC, 0x07, unsigned char[6]) #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 BTHWVENDOR _IOR(BT_IOC_MAGIC, 0x0a, char[20]) + #define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x0e, unsigned char[22]) /* =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 */ /* Ioctls for executing HCI commands */ @@ -279,7 +280,7 @@ * Init/shutdown and control of stack=20 */ =20 -void init_stack(int bt_cfd, int spd); +int init_stack(int bt_cfd, int spd); int bt_isinitiated(int bt_cfd); void shutdown_stack(int bt_cfd); #ifndef BT_USERSTACK |
From: Peter K. <pk...@us...> - 2001-06-19 10:35:56
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.14 1.15=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): --- bt_if.h 2001/06/15 12:36:25 1.14 +++ bt_if.h 2001/06/19 10:35:56 1.15 @@ -131,14 +131,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 BTWAITNEWCONNECTIONS _IO(BT_IOC_MAGIC, 0x0b) -#define BTISLOWERCONNECTED _IOW(BT_IOC_MAGIC, 0x0c, int) - #define BTSETSPEED _IOW(BT_IOC_MAGIC, 0x02, int) #define BTINITSTACK _IO(BT_IOC_MAGIC, 0x03) #define BTSETSERTTY _IO(BT_IOC_MAGIC, 0x04) @@ -148,24 +144,31 @@ #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]) + /* =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 */ /* Ioctls for executing HCI commands */ =20 /* Link Control Command */ =20 -#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 */ =20 -#define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x20, unsigned char[7]) +#define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, unsigned char[7]) =20 /* Host Controller & Baseband Commands */ =20 @@ -211,6 +214,8 @@ /* | BD(6) | type (2) |*/ #define BTGETINFO _IOW(BT_IOC_MAGIC, 0x74, unsigned char[8]) =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 */ + /* Used to calculate opcode for HCI commands using raw interface */ #define OPCODE_LSB(ocf, ogf) ((ocf) & 0xff) #define OPCODE_MSB(ocf, ogf) (((ocf) >> 8) | (((ogf) & 0x3f) << 2)) @@ -286,6 +291,7 @@ #ifndef BT_USERSTACK char* bt_hw_vendor(void); #endif +char* bt_firmware_info(void); void reset_hw(void); int bt_openctrl(void); void set_bt_line_disc(int phys_fd, int bt_disc, char* physdev); |
From: Olov H. <ol...@us...> - 2001-07-10 13:01:14
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.15 1.16=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added support for max number of BT connections The diff of the modified file(s): --- bt_if.h 2001/06/19 10:35:56 1.15 +++ bt_if.h 2001/07/10 13:01:14 1.16 @@ -252,7 +252,7 @@ #define BT_CSR_PSKEY _IOWR(BT_IOC_MAGIC, 0xf5, unsigned short[CSR_PSKEY_MS= GHDR_SIZE + CSR_PSKEY_MAXPARAMS]) =20 #define BTINITBCSP _IO(BT_IOC_MAGIC, 0xf6) - +#define BTSETMAXCONNECTIONS _IOW(BT_IOC_MAGIC, 0xf7, unsigned char) /* =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 */ /* Structs */ =20 |
From: Mattias A. <mat...@us...> - 2001-08-01 09:39:25
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.17 1.18=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * added ioctl for HCIREADCOUNTRYCODE * added comment * added bt_read_country_code The diff of the modified file(s): --- bt_if.h 2001/07/30 10:18:53 1.17 +++ bt_if.h 2001/08/01 09:39:24 1.18 @@ -194,6 +194,7 @@ =20 /* Informational Parameters */ =20 +#define HCIREADCOUNTRYCODE _IOR(BT_IOC_MAGIC, 0x43, int) #define HCIREADLOCALBDADDR _IOR(BT_IOC_MAGIC, 0x45, unsigned char[6]) =20 /* Status Parameters */ @@ -242,7 +243,10 @@ =20 #define BTSENDTESTDATA _IOW(BT_IOC_MAGIC, 0xf0, int[2]) #define HCITESTCONNECTREQ _IOW(BT_IOC_MAGIC, 0xf1, unsigned char[6]) + +/* | len (1) | test string | -- used for unplug tests */ #define BTTESTCOMMAND _IOW(BT_IOC_MAGIC, 0xf2, unsigned char[261]) + #define BTSETMSSWITCH _IOW(BT_IOC_MAGIC, 0xf3, unsigned char) #define BTSETBCSPMODE _IOW(BT_IOC_MAGIC, 0xf4, unsigned char) =20 @@ -340,6 +344,8 @@ unsigned char minor_class,=20 unsigned char format); =20 +int bt_read_country_code(int bt_cfd, unsigned char *result); + void enable_dut(int bt_cfd); =20 =20 @@ -348,6 +354,7 @@ =20 /* Sets friendly name to name */ void bt_set_local_name(int bt_cfd, const unsigned char *name); + /*=20 * Misc functions=20 */ |
From: Mattias A. <mat...@us...> - 2001-08-22 17:49:13
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.18 1.19=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * change according to testcases at UP6 The diff of the modified file(s): --- bt_if.h 2001/08/01 09:39:24 1.18 +++ bt_if.h 2001/08/22 17:49:12 1.19 @@ -76,7 +76,7 @@ #define TCS_LAYER 5 #define L2CAP_TEST_LAYER 0x1231 #define L2CAP_TEST2_LAYER 0x1233 -#define L2CAP_TEST3_LAYER 0x4561 +#define L2CAP_TEST3_LAYER 0x4461 =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 */ /* SDP server */ |
From: Peter K. <pk...@us...> - 2001-09-10 09:51:12
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.23 1.24=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added declaration of bt_set_max_conections(). The diff of the modified file(s): --- bt_if.h 2001/09/07 12:53:50 1.23 +++ bt_if.h 2001/09/10 09:51:11 1.24 @@ -324,6 +324,7 @@ int bt_send(int fd, int len, int repeat); void bt_showstatus(void); int bt_force_msswitch_as_server(int bt_cfd, int enable); +int bt_set_max_conections(int bt_cfd, int connections); =20 /*=20=20 * HCI command functions=20 |
From: Peter K. <pk...@us...> - 2001-10-05 11:57:43
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.25 1.26=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): --- bt_if.h 2001/10/03 17:43:11 1.25 +++ bt_if.h 2001/10/05 11:57:42 1.26 @@ -251,7 +251,7 @@ #define BTSETBCSPMODE _IOWR(BT_IOC_MAGIC, 0xf4, int) =20 #define CSR_PSKEY_MSGHDR_SIZE 3 -#define CSR_PSKEY_MAXPARAMS 10 +#define CSR_PSKEY_MAXPARAMS 40 =20 /*=20 * | ps_key (u16) | rw_mode (u16) | len (u16) | params (u16[])|=20 |
From: Fredrik S. <fre...@us...> - 2001-12-04 10:19:55
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.28 1.29=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added BNEP defines. The diff of the modified file(s): --- bt_if.h 2001/10/15 08:48:53 1.28 +++ bt_if.h 2001/12/04 10:19:54 1.29 @@ -152,6 +152,12 @@ =20 #define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, unsigned char[7]) =20 +/* BNEP Control Commands */ +#define BNEPCONNECT _IOW(BT_IOC_MAGIC, 0x29, unsigned char[6]) +#define BNEPTEST _IOW(BT_IOC_MAGIC, 0x2a, unsigned char[5]) +#define BNEPADDPROTOCOLFILTER _IOW(BT_IOC_MAGIC, 0x2b, unsigned int[2]) +#define BNEPADDMULTICASTFILTER _IOW(BT_IOC_MAGIC, 0x2c, unsigned int[2]) + /* Host Controller & Baseband Commands */ =20 #define HCIRESET _IO(BT_IOC_MAGIC, 0x30) |
From: Fredrik S. <fre...@us...> - 2002-01-18 13:44:40
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Comment ---- ----------- ----------- ------- bt_if.h 1.29 1.30=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): --- bt_if.h 2001/12/04 10:19:54 1.29 +++ bt_if.h 2002/01/18 13:44:39 1.30 @@ -156,7 +156,7 @@ #define BNEPCONNECT _IOW(BT_IOC_MAGIC, 0x29, unsigned char[6]) #define BNEPTEST _IOW(BT_IOC_MAGIC, 0x2a, unsigned char[5]) #define BNEPADDPROTOCOLFILTER _IOW(BT_IOC_MAGIC, 0x2b, unsigned int[2]) -#define BNEPADDMULTICASTFILTER _IOW(BT_IOC_MAGIC, 0x2c, unsigned int[2]) +#define BNEPADDMULTICASTFILTER _IOW(BT_IOC_MAGIC, 0x2c, unsigned char[12]) =20 /* Host Controller & Baseband Commands */ =20 |
From: Willy S. <sag...@us...> - 2002-04-08 16:44:07
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- bt_if.h 1.32 1.33=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added new commands The diff of the modified file(s): --- bt_if.h 28 Feb 2002 20:08:31 -0000 1.32 +++ bt_if.h 8 Apr 2002 11:23:11 -0000 1.33 @@ -150,16 +150,24 @@ #define HCIAUTHENTICATION_REQUESTED _IOW(BT_IOC_MAGIC, 0x25, unsigned char= [6]) #define HCISETCONNECTION_ENCRYPTION _IOW(BT_IOC_MAGIC, 0x26, unsigned char= [7]) #define HCIREMOTENAME_REQUEST _IOW(BT_IOC_MAGIC, 0x27, unsigned char[255]) +#define HCIREADCLOCKOFFSET _IOWR(BT_IOC_MAGIC, 0x53, unsigned char[4]) =20 /* Link Policy Commands */ =20 #define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, unsigned char[7]) +#define HCIPARKMODE _IOW(BT_IOC_MAGIC, 0x51, unsigned char[6]) +#define HCIEXITPARKMODE _IOW(BT_IOC_MAGIC, 0x52, unsigned char[4]) +#define HCISNIFFMODE _IOW(BT_IOC_MAGIC, 0x59, unsigned char[8]) +#define HCIEXITSNIFFMODE _IOW(BT_IOC_MAGIC, 0x5a, unsigned char[4]) +#define HCIWRITELINKPOLICYSETTINGS _IOW(BT_IOC_MAGIC, 0x5b, unsigned char[= 4]) +#define HCIHOLDMODE _IOW(BT_IOC_MAGIC, 0x5c, unsigned char[6]) =20 /* BNEP Control Commands */ -#define BNEPCONNECT _IOW(BT_IOC_MAGIC, 0x29, unsigned char[6]) +#define BNEPCONNECT _IOWR(BT_IOC_MAGIC, 0x29, unsigned char[6]) #define BNEPTEST _IOW(BT_IOC_MAGIC, 0x2a, unsigned char[5]) #define BNEPADDPROTOCOLFILTER _IOW(BT_IOC_MAGIC, 0x2b, unsigned int[2]) #define BNEPADDMULTICASTFILTER _IOW(BT_IOC_MAGIC, 0x2c, unsigned char[12]) +#define BNEPDISCONNECT _IOWR(BT_IOC_MAGIC, 0x2d, unsigned char[6]) =20 /* Host Controller & Baseband Commands */ =20 @@ -179,6 +187,12 @@ #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[255]) +#define HCIREADNUMBROADCASTRETRANSMISSIONS _IOWR(BT_IOC_MAGIC, 0x55, unsig= ned char[2]) +#define HCIWRITENUMBROADCASTRETRANSMISSIONS _IOWR(BT_IOC_MAGIC, 0x56, unsi= gned char) +#define HCIWRITEPAGETO _IOW(BT_IOC_MAGIC, 0x54, unsigned char[4]) +#define HCIREADTRANSMITPOWERLEVEL _IOWR(BT_IOC_MAGIC, 0x57, unsigned char[= 3]) +#define HCIWRITELINKSUPERVISIONTO _IOW(BT_IOC_MAGIC, 0x58, unsigned char[8= ]) +=20 =20 /* Informational Parameters */ =20 @@ -186,6 +200,7 @@ #define HCIREADLOCALBDADDR _IOR(BT_IOC_MAGIC, 0x45, unsigned char[6]) =20 /* Status Parameters */ +#define HCIREADRSSI _IOWR(BT_IOC_MAGIC, 0x50, unsigned char[4]) =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 */ /* Testing Commands */ @@ -299,6 +314,14 @@ void set_bt_line_disc(int phys_fd, int bt_disc, char* physdev); =20 /*=20 + * BNEP functions + */ +#ifndef BTD_USERSTACK +void bnep_connect(int bt_fd, unsigned char *bd); +void bnep_disconnect(int bt_fd, unsigned char *bd); +#endif + +/*=20 * Connect/Disconnect functions=20 */ =20 @@ -344,6 +367,20 @@ =20 int bt_read_country_code(int bt_cfd); =20 +void bt_read_rssi(int bt_cfd, unsigned char* con_hdl); +void bt_park_mode(int bt_cfd, unsigned char* park_params); +void bt_exit_park_mode(int bt_cfd, unsigned char* con_hdl); +void bt_sniff_mode(int bt_cfd, unsigned char* park_params); +void bt_exit_sniff_mode(int bt_cfd, unsigned char* con_hdl); +void bt_read_clock_offset(int bt_cfd, unsigned char* con_hdl); +void bt_read_num_broadcast_rtx(int bt_cfd); +void bt_write_num_broadcast_rtx(int bt_cfd, unsigned char* num_rtx); +void bt_write_page_to(int bt_cfd, unsigned char* page_to); +void bt_read_tx_power_level(int bt_cfd, unsigned char* tx_power_level); +void bt_write_link_supervision_to(int bt_cfd, unsigned char* link_to); +void bt_write_page_scan_activity(int bt_cfd, unsigned char* page_scan); +void bt_write_link_policy_settings(int bt_cfd, unsigned char* policy_param= s); +void bt_hold_mode(int bt_cfd, unsigned char* hold_params); void enable_dut(int bt_cfd); =20 =20 |
From: Peter K. <pk...@us...> - 2002-11-19 14:21:19
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- bt_if.h 1.37 1.38=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Minor change. The diff of the modified file(s): --- bt_if.h 19 Nov 2002 14:15:46 -0000 1.37 +++ bt_if.h 19 Nov 2002 14:21:18 -0000 1.38 @@ -126,7 +126,7 @@ #define BTREADREMOTEBDADDR _IOWR(BT_IOC_MAGIC, 0x07, unsigned char[6]) #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 BTHWVENDOR _IOR(BT_IOC_MAGIC, 0x0A, char[20]) #define BTFIRMWAREINFO _IOR(BT_IOC_MAGIC, 0x0B, char[80]) =20 #define BTWAITFORCONNECTION _IOW(BT_IOC_MAGIC, 0x0C, int) @@ -136,7 +136,7 @@ //#define BT_SDP_REQUEST _IOW(BT_IOC_MAGIC, 0x0F, bt_sdp_request) #define BT_GETCACHEDLINKKEY _IOWR(BT_IOC_MAGIC, 0x10, unsigned char[22]) =20 -/* Disconnect the BB connection (Consafe) */ +/* Disconnect the BB connection */ #define BTDISCONNECT_BB _IOW(BT_IOC_MAGIC, 0x11, unsigned char[6]) =20 #define BTREADREMOTENAME _IOWR(BT_IOC_MAGIC, 0x12, unsigned char[BT_NAME_L= ENGTH]) |