commit 395b044f65745ba0c4f78a21bd8d9390c5aa9b2b
author Dmitry Shmidt <dimitrysh@google.com> Tue Nov 08 08:56:57 2016 -0800
committer Dmitry Shmidt <dimitrysh@google.com> Tue Nov 08 08:56:57 2016 -0800
tree 242079c8be90631150ef06bd149f69eeac5b3677
parent cc14758ff0497beb73d3ecc7abf8ed05302f2151

hikey: Fix wpan warning including BOTHER redefinition

Test: Manual
Bug: 32713438

Change-Id: Ie6518fbb5e7594fa2d08078375ff7bcf92533a16
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

wpan/bluedroid_wilink/libbt-vendor-ti.c

diff --git a/wpan/bluedroid_wilink/libbt-vendor-ti.c b/wpan/bluedroid_wilink/libbt-vendor-ti.c
index e05c154..46705bd 100644
--- a/wpan/bluedroid_wilink/libbt-vendor-ti.c
+++ b/wpan/bluedroid_wilink/libbt-vendor-ti.c
@@ -41,12 +41,13 @@
  * Returns          None
  *
  * *******************************************************************************/
-void hw_config_cback(HC_BT_HDR *p_evt_buf)
+void hw_config_cback(HC_BT_HDR * __unused p_evt_buf)
 {
     ALOGV("hw_config_cback");
 }
 
-int ti_init(const bt_vendor_callbacks_t* p_cb, unsigned char *local_bdaddr) {
+int ti_init(const bt_vendor_callbacks_t* p_cb, unsigned char * __unused local_bdaddr)
+{
     ALOGV("vendor Init");
 
     if (p_cb == NULL)
@@ -59,14 +60,18 @@
 
     return 0;
 }
-void ti_cleanup(void) {
+
+void ti_cleanup(void)
+{
     ALOGV("vendor cleanup");
 
     bt_vendor_cbacks = NULL;
 }
-int ti_op(bt_vendor_opcode_t opcode, void **param) {
+
+int ti_op(bt_vendor_opcode_t opcode, void *param)
+{
     int fd;
-    int *fd_array = (int (*)[]) param;
+    int *fd_array = (int *)param;
 
     ALOGV("vendor op - %d", opcode);
     switch(opcode)
@@ -99,6 +104,7 @@
 
     return 0;
 }
+
 const bt_vendor_interface_t BLUETOOTH_VENDOR_LIB_INTERFACE  = {
     .init = ti_init,
     .op = ti_op,

wpan/uim/uim.h

diff --git a/wpan/uim/uim.h b/wpan/uim/uim.h
index c21abda..c88d9cc 100644
--- a/wpan/uim/uim.h
+++ b/wpan/uim/uim.h
@@ -26,7 +26,6 @@
 
 /* Paramaters to set the baud rate*/
 #define  FLOW_CTL	0x0001
-#define  BOTHER		0x00001000
 #define  ARM_NCCS	19
 
 #ifndef TCGETS2