From: Peter K. <pk...@us...> - 2001-04-10 12:26:41
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.67 1.68=20=20=20=20=20=20=20=20=20=20=20=20 btconfig.h 1.23 1.24=20=20=20=20=20=20=20=20=20=20=20=20 rfcomm.h 1.35 1.36=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Include linux/config.h where required to keep 'make dep' happy. The diff of the modified file(s): --- btcommon.h 2001/03/30 09:40:53 1.67 +++ btcommon.h 2001/04/10 12:26:41 1.68 @@ -51,7 +51,6 @@ #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 --- btconfig.h 2001/03/05 16:33:36 1.23 +++ btconfig.h 2001/04/10 12:26:41 1.24 @@ -39,6 +39,10 @@ * */ =20 +#ifdef __KERNEL__ +#include <linux/config.h> +#endif + /* * 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 --- rfcomm.h 2001/03/07 20:09:24 1.35 +++ rfcomm.h 2001/04/10 12:26:41 1.36 @@ -47,6 +47,7 @@ /****************** INCLUDE FILES SECTION ********************************= ***/ =20 #ifdef __KERNEL__ +#include <linux/config.h> #include <linux/types.h> #include <linux/bluetooth/btcommon.h> #else |
From: Peter K. <pk...@us...> - 2001-04-17 16:06:50
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.h 1.38 1.39=20=20=20=20=20=20=20=20=20=20=20=20 btcommon.h 1.70 1.71=20=20=20=20=20=20=20=20=20=20=20=20 hci.h 1.50 1.51=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Clean-up of functions to get HW vendor and firmware version. The diff of the modified file(s): --- bluetooth.h 2001/03/30 10:51:53 1.38 +++ bluetooth.h 2001/04/17 16:06:49 1.39 @@ -73,8 +73,6 @@ s32 bt_registered(struct tty_struct *tty); =20 void bt_shutdown(void); -void show_bt_version(void); -char *get_hw_name(void); void bt_hangupline(s32 line); void bt_feedstack(void); =20 --- btcommon.h 2001/04/12 15:14:50 1.70 +++ btcommon.h 2001/04/17 16:06:49 1.71 @@ -194,9 +194,9 @@ =20 /* NOTE ! * N_BT should be defined in /include/asm/termios.h=20 - * However, if you are compiling this source standalone - * the following define can be useful. If this number is taken=20 - * simply change it to something not taken. + * However, if you are compiling this source standalone, the following def= ine + * may be useful. If this number is already used simply change it to somet= hing + * that is not used. */ =20 #ifndef N_BT @@ -535,9 +535,6 @@ u32 serport_name_length; u8 serport_name[64]; } serport_profile_info; - -extern s32 bt_current_hw; -extern u8 bt_hw_firmware_info[255]; =20 #endif /****************** END OF FILE btcommon.h *******************************= ***/ --- hci.h 2001/03/31 15:49:39 1.50 +++ hci.h 2001/04/17 16:06:49 1.51 @@ -155,7 +155,11 @@ s32 hci_set_bd_addr(u8 bd[6]); s32 hci_set_baudrate(u32 baudrate);=20 s32 hci_read_firmware_rev_info(void); -void show_bt_vendor(void); + +char *bt_hw_vendor(void); +char *bt_hw_firmware(void); + +void bt_show_vendor(void); =20 #endif /****************** END OF FILE hci.h ************************************= ***/ |
From: Peter K. <pk...@us...> - 2001-06-15 12:31:56
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.75 1.76=20=20=20=20=20=20=20=20=20=20=20=20 hci.h 1.60 1.61=20=20=20=20=20=20=20=20=20=20=20=20 hci_internal.h 1.18 1.19=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added line argument to get_remote_bd() and corresponding ioctl to retrieve the BD address for a specific line, instead of the last one connected. The diff of the modified file(s): --- btcommon.h 2001/06/06 14:58:45 1.75 +++ btcommon.h 2001/06/15 12:31:55 1.76 @@ -123,7 +123,7 @@ #define BTSETSERTTY _IO(BT_IOC_MAGIC, 0x04) #define BTSETMODEMDUMMY _IOW(BT_IOC_MAGIC, 0x05, s32) #define BTSHUTDOWN _IO(BT_IOC_MAGIC, 0x06) -#define BTREADREMOTEBDADDR _IOR(BT_IOC_MAGIC, 0x07, u8[6]) +#define BTREADREMOTEBDADDR _IOWR(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]) --- hci.h 2001/06/14 10:53:33 1.60 +++ hci.h 2001/06/15 12:31:55 1.61 @@ -170,7 +170,7 @@ =20 /* Internal */ /* FIXME -- add parameter to choose from different devices */ -s32 get_remote_bd(u8 *bd); +s32 get_remote_bd(int line, u8 *bd); =20 /* Testing commands */ s32 hci_enable_dut(void); --- hci_internal.h 2001/06/08 12:50:15 1.18 +++ hci_internal.h 2001/06/15 12:31:55 1.19 @@ -332,7 +332,6 @@ hci_in_buffer hci_in_buf[NBR_OF_HCI_INBUFFERS]; u32 nbr_of_connections; u8 local_bd[6]; - s32 active_connection; hci_con con[MAX_NBR_OF_CONNECTIONS]; } hci_controller; =20 |
From: Peter K. <pk...@us...> - 2001-09-10 10:16:22
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.h 1.44 1.45=20=20=20=20=20=20=20=20=20=20=20=20 btcommon.h 1.82 1.83=20=20=20=20=20=20=20=20=20=20=20=20 hci.h 1.67 1.68=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added BCSP DFU support. The diff of the modified file(s): --- bluetooth.h 2001/07/31 17:50:55 1.44 +++ bluetooth.h 2001/09/10 10:16:22 1.45 @@ -90,6 +90,7 @@ =20 s32 bt_initiated(void); s32 bt_use_bcsp(s32 new_use_bcsp); +s32 bt_dfu_mode(s32 new_dfu_mode); void bt_connect_cfm(u32 con_id, s32 status); s32 bt_sprint_status(u8 *buf); void bt_send_sdp_data_received(u8 line, u8 *data, int len); --- btcommon.h 2001/08/29 09:34:44 1.82 +++ btcommon.h 2001/09/10 10:16:22 1.83 @@ -209,7 +209,11 @@ =20 #define BTINITBCSP _IO(BT_IOC_MAGIC, 0xf6) =20 -#define BTSETMAXCONNECTIONS _IOW(BT_IOC_MAGIC, 0xf7, u8) +#define BT_SET_DFU_MODE _IOWR(BT_IOC_MAGIC, 0xf7, s32) +#define BT_SEND_DFU_COMMAND _IOWR(BT_IOC_MAGIC, 0xf8, u8[2048]) +#define BT_RETRIEVE_DFU_RESPONSE _IOWR(BT_IOC_MAGIC, 0xf9, u8[2048]) + +#define BTSETMAXCONNECTIONS _IOW(BT_IOC_MAGIC, 0xfa, u8) =20 /* NOTE ! * N_BT should be defined in /include/asm/termios.h=20 --- hci.h 2001/08/17 09:19:00 1.67 +++ hci.h 2001/09/10 10:16:22 1.68 @@ -107,6 +107,16 @@ void hci_receive_acl(u8 *data, s32 count); void hci_receive_hq(u8 *data, u32 count); void hci_receive_bcsp(u8 *data, u32 count); +void hci_receive_dfu(u8 *data, u32 count); + +s32 hci_read_dfu(u8* data, u32 count); + +void hci_init_dfu(void); +void hci_shutdown_dfu(void); +#endif + +#ifdef CONFIG_BLUETOOTH_CSR +s32 csr_pskey(u16 ps_key, u16 rw_mode, u16 *retb, u16 n_pars); #endif =20 s32 lp_connect_req(u8 bd_addr[]); |
From: Peter K. <pk...@us...> - 2001-09-18 10:48:24
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bluetooth.h 1.45 1.46=20=20=20=20=20=20=20=20=20=20=20=20 btmem.h 1.20 1.21=20=20=20=20=20=20=20=20=20=20=20=20 hci.h 1.69 1.70=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added inclusion of linux/config.h The diff of the modified file(s): --- bluetooth.h 2001/09/10 10:16:22 1.45 +++ bluetooth.h 2001/09/18 10:48:22 1.46 @@ -43,6 +43,7 @@ #define BLUETOOTH_H =20 #ifdef __KERNEL__ +#include <linux/config.h> #include <linux/bluetooth/btcommon.h> #else #include "btcommon.h" --- btmem.h 2001/08/17 09:19:00 1.20 +++ btmem.h 2001/09/18 10:48:22 1.21 @@ -45,6 +45,7 @@ /****************** INCLUDE FILES SECTION ********************************= ***/ =20 #ifdef __KERNEL__ +#include <linux/config.h> #include <linux/types.h> #include <linux/bluetooth/btcommon.h> #else --- hci.h 2001/09/10 11:19:57 1.69 +++ hci.h 2001/09/18 10:48:22 1.70 @@ -46,6 +46,7 @@ /****************** INCLUDE FILES SECTION ********************************= ***/ =20 #ifdef __KERNEL__ +#include <linux/config.h> #include <linux/types.h> #include <linux/bluetooth/btcommon.h> #else |
From: Anders J. <and...@us...> - 2001-10-10 14:59:18
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bt_errno.h 1.2 1.3=20=20=20=20=20=20=20=20=20=20=20=20=20 rfcomm.h 1.40 1.41=20=20=20=20=20=20=20=20=20=20=20=20 sdp.h 1.26 1.27=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * RFCOMM_GETLINE, SDP_GETLINE -> GET_LINE * Added more errorcodes. The diff of the modified file(s): --- bt_errno.h 2001/04/17 15:48:15 1.2 +++ bt_errno.h 2001/10/10 14:59:17 1.3 @@ -45,19 +45,21 @@ =20 /* Unique status codes 32 bits : | layer 16 bits | code 16 bits | */ #define MSGCODE(layer, msgcode) ((((layer)<<16)&0xffff0000) | ((msgcode)&0= xffff)) +#define MSG_GET_LAYER(msg) ((msg >> 16) & 0x0000ffff) +#define MSG_GET_CODE(msg) (msg & 0x0000ffff) =20 /* Layer ID */ -#define MSG_LAYER_HCI 0 -#define MSG_LAYER_L2CAP 1 -#define MSG_LAYER_RFCOMM 2 +#define MSG_LAYER_HCI 1 +#define MSG_LAYER_L2CAP 2 +#define MSG_LAYER_RFCOMM 3 #define MSG_LAYER_SDP 4 -#define MSG_LAYER_TCS 8 -#define MSG_BT_INTERFACE 16 +#define MSG_LAYER_TCS 5 +#define MSG_BT_INTERFACE 6 =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=3D*/ /* HCI */ =20 -/* fixme */ +/* Uses errorcodes as specified in the BT specification */ =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=3D*/ /* L2CAP */ @@ -73,6 +75,10 @@ /* General l2cap return codes */ #define L2CAP_FAILED 0xf0 #define L2CAP_CON_UNRESPONSIVE 0xf1 +#define L2CAP_INVALID_STATE 0xf2 +#define L2CAP_NO_CONNECTION 0xf3 +#define L2CAP_EXCEED_REMOTE_MTU 0xf4 +#define L2CAP_RTX_TIMEOUT 0xf5 =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=3D*/ /* RFCOMM */ @@ -95,3 +101,4 @@ #define BT_NOTCONNECTED 0x1 #define BT_ALREADYCONNECTED 0x2 #define BT_TIMEOUT 0x3 +#define BT_LINE_BUSY 0x4 --- rfcomm.h 2001/10/05 12:06:43 1.40 +++ rfcomm.h 2001/10/10 14:59:17 1.41 @@ -71,7 +71,6 @@ D_ERR("con id 0x%x is not a RFCOMM ID (%s, l.= %d)\n", id, __FILE__, __LINE__);\ } while (0) =20 -#define GET_RFCOMMLINE(con_id) ((con_id >> 8) & 0xff) #define GET_RFCOMMSRVCH(con_id) ((con_id&0xff) >> 1) #define GET_RFCOMMDLCI(con_id) (con_id&0xff) =20 --- sdp.h 2001/03/30 09:45:45 1.26 +++ sdp.h 2001/10/10 14:59:17 1.27 @@ -69,7 +69,6 @@ =20 #define CREATE_SDP_ID(line, index) ( ((SDP_LAYER << 16) & 0xffff0000) | ((= line << 8) & 0x0000ff00) | (index & 0xff) ) #define GET_SDPINDEX(conID) ( (conID & 0xff) ) -#define GET_SDPLINE(conID) ( ((conID & 0xff00) >> 8) ) =20 /****************** TYPE DEFINITION SECTION ******************************= ***/ =20 |
From: Anders J. <and...@us...> - 2001-10-16 16:25:00
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- bt_errno.h 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20 test.h 1.10 1.11=20=20=20=20=20=20=20=20=20=20=20=20 unplug_test.h 1.2 1.3=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: * Changed functions to return a value. * Added HCI_INQUIRY_FAILED The diff of the modified file(s): --- bt_errno.h 2001/10/12 12:03:45 1.4 +++ bt_errno.h 2001/10/16 16:24:51 1.5 @@ -107,3 +107,4 @@ #define BT_ALREADYCONNECTED 0x2 #define BT_TIMEOUT 0x3 #define BT_LINE_BUSY 0x4 +#define BT_INQ_FAILED 0x5 --- test.h 2001/08/27 15:42:37 1.10 +++ test.h 2001/10/16 16:24:51 1.11 @@ -76,7 +76,7 @@ void test_disconnect_cfm(l2cap_con *l2cap); void test_receive_data(l2cap_con *l2cap, u8 *data, u32 len); s32 test_send_data(l2cap_con *con, u8 *testdata, s32 len); -void test_process_cmd(u8 *cmd, s32 size); +s32 test_process_cmd(u8 *cmd, s32 size); =20 #endif /****************** END OF FILE sdp.h ************************************= ***/ --- unplug_test.h 2001/08/27 15:42:00 1.2 +++ unplug_test.h 2001/10/16 16:24:50 1.3 @@ -44,7 +44,7 @@ =20 =20 void unplug_test_init(void); -void process_test_cmd(s32 test_case); -void do_sdp_test(int n); +s32 process_test_cmd(s32 test_case); +s32 do_sdp_test(int n); =20 #endif |
From: Fredrik S. <fre...@us...> - 2001-12-04 10:01:27
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Comment ---- ----------- ----------- ------- btcommon.h 1.90 1.91=20=20=20=20=20=20=20=20=20=20=20=20 btdebug.h 1.42 1.43=20=20=20=20=20=20=20=20=20=20=20=20 l2cap.h 1.41 1.42=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added defines for BNEP. The diff of the modified file(s): --- btcommon.h 2001/11/22 14:06:20 1.90 +++ btcommon.h 2001/12/04 10:01:27 1.91 @@ -159,6 +159,12 @@ /* Link Policy Commands */ #define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, u8[7]) =20 +/* BNEP Control Commands */ +#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]) + /* Host Controller & Baseband Commands */ #define HCIRESET _IO(BT_IOC_MAGIC, 0x30) #define HCIFLUSH _IO(BT_IOC_MAGIC, 0x31) @@ -183,6 +189,7 @@ #define HCIREADLOCALBDADDR _IOR(BT_IOC_MAGIC, 0x45, u8[6]) =20 /* Status Parameters */ +#define HCIREADRSSI _IOWR(BT_IOC_MAGIC, 0x50, u32) =20 /* Testing Commands */ #define HCIENABLEDUT _IO(BT_IOC_MAGIC, 0x65) --- btdebug.h 2001/11/15 11:18:14 1.42 +++ btdebug.h 2001/12/04 10:01:27 1.43 @@ -168,6 +168,15 @@ #define TCS_PRINT_DATA 0 #define TCS_DEBUG_REC 0 =20 +/***************** BNEP Debug defines ************************************= ***/ + +#define BNEP_DEBUG_MISC 0 +#define BNEP_DEBUG_XMIT 0 +#define BNEP_PRINT_DATA 0 +#define BNEP_DEBUG_REC 0 +#define BNEP_DEBUG_PROC 0 +#define BNEP_DBG_STR " BNEP " + /***************** BTMEM Debug defines ***********************************= ****/ =20 #define BTMEM_DEBUG 0 --- l2cap.h 2001/10/22 12:57:13 1.41 +++ l2cap.h 2001/12/04 10:01:27 1.42 @@ -68,10 +68,11 @@ #define MAX_CMD_ID 255 =20 /* Valid PSM values */ -#define MAX_PSM 8 +#define MAX_PSM 20 #define SDP_LAYER 1 #define RFCOMM_LAYER 3 #define TCS_LAYER 5 +#define BNEP_LAYER 9 =20 #define L2CAP_TEST_LAYER 0x1231 #define L2CAP_TEST2_LAYER 0x1233 |
From: Anders J. <and...@us...> - 2004-01-31 02:46:45
|
The following files were modified in linux/include/linux/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- bluetooth.h 1.50 1.51=20=20=20=20=20=20=20=20=20=20=20=20=20=20 btcommon.h 1.105 1.106=20=20=20=20=20=20=20=20=20=20=20=20=20 l2cap.h 1.46 1.47=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added lp_connect which is a wrapper around lp_connect_req. Added 2 new IOCTL:s. The diff of the modified file(s): --- bluetooth.h 2003/02/06 15:36:22 1.50 +++ bluetooth.h 2004/01/30 12:04:54 1.51 @@ -104,6 +104,7 @@ s32 bt_sprint_status(u8 *buf); void bt_send_sdp_data_received(u8 line, u8 *data, int len); void bt_reset_phys_hw(void); void bt_handle_hw_error(u8 error); +void bt_secman_notify(s32 status); =20 /* Handles wakeup of failed blocking function calls */ #ifdef __KERNEL__ --- btcommon.h 2004/01/09 15:28:59 1.105 +++ btcommon.h 2004/01/30 12:04:54 1.106 @@ -154,6 +154,7 @@ #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) +#define BBCONNECT _IOW(BT_IOC_MAGIC, 0x17, bt_connection) =20 /* Ioctls executing HCI commands */ =20 @@ -167,6 +168,7 @@ #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) +#define HCIAUTHENTICATION_ENCRYPTION _IOW(BT_IOC_MAGIC, 0x66, u8[6]) =20 /* Link Policy Commands */ #define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, u8[7]) --- l2cap.h 2003/11/05 15:22:54 1.46 +++ l2cap.h 2004/01/30 12:04:55 1.47 @@ -319,6 +319,8 @@ void l2cap_create_con(BD_ADDR bd, CLASS_ /* Indicates the baseband has been shutdown */ s32 lp_disconnect_ind(u32 con_hdl); =20 +s32 lp_connect(BD_ADDR bd, bt_pincode *pincode); + /* FIXME - lp_qos_cfm() */ /* FIXME - lp_qos_violation_ind() */ =20 |