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

[Gordon M. <gm...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
btconfig.h      1.18            1.19=20=20=20=20=20=20=20=20=20=20=20=20
hci_internal.h  1.11            1.12=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

--Modified the config macros to be compatible with the Linux kernel config =
system.


The diff of the modified file(s):

--- btconfig.h	2001/03/02 15:56:18	1.18
+++ btconfig.h	2001/03/04 17:54:54	1.19
@@ -39,6 +39,13 @@
  *
  */
=20
+/*
+ * 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
+ * this next section. See Config.in in the source directory.
+ * --gmcnutt
+ */
+#ifndef CONFIG_BLUETOOTH
 /******************
  *    General     *
  ******************/
@@ -47,10 +54,10 @@
 //#define USE_TCI
=20
 /* use of /proc files to read status information */
-#define BT_USE_PROC
+#define CONFIG_BLUETOOTH_PROC
=20
 /* Used to decrease overruns on serial port (see bluetooth.c) */
-#undef BT_USEINBUFFER
+#undef CONFIG_BLUETOOTH_USEINBUFFER
=20
 #ifdef __CRIS__
 #define USE_SECURITY_MANAGER
@@ -61,19 +68,13 @@
 /* Bluetooth HW defines used to setup different HW and to cope with=20
    limitations in HW */
=20
-#define HW_NOINIT 0
-#define HW_ERICSSON 1
-#define HW_DIGIANSWER 2
-#define HW_CSR 3
-#define HW_GENERIC 4
-#define HW_USBMODULE 5 /* Not implemented */
-
 /* This sets current HW */
-#define HW_CURRENT HW_ERICSSON
-//#define HW_CURRENT HW_CSR
-//#define HW_CURRENT HW_GENERIC
-
-#define HW_USED(x) (HW_CURRENT =3D=3D x)
+#undef CONFIG_BLUETOOTH_CSR=20=20=20=20=20=20=20=20
+#undef CONFIG_BLUETOOTH_NOINIT=20=20=20=20=20
+#undef CONFIG_BLUETOOTH_DIGIANSWER=20
+#undef CONFIG_BLUETOOTH_USBMODULE  /* Not implemented */
+#undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20
+#define CONFIG_BLUETOOTH_ERICSSON
=20
 /***************
  *     HCI     *
@@ -89,7 +90,7 @@
 //#define HCI_EMULATION
=20
 /* This should be defined if you are using the Ericsson P9A firmware */
-#define P9A
+#define CONFIG_BLUETOOTH_ERICSSON_P9A
=20
 /* This define is used during test of the host flow control */
 //#define HOST_FLOW_CTRL
@@ -102,14 +103,14 @@
 //#define EMC_TEST_DATA_SIZE 678
 #endif
=20
-#define HCI_USEUSB
+#define CONFIG_BLUETOOTH_HCI_USB
=20
 /****************
  *     L2CAP    *
  ****************/
=20
-#define L2CAP_USETIMERS
-#define DEF_ALLOWCONLESS 0
+#define CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#undef CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
=20
 /*****************
  *     RFCOMM    *
@@ -120,3 +121,5 @@
 /***************
  *     SDP     *
  ***************/
+
+#endif /* CONFIG_BLUETOOTH */
--- hci_internal.h	2001/03/03 13:59:14	1.11
+++ hci_internal.h	2001/03/04 17:54:55	1.12
@@ -342,7 +342,7 @@
 	u8 local_bd[6];
         s32 active_connection;
 	hci_con con[MAX_NBR_OF_CONNECTIONS];
-} __attribute__ ((packed)) hci_controller;
+} hci_controller;
=20
 /****************** EXPORTED FUNCTION DECLARATION SECTION ****************=
***/
=20