MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loc-pla: Create Platform Library Abstraction layer

Browse source 
Defined PLA functions to enable gps libraries to call
platform-dependent library calls transparantly. Removed
fake files and replaced the fake function with defined
PLA functions.

CRs-fixed: 605817

Change-Id: I677f658001329a10ef9b49bd963631a83fb4c85f
This commit is contained in:
Dongmei Wang 2014-12-02 18:39:10 -08:00 committed by Gerrit - the friendly Code Review server
parent 42c543919b
commit 836bdc4386
53 changed files with 494 additions and 326 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -41,6 +41,10 @@ PKG_CHECK_MODULES([DATA], [data])
AC_SUBST([DATA_CFLAGS]) AC_SUBST([DATA_CFLAGS])
AC_SUBST([DATA_LIBS]) AC_SUBST([DATA_LIBS])
PKG_CHECK_MODULES([LOCPLA], [loc-pla])
AC_SUBST([LOCPLA_CFLAGS])
AC_SUBST([LOCPLA_LIBS])
AC_ARG_WITH([libhardware_includes], AC_ARG_WITH([libhardware_includes],
AC_HELP_STRING([--with-libhardware-includes=@<:@dir@:>@], AC_HELP_STRING([--with-libhardware-includes=@<:@dir@:>@],
[Specify the location of the libhardware headers]), [Specify the location of the libhardware headers]),

1
core/ContextBase.cpp
View file

@ -35,7 +35,6 @@
#include <ContextBase.h> #include <ContextBase.h>
#include <msg_q.h> #include <msg_q.h>
#include <loc_target.h> #include <loc_target.h>
#include <log_util.h>
#include <platform_lib_includes.h> #include <platform_lib_includes.h>
#include <loc_log.h> #include <loc_log.h>

1
core/LocAdapterBase.cpp
View file

@ -32,7 +32,6 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <LocAdapterBase.h> #include <LocAdapterBase.h>
#include <loc_target.h> #include <loc_target.h>
#include <log_util.h>
#include <platform_lib_includes.h> #include <platform_lib_includes.h>
namespace loc_core { namespace loc_core {

1
core/LocApiBase.cpp
View file

@ -32,7 +32,6 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <LocApiBase.h> #include <LocApiBase.h>
#include <LocAdapterBase.h> #include <LocAdapterBase.h>
#include <log_util.h>
#include <platform_lib_includes.h> #include <platform_lib_includes.h>
namespace loc_core { namespace loc_core {

4
core/LocApiBase.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -33,7 +33,7 @@
#include <ctype.h> #include <ctype.h>
#include <gps_extended.h> #include <gps_extended.h>
#include <MsgTask.h> #include <MsgTask.h>
#include <log_util.h> #include <platform_lib_log_util.h>
namespace loc_core { namespace loc_core {

1
core/LocDualContext.cpp
View file

@ -33,7 +33,6 @@
#include <unistd.h> #include <unistd.h>
#include <LocDualContext.h> #include <LocDualContext.h>
#include <msg_q.h> #include <msg_q.h>
#include <log_util.h>
#include <loc_log.h> #include <loc_log.h>
namespace loc_core { namespace loc_core {

10
core/Makefile.am
View file

@ -1,6 +1,6 @@
AM_CFLAGS = -I./ \ AM_CFLAGS = -I./ \
-I../utils \ -I../utils \
-I../platform_lib_abstractions \ $(LOCPLA_CFLAGS) \
-fno-short-enums -fno-short-enums
libloc_core_la_h_sources = \ libloc_core_la_h_sources = \
@ -13,8 +13,7 @@ libloc_core_la_h_sources = \
UlpProxyBase.h \ UlpProxyBase.h \
gps_extended_c.h \ gps_extended_c.h \
gps_extended.h \ gps_extended.h \
loc_core_log.h \ loc_core_log.h
fake_sched_policy.h
libloc_core_la_c_sources = \ libloc_core_la_c_sources = \
MsgTask.cpp \ MsgTask.cpp \
@ -22,8 +21,7 @@ libloc_core_la_c_sources = \
LocAdapterBase.cpp \ LocAdapterBase.cpp \
ContextBase.cpp \ ContextBase.cpp \
LocDualContext.cpp \ LocDualContext.cpp \
loc_core_log.cpp \ loc_core_log.cpp
fake_sched_policy.c
library_includedir = $(pkgincludedir)/core library_includedir = $(pkgincludedir)/core
@ -41,7 +39,7 @@ libloc_core_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
libloc_core_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) libloc_core_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
endif endif
libloc_core_la_LIBADD = -lstdc++ -ldl ../utils/libgps_utils_so.la libloc_core_la_LIBADD = -lstdc++ -ldl $(LOCPLA_LIBS) ../utils/libgps_utils_so.la
#Create and Install libraries #Create and Install libraries
lib_LTLIBRARIES = libloc_core.la lib_LTLIBRARIES = libloc_core.la

9
core/MsgTask.cpp
View file

@ -29,16 +29,9 @@
#define LOG_NDDEBUG 0 #define LOG_NDDEBUG 0
#define LOG_TAG "LocSvc_MsgTask" #define LOG_TAG "LocSvc_MsgTask"
#ifdef _ANDROID
#include <cutils/sched_policy.h>
#include <android_runtime/AndroidRuntime.h>
#else
#include "fake_sched_policy.h"
#endif
#include <unistd.h> #include <unistd.h>
#include <MsgTask.h> #include <MsgTask.h>
#include <msg_q.h> #include <msg_q.h>
#include <log_util.h>
#include <loc_log.h> #include <loc_log.h>
#include <platform_lib_includes.h> #include <platform_lib_includes.h>
@ -100,7 +93,7 @@ void* MsgTask::loopMain(void* arg) {
MsgTask* copy = (MsgTask*)arg; MsgTask* copy = (MsgTask*)arg;
// make sure we do not run in background scheduling group // make sure we do not run in background scheduling group
set_sched_policy(GETTID_PLATFORM_LIB_ABSTRACTION, SP_FOREGROUND); platform_lib_abstraction_set_sched_policy(platform_lib_abstraction_gettid(), PLA_SP_FOREGROUND);
if (NULL != copy->mAssociator) { if (NULL != copy->mAssociator) {
copy->mAssociator(); copy->mAssociator();

1
core/loc_core_log.cpp
View file

@ -31,7 +31,6 @@
#define LOG_TAG "LocSvc_core_log" #define LOG_TAG "LocSvc_core_log"
#include <loc_log.h> #include <loc_log.h>
#include <log_util.h>
#include <loc_core_log.h> #include <loc_core_log.h>
#include <platform_lib_includes.h> #include <platform_lib_includes.h>

17
loc_api/Makefile.am
View file

@ -2,8 +2,8 @@ AM_CFLAGS = \
-I./ \ -I./ \
-I../core \ -I../core \
-I./libloc_api_50001 \ -I./libloc_api_50001 \
-I../platform_lib_abstractions \
-I../utils \ -I../utils \
$(LOCPLA_CFLAGS) \
-fno-short-enums \ -fno-short-enums \
-DTARGET_USES_QCOM_BSP -DTARGET_USES_QCOM_BSP
@ -26,8 +26,7 @@ libloc_eng_so_la_SOURCES = \
libloc_api_50001/loc_eng_dmn_conn_handler.cpp \ libloc_api_50001/loc_eng_dmn_conn_handler.cpp \
libloc_api_50001/loc_eng_dmn_conn_thread_helper.c \ libloc_api_50001/loc_eng_dmn_conn_thread_helper.c \
libloc_api_50001/loc_eng_dmn_conn_glue_msg.c \ libloc_api_50001/loc_eng_dmn_conn_glue_msg.c \
libloc_api_50001/loc_eng_dmn_conn_glue_pipe.c \ libloc_api_50001/loc_eng_dmn_conn_glue_pipe.c
fake_property_service.c
libloc_eng_so_la_SOURCES += libloc_eng_so_la_h_sources libloc_eng_so_la_SOURCES += libloc_eng_so_la_h_sources
@ -41,13 +40,12 @@ libloc_eng_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
libloc_eng_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) libloc_eng_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
endif endif
libloc_eng_so_la_LIBADD = -lstdc++ -ldl -llog ../utils/libgps_utils_so.la ../core/libloc_core.la libloc_eng_so_la_LIBADD = -lstdc++ -ldl -llog $(LOCPLA_LIBS) ../utils/libgps_utils_so.la ../core/libloc_core.la
libgps_default_so_la_SOURCES = \ libgps_default_so_la_SOURCES = \
libloc_api_50001/loc.cpp \ libloc_api_50001/loc.cpp \
libloc_api_50001/gps.c \ libloc_api_50001/gps.c
fake_property_service.c
if USE_GLIB if USE_GLIB
libgps_default_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@ libgps_default_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
@ -59,7 +57,7 @@ libgps_default_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
libgps_default_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) libgps_default_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
endif endif
libgps_default_so_la_LIBADD = -lstdc++ -llog ../utils/libgps_utils_so.la ../core/libloc_core.la -ldl libloc_eng_so.la libgps_default_so_la_LIBADD = -lstdc++ -llog $(LOCPLA_LIBS) ../utils/libgps_utils_so.la ../core/libloc_core.la -ldl libloc_eng_so.la
libloc_ds_api_CFLAGS = \ libloc_ds_api_CFLAGS = \
@ -83,7 +81,7 @@ libloc_ds_api_la_LDFLAGS += -Wl,--export-dynamic
libloc_ds_api_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(libloc_ds_api_CFLAGS) libloc_ds_api_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(libloc_ds_api_CFLAGS)
endif endif
libloc_ds_api_la_LIBADD = -lstdc++ $(QMIF_LIBS) -lqmiservices -ldsi_netctrl ../utils/libgps_utils_so.la libloc_ds_api_la_LIBADD = -lstdc++ $(QMIF_LIBS) -lqmiservices -ldsi_netctrl $(LOCPLA_LIBS) ../utils/libgps_utils_so.la
libloc_api_v02_CFLAGS = \ libloc_api_v02_CFLAGS = \
$(QMIF_CFLAGS) \ $(QMIF_CFLAGS) \
@ -108,7 +106,7 @@ libloc_api_v02_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(libloc_api_v02_CFLAGS
endif endif
libloc_api_v02_la_CXXFLAGS = -std=c++0x libloc_api_v02_la_CXXFLAGS = -std=c++0x
libloc_api_v02_la_LIBADD = -lstdc++ -lqmi_cci -lqmi_common_so ../core/libloc_core.la ../utils/libgps_utils_so.la libloc_ds_api.la libloc_api_v02_la_LIBADD = -lstdc++ -lqmi_cci -lqmi_common_so $(QMIF_LIBS) $(LOCPLA_LIBS) ../core/libloc_core.la ../utils/libgps_utils_so.la libloc_ds_api.la
library_include_HEADERS = \ library_include_HEADERS = \
libloc_api_50001/LocEngAdapter.h \ libloc_api_50001/LocEngAdapter.h \
@ -119,7 +117,6 @@ library_include_HEADERS = \
libloc_api_50001/loc_eng_agps.h \ libloc_api_50001/loc_eng_agps.h \
libloc_api_50001/loc_eng_msg.h \ libloc_api_50001/loc_eng_msg.h \
libloc_api_50001/loc_eng_log.h \ libloc_api_50001/loc_eng_log.h \
fake_property_service.h \
$(WORKSPACE)/qcom-opensource/location/loc_api/ds_api/ds_client.h \ $(WORKSPACE)/qcom-opensource/location/loc_api/ds_api/ds_client.h \
$(WORKSPACE)/qcom-opensource/location/loc_api/loc_api_v02/location_service_v02.h \ $(WORKSPACE)/qcom-opensource/location/loc_api/loc_api_v02/location_service_v02.h \
$(WORKSPACE)/qcom-opensource/location/loc_api/loc_api_v02/loc_api_v02_log.h \ $(WORKSPACE)/qcom-opensource/location/loc_api/loc_api_v02/loc_api_v02_log.h \

3
loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/src/LocApiRpc.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -38,7 +38,6 @@
#include <LocAdapterBase.h> #include <LocAdapterBase.h>
#include <loc_api_fixup.h> #include <loc_api_fixup.h>
#include <loc_api_rpc_glue.h> #include <loc_api_rpc_glue.h>
#include <log_util.h>
#include <loc_log.h> #include <loc_log.h>
#include <loc_api_log.h> #include <loc_api_log.h>
#ifdef USE_GLIB #ifdef USE_GLIB

3
loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/src/loc_api_log.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011 The Linux Foundation. All rights reserved. /* Copyright (c) 2011, 2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -32,7 +32,6 @@
#include "loc_api_log.h" #include "loc_api_log.h"
#include "loc_log.h" #include "loc_log.h"
#include "log_util.h"
#include "platform_lib_includes.h" #include "platform_lib_includes.h"
#include "rpc/rpc.h" #include "rpc/rpc.h"
#include "loc_api_fixup.h" #include "loc_api_fixup.h"

3
loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/src/loc_api_rpc_glue.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -62,7 +62,6 @@
#endif /* USE_GLIB */ #endif /* USE_GLIB */
/* Logging Improvement */ /* Logging Improvement */
#include "log_util.h"
#include "platform_lib_includes.h" #include "platform_lib_includes.h"
/*Maximum number of Modem init*/ /*Maximum number of Modem init*/
#define RPC_TRY_NUM 10 #define RPC_TRY_NUM 10

3
loc_api/libloc_api_50001/LocEngAdapter.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -33,7 +33,6 @@
#include <hardware/gps.h> #include <hardware/gps.h>
#include <loc.h> #include <loc.h>
#include <loc_eng_log.h> #include <loc_eng_log.h>
#include <log_util.h>
#include <LocAdapterBase.h> #include <LocAdapterBase.h>
#include <LocDualContext.h> #include <LocDualContext.h>
#include <UlpProxyBase.h> #include <UlpProxyBase.h>

12
loc_api/libloc_api_50001/loc.cpp
View file

@ -43,11 +43,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <LocDualContext.h> #include <LocDualContext.h>
#ifdef _ANDROID #include <platform_lib_includes.h>
#include <cutils/properties.h>
#else
#include "fake_property_service.h"
#endif
using namespace loc_core; using namespace loc_core;
@ -174,7 +170,7 @@ extern "C" const GpsInterface* gps_get_hardware_interface ()
loc_eng_read_config(); loc_eng_read_config();
// check to see if GPS should be disabled // check to see if GPS should be disabled
property_get("gps.disable", propBuf, ""); platform_lib_abstraction_property_get("gps.disable", propBuf, "");
if (propBuf[0] == '1') if (propBuf[0] == '1')
{ {
LOC_LOGD("gps_get_interface returning NULL because gps.disable=1\n"); LOC_LOGD("gps_get_interface returning NULL because gps.disable=1\n");
@ -475,7 +471,7 @@ static int loc_inject_location(double latitude, double longitude, float accuracy
{ {
char value[PROPERTY_VALUE_MAX]; char value[PROPERTY_VALUE_MAX];
memset(value, 0, sizeof(value)); memset(value, 0, sizeof(value));
(void)property_get("persist.gps.qc_nlp_in_use", value, "0"); (void)platform_lib_abstraction_property_get("persist.gps.qc_nlp_in_use", value, "0");
if(0 == strcmp(value, "1")) if(0 == strcmp(value, "1"))
{ {
enable_cpi = false; enable_cpi = false;
@ -596,7 +592,7 @@ const void* loc_get_extension(const char* name)
else if (strcmp(name, AGPS_RIL_INTERFACE) == 0) else if (strcmp(name, AGPS_RIL_INTERFACE) == 0)
{ {
char baseband[PROPERTY_VALUE_MAX]; char baseband[PROPERTY_VALUE_MAX];
property_get("ro.baseband", baseband, "msm"); platform_lib_abstraction_property_get("ro.baseband", baseband, "msm");
if (strcmp(baseband, "csfb") == 0) if (strcmp(baseband, "csfb") == 0)
{ {
ret_val = &sLocEngAGpsRilInterface; ret_val = &sLocEngAGpsRilInterface;

19
loc_api/libloc_api_50001/loc_eng.cpp
View file

@ -46,21 +46,6 @@
#include <time.h> #include <time.h>
#include <new> #include <new>
#include <LocEngAdapter.h> #include <LocEngAdapter.h>
#ifdef _ANDROID
#include <cutils/sched_policy.h>
#include <cutils/properties.h>
#else
#include "fake_sched_policy.h"
#include "fake_property_service.h"
#endif
#ifndef USE_GLIB
#include <utils/SystemClock.h>
#include <utils/Log.h>
#endif /* USE_GLIB */
#if defined(USE_GLIB) && !defined(OFF_TARGET) #if defined(USE_GLIB) && !defined(OFF_TARGET)
#include <glib.h> #include <glib.h>
#endif #endif
@ -69,7 +54,6 @@
#endif /* USE_GLIB */ #endif /* USE_GLIB */
#include <string.h> #include <string.h>
#include <loc_eng.h> #include <loc_eng.h>
#include <loc_eng_ni.h> #include <loc_eng_ni.h>
#include <loc_eng_dmn_conn.h> #include <loc_eng_dmn_conn.h>
@ -78,8 +62,7 @@
#include <loc_eng_nmea.h> #include <loc_eng_nmea.h>
#include <msg_q.h> #include <msg_q.h>
#include <loc.h> #include <loc.h>
#include "log_util.h" #include <platform_lib_includes.h>
#include "platform_lib_includes.h"
#include "loc_core_log.h" #include "loc_core_log.h"
#include "loc_eng_log.h" #include "loc_eng_log.h"

1
loc_api/libloc_api_50001/loc_eng.h
View file

@ -54,7 +54,6 @@ typedef unsigned char boolean;
#include <loc_eng_agps.h> #include <loc_eng_agps.h>
#include <loc_cfg.h> #include <loc_cfg.h>
#include <loc_log.h> #include <loc_log.h>
#include <log_util.h>
#include <loc_eng_agps.h> #include <loc_eng_agps.h>
#include <LocEngAdapter.h> #include <LocEngAdapter.h>

3
loc_api/libloc_api_50001/loc_eng_agps.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -32,7 +32,6 @@
#include <loc_eng_agps.h> #include <loc_eng_agps.h>
#include <loc_eng_log.h> #include <loc_eng_log.h>
#include <log_util.h>
#include <platform_lib_includes.h> #include <platform_lib_includes.h>
#include <loc_eng_dmn_conn_handler.h> #include <loc_eng_dmn_conn_handler.h>
#include <loc_eng_dmn_conn.h> #include <loc_eng_dmn_conn.h>

2
loc_api/libloc_api_50001/loc_eng_agps.h
View file

@ -40,7 +40,7 @@
#include <linked_list.h> #include <linked_list.h>
#include <loc_timer.h> #include <loc_timer.h>
#include <LocEngAdapter.h> #include <LocEngAdapter.h>
#include <platform_lib_includes.h>
#if defined(USE_GLIB) && !defined(OFF_TARGET) #if defined(USE_GLIB) && !defined(OFF_TARGET)
#include <glib.h> #include <glib.h>
#endif /* USE_GLIB */ #endif /* USE_GLIB */

5
loc_api/libloc_api_50001/loc_eng_dmn_conn.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -37,8 +37,7 @@
#include <grp.h> #include <grp.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "log_util.h" #include <platform_lib_includes.h>
#include "platform_lib_includes.h"
#include "loc_eng_dmn_conn_glue_msg.h" #include "loc_eng_dmn_conn_glue_msg.h"
#include "loc_eng_dmn_conn_handler.h" #include "loc_eng_dmn_conn_handler.h"
#include "loc_eng_dmn_conn.h" #include "loc_eng_dmn_conn.h"

5
loc_api/libloc_api_50001/loc_eng_dmn_conn_glue_msg.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011, The Linux Foundation. All rights reserved. /* Copyright (c) 2011,2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -31,8 +31,7 @@
#include <linux/types.h> #include <linux/types.h>
#include "log_util.h" #include <platform_lib_includes.h>
#include "platform_lib_includes.h"
#include "loc_eng_dmn_conn_glue_msg.h" #include "loc_eng_dmn_conn_glue_msg.h"
#include "loc_eng_dmn_conn_handler.h" #include "loc_eng_dmn_conn_handler.h"

5
loc_api/libloc_api_50001/loc_eng_dmn_conn_glue_pipe.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -37,8 +37,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "loc_eng_dmn_conn_glue_pipe.h" #include "loc_eng_dmn_conn_glue_pipe.h"
#include "log_util.h" #include <platform_lib_includes.h>
#include "platform_lib_includes.h"
/*=========================================================================== /*===========================================================================
FUNCTION loc_eng_dmn_conn_glue_pipeget FUNCTION loc_eng_dmn_conn_glue_pipeget

5
loc_api/libloc_api_50001/loc_eng_dmn_conn_handler.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -31,8 +31,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "log_util.h" #include <platform_lib_includes.h>
#include "platform_lib_includes.h"
#include "loc_eng_msg.h" #include "loc_eng_msg.h"
#include "loc_eng_dmn_conn.h" #include "loc_eng_dmn_conn.h"
#include "loc_eng_dmn_conn_handler.h" #include "loc_eng_dmn_conn_handler.h"

5
loc_api/libloc_api_50001/loc_eng_dmn_conn_thread_helper.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011, The Linux Foundation. All rights reserved. /* Copyright (c) 2011,2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -28,8 +28,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include "log_util.h" #include <platform_lib_includes.h>
#include "platform_lib_includes.h"
#include "loc_eng_dmn_conn_thread_helper.h" #include "loc_eng_dmn_conn_thread_helper.h"
/*=========================================================================== /*===========================================================================

4
loc_api/libloc_api_50001/loc_eng_msg.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -34,11 +34,11 @@
#include <gps_extended.h> #include <gps_extended.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <log_util.h>
#include <loc_eng_log.h> #include <loc_eng_log.h>
#include <loc_eng.h> #include <loc_eng.h>
#include <MsgTask.h> #include <MsgTask.h>
#include <LocEngAdapter.h> #include <LocEngAdapter.h>
#include <platform_lib_includes.h>
#ifndef SSID_BUF_SIZE #ifndef SSID_BUF_SIZE
#define SSID_BUF_SIZE (32+1) #define SSID_BUF_SIZE (32+1)

3
loc_api/libloc_api_50001/loc_eng_ni.cpp
View file

@ -43,8 +43,7 @@
#include <loc_eng.h> #include <loc_eng.h>
#include "log_util.h" #include <platform_lib_includes.h>
#include "platform_lib_includes.h"
using namespace loc_core; using namespace loc_core;

4
loc_api/libloc_api_50001/loc_eng_nmea.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2012, The Linux Foundation. All rights reserved. /* Copyright (c) 2012,2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -36,7 +36,7 @@
#include <loc_eng.h> #include <loc_eng.h>
#include <loc_eng_nmea.h> #include <loc_eng_nmea.h>
#include <math.h> #include <math.h>
#include "log_util.h" #include <platform_lib_includes.h>
/*=========================================================================== /*===========================================================================
FUNCTION loc_eng_nmea_send FUNCTION loc_eng_nmea_send

5
loc_api/libloc_api_50001/loc_eng_xtra.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2009-2013, The Linux Foundation. All rights reserved. /* Copyright (c) 2009-2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -32,8 +32,7 @@
#include <loc_eng.h> #include <loc_eng.h>
#include <MsgTask.h> #include <MsgTask.h>
#include "log_util.h" #include <platform_lib_includes.h>
#include "platform_lib_includes.h"
using namespace loc_core; using namespace loc_core;

10
platform_lib_abstractions/loc_pla/Makefile.am Normal file
View file

@ -0,0 +1,10 @@
# Makefile.am for gps loc-pla
#
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = loc-pla.pc
EXTRA_DIST = $(pkgconfig_DATA)

61
platform_lib_abstractions/loc_pla/configure.ac Normal file
View file

@ -0,0 +1,61 @@
# configure.ac -- Autoconf script for gps loc-pla
#
# Process this file with autoconf to produce a configure script
# Requires autoconf tool later than 2.61
AC_PREREQ(2.61)
# Initialize the gps loc-pla package version 1.0.0
AC_INIT([loc-pla],1.0.0)
# Does not strictly follow GNU Coding standards
AM_INIT_AUTOMAKE([foreign])
# Disables auto rebuilding of configure, Makefile.ins
AM_MAINTAINER_MODE
# Verifies the --srcdir is correct by checking for the path
AC_CONFIG_SRCDIR([include/platform_lib_includes.h])
# defines some macros variable to be included by source
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CXX
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_AWK
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
PKG_PROG_PKG_CONFIG
# Checks for libraries.
PKG_CHECK_MODULES([LOCSTUB], [loc-stub])
AC_SUBST([LOCSTUB_CFLAGS])
AC_SUBST([LOCSTUB_LIBS])
AC_ARG_WITH([glib],
AC_HELP_STRING([--with-glib],
[enable glib, building HLOS systems which use glib]))
if (test "x${with_glib}" = "xyes"); then
AC_DEFINE(ENABLE_USEGLIB, 1, [Define if HLOS systems uses glib])
PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16, dummy=yes,
AC_MSG_ERROR(GThread >= 2.16 is required))
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
AC_MSG_ERROR(GLib >= 2.16 is required))
GLIB_CFLAGS="$GLIB_CFLAGS $GTHREAD_CFLAGS"
GLIB_LIBS="$GLIB_LIBS $GTHREAD_LIBS"
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
fi
AM_CONDITIONAL(USE_GLIB, test "x${with_glib}" = "xyes")
AC_CONFIG_FILES([ \
Makefile \
src/Makefile \
loc-pla.pc \
])
AC_OUTPUT

45
platform_lib_abstractions/loc_pla/include/platform_lib_android_runtime.h Normal file
View file

@ -0,0 +1,45 @@
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of The Linux Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef __PLATFORM_LIB_ANDROID_RUNTIME_H__
#define __PLATFORM_LIB_ANDROID_RUNTIME_H__
#include <pthread.h>
#ifdef __cplusplus
extern "C" {
#endif
pthread_t platform_lib_abstraction_createJavaThread(const char* name, void (*start)(void *), void* arg);
#define LOC_EXT_CREATE_THREAD_CB_PLATFORM_LIB_ABSTRACTION platform_lib_abstraction_createJavaThread
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /*__PLATFORM_LIB_ANDROID_RUNTIME_H__ */

20
loc_api/fake_property_service.h → platform_lib_abstractions/loc_pla/include/platform_lib_gettid.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013, The Linux Foundation. All rights reserved. /* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -24,22 +24,18 @@
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/ */
#ifndef _FAKE_PROPERTY_SERVICE_H_ #ifndef __PLATFORM_LIB_GETTID_H__
#define _FAKE_PROPERTY_SERVICE_H #define __PLATFORM_LIB_GETTID_H__
#include <sys/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
pid_t platform_lib_abstraction_gettid();
#define PROPERTY_VALUE_MAX 92
int property_get(const char *key, char *value, const char *default_value);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif /* __cplusplus */
#endif /* __PLATFORM_LIB_GETTID_H__ */
#endif

15
platform_lib_abstractions/platform_lib_includes.h → platform_lib_abstractions/loc_pla/include/platform_lib_includes.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013, The Linux Foundation. All rights reserved. /* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -26,10 +26,15 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef _PLATFORM_LIB_INCLUDES_H_ #ifndef __PLATFORM_LIB_INCLUDES_H__
#define _PLATFORM_LIB_INCLUDES_H_ #define __PLATFORM_LIB_INCLUDES_H__
#include "platform_lib_time.h" #include "platform_lib_android_runtime.h"
#include "platform_lib_gettid.h"
#include "platform_lib_log_util.h"
#include "platform_lib_macros.h" #include "platform_lib_macros.h"
#include "platform_lib_property_service.h"
#include "platform_lib_sched_policy.h"
#include "platform_lib_time.h"
#endif #endif /* __PLATFORM_LIB_INCLUDES_H__ */

25
utils/log_util.h → platform_lib_abstractions/loc_pla/include/platform_lib_log_util.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011 The Linux Foundation. All rights reserved. /* Copyright (c) 2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -24,26 +24,27 @@
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/ */
#ifndef __LOG_UTIL_H__ #ifndef __PLATFORM_LIB_LOG_UTIL_H__
#define __LOG_UTIL_H__ #define __PLATFORM_LIB_LOG_UTIL_H__
#include "platform_lib_macros.h"
#ifndef USE_GLIB #ifndef USE_GLIB
#include <utils/Log.h> #include <utils/Log.h>
#endif /* USE_GLIB */ #else
#ifdef USE_GLIB
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#ifndef LOG_TAG #ifndef LOG_TAG
#define LOG_TAG "GPS_UTILS" #define LOG_TAG "GPS_UTILS"
#endif /* LOG_TAG */
#endif // LOG_TAG
#endif /* USE_GLIB */ #endif /* USE_GLIB */
@ -86,8 +87,8 @@ extern const char ENTRY_TAG[];
* MODULE EXPORTED FUNCTIONS * MODULE EXPORTED FUNCTIONS
* *
*============================================================================*/ *============================================================================*/
extern void loc_logger_init(unsigned long debug, unsigned long timestamp); void loc_logger_init(unsigned long debug, unsigned long timestamp);
extern char* get_timestamp(char* str, unsigned long buf_size); char* get_timestamp(char* str, unsigned long buf_size);
#ifndef DEBUG_DMN_LOC_API #ifndef DEBUG_DMN_LOC_API
@ -168,4 +169,4 @@ else if (loc_logger.DEBUG_LEVEL == 0xff) { ALOGV("V/"__VA_ARGS__); }
} }
#endif #endif
#endif // __LOG_UTIL_H__ #endif /* __PLATFORM_LIB_LOG_UTIL_H__ */

43
platform_lib_abstractions/platform_lib_macros.h → platform_lib_abstractions/loc_pla/include/platform_lib_macros.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. /* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -29,14 +29,21 @@
#ifndef __PLATFORM_LIB_MACROS_H__ #ifndef __PLATFORM_LIB_MACROS_H__
#define __PLATFORM_LIB_MACROS_H__ #define __PLATFORM_LIB_MACROS_H__
#include <sys/time.h>
#include <unistd.h>
#include <sys/syscall.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifdef USE_GLIB
#include <sys/time.h>
#ifndef OFF_TARGET
#include <glib.h>
#define strlcat g_strlcat
#define strlcpy g_strlcpy
#else
#define strlcat strncat
#define strlcpy strncpy
#endif
#define TS_PRINTF(format, x...) \ #define TS_PRINTF(format, x...) \
{ \ { \
struct timeval tv; \ struct timeval tv; \
@ -49,38 +56,16 @@ extern "C" {
fprintf(stdout,"%02d:%02d:%02d.%06ld]" format "\n", hh, mm, ss, tv.tv_usec,##x); \ fprintf(stdout,"%02d:%02d:%02d.%06ld]" format "\n", hh, mm, ss, tv.tv_usec,##x); \
} }
#ifdef USE_GLIB
#ifndef OFF_TARGET
#define strlcat g_strlcat
#define strlcpy g_strlcpy
#else
#define strlcat strncat
#define strlcpy strncpy
#endif
#define ALOGE(format, x...) TS_PRINTF("E/%s (%d): " format , LOG_TAG, getpid(), ##x) #define ALOGE(format, x...) TS_PRINTF("E/%s (%d): " format , LOG_TAG, getpid(), ##x)
#define ALOGW(format, x...) TS_PRINTF("W/%s (%d): " format , LOG_TAG, getpid(), ##x) #define ALOGW(format, x...) TS_PRINTF("W/%s (%d): " format , LOG_TAG, getpid(), ##x)
#define ALOGI(format, x...) TS_PRINTF("I/%s (%d): " format , LOG_TAG, getpid(), ##x) #define ALOGI(format, x...) TS_PRINTF("I/%s (%d): " format , LOG_TAG, getpid(), ##x)
#define ALOGD(format, x...) TS_PRINTF("D/%s (%d): " format , LOG_TAG, getpid(), ##x) #define ALOGD(format, x...) TS_PRINTF("D/%s (%d): " format , LOG_TAG, getpid(), ##x)
#define ALOGV(format, x...) TS_PRINTF("V/%s (%d): " format , LOG_TAG, getpid(), ##x) #define ALOGV(format, x...) TS_PRINTF("V/%s (%d): " format , LOG_TAG, getpid(), ##x)
#define GETTID_PLATFORM_LIB_ABSTRACTION (syscall(SYS_gettid)) #endif /* USE_GLIB */
#define LOC_EXT_CREATE_THREAD_CB_PLATFORM_LIB_ABSTRACTION createPthread
#define ELAPSED_MILLIS_SINCE_BOOT_PLATFORM_LIB_ABSTRACTION (elapsedMillisSinceBoot())
#else
pid_t gettid(void);
#define GETTID_PLATFORM_LIB_ABSTRACTION (gettid())
#define LOC_EXT_CREATE_THREAD_CB_PLATFORM_LIB_ABSTRACTION android::AndroidRuntime::createJavaThread
#define ELAPSED_MILLIS_SINCE_BOOT_PLATFORM_LIB_ABSTRACTION (android::elapsedRealtime())
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /*__cplusplus */ #endif /*__cplusplus */
#endif #endif /* __PLATFORM_LIB_MACROS_H__ */

43
platform_lib_abstractions/loc_pla/include/platform_lib_property_service.h Normal file
View file

@ -0,0 +1,43 @@
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of The Linux Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef __PLATFORM_LIB_PROPERTY_SERVICE_H__
#define __PLATFORM_LIB_PROPERTY_SERVICE_H__
#ifdef __cplusplus
extern "C" {
#endif
#define PROPERTY_VALUE_MAX 92
int platform_lib_abstraction_property_get(const char *key, char *value, const char *default_value);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __PLATFORM_LIB_PROPERTY_SERVICE_H__ */

37
core/fake_sched_policy.h → platform_lib_abstractions/loc_pla/include/platform_lib_sched_policy.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. /* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -24,42 +24,23 @@
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/ */
#ifndef _FAKE_SCHED_POLICY_H #ifndef __PLATFORM_LIB_SCHED_POLICY_H__
#define _FAKE_SCHED_POLICY_H #define __PLATFORM_LIB_SCHED_POLICY_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef enum { typedef enum {
SP_BACKGROUND = 0, PLA_SP_BACKGROUND = 0,
SP_FOREGROUND = 1, PLA_SP_FOREGROUND = 1,
} SchedPolicy; } PLASchedPolicy;
/*===========================================================================
FUNCTION set_sched_policy
DESCRIPTION
Local copy of this function which bypasses android set_sched_policy
DEPENDENCIES
None
RETURN VALUE
0
SIDE EFFECTS
N/A
===========================================================================*/
int set_sched_policy(int tid, SchedPolicy policy);
int platform_lib_abstraction_set_sched_policy(int tid, PLASchedPolicy policy);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif /* __cplusplus */
#endif // _FAKE_SCHED_POLICY_H #endif /* __PLATFORM_LIB_SCHED_POLICY_H__ */

21
platform_lib_abstractions/platform_lib_time.h → platform_lib_abstractions/loc_pla/include/platform_lib_time.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. /* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -26,20 +26,11 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef _PLATFORM_LIB_TIME_H_ #ifndef __PLATFORM_LIB_TIME_H__
#define _PLATFORM_LIB_TIME_H_ #define __PLATFORM_LIB_TIME_H__
#include <sys/time.h> #include <stdint.h>
#ifdef __cplusplus int64_t platform_lib_abstraction_elapsed_millis_since_boot();
extern "C" {
#endif
int64_t systemTime(int clock); #endif /* __PLATFORM_LIB_TIME_H__ */
int64_t elapsedMillisSinceBoot();
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif

10
platform_lib_abstractions/loc_pla/loc-pla.pc.in Normal file
View file

@ -0,0 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: loc-pla
Description: QTI GPS Location Platform Library Abstractions
Version: @VERSION@
Libs: -L${libdir} -lloc_pla
Cflags: -I${includedir}/loc-pla

40
platform_lib_abstractions/loc_pla/src/Makefile.am Normal file
View file

@ -0,0 +1,40 @@
AM_CFLAGS = \
$(LOCSTUB_CFLAGS) \
-I../include \
-fno-short-enums
h_sources = \
../include/platform_lib_android_runtime.h \
../include/platform_lib_gettid.h \
../include/platform_lib_includes.h \
../include/platform_lib_log_util.h \
../include/platform_lib_macros.h \
../include/platform_lib_property_service.h \
../include/platform_lib_sched_policy.h \
../include/platform_lib_time.h
library_includedir = $(pkgincludedir)
library_include_HEADERS = $(h_sources)
libloc_pla_la_SOURCES = \
platform_lib_android_runtime.cpp \
platform_lib_gettid.cpp \
platform_lib_log_util.cpp \
platform_lib_property_service.cpp \
platform_lib_sched_policy.cpp \
platform_lib_time.cpp
if USE_GLIB
libloc_pla_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
libloc_pla_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
libloc_pla_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
else
libloc_pla_la_CFLAGS = $(AM_CFLAGS)
libloc_pla_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
libloc_pla_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
endif
libloc_pla_la_LIBADD = -lstdc++ -ldl -llog $(LOCSTUB_LIBS)
#Create and Install libraries
lib_LTLIBRARIES = libloc_pla.la

40
platform_lib_abstractions/loc_pla/src/platform_lib_android_runtime.cpp Normal file
View file

@ -0,0 +1,40 @@
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of The Linux Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "platform_lib_android_runtime.h"
#ifdef USE_GLIB
#include <loc_stub_android_runtime.h>
#else
#include <android/AndroidRuntime.h>
#endif /* USE_GLIB */
pthread_t platform_lib_abstraction_createJavaThread(const char* name, void (*start)(void *), void* arg)
{
return android::AndroidRuntime::createJavaThread(name, start, arg);
}

23
loc_api/fake_property_service.c → platform_lib_abstractions/loc_pla/src/platform_lib_gettid.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. /* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -24,22 +24,17 @@
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/ */
#include <stdio.h> #include "platform_lib_gettid.h"
#ifdef USE_GLIB #ifdef USE_GLIB
#include <string.h> #include <loc_stub_gettid.h>
#endif #else
#include <unistd.h>
#endif /* USE_GLIB */
int property_get(const char *key, char * value, const char *default_value) pid_t platform_lib_abstraction_gettid()
{ {
/* This will disable gps interface return gettid();
value[0] = '1';
*/
if (strcmp(key, "ro.baseband") == 0) {
memcpy(value, "msm", 4);
} }
return 0;
}

48
platform_lib_abstractions/loc_pla/src/platform_lib_log_util.cpp Normal file
View file

@ -0,0 +1,48 @@
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of The Linux Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "platform_lib_log_util.h"
void loc_logger_init(unsigned long debug, unsigned long timestamp)
{
loc_logger.DEBUG_LEVEL = debug;
loc_logger.TIMESTAMP = timestamp;
}
char * get_timestamp(char *str, unsigned long buf_size)
{
struct timeval tv;
struct timezone tz;
int hh, mm, ss;
gettimeofday(&tv, &tz);
hh = tv.tv_sec/3600%24;
mm = (tv.tv_sec%3600)/60;
ss = tv.tv_sec%60;
snprintf(str, buf_size, "%02d:%02d:%02d.%06ld", hh, mm, ss, tv.tv_usec);
return str;
}

39
platform_lib_abstractions/loc_pla/src/platform_lib_property_service.cpp Normal file
View file

@ -0,0 +1,39 @@
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of The Linux Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "platform_lib_property_service.h"
#ifdef USE_GLIB
#include <loc_stub_property_service.h>
#else
#include <cutils/properties.h>
#endif /* USE_GLIB */
int platform_lib_abstraction_property_get(const char *key, char *value, const char *default_value)
{
return property_get(key, value, default_value);
}

30
core/fake_sched_policy.c → platform_lib_abstractions/loc_pla/src/platform_lib_sched_policy.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. /* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -24,28 +24,18 @@
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/ */
#include "fake_sched_policy.h" #include "platform_lib_sched_policy.h"
/*=========================================================================== #ifdef USE_GLIB
FUNCTION set_sched_policy #include <loc_stub_sched_policy.h>
#else
#include <cutils/sched_policy.h>
#endif /* USE_GLIB */
DESCRIPTION int platform_lib_abstraction_set_sched_policy(int tid, PLASchedPolicy policy)
Local copy of this function which bypasses android set_sched_policy
DEPENDENCIES
None
RETURN VALUE
0
SIDE EFFECTS
N/A
===========================================================================*/
int set_sched_policy(int tid, SchedPolicy policy)
{ {
return 0; return set_sched_policy(tid, (SchedPolicy)policy);
} }

35
platform_lib_abstractions/platform_lib_time.cpp → platform_lib_abstractions/loc_pla/src/platform_lib_time.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013, The Linux Foundation. All rights reserved. /* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -25,24 +25,23 @@
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <stdlib.h>
#include <sys/time.h>
#include "platform_lib_time.h" #include "platform_lib_time.h"
int64_t systemTime(int clock) #ifdef USE_GLIB
#include <loc_stub_time.h>
#else
#include <utils/SystemClock.h>
#endif /* USE_GLIB */
int64_t platform_lib_abstraction_elapsed_millis_since_boot()
{ {
struct timeval t; #ifdef USE_GLIB
t.tv_sec = t.tv_usec = 0;
gettimeofday(&t, NULL); return elapsedMillisSinceBoot();
return t.tv_sec*1000000LL + t.tv_usec;
#else
return android::elapsedRealtime();
#endif
} }
int64_t elapsedMillisSinceBoot()
{
int64_t t_us = systemTime(0);
return (int64_t) t_us / 1000LL;
}

13
utils/Makefile.am
View file

@ -6,19 +6,15 @@ AM_CFLAGS = -Wundef \
-fno-short-enums \ -fno-short-enums \
-fpic \ -fpic \
-I./ \ -I./ \
-I../platform_lib_abstractions $(LOCPLA_CFLAGS)
libgps_utils_so_la_h_sources = \ libgps_utils_so_la_h_sources = \
log_util.h \
msg_q.h \ msg_q.h \
linked_list.h \ linked_list.h \
loc_cfg.h \ loc_cfg.h \
loc_log.h \ loc_log.h \
loc_target.h \ loc_target.h \
loc_timer.h \ loc_timer.h
../platform_lib_abstractions/platform_lib_includes.h \
../platform_lib_abstractions/platform_lib_time.h \
../platform_lib_abstractions/platform_lib_macros.h
libgps_utils_so_la_c_sources = \ libgps_utils_so_la_c_sources = \
linked_list.c \ linked_list.c \
@ -26,8 +22,7 @@ libgps_utils_so_la_c_sources = \
loc_cfg.cpp \ loc_cfg.cpp \
loc_log.cpp \ loc_log.cpp \
loc_timer.c \ loc_timer.c \
loc_target.cpp \ loc_target.cpp
../platform_lib_abstractions/platform_lib_time.cpp
library_includedir = $(pkgincludedir)/utils library_includedir = $(pkgincludedir)/utils
@ -45,7 +40,7 @@ libgps_utils_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
libgps_utils_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) libgps_utils_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
endif endif
libgps_utils_so_la_LIBADD = -lstdc++ -llog libgps_utils_so_la_LIBADD = -lstdc++ -llog $(LOCPLA_LIBS)
#Create and Install libraries #Create and Install libraries
lib_LTLIBRARIES = libgps_utils_so.la lib_LTLIBRARIES = libgps_utils_so.la

5
utils/linked_list.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011, The Linux Foundation. All rights reserved. /* Copyright (c) 2011,2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -31,8 +31,7 @@
#include <string.h> #include <string.h>
#define LOG_TAG "LocSvc_utils_ll" #define LOG_TAG "LocSvc_utils_ll"
#include "log_util.h" #include <platform_lib_includes.h>
#include "platform_lib_includes.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>

4
utils/loc_cfg.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -38,7 +38,7 @@
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
#include <loc_cfg.h> #include <loc_cfg.h>
#include <log_util.h> #include <platform_lib_includes.h>
#if defined(USE_GLIB) && !defined(OFF_TARGET) #if defined(USE_GLIB) && !defined(OFF_TARGET)
#include <glib.h> #include <glib.h>
#endif #endif

60
utils/loc_log.cpp
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -34,11 +34,7 @@
#include <sys/time.h> #include <sys/time.h>
#include "loc_log.h" #include "loc_log.h"
#include "msg_q.h" #include "msg_q.h"
#ifdef USE_GLIB #include <platform_lib_includes.h>
#include <time.h>
#endif /* USE_GLIB */
#include "log_util.h"
#include "platform_lib_includes.h"
#define BUFFER_SIZE 120 #define BUFFER_SIZE 120
@ -180,55 +176,3 @@ char *loc_get_time(char *time_string, unsigned long buf_size)
return time_string; return time_string;
} }
/*===========================================================================
FUNCTION loc_logger_init
DESCRIPTION
Initializes the state of DEBUG_LEVEL and TIMESTAMP
DEPENDENCIES
N/A
RETURN VALUE
None
SIDE EFFECTS
N/A
===========================================================================*/
void loc_logger_init(unsigned long debug, unsigned long timestamp)
{
loc_logger.DEBUG_LEVEL = debug;
loc_logger.TIMESTAMP = timestamp;
}
/*===========================================================================
FUNCTION get_timestamp
DESCRIPTION
Generates a timestamp using the current system time
DEPENDENCIES
N/A
RETURN VALUE
Char pointer to the parameter str
SIDE EFFECTS
N/A
===========================================================================*/
char * get_timestamp(char *str, unsigned long buf_size)
{
struct timeval tv;
struct timezone tz;
int hh, mm, ss;
gettimeofday(&tv, &tz);
hh = tv.tv_sec/3600%24;
mm = (tv.tv_sec%3600)/60;
ss = tv.tv_sec%60;
snprintf(str, buf_size, "%02d:%02d:%02d.%06ld", hh, mm, ss, tv.tv_usec);
return str;
}

5
utils/loc_target.cpp
View file

@ -38,7 +38,6 @@
#include <cutils/properties.h> #include <cutils/properties.h>
#include "loc_target.h" #include "loc_target.h"
#include "loc_log.h" #include "loc_log.h"
#include "log_util.h"
#include <platform_lib_includes.h> #include <platform_lib_includes.h>
#define APQ8064_ID_1 "109" #define APQ8064_ID_1 "109"
@ -109,7 +108,7 @@ static bool is_qca1530(void)
for (i = 0; i < QCA1530_DETECT_TIMEOUT; ++i) for (i = 0; i < QCA1530_DETECT_TIMEOUT; ++i)
{ {
ret = property_get(qca1530_property_name, buf, NULL); ret = platform_lib_abstraction_property_get(qca1530_property_name, buf, NULL);
if (ret < 0) if (ret < 0)
{ {
LOC_LOGV( "qca1530: property %s is not accessible, ret=%d", LOC_LOGV( "qca1530: property %s is not accessible, ret=%d",
@ -165,7 +164,7 @@ unsigned int loc_get_target(void)
goto detected; goto detected;
} }
property_get("ro.baseband", baseband, ""); platform_lib_abstraction_property_get("ro.baseband", baseband, "");
if (!access(hw_platform, F_OK)) { if (!access(hw_platform, F_OK)) {
read_a_line(hw_platform, rd_hw_platform, LINE_LEN); read_a_line(hw_platform, rd_hw_platform, LINE_LEN);
} else { } else {

4
utils/loc_timer.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013, The Linux Foundation. All rights reserved. /* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -34,7 +34,7 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include<pthread.h> #include<pthread.h>
#include "log_util.h" #include <platform_lib_log_util.h>
/* /*
Return values: Return values:

5
utils/msg_q.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are * modification, are permitted provided that the following conditions are
@ -29,8 +29,7 @@
#include "msg_q.h" #include "msg_q.h"
#define LOG_TAG "LocSvc_utils_q" #define LOG_TAG "LocSvc_utils_q"
#include "log_util.h" #include <platform_lib_includes.h>
#include "platform_lib_includes.h"
#include "linked_list.h" #include "linked_list.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>