commit 485f249242097022e198b7a1232f6076be3ee893
author Thierry Strudel <tstrudel@google.com> Thu Oct 13 21:36:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 21:36:06 2016 +0000
tree 591d3bd989dc988f505b306a1fc495aebfed299b
parent 576d8bf648e1f482bc092ab57d17f1652ec40af6
parent b7260c25f01729de51be08443b9618eaf8e8a882

msmcobalt: Update to 07.00.00.253.032 am: 41464994bb
am: b7260c25f0

Change-Id: Idfd0df2edfa9e1424725078d57db9a1a887cb8b7

msm8992/libbt-vendor/src/hw_ar3k.c

diff --git a/msm8992/libbt-vendor/src/hw_ar3k.c b/msm8992/libbt-vendor/src/hw_ar3k.c
index 9ca5b3c..dbe6b51 100644
--- a/msm8992/libbt-vendor/src/hw_ar3k.c
+++ b/msm8992/libbt-vendor/src/hw_ar3k.c
@@ -45,6 +45,7 @@
 #include <dirent.h>
 #include <ctype.h>
 #include <cutils/properties.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
@@ -434,19 +435,19 @@
 static int get_ps_type(char *ptr, int index, char *type, char *sub_type)
 {
     int i;
-    int delim = FALSE;
+    int delim = false;
 
     if (index > MAX_PREAMBLE_LEN)
         return -EILSEQ;
 
     for (i = 1; i < index; i++) {
         if (__is_delim(ptr[i])) {
-            delim = TRUE;
+            delim = true;
             continue;
         }
 
         if (isalpha(ptr[i])) {
-            if (delim == FALSE)
+            if (delim == false)
                 (*type) = toupper(ptr[i]);
             else
                 (*sub_type)	= toupper(ptr[i]);
@@ -471,7 +472,7 @@
     char sub_type = '\0';
 
     format->type = PS_HEX;
-    format->array = TRUE;
+    format->array = true;
 
     if (strstr(buf, "[") != buf)
         return 0;
@@ -485,10 +486,10 @@
 
     /* Check is data type is of array */
     if (type == ARRAY || sub_type == ARRAY)
-        format->array = TRUE;
+        format->array = true;
 
     if (type == STRING || sub_type == STRING)
-        format->array = FALSE;
+        format->array = false;
 
     if (type == DECIMAL || type == BINARY)
         format->type = PS_DEC;
@@ -517,7 +518,7 @@
         ptr++;
     }
 
-    if (type.type == PS_HEX && type.array != TRUE)
+    if (type.type == PS_HEX && type.array != true)
         return strtol(ptr, NULL, 16);
 
     return UNDEFINED;
@@ -630,7 +631,7 @@
             read_count = (byte_count > ENTRY_PER_LINE) ?
             ENTRY_PER_LINE : byte_count;
 
-            if (format.type == PS_HEX && format.array == TRUE) {
+            if (format.type == PS_HEX && format.array == true) {
                 while (read_count > 0) {
                     update_tag_data(tag, &status, ptr);
                     read_count -= 2;

msm8996/libbt-vendor/src/hw_ar3k.c

diff --git a/msm8996/libbt-vendor/src/hw_ar3k.c b/msm8996/libbt-vendor/src/hw_ar3k.c
index 681cd09..f8e3342 100644
--- a/msm8996/libbt-vendor/src/hw_ar3k.c
+++ b/msm8996/libbt-vendor/src/hw_ar3k.c
@@ -437,19 +437,19 @@
 static int get_ps_type(char *ptr, int index, char *type, char *sub_type)
 {
     int i;
-    int delim = FALSE;
+    int delim = false;
 
     if (index > MAX_PREAMBLE_LEN)
         return -EILSEQ;
 
     for (i = 1; i < index; i++) {
         if (__is_delim(ptr[i])) {
-            delim = TRUE;
+            delim = true;
             continue;
         }
 
         if (isalpha(ptr[i])) {
-            if (delim == FALSE)
+            if (delim == false)
                 (*type) = toupper(ptr[i]);
             else
                 (*sub_type)	= toupper(ptr[i]);
@@ -474,7 +474,7 @@
     char sub_type = '\0';
 
     format->type = PS_HEX;
-    format->array = TRUE;
+    format->array = true;
 
     if (strstr(buf, "[") != buf)
         return 0;
@@ -488,10 +488,10 @@
 
     /* Check is data type is of array */
     if (type == ARRAY || sub_type == ARRAY)
-        format->array = TRUE;
+        format->array = true;
 
     if (type == STRING || sub_type == STRING)
-        format->array = FALSE;
+        format->array = false;
 
     if (type == DECIMAL || type == BINARY)
         format->type = PS_DEC;
@@ -520,7 +520,7 @@
         ptr++;
     }
 
-    if (type.type == PS_HEX && type.array != TRUE)
+    if (type.type == PS_HEX && type.array != true)
         return strtol(ptr, NULL, 16);
 
     return UNDEFINED;
@@ -633,7 +633,7 @@
             read_count = (byte_count > ENTRY_PER_LINE) ?
             ENTRY_PER_LINE : byte_count;
 
-            if (format.type == PS_HEX && format.array == TRUE) {
+            if (format.type == PS_HEX && format.array == true) {
                 while (read_count > 0) {
                     update_tag_data(tag, &status, ptr);
                     read_count -= 2;