CVS: The file 'apps/bluetooth/btd/btd.h' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in apps/bluetooth/btd:

Name            Old version     New version     Comment
----            -----------     -----------     -------
btd.h           1.34            1.35=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

If CONFIG_BLUETOOTH is defined when btd.h is included, then rely
on that CONFIG_BLUETOOTH_<hardware> is defined too.


The diff of the modified file(s):

--- btd.h	2001/03/04 17:54:54	1.34
+++ btd.h	2001/03/05 16:57:54	1.35
@@ -46,22 +46,21 @@
=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 */
-#undef CONFIG_BLUETOOTH_CSR=20=20=20=20=20=20=20=20
+
+/* Let us assume that if CONFIG_BLUETOOTH is definend (from the kernel
+   includes), then CONFIG_BLUETOOTH_<hardware> is also defined correctly */
+#ifndef CONFIG_BLUETOOTH
+
+/* Define the one of these that matches the used hardware */
 #undef CONFIG_BLUETOOTH_NOINIT=20=20=20=20=20
+#undef CONFIG_BLUETOOTH_CSR=20=20=20=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 CONFIG_BLUETOOTH_ERICSSON
+#undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20
+#undef CONFIG_BLUETOOTH_USBMODULE  /* Not implemented */
=20
+#endif CONFIG_BLUETOOTH
=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