CVS: 2 files have been modified in apps/bluetooth/btd.

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

The following files were modified in apps/bluetooth/btd:

Name            Old version     New version     Comment
----            -----------     -----------     -------
btd.c           1.82            1.83=20=20=20=20=20=20=20=20=20=20=20=20
btd.h           1.33            1.34=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):

--- btd.c	2001/03/04 15:49:23	1.82
+++ btd.c	2001/03/04 17:54:54	1.83
@@ -304,7 +304,7 @@
 /* Misc */
 static void show_menu(void);
=20
-#if HW_USED(HW_ERICSSON)&&defined(__CRIS__)
+#if defined(CONFIG_BLUETOOTH_ERICSSON)&&defined(__CRIS__)
 #define ECS_TEST_FUNCTIONS
 #endif
=20
@@ -3062,7 +3062,7 @@
 /****************** Vendor dependent functions ***********************/
 /*********************************************************************/
=20
-#if HW_USED(HW_ERICSSON)
+#if defined(CONFIG_BLUETOOTH_ERICSSON)
=20
 /* Set the phys device to Ericsson default speed, 57600 */
 void init_phys(int fd)
@@ -3121,7 +3121,7 @@
 #endif
 }
=20
-#elif HW_USED(HW_DIGIANSWER)
+#elif defined(CONFIG_BLUETOOTH_DIGIANSWER)
 /*********************************************************************/
 /*********************************************************************/
=20
@@ -3151,7 +3151,7 @@
 #endif
 }
=20
-#elif HW_USED(HW_CSR)
+#elif defined(CONFIG_BLUETOOTH_CSR)
 /*********************************************************************/
 /*********************************************************************/
=20
@@ -3195,7 +3195,7 @@
 #endif
 }
=20
-#elif HW_USED(HW_GENERIC)
+#elif defined(CONFIG_BLUETOOTH_GENERIC)
 /*********************************************************************/
 /*********************************************************************/
=20
@@ -3224,7 +3224,7 @@
 #endif
 }
=20
-#elif HW_USED(HW_NOINIT)
+#elif defined(CONFIG_BLUETOOTH_NOINIT)
 /*********************************************************************/
 /*********************************************************************/
=20
--- btd.h	2001/02/27 15:46:44	1.33
+++ btd.h	2001/03/04 17:54:54	1.34
@@ -46,20 +46,22 @@
=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 */
-
-#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 */
-
+#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
 /* This sets current HW */
-#define HW_CURRENT HW_ERICSSON
-//#define HW_CURRENT HW_CSR
+#define CONFIG_BLUETOOTH_ERICSSON
=20
-#define HW_USED(x) (HW_CURRENT =3D=3D x)
=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