CVS: 4 files have been modified in linux/include/linux/bluetooth.

[Anders J. <and...@us...>]

The following files were modified in linux/include/linux/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
bnep.h          1.1             1.2=20=20=20=20=20=20=20=20=20=20=20=20=20
bnep_internal.h 1.1             1.2=20=20=20=20=20=20=20=20=20=20=20=20=20
btcommon.h      1.92            1.93=20=20=20=20=20=20=20=20=20=20=20=20
hci.h           1.73            1.74=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


Patch from Alain Paschoud:
* Added ioctl to send a REMOTE_NAME_REQUEST.
* Define of BT_NAME_LENGTH.
* get_remote_name function now takes an extra parameter to allow the command
  to block.


* Moved some declarations from bnep_internal.h -> bnep.h




The diff of the modified file(s):

--- bnep.h	2002/01/24 16:09:59	1.1
+++ bnep.h	2002/02/06 11:19:59	1.2
@@ -196,6 +196,8 @@
 void bnep_disconnect_req(u8 line);
 u32  bnep_test(u8 *p);
=20
+s32 bnep_status_create_proc_file(void);
+s32 bnep_status_remove_proc_file(void);
=20
 #endif
 /****************** END OF FILE bnep.h ***********************************=
***/
--- bnep_internal.h	2002/01/24 16:10:00	1.1
+++ bnep_internal.h	2002/02/06 11:19:59	1.2
@@ -90,9 +90,4 @@
=20
 int bnep_send_raw_packet(l2cap_con *l2cap, u8 *data, u16 len);
 void print_ip_packet(char *data, u16 proto);
-
-/* Proc file interface */
-s32 bnep_create_proc_file(void);
-s32 bnep_remove_proc_file(void);
-s32 bnep_status_create_proc_file(void);
 #endif
--- btcommon.h	2002/01/18 12:50:32	1.92
+++ btcommon.h	2002/02/06 11:19:58	1.93
@@ -57,7 +57,7 @@
 #include "local.h"
 #include "btdebug.h"
 #include "btconfig.h"
-#include <sys/unistd.h> /* for the sleep ..*/
+#include <unistd.h> /* for the sleep ..*/
 #endif
=20
 /* Defines common to all files */
@@ -100,6 +100,10 @@
 #define le16_to_cpuu(addr) (le16_to_cpu(get_unaligned((u16 *)(addr))))
 #define le32_to_cpuu(addr) (le32_to_cpu(get_unaligned((u32 *)(addr))))
=20
+
+/******************* Define Values from Bluetooth specs ******************=
***/
+#define BT_NAME_LENGTH 248
+
 /****************** Defines realted to the bluetooth implementation ******=
***/
=20
 #define SERIAL_PORT_PROFILE 0
@@ -155,6 +159,7 @@
 #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])
+#define HCIREMOTENAME_REQUEST _IOW(BT_IOC_MAGIC, 0x27, u8[255])
=20
 /* Link Policy Commands */
 #define HCISWITCHROLE _IOW(BT_IOC_MAGIC, 0x28, u8[7])
@@ -172,7 +177,7 @@
 #define HCIREADSTOREDLINKKEY _IOWR(BT_IOC_MAGIC, 0x33, u8[7])
 #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 HCISETLOCALNAME _IOW(BT_IOC_MAGIC, 0x36, u8[BT_NAME_LENGTH])
 #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])
--- hci.h	2001/10/22 12:51:44	1.73
+++ hci.h	2002/02/06 11:19:58	1.74
@@ -185,6 +185,9 @@
 s32 hci_read_local_version_info(s32 block);
 s32 hci_read_country_code(void);
=20
+/* Status Parameters */
+s32 remote_name_request(u8 *bd, s32 block);
+
 /* Internal */
 /* FIXME -- add parameter to choose from different devices */
 s32 get_remote_bd(int line, u8 *bd);