commit eabe61ea9cdc1c2f2c514f6774314cdccc233fbb
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 07 21:11:41 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 07 21:11:41 2017 +0000
tree b777b24b8b7970dba1ff67f52ec8f5ed34d5b6a4
parent d2c6be9daf66e9a9bab30597234ff22e64ef950f
parent 1e67a856a17ee5200cc2b8a4757e8b474ba89da6

Merge "Fix pointer sign conversion warnings in bcm2079x halimpl."

halimpl/bcm2079x/gki/common/gki.h

diff --git a/halimpl/bcm2079x/gki/common/gki.h b/halimpl/bcm2079x/gki/common/gki.h
index a3e478a..f452719 100644
--- a/halimpl/bcm2079x/gki/common/gki.h
+++ b/halimpl/bcm2079x/gki/common/gki.h
@@ -363,7 +363,7 @@
 extern void GKI_exit_task(uint8_t);
 extern uint8_t GKI_get_taskid(void);
 extern void GKI_init(void);
-extern uint8_t* GKI_map_taskname(uint8_t);
+extern int8_t* GKI_map_taskname(uint8_t);
 extern uint8_t GKI_resume_task(uint8_t);
 extern void GKI_run(void*);
 extern void GKI_stop(void);

halimpl/bcm2079x/gki/ulinux/gki_ulinux.c

diff --git a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
index 255d7c2..07767d3 100644
--- a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
+++ b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
@@ -886,7 +886,7 @@
 ** NOTE             this function needs no customization
 **
 *******************************************************************************/
-uint8_t* GKI_map_taskname(uint8_t task_id) {
+int8_t* GKI_map_taskname(uint8_t task_id) {
   GKI_TRACE_1("GKI_map_taskname %d", task_id);
 
   if (task_id < GKI_MAX_TASKS) {
@@ -896,7 +896,7 @@
   } else if (task_id == GKI_MAX_TASKS) {
     return (gki_cb.com.OSTName[GKI_get_taskid()]);
   } else {
-    return (uint8_t*)"BAD";
+    return (int8_t*)"BAD";
   }
 }