loc_api: rearrange RPC glue to allow having multiple versions of the API.
The API version can be chosen by specifying the AMSS version in the board config
by setting the BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION variable.
The existing GPS_LOC_API_HARDWARE has been renamed BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE
Change-Id: I25aa313d7f291b874d52dfb7edf151e280061438
Signed-off-by: Mike Lockwood <lockwood@android.com>
diff --git a/loc_api/Android.mk b/loc_api/Android.mk
index 293b2da..52942bf 100755
--- a/loc_api/Android.mk
+++ b/loc_api/Android.mk
@@ -6,6 +6,6 @@
# · Neither the name of the QUALCOMM USA, INC. 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
-ifneq ($(GPS_LOC_API_HARDWARE),)
+ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
include $(call all-subdir-makefiles)
endif
diff --git a/loc_api/libloc_api-rpc/Android.mk b/loc_api/libloc_api-rpc/Android.mk
index f5d4008..dc4d53d 100755
--- a/loc_api/libloc_api-rpc/Android.mk
+++ b/loc_api/libloc_api-rpc/Android.mk
@@ -11,9 +11,8 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-RPC_INC:=rpc_inc
-
-AMSS_VERSION:=6356
+AMSS_VERSION:=$(BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION)
+RPC_INC:=inc-$(AMSS_VERSION)
generated_files:= \
gen-$(AMSS_VERSION)/loc_api_clnt.c \
@@ -21,8 +20,8 @@
gen-$(AMSS_VERSION)/loc_api_common_xdr.c \
gen-$(AMSS_VERSION)/loc_api_cb_svc.c \
gen-$(AMSS_VERSION)/loc_api_xdr.c \
- gen-$(AMSS_VERSION)/loc_api_fixup.c \
- src/loc_api_rpc_glue.c \
+ gen-$(AMSS_VERSION)/loc_api_fixup.c \
+ gen-$(AMSS_VERSION)/loc_api_rpc_glue.c \
src/loc_apicb_appinit.c
LOCAL_SRC_FILES:= $(generated_files)
@@ -31,7 +30,6 @@
# src/loc_api_cb_server.c
LOCAL_CFLAGS:=-fno-short-enums
-# LOCAL_CFLAGS+=-include $(RPC_INC)/commondefs.h
LOCAL_CFLAGS+=-include $(RPC_INC)/loc_api_common.h
LOCAL_CFLAGS+=-DDEBUG
# LOCAL_CFLAGS+=-DDEBUG -DVERBOSE
@@ -43,18 +41,19 @@
LOCAL_PRELINK_MODULE:= false
-LOCAL_COPY_HEADERS_TO:= libloc_api-rpc/$(RPC_INC)
+LOCAL_COPY_HEADERS_TO:= libloc_api-rpc/inc
LOCAL_COPY_HEADERS:= \
- $(RPC_INC)/debug.h \
$(RPC_INC)/loc_api_cb.h \
$(RPC_INC)/loc_api_common.h \
$(RPC_INC)/loc_api.h \
$(RPC_INC)/loc_api_fixup.h \
- $(RPC_INC)/loc_api_rpc_glue.h \
- $(RPC_INC)/loc_apicb_appinit.h
+ $(RPC_INC)/loc_apicb_appinit.h \
+ inc/debug.h \
+ inc/loc_api_rpc_glue.h
LOCAL_C_INCLUDES:= \
$(LOCAL_PATH) \
+ $(LOCAL_PATH)/inc \
$(LOCAL_PATH)/$(RPC_INC) \
$(TARGET_OUT_HEADERS)/libcommondefs-rpc \
$(TARGET_OUT_HEADERS)/librpc
diff --git a/loc_api/libloc_api-rpc/gen-6356/Makefile.xdr b/loc_api/libloc_api-rpc/gen-3200/Makefile.xdr
similarity index 96%
rename from loc_api/libloc_api-rpc/gen-6356/Makefile.xdr
rename to loc_api/libloc_api-rpc/gen-3200/Makefile.xdr
index e6e863f..60f730c 100755
--- a/loc_api/libloc_api-rpc/gen-6356/Makefile.xdr
+++ b/loc_api/libloc_api-rpc/gen-3200/Makefile.xdr
@@ -10,7 +10,7 @@
CLIENTS:= loc_api
SERVERS:= loc_api_cb
COMMON:= loc_api_common
-RPC_INC:=rpc_inc
+RPC_INC:= inc-$(AMSS_VERSION)
all: $(CLIENTS) $(SERVERS) $(COMMON) fixup
@@ -28,7 +28,7 @@
fixup:
mv ../$(RPC_INC)/loc_api_common.h ../$(RPC_INC)/loc_api_common.h.bak
- sed ../$(RPC_INC)/loc_api_common.h.bak -e "/#include <rpc/a#include \"$(RPC_INC)/loc_api_fixup.h\"" > ../$(RPC_INC)/loc_api_common.h
+ sed ../$(RPC_INC)/loc_api_common.h.bak -e "/#include <rpc/a#include \"loc_api_fixup.h\"" > ../$(RPC_INC)/loc_api_common.h
rm -f ../$(RPC_INC)/loc_api_common.h.bak
clean:
diff --git a/loc_api/libloc_api-rpc/gen-6356/loc_api.xdr b/loc_api/libloc_api-rpc/gen-3200/loc_api.xdr
similarity index 100%
rename from loc_api/libloc_api-rpc/gen-6356/loc_api.xdr
rename to loc_api/libloc_api-rpc/gen-3200/loc_api.xdr
diff --git a/loc_api/libloc_api-rpc/gen-6356/loc_api_cb.xdr b/loc_api/libloc_api-rpc/gen-3200/loc_api_cb.xdr
similarity index 100%
rename from loc_api/libloc_api-rpc/gen-6356/loc_api_cb.xdr
rename to loc_api/libloc_api-rpc/gen-3200/loc_api_cb.xdr
diff --git a/loc_api/libloc_api-rpc/gen-3200/loc_api_cb_svc.c b/loc_api/libloc_api-rpc/gen-3200/loc_api_cb_svc.c
new file mode 100644
index 0000000..b1aa199
--- /dev/null
+++ b/loc_api/libloc_api-rpc/gen-3200/loc_api_cb_svc.c
@@ -0,0 +1,64 @@
+/*
+ * Please do not edit this file.
+ * It was generated using rpcgen.
+ */
+
+#include "loc_api_cb.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <rpc/pmap_clnt.h>
+#include <string.h>
+#include <memory.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#ifndef SIG_PF
+#define SIG_PF void(*)(int)
+#endif
+
+void
+loc_apicbprog_0x00010001(struct svc_req *rqstp, register SVCXPRT *transp)
+{
+ union {
+ rpc_loc_event_cb_f_type_args rpc_loc_event_cb_f_type_0x00010001_arg;
+ } argument;
+ union {
+ rpc_loc_event_cb_f_type_rets rpc_loc_event_cb_f_type_0x00010001_res;
+ } result;
+ bool_t retval;
+ xdrproc_t _xdr_argument, _xdr_result;
+ bool_t (*local)(char *, void *, struct svc_req *);
+
+ switch (rqstp->rq_proc) {
+ case NULLPROC:
+ (void) svc_sendreply (transp, (xdrproc_t) xdr_void, (char *)NULL);
+ return;
+
+ case rpc_loc_event_cb_f_type:
+ _xdr_argument = (xdrproc_t) xdr_rpc_loc_event_cb_f_type_args;
+ _xdr_result = (xdrproc_t) xdr_rpc_loc_event_cb_f_type_rets;
+ local = (bool_t (*) (char *, void *, struct svc_req *))rpc_loc_event_cb_f_type_0x00010001_svc;
+ break;
+
+ default:
+ svcerr_noproc (transp);
+ return;
+ }
+ memset ((char *)&argument, 0, sizeof (argument));
+ if (!svc_getargs (transp, (xdrproc_t) _xdr_argument, (caddr_t) &argument)) {
+ svcerr_decode (transp);
+ return;
+ }
+ retval = (bool_t) (*local)((char *)&argument, (void *)&result, rqstp);
+ if (retval > 0 && !svc_sendreply(transp, (xdrproc_t) _xdr_result, (char *)&result)) {
+ svcerr_systemerr (transp);
+ }
+ if (!svc_freeargs (transp, (xdrproc_t) _xdr_argument, (caddr_t) &argument)) {
+ fprintf (stderr, "%s", "unable to free arguments");
+ exit (1);
+ }
+ if (!loc_apicbprog_0x00010001_freeresult (transp, _xdr_result, (caddr_t) &result))
+ fprintf (stderr, "%s", "unable to free results");
+
+ return;
+}
diff --git a/loc_api/libloc_api-rpc/gen-3200/loc_api_cb_xdr.c b/loc_api/libloc_api-rpc/gen-3200/loc_api_cb_xdr.c
new file mode 100644
index 0000000..1d7795e
--- /dev/null
+++ b/loc_api/libloc_api-rpc/gen-3200/loc_api_cb_xdr.c
@@ -0,0 +1,32 @@
+/*
+ * Please do not edit this file.
+ * It was generated using rpcgen.
+ */
+
+#include "loc_api_cb.h"
+
+bool_t
+xdr_rpc_loc_event_cb_f_type_args (XDR *xdrs, rpc_loc_event_cb_f_type_args *objp)
+{
+ register int32_t *buf;
+
+ if (!xdr_rpc_uint32 (xdrs, &objp->cb_id))
+ return FALSE;
+ if (!xdr_rpc_loc_client_handle_type (xdrs, &objp->loc_handle))
+ return FALSE;
+ if (!xdr_rpc_loc_event_mask_type (xdrs, &objp->loc_event))
+ return FALSE;
+ if (!xdr_pointer (xdrs, (char **)&objp->loc_event_payload, sizeof (rpc_loc_event_payload_u_type), (xdrproc_t) xdr_rpc_loc_event_payload_u_type))
+ return FALSE;
+ return TRUE;
+}
+
+bool_t
+xdr_rpc_loc_event_cb_f_type_rets (XDR *xdrs, rpc_loc_event_cb_f_type_rets *objp)
+{
+ register int32_t *buf;
+
+ if (!xdr_rpc_int32 (xdrs, &objp->loc_event_cb_f_type_result))
+ return FALSE;
+ return TRUE;
+}
diff --git a/loc_api/libloc_api-rpc/gen-6356/loc_api_clnt.c b/loc_api/libloc_api-rpc/gen-3200/loc_api_clnt.c
old mode 100755
new mode 100644
similarity index 62%
rename from loc_api/libloc_api-rpc/gen-6356/loc_api_clnt.c
rename to loc_api/libloc_api-rpc/gen-3200/loc_api_clnt.c
index 886e5e5..79814d4
--- a/loc_api/libloc_api-rpc/gen-6356/loc_api_clnt.c
+++ b/loc_api/libloc_api-rpc/gen-3200/loc_api_clnt.c
@@ -1,20 +1,3 @@
-/*
-Copyright (c) 2009, QUALCOMM USA, INC.
-
-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 QUALCOMM USA, INC. 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
-
- */
-
/*
* Please do not edit this file.
* It was generated using rpcgen.
diff --git a/loc_api/libloc_api-rpc/gen-6356/loc_api_common.xdr b/loc_api/libloc_api-rpc/gen-3200/loc_api_common.xdr
similarity index 100%
rename from loc_api/libloc_api-rpc/gen-6356/loc_api_common.xdr
rename to loc_api/libloc_api-rpc/gen-3200/loc_api_common.xdr
diff --git a/loc_api/libloc_api-rpc/gen-6356/loc_api_common_xdr.c b/loc_api/libloc_api-rpc/gen-3200/loc_api_common_xdr.c
old mode 100755
new mode 100644
similarity index 95%
rename from loc_api/libloc_api-rpc/gen-6356/loc_api_common_xdr.c
rename to loc_api/libloc_api-rpc/gen-3200/loc_api_common_xdr.c
index a68d94f..7b37b9c
--- a/loc_api/libloc_api-rpc/gen-6356/loc_api_common_xdr.c
+++ b/loc_api/libloc_api-rpc/gen-3200/loc_api_common_xdr.c
@@ -1,20 +1,3 @@
-/*
-Copyright (c) 2009, QUALCOMM USA, INC.
-
-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 QUALCOMM USA, INC. 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
-
- */
-
/*
* Please do not edit this file.
* It was generated using rpcgen.
diff --git a/loc_api/libloc_api-rpc/gen-6356/loc_api_fixup.c b/loc_api/libloc_api-rpc/gen-3200/loc_api_fixup.c
similarity index 100%
rename from loc_api/libloc_api-rpc/gen-6356/loc_api_fixup.c
rename to loc_api/libloc_api-rpc/gen-3200/loc_api_fixup.c
diff --git a/loc_api/libloc_api-rpc/src/loc_api_rpc_glue.c b/loc_api/libloc_api-rpc/gen-3200/loc_api_rpc_glue.c
similarity index 99%
rename from loc_api/libloc_api-rpc/src/loc_api_rpc_glue.c
rename to loc_api/libloc_api-rpc/gen-3200/loc_api_rpc_glue.c
index 930ff1c..8c17122 100755
--- a/loc_api/libloc_api-rpc/src/loc_api_rpc_glue.c
+++ b/loc_api/libloc_api-rpc/gen-3200/loc_api_rpc_glue.c
@@ -57,10 +57,10 @@
#include <rpc/clnt.h>
/* Include RPC headers */
-#include "rpc_inc/loc_api_rpc_glue.h"
+#include "loc_api_rpc_glue.h"
/* Callback init */
-#include "rpc_inc/loc_apicb_appinit.h"
+#include "loc_apicb_appinit.h"
/* Logging */
#define LOG_TAG "lib_api_rpc_glue"
diff --git a/loc_api/libloc_api-rpc/gen-6356/loc_api_xdr.c b/loc_api/libloc_api-rpc/gen-3200/loc_api_xdr.c
old mode 100755
new mode 100644
similarity index 71%
rename from loc_api/libloc_api-rpc/gen-6356/loc_api_xdr.c
rename to loc_api/libloc_api-rpc/gen-3200/loc_api_xdr.c
index 7e6a3e1..835f6b1
--- a/loc_api/libloc_api-rpc/gen-6356/loc_api_xdr.c
+++ b/loc_api/libloc_api-rpc/gen-3200/loc_api_xdr.c
@@ -1,20 +1,3 @@
-/*
-Copyright (c) 2009, QUALCOMM USA, INC.
-
-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 QUALCOMM USA, INC. 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
-
- */
-
/*
* Please do not edit this file.
* It was generated using rpcgen.
diff --git a/loc_api/libloc_api-rpc/gen-6356/loc_api_cb_svc.c b/loc_api/libloc_api-rpc/gen-6356/loc_api_cb_svc.c
deleted file mode 100755
index 3b94e62..0000000
--- a/loc_api/libloc_api-rpc/gen-6356/loc_api_cb_svc.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright (c) 2009, QUALCOMM USA, INC.
-
-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 QUALCOMM USA, INC. 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
-
- */
-
- /*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "loc_api_cb.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <rpc/pmap_clnt.h>
-#include <string.h>
-#include <memory.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#ifndef SIG_PF
-#define SIG_PF void(*)(int)
-#endif
-
-void
-loc_apicbprog_0x00010001(struct svc_req *rqstp, register SVCXPRT *transp)
-{
- union {
- rpc_loc_event_cb_f_type_args rpc_loc_event_cb_f_type_0x00010001_arg;
- } argument;
- union {
- rpc_loc_event_cb_f_type_rets rpc_loc_event_cb_f_type_0x00010001_res;
- } result;
- bool_t retval;
- xdrproc_t _xdr_argument, _xdr_result;
- bool_t (*local)(char *, void *, struct svc_req *);
-
- switch (rqstp->rq_proc) {
- case NULLPROC:
- (void) svc_sendreply (transp, (xdrproc_t) xdr_void, (char *)NULL);
- return;
-
- case rpc_loc_event_cb_f_type:
- _xdr_argument = (xdrproc_t) xdr_rpc_loc_event_cb_f_type_args;
- _xdr_result = (xdrproc_t) xdr_rpc_loc_event_cb_f_type_rets;
- local = (bool_t (*) (char *, void *, struct svc_req *))rpc_loc_event_cb_f_type_0x00010001_svc;
- break;
-
- default:
- svcerr_noproc (transp);
- return;
- }
- memset ((char *)&argument, 0, sizeof (argument));
- if (!svc_getargs (transp, (xdrproc_t) _xdr_argument, (caddr_t) &argument)) {
- svcerr_decode (transp);
- return;
- }
- retval = (bool_t) (*local)((char *)&argument, (void *)&result, rqstp);
- if (retval > 0 && !svc_sendreply(transp, (xdrproc_t) _xdr_result, (char *)&result)) {
- svcerr_systemerr (transp);
- }
- if (!svc_freeargs (transp, (xdrproc_t) _xdr_argument, (caddr_t) &argument)) {
- fprintf (stderr, "%s", "unable to free arguments");
- exit (1);
- }
- if (!loc_apicbprog_0x00010001_freeresult (transp, _xdr_result, (caddr_t) &result))
- fprintf (stderr, "%s", "unable to free results");
-
- return;
-}
diff --git a/loc_api/libloc_api-rpc/gen-6356/loc_api_cb_xdr.c b/loc_api/libloc_api-rpc/gen-6356/loc_api_cb_xdr.c
deleted file mode 100755
index 51bb47f..0000000
--- a/loc_api/libloc_api-rpc/gen-6356/loc_api_cb_xdr.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright (c) 2009, QUALCOMM USA, INC.
-
-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 QUALCOMM USA, INC. 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
-
- */
-
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "loc_api_cb.h"
-
-bool_t
-xdr_rpc_loc_event_cb_f_type_args (XDR *xdrs, rpc_loc_event_cb_f_type_args *objp)
-{
- register int32_t *buf;
-
- if (!xdr_rpc_uint32 (xdrs, &objp->cb_id))
- return FALSE;
- if (!xdr_rpc_loc_client_handle_type (xdrs, &objp->loc_handle))
- return FALSE;
- if (!xdr_rpc_loc_event_mask_type (xdrs, &objp->loc_event))
- return FALSE;
- if (!xdr_pointer (xdrs, (char **)&objp->loc_event_payload, sizeof (rpc_loc_event_payload_u_type), (xdrproc_t) xdr_rpc_loc_event_payload_u_type))
- return FALSE;
- return TRUE;
-}
-
-bool_t
-xdr_rpc_loc_event_cb_f_type_rets (XDR *xdrs, rpc_loc_event_cb_f_type_rets *objp)
-{
- register int32_t *buf;
-
- if (!xdr_rpc_int32 (xdrs, &objp->loc_event_cb_f_type_result))
- return FALSE;
- return TRUE;
-}
diff --git a/loc_api/libloc_api-rpc/rpc_inc/loc_api.h b/loc_api/libloc_api-rpc/inc-3200/loc_api.h
old mode 100755
new mode 100644
similarity index 83%
rename from loc_api/libloc_api-rpc/rpc_inc/loc_api.h
rename to loc_api/libloc_api-rpc/inc-3200/loc_api.h
index 95f9be5..8998aca
--- a/loc_api/libloc_api-rpc/rpc_inc/loc_api.h
+++ b/loc_api/libloc_api-rpc/inc-3200/loc_api.h
@@ -1,20 +1,4 @@
-/*
-Copyright (c) 2009, QUALCOMM USA, INC.
-
-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 QUALCOMM USA, INC. 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
-
- */
- /*
+/*
* Please do not edit this file.
* It was generated using rpcgen.
*/
diff --git a/loc_api/libloc_api-rpc/inc-3200/loc_api_cb.h b/loc_api/libloc_api-rpc/inc-3200/loc_api_cb.h
new file mode 100644
index 0000000..4f2f8f9
--- /dev/null
+++ b/loc_api/libloc_api-rpc/inc-3200/loc_api_cb.h
@@ -0,0 +1,64 @@
+/*
+ * Please do not edit this file.
+ * It was generated using rpcgen.
+ */
+
+#ifndef _LOC_API_CB_H_RPCGEN
+#define _LOC_API_CB_H_RPCGEN
+
+#include <rpc/rpc.h>
+
+#include <pthread.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+struct rpc_loc_event_cb_f_type_args {
+ rpc_uint32 cb_id;
+ rpc_loc_client_handle_type loc_handle;
+ rpc_loc_event_mask_type loc_event;
+ rpc_loc_event_payload_u_type *loc_event_payload;
+};
+typedef struct rpc_loc_event_cb_f_type_args rpc_loc_event_cb_f_type_args;
+
+struct rpc_loc_event_cb_f_type_rets {
+ rpc_int32 loc_event_cb_f_type_result;
+};
+typedef struct rpc_loc_event_cb_f_type_rets rpc_loc_event_cb_f_type_rets;
+#define LOC_APICBVERS 0x00010001
+
+#define LOC_APICBPROG 0x3100008c
+#define LOC_APICBVERS_0001 0x00010001
+
+#if defined(__STDC__) || defined(__cplusplus)
+#define rpc_loc_event_cb_f_type 1
+extern enum clnt_stat rpc_loc_event_cb_f_type_0x00010001(rpc_loc_event_cb_f_type_args *, rpc_loc_event_cb_f_type_rets *, CLIENT *);
+extern bool_t rpc_loc_event_cb_f_type_0x00010001_svc(rpc_loc_event_cb_f_type_args *, rpc_loc_event_cb_f_type_rets *, struct svc_req *);
+extern int loc_apicbprog_0x00010001_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
+
+#else /* K&R C */
+#define rpc_loc_event_cb_f_type 1
+extern enum clnt_stat rpc_loc_event_cb_f_type_0x00010001();
+extern bool_t rpc_loc_event_cb_f_type_0x00010001_svc();
+extern int loc_apicbprog_0x00010001_freeresult ();
+#endif /* K&R C */
+
+/* the xdr functions */
+
+#if defined(__STDC__) || defined(__cplusplus)
+extern bool_t xdr_rpc_loc_event_cb_f_type_args (XDR *, rpc_loc_event_cb_f_type_args*);
+extern bool_t xdr_rpc_loc_event_cb_f_type_rets (XDR *, rpc_loc_event_cb_f_type_rets*);
+
+#else /* K&R C */
+extern bool_t xdr_rpc_loc_event_cb_f_type_args ();
+extern bool_t xdr_rpc_loc_event_cb_f_type_rets ();
+
+#endif /* K&R C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !_LOC_API_CB_H_RPCGEN */
diff --git a/loc_api/libloc_api-rpc/rpc_inc/loc_api_common.h b/loc_api/libloc_api-rpc/inc-3200/loc_api_common.h
old mode 100755
new mode 100644
similarity index 96%
rename from loc_api/libloc_api-rpc/rpc_inc/loc_api_common.h
rename to loc_api/libloc_api-rpc/inc-3200/loc_api_common.h
index 66bfcb4..04be079
--- a/loc_api/libloc_api-rpc/rpc_inc/loc_api_common.h
+++ b/loc_api/libloc_api-rpc/inc-3200/loc_api_common.h
@@ -1,20 +1,4 @@
-/*
-Copyright (c) 2009, QUALCOMM USA, INC.
-
-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 QUALCOMM USA, INC. 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
-
- */
- /*
+/*
* Please do not edit this file.
* It was generated using rpcgen.
*/
@@ -23,7 +7,7 @@
#define _LOC_API_COMMON_H_RPCGEN
#include <rpc/rpc.h>
-#include "rpc_inc/loc_api_fixup.h"
+#include "loc_api_fixup.h"
#include <pthread.h>
diff --git a/loc_api/libloc_api-rpc/rpc_inc/loc_api_fixup.h b/loc_api/libloc_api-rpc/inc-3200/loc_api_fixup.h
similarity index 100%
rename from loc_api/libloc_api-rpc/rpc_inc/loc_api_fixup.h
rename to loc_api/libloc_api-rpc/inc-3200/loc_api_fixup.h
diff --git a/loc_api/libloc_api-rpc/rpc_inc/loc_apicb_appinit.h b/loc_api/libloc_api-rpc/inc-3200/loc_apicb_appinit.h
similarity index 100%
rename from loc_api/libloc_api-rpc/rpc_inc/loc_apicb_appinit.h
rename to loc_api/libloc_api-rpc/inc-3200/loc_apicb_appinit.h
diff --git a/loc_api/libloc_api-rpc/rpc_inc/debug.h b/loc_api/libloc_api-rpc/inc/debug.h
similarity index 100%
rename from loc_api/libloc_api-rpc/rpc_inc/debug.h
rename to loc_api/libloc_api-rpc/inc/debug.h
diff --git a/loc_api/libloc_api-rpc/rpc_inc/loc_api_rpc_glue.h b/loc_api/libloc_api-rpc/inc/loc_api_rpc_glue.h
similarity index 96%
rename from loc_api/libloc_api-rpc/rpc_inc/loc_api_rpc_glue.h
rename to loc_api/libloc_api-rpc/inc/loc_api_rpc_glue.h
index e855162..ef972bd 100755
--- a/loc_api/libloc_api-rpc/rpc_inc/loc_api_rpc_glue.h
+++ b/loc_api/libloc_api-rpc/inc/loc_api_rpc_glue.h
@@ -41,10 +41,10 @@
#define LOC_API_RPC_GLUE_H
/* Include RPC headers */
-#include "rpc_inc/loc_api_common.h"
-#include "rpc_inc/loc_api.h"
-#include "rpc_inc/loc_api_cb.h"
-#include "rpc_inc/loc_api_fixup.h"
+#include "loc_api_common.h"
+#include "loc_api.h"
+#include "loc_api_cb.h"
+#include "loc_api_fixup.h"
#ifdef __cplusplus
extern "C"
diff --git a/loc_api/libloc_api-rpc/rpc_inc/loc_api_cb.h b/loc_api/libloc_api-rpc/rpc_inc/loc_api_cb.h
deleted file mode 100755
index cbc783d..0000000
--- a/loc_api/libloc_api-rpc/rpc_inc/loc_api_cb.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright (c) 2009, QUALCOMM USA, INC.
-
-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 QUALCOMM USA, INC. 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
-
- */
-
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _LOC_API_CB_H_RPCGEN
-#define _LOC_API_CB_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#include <pthread.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-struct rpc_loc_event_cb_f_type_args {
- rpc_uint32 cb_id;
- rpc_loc_client_handle_type loc_handle;
- rpc_loc_event_mask_type loc_event;
- rpc_loc_event_payload_u_type *loc_event_payload;
-};
-typedef struct rpc_loc_event_cb_f_type_args rpc_loc_event_cb_f_type_args;
-
-struct rpc_loc_event_cb_f_type_rets {
- rpc_int32 loc_event_cb_f_type_result;
-};
-typedef struct rpc_loc_event_cb_f_type_rets rpc_loc_event_cb_f_type_rets;
-#define LOC_APICBVERS 0x00010001
-
-#define LOC_APICBPROG 0x3100008c
-#define LOC_APICBVERS_0001 0x00010001
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define rpc_loc_event_cb_f_type 1
-extern enum clnt_stat rpc_loc_event_cb_f_type_0x00010001(rpc_loc_event_cb_f_type_args *, rpc_loc_event_cb_f_type_rets *, CLIENT *);
-extern bool_t rpc_loc_event_cb_f_type_0x00010001_svc(rpc_loc_event_cb_f_type_args *, rpc_loc_event_cb_f_type_rets *, struct svc_req *);
-extern int loc_apicbprog_0x00010001_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define rpc_loc_event_cb_f_type 1
-extern enum clnt_stat rpc_loc_event_cb_f_type_0x00010001();
-extern bool_t rpc_loc_event_cb_f_type_0x00010001_svc();
-extern int loc_apicbprog_0x00010001_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern bool_t xdr_rpc_loc_event_cb_f_type_args (XDR *, rpc_loc_event_cb_f_type_args*);
-extern bool_t xdr_rpc_loc_event_cb_f_type_rets (XDR *, rpc_loc_event_cb_f_type_rets*);
-
-#else /* K&R C */
-extern bool_t xdr_rpc_loc_event_cb_f_type_args ();
-extern bool_t xdr_rpc_loc_event_cb_f_type_rets ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_LOC_API_CB_H_RPCGEN */
diff --git a/loc_api/libloc_api-rpc/src/loc_apicb_appinit.c b/loc_api/libloc_api-rpc/src/loc_apicb_appinit.c
index 511080c..7fcfd6c 100755
--- a/loc_api/libloc_api-rpc/src/loc_apicb_appinit.c
+++ b/loc_api/libloc_api-rpc/src/loc_apicb_appinit.c
@@ -15,10 +15,10 @@
-------------------------------------------------------------------------------
*/
#include "rpc/rpc.h"
-#include "rpc_inc/loc_api_common.h"
-#include "rpc_inc/loc_api.h"
-#include "rpc_inc/loc_api_cb.h"
-#include "rpc_inc/loc_api_fixup.h"
+#include "loc_api_common.h"
+#include "loc_api.h"
+#include "loc_api_cb.h"
+#include "loc_api_fixup.h"
#include "loc_apicb_appinit.h"
diff --git a/loc_api/libloc_api/Android.mk b/loc_api/libloc_api/Android.mk
index 040a57c..7497918 100755
--- a/loc_api/libloc_api/Android.mk
+++ b/loc_api/libloc_api/Android.mk
@@ -6,12 +6,10 @@
#· Neither the name of the QUALCOMM USA, Inc. 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
-AMSS_VERSION:=6356
-
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE := gps.$(GPS_LOC_API_HARDWARE)
+LOCAL_MODULE := gps.$(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE)
LOCAL_STATIC_LIBRARIES:= \
libloc_api-rpc
@@ -29,11 +27,12 @@
gps.c
LOCAL_CFLAGS += \
- -fno-short-enums
+ -fno-short-enums \
+ -DAMSS_VERSION=$(BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION)
LOCAL_C_INCLUDES:= \
$(TARGET_OUT_HEADERS)/libloc_api-rpc \
- $(TARGET_OUT_HEADERS)/libloc_api-rpc/rpc_inc \
+ $(TARGET_OUT_HEADERS)/libloc_api-rpc/inc \
$(TARGET_OUT_HEADERS)/libcommondefs-rpc/inc \
$(TARGET_OUT_HEADERS)/librpc
