commit 3f154f783bbe7f64d7ab455c01294a361f7ac133
author Devin Kim <dojip.kim@lge.com> Mon May 18 10:39:12 2015 -0700
committer Prashant Malani <pmalani@google.com> Mon Jul 06 17:38:01 2015 +0000
tree 4006b419024f633f428cecdf9efa4e321496006b
parent f5aa794d15464e1a2247dbe9ec122dcd3e93510c

Bluetooth: Fix the FW loading in BCM4343

BCM4343 doesn't have the name starting with 'BCM'. So fix the name
to use the dynamic FW loading for BCM4343

Bug: 21268506
Change-Id: Id43a748bf6180c2464671d35e7be3caaa6532e82

Android.mk

diff --git a/Android.mk b/Android.mk
index a9fd75f..913c607 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,6 +6,10 @@
 
 BDROID_DIR := $(TOP_DIR)system/bt
 
+ifeq ($(strip $(USE_BLUETOOTH_BCM4343)),true)
+LOCAL_CFLAGS += -DUSE_BLUETOOTH_BCM4343
+endif
+
 LOCAL_SRC_FILES := \
         src/bt_vendor_brcm.c \
         src/hardware.c \

src/hardware.c

diff --git a/src/hardware.c b/src/hardware.c
index 02103ca..9869ffa 100755
--- a/src/hardware.c
+++ b/src/hardware.c
@@ -676,6 +676,15 @@
                     strncpy(hw_cfg_cb.local_chip_name, p_name, \
                             LOCAL_NAME_BUFFER_LEN-1);
                 }
+#ifdef USE_BLUETOOTH_BCM4343
+                else if ((p_name = strstr(p_tmp, "4343")) != NULL)
+                {
+                    snprintf(hw_cfg_cb.local_chip_name,
+                             LOCAL_NAME_BUFFER_LEN-1, "BCM%s", p_name);
+                    strncpy(p_name, hw_cfg_cb.local_chip_name,
+                            LOCAL_NAME_BUFFER_LEN-1);
+                }
+#endif
                 else
                 {
                     strncpy(hw_cfg_cb.local_chip_name, "UNKNOWN", \