diff options
-rw-r--r-- | core/LocAdapterBase.cpp | 2 | ||||
-rw-r--r-- | core/LocApiBase.cpp | 2 | ||||
-rw-r--r-- | core/LocDualContext.cpp | 5 | ||||
-rw-r--r-- | core/Makefile.am | 7 | ||||
-rw-r--r-- | core/UlpProxyBase.h | 1 | ||||
-rw-r--r-- | loc_api/Makefile.am | 4 | ||||
-rw-r--r-- | loc_api/libloc_api_50001/LocEngAdapter.cpp | 3 | ||||
-rw-r--r-- | loc_api/libloc_api_50001/Makefile.am | 78 | ||||
-rw-r--r-- | loc_api/libloc_api_50001/loc_eng.cpp | 7 | ||||
-rw-r--r-- | loc_api/libloc_api_50001/loc_eng_ni.cpp | 2 | ||||
-rw-r--r-- | platform_lib_abstractions/loc_pla/include/platform_lib_macros.h | 2 | ||||
-rw-r--r-- | platform_lib_abstractions/loc_pla/include/platform_lib_time.h | 4 | ||||
-rw-r--r-- | platform_lib_abstractions/loc_pla/src/Makefile.am | 1 | ||||
-rw-r--r-- | platform_lib_abstractions/loc_stub/src/Makefile.am | 1 | ||||
-rw-r--r-- | utils/LocTimer.h | 2 | ||||
-rw-r--r-- | utils/Makefile.am | 15 | ||||
-rw-r--r-- | utils/MsgTask.cpp | 3 | ||||
-rw-r--r-- | utils/loc_cfg.cpp | 2 | ||||
-rw-r--r-- | utils/loc_misc_utils.cpp | 2 | ||||
-rw-r--r-- | utils/loc_timer.h | 2 |
20 files changed, 120 insertions, 25 deletions
diff --git a/core/LocAdapterBase.cpp b/core/LocAdapterBase.cpp index 8fdb8cb..e9bec95 100644 --- a/core/LocAdapterBase.cpp +++ b/core/LocAdapterBase.cpp @@ -32,7 +32,7 @@ #include <dlfcn.h> #include <LocAdapterBase.h> #include <loc_target.h> -#include <log_util.h> +#include <platform_lib_log_util.h> #include <LocAdapterProxyBase.h> namespace loc_core { diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp index dcd35fe..45d16e9 100644 --- a/core/LocApiBase.cpp +++ b/core/LocApiBase.cpp @@ -32,7 +32,7 @@ #include <dlfcn.h> #include <LocApiBase.h> #include <LocAdapterBase.h> -#include <log_util.h> +#include <platform_lib_log_util.h> #include <LocDualContext.h> namespace loc_core { diff --git a/core/LocDualContext.cpp b/core/LocDualContext.cpp index b5f33ac..74b2903 100644 --- a/core/LocDualContext.cpp +++ b/core/LocDualContext.cpp @@ -33,6 +33,7 @@ #include <unistd.h> #include <LocDualContext.h> #include <msg_q.h> +#include <platform_lib_log_util.h> #include <loc_log.h> namespace loc_core { @@ -58,7 +59,11 @@ ContextBase* LocDualContext::mBgContext = NULL; ContextBase* LocDualContext::mInjectContext = NULL; // the name must be shorter than 15 chars const char* LocDualContext::mLocationHalName = "Loc_hal_worker"; +#ifndef USE_GLIB const char* LocDualContext::mLBSLibName = "liblbs_core.so"; +#else +const char* LocDualContext::mLBSLibName = "liblbs_core.so.1"; +#endif pthread_mutex_t LocDualContext::mGetLocContextMutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/core/Makefile.am b/core/Makefile.am index e2d05be..341153a 100644 --- a/core/Makefile.am +++ b/core/Makefile.am @@ -1,10 +1,11 @@ AM_CFLAGS = -I./ \ -I../utils \ $(LOCPLA_CFLAGS) \ + -I$(WORKSPACE)/gps-noship/flp \ + -D__func__=__PRETTY_FUNCTION__ \ -fno-short-enums libloc_core_la_h_sources = \ - MsgTask.h \ LocApiBase.h \ LocAdapterBase.h \ ContextBase.h \ @@ -13,10 +14,10 @@ libloc_core_la_h_sources = \ UlpProxyBase.h \ gps_extended_c.h \ gps_extended.h \ - loc_core_log.h + loc_core_log.h \ + LocAdapterProxyBase.h libloc_core_la_c_sources = \ - MsgTask.cpp \ LocApiBase.cpp \ LocAdapterBase.cpp \ ContextBase.cpp \ diff --git a/core/UlpProxyBase.h b/core/UlpProxyBase.h index 59e265e..2bafb0a 100644 --- a/core/UlpProxyBase.h +++ b/core/UlpProxyBase.h @@ -31,7 +31,6 @@ #include <gps_extended.h> #include "fused_location_extended.h" - namespace loc_core { class LocAdapterBase; diff --git a/loc_api/Makefile.am b/loc_api/Makefile.am index d42d4d9..a5f529b 100644 --- a/loc_api/Makefile.am +++ b/loc_api/Makefile.am @@ -5,6 +5,7 @@ AM_CFLAGS = \ -I../utils \ $(LOCPLA_CFLAGS) \ -fno-short-enums \ + -D__func__=__PRETTY_FUNCTION__ \ -DTARGET_USES_QCOM_BSP libloc_eng_so_la_h_sources = \ @@ -81,7 +82,8 @@ libloc_ds_api_la_LDFLAGS += -Wl,--export-dynamic libloc_ds_api_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(libloc_ds_api_CFLAGS) endif -libloc_ds_api_la_LIBADD = -lstdc++ $(QMIF_LIBS) -lqmiservices $(LOCPLA_LIBS) ../utils/libgps_utils_so.la +libloc_ds_api_la_LIBADD = -lstdc++ $(QMIF_LIBS) -lqmiservices -ldsi_netctrl $(LOCPLA_LIBS) ../utils/libgps_utils_so.la +#libloc_ds_api_la_LIBADD = -lstdc++ $(QMIF_LIBS) -lqmiservices $(LOCPLA_LIBS) ../utils/libgps_utils_so.la libloc_api_v02_CFLAGS = \ $(QMIF_CFLAGS) \ diff --git a/loc_api/libloc_api_50001/LocEngAdapter.cpp b/loc_api/libloc_api_50001/LocEngAdapter.cpp index 1d1a59e..f3290db 100644 --- a/loc_api/libloc_api_50001/LocEngAdapter.cpp +++ b/loc_api/libloc_api_50001/LocEngAdapter.cpp @@ -339,9 +339,10 @@ void LocEngAdapter::requestPowerVote() LOC_LOGV("LocEngAdapterVotePower - Vote Power: %d", (int)powerUp); setGpsLock(powerUp ? 103 : 101); } - +#ifndef USE_GLIB delete mUlp; mUlp = ulp; +#endif } void LocInternalAdapter::reportPosition(UlpLocation &location, diff --git a/loc_api/libloc_api_50001/Makefile.am b/loc_api/libloc_api_50001/Makefile.am new file mode 100644 index 0000000..c762427 --- /dev/null +++ b/loc_api/libloc_api_50001/Makefile.am @@ -0,0 +1,78 @@ +AM_CFLAGS = \
+ -I../../utils \
+ -I../../platform_lib_abstractions \
+ -I$(WORKSPACE)/gps-noship/flp \
+ -fno-short-enums \
+ -D__func__=__PRETTY_FUNCTION__ \
+ -DFEATURE_GNSS_BIT_API
+
+libloc_adapter_so_la_SOURCES = loc_eng_log.cpp LocEngAdapter.cpp
+
+if USE_GLIB
+libloc_adapter_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
+libloc_adapter_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
+libloc_adapter_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
+else
+libloc_adapter_so_la_CFLAGS = $(AM_CFLAGS)
+libloc_adapter_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
+libloc_adapter_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
+endif
+libloc_adapter_so_la_LIBADD = -lstdc++ -lcutils ../../utils/libgps_utils_so.la
+
+
+libloc_eng_so_la_SOURCES = \
+ loc_eng.cpp \
+ loc_eng_agps.cpp \
+ loc_eng_xtra.cpp \
+ loc_eng_ni.cpp \
+ loc_eng_log.cpp \
+ loc_eng_dmn_conn.cpp \
+ loc_eng_dmn_conn_handler.cpp \
+ loc_eng_dmn_conn_thread_helper.c \
+ loc_eng_dmn_conn_glue_msg.c \
+ loc_eng_dmn_conn_glue_pipe.c
+
+
+if USE_GLIB
+libloc_eng_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
+libloc_eng_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
+libloc_eng_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
+else
+libloc_eng_so_la_CFLAGS = $(AM_CFLAGS)
+libloc_eng_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
+libloc_eng_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
+endif
+
+libloc_eng_so_la_LIBADD = -lstdc++ -lcutils -ldl ../../utils/libgps_utils_so.la libloc_adapter_so.la
+
+
+libgps_default_so_la_SOURCES = \
+ loc.cpp \
+ gps.c
+
+if USE_GLIB
+libgps_default_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
+libgps_default_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
+libgps_default_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
+else
+libgps_default_so_la_CFLAGS = $(AM_CFLAGS)
+libgps_default_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
+libgps_default_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
+endif
+
+libgps_default_so_la_LIBADD = -lstdc++ -lcutils ../../utils/libgps_utils_so.la -ldl libloc_eng_so.la
+
+library_include_HEADERS = \
+ LocEngAdapter.h \
+ loc.h \
+ loc_eng.h \
+ loc_eng_xtra.h \
+ loc_eng_ni.h \
+ loc_eng_agps.h \
+ loc_eng_msg.h \
+ loc_eng_log.h
+
+library_includedir = $(pkgincludedir)/libloc_api_50001
+
+#Create and Install libraries
+lib_LTLIBRARIES = libloc_adapter_so.la libloc_eng_so.la libgps_default_so.la
diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp index de72aa8..6aac28b 100644 --- a/loc_api/libloc_api_50001/loc_eng.cpp +++ b/loc_api/libloc_api_50001/loc_eng.cpp @@ -46,12 +46,7 @@ #include <time.h> #include <new> #include <LocEngAdapter.h> -#if defined(USE_GLIB) && !defined(OFF_TARGET) -#include <glib.h> -#endif -#ifdef USE_GLIB -#include <sys/syscall.h> -#endif /* USE_GLIB */ + #include <string.h> #include <loc_eng.h> diff --git a/loc_api/libloc_api_50001/loc_eng_ni.cpp b/loc_api/libloc_api_50001/loc_eng_ni.cpp index 3b20bbb..a29784f 100644 --- a/loc_api/libloc_api_50001/loc_eng_ni.cpp +++ b/loc_api/libloc_api_50001/loc_eng_ni.cpp @@ -235,8 +235,6 @@ static void* ni_thread_proc(void *args) LOC_LOGD("pSession->resp is %d\n",pSession->resp); - LOC_LOGD("loc_eng_ni_data_p->resp is %d\n",loc_eng_ni_data_p->resp); - // adding this check to support modem restart, in which case, we need the thread // to exit without calling sending data. We made sure that rawRequest is NULL in // loc_eng_ni_reset_on_engine_restart() diff --git a/platform_lib_abstractions/loc_pla/include/platform_lib_macros.h b/platform_lib_abstractions/loc_pla/include/platform_lib_macros.h index 32035d2..c712122 100644 --- a/platform_lib_abstractions/loc_pla/include/platform_lib_macros.h +++ b/platform_lib_abstractions/loc_pla/include/platform_lib_macros.h @@ -35,6 +35,8 @@ extern "C" { #ifdef USE_GLIB #include <sys/time.h> +#include <string.h> +#include <stdlib.h> #ifndef OFF_TARGET #include <glib.h> #define strlcat g_strlcat diff --git a/platform_lib_abstractions/loc_pla/include/platform_lib_time.h b/platform_lib_abstractions/loc_pla/include/platform_lib_time.h index c05b15c..7033a7a 100644 --- a/platform_lib_abstractions/loc_pla/include/platform_lib_time.h +++ b/platform_lib_abstractions/loc_pla/include/platform_lib_time.h @@ -30,7 +30,9 @@ #define __PLATFORM_LIB_TIME_H__ #include <stdint.h> - +#ifndef USE_GLIB +#include <utils/SystemClock.h> +#endif int64_t platform_lib_abstraction_elapsed_millis_since_boot(); #endif /* __PLATFORM_LIB_TIME_H__ */ diff --git a/platform_lib_abstractions/loc_pla/src/Makefile.am b/platform_lib_abstractions/loc_pla/src/Makefile.am index 3936837..6ee0be7 100644 --- a/platform_lib_abstractions/loc_pla/src/Makefile.am +++ b/platform_lib_abstractions/loc_pla/src/Makefile.am @@ -1,6 +1,7 @@ AM_CFLAGS = \ $(LOCSTUB_CFLAGS) \ -I../include \ + -D__func__=__PRETTY_FUNCTION__ \ -fno-short-enums h_sources = \ diff --git a/platform_lib_abstractions/loc_stub/src/Makefile.am b/platform_lib_abstractions/loc_stub/src/Makefile.am index c8ab5fc..8bda711 100644 --- a/platform_lib_abstractions/loc_stub/src/Makefile.am +++ b/platform_lib_abstractions/loc_stub/src/Makefile.am @@ -1,5 +1,6 @@ AM_CFLAGS = \ -I../include \ + -D__func__=__PRETTY_FUNCTION__ \ -fno-short-enums libloc_stub_la_extra_h = \ diff --git a/utils/LocTimer.h b/utils/LocTimer.h index c146852..c6a6362 100644 --- a/utils/LocTimer.h +++ b/utils/LocTimer.h @@ -31,7 +31,7 @@ #define __LOC_TIMER_CPP_H__ #include <stddef.h> -#include <log_util.h> +#include <platform_lib_includes.h> // opaque class to provide service implementation. class LocTimerDelegate; diff --git a/utils/Makefile.am b/utils/Makefile.am index 5e71843..50f1007 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -14,15 +14,24 @@ libgps_utils_so_la_h_sources = \ loc_cfg.h \ loc_log.h \ loc_target.h \ - loc_timer.h + loc_timer.h \ + MsgTask.h \ + LocHeap.h \ + LocThread.h \ + LocTimer.h \ + loc_misc_utils.h libgps_utils_so_la_c_sources = \ linked_list.c \ msg_q.c \ loc_cfg.cpp \ loc_log.cpp \ - loc_timer.c \ - loc_target.cpp + loc_target.cpp \ + LocHeap.cpp \ + LocTimer.cpp \ + LocThread.cpp \ + MsgTask.cpp \ + loc_misc_utils.cpp library_includedir = $(pkgincludedir)/utils diff --git a/utils/MsgTask.cpp b/utils/MsgTask.cpp index f33d602..78a3fe0 100644 --- a/utils/MsgTask.cpp +++ b/utils/MsgTask.cpp @@ -33,6 +33,7 @@ #include <MsgTask.h> #include <msg_q.h> #include <loc_log.h> +#include <platform_lib_includes.h> static void LocMsgDestroy(void* msg) { delete (LocMsg*)msg; @@ -77,7 +78,7 @@ void MsgTask::sendMsg(const LocMsg* msg) const { void MsgTask::prerun() { // make sure we do not run in background scheduling group - set_sched_policy(gettid(), SP_FOREGROUND); + platform_lib_abstraction_set_sched_policy(platform_lib_abstraction_gettid(), PLA_SP_FOREGROUND); } bool MsgTask::run() { diff --git a/utils/loc_cfg.cpp b/utils/loc_cfg.cpp index 967d2f3..926781a 100644 --- a/utils/loc_cfg.cpp +++ b/utils/loc_cfg.cpp @@ -38,7 +38,7 @@ #include <unistd.h> #include <time.h> #include <loc_cfg.h> -#include <log_util.h> +#include <platform_lib_includes.h> #include <loc_misc_utils.h> #ifdef USE_GLIB #include <glib.h> diff --git a/utils/loc_misc_utils.cpp b/utils/loc_misc_utils.cpp index 7e96313..dfe19a2 100644 --- a/utils/loc_misc_utils.cpp +++ b/utils/loc_misc_utils.cpp @@ -28,7 +28,7 @@ */ #include <stdio.h> #include <string.h> -#include <log_util.h> +#include <platform_lib_log_util.h> #include <loc_misc_utils.h> #include <ctype.h> diff --git a/utils/loc_timer.h b/utils/loc_timer.h index 2967858..25fd179 100644 --- a/utils/loc_timer.h +++ b/utils/loc_timer.h @@ -34,7 +34,7 @@ extern "C" { #endif /* __cplusplus */ #include <stddef.h> - +#include <platform_lib_includes.h> /* user_data: client context pointer, passthrough. Originally received from calling client when loc_timer_start() is called. |