aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Diewald <Diewi@diewald-net.com>2017-05-09 15:04:26 +0200
committerArian <arian.kulmer@web.de>2019-10-28 14:57:46 +0100
commitf3169d29959412430f1e395e0d8aefc6e7c43df4 (patch)
tree65320904ad7eae124fc04bc70ea6d334de617c96
parent3ce0a40f2582c485f56a0a5e7b4dc452a48bb190 (diff)
brcm-uim-sysfs: Enable boards to define N_BRCM_HCI for BT/FM.
Kernels based on version 3.10 require this define to be 25 such that the ldisc driver can be registered. Kernel version 3.4 requires the define to be 26, instead. Note: it is not sufficient to change this define here and in the brcm ldisc driver in the kernel to match values. Change-Id: Ic04f2df34f8db23d9707228be5fe5718f0a1edd5 Signed-off-by: Alexander Diewald <Diewi@diewald-net.com>
-rwxr-xr-xbrcm-uim-sysfs/Android.mk4
-rwxr-xr-xbrcm-uim-sysfs/include/uim.h5
2 files changed, 8 insertions, 1 deletions
diff --git a/brcm-uim-sysfs/Android.mk b/brcm-uim-sysfs/Android.mk
index 48ca6dc..23dbfd5 100755
--- a/brcm-uim-sysfs/Android.mk
+++ b/brcm-uim-sysfs/Android.mk
@@ -24,6 +24,10 @@ endif
LOCAL_CFLAGS += -DSYSFS_PREFIX=\"$(SYSFS_PREFIX)\"
+ifneq ($(BOARD_BRCM_HCI_NUM),)
+LOCAL_CFLAGS += -DBOARD_BRCM_HCI_NUM=$(BOARD_BRCM_HCI_NUM)
+endif
+
LOCAL_MODULE := brcm-uim-sysfs
LOCAL_MODULE_TAGS := optional
ifeq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 25 ))" )))
diff --git a/brcm-uim-sysfs/include/uim.h b/brcm-uim-sysfs/include/uim.h
index 12925b0..0748a82 100755
--- a/brcm-uim-sysfs/include/uim.h
+++ b/brcm-uim-sysfs/include/uim.h
@@ -166,8 +166,11 @@ typedef struct {
#define MAX_KMODULE_PATH_SIZE 100
#define UART_PORT_NAME_SIZE 20
+#ifdef BOARD_BRCM_HCI_NUM
+#define N_BRCM_HCI BOARD_BRCM_HCI_NUM
+#else
#define N_BRCM_HCI 25
-
+#endif
/* Functions to insert and remove the kernel modules from the system*/
extern int init_module(void *, unsigned int, const char *);