commit 6863d50b9bffee175de4dc4ee5c9cbe7a1979a23
author Zijun Zhao <zijunzhao@google.com> Thu Jul 13 19:29:48 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 13 19:29:48 2023 +0000
tree da851ba139b76918cb433974a1963ffde7820250
parent 99810e76d440c5fdbe91a5b5cbb9083deecbd850
parent ba06922bdb9e59debfa569b99fd1a3521c02225c

Merge "Fix duplicate symbols error in hardware" into main

1.0/hal/halcore.c

diff --git a/1.0/hal/halcore.c b/1.0/hal/halcore.c
index 1493cac..2912b05 100644
--- a/1.0/hal/halcore.c
+++ b/1.0/hal/halcore.c
@@ -27,6 +27,8 @@
 #include <pthread.h>
 #include <semaphore.h>
 
+pthread_mutex_t debugOutputSem = PTHREAD_MUTEX_INITIALIZER;
+bool halTraceMask = true;
 extern int I2cWriteCmd(const uint8_t* x, size_t len);
 extern void DispHal(const char* title, const void* data, size_t length);
 

1.0/include/halcore.h

diff --git a/1.0/include/halcore.h b/1.0/include/halcore.h
index 1df331b..4b646b6 100644
--- a/1.0/include/halcore.h
+++ b/1.0/include/halcore.h
@@ -42,8 +42,8 @@
 #define HAL_FLAG_NO_DEBUG 0 /* disable debug output */
 #define HAL_FLAG_DEBUG 1    /* enable debug output */
 
-bool halTraceMask;
-pthread_mutex_t debugOutputSem;
+extern bool halTraceMask;
+extern pthread_mutex_t debugOutputSem;
 
 #ifdef ANDROID
 #include <android/log.h>