Revert "shamu: add location API"

This reverts commit e3523f467b90da440720f505dfdbf8a3a6ea402c.

Bug: 30297337
diff --git a/location/Android.mk b/location/Android.mk
deleted file mode 100644
index 574d03a..0000000
--- a/location/Android.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-#only /etc/gps.conf to begin with
-DIR_LIST := $(LOCAL_PATH)/loc_api/
-include $(addsuffix Android.mk, $(DIR_LIST))
diff --git a/location/loc_api/Android.mk b/location/loc_api/Android.mk
deleted file mode 100644
index 76561b7..0000000
--- a/location/loc_api/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
-
-LOCAL_PATH := $(call my-dir)
-
-#add QMI libraries for QMI targets
-QMI_BOARD_PLATFORM_LIST := msm8960
-QMI_BOARD_PLATFORM_LIST += msm8974
-QMI_BOARD_PLATFORM_LIST += msm8226
-QMI_BOARD_PLATFORM_LIST += msm8610
-QMI_BOARD_PLATFORM_LIST += msm8084
-
-ifeq ($(call is-board-platform-in-list,$(QMI_BOARD_PLATFORM_LIST)),true)
-include $(call all-subdir-makefiles)
-endif #is-board-platform-in-list
-
-endif#BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE
diff --git a/location/loc_api/ds_api/Android.mk b/location/loc_api/ds_api/Android.mk
deleted file mode 100644
index 1755200..0000000
--- a/location/loc_api/ds_api/Android.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-ifneq ($(BUILD_TINY_ANDROID),true)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libloc_ds_api
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE_OWNER := qcom
-
-LOCAL_PROPRIETARY_MODULE := true
-
-LOCAL_SHARED_LIBRARIES := \
-    libutils \
-    libcutils \
-    libqmi_cci \
-    libqmi_csi \
-    libqmi_common_so \
-    libgps.utils \
-    libdsi_netctrl \
-    libqmiservices
-
-
-LOCAL_SRC_FILES += \
-    ds_client.c
-
-LOCAL_CFLAGS += \
-    -fno-short-enums \
-    -D_ANDROID_ \
-    -DGPS_PDK
-
-LOCAL_COPY_HEADERS_TO:= libloc_ds_api/
-
-LOCAL_COPY_HEADERS:= \
-    ds_client.h
-
-LOCAL_LDFLAGS += -Wl,--export-dynamic
-
-## Includes
-LOCAL_C_INCLUDES := \
-    $(TARGET_OUT_HEADERS)/libloc_eng \
-    $(TARGET_OUT_HEADERS)/qmi-framework/inc \
-    $(TARGET_OUT_HEADERS)/qmi/inc \
-    $(TARGET_OUT_HEADERS)/gps.utils \
-    $(TARGET_OUT_HEADERS)/data/inc
-
-
-
-include $(BUILD_SHARED_LIBRARY)
-
-endif # not BUILD_TINY_ANDROID
diff --git a/location/loc_api/ds_api/ds_client.c b/location/loc_api/ds_api/ds_client.c
deleted file mode 100644
index 5cf2f5c..0000000
--- a/location/loc_api/ds_api/ds_client.c
+++ /dev/null
@@ -1,744 +0,0 @@
-/* Copyright (c) 2013, 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.
- */
-
-#define LOG_NDEBUG 0
-#define LOG_TAG "LocSvc_ds_client"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <wireless_data_service_v01.h>
-#include <utils/Log.h>
-#include <log_util.h>
-#include <loc_log.h>
-#include <qmi_client.h>
-#include <qmi_idl_lib.h>
-#include <qmi_cci_target_ext.h>
-#include <qmi_cci_target.h>
-#include <qmi_cci_common.h>
-#include <dsi_netctrl.h>
-#include <ds_client.h>
-
-#include<sys/time.h>
-
-//Timeout to wait for wds service notification from qmi
-#define DS_CLIENT_SERVICE_TIMEOUT (4000)
-//Max timeout for the service to come up
-#define DS_CLIENT_SERVICE_TIMEOUT_TOTAL (40000)
-//Timeout for the service to respond to sync msg
-#define DS_CLIENT_SYNC_MSG_TIMEOUT (5000)
-/*Request messages the WDS client can send to the WDS service*/
-typedef union
-{
-    /*Requests the service for a list of all profiles present*/
-    wds_get_profile_list_req_msg_v01 *p_get_profile_list_req;
-    /*Requests the service for a profile's settings*/
-    wds_get_profile_settings_req_msg_v01 *p_get_profile_settings_req;
-}ds_client_req_union_type;
-
-/*Response indications that are sent by the WDS service*/
-typedef union
-{
-    wds_get_profile_list_resp_msg_v01 *p_get_profile_list_resp;
-    wds_get_profile_settings_resp_msg_v01 *p_get_profile_setting_resp;
-}ds_client_resp_union_type;
-
-struct event_strings_s
-{
-  char * str;
-  dsi_net_evt_t evt;
-};
-
-struct event_strings_s event_string_tbl[DSI_EVT_MAX] =
-{
-    NAME_VAL(DSI_EVT_INVALID),
-    NAME_VAL(DSI_EVT_NET_IS_CONN),
-    NAME_VAL(DSI_EVT_NET_NO_NET),
-    NAME_VAL(DSI_EVT_PHYSLINK_DOWN_STATE),
-    NAME_VAL(DSI_EVT_PHYSLINK_UP_STATE),
-    NAME_VAL(DSI_EVT_NET_RECONFIGURED),
-#ifndef GPS_PDK
-    NAME_VAL(DSI_EVT_WDS_CONNECTED)
-#endif
-};
-
-typedef struct
-{
-    ds_client_event_ind_cb_type event_cb;
-    void *caller_cookie;
-}ds_caller_data;
-
-typedef struct {
-    //Global dsi handle
-    dsi_hndl_t dsi_net_handle;
-    //Handle to caller's data
-    ds_caller_data caller_data;
-} ds_client_session_data;
-
-void net_ev_cb(dsi_hndl_t handle, void* user_data,
-               dsi_net_evt_t evt, dsi_evt_payload_t *payload_ptr)
-{
-    int i;
-    (void)handle;
-    (void)user_data;
-    (void)payload_ptr;
-    ds_caller_data *callback_data = (ds_caller_data *)user_data;
-
-    LOC_LOGD("%s:%d]: Enter. Callback data: %p\n", __func__, __LINE__, callback_data);
-    if(evt > DSI_EVT_INVALID && evt < DSI_EVT_MAX)
-    {
-        for(i=0;i<DSI_EVT_MAX;i++)
-        {
-            if(event_string_tbl[i].evt == evt)
-                LOC_LOGE("%s:%d]: Callback received: %s",
-                         __func__, __LINE__, event_string_tbl[i].str);
-        }
-        switch(evt) {
-        case DSI_EVT_NET_IS_CONN:
-#ifndef GPS_PDK
-        case DSI_EVT_WDS_CONNECTED:
-#endif
-        {
-            LOC_LOGD("%s:%d]: Emergency call started\n", __func__, __LINE__);
-            callback_data->event_cb(E_DS_CLIENT_DATA_CALL_CONNECTED,
-                                    callback_data->caller_cookie);
-            break;
-        }
-        case DSI_EVT_NET_NO_NET:
-        {
-            LOC_LOGD("%s:%d]: Emergency call stopped\n", __func__, __LINE__);
-            callback_data->event_cb(E_DS_CLIENT_DATA_CALL_DISCONNECTED,
-                                    callback_data->caller_cookie);
-            break;
-        }
-        default:
-            LOC_LOGD("%s:%d]: uninteresting event\n", __func__, __LINE__);
-        }
-    }
-    LOC_LOGD("%s:%d]:Exit\n", __func__, __LINE__);
-}
-
-/*This function is called to obtain a handle to the QMI WDS service*/
-static ds_client_status_enum_type
-ds_client_qmi_ctrl_point_init(qmi_client_type *p_wds_qmi_client)
-{
-    qmi_client_type wds_qmi_client, notifier = NULL;
-    ds_client_status_enum_type status = E_DS_CLIENT_SUCCESS;
-    qmi_service_info *p_service_info = NULL;
-    uint32_t num_services = 0, num_entries = 0;
-    qmi_client_error_type ret = QMI_NO_ERR;
-    unsigned char no_signal = 0;
-    qmi_client_os_params os_params;
-    int timeout = 0;
-
-    LOC_LOGD("%s:%d]:Enter\n", __func__, __LINE__);
-
-    //Get service object for QMI_WDS service
-    qmi_idl_service_object_type ds_client_service_object =
-        wds_get_service_object_v01();
-    if(ds_client_service_object == NULL) {
-        LOC_LOGE("%s:%d]: wds_get_service_object_v01 failed\n" ,
-                    __func__, __LINE__);
-        status  = E_DS_CLIENT_FAILURE_INTERNAL;
-        goto err;
-    }
-
-    //get service addressing information
-    ret = qmi_client_get_service_list(ds_client_service_object, NULL, NULL,
-                                      &num_services);
-    LOC_LOGD("%s:%d]: qmi_client_get_service_list() first try ret %d, "
-                   "num_services %d]\n", __func__, __LINE__, ret, num_services);
-    if(ret != QMI_NO_ERR) {
-        //Register for service notification
-        ret = qmi_client_notifier_init(ds_client_service_object, &os_params, &notifier);
-        if (ret != QMI_NO_ERR) {
-            LOC_LOGE("%s:%d]: qmi_client_notifier_init failed %d\n",
-                              __func__, __LINE__, ret);
-            status = E_DS_CLIENT_FAILURE_INTERNAL;
-            goto err;
-        }
-
-        do {
-            QMI_CCI_OS_SIGNAL_CLEAR(&os_params);
-            ret = qmi_client_get_service_list(ds_client_service_object, NULL,
-                                              NULL, &num_services);
-            if(ret != QMI_NO_ERR) {
-                QMI_CCI_OS_SIGNAL_WAIT(&os_params, DS_CLIENT_SERVICE_TIMEOUT);
-                no_signal = QMI_CCI_OS_SIGNAL_TIMED_OUT(&os_params);
-                if(!no_signal)
-                    ret = qmi_client_get_service_list(ds_client_service_object, NULL,
-                                                      NULL, &num_services);
-            }
-            timeout += DS_CLIENT_SERVICE_TIMEOUT;
-            LOC_LOGV("%s:%d]: qmi_client_get_service_list() returned ret: %d,"
-                     "no_signal: %d, total timeout: %d\n", __func__, __LINE__,
-                     ret, no_signal, timeout);
-        } while( (timeout < DS_CLIENT_SERVICE_TIMEOUT_TOTAL) &&
-                 no_signal &&
-                 (ret != QMI_NO_ERR) );
-    }
-
-    //Handle failure cases
-    if(num_services == 0 || ret != QMI_NO_ERR) {
-        if(!no_signal) {
-            LOC_LOGE("%s:%d]: qmi_client_get_service_list failed even though"
-                     "service is up!  Error: %d \n", __func__, __LINE__, ret);
-            status = E_DS_CLIENT_FAILURE_INTERNAL;
-        }
-        else {
-            LOC_LOGE("%s:%d]: qmi_client_get_service_list failed after retries"
-                     "Error: %d \n", __func__, __LINE__, ret);
-            status = E_DS_CLIENT_FAILURE_TIMEOUT;
-        }
-        goto err;
-    }
-
-    LOC_LOGD("%s:%d]: qmi_client_get_service_list succeeded\n", __func__, __LINE__);
-
-    //Success
-    p_service_info = (qmi_service_info *)malloc(num_services * sizeof(qmi_service_info));
-    if(p_service_info == NULL) {
-        LOC_LOGE("%s:%d]: could not allocate memory for serviceInfo !!\n",
-               __func__, __LINE__);
-        status = E_DS_CLIENT_FAILURE_INTERNAL;
-        goto err;
-    }
-    num_entries = num_services;
-
-    //Populate service info
-    ret = qmi_client_get_service_list(ds_client_service_object, p_service_info,
-                                     &num_entries, &num_services);
-    if(ret != QMI_NO_ERR) {
-        LOC_LOGE("%s:%d]: qmi_client_get_service_list failed. ret: %d \n",
-                 __func__, __LINE__, ret);
-        status = E_DS_CLIENT_FAILURE_INTERNAL;
-        goto err;
-    }
-
-    //Initialize wds_qmi_client
-    LOC_LOGD("%s:%d]: Initializing WDS client with qmi_client_init\n", __func__,
-             __LINE__);
-    ret = qmi_client_init(&p_service_info[0], ds_client_service_object,
-                          NULL, NULL, NULL, &wds_qmi_client);
-    if(ret != QMI_NO_ERR) {
-        LOC_LOGE("%s:%d]: qmi_client_init Error. ret: %d\n", __func__, __LINE__, ret);
-        status = E_DS_CLIENT_FAILURE_INTERNAL;
-        goto err;
-    }
-    LOC_LOGD("%s:%d]: WDS client initialized with qmi_client_init\n", __func__,
-         __LINE__);
-
-    //Store WDS QMI client handle in the parameter passed in
-    *p_wds_qmi_client = wds_qmi_client;
-
-    status = E_DS_CLIENT_SUCCESS;
-    LOC_LOGD("%s:%d]: init success\n", __func__, __LINE__);
-
-    if(notifier)
-        qmi_client_release(notifier);
-
-err:
-    if(p_service_info)
-        free(p_service_info);
-
-    LOC_LOGD("%s:%d]:Exit\n", __func__, __LINE__);
-    return status;
-}
-
-/*This function reads the error code from within the response struct*/
-static ds_client_status_enum_type ds_client_convert_qmi_response(
-    uint32_t req_id,
-    ds_client_resp_union_type *resp_union)
-{
-    ds_client_status_enum_type ret = E_DS_CLIENT_FAILURE_GENERAL;
-    LOC_LOGD("%s:%d]:Enter\n", __func__, __LINE__);
-    switch(req_id)
-    {
-    case QMI_WDS_GET_PROFILE_LIST_REQ_V01 :
-    {
-        if(resp_union->p_get_profile_list_resp->resp.error !=
-           QMI_ERR_NONE_V01) {
-            LOC_LOGE("%s:%d]: Response error: %d", __func__, __LINE__,
-                     resp_union->p_get_profile_list_resp->resp.error);
-        }
-        else
-            ret = E_DS_CLIENT_SUCCESS;
-    }
-    break;
-
-    case QMI_WDS_GET_PROFILE_SETTINGS_REQ_V01 :
-    {
-        if(resp_union->p_get_profile_setting_resp->resp.error !=
-           QMI_ERR_NONE_V01) {
-            LOC_LOGE("%s:%d]: Response error: %d", __func__, __LINE__,
-                     resp_union->p_get_profile_setting_resp->resp.error);
-        }
-        else
-            ret = E_DS_CLIENT_SUCCESS;
-    }
-    break;
-
-    default:
-        LOC_LOGE("%s:%d]: Unknown request ID\n", __func__, __LINE__);
-    }
-    LOC_LOGD("%s:%d]:Exit\n", __func__, __LINE__);
-    return ret;
-}
-
-
-static ds_client_status_enum_type ds_client_send_qmi_sync_req(
-    qmi_client_type *ds_client_handle,
-    uint32_t req_id,
-    ds_client_resp_union_type *resp_union,
-    ds_client_req_union_type *req_union)
-{
-    uint32_t req_len = 0;
-    uint32_t resp_len = 0;
-    ds_client_status_enum_type ret = E_DS_CLIENT_SUCCESS;
-    qmi_client_error_type qmi_ret = QMI_NO_ERR;
-    LOC_LOGD("%s:%d]:Enter\n", __func__, __LINE__);
-    switch(req_id)
-    {
-    case QMI_WDS_GET_PROFILE_LIST_REQ_V01 :
-    {
-        req_len = sizeof(wds_get_profile_list_req_msg_v01);
-        resp_len = sizeof(wds_get_profile_list_resp_msg_v01);
-        LOC_LOGD("%s:%d]: req_id = GET_PROFILE_LIST_REQ\n",
-                       __func__, __LINE__);
-    }
-    break;
-
-    case QMI_WDS_GET_PROFILE_SETTINGS_REQ_V01 :
-    {
-        req_len = sizeof(wds_get_profile_settings_req_msg_v01);
-        resp_len = sizeof(wds_get_profile_settings_resp_msg_v01);
-        LOC_LOGD("%s:%d]: req_id = GET_PROFILE_SETTINGS_REQ\n",
-                       __func__, __LINE__);
-    }
-    break;
-
-    default:
-        LOC_LOGE("%s:%d]: Error unknown req_id=%d\n", __func__, __LINE__,
-                       req_id);
-        ret = E_DS_CLIENT_FAILURE_INVALID_PARAMETER;
-        goto err;
-    }
-
-    LOC_LOGD("%s:%d]: req_id=%d, len = %d; resp_len= %d\n", __func__, __LINE__,
-             req_id, req_len, resp_len);
-    //Send msg through QCCI
-    qmi_ret = qmi_client_send_msg_sync(
-        *ds_client_handle,
-        req_id,
-        (void *)req_union->p_get_profile_list_req,
-        req_len,
-        (void *)resp_union->p_get_profile_list_resp,
-        resp_len,
-        DS_CLIENT_SYNC_MSG_TIMEOUT);
-    LOC_LOGD("%s:%d]: qmi_client_send_msg_sync returned: %d", __func__, __LINE__, qmi_ret);
-
-    if(qmi_ret != QMI_NO_ERR) {
-        ret = E_DS_CLIENT_FAILURE_INTERNAL;
-        goto err;
-    }
-
-    ret = ds_client_convert_qmi_response(req_id, resp_union);
-
-err:
-    LOC_LOGD("%s:%d]:Exit\n", __func__, __LINE__);
-    return ret;
-}
-
-/*This function obtains the list of supported profiles*/
-static ds_client_status_enum_type ds_client_get_profile_list(
-    qmi_client_type *ds_client_handle,
-    ds_client_resp_union_type *profile_list_resp_msg,
-    wds_profile_type_enum_v01 profile_type)
-{
-    ds_client_status_enum_type ret = E_DS_CLIENT_SUCCESS;
-    ds_client_req_union_type req_union;
-    LOC_LOGD("%s:%d]:Enter\n", __func__, __LINE__);
-
-    req_union.p_get_profile_list_req = NULL;
-    req_union.p_get_profile_list_req = (wds_get_profile_list_req_msg_v01 *)
-        calloc(1, sizeof(wds_get_profile_list_req_msg_v01));
-    if(req_union.p_get_profile_list_req == NULL) {
-        LOC_LOGE("%s:%d]: Could not allocate memory for"
-                 "wds_get_profile_list_req_msg_v01\n", __func__, __LINE__);
-        goto err;
-    }
-    //Populate required members of the request structure
-    req_union.p_get_profile_list_req->profile_type_valid = 1;
-    req_union.p_get_profile_list_req->profile_type = profile_type;
-    ret = ds_client_send_qmi_sync_req(ds_client_handle,
-                                       QMI_WDS_GET_PROFILE_LIST_REQ_V01,
-                                       profile_list_resp_msg, &req_union);
-    if(ret != E_DS_CLIENT_SUCCESS) {
-        LOC_LOGE("%s:%d]: ds_client_send_qmi_req failed. ret: %d\n",
-                 __func__, __LINE__, ret);
-        goto err;
-    }
-err:
-    LOC_LOGD("%s:%d]:Exit\n", __func__, __LINE__);
-    if(req_union.p_get_profile_list_req)
-        free(req_union.p_get_profile_list_req);
-    return ret;
-}
-
-/*This function obtains settings for the profile specified by
- the profile_identifier*/
-static ds_client_status_enum_type ds_client_get_profile_settings(
-    qmi_client_type *ds_client_handle,
-    ds_client_resp_union_type *profile_settings_resp_msg,
-    wds_profile_identifier_type_v01 *profile_identifier)
-{
-    ds_client_status_enum_type ret = E_DS_CLIENT_SUCCESS;
-    ds_client_req_union_type req_union;
-
-    LOC_LOGD("%s:%d]:Enter\n", __func__, __LINE__);
-    //Since it's a union containing a pointer to a structure,
-    //following entities have the same address
-    //- req_union
-    //- req_union.p_get_profile_settings_req
-    //- req_union.p_get_profile_settings_req->profile
-    //so we can very well assign req_union = profile_identifier
-    req_union.p_get_profile_settings_req =
-        (wds_get_profile_settings_req_msg_v01 *)profile_identifier;
-    ret = ds_client_send_qmi_sync_req(ds_client_handle,
-                                       QMI_WDS_GET_PROFILE_SETTINGS_REQ_V01,
-                                       profile_settings_resp_msg, &req_union);
-    if(ret != E_DS_CLIENT_SUCCESS) {
-        LOC_LOGE("%s:%d]: ds_client_send_qmi_req failed. ret: %d\n",
-                 __func__, __LINE__, ret);
-        goto err;
-    }
-err:
-    LOC_LOGD("%s:%d]:Exit\n", __func__, __LINE__);
-    return ret;
-}
-
-/*
-  Starts data call using the handle and the profile index
-*/
-ds_client_status_enum_type
-ds_client_start_call(dsClientHandleType client_handle, int profile_index, int pdp_type)
-{
-    ds_client_status_enum_type ret = E_DS_CLIENT_FAILURE_GENERAL;
-    dsi_call_param_value_t param_info;
-    dsi_hndl_t dsi_handle;
-    ds_client_session_data *ds_global_data = (ds_client_session_data *)client_handle;
-    LOC_LOGD("%s:%d]:Enter\n", __func__, __LINE__);
-    if(ds_global_data == NULL) {
-        LOC_LOGE("%s:%d]: Null callback parameter\n", __func__, __LINE__);
-        goto err;
-    }
-    dsi_handle = ds_global_data->dsi_net_handle;
-    //Set profile index as call parameter
-    param_info.buf_val = NULL;
-    param_info.num_val = profile_index;
-    dsi_set_data_call_param(dsi_handle,
-                            DSI_CALL_INFO_UMTS_PROFILE_IDX,
-                            &param_info);
-
-    //Set IP Version as call parameter
-    param_info.buf_val = NULL;
-    param_info.num_val = pdp_type;
-    dsi_set_data_call_param(dsi_handle,
-                            DSI_CALL_INFO_IP_VERSION,
-                            &param_info);
-    LOC_LOGD("%s:%d]: Starting emergency call with profile index %d; pdp_type:%d\n",
-             __func__, __LINE__, profile_index, pdp_type);
-    if(dsi_start_data_call(dsi_handle) == DSI_SUCCESS) {
-        LOC_LOGD("%s:%d]: Sent request to start data call\n",
-                 __func__, __LINE__);
-        ret = E_DS_CLIENT_SUCCESS;
-    }
-    else {
-        LOC_LOGE("%s:%d]: Could not send req to start data call \n", __func__, __LINE__);
-        ret = E_DS_CLIENT_FAILURE_GENERAL;
-        goto err;
-    }
-
-err:
-    LOC_LOGD("%s:%d]:Exit\n", __func__, __LINE__);
-    return ret;
-
-}
-
-/*Function to open an emergency call. Does the following things:
- - Obtains a handle to the WDS service
- - Obtains a list of profiles configured in the modem
- - Queries each profile and obtains settings to check if emergency calls
-   are supported
- - Returns the profile index that supports emergency calls
- - Returns handle to dsi_netctrl*/
-ds_client_status_enum_type
-ds_client_open_call(dsClientHandleType *client_handle,
-                    ds_client_cb_data *callback,
-                    void *caller_cookie,
-                    int *profile_index,
-                    int *pdp_type)
-{
-    ds_client_status_enum_type ret = E_DS_CLIENT_FAILURE_GENERAL;
-    ds_client_resp_union_type profile_list_resp_msg;
-    ds_client_resp_union_type profile_settings_resp_msg;
-    wds_profile_identifier_type_v01 profile_identifier;
-    uint32_t i=0;
-    dsi_hndl_t dsi_handle;
-    ds_client_session_data **ds_global_data = (ds_client_session_data **)client_handle;
-    unsigned char call_profile_index_found = 0;
-    uint32_t emergency_profile_index=0;
-    qmi_client_type wds_qmi_client;
-
-    profile_list_resp_msg.p_get_profile_list_resp = NULL;
-    profile_settings_resp_msg.p_get_profile_setting_resp = NULL;
-
-    LOC_LOGD("%s:%d]:Enter\n", __func__, __LINE__);
-    if(callback == NULL || ds_global_data == NULL) {
-        LOC_LOGE("%s:%d]: Null callback parameter\n", __func__, __LINE__);
-        goto err;
-    }
-
-    ret = ds_client_qmi_ctrl_point_init(&wds_qmi_client);
-    if(ret != E_DS_CLIENT_SUCCESS) {
-        LOC_LOGE("%s:%d]: ds_client_qmi_ctrl_point_init failed. ret: %d\n",
-                 __func__, __LINE__, ret);
-        goto err;
-    }
-
-    //Allocate memory for the response msg to obtain a list of profiles
-    profile_list_resp_msg.p_get_profile_list_resp = (wds_get_profile_list_resp_msg_v01 *)
-        calloc(1, sizeof(wds_get_profile_list_resp_msg_v01));
-    if(profile_list_resp_msg.p_get_profile_list_resp == NULL) {
-        LOC_LOGE("%s:%d]: Could not allocate memory for"
-                 "p_get_profile_list_resp\n", __func__, __LINE__);
-        ret = E_DS_CLIENT_FAILURE_NOT_ENOUGH_MEMORY;
-        goto err;
-    }
-
-    LOC_LOGD("%s:%d]: Getting profile list\n", __func__, __LINE__);
-    ret = ds_client_get_profile_list(&wds_qmi_client,
-                                      &profile_list_resp_msg,
-                                      WDS_PROFILE_TYPE_3GPP_V01);
-    if(ret != E_DS_CLIENT_SUCCESS) {
-        LOC_LOGE("%s:%d]: ds_client_get_profile_list failed. ret: %d\n",
-                 __func__, __LINE__, ret);
-        goto err;
-    }
-    LOC_LOGD("%s:%d]: Got profile list; length = %d\n", __func__, __LINE__,
-             profile_list_resp_msg.p_get_profile_list_resp->profile_list_len);
-
-    //Allocate memory for the response msg to obtain profile settings
-    //We allocate memory for only one response msg and keep re-using it
-    profile_settings_resp_msg.p_get_profile_setting_resp =
-        (wds_get_profile_settings_resp_msg_v01 *)
-        calloc(1, sizeof(wds_get_profile_settings_resp_msg_v01));
-    if(profile_settings_resp_msg.p_get_profile_setting_resp == NULL) {
-        LOC_LOGE("%s:%d]: Could not allocate memory for"
-                 "p_get_profile_setting_resp\n", __func__, __LINE__);
-        ret = E_DS_CLIENT_FAILURE_NOT_ENOUGH_MEMORY;
-        goto err;
-    }
-
-    //Loop over the list of profiles to find a profile that supports
-    //emergency calls
-    for(i=0; i < profile_list_resp_msg.p_get_profile_list_resp->profile_list_len; i++) {
-        /*QMI_WDS_GET_PROFILE_SETTINGS_REQ requires an input data
-          structure that is of type wds_profile_identifier_type_v01
-          We have to fill that structure for each profile from the
-          info obtained from the profile list*/
-        //copy profile type
-        profile_identifier.profile_type =
-            profile_list_resp_msg.p_get_profile_list_resp->profile_list[i].profile_type;
-        //copy profile index
-        profile_identifier.profile_index =
-            profile_list_resp_msg.p_get_profile_list_resp->profile_list[i].profile_index;
-
-        ret = ds_client_get_profile_settings(&wds_qmi_client,
-                                             &profile_settings_resp_msg,
-                                             &profile_identifier);
-        if(ret != E_DS_CLIENT_SUCCESS) {
-            LOC_LOGE("%s:%d]: ds_client_get_profile_settings failed. ret: %d\n",
-                     __func__, __LINE__, ret);
-            goto err;
-        }
-        LOC_LOGD("%s:%d]: Got profile setting for profile %d; name: %s\n",
-                 __func__, __LINE__, i,
-                 profile_settings_resp_msg.p_get_profile_setting_resp->profile_name);
-
-        if(profile_settings_resp_msg.p_get_profile_setting_resp->support_emergency_calls_valid) {
-            if(profile_settings_resp_msg.p_get_profile_setting_resp->support_emergency_calls) {
-                LOC_LOGD("%s:%d]: Found emergency profile in profile %d"
-                         , __func__, __LINE__, i);
-                call_profile_index_found = 1;
-                emergency_profile_index = profile_identifier.profile_index;
-
-                if(profile_settings_resp_msg.p_get_profile_setting_resp->pdp_type_valid) {
-                    *pdp_type = (int)profile_settings_resp_msg.p_get_profile_setting_resp->pdp_type;
-                    LOC_LOGD("%s:%d]: pdp_type: %d\n", __func__, __LINE__, *pdp_type);
-                    switch(*pdp_type) {
-                    case WDS_PDP_TYPE_PDP_IPV4_V01:
-                        *pdp_type = DSI_IP_VERSION_4;
-                        break;
-                    case WDS_PDP_TYPE_PDP_IPV6_V01:
-                        *pdp_type = DSI_IP_VERSION_6;
-                        break;
-                    case WDS_PDP_TYPE_PDP_IPV4V6_V01:
-                        *pdp_type = DSI_IP_VERSION_4_6;
-                        break;
-                    default:
-                        LOC_LOGE("%s:%d]: pdp_type unknown. Setting default as ipv4/v6\n",
-                                 __func__, __LINE__);
-                        *pdp_type = DSI_IP_VERSION_4;
-
-                    }
-                }
-                else {
-                    LOC_LOGD("%s:%d]: pdp type not valid in profile setting. Default ipv4\n",
-                             __func__, __LINE__);
-                    *pdp_type = DSI_IP_VERSION_4;
-                }
-                //Break out of for loop since we found the emergency profile
-                break;
-            }
-            else
-                LOC_LOGE("%s:%d]: Emergency profile valid but not supported in profile: %d "
-                         , __func__, __LINE__, i);
-        }
-        //Since this struct is loaded with settings for the next profile,
-        //it is important to clear out the memory to avoid values/flags
-        //from being carried over
-        memset((void *)profile_settings_resp_msg.p_get_profile_setting_resp,
-               0, sizeof(wds_get_profile_settings_resp_msg_v01));
-    }
-
-    //Release qmi client handle
-    if(qmi_client_release(wds_qmi_client) != QMI_NO_ERR) {
-        LOC_LOGE("%s:%d]: Could not release qmi client handle\n",
-                 __func__, __LINE__);
-        ret = E_DS_CLIENT_FAILURE_GENERAL;
-    }
-
-    if(call_profile_index_found) {
-        *profile_index = emergency_profile_index;
-        *ds_global_data = (ds_client_session_data *)calloc(1, sizeof(ds_client_session_data));
-        if(*ds_global_data == NULL) {
-            LOC_LOGE("%s:%d]: Could not allocate memory for ds_global_data. Failing\n",
-                     __func__, __LINE__);
-            ret = E_DS_CLIENT_FAILURE_NOT_ENOUGH_MEMORY;
-            goto err;
-        }
-
-        (*ds_global_data)->caller_data.event_cb = callback->event_cb;
-        (*ds_global_data)->caller_data.caller_cookie = caller_cookie;
-        dsi_handle = dsi_get_data_srvc_hndl(net_ev_cb, &(*ds_global_data)->caller_data);
-        if(dsi_handle == NULL) {
-            LOC_LOGE("%s:%d]: Could not get data handle. Retry Later\n",
-                     __func__, __LINE__);
-            ret = E_DS_CLIENT_RETRY_LATER;
-            goto err;
-        }
-        else
-            (*ds_global_data)->dsi_net_handle = dsi_handle;
-    }
-    else {
-        LOC_LOGE("%s:%d]: Could not find a profile that supports emergency calls",
-                 __func__, __LINE__);
-        ret = E_DS_CLIENT_FAILURE_GENERAL;
-    }
-err:
-    if(profile_list_resp_msg.p_get_profile_list_resp)
-        free(profile_list_resp_msg.p_get_profile_list_resp);
-    if(profile_settings_resp_msg.p_get_profile_setting_resp)
-        free(profile_settings_resp_msg.p_get_profile_setting_resp);
-    LOC_LOGD("%s:%d]:Exit\n", __func__, __LINE__);
-    return ret;
-}
-
-ds_client_status_enum_type ds_client_stop_call(dsClientHandleType client_handle)
-{
-    ds_client_status_enum_type ret = E_DS_CLIENT_SUCCESS;
-    ds_client_session_data *p_ds_global_data = (ds_client_session_data *)client_handle;
-    LOC_LOGD("%s:%d]:Enter\n", __func__, __LINE__);
-
-    if(client_handle == NULL) {
-        LOC_LOGE("%s:%d]: Null argument received. Failing\n", __func__, __LINE__);
-        ret = E_DS_CLIENT_FAILURE_GENERAL;
-        goto err;
-    }
-
-    if(dsi_stop_data_call(p_ds_global_data->dsi_net_handle) == DSI_SUCCESS) {
-        LOC_LOGD("%s:%d]: Sent request to stop data call\n", __func__, __LINE__);
-    }
-    else {
-        LOC_LOGE("%s:%d]: Could not send request to stop data call\n",
-                 __func__, __LINE__);
-        ret = E_DS_CLIENT_FAILURE_GENERAL;
-        goto err;
-    }
-
-err:
-    LOC_LOGD("%s:%d]:Exit\n", __func__, __LINE__);
-    return ret;
-}
-
-/*
-  Stops data call associated with the data handle
-*/
-void ds_client_close_call(dsClientHandleType *client_handle)
-{
-    ds_client_session_data **ds_global_data = (ds_client_session_data **)client_handle;
-    LOC_LOGD("%s:%d]:Enter\n", __func__, __LINE__);
-    if(client_handle == NULL || *client_handle == NULL) {
-        LOC_LOGE("%s:%d]: Null argument received. Failing\n", __func__, __LINE__);
-        goto err;
-    }
-    dsi_rel_data_srvc_hndl((*ds_global_data)->dsi_net_handle);
-    (*ds_global_data)->dsi_net_handle = NULL;
-    free(*ds_global_data);
-    *ds_global_data = NULL;
-    LOC_LOGD("%s:%d]: Released Data handle\n", __func__, __LINE__);
-err:
-    LOC_LOGD("%s:%d]:Exit\n", __func__, __LINE__);
-    return;
-}
-
-int ds_client_init()
-{
-    int ret = 0;
-    LOC_LOGD("%s:%d]:Enter\n", __func__, __LINE__);
-    if(DSI_SUCCESS != dsi_init(DSI_MODE_GENERAL))
-    {
-        LOC_LOGE("%s:%d]:dsi_init failed\n", __func__, __LINE__);
-        ret = -1;
-    }
-    LOC_LOGD("%s:%d]:Exit\n", __func__, __LINE__);
-    return ret;
-}
diff --git a/location/loc_api/ds_api/ds_client.h b/location/loc_api/ds_api/ds_client.h
deleted file mode 100644
index 71ec770..0000000
--- a/location/loc_api/ds_api/ds_client.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Copyright (c) 2013, 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 _DS_CLIENT_H_
-#define _DS_CLIENT_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void* dsClientHandleType;
-
-typedef enum
-{
-  E_DS_CLIENT_SUCCESS                              = 0,
-  /**< Request was successful. */
-
-  E_DS_CLIENT_FAILURE_GENERAL                      = 1,
-  /**< Failed because of a general failure. */
-
-  E_DS_CLIENT_FAILURE_UNSUPPORTED                  = 2,
-  /**< Failed because the service does not support the command. */
-
-  E_DS_CLIENT_FAILURE_INVALID_PARAMETER            = 3,
-  /**< Failed because the request contained invalid parameters. */
-
-  E_DS_CLIENT_FAILURE_ENGINE_BUSY                  = 4,
-  /**< Failed because the engine is busy. */
-
-  E_DS_CLIENT_FAILURE_PHONE_OFFLINE                = 5,
-  /**< Failed because the phone is offline. */
-
-  E_DS_CLIENT_FAILURE_TIMEOUT                      = 6,
-  /**< Failed because of a timeout. */
-
-  E_DS_CLIENT_FAILURE_SERVICE_NOT_PRESENT          = 7,
-  /**< Failed because the service is not present. */
-
-  E_DS_CLIENT_FAILURE_SERVICE_VERSION_UNSUPPORTED  = 8,
-  /**< Failed because the service version is unsupported. */
-
-  E_DS_CLIENT_FAILURE_CLIENT_VERSION_UNSUPPORTED  =  9,
-  /**< Failed because the service does not support client version. */
-
-  E_DS_CLIENT_FAILURE_INVALID_HANDLE               = 10,
-  /**< Failed because an invalid handle was specified. */
-
-  E_DS_CLIENT_FAILURE_INTERNAL                     = 11,
-  /**< Failed because of an internal error in the service. */
-
-  E_DS_CLIENT_FAILURE_NOT_INITIALIZED              = 12,
-  /**< Failed because the service has not been initialized. */
-
-  E_DS_CLIENT_FAILURE_NOT_ENOUGH_MEMORY             = 13,
-  /**< Failed because not rnough memory to do the operation.*/
-
-  E_DS_CLIENT_SERVICE_ALREADY_STARTED               = 14,
-  /*Service is already started*/
-
-  E_DS_CLIENT_DATA_CALL_CONNECTED                   = 15,
-
-  E_DS_CLIENT_DATA_CALL_DISCONNECTED                = 16,
-
-  E_DS_CLIENT_RETRY_LATER                           = 17
-}ds_client_status_enum_type;
-
-typedef enum {
-    DATA_CALL_NONE = 0,
-    DATA_CALL_OPEN,
-    DATA_CALL_CLOSE
-}data_call_request_enum_type;
-
-typedef void (*ds_client_event_ind_cb_type)(ds_client_status_enum_type result,
-                                             void* loc_adapter_cookie);
-typedef struct {
-    ds_client_event_ind_cb_type event_cb;
-}ds_client_cb_data;
-
-/*
-  This function is to be called as a first step by each process that
-  needs to use data services. This call internally calls dsi_init()
-  and prepares the module for making data calls.
-  Needs to be called once for every process
-*/
-int ds_client_init();
-
-/*
-  Obtains a handle to the dsi_netctrl layer and looks up the profile
-  to make the call. As of now. It only searches for profiles that
-  support emergency calls
- */
-ds_client_status_enum_type ds_client_open_call(dsClientHandleType *client_handle,
-                                               ds_client_cb_data *callback,
-                                               void *loc_adapter_cookie,
-                                               int *profile_index,
-                                               int *pdp_type);
-
-/*
-  Starts a data call using the profile number provided
- */
-ds_client_status_enum_type ds_client_start_call(dsClientHandleType client_handle,
-                                                int profile_index,
-                                                int pdp_type);
-
-/*
-  Stops a data call associated with the handle
-*/
-ds_client_status_enum_type ds_client_stop_call(dsClientHandleType client_handle);
-
-/*
-  Releases the handle used for making data calls
-*/
-void ds_client_close_call(dsClientHandleType *client_handle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/location/loc_api/loc_api_v02/Android.mk b/location/loc_api/loc_api_v02/Android.mk
deleted file mode 100644
index 6abdfe7..0000000
--- a/location/loc_api/loc_api_v02/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-ifneq ($(BUILD_TINY_ANDROID),true)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libloc_api_v02
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE_OWNER := qcom
-
-LOCAL_PROPRIETARY_MODULE := true
-
-LOCAL_SHARED_LIBRARIES := \
-    libutils \
-    libcutils \
-    libqmi_cci \
-    libqmi_csi \
-    libqmi_common_so \
-    libloc_core \
-    libgps.utils \
-    libloc_ds_api
-
-LOCAL_SRC_FILES = \
-    LocApiV02.cpp \
-    loc_api_v02_log.c \
-    loc_api_v02_client.c \
-    loc_api_sync_req.c \
-    location_service_v02.c
-
-LOCAL_CFLAGS += \
-    -fno-short-enums \
-    -D_ANDROID_ \
-    -DGPS_PDK
-
-LOCAL_COPY_HEADERS_TO:= libloc_api_v02/
-
-LOCAL_COPY_HEADERS:= \
-    location_service_v02.h \
-    loc_api_v02_log.h \
-    loc_api_v02_client.h \
-    loc_api_sync_req.h \
-    LocApiV02.h \
-    loc_util_log.h
-
-
-## Includes
-LOCAL_C_INCLUDES := \
-    $(TARGET_OUT_HEADERS)/libloc_core \
-    $(TARGET_OUT_HEADERS)/qmi-framework/inc \
-    $(TARGET_OUT_HEADERS)/qmi/inc \
-    $(TARGET_OUT_HEADERS)/gps.utils \
-    $(TARGET_OUT_HEADERS)/libloc_ds_api
-
-
-include $(BUILD_SHARED_LIBRARY)
-
-endif # not BUILD_TINY_ANDROID
diff --git a/location/loc_api/loc_api_v02/LocApiV02.cpp b/location/loc_api/loc_api_v02/LocApiV02.cpp
deleted file mode 100644
index a7fa9e7..0000000
--- a/location/loc_api/loc_api_v02/LocApiV02.cpp
+++ /dev/null
@@ -1,3218 +0,0 @@
-/* Copyright (c) 2011-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 Foundatoin, 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.
- */
-
-#define LOG_NDEBUG 0
-#define LOG_TAG "LocSvc_ApiV02"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include <hardware/gps.h>
-
-#ifndef USE_GLIB
-#include <utils/SystemClock.h>
-#endif /* USE_GLIB */
-#include <LocApiV02.h>
-#include <loc_api_v02_log.h>
-#include <loc_api_sync_req.h>
-#include <loc_util_log.h>
-#include <gps_extended.h>
-#include "platform_lib_includes.h"
-
-using namespace loc_core;
-
-/* Default session id ; TBD needs incrementing for each */
-#define LOC_API_V02_DEF_SESSION_ID (1)
-
-/* UMTS CP Address key*/
-#define LOC_NI_NOTIF_KEY_ADDRESS           "Address"
-
-/* GPS SV Id offset */
-#define GPS_SV_ID_OFFSET        (1)
-
-/* GLONASS SV Id offset */
-#define GLONASS_SV_ID_OFFSET    (65)
-
-/* SV ID range */
-#define SV_ID_RANGE             (32)
-
-#define BDS_SV_ID_OFFSET         (201)
-
-/* BeiDou SV ID RANGE*/
-#define BDS_SV_ID_RANGE          QMI_LOC_DELETE_MAX_BDS_SV_INFO_LENGTH_V02
-
-/* GPS week unknown*/
-#define C_GPS_WEEK_UNKNOWN      (65535)
-
-/* seconds per week*/
-#define WEEK_MSECS              (60*60*24*7*1000)
-
-/* static event callbacks that call the LocApiV02 callbacks*/
-
-/* global event callback, call the eventCb function in loc api adapter v02
-   instance */
-static void globalEventCb(locClientHandleType clientHandle,
-                          uint32_t eventId,
-                          const locClientEventIndUnionType eventPayload,
-                          void*  pClientCookie)
-{
-  MODEM_LOG_CALLFLOW(%s, loc_get_v02_event_name(eventId));
-  LocApiV02 *locApiV02Instance =
-      (LocApiV02 *)pClientCookie;
-
-  LOC_LOGV ("%s:%d] client = %p, event id = %d, client cookie ptr = %p\n",
-                  __func__,  __LINE__,  clientHandle, eventId, pClientCookie);
-
-  // return if null is passed
-  if( NULL == locApiV02Instance)
-  {
-    LOC_LOGE ("%s:%d] NULL object passed : client = %p, event id = %d\n",
-                  __func__,  __LINE__,  clientHandle, eventId);
-    return;
-  }
-  locApiV02Instance->eventCb(clientHandle, eventId, eventPayload);
-}
-
-/* global response callback, it calls the sync request process
-   indication function to unblock the request that is waiting on this
-   response indication*/
-static void globalRespCb(locClientHandleType clientHandle,
-                         uint32_t respId,
-                         const locClientRespIndUnionType respPayload,
-                         void*  pClientCookie)
-{
-  MODEM_LOG_CALLFLOW(%s, loc_get_v02_event_name(respId));
-  LocApiV02 *locApiV02Instance =
-        (LocApiV02 *)pClientCookie;
-
-
-  LOC_LOGV ("%s:%d] client = %p, resp id = %d, client cookie ptr = %p\n",
-                  __func__,  __LINE__,  clientHandle, respId, pClientCookie);
-
-  if( NULL == locApiV02Instance)
-  {
-    LOC_LOGE ("%s:%d] NULL object passed : client = %p, resp id = %d\n",
-                  __func__,  __LINE__,  clientHandle, respId);
-    return;
-  }
-    // process the sync call
-    // use pDeleteAssistDataInd as a dummy pointer
-  loc_sync_process_ind(clientHandle, respId,
-                       (void *)respPayload.pDeleteAssistDataInd);
-}
-
-/* global error callback, it will call the handle service down
-   function in the loc api adapter instance. */
-static void globalErrorCb (locClientHandleType clientHandle,
-                           locClientErrorEnumType errorId,
-                           void *pClientCookie)
-{
-  LocApiV02 *locApiV02Instance =
-          (LocApiV02 *)pClientCookie;
-
-  LOC_LOGV ("%s:%d] client = %p, error id = %d\n, client cookie ptr = %p\n",
-                  __func__,  __LINE__,  clientHandle, errorId, pClientCookie);
-  if( NULL == locApiV02Instance)
-  {
-    LOC_LOGE ("%s:%d] NULL object passed : client = %p, error id = %d\n",
-                  __func__,  __LINE__,  clientHandle, errorId);
-    return;
-  }
-  locApiV02Instance->errorCb(clientHandle, errorId);
-}
-
-/* global structure containing the callbacks */
-locClientCallbacksType globalCallbacks =
-{
-    sizeof(locClientCallbacksType),
-    globalEventCb,
-    globalRespCb,
-    globalErrorCb
-};
-
-/* Constructor for LocApiV02 */
-LocApiV02 :: LocApiV02(const MsgTask* msgTask,
-                       LOC_API_ADAPTER_EVENT_MASK_T exMask,
-                       ContextBase* context):
-    LocApiBase(msgTask, exMask, context),
-    clientHandle(LOC_CLIENT_INVALID_HANDLE_VALUE),
-    dsClientHandle(NULL), mGnssMeasurementSupported(sup_unknown),
-    mQmiMask(0), mInSession(false), mEngineOn(false)
-{
-    // initialize loc_sync_req interface
-    loc_sync_req_init();
-}
-
-/* Destructor for LocApiV02 */
-LocApiV02 :: ~LocApiV02()
-{
-    close();
-}
-
-LocApiBase* getLocApi(const MsgTask *msgTask,
-                      LOC_API_ADAPTER_EVENT_MASK_T exMask,
-                      ContextBase* context)
-{
-    LOC_LOGD("%s:%d]: Creating new LocApiV02", __func__, __LINE__);
-    return new LocApiV02(msgTask, exMask, context);
-}
-
-/* Initialize a loc api v02 client */
-enum loc_api_adapter_err
-LocApiV02 :: open(LOC_API_ADAPTER_EVENT_MASK_T mask)
-{
-  enum loc_api_adapter_err rtv = LOC_API_ADAPTER_ERR_SUCCESS;
-  LOC_API_ADAPTER_EVENT_MASK_T newMask = mMask | (mask & ~mExcludedMask);
-  locClientEventMaskType qmiMask = convertMask(newMask);
-  LOC_LOGD("%s:%d]: Enter mMask: %x; mask: %x; newMask: %x mQmiMask: %lld qmiMask: %lld",
-           __func__, __LINE__, mMask, mask, newMask, mQmiMask, qmiMask);
-  /* If the client is already open close it first */
-  if(LOC_CLIENT_INVALID_HANDLE_VALUE == clientHandle)
-  {
-    locClientStatusEnumType status = eLOC_CLIENT_SUCCESS;
-
-    LOC_LOGV ("%s:%d]: reference to this = %p passed in \n",
-              __func__, __LINE__, this);
-    /* initialize the loc api v02 interface, note that
-       the locClientOpen() function will block if the
-       service is unavailable for a fixed time out */
-
-    // it is important to cap the mask here, because not all LocApi's
-    // can enable the same bits, e.g. foreground and bckground.
-    status = locClientOpen(adjustMaskForNoSession(qmiMask), &globalCallbacks,
-                           &clientHandle, (void *)this);
-    mMask = newMask;
-    mQmiMask = qmiMask;
-    if (eLOC_CLIENT_SUCCESS != status ||
-        clientHandle == LOC_CLIENT_INVALID_HANDLE_VALUE )
-    {
-      mMask = 0;
-      mQmiMask = 0;
-      LOC_LOGE ("%s:%d]: locClientOpen failed, status = %s\n", __func__,
-                __LINE__, loc_get_v02_client_status_name(status));
-      rtv = LOC_API_ADAPTER_ERR_FAILURE;
-    }
-  } else if (newMask != mMask) {
-    // it is important to cap the mask here, because not all LocApi's
-    // can enable the same bits, e.g. foreground and bckground.
-    if (!registerEventMask(qmiMask)) {
-      // we do not update mMask here, because it did not change
-      // as the mask update has failed.
-      rtv = LOC_API_ADAPTER_ERR_FAILURE;
-    }
-    else {
-        mMask = newMask;
-        mQmiMask = qmiMask;
-    }
-  }
-  LOC_LOGD("%s:%d]: Exit mMask: %x; mask: %x mQmiMask: %llx qmiMask: %llx",
-           __func__, __LINE__, mMask, mask, mQmiMask, qmiMask);
-
-  if (LOC_API_ADAPTER_ERR_SUCCESS == rtv) {
-      cacheGnssMeasurementSupport();
-  }
-
-  return rtv;
-}
-
-bool LocApiV02 :: registerEventMask(locClientEventMaskType qmiMask)
-{
-    if (!mInSession) {
-        qmiMask = adjustMaskForNoSession(qmiMask);
-    }
-    LOC_LOGD("%s:%d]: mQmiMask=%lld qmiMask=%lld",
-             __func__, __LINE__, mQmiMask, qmiMask);
-    return locClientRegisterEventMask(clientHandle, qmiMask);
-}
-
-locClientEventMaskType LocApiV02 :: adjustMaskForNoSession(locClientEventMaskType qmiMask)
-{
-    LOC_LOGD("%s:%d]: before qmiMask=%lld",
-             __func__, __LINE__, qmiMask);
-    locClientEventMaskType clearMask = QMI_LOC_EVENT_MASK_POSITION_REPORT_V02 |
-                                       QMI_LOC_EVENT_MASK_GNSS_SV_INFO_V02 |
-                                       QMI_LOC_EVENT_MASK_NMEA_V02 |
-                                       QMI_LOC_EVENT_MASK_ENGINE_STATE_V02 |
-                                       QMI_LOC_EVENT_MASK_GNSS_MEASUREMENT_REPORT_V02;
-
-    qmiMask = qmiMask & ~clearMask;
-    LOC_LOGD("%s:%d]: after qmiMask=%lld",
-             __func__, __LINE__, qmiMask);
-    return qmiMask;
-}
-
-enum loc_api_adapter_err LocApiV02 :: close()
-{
-  enum loc_api_adapter_err rtv =
-      // success if either client is already invalid, or
-      // we successfully close the handle
-      (LOC_CLIENT_INVALID_HANDLE_VALUE == clientHandle ||
-       eLOC_CLIENT_SUCCESS == locClientClose(&clientHandle)) ?
-      LOC_API_ADAPTER_ERR_SUCCESS : LOC_API_ADAPTER_ERR_FAILURE;
-
-  mMask = 0;
-  clientHandle = LOC_CLIENT_INVALID_HANDLE_VALUE;
-
-  return rtv;
-}
-
-/* start positioning session */
-enum loc_api_adapter_err LocApiV02 :: startFix(const LocPosMode& fixCriteria)
-{
-  locClientStatusEnumType status;
-  locClientReqUnionType req_union;
-
-  qmiLocStartReqMsgT_v02 start_msg;
-
-  qmiLocSetOperationModeReqMsgT_v02 set_mode_msg;
-  qmiLocSetOperationModeIndMsgT_v02 set_mode_ind;
-
-    // clear all fields, validity masks
-  memset (&start_msg, 0, sizeof(start_msg));
-  memset (&set_mode_msg, 0, sizeof(set_mode_msg));
-  memset (&set_mode_ind, 0, sizeof(set_mode_ind));
-
-  LOC_LOGV("%s:%d]: start \n", __func__, __LINE__);
-  fixCriteria.logv();
-
-  mInSession = true;
-  registerEventMask(mQmiMask);
-
-  // fill in the start request
-  switch(fixCriteria.mode)
-  {
-    case LOC_POSITION_MODE_MS_BASED:
-      set_mode_msg.operationMode = eQMI_LOC_OPER_MODE_MSB_V02;
-      break;
-
-    case LOC_POSITION_MODE_MS_ASSISTED:
-      set_mode_msg.operationMode = eQMI_LOC_OPER_MODE_MSA_V02;
-      break;
-
-    case LOC_POSITION_MODE_RESERVED_4:
-      set_mode_msg.operationMode = eQMI_LOC_OPER_MODE_CELL_ID_V02;
-        break;
-
-    case LOC_POSITION_MODE_RESERVED_5:
-      set_mode_msg.operationMode = eQMI_LOC_OPER_MODE_WWAN_V02;
-        break;
-
-    default:
-      set_mode_msg.operationMode = eQMI_LOC_OPER_MODE_STANDALONE_V02;
-      break;
-  }
-
-  req_union.pSetOperationModeReq = &set_mode_msg;
-
-  // send the mode first, before the start message.
-  status = loc_sync_send_req(clientHandle,
-                             QMI_LOC_SET_OPERATION_MODE_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_SET_OPERATION_MODE_IND_V02,
-                             &set_mode_ind); // NULL?
-
-  if (status != eLOC_CLIENT_SUCCESS ||
-      eQMI_LOC_SUCCESS_V02 != set_mode_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: set opertion mode failed status = %s, "
-                   "ind..status = %s\n", __func__, __LINE__,
-              loc_get_v02_client_status_name(status),
-              loc_get_v02_qmi_status_name(set_mode_ind.status));
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE; // error
-  }
-
-  start_msg.minInterval_valid = 1;
-  start_msg.minInterval = fixCriteria.min_interval;
-
-  if (fixCriteria.preferred_accuracy >= 0) {
-      start_msg.horizontalAccuracyLevel_valid = 1;
-
-      if (fixCriteria.preferred_accuracy <= 100)
-      {
-          // fix needs high accuracy
-          start_msg.horizontalAccuracyLevel =  eQMI_LOC_ACCURACY_HIGH_V02;
-      }
-      else if (fixCriteria.preferred_accuracy <= 1000)
-      {
-          //fix needs med accuracy
-          start_msg.horizontalAccuracyLevel =  eQMI_LOC_ACCURACY_MED_V02;
-      }
-      else
-      {
-          //fix needs low accuracy
-          start_msg.horizontalAccuracyLevel =  eQMI_LOC_ACCURACY_LOW_V02;
-      }
-  }
-
-  start_msg.fixRecurrence_valid = 1;
-  if(GPS_POSITION_RECURRENCE_SINGLE == fixCriteria.recurrence)
-  {
-    start_msg.fixRecurrence = eQMI_LOC_RECURRENCE_SINGLE_V02;
-  }
-  else
-  {
-    start_msg.fixRecurrence = eQMI_LOC_RECURRENCE_PERIODIC_V02;
-  }
-
-  //dummy session id
-  // TBD: store session ID, check for session id in pos reports.
-  start_msg.sessionId = LOC_API_V02_DEF_SESSION_ID;
-
-  if (fixCriteria.credentials[0] != 0) {
-      int size1 = sizeof(start_msg.applicationId.applicationName);
-      int size2 = sizeof(fixCriteria.credentials);
-      int len = ((size1 < size2) ? size1 : size2) - 1;
-      memcpy(start_msg.applicationId.applicationName,
-             fixCriteria.credentials,
-             len);
-
-      size1 = sizeof(start_msg.applicationId.applicationProvider);
-      size2 = sizeof(fixCriteria.provider);
-      len = ((size1 < size2) ? size1 : size2) - 1;
-      memcpy(start_msg.applicationId.applicationProvider,
-             fixCriteria.provider,
-             len);
-
-      start_msg.applicationId_valid = 1;
-  }
-
-  // config Altitude Assumed
-  start_msg.configAltitudeAssumed_valid = 1;
-  start_msg.configAltitudeAssumed = eQMI_LOC_ALTITUDE_ASSUMED_IN_GNSS_SV_INFO_DISABLED_V02;
-
-  req_union.pStartReq = &start_msg;
-
-  status = locClientSendReq (clientHandle, QMI_LOC_START_REQ_V02,
-                            req_union );
-
-  if( eLOC_CLIENT_SUCCESS == status)
-  {
-    return LOC_API_ADAPTER_ERR_SUCCESS;
-  }
-
-  return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-}
-
-/* stop a positioning session */
-enum loc_api_adapter_err LocApiV02 :: stopFix()
-{
-  locClientStatusEnumType status;
-  locClientReqUnionType req_union;
-
-  qmiLocStopReqMsgT_v02 stop_msg;
-
-  LOC_LOGD(" %s:%d]: stop called \n", __func__, __LINE__);
-
-  memset(&stop_msg, 0, sizeof(stop_msg));
-
-  // dummy session id
-  stop_msg.sessionId = LOC_API_V02_DEF_SESSION_ID;
-
-  req_union.pStopReq = &stop_msg;
-
-  status = locClientSendReq(clientHandle,
-                            QMI_LOC_STOP_REQ_V02,
-                            req_union);
-
-  mInSession = false;
-  // if engine on never happend, deregister events
-  // without waiting for Engine Off
-  if (!mEngineOn) {
-      registerEventMask(mQmiMask);
-  }
-
-  if( eLOC_CLIENT_SUCCESS == status)
-  {
-    return LOC_API_ADAPTER_ERR_SUCCESS;
-  }
-
-  LOC_LOGE("%s:%d]: error = %s\n",__func__, __LINE__,
-           loc_get_v02_client_status_name(status));
-  return (LOC_API_ADAPTER_ERR_GENERAL_FAILURE);
-}
-
-/* set the positioning fix criteria */
-enum loc_api_adapter_err LocApiV02 :: setPositionMode(
-  const LocPosMode& posMode)
-{
-    if(isInSession())
-    {
-        //fix is in progress, send a restart
-        LOC_LOGD ("%s:%d]: fix is in progress restarting the fix with new "
-                  "criteria\n", __func__, __LINE__);
-
-        return( startFix(posMode));
-    }
-
-    return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* inject time into the position engine */
-enum loc_api_adapter_err LocApiV02 ::
-    setTime(GpsUtcTime time, int64_t timeReference, int uncertainty)
-{
-  locClientReqUnionType req_union;
-  locClientStatusEnumType status;
-  qmiLocInjectUtcTimeReqMsgT_v02  inject_time_msg;
-  qmiLocInjectUtcTimeIndMsgT_v02 inject_time_ind;
-
-  memset(&inject_time_msg, 0, sizeof(inject_time_msg));
-
-  inject_time_ind.status = eQMI_LOC_GENERAL_FAILURE_V02;
-
-  inject_time_msg.timeUtc = time;
-
-  inject_time_msg.timeUtc += (int64_t)(ELAPSED_MILLIS_SINCE_BOOT_PLATFORM_LIB_ABSTRACTION - timeReference);
-
-  inject_time_msg.timeUnc = uncertainty;
-
-  req_union.pInjectUtcTimeReq = &inject_time_msg;
-
-  LOC_LOGV ("%s:%d]: uncertainty = %d\n", __func__, __LINE__,
-                 uncertainty);
-
-  status = loc_sync_send_req(clientHandle,
-                             QMI_LOC_INJECT_UTC_TIME_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_INJECT_UTC_TIME_IND_V02,
-                             &inject_time_ind);
-
-  if (status != eLOC_CLIENT_SUCCESS ||
-      eQMI_LOC_SUCCESS_V02 != inject_time_ind.status)
-  {
-    LOC_LOGE ("%s:%d] status = %s, ind..status = %s\n", __func__,  __LINE__,
-              loc_get_v02_client_status_name(status),
-              loc_get_v02_qmi_status_name(inject_time_ind.status));
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* inject position into the position engine */
-enum loc_api_adapter_err LocApiV02 ::
-    injectPosition(double latitude, double longitude, float accuracy)
-{
-  locClientReqUnionType req_union;
-  locClientStatusEnumType status;
-  qmiLocInjectPositionReqMsgT_v02 inject_pos_msg;
-  qmiLocInjectPositionIndMsgT_v02 inject_pos_ind;
-
-  memset(&inject_pos_msg, 0, sizeof(inject_pos_msg));
-
-  inject_pos_msg.latitude_valid = 1;
-  inject_pos_msg.latitude = latitude;
-
-  inject_pos_msg.longitude_valid = 1;
-  inject_pos_msg.longitude = longitude;
-
-  inject_pos_msg.horUncCircular_valid = 1;
-
-  inject_pos_msg.horUncCircular = accuracy; //meters assumed
-
-  inject_pos_msg.horConfidence_valid = 1;
-
-  inject_pos_msg.horConfidence = 63; // 63% (1 std dev assumed)
-
-    /* Log */
-  LOC_LOGD("%s:%d]: Lat=%lf, Lon=%lf, Acc=%.2lf\n", __func__, __LINE__,
-                inject_pos_msg.latitude, inject_pos_msg.longitude,
-                inject_pos_msg.horUncCircular);
-
-  req_union.pInjectPositionReq = &inject_pos_msg;
-
-  status = loc_sync_send_req(clientHandle,
-                             QMI_LOC_INJECT_POSITION_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_INJECT_POSITION_IND_V02,
-                             &inject_pos_ind);
-
-  if (status != eLOC_CLIENT_SUCCESS ||
-      eQMI_LOC_SUCCESS_V02 != inject_pos_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: error! status = %s, inject_pos_ind.status = %s\n",
-              __func__, __LINE__,
-              loc_get_v02_client_status_name(status),
-              loc_get_v02_qmi_status_name(inject_pos_ind.status));
-
-   return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* delete assistance date */
-enum loc_api_adapter_err LocApiV02 ::  deleteAidingData(GpsAidingData f)
-{
-  locClientReqUnionType req_union;
-  locClientStatusEnumType status;
-  qmiLocDeleteAssistDataReqMsgT_v02 delete_req;
-  qmiLocDeleteAssistDataIndMsgT_v02 delete_resp;
-
-  memset(&delete_req, 0, sizeof(delete_req));
-  memset(&delete_resp, 0, sizeof(delete_resp));
-
-  if( f == GPS_DELETE_ALL )
-  {
-    delete_req.deleteAllFlag = true;
-  }
-
-  else
-  {
-    /* to keep track of svInfoList for GPS and GLO*/
-    uint32_t curr_sv_len = 0;
-    uint32_t curr_sv_idx = 0;
-    uint32_t sv_id =  0;
-
-    if((f & GPS_DELETE_EPHEMERIS ) || ( f & GPS_DELETE_ALMANAC ))
-    {
-      /* do delete for all GPS SV's */
-
-      curr_sv_len += SV_ID_RANGE;
-
-      sv_id = GPS_SV_ID_OFFSET;
-
-      delete_req.deleteSvInfoList_valid = 1;
-
-      delete_req.deleteSvInfoList_len = curr_sv_len;
-
-      LOC_LOGV("%s:%d]: Delete GPS SV info for index %d to %d"
-                    "and sv id %d to %d \n",
-                    __func__, __LINE__, curr_sv_idx, curr_sv_len - 1,
-                    sv_id, sv_id+SV_ID_RANGE);
-
-      for( uint32_t i = curr_sv_idx; i< curr_sv_len ; i++, sv_id++ )
-      {
-        delete_req.deleteSvInfoList[i].gnssSvId = sv_id;
-
-        delete_req.deleteSvInfoList[i].system = eQMI_LOC_SV_SYSTEM_GPS_V02;
-
-        if(f & GPS_DELETE_EPHEMERIS )
-        {
-          // set ephemeris mask for all GPS SV's
-          delete_req.deleteSvInfoList[i].deleteSvInfoMask |=
-            QMI_LOC_MASK_DELETE_EPHEMERIS_V02;
-        }
-
-        if( f & GPS_DELETE_ALMANAC )
-        {
-          delete_req.deleteSvInfoList[i].deleteSvInfoMask |=
-            QMI_LOC_MASK_DELETE_ALMANAC_V02;
-        }
-      }
-      // increment the current index
-      curr_sv_idx += SV_ID_RANGE;
-
-    }
-
-    if( f & GPS_DELETE_TIME_GPS )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_GPS_TIME_V02;
-    }
-
-    if(f & GPS_DELETE_POSITION )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_POSITION_V02;
-    }
-
-    if(f & GPS_DELETE_TIME )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_TIME_V02;
-    }
-
-    if(f & GPS_DELETE_IONO )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_IONO_V02;
-    }
-
-    if(f & GPS_DELETE_UTC )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_UTC_V02;
-    }
-
-    if(f & GPS_DELETE_HEALTH )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_HEALTH_V02;
-    }
-
-    if(f & GPS_DELETE_SVDIR )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_GPS_SVDIR_V02;
-    }
-    if(f & GPS_DELETE_SADATA )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_SADATA_V02;
-    }
-    if(f & GPS_DELETE_RTI )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_RTI_V02;
-    }
-    if(f & GPS_DELETE_CELLDB_INFO )
-    {
-      delete_req.deleteCellDbDataMask_valid = 1;
-      delete_req.deleteCellDbDataMask =
-        ( QMI_LOC_MASK_DELETE_CELLDB_POS_V02 |
-          QMI_LOC_MASK_DELETE_CELLDB_LATEST_GPS_POS_V02 |
-          QMI_LOC_MASK_DELETE_CELLDB_OTA_POS_V02 |
-          QMI_LOC_MASK_DELETE_CELLDB_EXT_REF_POS_V02 |
-          QMI_LOC_MASK_DELETE_CELLDB_TIMETAG_V02 |
-          QMI_LOC_MASK_DELETE_CELLDB_CELLID_V02 |
-          QMI_LOC_MASK_DELETE_CELLDB_CACHED_CELLID_V02 |
-          QMI_LOC_MASK_DELETE_CELLDB_LAST_SRV_CELL_V02 |
-          QMI_LOC_MASK_DELETE_CELLDB_CUR_SRV_CELL_V02 |
-          QMI_LOC_MASK_DELETE_CELLDB_NEIGHBOR_INFO_V02) ;
-
-    }
-    if(f & GPS_DELETE_ALMANAC_CORR )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_GPS_ALM_CORR_V02;
-    }
-    if(f & GPS_DELETE_FREQ_BIAS_EST )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_FREQ_BIAS_EST_V02;
-    }
-    if ( (f & GPS_DELETE_EPHEMERIS_GLO ) || (f & GPS_DELETE_ALMANAC_GLO ))
-    {
-      /* do delete for all GLONASS SV's (65 - 96)
-      */
-      curr_sv_len += SV_ID_RANGE;
-
-      sv_id = GLONASS_SV_ID_OFFSET;
-
-      delete_req.deleteSvInfoList_valid = 1;
-
-      delete_req.deleteSvInfoList_len = curr_sv_len;
-
-      LOC_LOGV("%s:%d]: Delete GLO SV info for index %d to %d"
-                    "and sv id %d to %d \n",
-                    __func__, __LINE__, curr_sv_idx, curr_sv_len - 1,
-                    sv_id, sv_id+SV_ID_RANGE);
-
-
-      for( uint32_t i = curr_sv_idx; i< curr_sv_len ; i++, sv_id++ )
-      {
-        delete_req.deleteSvInfoList[i].gnssSvId = sv_id;
-
-        delete_req.deleteSvInfoList[i].system = eQMI_LOC_SV_SYSTEM_GLONASS_V02;
-
-        if(f & GPS_DELETE_EPHEMERIS )
-        {
-          // set ephemeris mask for all GPS SV's
-          delete_req.deleteSvInfoList[i].deleteSvInfoMask |=
-            QMI_LOC_MASK_DELETE_EPHEMERIS_V02;
-        }
-
-        if( f & GPS_DELETE_ALMANAC )
-        {
-          delete_req.deleteSvInfoList[i].deleteSvInfoMask |=
-            QMI_LOC_MASK_DELETE_ALMANAC_V02;
-        }
-      }
-      curr_sv_idx += SV_ID_RANGE;
-    }
-
-    if(f & GPS_DELETE_SVDIR_GLO )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_GLO_SVDIR_V02;
-    }
-
-    if(f & GPS_DELETE_SVSTEER_GLO )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_GLO_SVSTEER_V02;
-    }
-
-    if(f & GPS_DELETE_ALMANAC_CORR_GLO )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_GLO_ALM_CORR_V02;
-    }
-
-    if(f & GPS_DELETE_TIME_GLO )
-    {
-      delete_req.deleteGnssDataMask_valid = 1;
-      delete_req.deleteGnssDataMask |= QMI_LOC_MASK_DELETE_GLO_TIME_V02;
-    }
-  }
-
-  req_union.pDeleteAssistDataReq = &delete_req;
-
-  status = loc_sync_send_req(clientHandle,
-                             QMI_LOC_DELETE_ASSIST_DATA_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_DELETE_ASSIST_DATA_IND_V02,
-                             &delete_resp);
-
-  if (status != eLOC_CLIENT_SUCCESS ||
-      eQMI_LOC_SUCCESS_V02 != delete_resp.status)
-  {
-    LOC_LOGE ("%s:%d]: error! status = %s, delete_resp.status = %s\n",
-              __func__, __LINE__,
-              loc_get_v02_client_status_name(status),
-              loc_get_v02_qmi_status_name(delete_resp.status));
-
-   return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* send NI user repsonse to the engine */
-enum loc_api_adapter_err LocApiV02 ::
-    informNiResponse(GpsUserResponseType userResponse,
-                     const void* passThroughData)
-{
-  locClientReqUnionType req_union;
-  locClientStatusEnumType status;
-
-  qmiLocNiUserRespReqMsgT_v02 ni_resp;
-  qmiLocNiUserRespIndMsgT_v02 ni_resp_ind;
-
-  qmiLocEventNiNotifyVerifyReqIndMsgT_v02 *request_pass_back =
-    (qmiLocEventNiNotifyVerifyReqIndMsgT_v02 *)passThroughData;
-
-  memset(&ni_resp,0, sizeof(ni_resp));
-
-  memset(&ni_resp_ind,0, sizeof(ni_resp_ind));
-
-  switch (userResponse)
-  {
-    case GPS_NI_RESPONSE_ACCEPT:
-      ni_resp.userResp = eQMI_LOC_NI_LCS_NOTIFY_VERIFY_ACCEPT_V02;
-      break;
-   case GPS_NI_RESPONSE_DENY:
-      ni_resp.userResp = eQMI_LOC_NI_LCS_NOTIFY_VERIFY_DENY_V02;
-      break;
-   case GPS_NI_RESPONSE_NORESP:
-      ni_resp.userResp = eQMI_LOC_NI_LCS_NOTIFY_VERIFY_NORESP_V02;
-      break;
-   default:
-      return LOC_API_ADAPTER_ERR_INVALID_PARAMETER;
-  }
-
-  LOC_LOGV(" %s:%d]: NI response: %d\n", __func__, __LINE__,
-                ni_resp.userResp);
-
-  ni_resp.notificationType = request_pass_back->notificationType;
-
-  // copy SUPL payload from request
-  if(request_pass_back->NiSuplInd_valid == 1)
-  {
-     ni_resp.NiSuplPayload_valid = 1;
-     memcpy(&(ni_resp.NiSuplPayload), &(request_pass_back->NiSuplInd),
-            sizeof(qmiLocNiSuplNotifyVerifyStructT_v02));
-
-  }
-  // should this be an "else if"?? we don't need to decide
-
-  // copy UMTS-CP payload from request
-  if( request_pass_back->NiUmtsCpInd_valid == 1 )
-  {
-     ni_resp.NiUmtsCpPayload_valid = 1;
-     memcpy(&(ni_resp.NiUmtsCpPayload), &(request_pass_back->NiUmtsCpInd),
-            sizeof(qmiLocNiUmtsCpNotifyVerifyStructT_v02));
-  }
-
-  //copy Vx payload from the request
-  if( request_pass_back->NiVxInd_valid == 1)
-  {
-     ni_resp.NiVxPayload_valid = 1;
-     memcpy(&(ni_resp.NiVxPayload), &(request_pass_back->NiVxInd),
-            sizeof(qmiLocNiVxNotifyVerifyStructT_v02));
-  }
-
-  // copy Vx service interaction payload from the request
-  if(request_pass_back->NiVxServiceInteractionInd_valid == 1)
-  {
-     ni_resp.NiVxServiceInteractionPayload_valid = 1;
-     memcpy(&(ni_resp.NiVxServiceInteractionPayload),
-            &(request_pass_back->NiVxServiceInteractionInd),
-            sizeof(qmiLocNiVxServiceInteractionStructT_v02));
-  }
-
-  // copy Network Initiated SUPL Version 2 Extension
-  if (request_pass_back->NiSuplVer2ExtInd_valid == 1)
-  {
-     ni_resp.NiSuplVer2ExtPayload_valid = 1;
-     memcpy(&(ni_resp.NiSuplVer2ExtPayload),
-            &(request_pass_back->NiSuplVer2ExtInd),
-            sizeof(qmiLocNiSuplVer2ExtStructT_v02));
-  }
-
-  // copy SUPL Emergency Notification
-  if(request_pass_back->suplEmergencyNotification_valid)
-  {
-     ni_resp.suplEmergencyNotification_valid = 1;
-     memcpy(&(ni_resp.suplEmergencyNotification),
-            &(request_pass_back->suplEmergencyNotification),
-            sizeof(qmiLocEmergencyNotificationStructT_v02));
-  }
-
-  req_union.pNiUserRespReq = &ni_resp;
-
-  status = loc_sync_send_req (
-     clientHandle, QMI_LOC_NI_USER_RESPONSE_REQ_V02,
-     req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-     QMI_LOC_NI_USER_RESPONSE_IND_V02, &ni_resp_ind);
-
-  if (status != eLOC_CLIENT_SUCCESS ||
-      eQMI_LOC_SUCCESS_V02 != ni_resp_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: error! status = %s, ni_resp_ind.status = %s\n",
-              __func__, __LINE__,
-              loc_get_v02_client_status_name(status),
-              loc_get_v02_qmi_status_name(ni_resp_ind.status));
-
-   return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* Set UMTs SLP server URL */
-enum loc_api_adapter_err LocApiV02 :: setServer(
-  const char* url, int len)
-{
-  locClientReqUnionType req_union;
-  locClientStatusEnumType status;
-  qmiLocSetServerReqMsgT_v02 set_server_req;
-  qmiLocSetServerIndMsgT_v02 set_server_ind;
-
-  if(len < 0 || len > sizeof(set_server_req.urlAddr))
-  {
-    LOC_LOGE("%s:%d]: len = %d greater than max allowed url length\n",
-                  __func__, __LINE__, len);
-
-    return LOC_API_ADAPTER_ERR_INVALID_PARAMETER;
-  }
-
-  memset(&set_server_req, 0, sizeof(set_server_req));
-
-  LOC_LOGD("%s:%d]:, url = %s, len = %d\n", __func__, __LINE__, url, len);
-
-  set_server_req.serverType = eQMI_LOC_SERVER_TYPE_UMTS_SLP_V02;
-
-  set_server_req.urlAddr_valid = 1;
-
-  strlcpy(set_server_req.urlAddr, url, sizeof(set_server_req.urlAddr));
-
-  req_union.pSetServerReq = &set_server_req;
-
-  status = loc_sync_send_req(clientHandle,
-                             QMI_LOC_SET_SERVER_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_SET_SERVER_IND_V02,
-                             &set_server_ind);
-
-  if (status != eLOC_CLIENT_SUCCESS ||
-         eQMI_LOC_SUCCESS_V02 != set_server_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: error status = %s, set_server_ind.status = %s\n",
-              __func__,__LINE__,
-              loc_get_v02_client_status_name(status),
-              loc_get_v02_qmi_status_name(set_server_ind.status));
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-enum loc_api_adapter_err LocApiV02 ::
-    setServer(unsigned int ip, int port, LocServerType type)
-{
-  locClientReqUnionType req_union;
-  locClientStatusEnumType status;
-  qmiLocSetServerReqMsgT_v02 set_server_req;
-  qmiLocSetServerIndMsgT_v02 set_server_ind;
-  qmiLocServerTypeEnumT_v02 set_server_cmd;
-
-  switch (type) {
-  case LOC_AGPS_MPC_SERVER:
-      set_server_cmd = eQMI_LOC_SERVER_TYPE_CDMA_MPC_V02;
-      break;
-  case LOC_AGPS_CUSTOM_PDE_SERVER:
-      set_server_cmd = eQMI_LOC_SERVER_TYPE_CUSTOM_PDE_V02;
-      break;
-  default:
-      set_server_cmd = eQMI_LOC_SERVER_TYPE_CDMA_PDE_V02;
-      break;
-  }
-
-  memset(&set_server_req, 0, sizeof(set_server_req));
-
-  LOC_LOGD("%s:%d]:, ip = %u, port = %d\n", __func__, __LINE__, ip, port);
-
-  set_server_req.serverType = set_server_cmd;
-  set_server_req.ipv4Addr_valid = 1;
-  set_server_req.ipv4Addr.addr = ip;
-  set_server_req.ipv4Addr.port = port;
-
-  req_union.pSetServerReq = &set_server_req;
-
-  status = loc_sync_send_req(clientHandle,
-                             QMI_LOC_SET_SERVER_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_SET_SERVER_IND_V02,
-                             &set_server_ind);
-
-    if (status != eLOC_CLIENT_SUCCESS ||
-         eQMI_LOC_SUCCESS_V02 != set_server_ind.status)
-    {
-      LOC_LOGE ("%s:%d]: error status = %s, set_server_ind.status = %s\n",
-                __func__,__LINE__,
-                loc_get_v02_client_status_name(status),
-                loc_get_v02_qmi_status_name(set_server_ind.status));
-
-      return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-    }
-
-    return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* Inject XTRA data, this module breaks down the XTRA
-   file into "chunks" and injects them one at a time */
-enum loc_api_adapter_err LocApiV02 :: setXtraData(
-  char* data, int length)
-{
-  locClientStatusEnumType status = eLOC_CLIENT_SUCCESS;
-  int     total_parts;
-  uint8_t   part;
-  uint16_t  len_injected;
-
-  locClientReqUnionType req_union;
-  qmiLocInjectPredictedOrbitsDataReqMsgT_v02 inject_xtra;
-  qmiLocInjectPredictedOrbitsDataIndMsgT_v02 inject_xtra_ind;
-
-  req_union.pInjectPredictedOrbitsDataReq = &inject_xtra;
-
-  LOC_LOGD("%s:%d]: xtra size = %d\n", __func__, __LINE__, length);
-
-  inject_xtra.formatType_valid = 1;
-  inject_xtra.formatType = eQMI_LOC_PREDICTED_ORBITS_XTRA_V02;
-  inject_xtra.totalSize = length;
-
-  total_parts = ((length - 1) / QMI_LOC_MAX_PREDICTED_ORBITS_PART_LEN_V02) + 1;
-
-  inject_xtra.totalParts = total_parts;
-
-  len_injected = 0; // O bytes injected
-
-  // XTRA injection starts with part 1
-  for (part = 1; part <= total_parts; part++)
-  {
-    inject_xtra.partNum = part;
-
-    if (QMI_LOC_MAX_PREDICTED_ORBITS_PART_LEN_V02 > (length - len_injected))
-    {
-      inject_xtra.partData_len = length - len_injected;
-    }
-    else
-    {
-      inject_xtra.partData_len = QMI_LOC_MAX_PREDICTED_ORBITS_PART_LEN_V02;
-    }
-
-    // copy data into the message
-    memcpy(inject_xtra.partData, data+len_injected, inject_xtra.partData_len);
-
-    LOC_LOGD("[%s:%d] part %d/%d, len = %d, total injected = %d\n",
-                  __func__, __LINE__,
-                  inject_xtra.partNum, total_parts, inject_xtra.partData_len,
-                  len_injected);
-
-    status = loc_sync_send_req( clientHandle,
-                                QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_REQ_V02,
-                                req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                                QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_IND_V02,
-                                &inject_xtra_ind);
-
-    if (status != eLOC_CLIENT_SUCCESS ||
-        eQMI_LOC_SUCCESS_V02 != inject_xtra_ind.status ||
-        inject_xtra.partNum != inject_xtra_ind.partNum)
-    {
-      LOC_LOGE ("%s:%d]: failed status = %s, inject_pos_ind.status = %s,"
-                     " part num = %d, ind.partNum = %d\n", __func__, __LINE__,
-                loc_get_v02_client_status_name(status),
-                loc_get_v02_qmi_status_name(inject_xtra_ind.status),
-                inject_xtra.partNum, inject_xtra_ind.partNum);
-
-      return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-      break;
-    }
-
-    len_injected += inject_xtra.partData_len;
-    LOC_LOGD("%s:%d]: XTRA injected length: %d\n", __func__, __LINE__,
-        len_injected);
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* Request the Xtra Server Url from the modem */
-enum loc_api_adapter_err LocApiV02 :: requestXtraServer()
-{
-  locClientStatusEnumType status = eLOC_CLIENT_SUCCESS;
-
-  locClientReqUnionType req_union;
-  qmiLocGetPredictedOrbitsDataSourceIndMsgT_v02 request_xtra_server_ind;
-
-  status = loc_sync_send_req( clientHandle,
-                              QMI_LOC_GET_PREDICTED_ORBITS_DATA_SOURCE_REQ_V02,
-                              req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                              QMI_LOC_GET_PREDICTED_ORBITS_DATA_SOURCE_IND_V02,
-                              &request_xtra_server_ind);
-
-  if (status != eLOC_CLIENT_SUCCESS ||
-      eQMI_LOC_SUCCESS_V02 != request_xtra_server_ind.status ||
-      false == request_xtra_server_ind.serverList_valid ||
-      0 == request_xtra_server_ind.serverList.serverList_len)
-  {
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-
-  if (request_xtra_server_ind.serverList.serverList_len == 1)
-  {
-    reportXtraServer(request_xtra_server_ind.serverList.serverList[0].serverUrl,
-                     "",
-                     "",
-                     QMI_LOC_MAX_SERVER_ADDR_LENGTH_V02);
-  }
-  else if (request_xtra_server_ind.serverList.serverList_len == 2)
-  {
-    reportXtraServer(request_xtra_server_ind.serverList.serverList[0].serverUrl,
-                     request_xtra_server_ind.serverList.serverList[1].serverUrl,
-                     "",
-                     QMI_LOC_MAX_SERVER_ADDR_LENGTH_V02);
-  }
-  else
-  {
-    reportXtraServer(request_xtra_server_ind.serverList.serverList[0].serverUrl,
-                     request_xtra_server_ind.serverList.serverList[1].serverUrl,
-                     request_xtra_server_ind.serverList.serverList[2].serverUrl,
-                     QMI_LOC_MAX_SERVER_ADDR_LENGTH_V02);
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-enum loc_api_adapter_err LocApiV02 :: atlOpenStatus(
-  int handle, int is_succ, char* apn, AGpsBearerType bear,
-  AGpsType agpsType)
-{
-  locClientStatusEnumType result = eLOC_CLIENT_SUCCESS;
-  locClientReqUnionType req_union;
-  qmiLocInformLocationServerConnStatusReqMsgT_v02 conn_status_req;
-  qmiLocInformLocationServerConnStatusIndMsgT_v02 conn_status_ind;
-
-
-  LOC_LOGD("%s:%d]: ATL open handle = %d, is_succ = %d, "
-                "APN = [%s], bearer = %d \n",  __func__, __LINE__,
-                handle, is_succ, apn, bear);
-
-  memset(&conn_status_req, 0, sizeof(conn_status_req));
-  memset(&conn_status_ind, 0, sizeof(conn_status_ind));
-
-        // Fill in data
-  conn_status_req.connHandle = handle;
-
-  conn_status_req.requestType = eQMI_LOC_SERVER_REQUEST_OPEN_V02;
-
-  if(is_succ)
-  {
-    conn_status_req.statusType = eQMI_LOC_SERVER_REQ_STATUS_SUCCESS_V02;
-
-    if(apn != NULL)
-        strlcpy(conn_status_req.apnProfile.apnName, apn,
-                sizeof(conn_status_req.apnProfile.apnName) );
-
-    switch(bear)
-    {
-    case AGPS_APN_BEARER_IPV4:
-        conn_status_req.apnProfile.pdnType =
-            eQMI_LOC_APN_PROFILE_PDN_TYPE_IPV4_V02;
-        conn_status_req.apnProfile_valid = 1;
-        break;
-
-    case AGPS_APN_BEARER_IPV6:
-        conn_status_req.apnProfile.pdnType =
-            eQMI_LOC_APN_PROFILE_PDN_TYPE_IPV6_V02;
-        conn_status_req.apnProfile_valid = 1;
-        break;
-
-    case AGPS_APN_BEARER_IPV4V6:
-        conn_status_req.apnProfile.pdnType =
-            eQMI_LOC_APN_PROFILE_PDN_TYPE_IPV4V6_V02;
-        conn_status_req.apnProfile_valid = 1;
-        break;
-
-    case AGPS_APN_BEARER_INVALID:
-        conn_status_req.apnProfile_valid = 0;
-        break;
-
-    default:
-        LOC_LOGE("%s:%d]:invalid bearer type\n",__func__,__LINE__);
-        conn_status_req.apnProfile_valid = 0;
-        return LOC_API_ADAPTER_ERR_INVALID_HANDLE;
-    }
-
-  }
-  else
-  {
-    conn_status_req.statusType = eQMI_LOC_SERVER_REQ_STATUS_FAILURE_V02;
-  }
-
-  req_union.pInformLocationServerConnStatusReq = &conn_status_req;
-
-  result = loc_sync_send_req(clientHandle,
-                             QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_IND_V02,
-                             &conn_status_ind);
-
-  if(result != eLOC_CLIENT_SUCCESS ||
-     eQMI_LOC_SUCCESS_V02 != conn_status_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: Error status = %s, ind..status = %s ",
-              __func__, __LINE__,
-              loc_get_v02_client_status_name(result),
-              loc_get_v02_qmi_status_name(conn_status_ind.status));
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-
-}
-
-
-/* close atl connection */
-enum loc_api_adapter_err LocApiV02 :: atlCloseStatus(
-  int handle, int is_succ)
-{
-  locClientStatusEnumType result = eLOC_CLIENT_SUCCESS;
-  locClientReqUnionType req_union;
-  qmiLocInformLocationServerConnStatusReqMsgT_v02 conn_status_req;
-  qmiLocInformLocationServerConnStatusIndMsgT_v02 conn_status_ind;
-
-  LOC_LOGD("%s:%d]: ATL close handle = %d, is_succ = %d\n",
-                 __func__, __LINE__,  handle, is_succ);
-
-  memset(&conn_status_req, 0, sizeof(conn_status_req));
-  memset(&conn_status_ind, 0, sizeof(conn_status_ind));
-
-        // Fill in data
-  conn_status_req.connHandle = handle;
-
-  conn_status_req.requestType = eQMI_LOC_SERVER_REQUEST_CLOSE_V02;
-
-  if(is_succ)
-  {
-    conn_status_req.statusType = eQMI_LOC_SERVER_REQ_STATUS_SUCCESS_V02;
-  }
-  else
-  {
-    conn_status_req.statusType = eQMI_LOC_SERVER_REQ_STATUS_FAILURE_V02;
-  }
-
-  req_union.pInformLocationServerConnStatusReq = &conn_status_req;
-
-  result = loc_sync_send_req(clientHandle,
-                             QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_IND_V02,
-                             &conn_status_ind);
-
-  if(result != eLOC_CLIENT_SUCCESS ||
-     eQMI_LOC_SUCCESS_V02 != conn_status_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: Error status = %s, ind..status = %s ",
-              __func__, __LINE__,
-              loc_get_v02_client_status_name(result),
-              loc_get_v02_qmi_status_name(conn_status_ind.status));
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* set the SUPL version */
-enum loc_api_adapter_err LocApiV02 :: setSUPLVersion(uint32_t version)
-{
-  locClientStatusEnumType result = eLOC_CLIENT_SUCCESS;
-  locClientReqUnionType req_union;
-
-  qmiLocSetProtocolConfigParametersReqMsgT_v02 supl_config_req;
-  qmiLocSetProtocolConfigParametersIndMsgT_v02 supl_config_ind;
-
-  LOC_LOGD("%s:%d]: supl version = %d\n",  __func__, __LINE__, version);
-
-
-  memset(&supl_config_req, 0, sizeof(supl_config_req));
-  memset(&supl_config_ind, 0, sizeof(supl_config_ind));
-
-   supl_config_req.suplVersion_valid = 1;
-   // SUPL version from MSByte to LSByte:
-   // (reserved)(major version)(minor version)(serviceIndicator)
-
-   supl_config_req.suplVersion = (version == 0x00020000)?
-     eQMI_LOC_SUPL_VERSION_2_0_V02 : eQMI_LOC_SUPL_VERSION_1_0_V02;
-
-  req_union.pSetProtocolConfigParametersReq = &supl_config_req;
-
-  result = loc_sync_send_req(clientHandle,
-                             QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_IND_V02,
-                             &supl_config_ind);
-
-  if(result != eLOC_CLIENT_SUCCESS ||
-     eQMI_LOC_SUCCESS_V02 != supl_config_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: Error status = %s, ind..status = %s ",
-              __func__, __LINE__,
-              loc_get_v02_client_status_name(result),
-              loc_get_v02_qmi_status_name(supl_config_ind.status));
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* set the configuration for LTE positioning profile (LPP) */
-enum loc_api_adapter_err LocApiV02 :: setLPPConfig(uint32_t profile)
-{
-  locClientStatusEnumType result = eLOC_CLIENT_SUCCESS;
-  locClientReqUnionType req_union;
-  qmiLocSetProtocolConfigParametersReqMsgT_v02 lpp_config_req;
-  qmiLocSetProtocolConfigParametersIndMsgT_v02 lpp_config_ind;
-
-  LOC_LOGD("%s:%d]: lpp profile = %d\n",  __func__, __LINE__, profile);
-
-  memset(&lpp_config_req, 0, sizeof(lpp_config_req));
-  memset(&lpp_config_ind, 0, sizeof(lpp_config_ind));
-
-  lpp_config_req.lppConfig_valid = 1;
-
-  lpp_config_req.lppConfig = profile;
-
-  req_union.pSetProtocolConfigParametersReq = &lpp_config_req;
-
-  result = loc_sync_send_req(clientHandle,
-                             QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_IND_V02,
-                             &lpp_config_ind);
-
-  if(result != eLOC_CLIENT_SUCCESS ||
-     eQMI_LOC_SUCCESS_V02 != lpp_config_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: Error status = %s, ind..status = %s ",
-              __func__, __LINE__,
-              loc_get_v02_client_status_name(result),
-              loc_get_v02_qmi_status_name(lpp_config_ind.status));
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* set the Sensor Configuration */
-enum loc_api_adapter_err LocApiV02 :: setSensorControlConfig(
-    int sensorsDisabled, int sensorProvider)
-{
-  locClientStatusEnumType result = eLOC_CLIENT_SUCCESS;
-  locClientReqUnionType req_union;
-
-  qmiLocSetSensorControlConfigReqMsgT_v02 sensor_config_req;
-  qmiLocSetSensorControlConfigIndMsgT_v02 sensor_config_ind;
-
-  LOC_LOGD("%s:%d]: sensors disabled = %d\n",  __func__, __LINE__, sensorsDisabled);
-
-  memset(&sensor_config_req, 0, sizeof(sensor_config_req));
-  memset(&sensor_config_ind, 0, sizeof(sensor_config_ind));
-
-  sensor_config_req.sensorsUsage_valid = 1;
-  sensor_config_req.sensorsUsage = (sensorsDisabled == 1) ? eQMI_LOC_SENSOR_CONFIG_SENSOR_USE_DISABLE_V02
-                                    : eQMI_LOC_SENSOR_CONFIG_SENSOR_USE_ENABLE_V02;
-
-  sensor_config_req.sensorProvider_valid = 1;
-  sensor_config_req.sensorProvider = (sensorProvider == 1 || sensorProvider == 4) ?
-      eQMI_LOC_SENSOR_CONFIG_USE_PROVIDER_SSC_V02 :
-      eQMI_LOC_SENSOR_CONFIG_USE_PROVIDER_NATIVE_V02;
-
-  req_union.pSetSensorControlConfigReq = &sensor_config_req;
-
-  result = loc_sync_send_req(clientHandle,
-                             QMI_LOC_SET_SENSOR_CONTROL_CONFIG_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_SET_SENSOR_CONTROL_CONFIG_IND_V02,
-                             &sensor_config_ind);
-
-  if(result != eLOC_CLIENT_SUCCESS ||
-     eQMI_LOC_SUCCESS_V02 != sensor_config_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: Error status = %s, ind..status = %s ",
-              __func__, __LINE__,
-              loc_get_v02_client_status_name(result),
-              loc_get_v02_qmi_status_name(sensor_config_ind.status));
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* set the Sensor Properties */
-enum loc_api_adapter_err LocApiV02 :: setSensorProperties(bool gyroBiasVarianceRandomWalk_valid, float gyroBiasVarianceRandomWalk,
-                            bool accelBiasVarianceRandomWalk_valid, float accelBiasVarianceRandomWalk,
-                            bool angleBiasVarianceRandomWalk_valid, float angleBiasVarianceRandomWalk,
-                            bool rateBiasVarianceRandomWalk_valid, float rateBiasVarianceRandomWalk,
-                            bool velocityBiasVarianceRandomWalk_valid, float velocityBiasVarianceRandomWalk)
-{
-  locClientStatusEnumType result = eLOC_CLIENT_SUCCESS;
-  locClientReqUnionType req_union;
-
-  qmiLocSetSensorPropertiesReqMsgT_v02 sensor_prop_req;
-  qmiLocSetSensorPropertiesIndMsgT_v02 sensor_prop_ind;
-
-  LOC_LOGI("%s:%d]: sensors prop: gyroBiasRandomWalk = %f, accelRandomWalk = %f, "
-           "angleRandomWalk = %f, rateRandomWalk = %f, velocityRandomWalk = %f\n",
-                 __func__, __LINE__, gyroBiasVarianceRandomWalk, accelBiasVarianceRandomWalk,
-           angleBiasVarianceRandomWalk, rateBiasVarianceRandomWalk, velocityBiasVarianceRandomWalk);
-
-  memset(&sensor_prop_req, 0, sizeof(sensor_prop_req));
-  memset(&sensor_prop_ind, 0, sizeof(sensor_prop_ind));
-
-  /* Set the validity bit and value for each sensor property */
-  sensor_prop_req.gyroBiasVarianceRandomWalk_valid = gyroBiasVarianceRandomWalk_valid;
-  sensor_prop_req.gyroBiasVarianceRandomWalk = gyroBiasVarianceRandomWalk;
-
-  sensor_prop_req.accelerationRandomWalkSpectralDensity_valid = accelBiasVarianceRandomWalk_valid;
-  sensor_prop_req.accelerationRandomWalkSpectralDensity = accelBiasVarianceRandomWalk;
-
-  sensor_prop_req.angleRandomWalkSpectralDensity_valid = angleBiasVarianceRandomWalk_valid;
-  sensor_prop_req.angleRandomWalkSpectralDensity = angleBiasVarianceRandomWalk;
-
-  sensor_prop_req.rateRandomWalkSpectralDensity_valid = rateBiasVarianceRandomWalk_valid;
-  sensor_prop_req.rateRandomWalkSpectralDensity = rateBiasVarianceRandomWalk;
-
-  sensor_prop_req.velocityRandomWalkSpectralDensity_valid = velocityBiasVarianceRandomWalk_valid;
-  sensor_prop_req.velocityRandomWalkSpectralDensity = velocityBiasVarianceRandomWalk;
-
-  req_union.pSetSensorPropertiesReq = &sensor_prop_req;
-
-  result = loc_sync_send_req(clientHandle,
-                             QMI_LOC_SET_SENSOR_PROPERTIES_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_SET_SENSOR_PROPERTIES_IND_V02,
-                             &sensor_prop_ind);
-
-  if(result != eLOC_CLIENT_SUCCESS ||
-     eQMI_LOC_SUCCESS_V02 != sensor_prop_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: Error status = %s, ind..status = %s ",
-              __func__, __LINE__,
-              loc_get_v02_client_status_name(result),
-              loc_get_v02_qmi_status_name(sensor_prop_ind.status));
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* set the Sensor Performance Config */
-enum loc_api_adapter_err LocApiV02 :: setSensorPerfControlConfig(int controlMode,
-                                                                        int accelSamplesPerBatch, int accelBatchesPerSec,
-                                                                        int gyroSamplesPerBatch, int gyroBatchesPerSec,
-                                                                        int accelSamplesPerBatchHigh, int accelBatchesPerSecHigh,
-                                                                        int gyroSamplesPerBatchHigh, int gyroBatchesPerSecHigh,
-                                                                        int algorithmConfig)
-{
-  locClientStatusEnumType result = eLOC_CLIENT_SUCCESS;
-  locClientReqUnionType req_union;
-
-  qmiLocSetSensorPerformanceControlConfigReqMsgT_v02 sensor_perf_config_req;
-  qmiLocSetSensorPerformanceControlConfigIndMsgT_v02 sensor_perf_config_ind;
-
-  LOC_LOGD("%s:%d]: Sensor Perf Control Config (performanceControlMode)(%u) "
-                "accel(#smp,#batches) (%u,%u) gyro(#smp,#batches) (%u,%u) "
-                "accel_high(#smp,#batches) (%u,%u) gyro_high(#smp,#batches) (%u,%u) "
-                "algorithmConfig(%u)\n",
-                __FUNCTION__,
-                __LINE__,
-                controlMode,
-                accelSamplesPerBatch,
-                accelBatchesPerSec,
-                gyroSamplesPerBatch,
-                gyroBatchesPerSec,
-                accelSamplesPerBatchHigh,
-                accelBatchesPerSecHigh,
-                gyroSamplesPerBatchHigh,
-                gyroBatchesPerSecHigh,
-                algorithmConfig
-                );
-
-  memset(&sensor_perf_config_req, 0, sizeof(sensor_perf_config_req));
-  memset(&sensor_perf_config_ind, 0, sizeof(sensor_perf_config_ind));
-
-  sensor_perf_config_req.performanceControlMode_valid = 1;
-  sensor_perf_config_req.performanceControlMode = (qmiLocSensorPerformanceControlModeEnumT_v02)controlMode;
-  sensor_perf_config_req.accelSamplingSpec_valid = 1;
-  sensor_perf_config_req.accelSamplingSpec.batchesPerSecond = accelBatchesPerSec;
-  sensor_perf_config_req.accelSamplingSpec.samplesPerBatch = accelSamplesPerBatch;
-  sensor_perf_config_req.gyroSamplingSpec_valid = 1;
-  sensor_perf_config_req.gyroSamplingSpec.batchesPerSecond = gyroBatchesPerSec;
-  sensor_perf_config_req.gyroSamplingSpec.samplesPerBatch = gyroSamplesPerBatch;
-  sensor_perf_config_req.accelSamplingSpecHigh_valid = 1;
-  sensor_perf_config_req.accelSamplingSpecHigh.batchesPerSecond = accelBatchesPerSecHigh;
-  sensor_perf_config_req.accelSamplingSpecHigh.samplesPerBatch = accelSamplesPerBatchHigh;
-  sensor_perf_config_req.gyroSamplingSpecHigh_valid = 1;
-  sensor_perf_config_req.gyroSamplingSpecHigh.batchesPerSecond = gyroBatchesPerSecHigh;
-  sensor_perf_config_req.gyroSamplingSpecHigh.samplesPerBatch = gyroSamplesPerBatchHigh;
-  sensor_perf_config_req.algorithmConfig_valid = 1;
-  sensor_perf_config_req.algorithmConfig = algorithmConfig;
-
-  req_union.pSetSensorPerformanceControlConfigReq = &sensor_perf_config_req;
-
-  result = loc_sync_send_req(clientHandle,
-                             QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_IND_V02,
-                             &sensor_perf_config_ind);
-
-  if(result != eLOC_CLIENT_SUCCESS ||
-     eQMI_LOC_SUCCESS_V02 != sensor_perf_config_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: Error status = %s, ind..status = %s ",
-              __func__, __LINE__,
-              loc_get_v02_client_status_name(result),
-              loc_get_v02_qmi_status_name(sensor_perf_config_ind.status));
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* set the External Power Config */
-enum loc_api_adapter_err LocApiV02 :: setExtPowerConfig(int isBatteryCharging)
-{
-  locClientStatusEnumType result = eLOC_CLIENT_SUCCESS;
-  locClientReqUnionType req_union;
-
-  qmiLocSetExternalPowerConfigReqMsgT_v02 ext_pwr_req;
-  qmiLocGetExternalPowerConfigIndMsgT_v02 ext_pwr_ind;
-
-  LOC_LOGI("%s:%d]: Ext Pwr Config (isBatteryCharging)(%u)",
-                __FUNCTION__,
-                __LINE__,
-                isBatteryCharging
-                );
-
-  memset(&ext_pwr_req, 0, sizeof(ext_pwr_req));
-  memset(&ext_pwr_ind, 0, sizeof(ext_pwr_ind));
-
-  switch(isBatteryCharging)
-  {
-    /* Charging */
-    case 1:
-      ext_pwr_req.externalPowerState = eQMI_LOC_EXTERNAL_POWER_CONNECTED_V02;
-      break;
-
-    /* Not charging */
-    case 0:
-      ext_pwr_req.externalPowerState = eQMI_LOC_EXTERNAL_POWER_NOT_CONNECTED_V02;
-      break;
-
-    default:
-      LOC_LOGE("%s:%d]: Invalid ext power state = %d!",
-                    __FUNCTION__,
-                    __LINE__,
-                    isBatteryCharging);
-      return LOC_API_ADAPTER_ERR_INVALID_PARAMETER;
-      break;
-  }
-
-  req_union.pSetExternalPowerConfigReq = &ext_pwr_req;
-
-  result = loc_sync_send_req(clientHandle,
-                             QMI_LOC_SET_EXTERNAL_POWER_CONFIG_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_SET_EXTERNAL_POWER_CONFIG_IND_V02,
-                             &ext_pwr_ind);
-
-  if(result != eLOC_CLIENT_SUCCESS ||
-     eQMI_LOC_SUCCESS_V02 != ext_pwr_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: Error status = %d, ind..status = %d ",
-                    __func__, __LINE__, result, ext_pwr_ind.status);
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* set the Positioning Protocol on A-GLONASS system */
-enum loc_api_adapter_err LocApiV02 :: setAGLONASSProtocol(unsigned long aGlonassProtocol)
-{
-  locClientStatusEnumType result = eLOC_CLIENT_SUCCESS;
-  locClientReqUnionType req_union;
-  qmiLocSetProtocolConfigParametersReqMsgT_v02 aGlonassProtocol_req;
-  qmiLocSetProtocolConfigParametersIndMsgT_v02 aGlonassProtocol_ind;
-
-  memset(&aGlonassProtocol_req, 0, sizeof(aGlonassProtocol_req));
-  memset(&aGlonassProtocol_ind, 0, sizeof(aGlonassProtocol_ind));
-
-  aGlonassProtocol_req.assistedGlonassProtocolMask_valid = 1;
-  aGlonassProtocol_req.assistedGlonassProtocolMask = aGlonassProtocol;
-
-  req_union.pSetProtocolConfigParametersReq = &aGlonassProtocol_req;
-
-  LOC_LOGD("%s:%d]: aGlonassProtocolMask = 0x%x\n",  __func__, __LINE__,
-                             aGlonassProtocol_req.assistedGlonassProtocolMask);
-
-  result = loc_sync_send_req(clientHandle,
-                             QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_REQ_V02,
-                             req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                             QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_IND_V02,
-                             &aGlonassProtocol_ind);
-
-  if(result != eLOC_CLIENT_SUCCESS ||
-     eQMI_LOC_SUCCESS_V02 != aGlonassProtocol_ind.status)
-  {
-    LOC_LOGE ("%s:%d]: Error status = %s, ind..status = %s ",
-              __func__, __LINE__,
-              loc_get_v02_client_status_name(result),
-              loc_get_v02_qmi_status_name(aGlonassProtocol_ind.status));
-
-    return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-  }
-  return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/* Convert event mask from loc eng to loc_api_v02 format */
-locClientEventMaskType LocApiV02 :: convertMask(
-  LOC_API_ADAPTER_EVENT_MASK_T mask)
-{
-  locClientEventMaskType eventMask = 0;
-  LOC_LOGD("%s:%d]: adapter mask = %u\n", __func__, __LINE__, mask);
-
-  if (mask & LOC_API_ADAPTER_BIT_PARSED_POSITION_REPORT)
-      eventMask |= QMI_LOC_EVENT_MASK_POSITION_REPORT_V02;
-
-  if (mask & LOC_API_ADAPTER_BIT_SATELLITE_REPORT)
-      eventMask |= QMI_LOC_EVENT_MASK_GNSS_SV_INFO_V02;
-
-  /* treat NMEA_1Hz and NMEA_POSITION_REPORT the same*/
-  if ((mask & LOC_API_ADAPTER_BIT_NMEA_POSITION_REPORT) ||
-      (mask & LOC_API_ADAPTER_BIT_NMEA_1HZ_REPORT) )
-      eventMask |= QMI_LOC_EVENT_MASK_NMEA_V02;
-
-  if (mask & LOC_API_ADAPTER_BIT_NI_NOTIFY_VERIFY_REQUEST)
-      eventMask |= QMI_LOC_EVENT_MASK_NI_NOTIFY_VERIFY_REQ_V02;
-
-  if (mask & LOC_API_ADAPTER_BIT_ASSISTANCE_DATA_REQUEST)
-  {
-    // TBD: This needs to be decoupled in the HAL
-    eventMask |= QMI_LOC_EVENT_MASK_INJECT_PREDICTED_ORBITS_REQ_V02;
-    eventMask |= QMI_LOC_EVENT_MASK_INJECT_TIME_REQ_V02;
-    eventMask |= QMI_LOC_EVENT_MASK_INJECT_POSITION_REQ_V02;
-  }
-
-  if (mask & LOC_API_ADAPTER_BIT_STATUS_REPORT)
-  {
-      eventMask |= (QMI_LOC_EVENT_MASK_ENGINE_STATE_V02);
-  }
-
-  if (mask & LOC_API_ADAPTER_BIT_LOCATION_SERVER_REQUEST)
-      eventMask |= QMI_LOC_EVENT_MASK_LOCATION_SERVER_CONNECTION_REQ_V02;
-
-  if (mask & LOC_API_ADAPTER_REQUEST_WIFI)
-      eventMask |= QMI_LOC_EVENT_MASK_WIFI_REQ_V02;
-
-  if (mask & LOC_API_ADAPTER_SENSOR_STATUS)
-      eventMask |= QMI_LOC_EVENT_MASK_SENSOR_STREAMING_READY_STATUS_V02;
-
-  if (mask & LOC_API_ADAPTER_REQUEST_TIME_SYNC)
-      eventMask |= QMI_LOC_EVENT_MASK_TIME_SYNC_REQ_V02;
-
-  if (mask & LOC_API_ADAPTER_REPORT_SPI)
-      eventMask |= QMI_LOC_EVENT_MASK_SET_SPI_STREAMING_REPORT_V02;
-
-  if (mask & LOC_API_ADAPTER_REPORT_NI_GEOFENCE)
-      eventMask |= QMI_LOC_EVENT_MASK_NI_GEOFENCE_NOTIFICATION_V02;
-
-  if (mask & LOC_API_ADAPTER_GEOFENCE_GEN_ALERT)
-      eventMask |= QMI_LOC_EVENT_MASK_GEOFENCE_GEN_ALERT_V02;
-
-  if (mask & LOC_API_ADAPTER_REPORT_GENFENCE_BREACH)
-      eventMask |= QMI_LOC_EVENT_MASK_GEOFENCE_BREACH_NOTIFICATION_V02;
-
-  if (mask & LOC_API_ADAPTER_BATCHED_GENFENCE_BREACH_REPORT)
-      eventMask |= QMI_LOC_EVENT_MASK_GEOFENCE_BATCH_BREACH_NOTIFICATION_V02;
-
-  if (mask & LOC_API_ADAPTER_PEDOMETER_CTRL)
-      eventMask |= QMI_LOC_EVENT_MASK_PEDOMETER_CONTROL_V02;
-
-  if (mask & LOC_API_ADAPTER_MOTION_CTRL)
-      eventMask |= QMI_LOC_EVENT_MASK_MOTION_DATA_CONTROL_V02;
-
-  if (mask & LOC_API_ADAPTER_REQUEST_WIFI_AP_DATA)
-      eventMask |= QMI_LOC_EVENT_MASK_INJECT_WIFI_AP_DATA_REQ_V02;
-
-  if(mask & LOC_API_ADAPTER_BIT_BATCH_FULL)
-      eventMask |= QMI_LOC_EVENT_MASK_BATCH_FULL_NOTIFICATION_V02;
-
-  if(mask & LOC_API_ADAPTER_BIT_BATCHED_POSITION_REPORT)
-      eventMask |= QMI_LOC_EVENT_MASK_LIVE_BATCHED_POSITION_REPORT_V02;
-
-  if (mask & LOC_API_ADAPTER_BIT_GNSS_MEASUREMENT)
-      eventMask |= QMI_LOC_EVENT_MASK_GNSS_MEASUREMENT_REPORT_V02;
-
-  return eventMask;
-}
-
-qmiLocLockEnumT_v02 LocApiV02 :: convertGpsLockMask(LOC_GPS_LOCK_MASK lockMask)
-{
-    if (isGpsLockAll(lockMask))
-        return eQMI_LOC_LOCK_ALL_V02;
-    if (isGpsLockMO(lockMask))
-        return eQMI_LOC_LOCK_MI_V02;
-    if (isGpsLockMT(lockMask))
-        return eQMI_LOC_LOCK_MT_V02;
-    if (isGpsLockNone(lockMask))
-        return eQMI_LOC_LOCK_NONE_V02;
-    return (qmiLocLockEnumT_v02)lockMask;
-}
-
-/* Convert error from loc_api_v02 to loc eng format*/
-enum loc_api_adapter_err LocApiV02 :: convertErr(
-  locClientStatusEnumType status)
-{
-  switch( status)
-  {
-    case LOC_API_ADAPTER_ERR_SUCCESS:
-      return LOC_API_ADAPTER_ERR_SUCCESS;
-
-    case eLOC_CLIENT_FAILURE_GENERAL:
-      return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-
-    case eLOC_CLIENT_FAILURE_UNSUPPORTED:
-      return LOC_API_ADAPTER_ERR_UNSUPPORTED;
-
-    case eLOC_CLIENT_FAILURE_INVALID_PARAMETER:
-      return LOC_API_ADAPTER_ERR_INVALID_PARAMETER;
-
-    case eLOC_CLIENT_FAILURE_ENGINE_BUSY:
-      return LOC_API_ADAPTER_ERR_ENGINE_BUSY;
-
-    case eLOC_CLIENT_FAILURE_PHONE_OFFLINE:
-      return LOC_API_ADAPTER_ERR_PHONE_OFFLINE;
-
-    case eLOC_CLIENT_FAILURE_TIMEOUT:
-      return LOC_API_ADAPTER_ERR_TIMEOUT;
-
-    case eLOC_CLIENT_FAILURE_INVALID_HANDLE:
-      return LOC_API_ADAPTER_ERR_INVALID_HANDLE;
-
-    case eLOC_CLIENT_FAILURE_SERVICE_NOT_PRESENT:
-      return LOC_API_ADAPTER_ERR_SERVICE_NOT_PRESENT;
-
-    default:
-      return LOC_API_ADAPTER_ERR_FAILURE;
-  }
-}
-
-/* convert position report to loc eng format and send the converted
-   position to loc eng */
-
-void LocApiV02 :: reportPosition (
-  const qmiLocEventPositionReportIndMsgT_v02 *location_report_ptr)
-{
-    UlpLocation location;
-    LocPosTechMask tech_Mask = LOC_POS_TECH_MASK_DEFAULT;
-    LOC_LOGD("Reporting postion from V2 Adapter\n");
-    memset(&location, 0, sizeof (UlpLocation));
-    location.size = sizeof(location);
-    GpsLocationExtended locationExtended;
-    memset(&locationExtended, 0, sizeof (GpsLocationExtended));
-    locationExtended.size = sizeof(locationExtended);
-    // Process the position from final and intermediate reports
-
-    if( (location_report_ptr->sessionStatus == eQMI_LOC_SESS_STATUS_SUCCESS_V02) ||
-        (location_report_ptr->sessionStatus == eQMI_LOC_SESS_STATUS_IN_PROGRESS_V02)
-        )
-    {
-        // Latitude & Longitude
-        if( (location_report_ptr->latitude_valid == 1 ) &&
-            (location_report_ptr->longitude_valid == 1)  &&
-            (location_report_ptr->latitude != 0 ||
-             location_report_ptr->longitude!= 0))
-        {
-            location.gpsLocation.flags  |= GPS_LOCATION_HAS_LAT_LONG;
-            location.gpsLocation.latitude  = location_report_ptr->latitude;
-            location.gpsLocation.longitude = location_report_ptr->longitude;
-
-            // Time stamp (UTC)
-            if(location_report_ptr->timestampUtc_valid == 1)
-            {
-                location.gpsLocation.timestamp = location_report_ptr->timestampUtc;
-            }
-
-            // Altitude
-            if(location_report_ptr->altitudeWrtEllipsoid_valid == 1  )
-            {
-                location.gpsLocation.flags  |= GPS_LOCATION_HAS_ALTITUDE;
-                location.gpsLocation.altitude = location_report_ptr->altitudeWrtEllipsoid;
-            }
-
-            // Speed
-            if((location_report_ptr->speedHorizontal_valid == 1) &&
-               (location_report_ptr->speedVertical_valid ==1 ) )
-            {
-                location.gpsLocation.flags  |= GPS_LOCATION_HAS_SPEED;
-                location.gpsLocation.speed = sqrt(
-                    (location_report_ptr->speedHorizontal *
-                     location_report_ptr->speedHorizontal) +
-                    (location_report_ptr->speedVertical *
-                     location_report_ptr->speedVertical) );
-            }
-
-            // Heading
-            if(location_report_ptr->heading_valid == 1)
-            {
-                location.gpsLocation.flags  |= GPS_LOCATION_HAS_BEARING;
-                location.gpsLocation.bearing = location_report_ptr->heading;
-            }
-
-            // Uncertainty (circular)
-            if( (location_report_ptr->horUncCircular_valid ) )
-            {
-                location.gpsLocation.flags  |= GPS_LOCATION_HAS_ACCURACY;
-                location.gpsLocation.accuracy = location_report_ptr->horUncCircular;
-            }
-
-            // Technology Mask
-            tech_Mask  |= location_report_ptr->technologyMask;
-
-            //Mark the location source as from GNSS
-            location.gpsLocation.flags |= LOCATION_HAS_SOURCE_INFO;
-            location.position_source = ULP_LOCATION_IS_FROM_GNSS;
-            if (location_report_ptr->magneticDeviation_valid)
-            {
-                locationExtended.flags |= GPS_LOCATION_EXTENDED_HAS_MAG_DEV;
-                locationExtended.magneticDeviation = location_report_ptr->magneticDeviation;
-            }
-
-            if (location_report_ptr->DOP_valid)
-            {
-                locationExtended.flags |= GPS_LOCATION_EXTENDED_HAS_DOP;
-                locationExtended.pdop = location_report_ptr->DOP.PDOP;
-                locationExtended.hdop = location_report_ptr->DOP.HDOP;
-                locationExtended.vdop = location_report_ptr->DOP.VDOP;
-            }
-
-            if (location_report_ptr->altitudeWrtMeanSeaLevel_valid)
-            {
-                locationExtended.flags |= GPS_LOCATION_EXTENDED_HAS_ALTITUDE_MEAN_SEA_LEVEL;
-                locationExtended.altitudeMeanSeaLevel = location_report_ptr->altitudeWrtMeanSeaLevel;
-            }
-
-            if (location_report_ptr->vertUnc_valid)
-            {
-               locationExtended.flags |= GPS_LOCATION_EXTENDED_HAS_VERT_UNC;
-               locationExtended.vert_unc = location_report_ptr->vertUnc;
-            }
-
-            if (location_report_ptr->speedUnc_valid )
-            {
-               locationExtended.flags |= GPS_LOCATION_EXTENDED_HAS_SPEED_UNC;
-               locationExtended.speed_unc = location_report_ptr->speedUnc;
-            }
-
-            LocApiBase::reportPosition( location,
-                            locationExtended,
-                            (void*)location_report_ptr,
-                            (location_report_ptr->sessionStatus
-                             == eQMI_LOC_SESS_STATUS_IN_PROGRESS_V02 ?
-                             LOC_SESS_INTERMEDIATE : LOC_SESS_SUCCESS),
-                            tech_Mask);
-        }
-    }
-    else
-    {
-        LocApiBase::reportPosition(location,
-                                   locationExtended,
-                                   NULL,
-                                   LOC_SESS_FAILURE);
-
-        LOC_LOGD("%s:%d]: Ignoring position report with sess status = %d, "
-                      "fix id = %u\n", __func__, __LINE__,
-                      location_report_ptr->sessionStatus,
-                      location_report_ptr->fixId );
-    }
-}
-
-/* convert satellite report to loc eng format and  send the converted
-   report to loc eng */
-void  LocApiV02 :: reportSv (
-  const qmiLocEventGnssSvInfoIndMsgT_v02 *gnss_report_ptr)
-{
-  GpsSvStatus      SvStatus;
-  GpsLocationExtended locationExtended;
-  int              num_svs_max, i;
-  const qmiLocSvInfoStructT_v02 *sv_info_ptr;
-
-  LOC_LOGV ("%s:%d]: num of sv = %d\n", __func__, __LINE__,
-                 gnss_report_ptr->svList_len);
-
-  num_svs_max = 0;
-  memset (&SvStatus, 0, sizeof (GpsSvStatus));
-  memset(&locationExtended, 0, sizeof (GpsLocationExtended));
-  locationExtended.size = sizeof(locationExtended);
-  if(gnss_report_ptr->svList_valid == 1)
-  {
-    num_svs_max = gnss_report_ptr->svList_len;
-    if(num_svs_max > GPS_MAX_SVS)
-    {
-      num_svs_max = GPS_MAX_SVS;
-    }
-    SvStatus.num_svs = 0;
-    for(i = 0; i < num_svs_max; i++)
-    {
-      sv_info_ptr = &(gnss_report_ptr->svList[i]);
-      if((sv_info_ptr->validMask & QMI_LOC_SV_INFO_MASK_VALID_SYSTEM_V02) &&
-         (sv_info_ptr->validMask & QMI_LOC_SV_INFO_MASK_VALID_GNSS_SVID_V02)
-         && (sv_info_ptr->gnssSvId != 0 ))
-      {
-        if(sv_info_ptr->system == eQMI_LOC_SV_SYSTEM_GPS_V02)
-        {
-          SvStatus.sv_list[SvStatus.num_svs].size = sizeof(GpsSvStatus);
-          SvStatus.sv_list[SvStatus.num_svs].prn = (int)sv_info_ptr->gnssSvId;
-
-          // We only have the data field to report gps eph and alm mask
-          if(sv_info_ptr->validMask &
-             QMI_LOC_SV_INFO_MASK_VALID_SVINFO_MASK_V02)
-          {
-            if(sv_info_ptr->svInfoMask &
-               QMI_LOC_SVINFO_MASK_HAS_EPHEMERIS_V02)
-            {
-              SvStatus.ephemeris_mask |= (1 << (sv_info_ptr->gnssSvId-1));
-            }
-            if(sv_info_ptr->svInfoMask &
-               QMI_LOC_SVINFO_MASK_HAS_ALMANAC_V02)
-            {
-              SvStatus.almanac_mask |= (1 << (sv_info_ptr->gnssSvId-1));
-            }
-          }
-
-          if((sv_info_ptr->validMask &
-              QMI_LOC_SV_INFO_MASK_VALID_PROCESS_STATUS_V02)
-             &&
-             (sv_info_ptr->svStatus == eQMI_LOC_SV_STATUS_TRACK_V02))
-          {
-            SvStatus.used_in_fix_mask |= (1 << (sv_info_ptr->gnssSvId-1));
-          }
-        }
-        // SBAS: GPS RPN: 120-151,
-        // In exteneded measurement report, we follow nmea standard,
-        // which is from 33-64.
-        else if(sv_info_ptr->system == eQMI_LOC_SV_SYSTEM_SBAS_V02)
-        {
-          SvStatus.sv_list[SvStatus.num_svs].prn =
-            sv_info_ptr->gnssSvId + 33 - 120;
-        }
-        // Gloness: Slot id: 1-32
-        // In extended measurement report, we follow nmea standard,
-        // which is 65-96
-        else if(sv_info_ptr->system == eQMI_LOC_SV_SYSTEM_GLONASS_V02)
-        {
-          SvStatus.sv_list[SvStatus.num_svs].prn =
-            sv_info_ptr->gnssSvId + (65-1);
-        }
-        // Unsupported SV system
-        else
-        {
-          continue;
-        }
-      }
-
-      if(sv_info_ptr->validMask & QMI_LOC_SV_INFO_MASK_VALID_SNR_V02 )
-      {
-        SvStatus.sv_list[SvStatus.num_svs].snr = sv_info_ptr->snr;
-      }
-
-      if(sv_info_ptr->validMask & QMI_LOC_SV_INFO_MASK_VALID_ELEVATION_V02)
-      {
-        SvStatus.sv_list[SvStatus.num_svs].elevation = sv_info_ptr->elevation;
-      }
-
-      if(sv_info_ptr->validMask & QMI_LOC_SV_INFO_MASK_VALID_AZIMUTH_V02)
-      {
-        SvStatus.sv_list[SvStatus.num_svs].azimuth = sv_info_ptr->azimuth;
-      }
-
-      SvStatus.num_svs++;
-    }
-  }
-
-  if (SvStatus.num_svs >= 0)
-  {
-    LOC_LOGV ("%s:%d]: firing SV callback\n", __func__, __LINE__);
-    LocApiBase::reportSv(SvStatus,
-                         locationExtended,
-                         (void*)gnss_report_ptr);
-  }
-}
-
-/* convert engine state report to loc eng format and send the converted
-   report to loc eng */
-void LocApiV02 :: reportEngineState (
-    const qmiLocEventEngineStateIndMsgT_v02 *engine_state_ptr)
-{
-
-  LOC_LOGV("%s:%d]: state = %d\n", __func__, __LINE__,
-                 engine_state_ptr->engineState);
-
-  struct MsgUpdateEngineState : public LocMsg {
-      LocApiV02* mpLocApiV02;
-      bool mEngineOn;
-      inline MsgUpdateEngineState(LocApiV02* pLocApiV02, bool engineOn) :
-                 LocMsg(), mpLocApiV02(pLocApiV02), mEngineOn(engineOn) {}
-      inline virtual void proc() const {
-          // If EngineOn is true and InSession is false and Engine is just turned off,
-          // then unregister the gps tracking specific event masks
-          if (mpLocApiV02->mEngineOn && !mpLocApiV02->mInSession && !mEngineOn) {
-              mpLocApiV02->registerEventMask(mpLocApiV02->mQmiMask);
-          }
-          mpLocApiV02->mEngineOn = mEngineOn;
-      }
-  };
-
-  if (engine_state_ptr->engineState == eQMI_LOC_ENGINE_STATE_ON_V02)
-  {
-    sendMsg(new MsgUpdateEngineState(this, true));
-    reportStatus(GPS_STATUS_ENGINE_ON);
-    reportStatus(GPS_STATUS_SESSION_BEGIN);
-  }
-  else if (engine_state_ptr->engineState == eQMI_LOC_ENGINE_STATE_OFF_V02)
-  {
-    sendMsg(new MsgUpdateEngineState(this, false));
-    reportStatus(GPS_STATUS_SESSION_END);
-    reportStatus(GPS_STATUS_ENGINE_OFF);
-  }
-  else
-  {
-    reportStatus(GPS_STATUS_NONE);
-  }
-
-}
-
-/* convert fix session state report to loc eng format and send the converted
-   report to loc eng */
-void LocApiV02 :: reportFixSessionState (
-    const qmiLocEventFixSessionStateIndMsgT_v02 *fix_session_state_ptr)
-{
-  GpsStatusValue status;
-  LOC_LOGD("%s:%d]: state = %d\n", __func__, __LINE__,
-                fix_session_state_ptr->sessionState);
-
-  status = GPS_STATUS_NONE;
-  if (fix_session_state_ptr->sessionState == eQMI_LOC_FIX_SESSION_STARTED_V02)
-  {
-    status = GPS_STATUS_SESSION_BEGIN;
-  }
-  else if (fix_session_state_ptr->sessionState
-           == eQMI_LOC_FIX_SESSION_FINISHED_V02)
-  {
-    status = GPS_STATUS_SESSION_END;
-  }
-  reportStatus(status);
-}
-
-/* convert NMEA report to loc eng format and send the converted
-   report to loc eng */
-void LocApiV02 :: reportNmea (
-  const qmiLocEventNmeaIndMsgT_v02 *nmea_report_ptr)
-{
-
-  LocApiBase::reportNmea(nmea_report_ptr->nmea,
-                         strlen(nmea_report_ptr->nmea));
-
-  LOC_LOGD("%s:%d]: $%c%c%c\n", __func__, __LINE__,
-                  nmea_report_ptr->nmea[3], nmea_report_ptr->nmea[4],
-                  nmea_report_ptr->nmea[5]);
-}
-
-/* convert and report an ATL request to loc engine */
-void LocApiV02 :: reportAtlRequest(
-  const qmiLocEventLocationServerConnectionReqIndMsgT_v02 * server_request_ptr)
-{
-  uint32_t connHandle = server_request_ptr->connHandle;
-  // service ATL open request; copy the WWAN type
-  if(server_request_ptr->requestType == eQMI_LOC_SERVER_REQUEST_OPEN_V02 )
-  {
-    AGpsType agpsType;
-    switch(server_request_ptr->wwanType)
-    {
-    case eQMI_LOC_WWAN_TYPE_INTERNET_V02:
-      agpsType = AGPS_TYPE_WWAN_ANY;
-      requestATL(connHandle, agpsType);
-      break;
-    case eQMI_LOC_WWAN_TYPE_AGNSS_V02:
-      agpsType = AGPS_TYPE_SUPL;
-      requestATL(connHandle, agpsType);
-      break;
-    case eQMI_LOC_WWAN_TYPE_AGNSS_EMERGENCY_V02:
-      requestSuplES(connHandle);
-      break;
-    default:
-      agpsType = AGPS_TYPE_WWAN_ANY;
-      requestATL(connHandle, agpsType);
-      break;
-    }
-  }
-  // service the ATL close request
-  else if (server_request_ptr->requestType == eQMI_LOC_SERVER_REQUEST_CLOSE_V02)
-  {
-    releaseATL(connHandle);
-  }
-}
-
-/* conver the NI report to loc eng format and send t loc engine */
-void LocApiV02 :: reportNiRequest(
-    const qmiLocEventNiNotifyVerifyReqIndMsgT_v02 *ni_req_ptr)
-{
-  GpsNiNotification notif;
-
-  /* initialize the notification*/
-  memset(notif.extras, 0, sizeof notif.extras);
-  memset(notif.text, 0, sizeof notif.text);
-  memset(notif.requestor_id, 0, sizeof notif.requestor_id);
-
-  /* NI timeout gets overwritten in LocApiEngAdapter,
-     initializing to 0 here */
-  notif.timeout     = 0;
-
-  notif.text_encoding = GPS_ENC_NONE ;
-
-  notif.requestor_id_encoding = GPS_ENC_UNKNOWN;
-
-  notif.notify_flags       = 0;
-
-  notif.default_response   = GPS_NI_RESPONSE_NORESP;
-
-  /*Handle Vx request */
-  if(ni_req_ptr->NiVxInd_valid == 1)
-  {
-     const qmiLocNiVxNotifyVerifyStructT_v02 *vx_req = &(ni_req_ptr->NiVxInd);
-
-     notif.ni_type     = GPS_NI_TYPE_VOICE;
-
-     // Requestor ID, the requestor id recieved is NULL terminated
-     hexcode(notif.requestor_id, sizeof notif.requestor_id,
-             (char *)vx_req->requestorId, vx_req->requestorId_len );
-  }
-
-  /* Handle UMTS CP request*/
-  else if(ni_req_ptr->NiUmtsCpInd_valid == 1)
-  {
-    const qmiLocNiUmtsCpNotifyVerifyStructT_v02 *umts_cp_req =
-       &ni_req_ptr->NiUmtsCpInd;
-
-    notif.ni_type     = GPS_NI_TYPE_UMTS_CTRL_PLANE;
-
-    /* notificationText should always be a NULL terminated string */
-    hexcode(notif.text, sizeof notif.text,
-            (char *)umts_cp_req->notificationText,
-            umts_cp_req->notificationText_len);
-
-    /* Store requestor ID */
-    hexcode(notif.requestor_id, sizeof(notif.requestor_id),
-            (char *)umts_cp_req->requestorId.codedString,
-            umts_cp_req->requestorId.codedString_len);
-
-   /* convert encodings */
-    notif.text_encoding = convertNiEncoding(umts_cp_req->dataCodingScheme);
-
-    notif.requestor_id_encoding =
-      convertNiEncoding(umts_cp_req->requestorId.dataCodingScheme);
-
-    /* LCS address (using extras field) */
-    if ( umts_cp_req->clientAddress_len != 0)
-    {
-      char lcs_addr[32]; // Decoded LCS address for UMTS CP NI
-
-      // Copy LCS Address into notif.extras in the format: Address = 012345
-      strlcat(notif.extras, LOC_NI_NOTIF_KEY_ADDRESS, sizeof (notif.extras));
-      strlcat(notif.extras, " = ", sizeof notif.extras);
-      int addr_len = 0;
-      const char *address_source = NULL;
-      address_source = (char *)umts_cp_req->clientAddress;
-      // client Address is always NULL terminated
-      addr_len = decodeAddress(lcs_addr, sizeof(lcs_addr), address_source,
-                               umts_cp_req->clientAddress_len);
-
-      // The address is ASCII string
-      if (addr_len)
-      {
-        strlcat(notif.extras, lcs_addr, sizeof notif.extras);
-      }
-    }
-
-  }
-  else if(ni_req_ptr->NiSuplInd_valid == 1)
-  {
-    const qmiLocNiSuplNotifyVerifyStructT_v02 *supl_req =
-      &ni_req_ptr->NiSuplInd;
-
-    notif.ni_type     = GPS_NI_TYPE_UMTS_SUPL;
-
-    // Client name
-    if (supl_req->valid_flags & QMI_LOC_SUPL_CLIENT_NAME_MASK_V02)
-    {
-      hexcode(notif.text, sizeof(notif.text),
-              (char *)supl_req->clientName.formattedString,
-              supl_req->clientName.formattedString_len);
-      LOC_LOGV("%s:%d]: SUPL NI: client_name: %s \n", __func__, __LINE__,
-          notif.text);
-    }
-    else
-    {
-      LOC_LOGV("%s:%d]: SUPL NI: client_name not present.",
-          __func__, __LINE__);
-    }
-
-    // Requestor ID
-    if (supl_req->valid_flags & QMI_LOC_SUPL_REQUESTOR_ID_MASK_V02)
-    {
-      hexcode(notif.requestor_id, sizeof notif.requestor_id,
-              (char*)supl_req->requestorId.formattedString,
-              supl_req->requestorId.formattedString_len );
-
-      LOC_LOGV("%s:%d]: SUPL NI: requestor_id: %s \n", __func__, __LINE__,
-          notif.requestor_id);
-    }
-    else
-    {
-      LOC_LOGV("%s:%d]: SUPL NI: requestor_id not present.",
-          __func__, __LINE__);
-    }
-
-    // Encoding type
-    if (supl_req->valid_flags & QMI_LOC_SUPL_DATA_CODING_SCHEME_MASK_V02)
-    {
-      notif.text_encoding = convertNiEncoding(supl_req->dataCodingScheme);
-
-      notif.requestor_id_encoding = convertNiEncoding(supl_req->dataCodingScheme);
-    }
-    else
-    {
-      notif.text_encoding = notif.requestor_id_encoding = GPS_ENC_UNKNOWN;
-    }
-
-    // ES SUPL
-    if(ni_req_ptr->suplEmergencyNotification_valid ==1)
-    {
-        const qmiLocEmergencyNotificationStructT_v02 *supl_emergency_request =
-        &ni_req_ptr->suplEmergencyNotification;
-
-        notif.ni_type = GPS_NI_TYPE_EMERGENCY_SUPL;
-    }
-
-  } //ni_req_ptr->NiSuplInd_valid == 1
-  else
-  {
-    LOC_LOGE("%s:%d]: unknown request event \n",__func__, __LINE__);
-    return;
-  }
-
-  // Set default_response & notify_flags
-  convertNiNotifyVerifyType(&notif, ni_req_ptr->notificationType);
-
-  qmiLocEventNiNotifyVerifyReqIndMsgT_v02 *ni_req_copy_ptr =
-    (qmiLocEventNiNotifyVerifyReqIndMsgT_v02 *)malloc(sizeof(*ni_req_copy_ptr));
-
-  if( NULL != ni_req_copy_ptr)
-  {
-    memcpy(ni_req_copy_ptr, ni_req_ptr, sizeof(*ni_req_copy_ptr));
-
-    requestNiNotify(notif, (const void*)ni_req_copy_ptr);
-  }
-  else
-  {
-    LOC_LOGE("%s:%d]: Error copying NI request\n", __func__, __LINE__);
-  }
-
-}
-
-/* Report the Xtra Server Url from the modem to HAL*/
-void LocApiV02 :: reportXtraServerUrl(
-                const qmiLocEventInjectPredictedOrbitsReqIndMsgT_v02*
-                server_request_ptr)
-{
-
-  if (server_request_ptr->serverList.serverList_len == 1)
-  {
-    reportXtraServer(server_request_ptr->serverList.serverList[0].serverUrl,
-                     "",
-                     "",
-                     QMI_LOC_MAX_SERVER_ADDR_LENGTH_V02);
-  }
-  else if (server_request_ptr->serverList.serverList_len == 2)
-  {
-    reportXtraServer(server_request_ptr->serverList.serverList[0].serverUrl,
-                     server_request_ptr->serverList.serverList[1].serverUrl,
-                     "",
-                     QMI_LOC_MAX_SERVER_ADDR_LENGTH_V02);
-  }
-  else
-  {
-    reportXtraServer(server_request_ptr->serverList.serverList[0].serverUrl,
-                     server_request_ptr->serverList.serverList[1].serverUrl,
-                     server_request_ptr->serverList.serverList[2].serverUrl,
-                     QMI_LOC_MAX_SERVER_ADDR_LENGTH_V02);
-  }
-
-}
-
-/* convert Ni Encoding type from QMI_LOC to loc eng format */
-GpsNiEncodingType LocApiV02 ::convertNiEncoding(
-  qmiLocNiDataCodingSchemeEnumT_v02 loc_encoding)
-{
-   GpsNiEncodingType enc = GPS_ENC_UNKNOWN;
-
-   switch (loc_encoding)
-   {
-     case eQMI_LOC_NI_SUPL_UTF8_V02:
-       enc = GPS_ENC_SUPL_UTF8;
-       break;
-     case eQMI_LOC_NI_SUPL_UCS2_V02:
-       enc = GPS_ENC_SUPL_UCS2;
-       break;
-     case eQMI_LOC_NI_SUPL_GSM_DEFAULT_V02:
-       enc = GPS_ENC_SUPL_GSM_DEFAULT;
-       break;
-     case eQMI_LOC_NI_SS_LANGUAGE_UNSPEC_V02:
-       enc = GPS_ENC_SUPL_GSM_DEFAULT; // SS_LANGUAGE_UNSPEC = GSM
-       break;
-     default:
-       break;
-   }
-
-   return enc;
-}
-
-/*convert NI notify verify type from QMI LOC to loc eng format*/
-bool LocApiV02 :: convertNiNotifyVerifyType (
-  GpsNiNotification *notif,
-  qmiLocNiNotifyVerifyEnumT_v02 notif_priv)
-{
-  switch (notif_priv)
-   {
-   case eQMI_LOC_NI_USER_NO_NOTIFY_NO_VERIFY_V02:
-      notif->notify_flags = 0;
-      break;
-
-   case eQMI_LOC_NI_USER_NOTIFY_ONLY_V02:
-      notif->notify_flags = GPS_NI_NEED_NOTIFY;
-      break;
-
-   case eQMI_LOC_NI_USER_NOTIFY_VERIFY_ALLOW_NO_RESP_V02:
-      notif->notify_flags = GPS_NI_NEED_NOTIFY | GPS_NI_NEED_VERIFY;
-      notif->default_response = GPS_NI_RESPONSE_ACCEPT;
-      break;
-
-   case eQMI_LOC_NI_USER_NOTIFY_VERIFY_NOT_ALLOW_NO_RESP_V02:
-      notif->notify_flags = GPS_NI_NEED_NOTIFY | GPS_NI_NEED_VERIFY;
-      notif->default_response = GPS_NI_RESPONSE_DENY;
-      break;
-
-   case eQMI_LOC_NI_USER_NOTIFY_VERIFY_PRIVACY_OVERRIDE_V02:
-      notif->notify_flags = GPS_NI_PRIVACY_OVERRIDE;
-      break;
-
-   default:
-      return false;
-   }
-
-   return true;
-}
-
-/* convert and report GNSS measurement data to loc eng */
-void LocApiV02 :: reportGnssMeasurementData(
-  const qmiLocEventGnssSvMeasInfoIndMsgT_v02& gnss_measurement_report_ptr)
-{
-    LOC_LOGV ("%s:%d]: entering\n", __func__, __LINE__);
-
-    GpsData gpsMeasurementData;
-    memset (&gpsMeasurementData, 0, sizeof(GpsData));
-
-    int svMeasurment_len = 0;
-
-    // size
-    gpsMeasurementData.size = sizeof(GpsData);
-
-    // number of measurements
-    if (gnss_measurement_report_ptr.svMeasurement_valid) {
-        svMeasurment_len =
-            gnss_measurement_report_ptr.svMeasurement_len;
-        gpsMeasurementData.measurement_count = svMeasurment_len;
-        LOC_LOGV ("%s:%d]: there are %d SV measurements\n",
-                  __func__, __LINE__, svMeasurment_len);
-    } else {
-        LOC_LOGV ("%s:%d]: there is no valid SV measurements\n",
-                  __func__, __LINE__);
-    }
-
-    if (svMeasurment_len != 0 &&
-        gnss_measurement_report_ptr.system == eQMI_LOC_SV_SYSTEM_GPS_V02) {
-
-        // the array of measurements
-        int index = 0;
-        while(svMeasurment_len > 0) {
-            convertGpsMeasurements(gpsMeasurementData.measurements[index],
-                                   gnss_measurement_report_ptr.svMeasurement[index]);
-            index++;
-            svMeasurment_len--;
-        }
-
-        // the GPS clock time reading
-        convertGpsClock(gpsMeasurementData.clock,
-                        gnss_measurement_report_ptr);
-
-        // calling the base
-        LOC_LOGV ("%s:%d]: calling LocApiBase::reportGpsMeasurementData.\n",
-                  __func__, __LINE__);
-        LocApiBase::reportGpsMeasurementData(gpsMeasurementData);
-    } else {
-        LOC_LOGV ("%s:%d]: There is no GPS measurement.\n",
-                  __func__, __LINE__);
-    }
-}
-
-/*convert GpsMeasurement type from QMI LOC to loc eng format*/
-void LocApiV02 :: convertGpsMeasurements (GpsMeasurement& gpsMeasurement,
-    const qmiLocSVMeasurementStructT_v02& gnss_measurement_info)
-{
-    LOC_LOGV ("%s:%d]: entering\n", __func__, __LINE__);
-
-    // size
-    gpsMeasurement.size = sizeof(GpsMeasurement);
-
-    // flag initiation
-    int flags = 0;
-
-    // prn
-    gpsMeasurement.prn = gnss_measurement_info.gnssSvId;
-
-    // time_offset_ns
-    gpsMeasurement.time_offset_ns = 0;
-
-    // state & received_gps_tow_ns
-    uint64_t validMask = gnss_measurement_info.measurementStatus &
-                         gnss_measurement_info.validMeasStatusMask;
-    uint64_t bitSynMask = QMI_LOC_MASK_MEAS_STATUS_BE_CONFIRM_V02 |
-                          QMI_LOC_MASK_MEAS_STATUS_SB_VALID_V02;
-
-    if (validMask & QMI_LOC_MASK_MEAS_STATUS_MS_VALID_V02) {
-        /* sub-frame decode & TOW decode */
-        gpsMeasurement.state = GPS_MEASUREMENT_STATE_SUBFRAME_SYNC |
-                                GPS_MEASUREMENT_STATE_TOW_DECODED |
-                                GPS_MEASUREMENT_STATE_BIT_SYNC |
-                                GPS_MEASUREMENT_STATE_CODE_LOCK;
-        gpsMeasurement.received_gps_tow_ns =
-            ((double)gnss_measurement_info.svTimeSpeed.svTimeMs +
-             (double)gnss_measurement_info.svTimeSpeed.svTimeSubMs) * 1e6;
-
-    } else if ((validMask & bitSynMask) == bitSynMask) {
-        /* bit sync */
-        gpsMeasurement.state = GPS_MEASUREMENT_STATE_BIT_SYNC |
-                                GPS_MEASUREMENT_STATE_CODE_LOCK;
-        gpsMeasurement.received_gps_tow_ns =
-            fmod(((double)gnss_measurement_info.svTimeSpeed.svTimeMs +
-                  (double)gnss_measurement_info.svTimeSpeed.svTimeSubMs), 20) * 1e6;
-
-    } else if (validMask & QMI_LOC_MASK_MEAS_STATUS_SM_VALID_V02) {
-        /* code lock */
-        gpsMeasurement.state = GPS_MEASUREMENT_STATE_CODE_LOCK;
-        gpsMeasurement.received_gps_tow_ns =
-             (double)gnss_measurement_info.svTimeSpeed.svTimeSubMs * 1e6;
-
-    } else {
-        /* by default */
-        gpsMeasurement.state = GPS_MEASUREMENT_STATE_UNKNOWN;
-        gpsMeasurement.received_gps_tow_ns = 0;
-    }
-
-    // c_n0_dbhz
-    gpsMeasurement.c_n0_dbhz = gnss_measurement_info.CNo/10.0;
-
-    // pseudorange_rate_mps
-    gpsMeasurement.pseudorange_rate_mps =
-        gnss_measurement_info.svTimeSpeed.dopplerShift;
-
-    // pseudorange_rate_uncertainty_mps
-    gpsMeasurement.pseudorange_rate_uncertainty_mps =
-        gnss_measurement_info.svTimeSpeed.dopplerShiftUnc;
-
-    // accumulated_delta_range_state
-    gpsMeasurement.accumulated_delta_range_state = GPS_ADR_STATE_UNKNOWN;
-
-    gpsMeasurement.flags = flags;
-
-    LOC_LOGV(" %s:%d]: GNSS measurement raw data received form modem: \n"
-             " Input => gnssSvId | CNo "
-             "| measurementStatus | dopplerShift |"
-             " dopplerShiftUnc| svTimeMs | svTimeSubMs"
-             " | validMeasStatusMask | \n"
-             " Input => %d | %d | 0x%04x%04x | %f | %f | %u | %f | 0x%04x%04x |\n",
-             __func__, __LINE__,
-             gnss_measurement_info.gnssSvId,                                    // %d
-             gnss_measurement_info.CNo,                                         // %d
-             (uint32_t)(gnss_measurement_info.measurementStatus >> 32),         // %04x Upper 32
-             (uint32_t)(gnss_measurement_info.measurementStatus & 0xFFFFFFFF),  // %04x Lower 32
-             gnss_measurement_info.svTimeSpeed.dopplerShift,                    // %f
-             gnss_measurement_info.svTimeSpeed.dopplerShiftUnc,                 // %f
-             gnss_measurement_info.svTimeSpeed.svTimeMs,                        // %u
-             gnss_measurement_info.svTimeSpeed.svTimeSubMs,                     // %f
-             (uint32_t)(gnss_measurement_info.validMeasStatusMask >> 32),       // %04x Upper 32
-             (uint32_t)(gnss_measurement_info.validMeasStatusMask & 0xFFFFFFFF) // %04x Lower 32
-            );
-
-    LOC_LOGV(" %s:%d]: GNSS measurement data after conversion: \n"
-             " Output => size | prn | time_offset_ns | state |"
-             " received_gps_tow_ns| c_n0_dbhz | pseudorange_rate_mps |"
-             " pseudorange_rate_uncertainty_mps |"
-             " accumulated_delta_range_state | flags \n"
-             " Output => %d | %d | %f | %d | %lld | %f | %f | %f | %d | %d \n",
-             __func__, __LINE__,
-             gpsMeasurement.size,                              // %d
-             gpsMeasurement.prn,                               // %d
-             gpsMeasurement.time_offset_ns,                    // %f
-             gpsMeasurement.state,                             // %d
-             gpsMeasurement.received_gps_tow_ns,               // %lld
-             gpsMeasurement.c_n0_dbhz,                         // %f
-             gpsMeasurement.pseudorange_rate_mps,              // %f
-             gpsMeasurement.pseudorange_rate_uncertainty_mps,  // %f
-             gpsMeasurement.accumulated_delta_range_state,     // %d
-             gpsMeasurement.flags                              // %d
-            );
-}
-
-/*convert GpsClock type from QMI LOC to loc eng format*/
-void LocApiV02 :: convertGpsClock (GpsClock& gpsClock,
-    const qmiLocEventGnssSvMeasInfoIndMsgT_v02& gnss_measurement_info)
-{
-    LOC_LOGV ("%s:%d]: entering\n", __func__, __LINE__);
-
-    // size
-    gpsClock.size = sizeof(GpsClock);
-
-    // flag initiation
-    int flags = 0;
-
-    // type & time_ns
-    if (gnss_measurement_info.systemTime_valid &&
-        gnss_measurement_info.systemTimeExt_valid) {
-
-        uint16_t systemWeek = gnss_measurement_info.systemTime.systemWeek;
-        uint32_t systemMsec = gnss_measurement_info.systemTime.systemMsec;
-        float sysClkBias = gnss_measurement_info.systemTime.systemClkTimeBias;
-        float sysClkUncMs = gnss_measurement_info.systemTime.systemClkTimeUncMs;
-        int sourceOfTime = gnss_measurement_info.systemTimeExt.sourceOfTime;
-        bool isTimeValid = (sysClkUncMs <= 15.0f); // 15ms
-
-        if(systemWeek != C_GPS_WEEK_UNKNOWN && isTimeValid) {
-            gpsClock.type = GPS_CLOCK_TYPE_GPS_TIME;
-            double temp =  (double)(systemWeek) * (double)WEEK_MSECS + (double)systemMsec;
-            gpsClock.time_ns = (double)temp*1e6 -
-                               (double)((int)(sysClkBias*1e6));
-        } else {
-            gpsClock.type = GPS_CLOCK_TYPE_UNKNOWN;
-        }
-    } else {
-        gpsClock.type = GPS_CLOCK_TYPE_UNKNOWN;
-    }
-
-    LOC_LOGV(" %s:%d]: GNSS measurement clock data received form modem: \n"
-             " Input => systemTime_valid | systemTimeExt_valid | systemWeek"
-             " | systemMsec | systemClkTimeBias"
-             " | systemClkTimeUncMs | sourceOfTime \n"
-             " Input => %d | %d | %d | %d | %f | %f | %d \n",
-             __func__, __LINE__,
-             gnss_measurement_info.systemTime_valid,                      // %d
-             gnss_measurement_info.systemTimeExt_valid,                   // %d
-             gnss_measurement_info.systemTime.systemWeek,                 // %d
-             gnss_measurement_info.systemTime.systemMsec,                 // %d
-             gnss_measurement_info.systemTime.systemClkTimeBias,          // %f
-             gnss_measurement_info.systemTime.systemClkTimeUncMs,         // %f
-             gnss_measurement_info.systemTimeExt.sourceOfTime);           // %d
-
-    LOC_LOGV(" %s:%d]: GNSS measurement clock after conversion: \n"
-             " Output => type | time_ns \n"
-             " Output => %d | %lld \n", __func__, __LINE__,
-             gpsClock.type,                                               // %d
-             gpsClock.time_ns);                                           // %lld
-
-    gpsClock.flags = flags;
-}
-
-/* event callback registered with the loc_api v02 interface */
-void LocApiV02 :: eventCb(locClientHandleType clientHandle,
-  uint32_t eventId, locClientEventIndUnionType eventPayload)
-{
-  LOC_LOGD("%s:%d]: event id = %d\n", __func__, __LINE__,
-                eventId);
-
-  switch(eventId)
-  {
-    //Position Report
-    case QMI_LOC_EVENT_POSITION_REPORT_IND_V02:
-      reportPosition(eventPayload.pPositionReportEvent);
-      break;
-
-    // Satellite report
-    case QMI_LOC_EVENT_GNSS_SV_INFO_IND_V02:
-      reportSv(eventPayload.pGnssSvInfoReportEvent);
-      break;
-
-    // Status report
-    case QMI_LOC_EVENT_ENGINE_STATE_IND_V02:
-      reportEngineState(eventPayload.pEngineState);
-      break;
-
-    case QMI_LOC_EVENT_FIX_SESSION_STATE_IND_V02:
-      reportFixSessionState(eventPayload.pFixSessionState);
-      break;
-
-    // NMEA
-    case QMI_LOC_EVENT_NMEA_IND_V02:
-      reportNmea(eventPayload.pNmeaReportEvent);
-      break;
-
-    // XTRA request
-    case QMI_LOC_EVENT_INJECT_PREDICTED_ORBITS_REQ_IND_V02:
-      LOC_LOGD("%s:%d]: XTRA download request\n", __func__,
-                    __LINE__);
-      reportXtraServerUrl(eventPayload.pInjectPredictedOrbitsReqEvent);
-      requestXtraData();
-      break;
-
-    // time request
-    case QMI_LOC_EVENT_INJECT_TIME_REQ_IND_V02:
-      LOC_LOGD("%s:%d]: Time request\n", __func__,
-                    __LINE__);
-      requestTime();
-      break;
-
-    //position request
-    case QMI_LOC_EVENT_INJECT_POSITION_REQ_IND_V02:
-      LOC_LOGD("%s:%d]: Position request\n", __func__,
-                    __LINE__);
-      requestLocation();
-      break;
-
-    // NI request
-    case QMI_LOC_EVENT_NI_NOTIFY_VERIFY_REQ_IND_V02:
-      reportNiRequest(eventPayload.pNiNotifyVerifyReqEvent);
-      break;
-
-    // AGPS connection request
-    case QMI_LOC_EVENT_LOCATION_SERVER_CONNECTION_REQ_IND_V02:
-      reportAtlRequest(eventPayload.pLocationServerConnReqEvent);
-      break;
-
-    // GNSS Measurement Report
-    case QMI_LOC_EVENT_GNSS_MEASUREMENT_REPORT_IND_V02:
-      reportGnssMeasurementData(*eventPayload.pGnssSvRawInfoEvent);
-      break;
-  }
-}
-
-/* Call the service LocAdapterBase down event*/
-void LocApiV02 :: errorCb(locClientHandleType handle,
-                             locClientErrorEnumType errorId)
-{
-  if(errorId == eLOC_CLIENT_ERROR_SERVICE_UNAVAILABLE)
-  {
-    LOC_LOGE("%s:%d]: Service unavailable error\n",
-                  __func__, __LINE__);
-
-    handleEngineDownEvent();
-
-    /* immediately send the engine up event so that
-    the loc engine re-initializes the adapter and the
-    loc-api_v02 interface */
-
-    handleEngineUpEvent();
-  }
-}
-
-static void ds_client_global_event_cb(ds_client_status_enum_type result,
-                                       void *loc_adapter_cookie)
-{
-    LocApiV02 *locApiV02Instance =
-        (LocApiV02 *)loc_adapter_cookie;
-    locApiV02Instance->ds_client_event_cb(result);
-    return;
-}
-
-void LocApiV02::ds_client_event_cb(ds_client_status_enum_type result)
-{
-    if(result == E_DS_CLIENT_DATA_CALL_CONNECTED) {
-        LOC_LOGD("%s:%d]: Emergency call is up", __func__, __LINE__);
-        reportDataCallOpened();
-    }
-    else if(result == E_DS_CLIENT_DATA_CALL_DISCONNECTED) {
-        LOC_LOGE("%s:%d]: Emergency call is stopped", __func__, __LINE__);
-        reportDataCallClosed();
-    }
-    return;
-}
-
-ds_client_cb_data ds_client_cb = {
-    ds_client_global_event_cb
-};
-
-int LocApiV02 :: initDataServiceClient()
-{
-    int ret=0;
-    ret = ds_client_init();
-    LOC_LOGD("%s:%d]: ret = %d\n", __func__, __LINE__,ret);
-    return ret;
-}
-
-int LocApiV02 :: openAndStartDataCall()
-{
-    enum loc_api_adapter_err ret;
-    int profile_index;
-    int pdp_type;
-    ds_client_status_enum_type result = ds_client_open_call(&dsClientHandle,
-                                                            &ds_client_cb,
-                                                            (void *)this,
-                                                            &profile_index,
-                                                            &pdp_type);
-    if(result == E_DS_CLIENT_SUCCESS) {
-        result = ds_client_start_call(dsClientHandle, profile_index, pdp_type);
-
-        if(result == E_DS_CLIENT_SUCCESS) {
-            LOC_LOGD("%s:%d]: Request to start Emergency call sent\n",
-                 __func__, __LINE__);
-        ret = LOC_API_ADAPTER_ERR_SUCCESS;
-        }
-        else {
-            LOC_LOGE("%s:%d]: Unable to bring up emergency call using DS. result = %d",
-                 __func__, __LINE__, (int)result);
-            ret = LOC_API_ADAPTER_ERR_UNSUPPORTED;
-        }
-    }
-    else if(result == E_DS_CLIENT_RETRY_LATER) {
-        LOC_LOGE("%s:%d]: Could not start emergency call. Retry after delay\n",
-                 __func__, __LINE__);
-        ret = LOC_API_ADAPTER_ERR_ENGINE_BUSY;
-    }
-    else {
-        LOC_LOGE("%s:%d]: Unable to bring up emergency call using DS. ret = %d",
-                 __func__, __LINE__, (int)ret);
-        ret = LOC_API_ADAPTER_ERR_UNSUPPORTED;
-    }
-
-    return (int)ret;
-}
-
-void LocApiV02 :: stopDataCall()
-{
-    ds_client_status_enum_type ret =
-        ds_client_stop_call(dsClientHandle);
-    if (ret == E_DS_CLIENT_SUCCESS) {
-        LOC_LOGD("%s:%d]: Request to Close SUPL ES call sent\n", __func__, __LINE__);
-    }
-    else {
-        if (ret == E_DS_CLIENT_FAILURE_INVALID_HANDLE) {
-            LOC_LOGE("%s:%d]: Conn handle not found for SUPL ES",
-                     __func__, __LINE__);
-        }
-        LOC_LOGE("%s:%d]: Could not close SUPL ES call. Ret: %d\n"
-                 ,__func__, __LINE__, ret);
-    }
-    return;
-}
-
-void LocApiV02 :: closeDataCall()
-{
-    ds_client_close_call(&dsClientHandle);
-    LOC_LOGD("%s:%d]: Release data client handle\n", __func__, __LINE__);
-    return;
-}
-
-enum loc_api_adapter_err LocApiV02 ::
-getWwanZppFix(GpsLocation &zppLoc)
-{
-    locClientReqUnionType req_union;
-    qmiLocGetAvailWwanPositionReqMsgT_v02 zpp_req;
-    qmiLocGetAvailWwanPositionIndMsgT_v02 zpp_ind;
-    memset(&zpp_ind, 0, sizeof(zpp_ind));
-    memset(&zpp_req, 0, sizeof(zpp_req));
-
-    req_union.pGetAvailWwanPositionReq = &zpp_req;
-
-    LOC_LOGD("%s:%d]: Get ZPP Fix from available wwan position\n", __func__, __LINE__);
-
-    locClientStatusEnumType status =
-        loc_sync_send_req(clientHandle,
-                          QMI_LOC_GET_AVAILABLE_WWAN_POSITION_REQ_V02,
-                          req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                          QMI_LOC_GET_AVAILABLE_WWAN_POSITION_IND_V02,
-                          &zpp_ind);
-
-    if (status != eLOC_CLIENT_SUCCESS ||
-        eQMI_LOC_SUCCESS_V02 != zpp_ind.status) {
-        LOC_LOGE ("%s:%d]: error! status = %s, zpp_ind.status = %s\n",
-                  __func__, __LINE__,
-                  loc_get_v02_client_status_name(status),
-                  loc_get_v02_qmi_status_name(zpp_ind.status));
-
-        return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-    }
-
-    LOC_LOGD("Got Zpp fix location validity (lat:%d, lon:%d, timestamp:%d accuracy:%d)",
-             zpp_ind.latitude_valid,
-             zpp_ind.longitude_valid,
-             zpp_ind.timestampUtc_valid,
-             zpp_ind.horUncCircular_valid);
-
-    LOC_LOGD("(%.7f, %.7f), timestamp %llu, accuracy %f",
-             zpp_ind.latitude,
-             zpp_ind.longitude,
-             zpp_ind.timestampUtc,
-             zpp_ind.horUncCircular);
-
-    zppLoc.size = sizeof(GpsLocation);
-    if (zpp_ind.timestampUtc_valid) {
-        zppLoc.timestamp = zpp_ind.timestampUtc;
-    }
-    else {
-        // no valid flag in GpsLocation structure to indicate if timestamp field is valid
-        zppLoc.timestamp = -1;
-    }
-
-    if ((zpp_ind.latitude_valid == false) ||
-        (zpp_ind.longitude_valid == false) ||
-        (zpp_ind.horUncCircular_valid == false)) {
-        return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-    }
-
-    zppLoc.flags = GPS_LOCATION_HAS_LAT_LONG | GPS_LOCATION_HAS_ACCURACY;
-    zppLoc.latitude = zpp_ind.latitude;
-    zppLoc.longitude = zpp_ind.longitude;
-    zppLoc.accuracy = zpp_ind.horUncCircular;
-
-    if (zpp_ind.altitudeWrtEllipsoid_valid) {
-        zppLoc.flags |= GPS_LOCATION_HAS_ALTITUDE;
-        zppLoc.altitude = zpp_ind.altitudeWrtEllipsoid;
-    }
-
-    return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-enum loc_api_adapter_err LocApiV02 :: getBestAvailableZppFix(GpsLocation & zppLoc)
-{
-    LocPosTechMask tech_mask;
-    return getBestAvailableZppFix(zppLoc, tech_mask);
-}
-
-enum loc_api_adapter_err LocApiV02 ::
-getBestAvailableZppFix(GpsLocation &zppLoc, LocPosTechMask &tech_mask)
-{
-    locClientReqUnionType req_union;
-
-    qmiLocGetBestAvailablePositionIndMsgT_v02 zpp_ind;
-    qmiLocGetBestAvailablePositionReqMsgT_v02 zpp_req;
-
-    memset(&zpp_ind, 0, sizeof(zpp_ind));
-    memset(&zpp_req, 0, sizeof(zpp_req));
-
-    req_union.pGetBestAvailablePositionReq = &zpp_req;
-
-    LOC_LOGD("%s:%d]: Get ZPP Fix from best available source\n", __func__, __LINE__);
-
-    locClientStatusEnumType status =
-        loc_sync_send_req(clientHandle,
-                          QMI_LOC_GET_BEST_AVAILABLE_POSITION_REQ_V02,
-                          req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                          QMI_LOC_GET_BEST_AVAILABLE_POSITION_IND_V02,
-                          &zpp_ind);
-
-    if (status != eLOC_CLIENT_SUCCESS ||
-        eQMI_LOC_SUCCESS_V02 != zpp_ind.status) {
-        LOC_LOGE ("%s:%d]: error! status = %s, zpp_ind.status = %s\n",
-                  __func__, __LINE__,
-                  loc_get_v02_client_status_name(status),
-                  loc_get_v02_qmi_status_name(zpp_ind.status));
-
-        return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-    }
-
-    LOC_LOGD("Got Zpp fix location validity (lat:%d, lon:%d, timestamp:%d accuracy:%d)",
-             zpp_ind.latitude_valid,
-             zpp_ind.longitude_valid,
-             zpp_ind.timestampUtc_valid,
-             zpp_ind.horUncCircular_valid);
-
-    LOC_LOGD("(%.7f, %.7f), timestamp %llu, accuracy %f",
-             zpp_ind.latitude,
-             zpp_ind.longitude,
-             zpp_ind.timestampUtc,
-             zpp_ind.horUncCircular);
-
-    zppLoc.size = sizeof(GpsLocation);
-    if (zpp_ind.timestampUtc_valid) {
-        zppLoc.timestamp = zpp_ind.timestampUtc;
-    }
-    else {
-        // no valid flag in GpsLocation structure to indicate if timestamp field is valid
-        zppLoc.timestamp = -1;
-    }
-
-    if ((zpp_ind.latitude_valid == false) ||
-        (zpp_ind.longitude_valid == false) ||
-        (zpp_ind.horUncCircular_valid == false)) {
-        return LOC_API_ADAPTER_ERR_GENERAL_FAILURE;
-    }
-
-    zppLoc.flags = GPS_LOCATION_HAS_LAT_LONG | GPS_LOCATION_HAS_ACCURACY;
-    zppLoc.latitude = zpp_ind.latitude;
-    zppLoc.longitude = zpp_ind.longitude;
-    zppLoc.accuracy = zpp_ind.horUncCircular;
-
-    if (zpp_ind.altitudeWrtEllipsoid_valid) {
-        zppLoc.flags |= GPS_LOCATION_HAS_ALTITUDE;
-        zppLoc.altitude = zpp_ind.altitudeWrtEllipsoid;
-    }
-
-    if (zpp_ind.horSpeed_valid) {
-        zppLoc.flags |= GPS_LOCATION_HAS_SPEED;
-        zppLoc.speed = zpp_ind.horSpeed;
-    }
-
-    if (zpp_ind.heading_valid) {
-        zppLoc.flags |= GPS_LOCATION_HAS_BEARING;
-        zppLoc.bearing = zpp_ind.heading;
-    }
-
-    if (zpp_ind.technologyMask_valid) {
-            tech_mask = zpp_ind.technologyMask;
-    }
-
-    return LOC_API_ADAPTER_ERR_SUCCESS;
-}
-
-/*Values for lock
-  1 = Do not lock any position sessions
-  2 = Lock MI position sessions
-  3 = Lock MT position sessions
-  4 = Lock all position sessions
-
-  Returns values:
-  zero on success; non-zero on failure
-*/
-int LocApiV02 :: setGpsLock(LOC_GPS_LOCK_MASK lockMask)
-{
-    qmiLocSetEngineLockReqMsgT_v02 setEngineLockReq;
-    qmiLocSetEngineLockIndMsgT_v02 setEngineLockInd;
-    locClientStatusEnumType status;
-    locClientReqUnionType req_union;
-    int ret=0;
-
-    LOC_LOGD("%s:%d]: Set Gps Lock: %x\n", __func__, __LINE__, lockMask);
-    setEngineLockReq.lockType = convertGpsLockMask(lockMask);
-    req_union.pSetEngineLockReq = &setEngineLockReq;
-    memset(&setEngineLockInd, 0, sizeof(setEngineLockInd));
-    status = loc_sync_send_req(clientHandle,
-                               QMI_LOC_SET_ENGINE_LOCK_REQ_V02,
-                               req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                               QMI_LOC_SET_ENGINE_LOCK_IND_V02,
-                               &setEngineLockInd);
-
-    if(status != eLOC_CLIENT_SUCCESS || setEngineLockInd.status != eQMI_LOC_SUCCESS_V02) {
-        LOC_LOGE("%s:%d]: Set engine lock failed. status: %s, ind status:%s\n",
-                 __func__, __LINE__,
-                 loc_get_v02_client_status_name(status),
-                 loc_get_v02_qmi_status_name(setEngineLockInd.status));
-        ret = -1;
-    }
-    LOC_LOGD("%s:%d]: exit\n", __func__, __LINE__);
-    return ret;
-}
-/*
-  Returns
-  Current value of GPS Lock on success
-  -1 on failure
-*/
-int LocApiV02 :: getGpsLock()
-{
-    qmiLocGetEngineLockReqMsgT_v02 getEngineLockReq;
-    qmiLocGetEngineLockIndMsgT_v02 getEngineLockInd;
-    locClientStatusEnumType status;
-    locClientReqUnionType req_union;
-    int ret=0;
-    LOC_LOGD("%s:%d]: Enter\n", __func__, __LINE__);
-    memset(&getEngineLockInd, 0, sizeof(getEngineLockInd));
-
-    //Passing req_union as a parameter even though this request has no payload
-    //since NULL or 0 gives an error during compilation
-    status = loc_sync_send_req(clientHandle,
-                               QMI_LOC_GET_ENGINE_LOCK_REQ_V02,
-                               req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                               QMI_LOC_GET_ENGINE_LOCK_IND_V02,
-                               &getEngineLockInd);
-    if(status != eLOC_CLIENT_SUCCESS || getEngineLockInd.status != eQMI_LOC_SUCCESS_V02) {
-        LOC_LOGE("%s:%d]: Set engine lock failed. status: %s, ind status:%s\n",
-                 __func__, __LINE__,
-                 loc_get_v02_client_status_name(status),
-                 loc_get_v02_qmi_status_name(getEngineLockInd.status));
-        ret = -1;
-    }
-    else {
-        if(getEngineLockInd.lockType_valid) {
-            ret = (int)getEngineLockInd.lockType;
-            LOC_LOGD("%s:%d]: Lock Type: %d\n", __func__, __LINE__, ret);
-        }
-        else {
-            LOC_LOGE("%s:%d]: Lock Type not valid\n", __func__, __LINE__);
-            ret = -1;
-        }
-    }
-    LOC_LOGD("%s:%d]: Exit\n", __func__, __LINE__);
-    return ret;
-}
-
-void LocApiV02 :: installAGpsCert(const DerEncodedCertificate* pData,
-                                  size_t numberOfCerts,
-                                  uint32_t slotBitMask)
-{
-    LOC_LOGD("%s:%d]:, slot mask=%u number of certs=%u",
-            __func__, __LINE__, slotBitMask, numberOfCerts);
-
-    uint8_t certIndex = 0;
-    for (uint8_t slot = 0; slot <= AGPS_CERTIFICATE_MAX_SLOTS-1; slot++, slotBitMask >>= 1)
-    {
-        if (slotBitMask & 1) //slot is writable
-        {
-            if (certIndex < numberOfCerts && pData[certIndex].data && pData[certIndex].length > 0)
-            {
-                LOC_LOGD("%s:%d]:, Inject cert#%u slot=%u length=%u",
-                         __func__, __LINE__, certIndex, slot, pData[certIndex].length);
-
-                locClientReqUnionType req_union;
-                locClientStatusEnumType status;
-                qmiLocInjectSuplCertificateReqMsgT_v02 injectCertReq;
-                qmiLocInjectSuplCertificateIndMsgT_v02 injectCertInd;
-
-                memset(&injectCertReq, 0, sizeof(injectCertReq));
-                injectCertReq.suplCertId = slot;
-                injectCertReq.suplCertData_len = pData[certIndex].length;
-                memcpy(injectCertReq.suplCertData, pData[certIndex].data, pData[certIndex].length);
-
-                req_union.pInjectSuplCertificateReq = &injectCertReq;
-
-                status = loc_sync_send_req(clientHandle,
-                                           QMI_LOC_INJECT_SUPL_CERTIFICATE_REQ_V02,
-                                           req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                                           QMI_LOC_INJECT_SUPL_CERTIFICATE_IND_V02,
-                                           &injectCertInd);
-
-                if (status != eLOC_CLIENT_SUCCESS ||
-                    eQMI_LOC_SUCCESS_V02 != injectCertInd.status)
-                {
-                    LOC_LOGE ("%s:%d]: inject-error status = %s, set_server_ind.status = %s",
-                              __func__,__LINE__,
-                              loc_get_v02_client_status_name(status),
-                              loc_get_v02_qmi_status_name(injectCertInd.status));
-                }
-
-                certIndex++; //move to next cert
-
-            } else {
-
-                LOC_LOGD("%s:%d]:, Delete slot=%u",
-                         __func__, __LINE__, slot);
-
-                // A fake cert is injected first before delete is called to workaround
-                // an issue that is seen with trying to delete an empty slot.
-                {
-                    locClientReqUnionType req_union;
-                    locClientStatusEnumType status;
-                    qmiLocInjectSuplCertificateReqMsgT_v02 injectFakeCertReq;
-                    qmiLocInjectSuplCertificateIndMsgT_v02 injectFakeCertInd;
-
-                    memset(&injectFakeCertReq, 0, sizeof(injectFakeCertReq));
-                    injectFakeCertReq.suplCertId = slot;
-                    injectFakeCertReq.suplCertData_len = 1;
-                    injectFakeCertReq.suplCertData[0] = 1;
-
-                    req_union.pInjectSuplCertificateReq = &injectFakeCertReq;
-
-                    status = loc_sync_send_req(clientHandle,
-                                       QMI_LOC_INJECT_SUPL_CERTIFICATE_REQ_V02,
-                                       req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                                       QMI_LOC_INJECT_SUPL_CERTIFICATE_IND_V02,
-                                       &injectFakeCertInd);
-
-                    if (status != eLOC_CLIENT_SUCCESS ||
-                        eQMI_LOC_SUCCESS_V02 != injectFakeCertInd.status)
-                    {
-                        LOC_LOGE ("%s:%d]: inject-fake-error status = %s, set_server_ind.status = %s",
-                                  __func__,__LINE__,
-                                  loc_get_v02_client_status_name(status),
-                                  loc_get_v02_qmi_status_name(injectFakeCertInd.status));
-                    }
-                }
-
-                locClientReqUnionType req_union;
-                locClientStatusEnumType status;
-                qmiLocDeleteSuplCertificateReqMsgT_v02 deleteCertReq;
-                qmiLocDeleteSuplCertificateIndMsgT_v02 deleteCertInd;
-
-                memset(&deleteCertReq, 0, sizeof(deleteCertReq));
-                deleteCertReq.suplCertId = slot;
-                deleteCertReq.suplCertId_valid = 1;
-
-                req_union.pDeleteSuplCertificateReq = &deleteCertReq;
-
-                status = loc_sync_send_req(clientHandle,
-                                           QMI_LOC_DELETE_SUPL_CERTIFICATE_REQ_V02,
-                                           req_union, LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                                           QMI_LOC_DELETE_SUPL_CERTIFICATE_IND_V02,
-                                           &deleteCertInd);
-
-                if (status != eLOC_CLIENT_SUCCESS ||
-                    eQMI_LOC_SUCCESS_V02 != deleteCertInd.status)
-                {
-                    LOC_LOGE("%s:%d]: delete-error status = %s, set_server_ind.status = %s",
-                              __func__,__LINE__,
-                              loc_get_v02_client_status_name(status),
-                              loc_get_v02_qmi_status_name(deleteCertInd.status));
-                }
-            }
-        } else {
-            LOC_LOGD("%s:%d]:, Not writable slot=%u",
-                     __func__, __LINE__, slot);
-        }
-    }
-
-}
-
-/*
-  Returns
-  0: update the gps reporting event successfully
-  -1: on failure
-*/
-int LocApiV02 :: updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event,
-                                        loc_registration_mask_status isEnabled)
-{
-    LOC_LOGD("%s:%d]: Enter\n", __func__, __LINE__);
-
-    return open((isEnabled == LOC_REGISTRATION_MASK_ENABLED)?(mMask|event):(mMask&~event));
-}
-
-bool LocApiV02 :: gnssConstellationConfig()
-{
-    return mGnssMeasurementSupported == sup_yes;
-}
-
-void LocApiV02 :: cacheGnssMeasurementSupport()
-{
-    if (sup_unknown == mGnssMeasurementSupported) {
-        if ((mQmiMask & QMI_LOC_EVENT_MASK_POSITION_REPORT_V02) ==
-            QMI_LOC_EVENT_MASK_POSITION_REPORT_V02) {
-            /*for GNSS Measurement service, use
-              QMI_LOC_SET_GNSS_CONSTELL_REPORT_CONFIG_V02
-              to check if modem support this feature or not*/
-            LOC_LOGD("%s:%d]: set GNSS measurement to report gps measurement only.\n",
-                     __func__, __LINE__);
-
-            qmiLocSetGNSSConstRepConfigReqMsgT_v02 setGNSSConstRepConfigReq;
-            qmiLocSetGNSSConstRepConfigIndMsgT_v02 setGNSSConstRepConfigInd;
-            memset(&setGNSSConstRepConfigReq, 0, sizeof(setGNSSConstRepConfigReq));
-            memset(&setGNSSConstRepConfigInd, 0, sizeof(setGNSSConstRepConfigInd));
-
-            locClientStatusEnumType status;
-            locClientReqUnionType req_union;
-
-            setGNSSConstRepConfigReq.measReportConfig_valid = true;
-            setGNSSConstRepConfigReq.measReportConfig = eQMI_SYSTEM_GPS_V02;
-            req_union.pSetGNSSConstRepConfigReq = &setGNSSConstRepConfigReq;
-
-            status = loc_sync_send_req(clientHandle,
-                                       QMI_LOC_SET_GNSS_CONSTELL_REPORT_CONFIG_V02,
-                                       req_union,
-                                       LOC_ENGINE_SYNC_REQUEST_TIMEOUT,
-                                       QMI_LOC_SET_GNSS_CONSTELL_REPORT_CONFIG_IND_V02,
-                                       &setGNSSConstRepConfigInd);
-
-            if(status != eLOC_CLIENT_SUCCESS ||
-               setGNSSConstRepConfigInd.status != eQMI_LOC_SUCCESS_V02) {
-                LOC_LOGD("%s:%d]: Set GNSS constellation failed."
-                         " status: %s, ind status:%s\n",
-                         __func__, __LINE__,
-                         loc_get_v02_client_status_name(status),
-                         loc_get_v02_qmi_status_name(setGNSSConstRepConfigInd.status));
-                mGnssMeasurementSupported = sup_no;
-            } else {
-                LOC_LOGD("%s:%d]: Set GNSS constellation succeeded.\n",
-                         __func__, __LINE__);
-                mGnssMeasurementSupported = sup_yes;
-            }
-        }
-    }
-
-    LOC_LOGV("%s:%d]: mGnssMeasurementSupported is %d\n", __func__, __LINE__, mGnssMeasurementSupported);
-}
diff --git a/location/loc_api/loc_api_v02/LocApiV02.h b/location/loc_api/loc_api_v02/LocApiV02.h
deleted file mode 100644
index 9c73b6e..0000000
--- a/location/loc_api/loc_api_v02/LocApiV02.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/* Copyright (c) 2011-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 LOC_API_V_0_2_H
-#define LOC_API_V_0_2_H
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "ds_client.h"
-#include <LocApiBase.h>
-#include <loc_api_v02_client.h>
-
-using namespace loc_core;
-
-/* This class derives from the LocApiBase class.
-   The members of this class are responsible for converting
-   the Loc API V02 data structures into Loc Adapter data structures.
-   This class also implements some of the virtual functions that
-   handle the requests from loc engine. */
-class LocApiV02 : public LocApiBase {
-  enum supported_status {
-      sup_unknown,
-      sup_yes,
-      sup_no
-  };
-protected:
-  /* loc api v02 handle*/
-  locClientHandleType clientHandle;
-
-private:
-  /*ds client handle*/
-  dsClientHandleType dsClientHandle;
-  enum supported_status mGnssMeasurementSupported;
-  locClientEventMaskType mQmiMask;
-  bool mInSession;
-  bool mEngineOn;
-
-  /* Convert event mask from loc eng to loc_api_v02 format */
-  static locClientEventMaskType convertMask(LOC_API_ADAPTER_EVENT_MASK_T mask);
-
-  /* Convert GPS LOCK mask from gps.conf definition */
-  static qmiLocLockEnumT_v02 convertGpsLockMask(LOC_GPS_LOCK_MASK lockMask);
-
-  /* Convert error from loc_api_v02 to loc eng format*/
-  static enum loc_api_adapter_err convertErr(locClientStatusEnumType status);
-
-  /* convert Ni Encoding type from QMI_LOC to loc eng format */
-  static GpsNiEncodingType convertNiEncoding(
-    qmiLocNiDataCodingSchemeEnumT_v02 loc_encoding);
-
-  /*convert NI notify verify type from QMI LOC to loc eng format*/
-  static bool convertNiNotifyVerifyType (GpsNiNotification *notif,
-      qmiLocNiNotifyVerifyEnumT_v02 notif_priv);
-
-  /*convert GpsMeasurement type from QMI LOC to loc eng format*/
-  static void convertGpsMeasurements (GpsMeasurement& gpsMeasurement,
-      const qmiLocSVMeasurementStructT_v02& gnss_measurement_info);
-
-  /*convert GpsClock type from QMI LOC to loc eng format*/
-  static void convertGpsClock (GpsClock& gpsClock,
-      const qmiLocEventGnssSvMeasInfoIndMsgT_v02& gnss_measurement_info);
-
-  /* convert position report to loc eng format and send the converted
-     position to loc eng */
-  void reportPosition
-    (const qmiLocEventPositionReportIndMsgT_v02 *location_report_ptr);
-
-  /* convert satellite report to loc eng format and  send the converted
-     report to loc eng */
-  void reportSv (const qmiLocEventGnssSvInfoIndMsgT_v02 *gnss_report_ptr);
-
-  /* convert engine state report to loc eng format and send the converted
-     report to loc eng */
-  void reportEngineState (
-    const qmiLocEventEngineStateIndMsgT_v02 *engine_state_ptr);
-
-  /* convert fix session report to loc eng format and send the converted
-     report to loc eng */
-  void reportFixSessionState (
-    const qmiLocEventFixSessionStateIndMsgT_v02 *fix_session_state_ptr);
-
-  /* convert NMEA report to loc eng format and send the converted
-     report to loc eng */
-  void reportNmea (const qmiLocEventNmeaIndMsgT_v02 *nmea_report_ptr);
-
-  /* convert and report an ATL request to loc engine */
-  void reportAtlRequest(
-    const qmiLocEventLocationServerConnectionReqIndMsgT_v02
-    *server_request_ptr);
-
-  /* convert and report NI request to loc eng */
-  void reportNiRequest(
-    const qmiLocEventNiNotifyVerifyReqIndMsgT_v02 *ni_req_ptr);
-
-  /* report the xtra server info */
-  void reportXtraServerUrl(
-    const qmiLocEventInjectPredictedOrbitsReqIndMsgT_v02* server_request_ptr);
-
-  /* convert and report GNSS measurement data to loc eng */
-  void reportGnssMeasurementData(
-    const qmiLocEventGnssSvMeasInfoIndMsgT_v02& gnss_measurement_report_ptr);
-
-  bool registerEventMask(locClientEventMaskType qmiMask);
-  locClientEventMaskType adjustMaskForNoSession(locClientEventMaskType qmiMask);
-  void cacheGnssMeasurementSupport();
-
-protected:
-  virtual enum loc_api_adapter_err
-    open(LOC_API_ADAPTER_EVENT_MASK_T mask);
-  virtual enum loc_api_adapter_err
-    close();
-
-public:
-  LocApiV02(const MsgTask* msgTask,
-            LOC_API_ADAPTER_EVENT_MASK_T exMask,
-            ContextBase *context = NULL);
-  ~LocApiV02();
-
-  /* event callback registered with the loc_api v02 interface */
-  virtual void eventCb(locClientHandleType client_handle,
-               uint32_t loc_event_id,
-               locClientEventIndUnionType loc_event_payload);
-
-  /* error callback, this function handles the  service unavailable
-     error */
-  void errorCb(locClientHandleType handle,
-               locClientErrorEnumType errorId);
-
-  void ds_client_event_cb(ds_client_status_enum_type result);
-
-  virtual enum loc_api_adapter_err startFix(const LocPosMode& posMode);
-
-  virtual enum loc_api_adapter_err stopFix();
-
-  virtual enum loc_api_adapter_err
-    setPositionMode(const LocPosMode& mode);
-
-  virtual enum loc_api_adapter_err
-    setTime(GpsUtcTime time, int64_t timeReference, int uncertainty);
-
-  virtual enum loc_api_adapter_err
-    injectPosition(double latitude, double longitude, float accuracy);
-
-  virtual enum loc_api_adapter_err
-    deleteAidingData(GpsAidingData f);
-
-  virtual enum loc_api_adapter_err
-    informNiResponse(GpsUserResponseType userResponse,
-                     const void* passThroughData);
-
-  virtual enum loc_api_adapter_err
-    setServer(const char* url, int len);
-  virtual enum loc_api_adapter_err
-    setServer(unsigned int ip, int port, LocServerType type);
-  virtual enum loc_api_adapter_err
-    setXtraData(char* data, int length);
-  virtual enum loc_api_adapter_err
-    requestXtraServer();
-  virtual enum loc_api_adapter_err
-    atlOpenStatus(int handle, int is_succ, char* apn, AGpsBearerType bear,
-                   AGpsType agpsType);
-  virtual enum loc_api_adapter_err atlCloseStatus(int handle, int is_succ);
-  virtual enum loc_api_adapter_err setSUPLVersion(uint32_t version);
-  virtual enum loc_api_adapter_err setLPPConfig(uint32_t profile);
-
-  virtual enum loc_api_adapter_err
-    setSensorControlConfig(int sensorUsage, int sensorProvider);
-
-  virtual enum loc_api_adapter_err
-    setSensorProperties(bool gyroBiasVarianceRandomWalk_valid, float gyroBiasVarianceRandomWalk,
-                            bool accelBiasVarianceRandomWalk_valid, float accelBiasVarianceRandomWalk,
-                            bool angleBiasVarianceRandomWalk_valid, float angleBiasVarianceRandomWalk,
-                            bool rateBiasVarianceRandomWalk_valid, float rateBiasVarianceRandomWalk,
-                            bool velocityBiasVarianceRandomWalk_valid, float velocityBiasVarianceRandomWalk);
-
-  virtual enum loc_api_adapter_err
-    setSensorPerfControlConfig(int controlMode, int accelSamplesPerBatch, int accelBatchesPerSec,
-                               int gyroSamplesPerBatch, int gyroBatchesPerSec,
-                               int accelSamplesPerBatchHigh, int accelBatchesPerSecHigh,
-                               int gyroSamplesPerBatchHigh, int gyroBatchesPerSecHigh, int algorithmConfig);
-  virtual enum loc_api_adapter_err setExtPowerConfig(int isBatteryCharging);
-  virtual enum loc_api_adapter_err setAGLONASSProtocol(unsigned long aGlonassProtocol);
-  virtual enum loc_api_adapter_err
-      getWwanZppFix(GpsLocation & zppLoc);
-  virtual enum loc_api_adapter_err
-      getBestAvailableZppFix(GpsLocation & zppLoc);
-  virtual enum loc_api_adapter_err
-      getBestAvailableZppFix(GpsLocation & zppLoc, LocPosTechMask & tech_mask);
-  virtual int initDataServiceClient();
-  virtual int openAndStartDataCall();
-  virtual void stopDataCall();
-  virtual void closeDataCall();
-  virtual int setGpsLock(LOC_GPS_LOCK_MASK lock);
-
-  /*
-    Returns
-    Current value of GPS Lock on success
-    -1 on failure
-  */
-  virtual int getGpsLock(void);
-
-  virtual void installAGpsCert(const DerEncodedCertificate* pData,
-                               size_t length,
-                               uint32_t slotBitMask);
-  /*
-    Update Registration Mask
-  */
-  virtual int updateRegistrationMask(LOC_API_ADAPTER_EVENT_MASK_T event,
-                                     loc_registration_mask_status isEnabled);
-  /*
-    Set Gnss Constellation Config
-  */
-  virtual bool gnssConstellationConfig();
-};
-
-extern "C" LocApiBase* getLocApi(const MsgTask* msgTask,
-                                 LOC_API_ADAPTER_EVENT_MASK_T exMask,
-                                 ContextBase* context);
-#endif //LOC_API_V_0_2_H
diff --git a/location/loc_api/loc_api_v02/Makefile.am b/location/loc_api/loc_api_v02/Makefile.am
deleted file mode 100644
index 2308cd4..0000000
--- a/location/loc_api/loc_api_v02/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-AM_CFLAGS = \
-            ${QMIF_CFLAGS} \
-            -I../../utils \
-            -I../../platform_lib_abstractions \
-            -I../libloc_api_50001
-
-requiredlibs = \
-            ${QMIF_LIBS} \
-            ../libloc_api_50001/libloc_adapter_so.la \
-            ../../utils/libgps_utils_so.la
-
-h_sources = LocApiV02Adapter.h \
-            loc_util_log.h \
-            location_service_v02.h \
-            loc_api_sync_req.h \
-            loc_api_v02_client.h \
-            loc_api_v02_log.h
-
-c_sources = LocApiV02Adapter.cpp \
-            loc_api_v02_log.c \
-            loc_api_v02_client.c \
-            loc_api_sync_req.c \
-            location_service_v02.c
-
-library_includedir = $(pkgincludedir)
-library_include_HEADERS = $(h_sources)
-
-libloc_api_la_SOURCES = $(c_sources) $(h_sources)
-
-if USE_GLIB
-libloc_api_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
-libloc_api_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
-libloc_api_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
-else
-libloc_api_la_CFLAGS = $(AM_CFLAGS)
-libloc_api_la_LDFLAGS = -shared -version-info 1:0:0
-libloc_api_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
-endif
-
-libloc_api_la_LIBADD = $(requiredlibs) -lstdc++
-
-lib_LTLIBRARIES = libloc_api.la
diff --git a/location/loc_api/loc_api_v02/loc_api_sync_req.c b/location/loc_api/loc_api_v02/loc_api_sync_req.c
deleted file mode 100644
index 6a08666..0000000
--- a/location/loc_api/loc_api_v02/loc_api_sync_req.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/* Copyright (c) 2011-2012, 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 <stdio.h>
-#include <assert.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <string.h>
-#include <pthread.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <loc_cfg.h>
-#include "loc_api_v02_client.h"
-#include "loc_api_sync_req.h"
-
-/* Logging */
-// Uncomment to log verbose logs
-#define LOG_NDEBUG 1
-
-// log debug logs
-#define LOG_NDDEBUG 1
-#define LOG_TAG "LocSvc_api_v02"
-#include "loc_util_log.h"
-
-#define LOC_SYNC_REQ_BUFFER_SIZE 8
-#define GPS_CONF_FILE "/etc/gps.conf"
-pthread_mutex_t  loc_sync_call_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static bool loc_sync_call_initialized = false;
-
-typedef struct {
-   pthread_mutex_t         sync_req_lock;
-
-   /* Client ID */
-   locClientHandleType     client_handle;
-
-   /*  waiting conditional variable */
-   pthread_cond_t          ind_arrived_cond;
-
-   /* Callback waiting data block, protected by loc_cb_data_mutex */
-   bool                    ind_is_selected;              /* is cb selected? */
-   bool                    ind_is_waiting;               /* is waiting?     */
-   bool                    ind_has_arrived;              /* callback has arrived */
-   uint32_t                req_id;                    /*  sync request */
-   void                    *recv_ind_payload_ptr; /* received  payload */
-   uint32_t                recv_ind_id;      /* received  ind   */
-
-} loc_sync_req_data_s_type;
-
-typedef struct {
-   bool                        in_use;  /* at least one sync call is active */
-   bool                        slot_in_use[LOC_SYNC_REQ_BUFFER_SIZE];
-   loc_sync_req_data_s_type    slots[LOC_SYNC_REQ_BUFFER_SIZE];
-} loc_sync_req_array_s_type;
-
-/***************************************************************************
- *                 DATA FOR ASYNCHRONOUS RPC PROCESSING
- **************************************************************************/
-loc_sync_req_array_s_type loc_sync_array;
-
-/*===========================================================================
-
-FUNCTION   loc_sync_req_init
-
-DESCRIPTION
-   Initialize this module
-
-DEPENDENCIES
-   N/A
-
-RETURN VALUE
-   none
-
-SIDE EFFECTS
-   N/A
-
-===========================================================================*/
-void loc_sync_req_init()
-{
-   LOC_LOGV(" %s:%d]:\n", __func__, __LINE__);
-   UTIL_READ_CONF_DEFAULT(GPS_CONF_FILE);
-   pthread_mutex_lock(&loc_sync_call_mutex);
-   if(true == loc_sync_call_initialized)
-   {
-      LOC_LOGD("%s:%d]:already initialized\n", __func__, __LINE__);
-      pthread_mutex_unlock(&loc_sync_call_mutex);
-      return;
-   }
-
-   loc_sync_array.in_use = false;
-
-   memset(loc_sync_array.slot_in_use, 0, sizeof(loc_sync_array.slot_in_use));
-
-   int i;
-   for (i = 0; i < LOC_SYNC_REQ_BUFFER_SIZE; i++)
-   {
-      loc_sync_req_data_s_type *slot = &loc_sync_array.slots[i];
-
-      pthread_mutex_init(&slot->sync_req_lock, NULL);
-      pthread_cond_init(&slot->ind_arrived_cond, NULL);
-
-      slot->client_handle = LOC_CLIENT_INVALID_HANDLE_VALUE;
-      slot->ind_is_selected = false;       /* is ind selected? */
-      slot->ind_is_waiting  = false;       /* is waiting?     */
-      slot->ind_has_arrived = false;       /* callback has arrived */
-      slot->recv_ind_id = 0;       /* ind to wait for   */
-      slot->recv_ind_payload_ptr = NULL;
-      slot->req_id =  0;   /* req id   */
-   }
-
-   loc_sync_call_initialized = true;
-   pthread_mutex_unlock(&loc_sync_call_mutex);
-}
-
-
-/*===========================================================================
-
-FUNCTION    loc_sync_process_ind
-
-DESCRIPTION
-   Wakes up blocked API calls to check if the needed callback has arrived
-
-DEPENDENCIES
-   N/A
-
-RETURN VALUE
-   none
-
-SIDE EFFECTS
-   N/A
-
-===========================================================================*/
-void loc_sync_process_ind(
-      locClientHandleType    client_handle, /* handle of the client */
-      uint32_t               ind_id ,      /* ind id */
-      void                   *ind_payload_ptr /* payload              */
-)
-{
-
-   LOC_LOGV("%s:%d]: received indication, handle = %p ind_id = %u \n",
-                 __func__,__LINE__, client_handle, ind_id);
-
-   pthread_mutex_lock(&loc_sync_call_mutex);
-
-   if (!loc_sync_array.in_use)
-   {
-      LOC_LOGD("%s:%d]: loc_sync_array not in use \n",
-                    __func__, __LINE__);
-      pthread_mutex_unlock(&loc_sync_call_mutex);
-      return;
-   }
-
-   bool in_use = false, consumed = false;
-   int i;
-
-   for (i = 0; i < LOC_SYNC_REQ_BUFFER_SIZE && !consumed; i++)
-   {
-      loc_sync_req_data_s_type *slot = &loc_sync_array.slots[i];
-
-      in_use |= loc_sync_array.slot_in_use[i];
-
-      pthread_mutex_lock(&slot->sync_req_lock);
-
-      if ( (loc_sync_array.slot_in_use[i]) && (slot->client_handle == client_handle)
-            && (ind_id == slot->recv_ind_id) && (!slot->ind_has_arrived))
-      {
-         // copy the payload to the slot waiting for this ind
-         size_t payload_size = 0;
-
-         LOC_LOGV("%s:%d]: found slot %d selected for ind %u \n",
-                       __func__, __LINE__, i, ind_id);
-
-         if(true == locClientGetSizeByRespIndId(ind_id, &payload_size) &&
-            NULL != slot->recv_ind_payload_ptr && NULL != ind_payload_ptr)
-         {
-            LOC_LOGV("%s:%d]: copying ind payload size = %u \n",
-                          __func__, __LINE__, payload_size);
-
-            memcpy(slot->recv_ind_payload_ptr, ind_payload_ptr, payload_size);
-
-            consumed = true;
-
-         }
-         /* Received a callback while waiting, wake up thread to check it */
-         if (slot->ind_is_waiting)
-         {
-            slot->recv_ind_id = ind_id;
-
-            pthread_cond_signal(&slot->ind_arrived_cond);
-         }
-         else
-         {
-            /* If callback arrives before wait, remember it */
-            LOC_LOGV("%s:%d]: ind %u arrived before wait was called \n",
-                          __func__, __LINE__, ind_id);
-
-            slot->ind_has_arrived = true;
-         }
-      }
-      pthread_mutex_unlock(&slot->sync_req_lock);
-   }
-
-   if (!in_use) {
-      loc_sync_array.in_use = false;
-   }
-
-   pthread_mutex_unlock(&loc_sync_call_mutex);
-}
-
-/*===========================================================================
-
-FUNCTION    loc_alloc_slot
-
-DESCRIPTION
-   Allocates a buffer slot for the synchronous API call
-
-DEPENDENCIES
-   N/A
-
-RETURN VALUE
-   Select ID (>=0)     : successful
-   -1                  : buffer full
-
-SIDE EFFECTS
-   N/A
-
-===========================================================================*/
-static int loc_alloc_slot()
-{
-   int i, select_id = -1; /* no free buffer */
-
-   pthread_mutex_lock(&loc_sync_call_mutex);
-
-   for (i = 0; i < LOC_SYNC_REQ_BUFFER_SIZE; i++)
-   {
-      if (!loc_sync_array.slot_in_use[i])
-      {
-         select_id = i;
-         loc_sync_array.slot_in_use[i] = 1;
-         loc_sync_array.in_use = true;
-         break;
-      }
-   }
-
-   pthread_mutex_unlock(&loc_sync_call_mutex);
-   LOC_LOGV("%s:%d]: returning slot %d\n",
-                 __func__, __LINE__, select_id);
-   return select_id;
-}
-
-/*===========================================================================
-
-FUNCTION    loc_free_slot
-
-DESCRIPTION
-   Frees a buffer slot after the synchronous API call
-
-DEPENDENCIES
-   N/A
-
-RETURN VALUE
-   None
-
-SIDE EFFECTS
-   N/A
-
-===========================================================================*/
-static void loc_free_slot(int select_id)
-{
-   int i;
-   loc_sync_req_data_s_type *slot;
-
-   pthread_mutex_lock(&loc_sync_call_mutex);
-
-   LOC_LOGD("%s:%d]: freeing slot %d\n", __func__, __LINE__, select_id);
-
-   loc_sync_array.slot_in_use[select_id] = 0;
-
-   slot = &loc_sync_array.slots[select_id];
-
-   slot->client_handle = LOC_CLIENT_INVALID_HANDLE_VALUE;
-   slot->ind_is_selected = false;       /* is ind selected? */
-   slot->ind_is_waiting  = false;       /* is waiting?     */
-   slot->ind_has_arrived = false;       /* callback has arrived */
-   slot->recv_ind_id = 0;       /* ind to wait for   */
-   slot->recv_ind_payload_ptr = NULL;
-   slot->req_id =  0;
-
-   // check if all slots are now free
-   for (i = 0; i < LOC_SYNC_REQ_BUFFER_SIZE; i++)
-   {
-      if (loc_sync_array.slot_in_use[i]) break;
-   }
-
-   if (i >= LOC_SYNC_REQ_BUFFER_SIZE)
-   {
-      loc_sync_array.in_use = false;
-   }
-
-   pthread_mutex_unlock(&loc_sync_call_mutex);
-}
-
-/*===========================================================================
-
-FUNCTION    loc_sync_select_ind
-
-DESCRIPTION
-   Selects which indication to wait for.
-
-
-DEPENDENCIES
-   N/A
-
-RETURN VALUE
-   Select ID (>=0)     : successful
-   -ENOMEM                  : out of buffer
-
-SIDE EFFECTS
-   N/A
-
-===========================================================================*/
-static int loc_sync_select_ind(
-      locClientHandleType       client_handle,   /* Client handle */
-      uint32_t                  ind_id,  /* ind Id wait for */
-      uint32_t                  req_id,   /* req id */
-      void *                    ind_payload_ptr /* ptr where payload should be copied to*/
-)
-{
-   int select_id = loc_alloc_slot();
-
-   LOC_LOGV("%s:%d]: client handle %p, ind_id %u, req_id %u \n",
-                 __func__, __LINE__, client_handle, ind_id, req_id);
-
-   if (select_id < 0)
-   {
-      LOC_LOGE("%s:%d]: buffer full for this synchronous req %s \n",
-                 __func__, __LINE__, loc_get_v02_event_name(req_id));
-      return -ENOMEM;
-   }
-
-   loc_sync_req_data_s_type *slot = &loc_sync_array.slots[select_id];
-
-   pthread_mutex_lock(&slot->sync_req_lock);
-
-   slot->client_handle = client_handle;
-   slot->ind_is_selected = true;
-   slot->ind_is_waiting = false;
-   slot->ind_has_arrived = false;
-
-   slot->recv_ind_id = ind_id;
-   slot->req_id      = req_id;
-   slot->recv_ind_payload_ptr = ind_payload_ptr; //store the payload ptr
-
-   pthread_mutex_unlock(&slot->sync_req_lock);
-
-   return select_id;
-}
-
-
-/*===========================================================================
-
-FUNCTION    loc_sync_wait_for_ind
-
-DESCRIPTION
-   Waits for a selected indication. The wait expires in timeout_seconds seconds.
-   If the function is called before an existing wait has finished, it will
-   immediately return error.
-
-DEPENDENCIES
-   N/A
-
-RETURN VALUE
-  0 on SUCCESS, -ve value on failure
-
-SIDE EFFECTS
-   N/A
-
-===========================================================================*/
-static int loc_sync_wait_for_ind(
-      int select_id,        /* ID from loc_sync_select_ind() */
-      int timeout_seconds,  /* Timeout in this number of seconds  */
-      uint32_t ind_id
-)
-{
-   if (select_id < 0 || select_id >= LOC_SYNC_REQ_BUFFER_SIZE || !loc_sync_array.slot_in_use[select_id])
-   {
-      LOC_LOGE("%s:%d]: invalid select_id: %d \n",
-                    __func__, __LINE__, select_id);
-
-      return (-EINVAL);
-   }
-
-   loc_sync_req_data_s_type *slot = &loc_sync_array.slots[select_id];
-
-   int ret_val = 0;  /* the return value of this function: 0 = no error */
-   int rc;          /* return code from pthread calls */
-
-   struct timeval present_time;
-   struct timespec expire_time;
-
-   pthread_mutex_lock(&slot->sync_req_lock);
-
-  do
-  {
-      if (slot->ind_has_arrived)
-      {
-         ret_val = 0;    /* success */
-         break;
-      }
-
-      if (slot->ind_is_waiting)
-      {
-         LOC_LOGW("%s:%d]: already waiting in this slot %d\n", __func__,
-                       __LINE__, select_id);
-         ret_val = -EBUSY; // busy
-         break;
-      }
-
-      /* Calculate absolute expire time */
-      gettimeofday(&present_time, NULL);
-      expire_time.tv_sec  = present_time.tv_sec;
-      expire_time.tv_nsec = present_time.tv_usec * 1000;
-      expire_time.tv_sec += timeout_seconds;
-
-      /* Take new wait request */
-      slot->ind_is_waiting = true;
-
-      /* Waiting */
-      rc = pthread_cond_timedwait(&slot->ind_arrived_cond,
-            &slot->sync_req_lock, &expire_time);
-
-      slot->ind_is_waiting = false;
-
-      if(rc == ETIMEDOUT)
-      {
-         LOC_LOGE("%s:%d]: slot %d, timed out for ind_id %s\n",
-                    __func__, __LINE__, select_id, loc_get_v02_event_name(ind_id));
-         ret_val = -ETIMEDOUT; //time out
-      }
-
-  } while (0);
-
-   pthread_mutex_unlock(&slot->sync_req_lock);
-   loc_free_slot(select_id);
-
-   return ret_val;
-}
-
-/*===========================================================================
-
-FUNCTION    loc_sync_send_req
-
-DESCRIPTION
-   Synchronous req call (thread safe)
-
-DEPENDENCIES
-   N/A
-
-RETURN VALUE
-   Loc API 2.0 status
-
-SIDE EFFECTS
-   N/A
-
-===========================================================================*/
-locClientStatusEnumType loc_sync_send_req
-(
-      locClientHandleType       client_handle,
-      uint32_t                  req_id,        /* req id */
-      locClientReqUnionType     req_payload,
-      uint32_t                  timeout_msec,
-      uint32_t                  ind_id,  //ind ID to block for, usually the same as req_id */
-      void                      *ind_payload_ptr /* can be NULL*/
-)
-{
-   locClientStatusEnumType status = eLOC_CLIENT_SUCCESS ;
-   int select_id;
-   int rc = 0;
-
-   // Select the callback we are waiting for
-   select_id = loc_sync_select_ind(client_handle, ind_id, req_id,
-                                   ind_payload_ptr);
-
-   if (select_id >= 0)
-   {
-      status =  locClientSendReq (client_handle, req_id, req_payload);
-      LOC_LOGV("%s:%d]: select_id = %d,locClientSendReq returned %d\n",
-                    __func__, __LINE__, select_id, status);
-
-      if (status != eLOC_CLIENT_SUCCESS )
-      {
-         loc_free_slot(select_id);
-      }
-      else
-      {
-         // Wait for the indication callback
-         if (( rc = loc_sync_wait_for_ind( select_id,
-                                           timeout_msec / 1000,
-                                           ind_id) ) < 0)
-         {
-            if ( rc == -ETIMEDOUT)
-               status = eLOC_CLIENT_FAILURE_TIMEOUT;
-            else
-               status = eLOC_CLIENT_FAILURE_INTERNAL;
-
-            // Callback waiting failed
-            LOC_LOGE("%s:%d]: loc_api_wait_for_ind failed, err %d, "
-                     "select id %d, status %s", __func__, __LINE__, rc ,
-                     select_id, loc_get_v02_client_status_name(status));
-         }
-         else
-         {
-            status =  eLOC_CLIENT_SUCCESS;
-            LOC_LOGV("%s:%d]: success (select id %d)\n",
-                          __func__, __LINE__, select_id);
-         }
-      }
-   } /* select id */
-
-   return status;
-}
-
-
diff --git a/location/loc_api/loc_api_v02/loc_api_sync_req.h b/location/loc_api/loc_api_v02/loc_api_sync_req.h
deleted file mode 100644
index 167c7c3..0000000
--- a/location/loc_api/loc_api_v02/loc_api_sync_req.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright (c) 2011, 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 LOC_SYNC_REQ_H
-#define LOC_SYNC_REQ_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-#include <stdbool.h>
-#include <stdint.h>
-#include "loc_api_v02_client.h"
-
-#define LOC_ENGINE_SYNC_REQUEST_TIMEOUT  (1000) // 1 second
-
-#define LOC_SEND_SYNC_REQ(NAME, ID, REQ, HANDLE)  \
-    int rv = true; \
-    locClientStatusEnumType st; \
-    locClientReqUnionType reqUnion; \
-    qmiLoc##NAME##IndMsgT_v02 ind; \
-\
-    reqUnion.p##NAME##Req = &REQ; \
-\
-    st = loc_sync_send_req(HANDLE,                          \
-                           QMI_LOC_##ID##_REQ_V02,          \
-                           reqUnion,                        \
-                           LOC_ENGINE_SYNC_REQUEST_TIMEOUT, \
-                           QMI_LOC_##ID##_IND_V02,          \
-                           &ind);                           \
-\
-    if (st != eLOC_CLIENT_SUCCESS || \
-        eQMI_LOC_SUCCESS_V02 != ind.status) { \
-        LOC_LOGE ("%s:%d]: Error : st = %d, ind.status = %d", \
-                  __func__, __LINE__,  st, ind.status); \
-        rv = false; \
-    }
-
-/* Init function */
-extern void loc_sync_req_init();
-
-
-/* Process Loc API indications to wake up blocked user threads */
-extern void loc_sync_process_ind(
-      locClientHandleType     client_handle,     /* handle of the client */
-      uint32_t                ind_id ,      /* respInd id */
-      void                    *ind_payload_ptr /* payload              */
-);
-
-/* Thread safe synchronous request,  using Loc API status return code */
-extern locClientStatusEnumType loc_sync_send_req
-(
-      locClientHandleType       client_handle,
-      uint32_t                  req_id,        /* req id */
-      locClientReqUnionType     req_payload,
-      uint32_t                  timeout_msec,
-      uint32_t                  ind_id,  //ind ID to block for, usually the same as req_id */
-      void                      *ind_payload_ptr /* can be NULL*/
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LOC_SYNC_REQ_H */
diff --git a/location/loc_api/loc_api_v02/loc_api_v02_client.c b/location/loc_api/loc_api_v02/loc_api_v02_client.c
deleted file mode 100644
index 67b3edf..0000000
--- a/location/loc_api/loc_api_v02/loc_api_v02_client.c
+++ /dev/null
@@ -1,2631 +0,0 @@
-/* Copyright (c) 2011-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 <stdlib.h>
-#include <string.h>
-#include <stddef.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "qmi_client.h"
-#include "qmi_idl_lib.h"
-#include "qmi_cci_target_ext.h"
-
-#if defined( _ANDROID_)
-#include "qmi_cci_target.h"
-#include "qmi_cci_common.h"
-#define LOG_NDEBUG 0
-#define LOG_TAG "LocSvc_api_v02"
-#endif //_ANDROID_
-
-
-#include "loc_api_v02_client.h"
-#include "loc_util_log.h"
-
-#ifdef LOC_UTIL_TARGET_OFF_TARGET
-
-// timeout in ms before send_msg_sync should return
-#define LOC_CLIENT_ACK_TIMEOUT (5000)
-
-#else
-
-// timeout in ms before send_msg_sync should return
-#define LOC_CLIENT_ACK_TIMEOUT (1000)
-
-#endif //LOC_UTIL_TARGET_OFF_TARGET
-
-#define LOC_CLIENT_MAX_OPEN_RETRIES (20)
-#define LOC_CLIENT_TIME_BETWEEN_OPEN_RETRIES (1)
-
-enum
-{
-  //! Special value for selecting any available service
-  /** This value enables selection of any available service */
-  eLOC_CLIENT_INSTANCE_ID_ANY = -1,
-  //! qca1530 service id value
-  /** qca1530 service daemon uses service id value 1 */
-  eLOC_CLIENT_INSTANCE_ID_QCA1530 = 1,
-  //! GSS service id value
-  /* GSS service id value is 0, but here it is set to -1 for compatibitily */
-  eLOC_CLIENT_INSTANCE_ID_GSS = eLOC_CLIENT_INSTANCE_ID_ANY,
-  //! MSM service id value
-  /** MSM service id value is 0, but here it is set to -1 for compatibitily */
-  eLOC_CLIENT_INSTANCE_ID_MSM = eLOC_CLIENT_INSTANCE_ID_ANY,
-  //! MDM service id value
-  /** MDM connects using QMUXD and assigned a value of
-      QMI_CLIENT_QMUX_RMNET_USB_INSTANCE_0 ("qmi_client_instance_defs.h", 37).
-      -1 for compatibility */
-  eLOC_CLIENT_INSTANCE_ID_MDM = eLOC_CLIENT_INSTANCE_ID_ANY,
-};
-
-/* Table to relate eventId, size and mask value used to enable the event*/
-typedef struct
-{
-  uint32_t               eventId;
-  size_t                 eventSize;
-  locClientEventMaskType eventMask;
-}locClientEventIndTableStructT;
-
-
-static locClientEventIndTableStructT locClientEventIndTable[]= {
-
-  // position report ind
-  { QMI_LOC_EVENT_POSITION_REPORT_IND_V02,
-    sizeof(qmiLocEventPositionReportIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_POSITION_REPORT_V02 },
-
-  // satellite report ind
-  { QMI_LOC_EVENT_GNSS_SV_INFO_IND_V02,
-    sizeof(qmiLocEventGnssSvInfoIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_GNSS_SV_INFO_V02 },
-
-  // NMEA report ind
-  { QMI_LOC_EVENT_NMEA_IND_V02,
-    sizeof(qmiLocEventNmeaIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_NMEA_V02 },
-
-  //NI event ind
-  { QMI_LOC_EVENT_NI_NOTIFY_VERIFY_REQ_IND_V02,
-    sizeof(qmiLocEventNiNotifyVerifyReqIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_NI_NOTIFY_VERIFY_REQ_V02 },
-
-  //Time Injection Request Ind
-  { QMI_LOC_EVENT_INJECT_TIME_REQ_IND_V02,
-    sizeof(qmiLocEventInjectTimeReqIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_INJECT_TIME_REQ_V02 },
-
-  //Predicted Orbits Injection Request
-  { QMI_LOC_EVENT_INJECT_PREDICTED_ORBITS_REQ_IND_V02,
-    sizeof(qmiLocEventInjectPredictedOrbitsReqIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_INJECT_PREDICTED_ORBITS_REQ_V02 },
-
-  //Position Injection Request Ind
-  { QMI_LOC_EVENT_INJECT_POSITION_REQ_IND_V02,
-    sizeof(qmiLocEventInjectPositionReqIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_INJECT_POSITION_REQ_V02 } ,
-
-  //Engine State Report Ind
-  { QMI_LOC_EVENT_ENGINE_STATE_IND_V02,
-    sizeof(qmiLocEventEngineStateIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_ENGINE_STATE_V02 },
-
-  //Fix Session State Report Ind
-  { QMI_LOC_EVENT_FIX_SESSION_STATE_IND_V02,
-    sizeof(qmiLocEventFixSessionStateIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_FIX_SESSION_STATE_V02 },
-
-  //Wifi Request Indication
-  { QMI_LOC_EVENT_WIFI_REQ_IND_V02,
-    sizeof(qmiLocEventWifiReqIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_WIFI_REQ_V02 },
-
-  //Sensor Streaming Ready Status Ind
-  { QMI_LOC_EVENT_SENSOR_STREAMING_READY_STATUS_IND_V02,
-    sizeof(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_SENSOR_STREAMING_READY_STATUS_V02 },
-
-  // Time Sync Request Indication
-  { QMI_LOC_EVENT_TIME_SYNC_REQ_IND_V02,
-    sizeof(qmiLocEventTimeSyncReqIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_TIME_SYNC_REQ_V02 },
-
-  //Set Spi Streaming Report Event
-  { QMI_LOC_EVENT_SET_SPI_STREAMING_REPORT_IND_V02,
-    sizeof(qmiLocEventSetSpiStreamingReportIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_SET_SPI_STREAMING_REPORT_V02 },
-
-  //Location Server Connection Request event
-  { QMI_LOC_EVENT_LOCATION_SERVER_CONNECTION_REQ_IND_V02,
-    sizeof(qmiLocEventLocationServerConnectionReqIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_LOCATION_SERVER_CONNECTION_REQ_V02 },
-
-  // NI Geofence Event
-  { QMI_LOC_EVENT_NI_GEOFENCE_NOTIFICATION_IND_V02,
-    sizeof(qmiLocEventNiGeofenceNotificationIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_NI_GEOFENCE_NOTIFICATION_V02},
-
-  // Geofence General Alert Event
-  { QMI_LOC_EVENT_GEOFENCE_GEN_ALERT_IND_V02,
-    sizeof(qmiLocEventGeofenceGenAlertIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_GEOFENCE_GEN_ALERT_V02},
-
-  //Geofence Breach event
-  { QMI_LOC_EVENT_GEOFENCE_BREACH_NOTIFICATION_IND_V02,
-    sizeof(qmiLocEventGeofenceBreachIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_GEOFENCE_BREACH_NOTIFICATION_V02},
-
-  //Geofence Batched Breach event
-  { QMI_LOC_EVENT_GEOFENCE_BATCHED_BREACH_NOTIFICATION_IND_V02,
-    sizeof(qmiLocEventGeofenceBatchedBreachIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_GEOFENCE_BATCH_BREACH_NOTIFICATION_V02},
-
-  //Pedometer Control event
-  { QMI_LOC_EVENT_PEDOMETER_CONTROL_IND_V02,
-    sizeof(qmiLocEventPedometerControlIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_PEDOMETER_CONTROL_V02 },
-
-  //Motion Data Control event
-  { QMI_LOC_EVENT_MOTION_DATA_CONTROL_IND_V02,
-    sizeof(qmiLocEventMotionDataControlIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_MOTION_DATA_CONTROL_V02 },
-
-  //Wifi AP data request event
-  { QMI_LOC_EVENT_INJECT_WIFI_AP_DATA_REQ_IND_V02,
-    sizeof(qmiLocEventInjectWifiApDataReqIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_INJECT_WIFI_AP_DATA_REQ_V02 },
-
-  //Get Batching On Fix Event
-  { QMI_LOC_EVENT_LIVE_BATCHED_POSITION_REPORT_IND_V02,
-    sizeof(qmiLocEventLiveBatchedPositionReportIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_LIVE_BATCHED_POSITION_REPORT_V02 },
-
-  //Get Batching On Full Event
-  { QMI_LOC_EVENT_BATCH_FULL_NOTIFICATION_IND_V02,
-    sizeof(qmiLocEventBatchFullIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_BATCH_FULL_NOTIFICATION_V02 },
-
-   //Vehicle Data Readiness event
-   { QMI_LOC_EVENT_VEHICLE_DATA_READY_STATUS_IND_V02,
-     sizeof(qmiLocEventVehicleDataReadyIndMsgT_v02),
-     QMI_LOC_EVENT_MASK_VEHICLE_DATA_READY_STATUS_V02 },
-
-   //GNSS measurement event
-   { QMI_LOC_EVENT_GNSS_MEASUREMENT_REPORT_IND_V02 ,
-     sizeof(qmiLocEventGnssSvMeasInfoIndMsgT_v02),
-     QMI_LOC_EVENT_MASK_GNSS_MEASUREMENT_REPORT_V02}
-};
-
-/* table to relate the respInd Id with its size */
-typedef struct
-{
-  uint32_t respIndId;
-  size_t   respIndSize;
-}locClientRespIndTableStructT;
-
-static locClientRespIndTableStructT locClientRespIndTable[]= {
-
-  // get service revision ind
-  { QMI_LOC_GET_SERVICE_REVISION_IND_V02,
-    sizeof(qmiLocGetServiceRevisionIndMsgT_v02)},
-
-  // Get Fix Criteria Resp Ind
-  { QMI_LOC_GET_FIX_CRITERIA_IND_V02,
-     sizeof(qmiLocGetFixCriteriaIndMsgT_v02)},
-
-  // NI User Resp In
-  { QMI_LOC_NI_USER_RESPONSE_IND_V02,
-    sizeof(qmiLocNiUserRespIndMsgT_v02)},
-
-  //Inject Predicted Orbits Data Resp Ind
-  { QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_IND_V02,
-    sizeof(qmiLocInjectPredictedOrbitsDataIndMsgT_v02)},
-
-  //Get Predicted Orbits Data Src Resp Ind
-  { QMI_LOC_GET_PREDICTED_ORBITS_DATA_SOURCE_IND_V02,
-    sizeof(qmiLocGetPredictedOrbitsDataSourceIndMsgT_v02)},
-
-  // Get Predicted Orbits Data Validity Resp Ind
-   { QMI_LOC_GET_PREDICTED_ORBITS_DATA_VALIDITY_IND_V02,
-     sizeof(qmiLocGetPredictedOrbitsDataValidityIndMsgT_v02)},
-
-   // Inject UTC Time Resp Ind
-   { QMI_LOC_INJECT_UTC_TIME_IND_V02,
-     sizeof(qmiLocInjectUtcTimeIndMsgT_v02)},
-
-   //Inject Position Resp Ind
-   { QMI_LOC_INJECT_POSITION_IND_V02,
-     sizeof(qmiLocInjectPositionIndMsgT_v02)},
-
-   //Set Engine Lock Resp Ind
-   { QMI_LOC_SET_ENGINE_LOCK_IND_V02,
-     sizeof(qmiLocSetEngineLockIndMsgT_v02)},
-
-   //Get Engine Lock Resp Ind
-   { QMI_LOC_GET_ENGINE_LOCK_IND_V02,
-     sizeof(qmiLocGetEngineLockIndMsgT_v02)},
-
-   //Set SBAS Config Resp Ind
-   { QMI_LOC_SET_SBAS_CONFIG_IND_V02,
-     sizeof(qmiLocSetSbasConfigIndMsgT_v02)},
-
-   //Get SBAS Config Resp Ind
-   { QMI_LOC_GET_SBAS_CONFIG_IND_V02,
-     sizeof(qmiLocGetSbasConfigIndMsgT_v02)},
-
-   //Set NMEA Types Resp Ind
-   { QMI_LOC_SET_NMEA_TYPES_IND_V02,
-     sizeof(qmiLocSetNmeaTypesIndMsgT_v02)},
-
-   //Get NMEA Types Resp Ind
-   { QMI_LOC_GET_NMEA_TYPES_IND_V02,
-     sizeof(qmiLocGetNmeaTypesIndMsgT_v02)},
-
-   //Set Low Power Mode Resp Ind
-   { QMI_LOC_SET_LOW_POWER_MODE_IND_V02,
-     sizeof(qmiLocSetLowPowerModeIndMsgT_v02)},
-
-   //Get Low Power Mode Resp Ind
-   { QMI_LOC_GET_LOW_POWER_MODE_IND_V02,
-     sizeof(qmiLocGetLowPowerModeIndMsgT_v02)},
-
-   //Set Server Resp Ind
-   { QMI_LOC_SET_SERVER_IND_V02,
-     sizeof(qmiLocSetServerIndMsgT_v02)},
-
-   //Get Server Resp Ind
-   { QMI_LOC_GET_SERVER_IND_V02,
-     sizeof(qmiLocGetServerIndMsgT_v02)},
-
-    //Delete Assist Data Resp Ind
-   { QMI_LOC_DELETE_ASSIST_DATA_IND_V02,
-     sizeof(qmiLocDeleteAssistDataIndMsgT_v02)},
-
-   //Set XTRA-T Session Control Resp Ind
-   { QMI_LOC_SET_XTRA_T_SESSION_CONTROL_IND_V02,
-     sizeof(qmiLocSetXtraTSessionControlIndMsgT_v02)},
-
-   //Get XTRA-T Session Control Resp Ind
-   { QMI_LOC_GET_XTRA_T_SESSION_CONTROL_IND_V02,
-     sizeof(qmiLocGetXtraTSessionControlIndMsgT_v02)},
-
-   //Inject Wifi Position Resp Ind
-   { QMI_LOC_INJECT_WIFI_POSITION_IND_V02,
-     sizeof(qmiLocInjectWifiPositionIndMsgT_v02)},
-
-   //Notify Wifi Status Resp Ind
-   { QMI_LOC_NOTIFY_WIFI_STATUS_IND_V02,
-     sizeof(qmiLocNotifyWifiStatusIndMsgT_v02)},
-
-   //Get Registered Events Resp Ind
-   { QMI_LOC_GET_REGISTERED_EVENTS_IND_V02,
-     sizeof(qmiLocGetRegisteredEventsIndMsgT_v02)},
-
-   //Set Operation Mode Resp Ind
-   { QMI_LOC_SET_OPERATION_MODE_IND_V02,
-     sizeof(qmiLocSetOperationModeIndMsgT_v02)},
-
-   //Get Operation Mode Resp Ind
-   { QMI_LOC_GET_OPERATION_MODE_IND_V02,
-     sizeof(qmiLocGetOperationModeIndMsgT_v02)},
-
-   //Set SPI Status Resp Ind
-   { QMI_LOC_SET_SPI_STATUS_IND_V02,
-     sizeof(qmiLocSetSpiStatusIndMsgT_v02)},
-
-   //Inject Sensor Data Resp Ind
-   { QMI_LOC_INJECT_SENSOR_DATA_IND_V02,
-     sizeof(qmiLocInjectSensorDataIndMsgT_v02)},
-
-   //Inject Time Sync Data Resp Ind
-   { QMI_LOC_INJECT_TIME_SYNC_DATA_IND_V02,
-     sizeof(qmiLocInjectTimeSyncDataIndMsgT_v02)},
-
-   //Set Cradle Mount config Resp Ind
-   { QMI_LOC_SET_CRADLE_MOUNT_CONFIG_IND_V02,
-     sizeof(qmiLocSetCradleMountConfigIndMsgT_v02)},
-
-   //Get Cradle Mount config Resp Ind
-   { QMI_LOC_GET_CRADLE_MOUNT_CONFIG_IND_V02,
-     sizeof(qmiLocGetCradleMountConfigIndMsgT_v02)},
-
-   //Set External Power config Resp Ind
-   { QMI_LOC_SET_EXTERNAL_POWER_CONFIG_IND_V02,
-     sizeof(qmiLocSetExternalPowerConfigIndMsgT_v02)},
-
-   //Get External Power config Resp Ind
-   { QMI_LOC_GET_EXTERNAL_POWER_CONFIG_IND_V02,
-     sizeof(qmiLocGetExternalPowerConfigIndMsgT_v02)},
-
-   //Location server connection status
-   { QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_IND_V02,
-     sizeof(qmiLocInformLocationServerConnStatusIndMsgT_v02)},
-
-   //Set Protocol Config Parameters
-   { QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_IND_V02,
-     sizeof(qmiLocSetProtocolConfigParametersIndMsgT_v02)},
-
-   //Get Protocol Config Parameters
-   { QMI_LOC_GET_PROTOCOL_CONFIG_PARAMETERS_IND_V02,
-     sizeof(qmiLocGetProtocolConfigParametersIndMsgT_v02)},
-
-   //Set Sensor Control Config
-   { QMI_LOC_SET_SENSOR_CONTROL_CONFIG_IND_V02,
-     sizeof(qmiLocSetSensorControlConfigIndMsgT_v02)},
-
-   //Get Sensor Control Config
-   { QMI_LOC_GET_SENSOR_CONTROL_CONFIG_IND_V02,
-     sizeof(qmiLocGetSensorControlConfigIndMsgT_v02)},
-
-   //Set Sensor Properties
-   { QMI_LOC_SET_SENSOR_PROPERTIES_IND_V02,
-     sizeof(qmiLocSetSensorPropertiesIndMsgT_v02)},
-
-   //Get Sensor Properties
-   { QMI_LOC_GET_SENSOR_PROPERTIES_IND_V02,
-     sizeof(qmiLocGetSensorPropertiesIndMsgT_v02)},
-
-   //Set Sensor Performance Control Config
-   { QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_IND_V02,
-     sizeof(qmiLocSetSensorPerformanceControlConfigIndMsgT_v02)},
-
-   //Get Sensor Performance Control Config
-   { QMI_LOC_GET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_IND_V02,
-     sizeof(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02)},
-   //Inject SUPL certificate
-   { QMI_LOC_INJECT_SUPL_CERTIFICATE_IND_V02,
-     sizeof(qmiLocInjectSuplCertificateIndMsgT_v02) },
-
-   //Delete SUPL certificate
-   { QMI_LOC_DELETE_SUPL_CERTIFICATE_IND_V02,
-     sizeof(qmiLocDeleteSuplCertificateIndMsgT_v02) },
-
-   // Set Position Engine Config
-   { QMI_LOC_SET_POSITION_ENGINE_CONFIG_PARAMETERS_IND_V02,
-     sizeof(qmiLocSetPositionEngineConfigParametersIndMsgT_v02)},
-
-   // Get Position Engine Config
-   { QMI_LOC_GET_POSITION_ENGINE_CONFIG_PARAMETERS_IND_V02,
-     sizeof(qmiLocGetPositionEngineConfigParametersIndMsgT_v02)},
-
-   //Add a Circular Geofence
-   { QMI_LOC_ADD_CIRCULAR_GEOFENCE_IND_V02,
-     sizeof(qmiLocAddCircularGeofenceIndMsgT_v02)},
-
-   //Delete a Geofence
-   { QMI_LOC_DELETE_GEOFENCE_IND_V02,
-     sizeof(qmiLocDeleteGeofenceIndMsgT_v02)} ,
-
-   //Query a Geofence
-   { QMI_LOC_QUERY_GEOFENCE_IND_V02,
-     sizeof(qmiLocQueryGeofenceIndMsgT_v02)},
-
-   //Edit a Geofence
-   { QMI_LOC_EDIT_GEOFENCE_IND_V02,
-     sizeof(qmiLocEditGeofenceIndMsgT_v02)},
-
-   //Get best available position
-   { QMI_LOC_GET_BEST_AVAILABLE_POSITION_IND_V02,
-     sizeof(qmiLocGetBestAvailablePositionIndMsgT_v02)},
-
-   //Inject motion data
-   { QMI_LOC_INJECT_MOTION_DATA_IND_V02,
-     sizeof(qmiLocInjectMotionDataIndMsgT_v02)},
-
-   //Get NI Geofence list
-   { QMI_LOC_GET_NI_GEOFENCE_ID_LIST_IND_V02,
-     sizeof(qmiLocGetNiGeofenceIdListIndMsgT_v02)},
-
-   //Inject GSM Cell Info
-   { QMI_LOC_INJECT_GSM_CELL_INFO_IND_V02,
-     sizeof(qmiLocInjectGSMCellInfoIndMsgT_v02)},
-
-   //Inject Network Initiated Message
-   { QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_IND_V02,
-     sizeof(qmiLocInjectNetworkInitiatedMessageIndMsgT_v02)},
-
-   //WWAN Out of Service Notification
-   { QMI_LOC_WWAN_OUT_OF_SERVICE_NOTIFICATION_IND_V02,
-     sizeof(qmiLocWWANOutOfServiceNotificationIndMsgT_v02)},
-
-   //Pedomete Report
-   { QMI_LOC_PEDOMETER_REPORT_IND_V02,
-     sizeof(qmiLocPedometerReportIndMsgT_v02)},
-
-   { QMI_LOC_INJECT_WCDMA_CELL_INFO_IND_V02,
-     sizeof(qmiLocInjectWCDMACellInfoIndMsgT_v02)},
-
-   { QMI_LOC_INJECT_TDSCDMA_CELL_INFO_IND_V02,
-     sizeof(qmiLocInjectTDSCDMACellInfoIndMsgT_v02)},
-
-   { QMI_LOC_INJECT_SUBSCRIBER_ID_IND_V02,
-     sizeof(qmiLocInjectSubscriberIDIndMsgT_v02)},
-
-   //Inject Wifi AP data Resp Ind
-   { QMI_LOC_INJECT_WIFI_AP_DATA_IND_V02,
-     sizeof(qmiLocInjectWifiApDataIndMsgT_v02)},
-
-   { QMI_LOC_START_BATCHING_IND_V02,
-     sizeof(qmiLocStartBatchingIndMsgT_v02)},
-
-   { QMI_LOC_STOP_BATCHING_IND_V02,
-     sizeof(qmiLocStopBatchingIndMsgT_v02)},
-
-   { QMI_LOC_GET_BATCH_SIZE_IND_V02,
-     sizeof(qmiLocGetBatchSizeIndMsgT_v02)},
-
-   { QMI_LOC_EVENT_LIVE_BATCHED_POSITION_REPORT_IND_V02,
-     sizeof(qmiLocEventPositionReportIndMsgT_v02)},
-
-   { QMI_LOC_EVENT_BATCH_FULL_NOTIFICATION_IND_V02,
-     sizeof(qmiLocEventBatchFullIndMsgT_v02)},
-
-   { QMI_LOC_READ_FROM_BATCH_IND_V02,
-     sizeof(qmiLocReadFromBatchIndMsgT_v02)},
-
-   { QMI_LOC_RELEASE_BATCH_IND_V02,
-     sizeof(qmiLocReleaseBatchIndMsgT_v02)},
-
-    //Vehicle Sensor Data
-    { QMI_LOC_INJECT_VEHICLE_SENSOR_DATA_IND_V02,
-      sizeof(qmiLocInjectVehicleSensorDataIndMsgT_v02)},
-
-   { QMI_LOC_NOTIFY_WIFI_ATTACHMENT_STATUS_IND_V02,
-     sizeof(qmiLocNotifyWifiAttachmentStatusIndMsgT_v02)},
-
-   { QMI_LOC_NOTIFY_WIFI_ENABLED_STATUS_IND_V02,
-     sizeof(qmiLocNotifyWifiEnabledStatusIndMsgT_v02)},
-
-   { QMI_LOC_SET_PREMIUM_SERVICES_CONFIG_IND_V02,
-     sizeof(qmiLocSetPremiumServicesCfgReqMsgT_v02)},
-
-   { QMI_LOC_GET_AVAILABLE_WWAN_POSITION_IND_V02,
-     sizeof(qmiLocGetAvailWwanPositionIndMsgT_v02)},
-
-   { QMI_LOC_SET_GNSS_CONSTELL_REPORT_CONFIG_IND_V02,
-     sizeof(qmiLocSetGNSSConstRepConfigIndMsgT_v02)}
-};
-
-
-/** whether indication is an event or a response */
-typedef enum { eventIndType =0, respIndType = 1 } locClientIndEnumT;
-
-
-/** @struct locClientInternalState
- */
-
-typedef struct locClientCbDataStructT locClientCallbackDataType;
-
-struct locClientCbDataStructT
-{
- // client cookie
-  void *pClientCookie;
-  //QCCI handle for this control point
-  qmi_client_type userHandle;
-
-  // callbacks registered by the clients
-  locClientEventIndCbType eventCallback;
-  locClientRespIndCbType respCallback;
-  locClientErrorCbType   errorCallback;
-
-  // the event mask the client has registered for
-  locClientEventMaskType eventRegMask;
-
-  //pointer to itself for checking consistency data
-   locClientCallbackDataType *pMe;
-};
-
-
-/*===========================================================================
- *
- *                          FUNCTION DECLARATION
- *
- *==========================================================================*/
-
-/** locClientGetSizeAndTypeByIndId
- *  @brief this function gets the size and the type (event,
- *         response)of the indication structure from its ID
- *  @param [in]  indId  ID of the indication
- *  @param [out] type   event or response indication
- *  @param [out] size   size of the indications
- *
- *  @return true if the ID was found, false otherwise */
-
-static bool locClientGetSizeAndTypeByIndId (uint32_t indId, size_t *pIndSize,
-                                         locClientIndEnumT *pIndType)
-{
-  // look in the event table
-  if(true == locClientGetSizeByEventIndId(indId, pIndSize))
-  {
-    *pIndType = eventIndType;
-
-    LOC_LOGV("%s:%d]: indId %d is an event size = %d\n", __func__, __LINE__,
-                  indId, (uint32_t)*pIndSize);
-    return true;
-  }
-
-  //else look in response table
-  if(true == locClientGetSizeByRespIndId(indId, pIndSize))
-  {
-    *pIndType = respIndType;
-
-    LOC_LOGV("%s:%d]: indId %d is a resp size = %d\n", __func__, __LINE__,
-                  indId, (uint32_t)*pIndSize);
-    return true;
-  }
-
-  // Id not found
-  LOC_LOGW("%s:%d]: indId %d not found\n", __func__, __LINE__, indId);
-  return false;
-}
-
-/** isClientRegisteredForEvent
-*  @brief checks the mask to identify if the client has
-*         registered for the specified event Id
-*  @param [in] eventIndId
-*  @param [in] eventRegMask
-*  @return true if client regstered for event; else false */
-
-static bool isClientRegisteredForEvent(
-    locClientEventMaskType eventRegMask,
-    uint32_t eventIndId)
-{
-  size_t idx = 0, eventIndTableSize = 0;
-
-  // look in the event table
-  eventIndTableSize =
-    (sizeof(locClientEventIndTable)/sizeof(locClientEventIndTableStructT));
-
-  for(idx=0; idx<eventIndTableSize; idx++ )
-  {
-    if(eventIndId == locClientEventIndTable[idx].eventId)
-    {
-      LOC_LOGV("%s:%d]: eventId %d registered mask = 0x%04x%04x, "
-               "eventMask = 0x%04x%04x\n", __func__, __LINE__,
-               eventIndId,(uint32_t)(eventRegMask>>32),
-               (uint32_t)(eventRegMask & 0xFFFFFFFF),
-               (uint32_t)(locClientEventIndTable[idx].eventMask >> 32),
-               (uint32_t)(locClientEventIndTable[idx].eventMask & 0xFFFFFFFF));
-
-      return((
-          eventRegMask & locClientEventIndTable[idx].eventMask)?
-          true:false);
-    }
-  }
-  LOC_LOGW("%s:%d]: eventId %d not found\n", __func__, __LINE__,
-                 eventIndId);
-  return false;
-}
-
-/** checkQmiMsgsSupported
- @brief check the qmi service is supported or not.
- @param [in] pResponse  pointer to the response received from
-        QMI_LOC service.
- @return bool value corresponding to the
-         service is supported or not.
-*/
-
-static bool checkQmiMsgsSupported(
-  uint32_t                 reqId,
-  qmiLocGetSupportMsgT_v02 *pResponse)
-{
-    LOC_LOGV("%s:%d]: entering \n", __func__, __LINE__);
-
-    /* For example, if a service supports exactly four messages with
-    IDs 0, 1, 30, and 31 (decimal), the array (in hexadecimal) is
-    4 bytes [03 00 00 c0]. */
-
-    int length = reqId/8 + 1;
-    LOC_LOGV("%s:%d]: length is %d ;\n", __func__, __LINE__, length);
-
-    if(pResponse->resp.supported_msgs_len < length) {
-        LOC_LOGV("%s:%d]: pResponse->resp.supported_msgs_len < %d \n", __func__, __LINE__, length);
-        return false;
-    } else {
-        LOC_LOGV("%s:%d]: pResponse->resp.supported_msgs_len >= %d \n", __func__, __LINE__, length);
-        int bit = reqId%8;
-        LOC_LOGV("%s:%d]: the bit is %d\n", __func__, __LINE__, bit);
-        LOC_LOGV("%s:%d]: the pResponse->resp.supported_msgs[length] is %d\n",
-                 __func__, __LINE__, pResponse->resp.supported_msgs[length]);
-        if (pResponse->resp.supported_msgs[length-1] & (1<<bit)) {
-            LOC_LOGV("%s:%d]: this service %d is supported\n", __func__, __LINE__, reqId);
-            return true;
-        } else {
-            LOC_LOGV("%s:%d]: this service %d is not supported\n", __func__, __LINE__, reqId);
-            return false;
-        }
-    }
-}
-
-/** convertQmiResponseToLocStatus
- @brief converts a qmiLocGenRespMsgT to locClientStatusEnumType*
- @param [in] pResponse; pointer to the response received from
-        QMI_LOC service.
- @return locClientStatusEnumType corresponding to the
-         response.
-*/
-
-static locClientStatusEnumType convertQmiResponseToLocStatus(
-  qmiLocGenRespMsgT_v02 *pResponse)
-{
-  locClientStatusEnumType status =  eLOC_CLIENT_FAILURE_INTERNAL;
-
-  // if result == SUCCESS don't look at error code
-  if(pResponse->resp.result == QMI_RESULT_SUCCESS_V01 )
-  {
-    status  = eLOC_CLIENT_SUCCESS;
-  }
-  else
-  {
-    switch(pResponse->resp.error)
-    {
-      case QMI_ERR_MALFORMED_MSG_V01:
-      case QMI_ERR_INVALID_ARG_V01:
-        status = eLOC_CLIENT_FAILURE_INVALID_PARAMETER;
-        break;
-
-      case QMI_ERR_DEVICE_IN_USE_V01:
-        status = eLOC_CLIENT_FAILURE_ENGINE_BUSY;
-        break;
-
-      default:
-        status = eLOC_CLIENT_FAILURE_INTERNAL;
-        break;
-    }
-  }
-  LOC_LOGV("%s:%d]: result = %d, error = %d, status = %d\n",
-                __func__, __LINE__, pResponse->resp.result,
-                pResponse->resp.error, status);
-  return status;
-}
-
-/** convertQmiErrorToLocError
- @brief converts a qmi service error type to
-        locClientErrorEnumType
- @param [in] error received QMI service.
- @return locClientErrorEnumType corresponding to the error.
-*/
-
-static locClientErrorEnumType convertQmiErrorToLocError(
-  qmi_client_error_type error)
-{
-  locClientErrorEnumType locError ;
-  switch(error)
-  {
-    case QMI_SERVICE_ERR:
-      locError = eLOC_CLIENT_ERROR_SERVICE_UNAVAILABLE;
-      break;
-
-    default:
-      locError = eLOC_CLIENT_ERROR_SERVICE_UNAVAILABLE;
-      break;
-  }
-  LOC_LOGV("%s:%d]: qmi error = %d, loc error = %d\n",
-                __func__, __LINE__, error, locError);
-  return locError;
-}
-
-/** locClienHandlePosReportInd
- *  @brief Validates a position report ind
- *  @param [in] msg_id
- *  @param [in] ind_buf
- *  @param [in] ind_buf_len
- *  @return true if pos report is valid, false otherwise
-*/
-static bool locClientHandlePosReportInd
-(
- uint32_t        msg_id,
- const void*     ind_buf,
- uint32_t        ind_buf_len
-)
-{
-  // validate position report
-  qmiLocEventPositionReportIndMsgT_v02 *posReport =
-    (qmiLocEventPositionReportIndMsgT_v02 *)ind_buf;
-
-  LOC_LOGV ("%s:%d]: len = %d lat = %f, lon = %f, alt = %f\n",
-                 __func__, __LINE__, ind_buf_len,
-                 posReport->latitude, posReport->longitude,
-                 posReport->altitudeWrtEllipsoid);
-
-  return true;
-}
-//-----------------------------------------------------------------------------
-
-/** locClientHandleSatReportInd
- *  @brief Validates a satellite report indication. Dk
- *  @param [in] msg_id
- *  @param [in] ind_buf
- *  @param [in] ind_buf_len
- *  @return true if sat report is valid, false otherwise
-*/
-static bool locClientHandleSatReportInd
-(
- uint32_t        msg_id,
- const void*     ind_buf,
- uint32_t        ind_buf_len
-)
-{
-  // validate sat reports
-  unsigned int idx = 0;
-  qmiLocEventGnssSvInfoIndMsgT_v02 *satReport =
-    (qmiLocEventGnssSvInfoIndMsgT_v02 *)ind_buf;
-
-  LOC_LOGV ("%s:%d]: len = %u , altitude assumed = %u, num SV's = %u"
-                 " validity = %d \n ", __func__, __LINE__,
-                 ind_buf_len, satReport->altitudeAssumed,
-                 satReport->svList_len, satReport->svList_valid);
-  //Log SV report
-  for( idx = 0; idx <satReport->svList_len; idx++ )
-  {
-    LOC_LOGV("%s:%d]: valid_mask = %x, prn = %u, system = %d, "
-                  "status = %d \n", __func__, __LINE__,
-                  satReport->svList[idx].validMask, satReport->svList[idx].gnssSvId,
-                  satReport->svList[idx].system, satReport->svList[idx].svStatus);
-  }
-
-   return true;
-}
-
-
-/** locClientHandleNmeaReportInd
- *  @brief Validate a NMEA report indication.
- *  @param [in] msg_id
- *  @param [in] ind_buf
- *  @param [in] ind_buf_len
- *  @return true if nmea report is valid, false otherwise
-*/
-
-
-static bool locClientHandleNmeaReportInd
-(
- uint32_t        msg_id,
- const void*     ind_buf,
- uint32_t        ind_buf_len
-)
-{
- // validate NMEA report
-  return true;
-}
-
-/** locClientHandleGetServiceRevisionRespInd
- *  @brief Handles a Get Service Revision Rresponse indication.
- *  @param [in] msg_id
- *  @param [in] ind_buf
- *  @param [in] ind_buf_len
- *  @return true if service revision is valid, false otherwise
-*/
-
-static bool locClientHandleGetServiceRevisionRespInd
-(
- uint32_t        msg_id,
- const void*     ind_buf,
- uint32_t        ind_buf_len
-)
-{
-  LOC_LOGV("%s:%d] :\n", __func__, __LINE__);
-  return true;
-}
-
-/** locClientHandleIndication
- *  @brief looks at each indication and calls the appropriate
- *         validation handler
- *  @param [in] indId
- *  @param [in] indBuffer
- *  @param [in] indSize
- *  @return true if indication was validated; else false */
-
-static bool locClientHandleIndication(
-  uint32_t        indId,
-  void*           indBuffer,
-  size_t          indSize
- )
-{
-  bool status = false;
-  switch(indId)
-  {
-    // handle the event indications
-    //-------------------------------------------------------------------------
-
-    // handle position report
-    case QMI_LOC_EVENT_POSITION_REPORT_IND_V02:
-    {
-      status = locClientHandlePosReportInd(indId, indBuffer, indSize);
-      break;
-    }
-    // handle satellite report
-    case QMI_LOC_EVENT_GNSS_SV_INFO_IND_V02:
-    {
-      status = locClientHandleSatReportInd(indId, indBuffer, indSize);
-      break;
-    }
-
-    // handle NMEA report
-    case QMI_LOC_EVENT_NMEA_IND_V02:
-    {
-      status = locClientHandleNmeaReportInd(indId, indBuffer, indSize);
-      break;
-    }
-
-    // handle NI Notify Verify Request Ind
-    case QMI_LOC_EVENT_NI_NOTIFY_VERIFY_REQ_IND_V02:
-    {
-     // locClientHandleNiReqInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    // handle Time Inject request Ind
-    case QMI_LOC_EVENT_INJECT_TIME_REQ_IND_V02:
-    {
-     // locClientHandleTimeInjectReqInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    // handle XTRA data Inject request Ind
-    case QMI_LOC_EVENT_INJECT_PREDICTED_ORBITS_REQ_IND_V02:
-    {
-     // locClientHandleXtraInjectReqInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    // handle position inject request Ind
-    case QMI_LOC_EVENT_INJECT_POSITION_REQ_IND_V02:
-    {
-     // locClientHandlePositionInjectReqInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    // handle engine state Ind
-    case QMI_LOC_EVENT_ENGINE_STATE_IND_V02:
-    {
-     // locClientHandleEngineStateInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    // handle fix session state Ind
-    case QMI_LOC_EVENT_FIX_SESSION_STATE_IND_V02:
-    {
-     // locClientHandleFixSessionStateInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    // handle Wifi request Ind
-    case QMI_LOC_EVENT_WIFI_REQ_IND_V02:
-    {
-     // locClientHandleWifiReqInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    // handle sensor streaming ready status Ind
-    case QMI_LOC_EVENT_SENSOR_STREAMING_READY_STATUS_IND_V02:
-    {
-     // locClientHandleSensorStreamingReadyInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    // handle time sync  Ind
-    case QMI_LOC_EVENT_TIME_SYNC_REQ_IND_V02:
-    {
-     // locClientHandleTimeSyncReqInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    // handle set streaming report ind
-    case QMI_LOC_EVENT_SET_SPI_STREAMING_REPORT_IND_V02:
-    {
-     // locClientHandleSetSpiStreamingInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_LOCATION_SERVER_CONNECTION_REQ_IND_V02:
-    {
-      //locClientHandleLocServerConnReqInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_NI_GEOFENCE_NOTIFICATION_IND_V02:
-    {
-      //locClientHandleNiGeofenceNotificationInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_GEOFENCE_GEN_ALERT_IND_V02:
-    {
-      //locClientHandleGeofenceGenAlertInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_GEOFENCE_BREACH_NOTIFICATION_IND_V02:
-    {
-      //locClientHandleGeofenceBreachInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_GEOFENCE_BATCHED_BREACH_NOTIFICATION_IND_V02:
-    {
-      //locClientHandleGeofenceBatchedBreachInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_PEDOMETER_CONTROL_IND_V02 :
-    {
-      //locClientHandlePedometerControlInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_MOTION_DATA_CONTROL_IND_V02:
-    {
-      //locClientHandleMotionDataControlInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_INJECT_WIFI_AP_DATA_REQ_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_VEHICLE_DATA_READY_STATUS_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_INJECT_VEHICLE_SENSOR_DATA_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    //-------------------------------------------------------------------------
-
-    // handle the response indications
-    //-------------------------------------------------------------------------
-
-    // Get service Revision response indication
-    case QMI_LOC_GET_SERVICE_REVISION_IND_V02:
-    {
-      status = locClientHandleGetServiceRevisionRespInd(indId,
-                                                        indBuffer, indSize);
-      break;
-    }
-
-    case QMI_LOC_GET_FIX_CRITERIA_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    // predicted orbits data response indication
-    case QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_IND_V02:
-    {
-      //locClientHandleInjectPredictedOrbitsDataInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    // get predicted orbits source response indication
-    case QMI_LOC_GET_PREDICTED_ORBITS_DATA_SOURCE_IND_V02:
-    {
-      //locClientHandleGetPredictedOrbitsSourceInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    // get predicted orbits validity response indication
-    case QMI_LOC_GET_PREDICTED_ORBITS_DATA_VALIDITY_IND_V02:
-    {
-      //locClientHandleGetPredictedOrbitsDataValidityInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_INJECT_SENSOR_DATA_IND_V02 :
-    {
-      //locClientHandleInjectSensorDataInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_GET_PROTOCOL_CONFIG_PARAMETERS_IND_V02:
-    {
-      //locClientHandleGetProtocolConfigParametersInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_IND_V02:
-    {
-      //locClientHandleSetProtocolConfigParametersInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_GET_EXTERNAL_POWER_CONFIG_IND_V02:
-    {
-      //locClientHandleGetExtPowerConfigInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_GET_CRADLE_MOUNT_CONFIG_IND_V02:
-    {
-      //locClientHandleGetCradleMountConfigInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_GET_SENSOR_CONTROL_CONFIG_IND_V02:
-    {
-      //locClientHandleGetSensorControlConfigInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_GET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_IND_V02:
-    {
-      //locClientHandleGetSensorPerformanceControlConfigInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_GET_SENSOR_PROPERTIES_IND_V02:
-    {
-      //locClientHandleGetSensorPropertiesInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_IND_V02:
-    {
-      //locClientHandleSetSensorPerformanceControlConfigInd(user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_SET_POSITION_ENGINE_CONFIG_PARAMETERS_IND_V02:
-    {
-    // locClientHandleSetPositionEngineConfigParam(
-    //     user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_GET_POSITION_ENGINE_CONFIG_PARAMETERS_IND_V02:
-    {
-      // locClientHandleSetPositionEngineConfigParam(
-      //     user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_ADD_CIRCULAR_GEOFENCE_IND_V02:
-    {
-      // locClientHandleAddCircularGeofenceInd(
-      //     user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_DELETE_GEOFENCE_IND_V02:
-    {
-      // locClientHandleDeleteGeofenceInd(
-      //     user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EDIT_GEOFENCE_IND_V02:
-    {
-      // locClientHandleEditGeofenceInd(
-      //     user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_QUERY_GEOFENCE_IND_V02:
-    {
-      // locClientHandleQueryGeofenceInd(
-      //     user_handle, msg_id, ind_buf, ind_buf_len);
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_GET_BEST_AVAILABLE_POSITION_IND_V02:
-    {
-      status = true;
-      break;
-    }
-    case QMI_LOC_GET_ENGINE_LOCK_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_GET_NI_GEOFENCE_ID_LIST_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_PEDOMETER_REPORT_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_START_BATCHING_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_STOP_BATCHING_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_GET_BATCH_SIZE_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_LIVE_BATCHED_POSITION_REPORT_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_BATCH_FULL_NOTIFICATION_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_READ_FROM_BATCH_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_RELEASE_BATCH_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_EVENT_GNSS_MEASUREMENT_REPORT_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    case QMI_LOC_SET_GNSS_CONSTELL_REPORT_CONFIG_IND_V02:
-    {
-      status = true;
-      break;
-    }
-
-    // for indications that only have a "status" field
-    case QMI_LOC_NI_USER_RESPONSE_IND_V02:
-    case QMI_LOC_INJECT_UTC_TIME_IND_V02:
-    case QMI_LOC_INJECT_POSITION_IND_V02:
-    case QMI_LOC_SET_ENGINE_LOCK_IND_V02:
-    case QMI_LOC_SET_SBAS_CONFIG_IND_V02:
-    case QMI_LOC_SET_NMEA_TYPES_IND_V02:
-    case QMI_LOC_SET_LOW_POWER_MODE_IND_V02:
-    case QMI_LOC_SET_SERVER_IND_V02:
-    case QMI_LOC_DELETE_ASSIST_DATA_IND_V02:
-    case QMI_LOC_SET_XTRA_T_SESSION_CONTROL_IND_V02:
-    case QMI_LOC_INJECT_WIFI_POSITION_IND_V02:
-    case QMI_LOC_NOTIFY_WIFI_STATUS_IND_V02:
-    case QMI_LOC_SET_OPERATION_MODE_IND_V02:
-    case QMI_LOC_SET_SPI_STATUS_IND_V02:
-    case QMI_LOC_INJECT_TIME_SYNC_DATA_IND_V02:
-    case QMI_LOC_SET_CRADLE_MOUNT_CONFIG_IND_V02:
-    case QMI_LOC_SET_EXTERNAL_POWER_CONFIG_IND_V02:
-    case QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_IND_V02:
-    case QMI_LOC_SET_SENSOR_CONTROL_CONFIG_IND_V02:
-    case QMI_LOC_SET_SENSOR_PROPERTIES_IND_V02:
-    case QMI_LOC_INJECT_SUPL_CERTIFICATE_IND_V02:
-    case QMI_LOC_DELETE_SUPL_CERTIFICATE_IND_V02:
-    case QMI_LOC_INJECT_MOTION_DATA_IND_V02:
-    case QMI_LOC_INJECT_GSM_CELL_INFO_IND_V02:
-    case QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_IND_V02:
-    case QMI_LOC_WWAN_OUT_OF_SERVICE_NOTIFICATION_IND_V02:
-    case QMI_LOC_INJECT_WCDMA_CELL_INFO_IND_V02:
-    case QMI_LOC_INJECT_TDSCDMA_CELL_INFO_IND_V02:
-    case QMI_LOC_INJECT_SUBSCRIBER_ID_IND_V02:
-    case QMI_LOC_INJECT_WIFI_AP_DATA_IND_V02:
-    case QMI_LOC_NOTIFY_WIFI_ATTACHMENT_STATUS_IND_V02:
-    case QMI_LOC_NOTIFY_WIFI_ENABLED_STATUS_IND_V02:
-    case QMI_LOC_SET_PREMIUM_SERVICES_CONFIG_IND_V02:
-    case QMI_LOC_GET_AVAILABLE_WWAN_POSITION_IND_V02:
-    {
-      status = true;
-      break;
-    }
-    default:
-      LOC_LOGW("%s:%d]: unknown ind id %d\n", __func__, __LINE__,
-                   (uint32_t)indId);
-      status = false;
-      break;
-  }
-  return status;
-}
-
-
-/** locClientErrorCb
- *  @brief handles the QCCI error events, this is called by the
- *         QCCI infrastructure when the service is no longer
- *         available.
- *  @param [in] user handle
- *  @param [in] error
- *  @param [in] *err_cb_data
- */
-
-static void locClientErrorCb
-(
-  qmi_client_type user_handle,
-  qmi_client_error_type error,
-  void *err_cb_data
-)
-{
-  locClientCallbackDataType* pCallbackData =
-        (locClientCallbackDataType *)err_cb_data;
-  locClientErrorCbType localErrorCallback = NULL;
-
-  /* copy the errorCallback function pointer from the callback
-   * data to local variable. This is to protect against the race
-   * condition between open/close and error callback.
-   */
-  if(NULL != pCallbackData)
-  {
-    localErrorCallback = pCallbackData->errorCallback;
-  }
-
-  LOC_LOGD("%s:%d]: Service Error %d received, pCallbackData = %p\n",
-      __func__, __LINE__, error, err_cb_data);
-
-  /* call the error callback
-   * To avoid calling the errorCallback after locClientClose
-   * is called, check pCallbackData->errorCallback again here
-   */
-
-  if( (NULL != pCallbackData) &&
-      (NULL != localErrorCallback) &&
-      (NULL != pCallbackData->errorCallback) &&
-      (pCallbackData == pCallbackData->pMe)  )
-  {
-    //invoke the error callback for the corresponding client
-    localErrorCallback(
-        (locClientHandleType)pCallbackData,
-        convertQmiErrorToLocError(error),
-        pCallbackData->pClientCookie);
-  }
-}
-
-
-/** locClientIndCb
- *  @brief handles the indications sent from the service, if a
- *         response indication was received then the it is sent
- *         to the response callback. If a event indication was
- *         received then it is sent to the event callback
- *  @param [in] user handle
- *  @param [in] msg_id
- *  @param [in] ind_buf
- *  @param [in] ind_buf_len
- *  @param [in] ind_cb_data */
-
-static void locClientIndCb
-(
- qmi_client_type                user_handle,
- unsigned int                   msg_id,
- void                           *ind_buf,
- unsigned int                   ind_buf_len,
- void                           *ind_cb_data
-)
-{
-  locClientIndEnumT indType;
-  size_t indSize = 0;
-  qmi_client_error_type rc ;
-  locClientCallbackDataType* pCallbackData =
-      (locClientCallbackDataType *)ind_cb_data;
-
-  LOC_LOGV("%s:%d]: Indication: msg_id=%d buf_len=%d pCallbackData = %p\n",
-                __func__, __LINE__, (uint32_t)msg_id, ind_buf_len,
-                pCallbackData);
-
-  // check callback data
-  if(NULL == pCallbackData ||(pCallbackData != pCallbackData->pMe))
-  {
-    LOC_LOGE("%s:%d]: invalid callback data", __func__, __LINE__);
-    return;
-  }
-
-  // check user handle
-  if(memcmp(&pCallbackData->userHandle, &user_handle, sizeof(user_handle)))
-  {
-    LOC_LOGE("%s:%d]: invalid user_handle got %p expected %p\n",
-        __func__, __LINE__,
-        user_handle, pCallbackData->userHandle);
-    return;
-  }
-  // Get the indication size and type ( eventInd or respInd)
-  if( true == locClientGetSizeAndTypeByIndId(msg_id, &indSize, &indType))
-  {
-    void *indBuffer = NULL;
-
-    // if the client did not register for this event then just drop it
-     if( (eventIndType == indType) &&
-         ( (NULL == pCallbackData->eventCallback) ||
-         (false == isClientRegisteredForEvent(pCallbackData->eventRegMask, msg_id)) ) )
-    {
-       LOC_LOGW("%s:%d]: client is not registered for event %d\n",
-                     __func__, __LINE__, (uint32_t)msg_id);
-       return;
-    }
-
-    // decode the indication
-    indBuffer = malloc(indSize);
-
-    if(NULL == indBuffer)
-    {
-      LOC_LOGE("%s:%d]: memory allocation failed\n", __func__, __LINE__);
-      return;
-    }
-
-    rc = QMI_NO_ERR;
-
-    if (ind_buf_len > 0)
-    {
-        // decode the indication
-        rc = qmi_client_message_decode(
-            user_handle,
-            QMI_IDL_INDICATION,
-            msg_id,
-            ind_buf,
-            ind_buf_len,
-            indBuffer,
-            indSize);
-    }
-
-    if( rc == QMI_NO_ERR )
-    {
-      //validate indication
-      if (true == locClientHandleIndication(msg_id, indBuffer, indSize))
-      {
-        if(eventIndType == indType)
-        {
-          locClientEventIndUnionType eventIndUnion;
-
-          /* copy the eventCallback function pointer from the callback
-           * data to local variable. This is to protect against the race
-           * condition between open/close and indication callback.
-           */
-           locClientEventIndCbType localEventCallback =
-               pCallbackData->eventCallback;
-
-          // dummy event
-          eventIndUnion.pPositionReportEvent =
-            (qmiLocEventPositionReportIndMsgT_v02 *)indBuffer;
-
-          /* call the event callback
-           * To avoid calling the eventCallback after locClientClose
-           * is called, check pCallbackData->eventCallback again here
-           */
-          if((NULL != localEventCallback) &&
-              (NULL != pCallbackData->eventCallback))
-          {
-            localEventCallback(
-                (locClientHandleType)pCallbackData,
-                msg_id,
-                eventIndUnion,
-                pCallbackData->pClientCookie);
-          }
-        }
-        else if(respIndType == indType)
-        {
-          locClientRespIndUnionType respIndUnion;
-
-          /* copy the respCallback function pointer from the callback
-           * data to local variable. This is to protect against the race
-           * condition between open/close and indication callback.
-           */
-          locClientRespIndCbType localRespCallback =
-              pCallbackData->respCallback;
-
-          // dummy to suppress compiler warnings
-          respIndUnion.pDeleteAssistDataInd =
-            (qmiLocDeleteAssistDataIndMsgT_v02 *)indBuffer;
-
-          /* call the response callback
-           * To avoid calling the respCallback after locClientClose
-           * is called, check pCallbackData->respCallback again here
-           */
-          if((NULL != localRespCallback) &&
-              (NULL != pCallbackData->respCallback))
-          {
-            localRespCallback(
-                (locClientHandleType)pCallbackData,
-                msg_id,
-                respIndUnion,
-                pCallbackData->pClientCookie);
-          }
-        }
-      }
-      else // error handling indication
-      {
-        LOC_LOGE("%s:%d]: Error handling the indication %d\n",
-                      __func__, __LINE__, (uint32_t)msg_id);
-      }
-    }
-    else
-    {
-      LOC_LOGE("%s:%d]: Error decoding indication %d\n",
-                    __func__, __LINE__, rc);
-    }
-    if(indBuffer)
-    {
-      free (indBuffer);
-    }
-  }
-  else // Id not found
-  {
-    LOC_LOGE("%s:%d]: Error indication not found %d\n",
-                  __func__, __LINE__,(uint32_t)msg_id);
-  }
-  return;
-}
-
-
-/** locClientRegisterEventMask
- *  @brief registers the event mask with loc service
- *  @param [in] clientHandle
- *  @param [in] eventRegMask
- *  @return true if indication was validated; else false */
-
-bool locClientRegisterEventMask(
-    locClientHandleType clientHandle,
-    locClientEventMaskType eventRegMask)
-{
-  locClientStatusEnumType status = eLOC_CLIENT_SUCCESS;
-  locClientReqUnionType reqUnion;
-  qmiLocRegEventsReqMsgT_v02 regEventsReq;
-
-  memset(&regEventsReq, 0, sizeof(regEventsReq));
-
-  regEventsReq.eventRegMask = eventRegMask;
-  reqUnion.pRegEventsReq = &regEventsReq;
-
-  status = locClientSendReq(clientHandle,
-                            QMI_LOC_REG_EVENTS_REQ_V02,
-                            reqUnion);
-
-  if(eLOC_CLIENT_SUCCESS != status )
-  {
-    LOC_LOGE("%s:%d] status %s\n", __func__, __LINE__,
-             loc_get_v02_client_status_name(status) );
-    return false;
-  }
-
-  return true;
-}
-
-/**  validateRequest
-  @brief validates the input request
-  @param [in] reqId       request ID
-  @param [in] reqPayload  Union of pointers to message payload
-  @param [out] ppOutData  Pointer to void *data if successful
-  @param [out] pOutLen    Pointer to length of data if succesful.
-  @return false on failure, true on Success
-*/
-
-static bool validateRequest(
-  uint32_t                    reqId,
-  const locClientReqUnionType reqPayload,
-  void                        **ppOutData,
-  uint32_t                    *pOutLen )
-
-{
-  bool noPayloadFlag = false;
-
-  LOC_LOGV("%s:%d]: reqId = %d\n", __func__, __LINE__, reqId);
-  switch(reqId)
-  {
-    case QMI_LOC_INFORM_CLIENT_REVISION_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInformClientRevisionReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_REG_EVENTS_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocRegEventsReqMsgT_v02);
-       break;
-    }
-
-    case QMI_LOC_START_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocStartReqMsgT_v02);
-       break;
-    }
-
-    case QMI_LOC_STOP_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocStopReqMsgT_v02);
-       break;
-    }
-
-    case QMI_LOC_NI_USER_RESPONSE_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocNiUserRespReqMsgT_v02);
-       break;
-    }
-
-    case QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectPredictedOrbitsDataReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_UTC_TIME_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectUtcTimeReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_POSITION_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectPositionReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_ENGINE_LOCK_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetEngineLockReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_SBAS_CONFIG_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetSbasConfigReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_NMEA_TYPES_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetNmeaTypesReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_LOW_POWER_MODE_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetLowPowerModeReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_SERVER_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetServerReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_DELETE_ASSIST_DATA_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocDeleteAssistDataReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_XTRA_T_SESSION_CONTROL_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetXtraTSessionControlReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_WIFI_POSITION_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectWifiPositionReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_NOTIFY_WIFI_STATUS_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocNotifyWifiStatusReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_OPERATION_MODE_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetOperationModeReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_SPI_STATUS_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetSpiStatusReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_SENSOR_DATA_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectSensorDataReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_TIME_SYNC_DATA_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectTimeSyncDataReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_CRADLE_MOUNT_CONFIG_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetCradleMountConfigReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_EXTERNAL_POWER_CONFIG_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetExternalPowerConfigReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInformLocationServerConnStatusReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetProtocolConfigParametersReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_GET_PROTOCOL_CONFIG_PARAMETERS_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocGetProtocolConfigParametersReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_SENSOR_CONTROL_CONFIG_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetSensorControlConfigReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_GET_SENSOR_PROPERTIES_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocGetSensorPropertiesReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_SENSOR_PROPERTIES_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetSensorPropertiesReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_SUPL_CERTIFICATE_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectSuplCertificateReqMsgT_v02);
-      break;
-    }
-    case QMI_LOC_DELETE_SUPL_CERTIFICATE_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocDeleteSuplCertificateReqMsgT_v02);
-      break;
-    }
-    case QMI_LOC_SET_POSITION_ENGINE_CONFIG_PARAMETERS_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocSetPositionEngineConfigParametersReqMsgT_v02);
-      break;
-    }
-    case QMI_LOC_GET_POSITION_ENGINE_CONFIG_PARAMETERS_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocGetPositionEngineConfigParametersReqMsgT_v02);
-      break;
-    }
-    case QMI_LOC_ADD_CIRCULAR_GEOFENCE_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocAddCircularGeofenceReqMsgT_v02);
-      break;
-    }
-    case QMI_LOC_DELETE_GEOFENCE_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocDeleteGeofenceReqMsgT_v02);
-      break;
-    }
-    case QMI_LOC_QUERY_GEOFENCE_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocQueryGeofenceReqMsgT_v02);
-      break;
-    }
-    case QMI_LOC_EDIT_GEOFENCE_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocEditGeofenceReqMsgT_v02);
-      break;
-    }
-    case QMI_LOC_GET_BEST_AVAILABLE_POSITION_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocGetBestAvailablePositionReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_MOTION_DATA_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectMotionDataReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_GET_NI_GEOFENCE_ID_LIST_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocGetNiGeofenceIdListReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_GSM_CELL_INFO_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectGSMCellInfoReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectNetworkInitiatedMessageReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_PEDOMETER_REPORT_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocPedometerReportReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_WCDMA_CELL_INFO_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectWCDMACellInfoReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_TDSCDMA_CELL_INFO_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectTDSCDMACellInfoReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_SUBSCRIBER_ID_IND_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectSubscriberIDReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_WIFI_AP_DATA_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectWifiApDataReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_GET_BATCH_SIZE_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocGetBatchSizeReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_START_BATCHING_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocStartBatchingReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_READ_FROM_BATCH_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocReadFromBatchReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_STOP_BATCHING_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocStopBatchingReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_RELEASE_BATCH_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocReleaseBatchReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_INJECT_VEHICLE_SENSOR_DATA_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocInjectVehicleSensorDataReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_NOTIFY_WIFI_ATTACHMENT_STATUS_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocNotifyWifiAttachmentStatusReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_NOTIFY_WIFI_ENABLED_STATUS_REQ_V02:
-    {
-      *pOutLen = sizeof(qmiLocNotifyWifiEnabledStatusReqMsgT_v02);
-      break;
-    }
-
-    case QMI_LOC_SET_PREMIUM_SERVICES_CONFIG_REQ_V02:
-    {
-        *pOutLen = sizeof(qmiLocSetPremiumServicesCfgReqMsgT_v02);
-        break;
-    }
-
-    case QMI_LOC_GET_AVAILABLE_WWAN_POSITION_REQ_V02:
-    {
-        *pOutLen = sizeof(qmiLocGetAvailWwanPositionReqMsgT_v02);
-        break;
-    }
-
-    case QMI_LOC_SET_GNSS_CONSTELL_REPORT_CONFIG_V02:
-    {
-        *pOutLen = sizeof(qmiLocSetGNSSConstRepConfigReqMsgT_v02);
-        break;
-    }
-
-    // ALL requests with no payload
-    case QMI_LOC_GET_SERVICE_REVISION_REQ_V02:
-    case QMI_LOC_GET_FIX_CRITERIA_REQ_V02:
-    case QMI_LOC_GET_PREDICTED_ORBITS_DATA_SOURCE_REQ_V02:
-    case QMI_LOC_GET_PREDICTED_ORBITS_DATA_VALIDITY_REQ_V02:
-    case QMI_LOC_GET_ENGINE_LOCK_REQ_V02:
-    case QMI_LOC_GET_SBAS_CONFIG_REQ_V02:
-    case QMI_LOC_GET_NMEA_TYPES_REQ_V02:
-    case QMI_LOC_GET_LOW_POWER_MODE_REQ_V02:
-    case QMI_LOC_GET_SERVER_REQ_V02:
-    case QMI_LOC_GET_XTRA_T_SESSION_CONTROL_REQ_V02:
-    case QMI_LOC_GET_REGISTERED_EVENTS_REQ_V02:
-    case QMI_LOC_GET_OPERATION_MODE_REQ_V02:
-    case QMI_LOC_GET_CRADLE_MOUNT_CONFIG_REQ_V02:
-    case QMI_LOC_GET_EXTERNAL_POWER_CONFIG_REQ_V02:
-    case QMI_LOC_GET_SENSOR_CONTROL_CONFIG_REQ_V02:
-    case QMI_LOC_GET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_REQ_V02:
-    case QMI_LOC_WWAN_OUT_OF_SERVICE_NOTIFICATION_REQ_V02:
-    case QMI_LOC_GET_SUPPORTED_MSGS_REQ_V02:
-    case QMI_LOC_GET_SUPPORTED_FIELDS_REQ_V02:
-    {
-      noPayloadFlag = true;
-      break;
-    }
-
-    default:
-      LOC_LOGW("%s:%d]: Error unknown reqId=%d\n", __func__, __LINE__,
-                    reqId);
-      return false;
-  }
-  if(true == noPayloadFlag)
-  {
-    *ppOutData = NULL;
-    *pOutLen = 0;
-  }
-  else
-  {
-    //set dummy pointer for request union
-    *ppOutData = (void*) reqPayload.pInformClientRevisionReq;
-  }
-  LOC_LOGV("%s:%d]: reqId=%d, len = %d\n", __func__, __LINE__,
-                reqId, *pOutLen);
-  return true;
-}
-
-/** locClientQmiCtrlPointInit
- @brief wait for the service to come up or timeout; when the
-        service comes up initialize the control point and set
-        internal handle and indication callback.
- @param pQmiClient,
-*/
-
-static locClientStatusEnumType locClientQmiCtrlPointInit(
-    locClientCallbackDataType *pLocClientCbData,
-    int instanceId)
-{
-  qmi_client_type clnt, notifier;
-  bool notifierInitFlag = false;
-  locClientStatusEnumType status = eLOC_CLIENT_SUCCESS;
-  // os_params must stay in the same scope as notifier
-  // because when notifier is initialized, the pointer
-  // of os_params is retained in QMI framework, and it
-  // used when notifier is released.
-  qmi_client_os_params os_params;
-  // instances of this service
-  qmi_service_info serviceInfo;
-
-  do
-  {
-    qmi_client_error_type rc = QMI_NO_ERR;
-
-    // Get the service object for the qmiLoc Service
-    qmi_idl_service_object_type locClientServiceObject =
-      loc_get_service_object_v02();
-
-    // Verify that qmiLoc_get_service_object did not return NULL
-    if (NULL == locClientServiceObject)
-    {
-        LOC_LOGE("%s:%d]: qmiLoc_get_service_object_v02 failed\n" ,
-                    __func__, __LINE__ );
-       status = eLOC_CLIENT_FAILURE_INTERNAL;
-       break;
-    }
-
-    // register for service notification
-    rc = qmi_client_notifier_init(locClientServiceObject, &os_params, &notifier);
-    notifierInitFlag = (NULL != notifier);
-
-    if (rc != QMI_NO_ERR) {
-        LOC_LOGE("%s:%d]: qmi_client_notifier_init failed %d\n",
-                 __func__, __LINE__, rc);
-        status = eLOC_CLIENT_FAILURE_INTERNAL;
-        break;
-    }
-
-    while (1) {
-        QMI_CCI_OS_SIGNAL_CLEAR(&os_params);
-
-        if (instanceId >= 0) {
-            // use instance-specific lookup
-            rc = qmi_client_get_service_instance(locClientServiceObject, instanceId, &serviceInfo);
-        } else {
-            // lookup service with any instance id
-            rc = qmi_client_get_any_service(locClientServiceObject, &serviceInfo);
-        }
-
-        // get the service addressing information
-        LOC_LOGV("%s:%d]: qmi_client_get_service() rc: %d ", __func__, __LINE__, rc);
-
-        if(rc == QMI_NO_ERR)
-            break;
-
-        QMI_CCI_OS_SIGNAL_WAIT(&os_params, 0);
-    }
-
-    LOC_LOGV("%s:%d]: passing the pointer %p to qmi_client_init \n",
-                      __func__, __LINE__, pLocClientCbData);
-
-    // initialize the client
-    //sent the address of the first service found
-    // if IPC router is present, this will go to the service instance
-    // enumerated over IPC router, else it will go over the next transport where
-    // the service was enumerated.
-    rc = qmi_client_init(&serviceInfo, locClientServiceObject,
-                         locClientIndCb, (void *) pLocClientCbData,
-                         NULL, &clnt);
-
-    if(rc != QMI_NO_ERR)
-    {
-      LOC_LOGE("%s:%d]: qmi_client_init error %d\n",
-                    __func__, __LINE__, rc);
-
-      status = eLOC_CLIENT_FAILURE_INTERNAL;
-      break;
-    }
-
-    LOC_LOGV("%s:%d]: passing the pointer %p to"
-                  "qmi_client_register_error_cb \n",
-                   __func__, __LINE__, pLocClientCbData);
-
-    // register error callback
-    rc  = qmi_client_register_error_cb(clnt,
-        locClientErrorCb, (void *) pLocClientCbData);
-
-    if( QMI_NO_ERR != rc)
-    {
-      LOC_LOGE("%s:%d]: could not register QCCI error callback error:%d\n",
-                    __func__, __LINE__, rc);
-
-      status = eLOC_CLIENT_FAILURE_INTERNAL;
-      break;
-    }
-
-    // copy the clnt handle returned in qmi_client_init
-    memcpy(&(pLocClientCbData->userHandle), &clnt, sizeof(qmi_client_type));
-
-    status = eLOC_CLIENT_SUCCESS;
-
-  } while(0);
-
-  /* release the notifier handle */
-  if(true == notifierInitFlag)
-  {
-    qmi_client_release(notifier);
-  }
-
-  return status;
-}
-//----------------------- END INTERNAL FUNCTIONS ----------------------------------------
-
-/** locClientOpenInstance
-  @brief Connects a location client to the location engine. If the connection
-         is successful, returns a handle that the location client uses for
-         future location operations.
-
-  @param [in] eventRegMask     Mask of asynchronous events the client is
-                               interested in receiving
-  @param [in] instanceId       Value of QMI service instance id to use.
-  @param [in] eventIndCb       Function to be invoked to handle an event.
-  @param [in] respIndCb        Function to be invoked to handle a response
-                               indication.
-  @param [out] locClientHandle Handle to be used by the client
-                               for any subsequent requests.
-
-  @return
-  One of the following error codes:
-  - eLOC_CLIENT_SUCCESS  -- If the connection is opened.
-  - non-zero error code(see locClientStatusEnumType)--  On failure.
-*/
-locClientStatusEnumType locClientOpenInstance (
-  locClientEventMaskType         eventRegMask,
-  int                            instanceId,
-  const locClientCallbacksType*  pLocClientCallbacks,
-  locClientHandleType*           pLocClientHandle,
-  const void*                    pClientCookie)
-{
-  locClientStatusEnumType status = eLOC_CLIENT_SUCCESS;
-  locClientCallbackDataType *pCallbackData = NULL;
-
-  // check input parameters
-  if( (NULL == pLocClientCallbacks) || (NULL == pLocClientHandle)
-      || (NULL == pLocClientCallbacks->respIndCb) ||
-      (pLocClientCallbacks->size != sizeof(locClientCallbacksType)))
-  {
-    LOC_LOGE("%s:%d]: Invalid parameters in locClientOpen\n",
-             __func__, __LINE__);
-    return eLOC_CLIENT_FAILURE_INVALID_PARAMETER;
-  }
-
-  do
-  {
-    // Allocate memory for the callback data
-    pCallbackData =
-        ( locClientCallbackDataType*)calloc(
-            1, sizeof(locClientCallbackDataType));
-
-    if(NULL == pCallbackData)
-    {
-      LOC_LOGE("%s:%d]: Could not allocate memory for callback data \n",
-                        __func__, __LINE__);
-      status = eLOC_CLIENT_FAILURE_INTERNAL;
-      break;
-    }
-
-    /* Initialize the QMI control point; this function will block
-     * until a service is up or a timeout occurs. If the connection to
-     * the service succeeds the callback data will be filled in with
-     * a qmi_client value.
-     */
-
-
-    EXIT_LOG_CALLFLOW(%s, "loc client open");
-    status = locClientQmiCtrlPointInit(pCallbackData, instanceId);
-
-    LOC_LOGV ("%s:%d] locClientQmiCtrlPointInit returned %d\n",
-                    __func__, __LINE__, status);
-
-    if(status != eLOC_CLIENT_SUCCESS)
-    {
-      free(pCallbackData);
-      pCallbackData = NULL;
-      LOC_LOGE ("%s:%d] locClientQmiCtrlPointInit returned %d\n",
-                    __func__, __LINE__, status);
-      break;
-    }
-     // set the self pointer
-    pCallbackData->pMe = pCallbackData;
-     // set the handle to the callback data
-    *pLocClientHandle = (locClientHandleType)pCallbackData;
-
-    if(true != locClientRegisterEventMask(*pLocClientHandle,eventRegMask))
-    {
-      LOC_LOGE("%s:%d]: Error sending registration mask\n",
-                  __func__, __LINE__);
-
-      // release the client
-      locClientClose(pLocClientHandle);
-
-      status = eLOC_CLIENT_FAILURE_INTERNAL;
-      break;
-    }
-
-    /* Initialize rest of the client structure now that the connection
-     * to the service has been created successfully.
-     */
-
-    //fill in the event callback
-     pCallbackData->eventCallback = pLocClientCallbacks->eventIndCb;
-
-     //fill in the response callback
-     pCallbackData->respCallback = pLocClientCallbacks->respIndCb;
-
-     //fill in the error callback
-     pCallbackData->errorCallback = pLocClientCallbacks->errorCb;
-
-     //set the client event registration mask
-     pCallbackData->eventRegMask = eventRegMask;
-
-     // set the client cookie
-     pCallbackData->pClientCookie = (void *)pClientCookie;
-
-  }while(0);
-
-  if(eLOC_CLIENT_SUCCESS != status)
-  {
-    *pLocClientHandle = LOC_CLIENT_INVALID_HANDLE_VALUE;
-    LOC_LOGE("%s:%d]: Error! status = %d\n", __func__, __LINE__,status);
-  }
-
-  else
-  {
-    LOC_LOGD("%s:%d]: returning handle = %p, user_handle=%p, status = %d\n",
-                __func__, __LINE__, *pLocClientHandle,
-                pCallbackData->userHandle, status);
-  }
-
-  return(status);
-}
-
-/** locClientOpen
-  @brief Connects a location client to the location engine. If the connection
-         is successful, returns a handle that the location client uses for
-         future location operations.
-
-  @param [in] eventRegMask     Mask of asynchronous events the client is
-                               interested in receiving
-  @param [in] eventIndCb       Function to be invoked to handle an event.
-  @param [in] respIndCb        Function to be invoked to handle a response
-                               indication.
-  @param [out] locClientHandle Handle to be used by the client
-                               for any subsequent requests.
-
-  @return
-  One of the following error codes:
-  - eLOC_CLIENT_SUCCESS  -- If the connection is opened.
-  - non-zero error code(see locClientStatusEnumType)--  On failure.
-*/
-
-locClientStatusEnumType locClientOpen (
-  locClientEventMaskType         eventRegMask,
-  const locClientCallbacksType*  pLocClientCallbacks,
-  locClientHandleType*           pLocClientHandle,
-  const void*                    pClientCookie)
-{
-  int instanceId;
-  locClientStatusEnumType status;
-  int tries = 1;
-#ifdef _ANDROID_
-  switch (getTargetGnssType(loc_get_target()))
-  {
-  case GNSS_GSS:
-    instanceId = eLOC_CLIENT_INSTANCE_ID_GSS;
-    break;
-  case GNSS_QCA1530:
-    instanceId = eLOC_CLIENT_INSTANCE_ID_QCA1530;
-    break;
-  case GNSS_MSM:
-    instanceId = eLOC_CLIENT_INSTANCE_ID_MSM;
-    break;
-  case GNSS_MDM:
-    instanceId = eLOC_CLIENT_INSTANCE_ID_MDM;
-    break;
-  default:
-    instanceId = eLOC_CLIENT_INSTANCE_ID_ANY;
-    break;
-  }
-
-  LOC_LOGI("%s:%d]: Service instance id is %d\n",
-             __func__, __LINE__, instanceId);
-#else
-  instanceId = eLOC_CLIENT_INSTANCE_ID_ANY;
-#endif
-
-  while ((status = locClientOpenInstance(eventRegMask, instanceId, pLocClientCallbacks,
-          pLocClientHandle, pClientCookie)) != eLOC_CLIENT_SUCCESS) {
-    if (tries <= LOC_CLIENT_MAX_OPEN_RETRIES) {
-      LOC_LOGE("%s:%d]: failed with status=%d on try %d",
-               __func__, __LINE__, status, tries);
-      tries++;
-      sleep(LOC_CLIENT_TIME_BETWEEN_OPEN_RETRIES);
-    } else {
-      LOC_LOGE("%s:%d]: failed with status=%d Aborting...",
-               __func__, __LINE__, status);
-      break;
-    }
-  }
-
-  return status;
-}
-
-/** locClientClose
-  @brief Disconnects a client from the location engine.
-  @param [in] pLocClientHandle  Pointer to the handle returned by the
-                                locClientOpen() function.
-  @return
-  One of the following error codes:
-  - 0 (eLOC_CLIENT_SUCCESS) - On success.
-  - non-zero error code(see locClientStatusEnumType) - On failure.
-*/
-
-locClientStatusEnumType locClientClose(
-  locClientHandleType* pLocClientHandle)
-{
-  // convert handle to callback data
-  locClientCallbackDataType *pCallbackData;
-  qmi_client_error_type rc = QMI_NO_ERR; //No error
-
-  if(NULL == pLocClientHandle)
-  {
-    // invalid handle
-    LOC_LOGE("%s:%d]: invalid pointer to handle \n",
-                  __func__, __LINE__);
-
-    return(eLOC_CLIENT_FAILURE_INVALID_PARAMETER);
-  }
-
-  pCallbackData = (locClientCallbackDataType *)(*pLocClientHandle);
-
-  // check the input handle for sanity
-  if(NULL == pCallbackData ||
-     NULL == pCallbackData->userHandle ||
-     pCallbackData != pCallbackData->pMe )
-  {
-    // invalid handle
-    LOC_LOGE("%s:%d]: invalid handle \n",
-                  __func__, __LINE__);
-
-    return(eLOC_CLIENT_FAILURE_INVALID_HANDLE);
-  }
-
-  LOC_LOGV("locClientClose releasing handle %p, user handle %p\n",
-      *pLocClientHandle, pCallbackData->userHandle );
-
-  // NEXT call goes out to modem. We log the callflow before it
-  // actually happens to ensure the this comes before resp callflow
-  // back from the modem, to avoid confusing log order. We trust
-  // that the QMI framework is robust.
-  EXIT_LOG_CALLFLOW(%s, "loc client close");
-
-  // release the handle
-  rc = qmi_client_release(pCallbackData->userHandle);
-  if(QMI_NO_ERR != rc )
-  {
-    LOC_LOGW("%s:%d]: qmi_client_release error %d for client %p\n",
-                   __func__, __LINE__, rc, pCallbackData->userHandle);
-    return(eLOC_CLIENT_FAILURE_INTERNAL);
-  }
-
-  /* clear the memory allocated to callback data to minimize the chances
-   *  of a race condition occurring between close and the indication
-   *  callback
-   */
-  memset(pCallbackData, 0, sizeof(*pCallbackData));
-
-  // free the memory assigned in locClientOpen
-  free(pCallbackData);
-  pCallbackData= NULL;
-
-  // set the handle to invalid value
-  *pLocClientHandle = LOC_CLIENT_INVALID_HANDLE_VALUE;
-  return eLOC_CLIENT_SUCCESS;
-}
-
-/** locClientSendReq
-  @brief Sends a message to the location engine. If the locClientSendMsg()
-         function is successful, the client should expect an indication
-         (except start, stop, event reg and sensor injection messages),
-         through the registered callback in the locOpen() function. The
-         indication will contain the status of the request and if status is a
-         success, indication also contains the payload
-         associated with response.
-  @param [in] handle Handle returned by the locClientOpen()
-              function.
-  @param [in] reqId         message ID of the request
-  @param [in] reqPayload   Payload of the request, can be NULL
-                            if request has no payload
-
-  @return
-  One of the following error codes:
-  - 0 (eLOC_CLIENT_SUCCESS ) - On success.
-  - non-zero error code (see locClientStatusEnumType) - On failure.
-*/
-
-locClientStatusEnumType locClientSendReq(
-  locClientHandleType      handle,
-  uint32_t                 reqId,
-  locClientReqUnionType    reqPayload )
-{
-  locClientStatusEnumType status = eLOC_CLIENT_SUCCESS;
-  qmi_client_error_type rc = QMI_NO_ERR; //No error
-  qmiLocGenRespMsgT_v02 resp;
-  uint32_t reqLen = 0;
-  void *pReqData = NULL;
-  locClientCallbackDataType *pCallbackData =
-        (locClientCallbackDataType *)handle;
-
-  // check the input handle for sanity
-   if(NULL == pCallbackData ||
-      NULL == pCallbackData->userHandle ||
-      pCallbackData != pCallbackData->pMe )
-   {
-     // did not find the handle in the client List
-     LOC_LOGE("%s:%d]: invalid handle \n",
-                   __func__, __LINE__);
-
-     return(eLOC_CLIENT_FAILURE_INVALID_HANDLE);
-   }
-
-  // validate that the request is correct
-  if (validateRequest(reqId, reqPayload, &pReqData, &reqLen) == false)
-  {
-
-    LOC_LOGE("%s:%d] error invalid request\n", __func__,
-                __LINE__);
-
-    return(eLOC_CLIENT_FAILURE_INVALID_PARAMETER);
-  }
-
-  LOC_LOGV("%s:%d] sending reqId= %d, len = %d\n", __func__,
-                __LINE__, reqId, reqLen);
-
-  // NEXT call goes out to modem. We log the callflow before it
-  // actually happens to ensure the this comes before resp callflow
-  // back from the modem, to avoid confusing log order. We trust
-  // that the QMI framework is robust.
-  EXIT_LOG_CALLFLOW(%s, loc_get_v02_event_name(reqId));
-  rc = qmi_client_send_msg_sync(
-      pCallbackData->userHandle,
-      reqId,
-      pReqData,
-      reqLen,
-      &resp,
-      sizeof(resp),
-      LOC_CLIENT_ACK_TIMEOUT);
-
-  LOC_LOGV("%s:%d] qmi_client_send_msg_sync returned %d\n", __func__,
-                __LINE__, rc);
-
-  if (rc != QMI_NO_ERR)
-  {
-    LOC_LOGE("%s:%d]: send_msg_sync error: %d\n",__func__, __LINE__, rc);
-    return(eLOC_CLIENT_FAILURE_INTERNAL);
-  }
-
-  // map the QCCI response to Loc API v02 status
-  status = convertQmiResponseToLocStatus(&resp);
-
-  // if the request is to change registered events, update the
-  // loc api copy of that
-  if(eLOC_CLIENT_SUCCESS == status &&
-      QMI_LOC_REG_EVENTS_REQ_V02 == reqId)
-  {
-    if(NULL != reqPayload.pRegEventsReq )
-    {
-      pCallbackData->eventRegMask =
-        (locClientEventMaskType)(reqPayload.pRegEventsReq->eventRegMask);
-    }
-  }
-  return(status);
-}
-
-/** locClientSupportMsgCheck
-  @brief Sends a QMI_LOC_GET_SUPPORTED_MSGS_REQ_V02 message to the
-         location engine, and then recieves a list of all services supported
-         by the engine. This function will check if the input service form
-         the client is in the list or not. If the locClientSupportMsgCheck()
-         function is successful, the client should expect an bool result of
-         the service is supported or not.
-  @param [in] handle Handle returned by the locClientOpen()
-              function.
-  @param [in] reqId        message ID of the request
-  @param [in] reqPayload   Payload of the request, can be NULL
-                            if request has no payload
-
-  @return
-  - true - On support.
-  - false - On dose not supprt or on failure.
-*/
-
-bool locClientSupportMsgCheck(
-  locClientHandleType      handle,
-  uint32_t                 reqId,
-  locClientReqUnionType    reqPayload )
-{
-  bool result = false; // by default is false
-  locClientStatusEnumType status = eLOC_CLIENT_SUCCESS;
-  qmi_client_error_type rc = QMI_NO_ERR; //No error
-  qmiLocGetSupportMsgT_v02 resp;
-
-  uint32_t reqLen = 0;
-  void *pReqData = NULL;
-  locClientCallbackDataType *pCallbackData =
-        (locClientCallbackDataType *)handle;
-
-   if(NULL == pCallbackData) {
-       LOC_LOGE("%s:%d]: invalid handle -- handle is NULL \n",
-                   __func__, __LINE__);
-       return result;
-   }
-   if( NULL == pCallbackData->userHandle ) {
-        LOC_LOGE("%s:%d]: invalid handle -- NULL == pCallbackData->userHandle \n",
-                   __func__, __LINE__);
-       return result;
-   }
-   if (pCallbackData != pCallbackData->pMe) {
-        LOC_LOGE("%s:%d]: invalid handle -- pCallbackData != pCallbackData->pMe \n",
-                   __func__, __LINE__);
-        return result;
-   }
-  // check the input handle for sanity
-   if( NULL == pCallbackData ||
-       NULL == pCallbackData->userHandle ||
-       pCallbackData != pCallbackData->pMe ) {
-     // did not find the handle in the client List
-     LOC_LOGE("%s:%d]: invalid handle \n",
-                   __func__, __LINE__);
-
-     return result;
-   }
-
-  // NEXT call goes out to modem. We log the callflow before it
-  // actually happens to ensure the this comes before resp callflow
-  // back from the modem, to avoid confusing log order. We trust
-  // that the QMI framework is robust.
-
-  EXIT_LOG_CALLFLOW(%s, loc_get_v02_event_name(QMI_LOC_GET_SUPPORTED_MSGS_REQ_V02));
-  rc = qmi_client_send_msg_sync(
-      pCallbackData->userHandle,
-      QMI_LOC_GET_SUPPORTED_MSGS_REQ_V02,
-      pReqData,
-      reqLen,
-      &resp,
-      sizeof(resp),
-      LOC_CLIENT_ACK_TIMEOUT);
-
-  LOC_LOGV("%s:%d] qmi_client_send_msg_sync returned %d\n", __func__,
-                __LINE__, rc);
-
-  if (rc != QMI_NO_ERR)
-  {
-    LOC_LOGE("%s:%d]: send_msg_sync error: %d\n",__func__, __LINE__, rc);
-    return result;
-  }
-
-  // map the QCCI response to Loc API v02 status
-  status = convertQmiResponseToLocStatus(&resp);
-
-  // if the request is to change registered events, update the
-  // loc api copy of that
-  if(eLOC_CLIENT_SUCCESS == status)
-  {
-    LOC_LOGV("%s:%d]eLOC_CLIENT_SUCCESS == status\n", __func__, __LINE__);
-    if(NULL != reqPayload.pRegEventsReq )
-    {
-      LOC_LOGV("%s:%d]NULL != reqPayload.pRegEventsReq\n", __func__, __LINE__);
-      pCallbackData->eventRegMask =
-        (locClientEventMaskType)(reqPayload.pRegEventsReq->eventRegMask);
-    }
-
-    result = checkQmiMsgsSupported(reqId, &resp);
-  }
-
-  LOC_LOGV("%s:%d] return value is %d\n", __func__, __LINE__, result);
-  return result;
-}
-
-/** locClientGetSizeByRespIndId
- *  @brief Get the size of the response indication structure,
- *         from a specified id
- *  @param [in]  respIndId
- *  @param [out] pRespIndSize
- *  @return true if resp ID was found; else false
-*/
-
-bool locClientGetSizeByRespIndId(uint32_t respIndId, size_t *pRespIndSize)
-{
-  size_t idx = 0, respIndTableSize = 0;
-  respIndTableSize = (sizeof(locClientRespIndTable)/sizeof(locClientRespIndTableStructT));
-  for(idx=0; idx<respIndTableSize; idx++ )
-  {
-    if(respIndId == locClientRespIndTable[idx].respIndId)
-    {
-      // found
-      *pRespIndSize = locClientRespIndTable[idx].respIndSize;
-
-      LOC_LOGV("%s:%d]: resp ind Id %d size = %d\n", __func__, __LINE__,
-                    respIndId, (uint32_t)*pRespIndSize);
-      return true;
-    }
-  }
-
-  //not found
-  return false;
-}
-
-
-/** locClientGetSizeByEventIndId
- *  @brief Gets the size of the event indication structure, from
- *         a specified id
- *  @param [in]  eventIndId
- *  @param [out] pEventIndSize
- *  @return true if event ID was found; else false
-*/
-bool locClientGetSizeByEventIndId(uint32_t eventIndId, size_t *pEventIndSize)
-{
-  size_t idx = 0, eventIndTableSize = 0;
-
-  // look in the event table
-  eventIndTableSize =
-    (sizeof(locClientEventIndTable)/sizeof(locClientEventIndTableStructT));
-
-  for(idx=0; idx<eventIndTableSize; idx++ )
-  {
-    if(eventIndId == locClientEventIndTable[idx].eventId)
-    {
-      // found
-      *pEventIndSize = locClientEventIndTable[idx].eventSize;
-
-      LOC_LOGV("%s:%d]: event ind Id %d size = %d\n", __func__, __LINE__,
-                    eventIndId, (uint32_t)*pEventIndSize);
-      return true;
-    }
-  }
-  // not found
-  return false;
-}
diff --git a/location/loc_api/loc_api_v02/loc_api_v02_client.h b/location/loc_api/loc_api_v02/loc_api_v02_client.h
deleted file mode 100644
index 0237cc3..0000000
--- a/location/loc_api/loc_api_v02/loc_api_v02_client.h
+++ /dev/null
@@ -1,1564 +0,0 @@
-/* Copyright (c) 2011-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.
- */
-
-/** @file loc_api_v02_client.h
-*/
-
-#ifndef LOC_API_V02_CLIENT_H
-#define LOC_API_V02_CLIENT_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*=============================================================================
- *
- *                             DATA DECLARATION
- *
- *============================================================================*/
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "location_service_v02.h"  //QMI LOC Service data types definitions
-
-#include <stddef.h>
-
-/******************************************************************************
- *  Constants and configuration
- *****************************************************************************/
-
-/** @ingroup constants_macros
-  Specific value of #locClientHandleType, indicating an invalid handle. */
-#define LOC_CLIENT_INVALID_HANDLE_VALUE (NULL)
-
-
-/** @addtogroup data_types
-@{ */
-
-/** Location client handle used to represent a specific client. Negative values
-    are invalid handles.
-*/
-typedef void* locClientHandleType;
-
-/** Data type for events and event masks. */
-typedef uint64_t locClientEventMaskType;
-
-/** Location client status values.
-*/
-typedef enum
-{
-  eLOC_CLIENT_SUCCESS                              = 0,
-  /**< Request was successful. */
-
-  eLOC_CLIENT_FAILURE_GENERAL                      = 1,
-  /**< Failed because of a general failure. */
-
-  eLOC_CLIENT_FAILURE_UNSUPPORTED                  = 2,
-  /**< Failed because the service does not support the command. */
-
-  eLOC_CLIENT_FAILURE_INVALID_PARAMETER            = 3,
-  /**< Failed because the request contained invalid parameters. */
-
-  eLOC_CLIENT_FAILURE_ENGINE_BUSY                  = 4,
-  /**< Failed because the engine is busy. */
-
-  eLOC_CLIENT_FAILURE_PHONE_OFFLINE                = 5,
-  /**< Failed because the phone is offline. */
-
-  eLOC_CLIENT_FAILURE_TIMEOUT                      = 6,
-  /**< Failed because of a timeout. */
-
-  eLOC_CLIENT_FAILURE_SERVICE_NOT_PRESENT          = 7,
-  /**< Failed because the service is not present. */
-
-  eLOC_CLIENT_FAILURE_SERVICE_VERSION_UNSUPPORTED  = 8,
-  /**< Failed because the service version is unsupported. */
-
-  eLOC_CLIENT_FAILURE_CLIENT_VERSION_UNSUPPORTED  =  9,
-  /**< Failed because the service does not support client version. */
-
-  eLOC_CLIENT_FAILURE_INVALID_HANDLE               = 10,
-  /**< Failed because an invalid handle was specified. */
-
-  eLOC_CLIENT_FAILURE_INTERNAL                     = 11,
-  /**< Failed because of an internal error in the service. */
-
-  eLOC_CLIENT_FAILURE_NOT_INITIALIZED              = 12,
-  /**< Failed because the service has not been initialized. */
-
-  eLOC_CLIENT_FAILURE_NOT_ENOUGH_MEMORY             = 13
-  /**< Failed because there is not enough memory to do the operation. */
-
-}locClientStatusEnumType;
-
-/** Location client error values
-*/
-typedef enum
-{
-  eLOC_CLIENT_ERROR_SERVICE_UNAVAILABLE            = 1
-  /**< Service is no longer available. Upon getting this error, the client
-       must close the existing connection and reopen the connection. */
-
-}locClientErrorEnumType;
-
-
-/** Request messages the client can send to the location engine.
-
-  The following requests do not have any data associated, so they do not have a
-  payload structure defined:
-
-  - GetServiceRevision
-  - GetFixCriteria
-  - GetPredictedOrbitsDataSource
-  - GetPredictedOrbitsDataValidity
-  - GetEngineLock
-  - GetSbasConfigReq
-  - GetRegisteredEvents
-  - GetNmeaTypes
-  - GetLowPowerMode
-  - GetXtraTSessionControl
-  - GetRegisteredEvents
-  - GetOperationMode
-  - GetCradleMountConfig
-  - GetExternalPowerConfig
-  - GetSensorControlConfig
-  - GetSensorPerformanceControlConfiguration
-  - WWANOutOfServiceNotification
-*/
-typedef union
-{
-   const qmiLocInformClientRevisionReqMsgT_v02* pInformClientRevisionReq;
-   /**< Notifies the service about the revision the client is using.
-
-        The client does not receive any indications corresponding to this
-        request.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_INFORM_CLIENT_REVISION_REQ_V02. */
-
-   const qmiLocRegEventsReqMsgT_v02* pRegEventsReq;
-   /**< Changes the events the client is interested in receiving.
-
-        The client does not receive any indications corresponding to this
-        request.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_REG_EVENTS_REQ_V02. */
-
-   const qmiLocStartReqMsgT_v02* pStartReq;
-   /**< Starts a positioning session.
-
-        The client receives the following indications: position report,
-        satellite report, fix session report, and NMEA report (if applicable).
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_START_REQ_V02. */
-
-   const qmiLocStopReqMsgT_v02* pStopReq;
-   /**< Stops a positioning session. The client receives a fix session report
-        denoting that the fix session ended after this message was sent.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_STOP_REQ_V02. */
-
-   const qmiLocNiUserRespReqMsgT_v02* pNiUserRespReq;
-   /**< Informs the service about the user response for a network-initiated call.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_NI_USER_RESPONSE_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_NI_USER_RESPONSE_REQ_V02. */
-
-   const qmiLocInjectPredictedOrbitsDataReqMsgT_v02* pInjectPredictedOrbitsDataReq;
-   /**< Injects the predicted orbits data into the service.
-
-        When all predicted orbits data parts have been injected, the client
-        receives the following indication containing a response:
-        QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_IND_V02.
-
-        The client injects successive data parts without waiting for this
-        indication as long as locClientSendReq() returns successfully.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_REQ_V02. */
-
-   const qmiLocInjectUtcTimeReqMsgT_v02* pInjectUtcTimeReq;
-   /**< Injects UTC time into the service.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_INJECT_UTC_TIME_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_INJECT_UTC_TIME_REQ_V02. */
-
-   const qmiLocInjectPositionReqMsgT_v02* pInjectPositionReq;
-   /**< Injects a position into the service.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_INJECT_POSITION_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_INJECT_POSITION_REQ_V02. */
-
-   const qmiLocSetEngineLockReqMsgT_v02* pSetEngineLockReq;
-   /**< Sets the location engine lock.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_ENGINE_LOCK_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_ENGINE_LOCK_REQ_V02. */
-
-   const qmiLocSetSbasConfigReqMsgT_v02* pSetSbasConfigReq;
-   /**< Sets the SBAS configuration.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_SBAS_CONFIG_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_SBAS_CONFIG_REQ_V02 . */
-
-   const qmiLocSetNmeaTypesReqMsgT_v02* pSetNmeaTypesReq;
-   /**< Sets the NMEA types configuration.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_NMEA_TYPES_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_NMEA_TYPES_REQ_V02. */
-
-   const qmiLocSetLowPowerModeReqMsgT_v02* pSetLowPowerModeReq;
-   /**< Sets the Low Power mode configuration.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_LOW_POWER_MODE_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_LOW_POWER_MODE_REQ_V02. */
-
-   const qmiLocSetServerReqMsgT_v02* pSetServerReq;
-   /**< Sets the A-GPS server type and address.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_SERVER_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_SERVER_REQ_V02. */
-
-   const qmiLocGetServerReqMsgT_v02* pGetServerReq;
-   /**< Gets the A-GPS server type and address.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_GET_SERVER_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_GET_SERVER_REQ_V02. */
-
-   const qmiLocDeleteAssistDataReqMsgT_v02* pDeleteAssistDataReq;
-   /**< Deletes the aiding data from the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_DELETE_ASSIST_DATA_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_DELETE_ASSIST_DATA_REQ_V02. */
-
-   const qmiLocSetXtraTSessionControlReqMsgT_v02* pSetXtraTSessionControlReq;
-   /**< Sets XTRA-T session control in the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_XTRA_T_SESSION_CONTROL_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_XTRA_T_SESSION_CONTROL_REQ_V02. */
-
-   const qmiLocInjectWifiPositionReqMsgT_v02* pInjectWifiPositionReq;
-   /**< Injects a WiFi position into the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_INJECT_WIFI_POSITION_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_INJECT_WIFI_POSITION_REQ_V02. */
-
-   const qmiLocNotifyWifiStatusReqMsgT_v02* pNotifyWifiStatusReq;
-   /**< Notifies the engine about the WiFi status.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_NOTIFY_WIFI_STATUS_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_NOTIFY_WIFI_STATUS_REQ_V02. */
-
-   const qmiLocSetOperationModeReqMsgT_v02* pSetOperationModeReq;
-   /**< Sets the engine Operation mode.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_OPERATION_MODE_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_OPERATION_MODE_REQ_V02. */
-
-   const qmiLocSetSpiStatusReqMsgT_v02* pSetSpiStatusReq;
-   /**< Sends the stationary position status to the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_SPI_STATUS_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_SPI_STATUS_REQ_V02. */
-
-   const qmiLocInjectSensorDataReqMsgT_v02* pInjectSensorDataReq;
-   /**< Injects sensor data into the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_INJECT_SENSOR_DATA_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_INJECT_SENSOR_DATA_REQ_V02. */
-
-   const qmiLocInjectTimeSyncDataReqMsgT_v02* pInjectTimeSyncReq;
-   /**< Injects time synchronization information into the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_INJECT_TIME_SYNC_DATA_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_INJECT_TIME_SYNC_DATA_REQ_V02. */
-
-   const qmiLocSetCradleMountConfigReqMsgT_v02* pSetCradleMountConfigReq;
-   /**< Sets the cradle mount state information in the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        SET_CRADLE_MOUNT_CONFIG_REQ_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        SET_CRADLE_MOUNT_CONFIG_IND_V02. */
-
-   const qmiLocSetExternalPowerConfigReqMsgT_v02* pSetExternalPowerConfigReq;
-   /**< Sets external power configuration state in the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_EXTERNAL_POWER_CONFIG_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_EXTERNAL_POWER_CONFIG_REQ_V02. */
-
-   const qmiLocInformLocationServerConnStatusReqMsgT_v02*
-     pInformLocationServerConnStatusReq;
-   /**< Informs the engine about the connection status to the location server.
-
-        This can be sent in response to a
-        QMI_LOC_EVENT_LOCATION_SERVER_CONNECTION_REQ_IND_V02 request. The
-        service sends back a QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_IND_V02
-        response indication for this request.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_REQ_V02. */
-
-   const qmiLocSetProtocolConfigParametersReqMsgT_v02*
-     pSetProtocolConfigParametersReq;
-   /**< Sets the protocol configuration parameters in the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_REQ_V02. */
-
-   const qmiLocGetProtocolConfigParametersReqMsgT_v02*
-     pGetProtocolConfigParametersReq;
-   /**< Retrieves protocol configuration parameters from the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_GET_PROTOCOL_CONFIG_PARAMETERS_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_GET_PROTOCOL_CONFIG_PARAMETERS_REQ_V02. */
-
-   const qmiLocSetSensorControlConfigReqMsgT_v02*
-     pSetSensorControlConfigReq;
-   /**< Sets the sensor control configuration parameters in the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_SENSOR_CONTROL_CONFIG_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_SENSOR_CONTROL_CONFIG_REQ_V02. */
-
-   const qmiLocSetSensorPerformanceControlConfigReqMsgT_v02*
-      pSetSensorPerformanceControlConfigReq;
-   /**< Sets the sensor performance configuration parameters in the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_REQ_V02. */
-
-   const qmiLocGetSensorPropertiesReqMsgT_v02* pGetSensorPropertiesReq;
-   /**< Retrieves the sensor properties from the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_GET_SENSOR_PROPERTIES_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_GET_SENSOR_PROPERTIES_REQ_V02. */
-
-   const qmiLocSetSensorPropertiesReqMsgT_v02* pSetSensorPropertiesReq;
-   /**< Sets the sensor properties in the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_SENSOR_PROPERTIES_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_SENSOR_PROPERTIES_REQ_V02. */
-
-   const qmiLocInjectSuplCertificateReqMsgT_v02* pInjectSuplCertificateReq;
-   /**< Injects a SUPL certificate into the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_INJECT_SUPL_CERTIFICATE_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_INJECT_SUPL_CERTIFICATE_REQ_V02. */
-
-   const qmiLocDeleteSuplCertificateReqMsgT_v02* pDeleteSuplCertificateReq;
-   /**< Deletes a SUPL certificate from the engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_DELETE_SUPL_CERTIFICATE_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_DELETE_SUPL_CERTIFICATE_REQ_V02. */
-
-   const qmiLocSetPositionEngineConfigParametersReqMsgT_v02*
-     pSetPositionEngineConfigParametersReq;
-   /**< Sets position engine configuration.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_SET_POSITION_ENGINE_CONFIG_PARAMETERS_IND _V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_SET_POSITION_ENGINE_CONFIG_PARAMETERS_REQ_V02. */
-
-   const qmiLocGetPositionEngineConfigParametersReqMsgT_v02*
-     pGetPositionEngineConfigParametersReq;
-   /**< Gets position engine configuration.
-
-         If the request is accepted by the service, the client receives the
-         following indication containing a response:
-         QMI_LOC_GET_POSITION_ENGINE_CONFIG_PARAMETERS_IND_V02.
-
-         To send this request, set the reqId field in locClientSendReq() to
-         QMI_LOC_GET_POSITION_ENGINE_CONFIG_PARAMETERS_REQ_V02. */
-
-   const qmiLocAddCircularGeofenceReqMsgT_v02* pAddCircularGeofenceReq;
-   /**< Adds a circular geofence.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_ADD_CIRCULAR_GEOFENCE_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_ADD_CIRCULAR_GEOFENCE_REQ_V02 */
-
-   const qmiLocDeleteGeofenceReqMsgT_v02* pDeleteGeofenceReq;
-   /**< Deletes a geofence.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_DELETE_GEOFENCE_IND_V02.
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_DELETE_GEOFENCE_REQ_V02 */
-
-   const qmiLocQueryGeofenceReqMsgT_v02* pQueryGeofenceReq;
-   /**< Queries a geofence.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_QUERY_GEOFENCE_IND_V02
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_QUERY_GEOFENCE_REQ_V02. */
-
-    const qmiLocEditGeofenceReqMsgT_v02* pEditGeofenceReq;
-    /**< Edits geofence parameters.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_EDIT_GEOFENCE_IND_V02
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_EDIT_GEOFENCE_REQ_V02. */
-
-    const qmiLocGetBestAvailablePositionReqMsgT_v02*
-      pGetBestAvailablePositionReq;
-    /**< Get the best available position from location engine
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_GET_BEST_AVAILABLE_POSITION_IND_V02
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_GET_BEST_AVAILABLE_POSITION_REQ_V02. @newpagetable */
-
-    const qmiLocInjectMotionDataReqMsgT_v02* pInjectMotionDataReq;
-    /**< Inject motion data in the location engine
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_INJECT_MOTION_DATA_IND_V02
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_INJECT_MOTION_DATA_REQ_V02 */
-
-    const qmiLocGetNiGeofenceIdListReqMsgT_v02* pGetNiGeofenceIdListReq;
-    /**< Get the list of Network Initiated Geofences from the location engine.
-
-        If the request is accepted by the service, the client receives the
-        following indication containing a response:
-        QMI_LOC_GET_NI_GEOFENCE_ID_LIST_IND_V02
-
-        To send this request, set the reqId field in locClientSendReq() to
-        QMI_LOC_GET_NI_GEOFENCE_ID_LIST_REQ_V02 */
-
-    const qmiLocInjectGSMCellInfoReqMsgT_v02 *pInjectGSMCellInfoReq;
-    /**< Inject GSM Cell Information into the location engine.
-         If the request is accepted by the service, the client receives the
-         following indication containing a response:
-         QMI_LOC_INJECT_GSM_CELL_INFO_IND_V02
-
-         To send this request, set the reqId field in locClientSendReq() to
-         QMI_LOC_INJECT_GSM_CELL_INFO_REQ_V02 */
-
-    const qmiLocInjectNetworkInitiatedMessageReqMsgT_v02
-      *pInjectNetworkInitiatedMessageReq;
-    /**< Inject Network Initiated Message into the location engine.
-         If the request is accepted by the service, the client receives the
-         following indication containing a response:
-         QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_IND_V02
-
-         To send this request, set the reqId field in locClientSendReq() to
-         QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_REQ_V02 */
-
-    const void *pWWANOutOfServiceNotificationReq;
-
-    const qmiLocPedometerReportReqMsgT_v02 *pPedometerReportReq;
-    /**< Send pedometer data to the location engine. If the request is
-         accepted by the service, the client receives the following
-         indication containing a response:
-         QMI_LOC_PEDOMETER_REPORT_IND_V02
-
-         To send this request, set the reqId field in locClientSendReq() to
-         QMI_LOC_PEDOMETER_REPORT_REQ_V02 */
-
-    const qmiLocInjectWCDMACellInfoReqMsgT_v02 *pInjectWCDMACellInfoReq;
-    const qmiLocInjectTDSCDMACellInfoReqMsgT_v02 *pInjectTDSCDMACellInfoReq;
-    const qmiLocInjectSubscriberIDReqMsgT_v02 *pInjectSubscriberIDReq;
-    const qmiLocInjectWifiApDataReqMsgT_v02 *pInjectWifiApDataReq;
-    const qmiLocNotifyWifiAttachmentStatusReqMsgT_v02 *pNotifyWifiAttachmentStatusReq;
-    const qmiLocNotifyWifiEnabledStatusReqMsgT_v02 *pNotifyWifiEnabledStatusReq;
-
-    const qmiLocReadFromBatchReqMsgT_v02 *pReadFromBatchReq;
-    const qmiLocGetBatchSizeReqMsgT_v02 *pGetBatchSizeReq;
-    const qmiLocStartBatchingReqMsgT_v02 *pStartBatchingReq;
-    const qmiLocStopBatchingReqMsgT_v02 *pStopBatchingReq;
-    const qmiLocReleaseBatchReqMsgT_v02 *pReleaseBatchReq;
-
-    const qmiLocInjectVehicleSensorDataReqMsgT_v02 *pInjectVehicleSensorDataReq;
-
-    /**< Send vehicle sensor data to the location engine. If the request is
-         accepted by the service, the client receives the following
-         indication containing a response:
-         QMI_LOC_INJECT_VEHICLE_SENSOR_DATA_IND_V02
-
-         To send this request, set the reqId field in locClientSendReq() to
-         QMI_LOC_INJECT_VEHICLE_SENSOR_DATA_REQ_V02 */
-
-    const qmiLocSetPremiumServicesCfgReqMsgT_v02 *pSetPremiumServicesCfgReq;
-    /*QMI_LOC_SET_PREMIUM_SERVICES_CONFIG_REQ_V02*/
-
-    const qmiLocGetAvailWwanPositionReqMsgT_v02 *pGetAvailWwanPositionReq;
-    /*QMI_LOC_GET_AVAILABLE_WWAN_POSITION_REQ_V02*/
-
-    const qmiLocSetGNSSConstRepConfigReqMsgT_v02 *pSetGNSSConstRepConfigReq;
-    /*QMI_LOC_SET_GNSS_CONSTELL_REPORT_CONFIG_V02*/
-
-}locClientReqUnionType;
-
-
-/** Event indications that are sent by the service.
-*/
-typedef union
-{
-   const qmiLocEventPositionReportIndMsgT_v02* pPositionReportEvent;
-   /**< Contains the position information.
-
-        This event is generated after QMI_LOC_START_REQ_V02 is sent. If
-        periodic fix criteria is specified, this event is generated multiple
-        times periodically at the specified rate until QMI_LOC_STOP_REQ_V02 is
-        sent.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_POSITION_REPORT_IND_V02. */
-
-   const qmiLocEventGnssSvInfoIndMsgT_v02* pGnssSvInfoReportEvent;
-   /**< Contains the GNSS satellite information.
-
-        This event is generated after QMI_LOC_START_REQ_V02 is sent. This event
-        is generated at 1 Hz if the location engine is tracking satellites to
-        make a location fix.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_GNSS_INFO_IND_V02. */
-
-   const qmiLocEventNmeaIndMsgT_v02* pNmeaReportEvent;
-   /**< Contains an NMEA report sentence.
-
-        The entire NMEA report consisting of multiple sentences is sent at a
-        1 Hz rate. This event is generated after QMI_LOC_START_REQ_V02 is sent.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_NMEA_IND_V02. */
-
-   const qmiLocEventNiNotifyVerifyReqIndMsgT_v02* pNiNotifyVerifyReqEvent;
-   /**< Notifies a location client when the network triggers a positioning
-        request to the mobile.
-
-        Upon getting this event, the location client displays the
-        network-initiated fix request in a dialog and prompts the user to
-        accept or deny the request. The client responds to this request with
-        the message QMI_LOC_NI_USER_RESPONSE_REQ_V02.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_NI_NOTIFY_VERIFY_REQ_IND_V02. */
-
-   const qmiLocEventInjectTimeReqIndMsgT_v02* pInjectTimeReqEvent;
-   /**< Asks the client for time assistance.
-
-        The client responds to this request with the message
-        QMI_LOC_INJECT_UTC_TIME_REQ_V02.
-
-        The eventIndId field in the event indication callback is
-        set to QMI_LOC_EVENT_INJECT_TIME_REQ_IND_V02. */
-
-   const qmiLocEventInjectPredictedOrbitsReqIndMsgT_v02*
-         pInjectPredictedOrbitsReqEvent;
-   /**< Asks the client for predicted orbits data assistance.
-
-        The client responds to this request with the message
-        QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_REQ_V02.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_INJECT_PREDICTED_ORBITS_REQ_IND_V02. */
-
-   const qmiLocEventInjectPositionReqIndMsgT_v02* pInjectPositionReqEvent;
-   /**< Asks the client for position assistance.
-
-        The client responds to this request with the message
-        QMI_LOC_INJECT_POSITION_REQ_V02.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_INJECT_POSITION_REQ_IND_V02. */
-
-   const qmiLocEventEngineStateIndMsgT_v02* pEngineState;
-   /**< Sent by the engine whenever it turns on or off.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_ENGINE_STATE_IND_V02. */
-
-   const qmiLocEventFixSessionStateIndMsgT_v02* pFixSessionState;
-   /**< Sent by the engine when a location session begins or ends.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_FIX_SESSION_STATE_IND_V02. */
-
-   const qmiLocEventWifiReqIndMsgT_v02* pWifiReqEvent;
-   /**< Sent by the engine when it needs WiFi support.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_WIFI_REQ_IND_V02. */
-
-   const qmiLocEventSensorStreamingReadyStatusIndMsgT_v02*
-          pSensorStreamingReadyStatusEvent;
-   /**< Notifies the client that the engine is ready to accept sensor data.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_SENSOR_STREAMING_READY_STATUS_IND_V02. */
-
-   const qmiLocEventTimeSyncReqIndMsgT_v02* pTimeSyncReqEvent;
-   /**< Sent by the engine when it needs to synchronize its time with the sensor
-        processor time.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_TIME_SYNC_REQ_IND_V02. */
-
-   const qmiLocEventSetSpiStreamingReportIndMsgT_v02*
-     pSetSpiStreamingReportEvent;
-   /**< Asks the client to start/stop sending a Stationary Position Indicator
-        (SPI) stream.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_SET_SPI_STREAMING_REPORT_IND_V02. */
-
-   const qmiLocEventLocationServerConnectionReqIndMsgT_v02*
-      pLocationServerConnReqEvent;
-   /**< Sent by the engine to ask the client to open or close a connection to
-        a location server.
-
-        The client responds to this request by sending the
-        QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_REQ_V02 message.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_LOCATION_SERVER_CONNECTION_REQ_IND_V02. */
-
-   const qmiLocEventNiGeofenceNotificationIndMsgT_v02*
-     pNiGeofenceNotificationEvent;
-   /**< Sent by the engine to notify the client about changes to a
-        network-initiated geofence.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_NI_GEOFENCE_NOTIFICATION_IND_V02. */
-
-   const qmiLocEventGeofenceGenAlertIndMsgT_v02* pGeofenceGenAlertEvent;
-   /**< Sent by the engine to notify the client about updates that may
-        affect a geofence operation.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_GEOFENCE_GEN_ALERT_IND_V02. */
-
-   const qmiLocEventGeofenceBreachIndMsgT_v02* pGeofenceBreachEvent;
-   /**< Sent by the engine to notify the client about a geofence breach
-        event.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_GEOFENCE_BREACH_NOTIFICATION_IND_V02. @newpagetable */
-
-   const qmiLocEventGeofenceBatchedBreachIndMsgT_v02* pGeofenceBatchedBreachEvent;
-   /**< Sent by the engine to notify the client about a geofence breach
-        event.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_GEOFENCE_BATCHED_BREACH_NOTIFICATION_IND_V02. @newpagetable */
-
-   const qmiLocEventPedometerControlIndMsgT_v02* pPedometerControlEvent;
-   /**< Sent by the engine to recommend how pedometer data is sent to the
-        location engine.
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_PEDOMETER_CONTROL_IND_V02. @newpagetable */
-
-   const qmiLocEventMotionDataControlIndMsgT_v02* pMotionDataControlEvent;
-   /**< Sent by the engine to recommend how motion data is sent to the
-        location engine.
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_MOTION_DATA_CONTROL_IND_V02. @newpagetable */
-
-   const qmiLocEventInjectWifiApDataReqIndMsgT_v02* pWifiApDataReqEvent;
-   const qmiLocEventLiveBatchedPositionReportIndMsgT_v02* pBatchPositionReportEvent;
-   /**< Sent by the engine to notify the client that live batch location
-        is ready, and the location info.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_LIVE_BATCHED_POSITION_REPORT_IND_V02. */
-
-   const qmiLocEventBatchFullIndMsgT_v02* pBatchCount;
-   /**< Sent by the engine to notify the client that batch location is
-        full, and how many location are available to read.
-
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_BATCH_FULL_IND_V02. */
-
-   const qmiLocEventVehicleDataReadyIndMsgT_v02* pVehicleDataReadyEvent;
-
-   /**< Sent by the engine to recommend how vehicle sensor data is
-        sent to the location engine.
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_VEHICLE_DATA_READY_STATUS_IND_V02. @newpagetable */
-
-   const qmiLocEventGnssSvMeasInfoIndMsgT_v02* pGnssSvRawInfoEvent;
-   /**< Sent by the engine to report GNSS measurement.
-        The eventIndId field in the event indication callback is set to
-        QMI_LOC_EVENT_GNSS_MEASUREMENT_REPORT_IND_V02. @newpagetable */
-
-}locClientEventIndUnionType;
-
-
-/** Response indications that are sent by the service.
-*/
-typedef union
-{
-   const qmiLocGetServiceRevisionIndMsgT_v02* pGetServiceRevisionInd;
-   /**< Response to the QMI_LOC_GET_SERVICE_REVISION_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_SERVICE_REVISION_IND_V02. */
-
-   const qmiLocGetFixCriteriaIndMsgT_v02* pGetFixCriteriaInd;
-   /**< Response to the QMI_LOC_GET_FIX_CRITERIA_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_FIX_CRITERIA_IND_V02. */
-
-   const qmiLocNiUserRespIndMsgT_v02* pNiUserRespInd;
-   /**< Response to the QMI_LOC_NI_USER_RESPONSE_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_NI_USER_RESPONSE_IND_V02. */
-
-   const qmiLocInjectPredictedOrbitsDataIndMsgT_v02*
-     pInjectPredictedOrbitsDataInd;
-   /**< Sent after a predicted orbits data part has been successfully injected.
-
-        The client waits for this indication before injecting the next part.
-        This indication is sent in response to
-        QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_REQ_V02.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_IND_V02. */
-
-   const qmiLocGetPredictedOrbitsDataSourceIndMsgT_v02*
-      pGetPredictedOrbitsDataSourceInd;
-   /**< Response to the QMI_LOC_GET_PREDICTED_ORBITS_DATA_SOURCE_REQ_V02
-        request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_PREDICTED_ORBITS_DATA_SOURCE_IND_V02. */
-
-   const qmiLocGetPredictedOrbitsDataValidityIndMsgT_v02*
-     pGetPredictedOrbitsDataValidityInd;
-   /**< Response to the QMI_LOC_GET_PREDICTED_ORBITS_DATA_VALIDITY_REQ_V02
-        request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_PREDICTED_ORBITS_DATA_VALIDITY_IND_V02. */
-
-   const qmiLocInjectUtcTimeIndMsgT_v02* pInjectUtcTimeInd;
-   /**< Response to the QMI_LOC_INJECT_UTC_TIME_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INJECT_UTC_TIME_IND_V02. */
-
-   const qmiLocInjectPositionIndMsgT_v02* pInjectPositionInd;
-   /**< Response to the QMI_LOC_INJECT_POSITION_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INJECT_POSITION_IND_V02. */
-
-   const qmiLocSetEngineLockIndMsgT_v02* pSetEngineLockInd;
-   /**< Response to the QMI_LOC_SET_ENGINE_LOCK_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_ENGINE_LOCK_IND_V02. */
-
-   const qmiLocGetEngineLockIndMsgT_v02* pGetEngineLockInd;
-   /**< Response to the QMI_LOC_GET_ENGINE_LOCK_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_ENGINE_LOCK_IND_V02. */
-
-   const qmiLocSetSbasConfigIndMsgT_v02* pSetSbasConfigInd;
-   /**< Response to the QMI_LOC_SET_SBAS_CONFIG_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_SBAS_CONFIG_IND_V02. */
-
-   const qmiLocGetSbasConfigIndMsgT_v02* pGetSbasConfigInd;
-   /**< Response to the QMI_LOC_GET_SBAS_CONFIG_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_SBAS_CONFIG_IND_V02. */
-
-   const qmiLocSetNmeaTypesIndMsgT_v02* pSetNmeaTypesInd;
-   /**< Response to the QMI_LOC_SET_NMEA_TYPES_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_NMEA_TYPES_IND_V02. */
-
-   const qmiLocGetNmeaTypesIndMsgT_v02* pGetNmeaTypesInd;
-   /**< Response to the QMI_LOC_GET_NMEA_TYPES_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_NMEA_TYPES_IND_V02. */
-
-   const qmiLocSetLowPowerModeIndMsgT_v02* pSetLowPowerModeInd;
-   /**< Response to the QMI_LOC_SET_LOW_POWER_MODE_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_LOW_POWER_MODE_IND_V02. */
-
-   const qmiLocGetLowPowerModeIndMsgT_v02* pGetLowPowerModeInd;
-   /**< Response to the QMI_LOC_GET_LOW_POWER_MODE_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_LOW_POWER_MODE_IND_V02. */
-
-   const qmiLocSetServerIndMsgT_v02* pSetServerInd;
-   /**< Response to the QMI_LOC_SET_SERVER_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_SERVER_IND_V02. */
-
-   const qmiLocGetServerIndMsgT_v02* pGetServerInd;
-   /**< Response to the QMI_LOC_GET_SERVER_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_SERVER_IND_V02. */
-
-   const qmiLocDeleteAssistDataIndMsgT_v02* pDeleteAssistDataInd;
-   /**< Response to the QMI_LOC_DELETE_ASSIST_DATA_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_DELETE_ASSIST_DATA_IND_V02. */
-
-   const qmiLocSetXtraTSessionControlIndMsgT_v02* pSetXtraTSessionControlInd;
-   /**< Response to the QMI_LOC_SET_XTRA_T_SESSION_CONTROL_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_XTRA_T_SESSION_CONTROL_IND_V02. */
-
-   const qmiLocGetXtraTSessionControlIndMsgT_v02* pGetXtraTSessionControlInd;
-   /**< Response to the QMI_LOC_GET_XTRA_T_SESSION_CONTROL_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_XTRA_T_SESSION_CONTROL_IND_V02. */
-
-   const qmiLocInjectWifiPositionIndMsgT_v02* pInjectWifiPositionInd;
-   /**< Response to the QMI_LOC_INJECT_WIFI_POSITION_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INJECT_WIFI_POSITION_IND_V02. */
-
-   const qmiLocNotifyWifiStatusIndMsgT_v02* pNotifyWifiStatusInd;
-   /**< Response to the QMI_LOC_NOTIFY_WIFI_STATUS_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_NOTIFY_WIFI_STATUS_IND_V02. */
-
-   const qmiLocGetRegisteredEventsIndMsgT_v02* pGetRegisteredEventsInd;
-   /**< Response to the QMI_LOC_GET_REGISTERED_EVENTS_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_REGISTERED_EVENTS_IND_V02. */
-
-   const qmiLocSetOperationModeIndMsgT_v02* pSetOperationModeInd;
-   /**< Response to the QMI_LOC_SET_OPERATION_MODE_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_OPERATION_MODE_IND_V02. */
-
-   const qmiLocGetOperationModeIndMsgT_v02* pGetOperationModeInd;
-   /**< Response to the QMI_LOC_GET_OPERATION_MODE_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_OPERATION_MODE_IND_V02. */
-
-   const qmiLocSetSpiStatusIndMsgT_v02* pSetSpiStatusInd;
-   /**< Response to the QMI_LOC_SET_SPI_STATUS_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_SPI_STATUS_IND_V02. */
-
-   const qmiLocInjectSensorDataIndMsgT_v02* pInjectSensorDataInd;
-   /**< Response to the QMI_LOC_INJECT_SENSOR_DATA_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INJECT_SENSOR_DATA_IND_V02. */
-
-   const qmiLocInjectTimeSyncDataIndMsgT_v02* pInjectTimeSyncDataInd;
-   /**< Response to the QMI_LOC_INJECT_TIME_SYNC_DATA_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INJECT_TIME_SYNC_DATA_IND_V02. */
-
-   const qmiLocSetCradleMountConfigIndMsgT_v02* pSetCradleMountConfigInd;
-   /**< Response to the QMI_LOC_SET_CRADLE_MOUNT_CONFIG_IND_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_CRADLE_MOUNT_CONFIG_REQ_V02. */
-
-   const qmiLocGetCradleMountConfigIndMsgT_v02* pGetCradleMountConfigInd;
-   /**< Response to the QMI_LOC_GET_CRADLE_MOUNT_CONFIG_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_CRADLE_MOUNT_CONFIG_IND_V02. */
-
-   const qmiLocSetExternalPowerConfigIndMsgT_v02* pSetExternalPowerConfigInd;
-   /**< Response to the QMI_LOC_SET_EXTERNAL_POWER_CONFIG_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_EXTERNAL_POWER_CONFIG_IND_V02. */
-
-   const qmiLocGetExternalPowerConfigIndMsgT_v02* pGetExternalPowerConfigInd;
-   /**< Response to the QMI_LOC_GET_EXTERNAL_POWER_CONFIG_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_EXTERNAL_POWER_CONFIG_IND_V02. */
-
-   const qmiLocInformLocationServerConnStatusIndMsgT_v02*
-     pInformLocationServerConnStatusInd;
-   /**< Response to the QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_REQ_V02
-        request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_IND_V02.*/
-
-   const qmiLocSetProtocolConfigParametersIndMsgT_v02*
-     pSetProtocolConfigParametersInd;
-   /**< Response to the QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_IND_V02. */
-
-   const qmiLocGetProtocolConfigParametersIndMsgT_v02*
-     pGetProtocolConfigParametersInd;
-   /**< Response to the QMI_LOC_GET_PROTOCOL_CONFIG_PARAMETERS_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_PROTOCOL_CONFIG_PARAMETERS_IND_V02. */
-
-   const qmiLocSetSensorControlConfigIndMsgT_v02* pSetSensorControlConfigInd;
-   /**< Response to the QMI_LOC_SET_SENSOR_CONTROL_CONFIG_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_SENSOR_CONTROL_CONFIG_IND_V02.
-         */
-
-   const qmiLocGetSensorControlConfigIndMsgT_v02* pGetSensorControlConfigInd;
-   /**< Response to the QMI_LOC_GET_SENSOR_CONTROL_CONFIG_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_SENSOR_CONTROL_CONFIG_IND_V02.
-         */
-
-   const qmiLocSetSensorPropertiesIndMsgT_v02* pSetSensorPropertiesInd;
-   /**< Response to the QMI_LOC_SET_SENSOR_PROPERTIES_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_SENSOR_PROPERTIES_IND_V02.
-         */
-
-   const qmiLocGetSensorPropertiesIndMsgT_v02* pGetSensorPropertiesInd;
-   /**< Response to the QMI_LOC_GET_SENSOR_PROPERTIES_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_SENSOR_PROPERTIES_IND_V02.
-         */
-
-   const qmiLocSetSensorPerformanceControlConfigIndMsgT_v02*
-     pSetSensorPerformanceControlConfigInd;
-   /**< Response to the
-        QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_IND_V02. */
-
-   const qmiLocGetSensorPerformanceControlConfigIndMsgT_v02*
-     pGetSensorPerformanceControlConfigInd;
-   /**< Response to the
-        QMI_LOC_GET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_IND_V02. */
-
-   const qmiLocInjectSuplCertificateIndMsgT_v02* pInjectSuplCertificateInd;
-   /**< Response to the QMI_LOC_INJECT_SUPL_CERTIFICATE_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INJECT_SUPL_CERTIFICATE_IND_V02. */
-
-   const qmiLocDeleteSuplCertificateIndMsgT_v02* pDeleteSuplCertificateInd;
-   /**< Response to the QMI_LOC_DELETE_SUPL_CERTIFICATE_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_DELETE_SUPL_CERTIFICATE_IND_V02. */
-
-   const qmiLocSetPositionEngineConfigParametersIndMsgT_v02*
-     pSetPositionEngineConfigParametersInd;
-   /**< Response to the QMI_LOC_SET_POSITION_ENGINE_CONFIG_PARAMETERS_REQ_V02
-        request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_SET_POSITION_ENGINE_CONFIG_PARAMETERS_IND_V02. */
-
-   const qmiLocGetPositionEngineConfigParametersIndMsgT_v02*
-     pGetPositionEngineConfigParametersInd;
-    /**< Response to the QMI_LOC_GET_POSITION_ENGINE_CONFIG_PARAMETERS_REQ_V02
-         request.
-
-         The respIndId field in the response indication callback is set to
-         QMI_LOC_GET_POSITION_ENGINE_CONFIG_PARAMETERS_IND_V02. */
-
-   const qmiLocAddCircularGeofenceIndMsgT_v02* pAddCircularGeofenceInd;
-   /**< Response to the QMI_LOC_ADD_CIRCULAR_GEOFENCE_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_ADD_CIRCULAR_GEOFENCE_IND_V02. */
-
-   const qmiLocDeleteGeofenceIndMsgT_v02* pDeleteGeofenceInd;
-   /**< Response to the QMI_LOC_DELETE_GEOFENCE_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_DELETE_GEOFENCE_IND_V02. */
-
-   const qmiLocQueryGeofenceIndMsgT_v02* pQueryGeofenceInd;
-    /**< Response to the QMI_LOC_QUERY_GEOFENCE_REQ_V02 request.
-
-         The respIndId field in the response indication callback is set to
-         QMI_LOC_QUERY_GEOFENCE_IND_V02. */
-
-   const qmiLocEditGeofenceIndMsgT_v02* pEditGeofenceInd;
-   /**< Response to the QMI_LOC_EDIT_GEOFENCE_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_EDIT_GEOFENCE_IND_V02. */
-
-   const qmiLocGetBestAvailablePositionIndMsgT_v02*
-      pGetBestAvailablePositionInd;
-   /**< Response to the QMI_LOC_GET_BEST_AVAILABLE_POSITION_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_BEST_AVAILABLE_POSITION_IND_V02. */
-
-   const qmiLocInjectMotionDataIndMsgT_v02* pInjectMotionDataInd;
-   /**< Response to the QMI_LOC_INJECT_MOTION_DATA_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INJECT_MOTION_DATA_IND_V02. */
-
-   const qmiLocGetNiGeofenceIdListIndMsgT_v02* pGetNiGeofenceIdListInd;
-   /**< Response to the QMI_LOC_GET_NI_GEOFENCE_ID_LIST_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_GET_NI_GEOFENCE_ID_LIST_IND_V02. */
-
-   const qmiLocInjectGSMCellInfoIndMsgT_v02* pInjectGSMCellInfoInd;
-    /**< Response to the QMI_LOC_INJECT_GSM_CELL_INFO_REQ_V02 request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INJECT_GSM_CELL_INFO_IND_V02. */
-
-   const qmiLocInjectNetworkInitiatedMessageIndMsgT_v02*
-     pInjectNetworkInitiatedMessageInd;
-
-   /**< Response to the QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_REQ_V02
-        request.
-
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_IND_V02. */
-
-   const qmiLocWWANOutOfServiceNotificationIndMsgT_v02*
-     pWWANOutOfServiceNotificationInd;
-
-   /**< Response to the QMI_LOC_WWAN_OUT_OF_SERVICE_NOTIFICATION_REQ_V02
-        request.
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_WWAN_OUT_OF_SERVICE_NOTIFICATION_IND_V02. */
-
-   const qmiLocPedometerReportIndMsgT_v02* pPedometerReportInd;
-
-   /**< Response to the QMI_LOC_PEDOMETER_REPORT_REQ_V02 request.
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_PEDOMETER_REPORT_IND_V02. */
-
-    const qmiLocInjectWCDMACellInfoIndMsgT_v02 *pInjectWCDMACellInfoInd;
-    const qmiLocInjectTDSCDMACellInfoIndMsgT_v02 *pInjectTDSCDMACellInfoInd;
-    const qmiLocInjectSubscriberIDIndMsgT_v02 *pInjectSubscriberIDInd;
-    const qmiLocInjectWifiApDataIndMsgT_v02 *pInjectWifiApDataInd;
-    const qmiLocNotifyWifiAttachmentStatusIndMsgT_v02 *pNotifyWifiAttachmentStatusInd;
-    const qmiLocNotifyWifiEnabledStatusIndMsgT_v02 *pNotifyWifiEnabledStatusInd;
-
-    const qmiLocInjectVehicleSensorDataIndMsgT_v02 *pInjectVehicleSensorDataInd;
-
-    /**< Response to the QMI_LOC_INJECT_VEHICLE_SENSOR_DATA_REQ_V02 request.
-        The respIndId field in the response indication callback is set to
-        QMI_LOC_INJECT_VEHICLE_SENSOR_DATA_IND_V02. */
-
-    const qmiLocGetAvailWwanPositionIndMsgT_v02 *pGetAvailWwanPositionInd;
-    /*QMI_LOC_GET_AVAILABLE_WWAN_POSITION_IND_V02*/
-
-    const qmiLocSetGNSSConstRepConfigIndMsgT_v02 *pSetGNSSConstRepConfigInd;
-    /*QMI_LOC_SET_GNSS_CONSTELL_REPORT_CONFIG_IND_V02*/
-
-}locClientRespIndUnionType;
-
-/** @} */ /* end_addtogroup data_types */
-
-/** @addtogroup callback_functions
-@{ */
-/**
-  Location event indication callback function type. The Location service can
-  generate two types of indications:
-
-  - Asynchronous events indications, such as time injection request and satellite
-    reports. The client specifies the asynchronous events it is interested in
-    receiving through the event mask (see locClientOpen()).
-  - Response indications that are generated as a response to a request. For
-    example, the QMI_LOC_GET_FIX_CRITERIA_REQ_V02 request generates the
-    indication, QMI_LOC_GET_FIX_CRITERIA_IND_V02.
-
-  This callback handles the asynchronous event indications.
-
-  @datatypes
-  #locClientHandleType \n
-  #locClientEventIndUnionType
-
-  @param handle            Location client for this event. Only the client who
-                           registered for the corresponding event receives
-                           this callback.
-  @param eventIndId        ID of the event indication.
-  @param eventIndPayload   Event indication payload.
-  @param pClientCookie     Pointer to the cookie the client specified during
-                           registration.
-
-  @return
-  None.
-
-  @dependencies
-  None. @newpage
-*/
-typedef void (*locClientEventIndCbType)(
-      locClientHandleType handle,
-      uint32_t eventIndId,
-      const locClientEventIndUnionType eventIndPayload,
-      void *pClientCookie
-);
-
-/**
-  Location response indication callback function type. The Location service can
-  generate two types of indications:
-
-  - Asynchronous events indications, such as time injection request and satellite
-    reports. The client specifies the asynchronous events it is interested in
-    receiving through the event mask (see locClientOpen()).
-  - Response indications that are generated as a response to a request. For
-    example, the QMI_LOC_GET_FIX_CRITERIA_REQ_V02 request generates the
-    indication, QMI_LOC_GET_FIX_CRITERIA_IND_V02.
-
-  This callback handles the response indications.
-
-  @datatypes
-  #locClientHandleType \n
-  #locClientRespIndUnionType
-
-  @param handle           Location client who sent the request for which this
-                          response indication is generated.
-  @param respIndId        ID of the response. It is the same value as the ID
-                          of request sent to the engine.
-  @param respIndPayload   Payload of the response indication.
-  @param pClientCookie    Pointer to the cookie the client specified during
-                          registration.
-
-  @return
-  None.
-
-  @dependencies
-  None. @newpage
-*/
-typedef void  (*locClientRespIndCbType)(
-      locClientHandleType handle,
-      uint32_t respIndId,
-      const locClientRespIndUnionType respIndPayload,
-      void *pClientCookie
-);
-
-/**
-  Location error callback function type. This function is called to inform
-  the client that the service is no longer available. When the client
-  receives this callback, it must close the existing connection and reopen
-  the client connection.
-
-  @datatypes
-  #locClientHandleType \n
-  #locClientErrorEnumType
-
-  @param handle           Location client who sent the request for which this
-                          error indication is generated.
-  @param errorId          Error ID.
-  @param pClientCookie    Payload associated with the error indication.
-
-  @return
-  None.
-
-  @dependencies
-  None.
-*/
-typedef void  (*locClientErrorCbType)(
-      locClientHandleType handle,
-      locClientErrorEnumType errorId,
-      void* pClientCookie
- );
-/** @} */ /* end_addtogroup callback_functions */
-
-
-/** @ingroup data_types
-  Callback functions to be registered during locClientOpen().
-*/
-typedef struct
-{
-    uint32_t size;                       /**< Size of the structure. */
-    locClientEventIndCbType eventIndCb;  /**< Event indication callback. */
-    locClientRespIndCbType respIndCb;    /**< Response indication callback. */
-    locClientErrorCbType errorCb;        /**< Error indication callback.
-                                              @newpagetable */
-}locClientCallbacksType;
-
-/**
-  Response for getting qmi service list
-*/
-typedef struct
-{
-    qmi_get_supported_msgs_resp_v01 resp; /**< Response */
-}qmiLocGetSupportMsgT_v02;
-
-/*===========================================================================
- *
- *                          FUNCTION DECLARATION
- *
- *==========================================================================*/
-/** @addtogroup operation_functions
-@{ */
-/*==========================================================================
-    locClientOpen */
-/** @xreflabel{hdr:locClientOpenFunction}
-  Connects a location client to the location engine. If the connection is
-  successful, this function returns a handle that the location client uses for
-  future location operations.
-
-  @datatypes
-  #locClientStatusEnumType \n
-  #locClientEventMaskType \n
-  #locClientCallbacksType \n
-  #locClientHandleType
-
-  @param[in]  eventRegMask          Mask of asynchronous events the client is
-                                    interested in receiving.
-  @param[in]  pLocClientCallbacks   Pointer to structure containing the
-                                    callbacks.
-  @param[out] pLocClientHandle      Pointer to the handle to be used by the
-                                    client for any subsequent requests.
-  @param[in]  pLocClientCookie      Pointer to a cookie to be returned to the
-                                    client along with the callbacks.
-
-  @return
-  One of the following error codes:
-  - eLOC_CLIENT_SUCCESS -- If the connection is opened.
-  - Non-zero error code (see #locClientStatusEnumType) -- On failure.
-
-  @dependencies
-  None. @newpage
-*/
-extern locClientStatusEnumType locClientOpen (
-      locClientEventMaskType            eventRegMask,
-      const locClientCallbacksType*     pLocClientCallbacks,
-      locClientHandleType*              pLocClientHandle,
-      const void*                       pLocClientCookie
-);
-
-
-/*==========================================================================
-    locClientClose */
-/** @xreflabel{hdr:locClientCloseFunction}
-  Disconnects a client from the location engine and sets the handle to
-  LOC_CLIENT_INVALID_HANDLE_VALUE.
-
-  @datatypes
-  #locClientStatusEnumType \n
-  #locClientHandleType
-
-  @param[in] pLocClientHandle  Pointer to the handle returned by the
-                               locClientOpen() function.
-
-  @return
-  One of the following error codes:
-  - 0 (eLOC_CLIENT_SUCCESS) -- On success.
-  - Non-zero error code (see \ref locClientStatusEnumType) -- On failure.
-
-  @dependencies
-  None. @newpage
-*/
-extern locClientStatusEnumType locClientClose (
-      locClientHandleType* pLocClientHandle
-);
-
-/*=============================================================================
-    locClientSendReq */
-/** @xreflabel{hdr:locClientSendReqFunction}
-  Sends a message to the location engine. If this function is successful, the
-  client expects an indication (except start, stop, event registration, and
-  sensor injection messages) through the registered callback in the
-  locClientOpen() function.
-
-  The indication contains the status of the request. If the status is a success,
-  the indication also contains the payload associated with response.
-
-  @datatypes
-  #locClientStatusEnumType \n
-  #locClientHandleType \n
-  #locClientReqUnionType
-
-  @param[in] handle        Handle returned by the locClientOpen() function.
-  @param[in] reqId         QMI_LOC service message ID of the request.
-  @param[in] reqPayload    Payload of the request. This can be NULL if the
-                           request has no payload.
-
-  @return
-  One of the following error codes:
-  - 0 (eLOC_CLIENT_SUCCESS) -- On success.
-  - Non-zero error code (see \ref locClientStatusEnumType) -- On failure.
-
-  @dependencies
-  None. @newpage
-*/
-extern locClientStatusEnumType locClientSendReq(
-     locClientHandleType       handle,
-     uint32_t                  reqId,
-     locClientReqUnionType     reqPayload
-);
-
-/*=============================================================================
-    locClientSupportMsgCheck */
-/**
-  Sends a QMI_LOC_GET_SUPPORTED_MSGS_REQ_V02 message to the
-  location engine, and then recieves a list of all services supported
-  by the engine. This function will check if the input service form
-  the client is in the list or not. If the locClientSupportMsgCheck()
-  function is successful, the client should expect an bool result of
-  the service is supported or not.
-
-  @datatypes
-  #locClientStatusEnumType \n
-  #locClientHandleType \n
-  #locClientReqUnionType
-
-  @param [in] handle Handle returned by the locClientOpen()
-              function.
-  @param [in] reqId        message ID of the request
-  @param [in] reqPayload   Payload of the request, can be NULL
-                           if request has no payload
-
-  @return
-  - true - On support.
-  - false - On dose not supprt or on failure.
-
-  @dependencies
-  None. @newpage
-*/
-extern bool locClientSupportMsgCheck(
-     locClientHandleType      handle,
-     uint32_t                 reqId,
-     locClientReqUnionType    reqPayload
-);
-
-/*=============================================================================
-    locClientGetSizeByEventIndId */
-/** Gets the size of the event indication structure from a specified ID.
-
-  @param[in]  eventIndId      Event indicator ID.
-  @param[out] pEventIndSize   Pointer to the size of the structure.
-
-  @return
-  TRUE -- The event ID was found. \n
-  FALSE -- Otherwise.
-
-  @dependencies
-  None. @newpage
-*/
-extern bool locClientGetSizeByEventIndId(
-  uint32_t eventIndId,
-  size_t *pEventIndSize);
-
-
-/*=============================================================================
-    locClientGetSizeByRespIndId */
-/** Gets the size of the response indication structure from a specified ID.
-
-  @param[in]  respIndId      Response indicator ID.
-  @param[out] pRespIndSize   Pointer to the size of the structure.
-
-  @return
-  TRUE -- The response ID was found. \n
-  FALSE -- Otherwise.
-
-  @dependencies
-  None.
-*/
-extern bool locClientGetSizeByRespIndId(
-  uint32_t respIndId,
-  size_t *pRespIndSize);
-
-/** locClientRegisterEventMask
- *  @brief registers the event mask with loc service
- *  @param [in] clientHandle
- *  @param [in] eventRegMask
- *  @return true if indication was validated; else false */
-
-extern bool locClientRegisterEventMask(
-    locClientHandleType clientHandle,
-    locClientEventMaskType eventRegMask);
-
-/*=============================================================================*/
-/** @} */ /* end_addtogroup operation_functions */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LOC_API_V02_CLIENT_H*/
diff --git a/location/loc_api/loc_api_v02/loc_api_v02_log.c b/location/loc_api/loc_api_v02/loc_api_v02_log.c
deleted file mode 100644
index 71076cc..0000000
--- a/location/loc_api/loc_api_v02/loc_api_v02_log.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/* Copyright (c) 2011-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 <loc_api_v02_log.h>
-#include <location_service_v02.h>
-
-static loc_name_val_s_type loc_v02_event_name[] =
-{
-    NAME_VAL(QMI_LOC_INFORM_CLIENT_REVISION_REQ_V02),
-    NAME_VAL(QMI_LOC_INFORM_CLIENT_REVISION_RESP_V02),
-    NAME_VAL(QMI_LOC_REG_EVENTS_REQ_V02),
-    NAME_VAL(QMI_LOC_REG_EVENTS_RESP_V02),
-    NAME_VAL(QMI_LOC_START_REQ_V02),
-    NAME_VAL(QMI_LOC_START_RESP_V02),
-    NAME_VAL(QMI_LOC_STOP_REQ_V02),
-    NAME_VAL(QMI_LOC_STOP_RESP_V02),
-    NAME_VAL(QMI_LOC_EVENT_POSITION_REPORT_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_GNSS_SV_INFO_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_NMEA_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_NI_NOTIFY_VERIFY_REQ_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_INJECT_TIME_REQ_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_INJECT_PREDICTED_ORBITS_REQ_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_INJECT_POSITION_REQ_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_ENGINE_STATE_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_FIX_SESSION_STATE_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_WIFI_REQ_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_SENSOR_STREAMING_READY_STATUS_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_TIME_SYNC_REQ_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_SET_SPI_STREAMING_REPORT_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_LOCATION_SERVER_CONNECTION_REQ_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_INJECT_WIFI_AP_DATA_REQ_IND_V02),
-    NAME_VAL(QMI_LOC_GET_SERVICE_REVISION_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_SERVICE_REVISION_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_SERVICE_REVISION_IND_V02),
-    NAME_VAL(QMI_LOC_GET_FIX_CRITERIA_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_FIX_CRITERIA_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_FIX_CRITERIA_IND_V02),
-    NAME_VAL(QMI_LOC_NI_USER_RESPONSE_REQ_V02),
-    NAME_VAL(QMI_LOC_NI_USER_RESPONSE_RESP_V02),
-    NAME_VAL(QMI_LOC_NI_USER_RESPONSE_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_PREDICTED_ORBITS_DATA_IND_V02),
-    NAME_VAL(QMI_LOC_GET_PREDICTED_ORBITS_DATA_SOURCE_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_PREDICTED_ORBITS_DATA_SOURCE_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_PREDICTED_ORBITS_DATA_SOURCE_IND_V02),
-    NAME_VAL(QMI_LOC_GET_PREDICTED_ORBITS_DATA_VALIDITY_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_PREDICTED_ORBITS_DATA_VALIDITY_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_PREDICTED_ORBITS_DATA_VALIDITY_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_UTC_TIME_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_UTC_TIME_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_UTC_TIME_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_POSITION_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_POSITION_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_POSITION_IND_V02),
-    NAME_VAL(QMI_LOC_SET_ENGINE_LOCK_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_ENGINE_LOCK_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_ENGINE_LOCK_IND_V02),
-    NAME_VAL(QMI_LOC_GET_ENGINE_LOCK_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_ENGINE_LOCK_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_ENGINE_LOCK_IND_V02),
-    NAME_VAL(QMI_LOC_SET_SBAS_CONFIG_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_SBAS_CONFIG_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_SBAS_CONFIG_IND_V02),
-    NAME_VAL(QMI_LOC_GET_SBAS_CONFIG_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_SBAS_CONFIG_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_SBAS_CONFIG_IND_V02),
-    NAME_VAL(QMI_LOC_SET_NMEA_TYPES_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_NMEA_TYPES_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_NMEA_TYPES_IND_V02),
-    NAME_VAL(QMI_LOC_GET_NMEA_TYPES_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_NMEA_TYPES_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_NMEA_TYPES_IND_V02),
-    NAME_VAL(QMI_LOC_SET_LOW_POWER_MODE_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_LOW_POWER_MODE_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_LOW_POWER_MODE_IND_V02),
-    NAME_VAL(QMI_LOC_GET_LOW_POWER_MODE_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_LOW_POWER_MODE_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_LOW_POWER_MODE_IND_V02),
-    NAME_VAL(QMI_LOC_SET_SERVER_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_SERVER_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_SERVER_IND_V02),
-    NAME_VAL(QMI_LOC_GET_SERVER_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_SERVER_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_SERVER_IND_V02),
-    NAME_VAL(QMI_LOC_DELETE_ASSIST_DATA_REQ_V02),
-    NAME_VAL(QMI_LOC_DELETE_ASSIST_DATA_RESP_V02),
-    NAME_VAL(QMI_LOC_DELETE_ASSIST_DATA_IND_V02),
-    NAME_VAL(QMI_LOC_SET_XTRA_T_SESSION_CONTROL_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_XTRA_T_SESSION_CONTROL_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_XTRA_T_SESSION_CONTROL_IND_V02),
-    NAME_VAL(QMI_LOC_GET_XTRA_T_SESSION_CONTROL_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_XTRA_T_SESSION_CONTROL_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_XTRA_T_SESSION_CONTROL_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_WIFI_POSITION_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_WIFI_POSITION_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_WIFI_POSITION_IND_V02),
-    NAME_VAL(QMI_LOC_NOTIFY_WIFI_STATUS_REQ_V02),
-    NAME_VAL(QMI_LOC_NOTIFY_WIFI_STATUS_RESP_V02),
-    NAME_VAL(QMI_LOC_NOTIFY_WIFI_STATUS_IND_V02),
-    NAME_VAL(QMI_LOC_GET_REGISTERED_EVENTS_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_REGISTERED_EVENTS_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_REGISTERED_EVENTS_IND_V02),
-    NAME_VAL(QMI_LOC_SET_OPERATION_MODE_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_OPERATION_MODE_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_OPERATION_MODE_IND_V02),
-    NAME_VAL(QMI_LOC_GET_OPERATION_MODE_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_OPERATION_MODE_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_OPERATION_MODE_IND_V02),
-    NAME_VAL(QMI_LOC_SET_SPI_STATUS_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_SPI_STATUS_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_SPI_STATUS_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_SENSOR_DATA_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_SENSOR_DATA_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_SENSOR_DATA_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_TIME_SYNC_DATA_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_TIME_SYNC_DATA_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_TIME_SYNC_DATA_IND_V02),
-    NAME_VAL(QMI_LOC_SET_CRADLE_MOUNT_CONFIG_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_CRADLE_MOUNT_CONFIG_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_CRADLE_MOUNT_CONFIG_IND_V02),
-    NAME_VAL(QMI_LOC_GET_CRADLE_MOUNT_CONFIG_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_CRADLE_MOUNT_CONFIG_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_CRADLE_MOUNT_CONFIG_IND_V02),
-    NAME_VAL(QMI_LOC_SET_EXTERNAL_POWER_CONFIG_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_EXTERNAL_POWER_CONFIG_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_EXTERNAL_POWER_CONFIG_IND_V02),
-    NAME_VAL(QMI_LOC_GET_EXTERNAL_POWER_CONFIG_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_EXTERNAL_POWER_CONFIG_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_EXTERNAL_POWER_CONFIG_IND_V02),
-    NAME_VAL(QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_REQ_V02),
-    NAME_VAL(QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_RESP_V02),
-    NAME_VAL(QMI_LOC_INFORM_LOCATION_SERVER_CONN_STATUS_IND_V02),
-    NAME_VAL(QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_PROTOCOL_CONFIG_PARAMETERS_IND_V02),
-    NAME_VAL(QMI_LOC_GET_PROTOCOL_CONFIG_PARAMETERS_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_PROTOCOL_CONFIG_PARAMETERS_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_PROTOCOL_CONFIG_PARAMETERS_IND_V02),
-    NAME_VAL(QMI_LOC_SET_SENSOR_CONTROL_CONFIG_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_SENSOR_CONTROL_CONFIG_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_SENSOR_CONTROL_CONFIG_IND_V02),
-    NAME_VAL(QMI_LOC_GET_SENSOR_CONTROL_CONFIG_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_SENSOR_CONTROL_CONFIG_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_SENSOR_CONTROL_CONFIG_IND_V02),
-    NAME_VAL(QMI_LOC_SET_SENSOR_PROPERTIES_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_SENSOR_PROPERTIES_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_SENSOR_PROPERTIES_IND_V02),
-    NAME_VAL(QMI_LOC_GET_SENSOR_PROPERTIES_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_SENSOR_PROPERTIES_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_SENSOR_PROPERTIES_IND_V02),
-    NAME_VAL(QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_IND_V02),
-    NAME_VAL(QMI_LOC_GET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_SENSOR_PERFORMANCE_CONTROL_CONFIGURATION_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_SUPL_CERTIFICATE_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_SUPL_CERTIFICATE_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_SUPL_CERTIFICATE_IND_V02),
-    NAME_VAL(QMI_LOC_DELETE_SUPL_CERTIFICATE_REQ_V02),
-    NAME_VAL(QMI_LOC_DELETE_SUPL_CERTIFICATE_RESP_V02),
-    NAME_VAL(QMI_LOC_DELETE_SUPL_CERTIFICATE_IND_V02),
-    NAME_VAL(QMI_LOC_SET_POSITION_ENGINE_CONFIG_PARAMETERS_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_POSITION_ENGINE_CONFIG_PARAMETERS_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_POSITION_ENGINE_CONFIG_PARAMETERS_IND_V02),
-    NAME_VAL(QMI_LOC_GET_POSITION_ENGINE_CONFIG_PARAMETERS_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_POSITION_ENGINE_CONFIG_PARAMETERS_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_POSITION_ENGINE_CONFIG_PARAMETERS_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_NI_GEOFENCE_NOTIFICATION_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_GEOFENCE_GEN_ALERT_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_GEOFENCE_BREACH_NOTIFICATION_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_GEOFENCE_BATCHED_BREACH_NOTIFICATION_IND_V02),
-    NAME_VAL(QMI_LOC_ADD_CIRCULAR_GEOFENCE_REQ_V02),
-    NAME_VAL(QMI_LOC_ADD_CIRCULAR_GEOFENCE_RESP_V02),
-    NAME_VAL(QMI_LOC_ADD_CIRCULAR_GEOFENCE_IND_V02),
-    NAME_VAL(QMI_LOC_DELETE_GEOFENCE_REQ_V02),
-    NAME_VAL(QMI_LOC_DELETE_GEOFENCE_RESP_V02),
-    NAME_VAL(QMI_LOC_DELETE_GEOFENCE_IND_V02),
-    NAME_VAL(QMI_LOC_QUERY_GEOFENCE_REQ_V02),
-    NAME_VAL(QMI_LOC_QUERY_GEOFENCE_RESP_V02),
-    NAME_VAL(QMI_LOC_QUERY_GEOFENCE_IND_V02),
-    NAME_VAL(QMI_LOC_EDIT_GEOFENCE_REQ_V02),
-    NAME_VAL(QMI_LOC_EDIT_GEOFENCE_RESP_V02),
-    NAME_VAL(QMI_LOC_EDIT_GEOFENCE_IND_V02),
-    NAME_VAL(QMI_LOC_GET_BEST_AVAILABLE_POSITION_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_BEST_AVAILABLE_POSITION_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_BEST_AVAILABLE_POSITION_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_MOTION_DATA_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_MOTION_DATA_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_MOTION_DATA_IND_V02),
-    NAME_VAL(QMI_LOC_GET_NI_GEOFENCE_ID_LIST_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_NI_GEOFENCE_ID_LIST_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_NI_GEOFENCE_ID_LIST_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_GSM_CELL_INFO_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_GSM_CELL_INFO_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_GSM_CELL_INFO_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_IND_V02),
-    NAME_VAL(QMI_LOC_WWAN_OUT_OF_SERVICE_NOTIFICATION_REQ_V02),
-    NAME_VAL(QMI_LOC_WWAN_OUT_OF_SERVICE_NOTIFICATION_RESP_V02),
-    NAME_VAL(QMI_LOC_WWAN_OUT_OF_SERVICE_NOTIFICATION_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_PEDOMETER_CONTROL_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_MOTION_DATA_CONTROL_IND_V02),
-    NAME_VAL(QMI_LOC_PEDOMETER_REPORT_REQ_V02),
-    NAME_VAL(QMI_LOC_PEDOMETER_REPORT_RESP_V02),
-    NAME_VAL(QMI_LOC_PEDOMETER_REPORT_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_WCDMA_CELL_INFO_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_WCDMA_CELL_INFO_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_WCDMA_CELL_INFO_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_TDSCDMA_CELL_INFO_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_TDSCDMA_CELL_INFO_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_TDSCDMA_CELL_INFO_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_SUBSCRIBER_ID_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_SUBSCRIBER_ID_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_SUBSCRIBER_ID_IND_V02),
-    NAME_VAL(QMI_LOC_GET_SUPPORTED_MSGS_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_SUPPORTED_MSGS_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_SUPPORTED_FIELDS_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_SUPPORTED_FIELDS_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_WIFI_AP_DATA_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_WIFI_AP_DATA_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_WIFI_AP_DATA_IND_V02),
-    NAME_VAL(QMI_LOC_GET_BATCH_SIZE_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_BATCH_SIZE_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_BATCH_SIZE_IND_V02),
-    NAME_VAL(QMI_LOC_START_BATCHING_REQ_V02),
-    NAME_VAL(QMI_LOC_START_BATCHING_RESP_V02),
-    NAME_VAL(QMI_LOC_START_BATCHING_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_BATCH_FULL_NOTIFICATION_IND_V02),
-    NAME_VAL(QMI_LOC_READ_FROM_BATCH_REQ_V02),
-    NAME_VAL(QMI_LOC_READ_FROM_BATCH_RESP_V02),
-    NAME_VAL(QMI_LOC_READ_FROM_BATCH_IND_V02),
-    NAME_VAL(QMI_LOC_STOP_BATCHING_REQ_V02),
-    NAME_VAL(QMI_LOC_STOP_BATCHING_RESP_V02),
-    NAME_VAL(QMI_LOC_STOP_BATCHING_IND_V02),
-    NAME_VAL(QMI_LOC_RELEASE_BATCH_REQ_V02),
-    NAME_VAL(QMI_LOC_RELEASE_BATCH_RESP_V02),
-    NAME_VAL(QMI_LOC_RELEASE_BATCH_IND_V02),
-    NAME_VAL(QMI_LOC_INJECT_VEHICLE_SENSOR_DATA_REQ_V02),
-    NAME_VAL(QMI_LOC_INJECT_VEHICLE_SENSOR_DATA_RESP_V02),
-    NAME_VAL(QMI_LOC_INJECT_VEHICLE_SENSOR_DATA_IND_V02),
-    NAME_VAL(QMI_LOC_NOTIFY_WIFI_ATTACHMENT_STATUS_REQ_V02),
-    NAME_VAL(QMI_LOC_NOTIFY_WIFI_ATTACHMENT_STATUS_RESP_V02),
-    NAME_VAL(QMI_LOC_NOTIFY_WIFI_ATTACHMENT_STATUS_IND_V02),
-    NAME_VAL(QMI_LOC_NOTIFY_WIFI_ENABLED_STATUS_REQ_V02),
-    NAME_VAL(QMI_LOC_NOTIFY_WIFI_ENABLED_STATUS_RESP_V02),
-    NAME_VAL(QMI_LOC_NOTIFY_WIFI_ENABLED_STATUS_IND_V02),
-    NAME_VAL(QMI_LOC_SET_PREMIUM_SERVICES_CONFIG_REQ_V02),
-    NAME_VAL(QMI_LOC_SET_PREMIUM_SERVICES_CONFIG_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_PREMIUM_SERVICES_CONFIG_IND_V02),
-    NAME_VAL(QMI_LOC_GET_AVAILABLE_WWAN_POSITION_REQ_V02),
-    NAME_VAL(QMI_LOC_GET_AVAILABLE_WWAN_POSITION_RESP_V02),
-    NAME_VAL(QMI_LOC_GET_AVAILABLE_WWAN_POSITION_IND_V02),
-    NAME_VAL(QMI_LOC_EVENT_GNSS_MEASUREMENT_REPORT_IND_V02),
-    NAME_VAL(QMI_LOC_SET_GNSS_CONSTELL_REPORT_CONFIG_V02),
-    NAME_VAL(QMI_LOC_SET_GNSS_CONSTELL_REPORT_CONFIG_RESP_V02),
-    NAME_VAL(QMI_LOC_SET_GNSS_CONSTELL_REPORT_CONFIG_IND_V02)
-};
-static int loc_v02_event_num = sizeof(loc_v02_event_name) / sizeof(loc_name_val_s_type);
-
-const char* loc_get_v02_event_name(uint32_t event)
-{
-    return loc_get_name_from_val(loc_v02_event_name, loc_v02_event_num, (long) event);
-}
-
-static loc_name_val_s_type loc_v02_client_status_name[] =
-{
-    NAME_VAL(eLOC_CLIENT_SUCCESS),
-    NAME_VAL(eLOC_CLIENT_FAILURE_GENERAL),
-    NAME_VAL(eLOC_CLIENT_FAILURE_UNSUPPORTED),
-    NAME_VAL(eLOC_CLIENT_FAILURE_INVALID_PARAMETER),
-    NAME_VAL(eLOC_CLIENT_FAILURE_ENGINE_BUSY),
-    NAME_VAL(eLOC_CLIENT_FAILURE_PHONE_OFFLINE),
-    NAME_VAL(eLOC_CLIENT_FAILURE_TIMEOUT),
-    NAME_VAL(eLOC_CLIENT_FAILURE_SERVICE_NOT_PRESENT),
-    NAME_VAL(eLOC_CLIENT_FAILURE_SERVICE_VERSION_UNSUPPORTED),
-    NAME_VAL(eLOC_CLIENT_FAILURE_CLIENT_VERSION_UNSUPPORTED),
-    NAME_VAL(eLOC_CLIENT_FAILURE_INVALID_HANDLE),
-    NAME_VAL(eLOC_CLIENT_FAILURE_INTERNAL),
-    NAME_VAL(eLOC_CLIENT_FAILURE_NOT_INITIALIZED),
-    NAME_VAL(eLOC_CLIENT_FAILURE_NOT_ENOUGH_MEMORY),
-};
-static int loc_v02_client_status_num = sizeof(loc_v02_client_status_name) / sizeof(loc_name_val_s_type);
-
-const char* loc_get_v02_client_status_name(locClientStatusEnumType status)
-{
-    return loc_get_name_from_val(loc_v02_client_status_name, loc_v02_client_status_num, (long) status);
-}
-
-
-static loc_name_val_s_type loc_v02_qmi_status_name[] =
-{
-    NAME_VAL(eQMI_LOC_SUCCESS_V02),
-    NAME_VAL(eQMI_LOC_GENERAL_FAILURE_V02),
-    NAME_VAL(eQMI_LOC_UNSUPPORTED_V02),
-    NAME_VAL(eQMI_LOC_INVALID_PARAMETER_V02),
-    NAME_VAL(eQMI_LOC_ENGINE_BUSY_V02),
-    NAME_VAL(eQMI_LOC_PHONE_OFFLINE_V02),
-    NAME_VAL(eQMI_LOC_TIMEOUT_V02),
-    NAME_VAL(eQMI_LOC_CONFIG_NOT_SUPPORTED_V02),
-    NAME_VAL(eQMI_LOC_INSUFFICIENT_MEMORY_V02),
-};
-static int loc_v02_qmi_status_num = sizeof(loc_v02_qmi_status_name) / sizeof(loc_name_val_s_type);
-
-const char* loc_get_v02_qmi_status_name(qmiLocStatusEnumT_v02 status)
-{
-    return loc_get_name_from_val(loc_v02_qmi_status_name, loc_v02_qmi_status_num, (long) status);
-}
diff --git a/location/loc_api/loc_api_v02/loc_api_v02_log.h b/location/loc_api/loc_api_v02/loc_api_v02_log.h
deleted file mode 100644
index 8d4670c..0000000
--- a/location/loc_api/loc_api_v02/loc_api_v02_log.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright (c) 2011, 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 LOC_API_V02_LOG_H
-#define LOC_API_V02_LOG_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include <loc_log.h>
-#include <loc_api_v02_client.h>
-
-const char* loc_get_v02_event_name(uint32_t event);
-const char* loc_get_v02_client_status_name(locClientStatusEnumType status);
-const char* loc_get_v02_qmi_status_name(qmiLocStatusEnumT_v02 status);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LOC_API_V02_LOG_H */
diff --git a/location/loc_api/loc_api_v02/loc_util_log.h b/location/loc_api/loc_api_v02/loc_util_log.h
deleted file mode 100644
index 49201f8..0000000
--- a/location/loc_api/loc_api_v02/loc_util_log.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Copyright (c) 2011-2012, 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 LOC_UTIL_LOG_H
-#define LOC_UTIL_LOG_H
-
-#if defined(_ANDROID_)
-#include "loc_api_v02_log.h"
-#include <log_util.h>
-
-#else // no _ANDROID_
-
-#if defined(__LOC_API_V02_LOG_SILENT__)
-#define MSG_LOG
-#define LOC_LOGE(...) MSG_LOG(__VA_ARGS__);
-#define LOC_LOGW(...) MSG_LOG(__VA_ARGS__);
-#define LOC_LOGD(...) MSG_LOG(__VA_ARGS__);
-#define LOC_LOGI(...) MSG_LOG(__VA_ARGS__);
-#define LOC_LOGV(...) MSG_LOG(__VA_ARGS__);
-#else
-
-// common for QNX and Griffon
-
-//error logs
-#define LOC_LOGE(...) printf(__VA_ARGS__)
-//warning logs
-#define LOC_LOGW(...) printf(__VA_ARGS__)
-// debug logs
-#define LOC_LOGD(...) printf(__VA_ARGS__)
-//info logs
-#define LOC_LOGI(...) printf(__VA_ARGS__)
-//verbose logs
-#define LOC_LOGV(...) printf(__VA_ARGS__)
-#endif //__LOC_API_V02_LOG_SILENT__
-
-#define MODEM_LOG_CALLFLOW(SPEC, VAL)
-#define EXIT_LOG_CALLFLOW(SPEC, VAL)
-
-#define loc_get_v02_event_name(X) #X
-#define loc_get_v02_client_status_name(X) #X
-
-#define loc_get_v02_qmi_status_name(X)  #X
-
-//specific to OFF TARGET
-#ifdef LOC_UTIL_TARGET_OFF_TARGET
-
-#include <stdio.h>
-# include <asm/errno.h>
-# include <sys/time.h>
-
-// get around strl*: not found in glibc
-// TBD:look for presence of eglibc other libraries
-// with strlcpy supported.
-#define strlcpy(X,Y,Z) strcpy(X,Y)
-#define strlcat(X,Y,Z) strcat(X,Y)
-
-#endif //LOC_UTIL_TARGET_OFF_TARGET
-
-#endif //_ANDROID_
-
-#endif //LOC_UTIL_LOG_H
diff --git a/location/loc_api/loc_api_v02/location_service_v02.c b/location/loc_api/loc_api_v02/location_service_v02.c
deleted file mode 100644
index 442e49c..0000000
--- a/location/loc_api/loc_api_v02/location_service_v02.c
+++ /dev/null
@@ -1,4695 +0,0 @@
-/* Copyright (c) 2011-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.
- */
-
-/*====*====*====*====*====*====*====*====*====*====*====*====*====*====*====*
- *THIS IS AN AUTO GENERATED FILE. DO NOT ALTER IN ANY WAY
- *====*====*====*====*====*====*====*====*====*====*====*====*====*====*====*/
-
-/* This file was generated with Tool version 6.10
-   It was generated on: Thu Jul 17 2014 (Spin 0)
-   From IDL File: location_service_v02.idl */
-
-#include "stdint.h"
-#include "qmi_idl_lib_internal.h"
-#include "location_service_v02.h"
-#include "common_v01.h"
-
-
-/*Type Definitions*/
-static const uint8_t qmiLocApplicationIdStructT_data_v02[] = {
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocApplicationIdStructT_v02, applicationProvider),
-  QMI_LOC_MAX_APP_ID_PROVIDER_LENGTH_V02,
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocApplicationIdStructT_v02, applicationName),
-  QMI_LOC_MAX_APP_ID_NAME_LENGTH_V02,
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocApplicationIdStructT_v02, applicationVersion_valid),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocApplicationIdStructT_v02, applicationVersion),
-  QMI_LOC_MAX_APP_ID_VERSION_LENGTH_V02,
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocGPSTimeStructT_data_v02[] = {
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGPSTimeStructT_v02, gpsWeek),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGPSTimeStructT_v02, gpsTimeOfWeekMs),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocDOPStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDOPStructT_v02, PDOP),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDOPStructT_v02, HDOP),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDOPStructT_v02, VDOP),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocSensorUsageIndicatorStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSensorUsageIndicatorStructT_v02, usageMask),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSensorUsageIndicatorStructT_v02, aidingIndicatorMask),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocSvInfoStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSvInfoStructT_v02, validMask),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSvInfoStructT_v02, system),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSvInfoStructT_v02, gnssSvId),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSvInfoStructT_v02, healthStatus),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSvInfoStructT_v02, svStatus),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSvInfoStructT_v02, svInfoMask),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSvInfoStructT_v02, elevation),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSvInfoStructT_v02, azimuth),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSvInfoStructT_v02, snr),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocNiVxNotifyVerifyStructT_data_v02[] = {
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiVxNotifyVerifyStructT_v02, posQosIncl),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiVxNotifyVerifyStructT_v02, posQos),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiVxNotifyVerifyStructT_v02, numFixes),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiVxNotifyVerifyStructT_v02, timeBetweenFixes),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiVxNotifyVerifyStructT_v02, posMode),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiVxNotifyVerifyStructT_v02, encodingScheme),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiVxNotifyVerifyStructT_v02, requestorId),
-  QMI_LOC_NI_MAX_REQUESTOR_ID_LENGTH_V02,
-  QMI_IDL_OFFSET8(qmiLocNiVxNotifyVerifyStructT_v02, requestorId) - QMI_IDL_OFFSET8(qmiLocNiVxNotifyVerifyStructT_v02, requestorId_len),
-
-  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiVxNotifyVerifyStructT_v02, userRespTimerInSeconds),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocNiSuplFormattedStringStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplFormattedStringStructT_v02, formatType),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplFormattedStringStructT_v02, formattedString),
-  QMI_LOC_NI_MAX_CLIENT_NAME_LENGTH_V02,
-  QMI_IDL_OFFSET8(qmiLocNiSuplFormattedStringStructT_v02, formattedString) - QMI_IDL_OFFSET8(qmiLocNiSuplFormattedStringStructT_v02, formattedString_len),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocNiSuplQopStructT_data_v02[] = {
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplQopStructT_v02, validMask),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplQopStructT_v02, horizontalAccuracy),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplQopStructT_v02, verticalAccuracy),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplQopStructT_v02, maxLocAge),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplQopStructT_v02, delay),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocIpV4AddrStructType_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocIpV4AddrStructType_v02, addr),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocIpV4AddrStructType_v02, port),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocIpV6AddrStructType_data_v02[] = {
-  QMI_IDL_FLAGS_IS_ARRAY |QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocIpV6AddrStructType_v02, addr),
-  QMI_LOC_IPV6_ADDR_LENGTH_V02,
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocIpV6AddrStructType_v02, port),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocNiSuplServerInfoStructT_data_v02[] = {
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplServerInfoStructT_v02, suplServerAddrTypeMask),
-
-  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplServerInfoStructT_v02, ipv4Addr),
-  QMI_IDL_TYPE88(0, 8),
-  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplServerInfoStructT_v02, ipv6Addr),
-  QMI_IDL_TYPE88(0, 9),
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocNiSuplServerInfoStructT_v02, urlAddr),
-  QMI_LOC_MAX_SERVER_ADDR_LENGTH_V02,
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocNiSuplNotifyVerifyStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplNotifyVerifyStructT_v02, valid_flags),
-
-  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplNotifyVerifyStructT_v02, suplServerInfo),
-  QMI_IDL_TYPE88(0, 10),
-  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_FLAGS_IS_ARRAY |QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiSuplNotifyVerifyStructT_v02, suplSessionId),
-  QMI_LOC_NI_SUPL_SLP_SESSION_ID_BYTE_LENGTH_V02,
-
-  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_FLAGS_IS_ARRAY |QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiSuplNotifyVerifyStructT_v02, suplHash),
-  QMI_LOC_NI_SUPL_HASH_LENGTH_V02,
-
-  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiSuplNotifyVerifyStructT_v02, posMethod),
-
-  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiSuplNotifyVerifyStructT_v02, dataCodingScheme),
-
-  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiSuplNotifyVerifyStructT_v02, requestorId),
-  QMI_IDL_TYPE88(0, 6),
-  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiSuplNotifyVerifyStructT_v02, clientName),
-  QMI_IDL_TYPE88(0, 6),
-  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiSuplNotifyVerifyStructT_v02, suplQop),
-  QMI_IDL_TYPE88(0, 7),
-  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiSuplNotifyVerifyStructT_v02, userResponseTimer),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocNiUmtsCpCodedStringStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpCodedStringStructT_v02, dataCodingScheme),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpCodedStringStructT_v02, codedString),
-  QMI_LOC_NI_CODEWORD_MAX_LENGTH_V02,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpCodedStringStructT_v02, codedString) - QMI_IDL_OFFSET8(qmiLocNiUmtsCpCodedStringStructT_v02, codedString_len),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocNiUmtsCpNotifyVerifyStructT_data_v02[] = {
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, valid_flags),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, invokeId),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, dataCodingScheme),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, notificationText),
-  QMI_LOC_NI_MAX_CLIENT_NAME_LENGTH_V02,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, notificationText) - QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, notificationText_len),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, clientAddress),
-  QMI_LOC_NI_MAX_EXT_CLIENT_ADDRESS_V02,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, clientAddress) - QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, clientAddress_len),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, locationType),
-
-  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, requestorId),
-  QMI_IDL_TYPE88(0, 12),
-  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, codewordString),
-  QMI_IDL_TYPE88(0, 12),
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, lcsServiceTypeId),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUmtsCpNotifyVerifyStructT_v02, userResponseTimer),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocNiVxServiceInteractionStructT_data_v02[] = {
-  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocNiVxServiceInteractionStructT_v02, niVxReq),
-  QMI_IDL_TYPE88(0, 5),
-  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiVxServiceInteractionStructT_v02, serviceInteractionType),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocNiSuplVer2ExtStructT_data_v02[] = {
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplVer2ExtStructT_v02, supportedNetworksMask),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplVer2ExtStructT_v02, triggerType),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiSuplVer2ExtStructT_v02, gnssType),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocAssistanceServerUrlStructT_data_v02[] = {
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocAssistanceServerUrlStructT_v02, serverUrl),
-  QMI_LOC_MAX_SERVER_ADDR_LENGTH_V02,
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocTimeServerListStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocTimeServerListStructT_v02, delayThreshold),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocTimeServerListStructT_v02, timeServerList),
-  QMI_LOC_MAX_NTP_SERVERS_V02,
-  QMI_IDL_OFFSET8(qmiLocTimeServerListStructT_v02, timeServerList) - QMI_IDL_OFFSET8(qmiLocTimeServerListStructT_v02, timeServerList_len),
-  QMI_IDL_TYPE88(0, 16),
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocPredictedOrbitsAllowedSizesStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPredictedOrbitsAllowedSizesStructT_v02, maxFileSizeInBytes),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPredictedOrbitsAllowedSizesStructT_v02, maxPartSize),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocPredictedOrbitsServerListStructT_data_v02[] = {
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocPredictedOrbitsServerListStructT_v02, serverList),
-  QMI_LOC_MAX_PREDICTED_ORBITS_SERVERS_V02,
-  QMI_IDL_OFFSET8(qmiLocPredictedOrbitsServerListStructT_v02, serverList) - QMI_IDL_OFFSET8(qmiLocPredictedOrbitsServerListStructT_v02, serverList_len),
-  QMI_IDL_TYPE88(0, 16),
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocSensorControlConfigSamplingSpecStructT_data_v02[] = {
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSensorControlConfigSamplingSpecStructT_v02, samplesPerBatch),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSensorControlConfigSamplingSpecStructT_v02, batchesPerSecond),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocSensorReadyStatusStructT_data_v02[] = {
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSensorReadyStatusStructT_v02, injectEnable),
-
-  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocSensorReadyStatusStructT_v02, dataFrequency),
-  QMI_IDL_TYPE88(0, 20),
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocGeofencePositionStructT_data_v02[] = {
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, timestampUtc),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, latitude),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, longitude),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, horUncEllipseSemiMinor),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, horUncEllipseSemiMajor),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, horUncEllipseOrientAzimuth),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, speedHorizontal_valid),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, speedHorizontal),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, altitudeWrtEllipsoid_valid),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, altitudeWrtEllipsoid),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, vertUnc_valid),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, vertUnc),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, speedVertical_valid),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, speedVertical),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, heading_valid),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofencePositionStructT_v02, heading),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocPredictedOrbitsDataValidityStructT_data_v02[] = {
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPredictedOrbitsDataValidityStructT_v02, startTimeInUTC),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPredictedOrbitsDataValidityStructT_v02, durationHours),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocAltitudeSrcInfoStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocAltitudeSrcInfoStructT_v02, source),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocAltitudeSrcInfoStructT_v02, linkage),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocAltitudeSrcInfoStructT_v02, coverage),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocDeleteSvInfoStructT_data_v02[] = {
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteSvInfoStructT_v02, gnssSvId),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteSvInfoStructT_v02, system),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteSvInfoStructT_v02, deleteSvInfoMask),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocWifiFixTimeStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiFixTimeStructT_v02, wifiPositionTime),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocWifiFixPosStructT_data_v02[] = {
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiFixPosStructT_v02, lat),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiFixPosStructT_v02, lon),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiFixPosStructT_v02, hepe),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiFixPosStructT_v02, numApsUsed),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiFixPosStructT_v02, fixErrorCode),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocWifiApInfoStructT_data_v02[] = {
-  QMI_IDL_FLAGS_IS_ARRAY |QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApInfoStructT_v02, macAddr),
-  QMI_LOC_WIFI_MAC_ADDR_LENGTH_V02,
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApInfoStructT_v02, rssi),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApInfoStructT_v02, channel),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApInfoStructT_v02, apQualifier),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLoc3AxisSensorSampleStructT_data_v02[] = {
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLoc3AxisSensorSampleStructT_v02, timeOffset),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLoc3AxisSensorSampleStructT_v02, xAxis),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLoc3AxisSensorSampleStructT_v02, yAxis),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLoc3AxisSensorSampleStructT_v02, zAxis),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLoc3AxisSensorSampleListStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLoc3AxisSensorSampleListStructT_v02, timeOfFirstSample),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLoc3AxisSensorSampleListStructT_v02, flags),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLoc3AxisSensorSampleListStructT_v02, sensorData),
-  QMI_LOC_SENSOR_DATA_MAX_SAMPLES_V02,
-  QMI_IDL_OFFSET8(qmiLoc3AxisSensorSampleListStructT_v02, sensorData) - QMI_IDL_OFFSET8(qmiLoc3AxisSensorSampleListStructT_v02, sensorData_len),
-  QMI_IDL_TYPE88(0, 29),
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocApnProfilesStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocApnProfilesStructT_v02, pdnType),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocApnProfilesStructT_v02, apnName),
-  QMI_LOC_MAX_APN_NAME_LENGTH_V02,
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocCircularGeofenceArgsStructT_data_v02[] = {
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocCircularGeofenceArgsStructT_v02, latitude),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocCircularGeofenceArgsStructT_v02, longitude),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocCircularGeofenceArgsStructT_v02, radius),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocMotionDataStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocMotionDataStructT_v02, motion_state),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocMotionDataStructT_v02, motion_mode),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocMotionDataStructT_v02, probability_of_state),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocMotionDataStructT_v02, age),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocMotionDataStructT_v02, timeout),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocGSMCellIdStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGSMCellIdStructT_v02, MCC),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGSMCellIdStructT_v02, MNC),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGSMCellIdStructT_v02, LAC),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGSMCellIdStructT_v02, CID),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocEmergencyNotificationStructT_data_v02[] = {
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocEmergencyNotificationStructT_v02, eslpUrl),
-  QMI_LOC_MAX_SERVER_ADDR_LENGTH_V02,
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocSensorTemperatureSampleStructT_data_v02[] = {
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSensorTemperatureSampleStructT_v02, timeOffset),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSensorTemperatureSampleStructT_v02, temperature),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocSensorTemperatureSampleListStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSensorTemperatureSampleListStructT_v02, timeSource),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSensorTemperatureSampleListStructT_v02, timeOfFirstSample),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocSensorTemperatureSampleListStructT_v02, temperatureData),
-  QMI_LOC_SENSOR_DATA_MAX_SAMPLES_V02,
-  QMI_IDL_OFFSET8(qmiLocSensorTemperatureSampleListStructT_v02, temperatureData) - QMI_IDL_OFFSET8(qmiLocSensorTemperatureSampleListStructT_v02, temperatureData_len),
-  QMI_IDL_TYPE88(0, 36),
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocWCDMACellIdStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWCDMACellIdStructT_v02, mcc),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWCDMACellIdStructT_v02, mnc),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWCDMACellIdStructT_v02, cid),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocTDSCDMACellIdStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocTDSCDMACellIdStructT_v02, mcc),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocTDSCDMACellIdStructT_v02, mnc),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocTDSCDMACellIdStructT_v02, cid),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocTDSCDMACellIdStructT_v02, lac),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocDeleteBDSSvInfoStructT_data_v02[] = {
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteBDSSvInfoStructT_v02, gnssSvId),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteBDSSvInfoStructT_v02, deleteSvInfoMask),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocGeofenceIdContinuousStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofenceIdContinuousStructT_v02, idLow),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofenceIdContinuousStructT_v02, idHigh),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocBatchedReportStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, fixId),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, validFields),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, latitude),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, longitude),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, horUncCircular),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, speedHorizontal),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, speedUnc),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, altitudeWrtEllipsoid),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, speedVertical),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, heading),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, headingUnc),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, technologyMask),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, timestampUtc),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, timeUnc),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, magneticDeviation),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, vertUnc),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, horConfidence),
-
-  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocBatchedReportStructT_v02, gpsTime),
-  QMI_IDL_TYPE88(0, 1),
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocWifiApDataStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, wifiApDataMask),
-
-  QMI_IDL_FLAGS_IS_ARRAY |QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, macAddress),
-  QMI_LOC_WIFI_MAC_ADDR_LENGTH_V02,
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, apTransmitPower),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, apAntennaGain),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, apSignalToNoise),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, apDeviceType),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, apRssi),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, apChannel),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, apRoundTripDelay),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, apRoundTripDelayUnit),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, apRoundTripDelayAccuracy),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, mobileSignalToNoise),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWifiApDataStructT_v02, mobileRssi),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocVehicleSensorSampleStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocVehicleSensorSampleStructT_v02, timeOffset),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocVehicleSensorSampleStructT_v02, axisSample),
-  QMI_LOC_VEHICLE_SENSOR_DATA_MAX_AXES_V02,
-  QMI_IDL_OFFSET8(qmiLocVehicleSensorSampleStructT_v02, axisSample) - QMI_IDL_OFFSET8(qmiLocVehicleSensorSampleStructT_v02, axisSample_len),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocVehicleSensorSampleListStructType_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocVehicleSensorSampleListStructType_v02, sampleTimeBase),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocVehicleSensorSampleListStructType_v02, axesValidity),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocVehicleSensorSampleListStructType_v02, sensorData),
-  QMI_LOC_VEHICLE_SENSOR_DATA_MAX_SAMPLES_V02,
-  QMI_IDL_OFFSET8(qmiLocVehicleSensorSampleListStructType_v02, sensorData) - QMI_IDL_OFFSET8(qmiLocVehicleSensorSampleListStructType_v02, sensorData_len),
-  QMI_IDL_TYPE88(0, 44),
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocVehicleOdometrySampleStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocVehicleOdometrySampleStructT_v02, timeOffset),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocVehicleOdometrySampleStructT_v02, distanceTravelled),
-  QMI_LOC_VEHICLE_ODOMETRY_MAX_MEASUREMENTS_V02,
-  QMI_IDL_OFFSET8(qmiLocVehicleOdometrySampleStructT_v02, distanceTravelled) - QMI_IDL_OFFSET8(qmiLocVehicleOdometrySampleStructT_v02, distanceTravelled_len),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocVehicleOdometrySampleListStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocVehicleOdometrySampleListStructT_v02, sampleTimeBase),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocVehicleOdometrySampleListStructT_v02, flags),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocVehicleOdometrySampleListStructT_v02, wheelFlags),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocVehicleOdometrySampleListStructT_v02, distanceTravelledBase),
-
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocVehicleOdometrySampleListStructT_v02, odometryData),
-  QMI_LOC_VEHICLE_SENSOR_DATA_MAX_SAMPLES_V02,
-  QMI_IDL_OFFSET8(qmiLocVehicleOdometrySampleListStructT_v02, odometryData) - QMI_IDL_OFFSET8(qmiLocVehicleOdometrySampleListStructT_v02, odometryData_len),
-  QMI_IDL_TYPE88(0, 46),
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocGeofenceMotionStateConfigStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofenceMotionStateConfigStructT_v02, motionState),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGeofenceMotionStateConfigStructT_v02, motionStateSpeed),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocRcvrClockFrequencyInfoStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocRcvrClockFrequencyInfoStructT_v02, clockDrift),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocRcvrClockFrequencyInfoStructT_v02, clockDriftUnc),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocRcvrClockFrequencyInfoStructT_v02, sourceOfFreq),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocLeapSecondInfoStructT_data_v02[] = {
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocLeapSecondInfoStructT_v02, leapSec),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocLeapSecondInfoStructT_v02, leapSecUnc),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocInterSystemBiasStructT_data_v02[] = {
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInterSystemBiasStructT_v02, validMask),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInterSystemBiasStructT_v02, timeBias),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInterSystemBiasStructT_v02, timeBiasUnc),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocGnssTimeStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGnssTimeStructT_v02, system),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGnssTimeStructT_v02, systemWeek),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGnssTimeStructT_v02, systemMsec),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGnssTimeStructT_v02, systemClkTimeBias),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGnssTimeStructT_v02, systemClkTimeUncMs),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocGloTimeStructT_data_v02[] = {
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGloTimeStructT_v02, gloFourYear),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGloTimeStructT_v02, gloDays),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGloTimeStructT_v02, gloMsec),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGloTimeStructT_v02, gloClkTimeBias),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGloTimeStructT_v02, gloClkTimeUncMs),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocGnssTimeExtStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGnssTimeExtStructT_v02, refFCount),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGnssTimeExtStructT_v02, systemRtc_valid),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGnssTimeExtStructT_v02, systemRtcMs),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGnssTimeExtStructT_v02, sourceOfTime),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocSVTimeSpeedStructT_data_v02[] = {
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVTimeSpeedStructT_v02, svTimeMs),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVTimeSpeedStructT_v02, svTimeSubMs),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVTimeSpeedStructT_v02, svTimeUncMs),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVTimeSpeedStructT_v02, dopplerShift),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVTimeSpeedStructT_v02, dopplerShiftUnc),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVTimeSpeedStructT_v02, dopplerAccel_valid),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVTimeSpeedStructT_v02, dopplerAccel),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-static const uint8_t qmiLocSVMeasurementStructT_data_v02[] = {
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, gnssSvId),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, gloFrequency),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, svStatus),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, validMask),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, healthStatus),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, svInfoMask),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, validMeasStatusMask),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, measurementStatus),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, CNo),
-
-  QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, gloRfLoss),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, measLatency),
-
-  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, svTimeSpeed),
-  QMI_IDL_TYPE88(0, 55),
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, lossOfLock),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, multipathEstimate),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, fineSpeed),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, fineSpeedUnc),
-
-  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, carrierPhase),
-
-  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, cycleSlipCount),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, svAzimuth),
-
-  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSVMeasurementStructT_v02, svElevation),
-
-  QMI_IDL_FLAG_END_VALUE
-};
-
-/*Message Definitions*/
-static const uint8_t qmiLocGenRespMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGenRespMsgT_v02, resp),
-  QMI_IDL_TYPE88(1, 0)
-};
-
-static const uint8_t qmiLocInformClientRevisionReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInformClientRevisionReqMsgT_v02, revision)
-};
-
-static const uint8_t qmiLocRegEventsReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocRegEventsReqMsgT_v02, eventRegMask)
-};
-
-static const uint8_t qmiLocStartReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, sessionId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, fixRecurrence) - QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, fixRecurrence_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, fixRecurrence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, horizontalAccuracyLevel) - QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, horizontalAccuracyLevel_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, horizontalAccuracyLevel),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, intermediateReportState) - QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, intermediateReportState_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, intermediateReportState),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, minInterval) - QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, minInterval_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, minInterval),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, applicationId) - QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, applicationId_valid)),
-  0x14,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, applicationId),
-  QMI_IDL_TYPE88(0, 0),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, configAltitudeAssumed) - QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, configAltitudeAssumed_valid)),
-  0x15,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStartReqMsgT_v02, configAltitudeAssumed)
-};
-
-static const uint8_t qmiLocStopReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStopReqMsgT_v02, sessionId)
-};
-
-static const uint8_t qmiLocEventPositionReportIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, sessionStatus),
-
-  0x02,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, sessionId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, latitude) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, latitude_valid)),
-  0x10,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, latitude),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, longitude) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, longitude_valid)),
-  0x11,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, longitude),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncCircular) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncCircular_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncCircular),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncEllipseSemiMinor) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncEllipseSemiMinor_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncEllipseSemiMinor),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncEllipseSemiMajor) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncEllipseSemiMajor_valid)),
-  0x14,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncEllipseSemiMajor),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncEllipseOrientAzimuth) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncEllipseOrientAzimuth_valid)),
-  0x15,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horUncEllipseOrientAzimuth),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horConfidence) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horConfidence_valid)),
-  0x16,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horReliability) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horReliability_valid)),
-  0x17,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, horReliability),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, speedHorizontal) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, speedHorizontal_valid)),
-  0x18,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, speedHorizontal),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, speedUnc) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, speedUnc_valid)),
-  0x19,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, speedUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, altitudeWrtEllipsoid) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, altitudeWrtEllipsoid_valid)),
-  0x1A,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, altitudeWrtEllipsoid),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, altitudeWrtMeanSeaLevel) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, altitudeWrtMeanSeaLevel_valid)),
-  0x1B,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, altitudeWrtMeanSeaLevel),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, vertUnc) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, vertUnc_valid)),
-  0x1C,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, vertUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, vertConfidence) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, vertConfidence_valid)),
-  0x1D,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, vertConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, vertReliability) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, vertReliability_valid)),
-  0x1E,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, vertReliability),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, speedVertical) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, speedVertical_valid)),
-  0x1F,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, speedVertical),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, heading) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, heading_valid)),
-  0x20,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, heading),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, headingUnc) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, headingUnc_valid)),
-  0x21,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, headingUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, magneticDeviation) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, magneticDeviation_valid)),
-  0x22,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, magneticDeviation),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, technologyMask) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, technologyMask_valid)),
-  0x23,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, technologyMask),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, DOP) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, DOP_valid)),
-  0x24,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, DOP),
-  QMI_IDL_TYPE88(0, 2),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, timestampUtc) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, timestampUtc_valid)),
-  0x25,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, timestampUtc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, leapSeconds) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, leapSeconds_valid)),
-  0x26,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, leapSeconds),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, gpsTime) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, gpsTime_valid)),
-  0x27,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, gpsTime),
-  QMI_IDL_TYPE88(0, 1),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, timeUnc) - QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, timeUnc_valid)),
-  0x28,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPositionReportIndMsgT_v02, timeUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, timeSrc) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, timeSrc_valid)),
-  0x29,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventPositionReportIndMsgT_v02, timeSrc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, sensorDataUsage) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, sensorDataUsage_valid)),
-  0x2A,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventPositionReportIndMsgT_v02, sensorDataUsage),
-  QMI_IDL_TYPE88(0, 3),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, fixId) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, fixId_valid)),
-  0x2B,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventPositionReportIndMsgT_v02, fixId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, gnssSvUsedList) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, gnssSvUsedList_valid)),
-  0x2C,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventPositionReportIndMsgT_v02, gnssSvUsedList),
-  QMI_LOC_MAX_SV_USED_LIST_LENGTH_V02,
-  QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, gnssSvUsedList) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, gnssSvUsedList_len),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, altitudeAssumed) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventPositionReportIndMsgT_v02, altitudeAssumed_valid)),
-  0x2D,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventPositionReportIndMsgT_v02, altitudeAssumed)
-};
-
-static const uint8_t qmiLocEventGnssSvInfoIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvInfoIndMsgT_v02, altitudeAssumed),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvInfoIndMsgT_v02, svList) - QMI_IDL_OFFSET8(qmiLocEventGnssSvInfoIndMsgT_v02, svList_valid)),
-  0x10,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvInfoIndMsgT_v02, svList),
-  QMI_LOC_SV_INFO_LIST_MAX_SIZE_V02,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvInfoIndMsgT_v02, svList) - QMI_IDL_OFFSET8(qmiLocEventGnssSvInfoIndMsgT_v02, svList_len),
-  QMI_IDL_TYPE88(0, 4)
-};
-
-static const uint8_t qmiLocEventNmeaIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocEventNmeaIndMsgT_v02, nmea),
-  QMI_LOC_NMEA_STRING_MAX_LENGTH_V02
-};
-
-static const uint8_t qmiLocEventNiNotifyVerifyReqIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, notificationType),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiVxInd) - QMI_IDL_OFFSET8(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiVxInd_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiVxInd),
-  QMI_IDL_TYPE88(0, 5),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiSuplInd) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiSuplInd_valid)),
-  0x11,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiSuplInd),
-  QMI_IDL_TYPE88(0, 11),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiUmtsCpInd) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiUmtsCpInd_valid)),
-  0x12,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiUmtsCpInd),
-  QMI_IDL_TYPE88(0, 13),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiVxServiceInteractionInd) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiVxServiceInteractionInd_valid)),
-  0x13,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiVxServiceInteractionInd),
-  QMI_IDL_TYPE88(0, 14),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiSuplVer2ExtInd) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiSuplVer2ExtInd_valid)),
-  0x14,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, NiSuplVer2ExtInd),
-  QMI_IDL_TYPE88(0, 15),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, suplEmergencyNotification) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, suplEmergencyNotification_valid)),
-  0x15,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventNiNotifyVerifyReqIndMsgT_v02, suplEmergencyNotification),
-  QMI_IDL_TYPE88(0, 35)
-};
-
-static const uint8_t qmiLocEventInjectTimeReqIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventInjectTimeReqIndMsgT_v02, timeServerInfo) - QMI_IDL_OFFSET8(qmiLocEventInjectTimeReqIndMsgT_v02, timeServerInfo_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventInjectTimeReqIndMsgT_v02, timeServerInfo),
-  QMI_IDL_TYPE88(0, 17)
-};
-
-static const uint8_t qmiLocEventInjectPredictedOrbitsReqIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventInjectPredictedOrbitsReqIndMsgT_v02, allowedSizes),
-  QMI_IDL_TYPE88(0, 18),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventInjectPredictedOrbitsReqIndMsgT_v02, serverList) - QMI_IDL_OFFSET8(qmiLocEventInjectPredictedOrbitsReqIndMsgT_v02, serverList_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventInjectPredictedOrbitsReqIndMsgT_v02, serverList),
-  QMI_IDL_TYPE88(0, 19)
-};
-
-static const uint8_t qmiLocEventInjectPositionReqIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventInjectPositionReqIndMsgT_v02, latitude),
-
-  0x02,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventInjectPositionReqIndMsgT_v02, longitude),
-
-  0x03,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventInjectPositionReqIndMsgT_v02, horUncCircular),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x04,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventInjectPositionReqIndMsgT_v02, timestampUtc)
-};
-
-static const uint8_t qmiLocEventEngineStateIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventEngineStateIndMsgT_v02, engineState)
-};
-
-static const uint8_t qmiLocEventFixSessionStateIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventFixSessionStateIndMsgT_v02, sessionState),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventFixSessionStateIndMsgT_v02, sessionId) - QMI_IDL_OFFSET8(qmiLocEventFixSessionStateIndMsgT_v02, sessionId_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventFixSessionStateIndMsgT_v02, sessionId)
-};
-
-static const uint8_t qmiLocEventWifiReqIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventWifiReqIndMsgT_v02, requestType),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventWifiReqIndMsgT_v02, tbfInMs) - QMI_IDL_OFFSET8(qmiLocEventWifiReqIndMsgT_v02, tbfInMs_valid)),
-  0x10,
-   QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventWifiReqIndMsgT_v02, tbfInMs)
-};
-
-static const uint8_t qmiLocEventSensorStreamingReadyStatusIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, accelReady) - QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, accelReady_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, accelReady),
-  QMI_IDL_TYPE88(0, 21),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, gyroReady) - QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, gyroReady_valid)),
-  0x11,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, gyroReady),
-  QMI_IDL_TYPE88(0, 21),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, accelTemperatureReady) - QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, accelTemperatureReady_valid)),
-  0x12,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, accelTemperatureReady),
-  QMI_IDL_TYPE88(0, 21),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, gyroTemperatureReady) - QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, gyroTemperatureReady_valid)),
-  0x13,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02, gyroTemperatureReady),
-  QMI_IDL_TYPE88(0, 21)
-};
-
-static const uint8_t qmiLocEventTimeSyncReqIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventTimeSyncReqIndMsgT_v02, refCounter)
-};
-
-static const uint8_t qmiLocEventSetSpiStreamingReportIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventSetSpiStreamingReportIndMsgT_v02, enable)
-};
-
-static const uint8_t qmiLocEventLocationServerConnectionReqIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventLocationServerConnectionReqIndMsgT_v02, connHandle),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventLocationServerConnectionReqIndMsgT_v02, requestType),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x03,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventLocationServerConnectionReqIndMsgT_v02, wwanType)
-};
-
-static const uint8_t qmiLocEventNiGeofenceNotificationIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventNiGeofenceNotificationIndMsgT_v02, geofenceId),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventNiGeofenceNotificationIndMsgT_v02, operationType)
-};
-
-static const uint8_t qmiLocEventGeofenceGenAlertIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGeofenceGenAlertIndMsgT_v02, geofenceAlert)
-};
-
-static const uint8_t qmiLocEventGeofenceBreachIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGeofenceBreachIndMsgT_v02, geofenceId),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGeofenceBreachIndMsgT_v02, breachType),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGeofenceBreachIndMsgT_v02, geofencePosition) - QMI_IDL_OFFSET8(qmiLocEventGeofenceBreachIndMsgT_v02, geofencePosition_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGeofenceBreachIndMsgT_v02, geofencePosition),
-  QMI_IDL_TYPE88(0, 22),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGeofenceBreachIndMsgT_v02, breachConfidence) - QMI_IDL_OFFSET8(qmiLocEventGeofenceBreachIndMsgT_v02, breachConfidence_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGeofenceBreachIndMsgT_v02, breachConfidence)
-};
-
-/*
- * qmiLocGetServiceRevisionReqMsgT is empty
- * static const uint8_t qmiLocGetServiceRevisionReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetServiceRevisionIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetServiceRevisionIndMsgT_v02, status),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetServiceRevisionIndMsgT_v02, revision),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetServiceRevisionIndMsgT_v02, gnssMeFWVerString) - QMI_IDL_OFFSET8(qmiLocGetServiceRevisionIndMsgT_v02, gnssMeFWVerString_valid)),
-  0x10,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocGetServiceRevisionIndMsgT_v02, gnssMeFWVerString),
-  QMI_LOC_GNSS_ME_VERSION_STRING_MAX_LENGTH_V02,
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetServiceRevisionIndMsgT_v02, gnssHostSWVerString) - QMI_IDL_OFFSET8(qmiLocGetServiceRevisionIndMsgT_v02, gnssHostSWVerString_valid)),
-  0x11,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocGetServiceRevisionIndMsgT_v02, gnssHostSWVerString),
-  QMI_LOC_GNSS_HOSTED_SW_VERSION_STRING_MAX_LENGTH_V02,
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocGetServiceRevisionIndMsgT_v02, gnssSWVerString) - QMI_IDL_OFFSET16RELATIVE(qmiLocGetServiceRevisionIndMsgT_v02, gnssSWVerString_valid)),
-  0x12,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_STRING,
-  QMI_IDL_OFFSET16ARRAY(qmiLocGetServiceRevisionIndMsgT_v02, gnssSWVerString),
-  QMI_LOC_GNSS_SW_VERSION_STRING_MAX_LENGTH_V02
-};
-
-/*
- * qmiLocGetFixCriteriaReqMsgT is empty
- * static const uint8_t qmiLocGetFixCriteriaReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetFixCriteriaIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, horizontalAccuracyLevel) - QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, horizontalAccuracyLevel_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, horizontalAccuracyLevel),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, intermediateReportState) - QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, intermediateReportState_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, intermediateReportState),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, minInterval) - QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, minInterval_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, minInterval),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, applicationId) - QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, applicationId_valid)),
-  0x13,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetFixCriteriaIndMsgT_v02, applicationId),
-  QMI_IDL_TYPE88(0, 0)
-};
-
-static const uint8_t qmiLocNiUserRespReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUserRespReqMsgT_v02, userResp),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUserRespReqMsgT_v02, notificationType),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocNiUserRespReqMsgT_v02, NiVxPayload) - QMI_IDL_OFFSET8(qmiLocNiUserRespReqMsgT_v02, NiVxPayload_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocNiUserRespReqMsgT_v02, NiVxPayload),
-  QMI_IDL_TYPE88(0, 5),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocNiUserRespReqMsgT_v02, NiSuplPayload) - QMI_IDL_OFFSET16RELATIVE(qmiLocNiUserRespReqMsgT_v02, NiSuplPayload_valid)),
-  0x11,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiUserRespReqMsgT_v02, NiSuplPayload),
-  QMI_IDL_TYPE88(0, 11),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocNiUserRespReqMsgT_v02, NiUmtsCpPayload) - QMI_IDL_OFFSET16RELATIVE(qmiLocNiUserRespReqMsgT_v02, NiUmtsCpPayload_valid)),
-  0x12,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiUserRespReqMsgT_v02, NiUmtsCpPayload),
-  QMI_IDL_TYPE88(0, 13),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocNiUserRespReqMsgT_v02, NiVxServiceInteractionPayload) - QMI_IDL_OFFSET16RELATIVE(qmiLocNiUserRespReqMsgT_v02, NiVxServiceInteractionPayload_valid)),
-  0x13,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiUserRespReqMsgT_v02, NiVxServiceInteractionPayload),
-  QMI_IDL_TYPE88(0, 14),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocNiUserRespReqMsgT_v02, NiSuplVer2ExtPayload) - QMI_IDL_OFFSET16RELATIVE(qmiLocNiUserRespReqMsgT_v02, NiSuplVer2ExtPayload_valid)),
-  0x14,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiUserRespReqMsgT_v02, NiSuplVer2ExtPayload),
-  QMI_IDL_TYPE88(0, 15),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocNiUserRespReqMsgT_v02, suplEmergencyNotification) - QMI_IDL_OFFSET16RELATIVE(qmiLocNiUserRespReqMsgT_v02, suplEmergencyNotification_valid)),
-  0x15,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocNiUserRespReqMsgT_v02, suplEmergencyNotification),
-  QMI_IDL_TYPE88(0, 35)
-};
-
-static const uint8_t qmiLocNiUserRespIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNiUserRespIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocInjectPredictedOrbitsDataReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPredictedOrbitsDataReqMsgT_v02, totalSize),
-
-  0x02,
-   QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPredictedOrbitsDataReqMsgT_v02, totalParts),
-
-  0x03,
-   QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPredictedOrbitsDataReqMsgT_v02, partNum),
-
-  0x04,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN | QMI_IDL_FLAGS_SZ_IS_16 |   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPredictedOrbitsDataReqMsgT_v02, partData),
-  ((QMI_LOC_MAX_PREDICTED_ORBITS_PART_LEN_V02) & 0xFF), ((QMI_LOC_MAX_PREDICTED_ORBITS_PART_LEN_V02) >> 8),
-  QMI_IDL_OFFSET8(qmiLocInjectPredictedOrbitsDataReqMsgT_v02, partData) - QMI_IDL_OFFSET8(qmiLocInjectPredictedOrbitsDataReqMsgT_v02, partData_len),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocInjectPredictedOrbitsDataReqMsgT_v02, formatType) - QMI_IDL_OFFSET16RELATIVE(qmiLocInjectPredictedOrbitsDataReqMsgT_v02, formatType_valid)),
-  0x10,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocInjectPredictedOrbitsDataReqMsgT_v02, formatType)
-};
-
-static const uint8_t qmiLocInjectPredictedOrbitsDataIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPredictedOrbitsDataIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPredictedOrbitsDataIndMsgT_v02, partNum) - QMI_IDL_OFFSET8(qmiLocInjectPredictedOrbitsDataIndMsgT_v02, partNum_valid)),
-  0x10,
-   QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPredictedOrbitsDataIndMsgT_v02, partNum)
-};
-
-/*
- * qmiLocGetPredictedOrbitsDataSourceReqMsgT is empty
- * static const uint8_t qmiLocGetPredictedOrbitsDataSourceReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetPredictedOrbitsDataSourceIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetPredictedOrbitsDataSourceIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetPredictedOrbitsDataSourceIndMsgT_v02, allowedSizes) - QMI_IDL_OFFSET8(qmiLocGetPredictedOrbitsDataSourceIndMsgT_v02, allowedSizes_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetPredictedOrbitsDataSourceIndMsgT_v02, allowedSizes),
-  QMI_IDL_TYPE88(0, 18),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetPredictedOrbitsDataSourceIndMsgT_v02, serverList) - QMI_IDL_OFFSET8(qmiLocGetPredictedOrbitsDataSourceIndMsgT_v02, serverList_valid)),
-  0x11,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetPredictedOrbitsDataSourceIndMsgT_v02, serverList),
-  QMI_IDL_TYPE88(0, 19)
-};
-
-/*
- * qmiLocGetPredictedOrbitsDataValidityReqMsgT is empty
- * static const uint8_t qmiLocGetPredictedOrbitsDataValidityReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetPredictedOrbitsDataValidityIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetPredictedOrbitsDataValidityIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetPredictedOrbitsDataValidityIndMsgT_v02, validityInfo) - QMI_IDL_OFFSET8(qmiLocGetPredictedOrbitsDataValidityIndMsgT_v02, validityInfo_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetPredictedOrbitsDataValidityIndMsgT_v02, validityInfo),
-  QMI_IDL_TYPE88(0, 23)
-};
-
-static const uint8_t qmiLocInjectUtcTimeReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectUtcTimeReqMsgT_v02, timeUtc),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectUtcTimeReqMsgT_v02, timeUnc)
-};
-
-static const uint8_t qmiLocInjectUtcTimeIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectUtcTimeIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocInjectPositionReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, latitude) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, latitude_valid)),
-  0x10,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, latitude),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, longitude) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, longitude_valid)),
-  0x11,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, longitude),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, horUncCircular) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, horUncCircular_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, horUncCircular),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, horConfidence) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, horConfidence_valid)),
-  0x13,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, horConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, horReliability) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, horReliability_valid)),
-  0x14,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, horReliability),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, altitudeWrtEllipsoid) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, altitudeWrtEllipsoid_valid)),
-  0x15,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, altitudeWrtEllipsoid),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, altitudeWrtMeanSeaLevel) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, altitudeWrtMeanSeaLevel_valid)),
-  0x16,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, altitudeWrtMeanSeaLevel),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, vertUnc) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, vertUnc_valid)),
-  0x17,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, vertUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, vertConfidence) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, vertConfidence_valid)),
-  0x18,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, vertConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, vertReliability) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, vertReliability_valid)),
-  0x19,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, vertReliability),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, altSourceInfo) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, altSourceInfo_valid)),
-  0x1A,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, altSourceInfo),
-  QMI_IDL_TYPE88(0, 24),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, timestampUtc) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, timestampUtc_valid)),
-  0x1B,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, timestampUtc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, timestampAge) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, timestampAge_valid)),
-  0x1C,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, timestampAge),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, positionSrc) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, positionSrc_valid)),
-  0x1D,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, positionSrc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, rawHorUncCircular) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, rawHorUncCircular_valid)),
-  0x1E,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, rawHorUncCircular),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, rawHorConfidence) - QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, rawHorConfidence_valid)),
-  0x1F,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionReqMsgT_v02, rawHorConfidence)
-};
-
-static const uint8_t qmiLocInjectPositionIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectPositionIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocSetEngineLockReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetEngineLockReqMsgT_v02, lockType)
-};
-
-static const uint8_t qmiLocSetEngineLockIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetEngineLockIndMsgT_v02, status)
-};
-
-/*
- * qmiLocGetEngineLockReqMsgT is empty
- * static const uint8_t qmiLocGetEngineLockReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetEngineLockIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetEngineLockIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetEngineLockIndMsgT_v02, lockType) - QMI_IDL_OFFSET8(qmiLocGetEngineLockIndMsgT_v02, lockType_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetEngineLockIndMsgT_v02, lockType)
-};
-
-static const uint8_t qmiLocSetSbasConfigReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSbasConfigReqMsgT_v02, sbasConfig)
-};
-
-static const uint8_t qmiLocSetSbasConfigIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSbasConfigIndMsgT_v02, status)
-};
-
-/*
- * qmiLocGetSbasConfigReqMsgT is empty
- * static const uint8_t qmiLocGetSbasConfigReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetSbasConfigIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSbasConfigIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSbasConfigIndMsgT_v02, sbasConfig) - QMI_IDL_OFFSET8(qmiLocGetSbasConfigIndMsgT_v02, sbasConfig_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSbasConfigIndMsgT_v02, sbasConfig)
-};
-
-static const uint8_t qmiLocSetNmeaTypesReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetNmeaTypesReqMsgT_v02, nmeaSentenceType)
-};
-
-static const uint8_t qmiLocSetNmeaTypesIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetNmeaTypesIndMsgT_v02, status)
-};
-
-/*
- * qmiLocGetNmeaTypesReqMsgT is empty
- * static const uint8_t qmiLocGetNmeaTypesReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetNmeaTypesIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetNmeaTypesIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetNmeaTypesIndMsgT_v02, nmeaSentenceType) - QMI_IDL_OFFSET8(qmiLocGetNmeaTypesIndMsgT_v02, nmeaSentenceType_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetNmeaTypesIndMsgT_v02, nmeaSentenceType)
-};
-
-static const uint8_t qmiLocSetLowPowerModeReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetLowPowerModeReqMsgT_v02, lowPowerMode)
-};
-
-static const uint8_t qmiLocSetLowPowerModeIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetLowPowerModeIndMsgT_v02, status)
-};
-
-/*
- * qmiLocGetLowPowerModeReqMsgT is empty
- * static const uint8_t qmiLocGetLowPowerModeReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetLowPowerModeIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetLowPowerModeIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetLowPowerModeIndMsgT_v02, lowPowerMode) - QMI_IDL_OFFSET8(qmiLocGetLowPowerModeIndMsgT_v02, lowPowerMode_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetLowPowerModeIndMsgT_v02, lowPowerMode)
-};
-
-static const uint8_t qmiLocSetServerReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetServerReqMsgT_v02, serverType),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetServerReqMsgT_v02, ipv4Addr) - QMI_IDL_OFFSET8(qmiLocSetServerReqMsgT_v02, ipv4Addr_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocSetServerReqMsgT_v02, ipv4Addr),
-  QMI_IDL_TYPE88(0, 8),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetServerReqMsgT_v02, ipv6Addr) - QMI_IDL_OFFSET8(qmiLocSetServerReqMsgT_v02, ipv6Addr_valid)),
-  0x11,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocSetServerReqMsgT_v02, ipv6Addr),
-  QMI_IDL_TYPE88(0, 9),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetServerReqMsgT_v02, urlAddr) - QMI_IDL_OFFSET8(qmiLocSetServerReqMsgT_v02, urlAddr_valid)),
-  0x12,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocSetServerReqMsgT_v02, urlAddr),
-  QMI_LOC_MAX_SERVER_ADDR_LENGTH_V02
-};
-
-static const uint8_t qmiLocSetServerIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetServerIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocGetServerReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetServerReqMsgT_v02, serverType),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetServerReqMsgT_v02, serverAddrTypeMask) - QMI_IDL_OFFSET8(qmiLocGetServerReqMsgT_v02, serverAddrTypeMask_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetServerReqMsgT_v02, serverAddrTypeMask)
-};
-
-static const uint8_t qmiLocGetServerIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetServerIndMsgT_v02, status),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetServerIndMsgT_v02, serverType),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetServerIndMsgT_v02, ipv4Addr) - QMI_IDL_OFFSET8(qmiLocGetServerIndMsgT_v02, ipv4Addr_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetServerIndMsgT_v02, ipv4Addr),
-  QMI_IDL_TYPE88(0, 8),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetServerIndMsgT_v02, ipv6Addr) - QMI_IDL_OFFSET8(qmiLocGetServerIndMsgT_v02, ipv6Addr_valid)),
-  0x11,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetServerIndMsgT_v02, ipv6Addr),
-  QMI_IDL_TYPE88(0, 9),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetServerIndMsgT_v02, urlAddr) - QMI_IDL_OFFSET8(qmiLocGetServerIndMsgT_v02, urlAddr_valid)),
-  0x12,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_STRING,
-  QMI_IDL_OFFSET8(qmiLocGetServerIndMsgT_v02, urlAddr),
-  QMI_LOC_MAX_SERVER_ADDR_LENGTH_V02
-};
-
-static const uint8_t qmiLocDeleteAssistDataReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteAssistDataReqMsgT_v02, deleteAllFlag),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocDeleteAssistDataReqMsgT_v02, deleteSvInfoList) - QMI_IDL_OFFSET8(qmiLocDeleteAssistDataReqMsgT_v02, deleteSvInfoList_valid)),
-  0x10,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocDeleteAssistDataReqMsgT_v02, deleteSvInfoList),
-  QMI_LOC_DELETE_MAX_SV_INFO_LENGTH_V02,
-  QMI_IDL_OFFSET8(qmiLocDeleteAssistDataReqMsgT_v02, deleteSvInfoList) - QMI_IDL_OFFSET8(qmiLocDeleteAssistDataReqMsgT_v02, deleteSvInfoList_len),
-  QMI_IDL_TYPE88(0, 25),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocDeleteAssistDataReqMsgT_v02, deleteGnssDataMask) - QMI_IDL_OFFSET16RELATIVE(qmiLocDeleteAssistDataReqMsgT_v02, deleteGnssDataMask_valid)),
-  0x11,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocDeleteAssistDataReqMsgT_v02, deleteGnssDataMask),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocDeleteAssistDataReqMsgT_v02, deleteCellDbDataMask) - QMI_IDL_OFFSET16RELATIVE(qmiLocDeleteAssistDataReqMsgT_v02, deleteCellDbDataMask_valid)),
-  0x12,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocDeleteAssistDataReqMsgT_v02, deleteCellDbDataMask),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocDeleteAssistDataReqMsgT_v02, deleteClockInfoMask) - QMI_IDL_OFFSET16RELATIVE(qmiLocDeleteAssistDataReqMsgT_v02, deleteClockInfoMask_valid)),
-  0x13,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocDeleteAssistDataReqMsgT_v02, deleteClockInfoMask),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocDeleteAssistDataReqMsgT_v02, deleteBdsSvInfoList) - QMI_IDL_OFFSET16RELATIVE(qmiLocDeleteAssistDataReqMsgT_v02, deleteBdsSvInfoList_valid)),
-  0x14,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocDeleteAssistDataReqMsgT_v02, deleteBdsSvInfoList),
-  QMI_LOC_DELETE_MAX_BDS_SV_INFO_LENGTH_V02,
-  QMI_IDL_OFFSET16RELATIVE(qmiLocDeleteAssistDataReqMsgT_v02, deleteBdsSvInfoList) - QMI_IDL_OFFSET16RELATIVE(qmiLocDeleteAssistDataReqMsgT_v02, deleteBdsSvInfoList_len),
-  QMI_IDL_TYPE88(0, 40)
-};
-
-static const uint8_t qmiLocDeleteAssistDataIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteAssistDataIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocSetXtraTSessionControlReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetXtraTSessionControlReqMsgT_v02, xtraTSessionControl)
-};
-
-static const uint8_t qmiLocSetXtraTSessionControlIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetXtraTSessionControlIndMsgT_v02, status)
-};
-
-/*
- * qmiLocGetXtraTSessionControlReqMsgT is empty
- * static const uint8_t qmiLocGetXtraTSessionControlReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetXtraTSessionControlIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetXtraTSessionControlIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetXtraTSessionControlIndMsgT_v02, xtraTSessionControl) - QMI_IDL_OFFSET8(qmiLocGetXtraTSessionControlIndMsgT_v02, xtraTSessionControl_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetXtraTSessionControlIndMsgT_v02, xtraTSessionControl)
-};
-
-static const uint8_t qmiLocInjectWifiPositionReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectWifiPositionReqMsgT_v02, wifiFixTime) - QMI_IDL_OFFSET8(qmiLocInjectWifiPositionReqMsgT_v02, wifiFixTime_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInjectWifiPositionReqMsgT_v02, wifiFixTime),
-  QMI_IDL_TYPE88(0, 26),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectWifiPositionReqMsgT_v02, wifiFixPosition) - QMI_IDL_OFFSET8(qmiLocInjectWifiPositionReqMsgT_v02, wifiFixPosition_valid)),
-  0x11,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInjectWifiPositionReqMsgT_v02, wifiFixPosition),
-  QMI_IDL_TYPE88(0, 27),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectWifiPositionReqMsgT_v02, apInfo) - QMI_IDL_OFFSET8(qmiLocInjectWifiPositionReqMsgT_v02, apInfo_valid)),
-  0x12,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInjectWifiPositionReqMsgT_v02, apInfo),
-  QMI_LOC_WIFI_MAX_REPORTED_APS_PER_MSG_V02,
-  QMI_IDL_OFFSET8(qmiLocInjectWifiPositionReqMsgT_v02, apInfo) - QMI_IDL_OFFSET8(qmiLocInjectWifiPositionReqMsgT_v02, apInfo_len),
-  QMI_IDL_TYPE88(0, 28),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocInjectWifiPositionReqMsgT_v02, horizontalReliability) - QMI_IDL_OFFSET16RELATIVE(qmiLocInjectWifiPositionReqMsgT_v02, horizontalReliability_valid)),
-  0x13,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocInjectWifiPositionReqMsgT_v02, horizontalReliability),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocInjectWifiPositionReqMsgT_v02, rawHepe) - QMI_IDL_OFFSET16RELATIVE(qmiLocInjectWifiPositionReqMsgT_v02, rawHepe_valid)),
-  0x14,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocInjectWifiPositionReqMsgT_v02, rawHepe)
-};
-
-static const uint8_t qmiLocInjectWifiPositionIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectWifiPositionIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocNotifyWifiStatusReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNotifyWifiStatusReqMsgT_v02, wifiStatus)
-};
-
-static const uint8_t qmiLocNotifyWifiStatusIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNotifyWifiStatusIndMsgT_v02, status)
-};
-
-/*
- * qmiLocGetRegisteredEventsReqMsgT is empty
- * static const uint8_t qmiLocGetRegisteredEventsReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetRegisteredEventsIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetRegisteredEventsIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetRegisteredEventsIndMsgT_v02, eventRegMask) - QMI_IDL_OFFSET8(qmiLocGetRegisteredEventsIndMsgT_v02, eventRegMask_valid)),
-  0x10,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetRegisteredEventsIndMsgT_v02, eventRegMask)
-};
-
-static const uint8_t qmiLocSetOperationModeReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetOperationModeReqMsgT_v02, operationMode)
-};
-
-static const uint8_t qmiLocSetOperationModeIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetOperationModeIndMsgT_v02, status)
-};
-
-/*
- * qmiLocGetOperationModeReqMsgT is empty
- * static const uint8_t qmiLocGetOperationModeReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetOperationModeIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetOperationModeIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetOperationModeIndMsgT_v02, operationMode) - QMI_IDL_OFFSET8(qmiLocGetOperationModeIndMsgT_v02, operationMode_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetOperationModeIndMsgT_v02, operationMode)
-};
-
-static const uint8_t qmiLocSetSpiStatusReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSpiStatusReqMsgT_v02, stationary),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSpiStatusReqMsgT_v02, confidenceStationary) - QMI_IDL_OFFSET8(qmiLocSetSpiStatusReqMsgT_v02, confidenceStationary_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSpiStatusReqMsgT_v02, confidenceStationary)
-};
-
-static const uint8_t qmiLocSetSpiStatusIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSpiStatusIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocInjectSensorDataReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectSensorDataReqMsgT_v02, opaqueIdentifier) - QMI_IDL_OFFSET8(qmiLocInjectSensorDataReqMsgT_v02, opaqueIdentifier_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSensorDataReqMsgT_v02, opaqueIdentifier),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectSensorDataReqMsgT_v02, threeAxisAccelData) - QMI_IDL_OFFSET8(qmiLocInjectSensorDataReqMsgT_v02, threeAxisAccelData_valid)),
-  0x11,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInjectSensorDataReqMsgT_v02, threeAxisAccelData),
-  QMI_IDL_TYPE88(0, 30),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocInjectSensorDataReqMsgT_v02, threeAxisGyroData) - QMI_IDL_OFFSET16RELATIVE(qmiLocInjectSensorDataReqMsgT_v02, threeAxisGyroData_valid)),
-  0x12,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocInjectSensorDataReqMsgT_v02, threeAxisGyroData),
-  QMI_IDL_TYPE88(0, 30),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocInjectSensorDataReqMsgT_v02, threeAxisAccelDataTimeSource) - QMI_IDL_OFFSET16RELATIVE(qmiLocInjectSensorDataReqMsgT_v02, threeAxisAccelDataTimeSource_valid)),
-  0x13,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocInjectSensorDataReqMsgT_v02, threeAxisAccelDataTimeSource),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocInjectSensorDataReqMsgT_v02, threeAxisGyroDataTimeSource) - QMI_IDL_OFFSET16RELATIVE(qmiLocInjectSensorDataReqMsgT_v02, threeAxisGyroDataTimeSource_valid)),
-  0x14,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocInjectSensorDataReqMsgT_v02, threeAxisGyroDataTimeSource),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocInjectSensorDataReqMsgT_v02, accelTemperatureData) - QMI_IDL_OFFSET16RELATIVE(qmiLocInjectSensorDataReqMsgT_v02, accelTemperatureData_valid)),
-  0x15,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocInjectSensorDataReqMsgT_v02, accelTemperatureData),
-  QMI_IDL_TYPE88(0, 37),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocInjectSensorDataReqMsgT_v02, gyroTemperatureData) - QMI_IDL_OFFSET16RELATIVE(qmiLocInjectSensorDataReqMsgT_v02, gyroTemperatureData_valid)),
-  0x16,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocInjectSensorDataReqMsgT_v02, gyroTemperatureData),
-  QMI_IDL_TYPE88(0, 37)
-};
-
-static const uint8_t qmiLocInjectSensorDataIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, opaqueIdentifier) - QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, opaqueIdentifier_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, opaqueIdentifier),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, threeAxisAccelSamplesAccepted) - QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, threeAxisAccelSamplesAccepted_valid)),
-  0x11,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, threeAxisAccelSamplesAccepted),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, threeAxisGyroSamplesAccepted) - QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, threeAxisGyroSamplesAccepted_valid)),
-  0x12,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, threeAxisGyroSamplesAccepted),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, accelTemperatureSamplesAccepted) - QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, accelTemperatureSamplesAccepted_valid)),
-  0x13,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, accelTemperatureSamplesAccepted),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, gyroTemperatureSamplesAccepted) - QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, gyroTemperatureSamplesAccepted_valid)),
-  0x14,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSensorDataIndMsgT_v02, gyroTemperatureSamplesAccepted)
-};
-
-static const uint8_t qmiLocInjectTimeSyncDataReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectTimeSyncDataReqMsgT_v02, refCounter),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectTimeSyncDataReqMsgT_v02, sensorProcRxTime),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x03,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectTimeSyncDataReqMsgT_v02, sensorProcTxTime)
-};
-
-static const uint8_t qmiLocInjectTimeSyncDataIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectTimeSyncDataIndMsgT_v02, status)
-};
-
-/*
- * qmiLocGetCradleMountConfigReqMsgT is empty
- * static const uint8_t qmiLocGetCradleMountConfigReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetCradleMountConfigIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetCradleMountConfigIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetCradleMountConfigIndMsgT_v02, cradleMountState) - QMI_IDL_OFFSET8(qmiLocGetCradleMountConfigIndMsgT_v02, cradleMountState_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetCradleMountConfigIndMsgT_v02, cradleMountState),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetCradleMountConfigIndMsgT_v02, confidenceCradleMountState) - QMI_IDL_OFFSET8(qmiLocGetCradleMountConfigIndMsgT_v02, confidenceCradleMountState_valid)),
-  0x11,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetCradleMountConfigIndMsgT_v02, confidenceCradleMountState)
-};
-
-static const uint8_t qmiLocSetCradleMountConfigReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetCradleMountConfigReqMsgT_v02, cradleMountState),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetCradleMountConfigReqMsgT_v02, confidenceCradleMountState) - QMI_IDL_OFFSET8(qmiLocSetCradleMountConfigReqMsgT_v02, confidenceCradleMountState_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetCradleMountConfigReqMsgT_v02, confidenceCradleMountState)
-};
-
-static const uint8_t qmiLocSetCradleMountConfigIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetCradleMountConfigIndMsgT_v02, status)
-};
-
-/*
- * qmiLocGetExternalPowerConfigReqMsgT is empty
- * static const uint8_t qmiLocGetExternalPowerConfigReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetExternalPowerConfigIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetExternalPowerConfigIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetExternalPowerConfigIndMsgT_v02, externalPowerState) - QMI_IDL_OFFSET8(qmiLocGetExternalPowerConfigIndMsgT_v02, externalPowerState_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetExternalPowerConfigIndMsgT_v02, externalPowerState)
-};
-
-static const uint8_t qmiLocSetExternalPowerConfigReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetExternalPowerConfigReqMsgT_v02, externalPowerState)
-};
-
-static const uint8_t qmiLocSetExternalPowerConfigIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetExternalPowerConfigIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocInformLocationServerConnStatusReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInformLocationServerConnStatusReqMsgT_v02, connHandle),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInformLocationServerConnStatusReqMsgT_v02, requestType),
-
-  0x03,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInformLocationServerConnStatusReqMsgT_v02, statusType),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInformLocationServerConnStatusReqMsgT_v02, apnProfile) - QMI_IDL_OFFSET8(qmiLocInformLocationServerConnStatusReqMsgT_v02, apnProfile_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInformLocationServerConnStatusReqMsgT_v02, apnProfile),
-  QMI_IDL_TYPE88(0, 31)
-};
-
-static const uint8_t qmiLocInformLocationServerConnStatusIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInformLocationServerConnStatusIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocSetProtocolConfigParametersReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplSecurity) - QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplSecurity_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplSecurity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, vxVersion) - QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, vxVersion_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, vxVersion),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplVersion) - QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplVersion_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplVersion),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, lppConfig) - QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, lppConfig_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, lppConfig),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, assistedGlonassProtocolMask) - QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, assistedGlonassProtocolMask_valid)),
-  0x14,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, assistedGlonassProtocolMask),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplHashAlgo) - QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplHashAlgo_valid)),
-  0x15,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplHashAlgo),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplTlsVersion) - QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplTlsVersion_valid)),
-  0x16,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, suplTlsVersion),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, emergencyProtocol) - QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, emergencyProtocol_valid)),
-  0x17,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, emergencyProtocol),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, wifiScanInjectTimeout) - QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, wifiScanInjectTimeout_valid)),
-  0x18,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersReqMsgT_v02, wifiScanInjectTimeout)
-};
-
-static const uint8_t qmiLocSetProtocolConfigParametersIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersIndMsgT_v02, failedProtocolConfigParamMask) - QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersIndMsgT_v02, failedProtocolConfigParamMask_valid)),
-  0x10,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetProtocolConfigParametersIndMsgT_v02, failedProtocolConfigParamMask)
-};
-
-static const uint8_t qmiLocGetProtocolConfigParametersReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersReqMsgT_v02, getProtocolConfigParamMask)
-};
-
-static const uint8_t qmiLocGetProtocolConfigParametersIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplSecurity) - QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplSecurity_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplSecurity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, vxVersion) - QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, vxVersion_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, vxVersion),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplVersion) - QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplVersion_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplVersion),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, lppConfig) - QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, lppConfig_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, lppConfig),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, assistedGlonassProtocolMask) - QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, assistedGlonassProtocolMask_valid)),
-  0x14,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, assistedGlonassProtocolMask),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplHashAlgo) - QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplHashAlgo_valid)),
-  0x15,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplHashAlgo),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplTlsVersion) - QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplTlsVersion_valid)),
-  0x16,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, suplTlsVersion),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, emergencyProtocol) - QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, emergencyProtocol_valid)),
-  0x17,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, emergencyProtocol),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, wifiScanInjectTimeout) - QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, wifiScanInjectTimeout_valid)),
-  0x18,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetProtocolConfigParametersIndMsgT_v02, wifiScanInjectTimeout)
-};
-
-static const uint8_t qmiLocSetSensorControlConfigReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorControlConfigReqMsgT_v02, sensorsUsage) - QMI_IDL_OFFSET8(qmiLocSetSensorControlConfigReqMsgT_v02, sensorsUsage_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorControlConfigReqMsgT_v02, sensorsUsage),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorControlConfigReqMsgT_v02, sensorProvider) - QMI_IDL_OFFSET8(qmiLocSetSensorControlConfigReqMsgT_v02, sensorProvider_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorControlConfigReqMsgT_v02, sensorProvider)
-};
-
-static const uint8_t qmiLocSetSensorControlConfigIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorControlConfigIndMsgT_v02, status)
-};
-
-/*
- * qmiLocGetSensorControlConfigReqMsgT is empty
- * static const uint8_t qmiLocGetSensorControlConfigReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetSensorControlConfigIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorControlConfigIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorControlConfigIndMsgT_v02, sensorsUsage) - QMI_IDL_OFFSET8(qmiLocGetSensorControlConfigIndMsgT_v02, sensorsUsage_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorControlConfigIndMsgT_v02, sensorsUsage),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorControlConfigIndMsgT_v02, sensorProvider) - QMI_IDL_OFFSET8(qmiLocGetSensorControlConfigIndMsgT_v02, sensorProvider_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorControlConfigIndMsgT_v02, sensorProvider)
-};
-
-static const uint8_t qmiLocSetSensorPropertiesReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, gyroBiasVarianceRandomWalk) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, gyroBiasVarianceRandomWalk_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, gyroBiasVarianceRandomWalk),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, velocityRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, velocityRandomWalkSpectralDensity_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, velocityRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, accelerationRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, accelerationRandomWalkSpectralDensity_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, accelerationRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, angleRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, angleRandomWalkSpectralDensity_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, angleRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, rateRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, rateRandomWalkSpectralDensity_valid)),
-  0x14,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, rateRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleDataUse) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleDataUse_valid)),
-  0x15,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleDataUse),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleVelocityRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleVelocityRandomWalkSpectralDensity_valid)),
-  0x16,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleVelocityRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleAccelRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleAccelRandomWalkSpectralDensity_valid)),
-  0x17,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleAccelRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleAngleRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleAngleRandomWalkSpectralDensity_valid)),
-  0x18,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleAngleRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleAngularRateRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleAngularRateRandomWalkSpectralDensity_valid)),
-  0x19,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleAngularRateRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleOdometryScaleFactorRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleOdometryScaleFactorRandomWalkSpectralDensity_valid)),
-  0x1A,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleOdometryScaleFactorRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleOdometryVariance) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleOdometryVariance_valid)),
-  0x1B,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesReqMsgT_v02, vehicleOdometryVariance)
-};
-
-static const uint8_t qmiLocSetSensorPropertiesIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesIndMsgT_v02, failedSensorPropertiesMask) - QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesIndMsgT_v02, failedSensorPropertiesMask_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPropertiesIndMsgT_v02, failedSensorPropertiesMask)
-};
-
-static const uint8_t qmiLocGetSensorPropertiesReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesReqMsgT_v02, getSensorPropertiesMask)
-};
-
-static const uint8_t qmiLocGetSensorPropertiesIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, gyroBiasVarianceRandomWalk) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, gyroBiasVarianceRandomWalk_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, gyroBiasVarianceRandomWalk),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, velocityRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, velocityRandomWalkSpectralDensity_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, velocityRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, accelerationRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, accelerationRandomWalkSpectralDensity_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, accelerationRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, angleRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, angleRandomWalkSpectralDensity_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, angleRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, rateRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, rateRandomWalkSpectralDensity_valid)),
-  0x14,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, rateRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleDataUse) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleDataUse_valid)),
-  0x15,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleDataUse),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleVelocityRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleVelocityRandomWalkSpectralDensity_valid)),
-  0x16,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleVelocityRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleAccelRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleAccelRandomWalkSpectralDensity_valid)),
-  0x17,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleAccelRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleAngleRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleAngleRandomWalkSpectralDensity_valid)),
-  0x18,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleAngleRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleAngularRateRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleAngularRateRandomWalkSpectralDensity_valid)),
-  0x19,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleAngularRateRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleOdometryScaleFactorRandomWalkSpectralDensity) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleOdometryScaleFactorRandomWalkSpectralDensity_valid)),
-  0x1A,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleOdometryScaleFactorRandomWalkSpectralDensity),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleOdometryVariance) - QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleOdometryVariance_valid)),
-  0x1B,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPropertiesIndMsgT_v02, vehicleOdometryVariance)
-};
-
-static const uint8_t qmiLocSetSensorPerformanceControlConfigReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, performanceControlMode) - QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, performanceControlMode_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, performanceControlMode),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, accelSamplingSpec) - QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, accelSamplingSpec_valid)),
-  0x11,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, accelSamplingSpec),
-  QMI_IDL_TYPE88(0, 20),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, gyroSamplingSpec) - QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, gyroSamplingSpec_valid)),
-  0x12,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, gyroSamplingSpec),
-  QMI_IDL_TYPE88(0, 20),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, algorithmConfig) - QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, algorithmConfig_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, algorithmConfig),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, accelSamplingSpecHigh) - QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, accelSamplingSpecHigh_valid)),
-  0x14,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, accelSamplingSpecHigh),
-  QMI_IDL_TYPE88(0, 20),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, gyroSamplingSpecHigh) - QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, gyroSamplingSpecHigh_valid)),
-  0x15,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02, gyroSamplingSpecHigh),
-  QMI_IDL_TYPE88(0, 20)
-};
-
-static const uint8_t qmiLocSetSensorPerformanceControlConfigIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigIndMsgT_v02, failedConfiguration) - QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigIndMsgT_v02, failedConfiguration_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetSensorPerformanceControlConfigIndMsgT_v02, failedConfiguration)
-};
-
-/*
- * qmiLocGetSensorPerformanceControlConfigReqMsgT is empty
- * static const uint8_t qmiLocGetSensorPerformanceControlConfigReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocGetSensorPerformanceControlConfigIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, performanceControlMode) - QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, performanceControlMode_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, performanceControlMode),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, accelSamplingSpec) - QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, accelSamplingSpec_valid)),
-  0x11,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, accelSamplingSpec),
-  QMI_IDL_TYPE88(0, 20),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, gyroSamplingSpec) - QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, gyroSamplingSpec_valid)),
-  0x12,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, gyroSamplingSpec),
-  QMI_IDL_TYPE88(0, 20),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, algorithmConfig) - QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, algorithmConfig_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, algorithmConfig),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, accelSamplingSpecHigh) - QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, accelSamplingSpecHigh_valid)),
-  0x14,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, accelSamplingSpecHigh),
-  QMI_IDL_TYPE88(0, 20),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, gyroSamplingSpecHigh) - QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, gyroSamplingSpecHigh_valid)),
-  0x15,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02, gyroSamplingSpecHigh),
-  QMI_IDL_TYPE88(0, 20)
-};
-
-static const uint8_t qmiLocInjectSuplCertificateReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSuplCertificateReqMsgT_v02, suplCertId),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN | QMI_IDL_FLAGS_SZ_IS_16 |   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSuplCertificateReqMsgT_v02, suplCertData),
-  ((QMI_LOC_MAX_SUPL_CERT_LENGTH_V02) & 0xFF), ((QMI_LOC_MAX_SUPL_CERT_LENGTH_V02) >> 8),
-  QMI_IDL_OFFSET8(qmiLocInjectSuplCertificateReqMsgT_v02, suplCertData) - QMI_IDL_OFFSET8(qmiLocInjectSuplCertificateReqMsgT_v02, suplCertData_len)
-};
-
-static const uint8_t qmiLocInjectSuplCertificateIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSuplCertificateIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocDeleteSuplCertificateReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocDeleteSuplCertificateReqMsgT_v02, suplCertId) - QMI_IDL_OFFSET8(qmiLocDeleteSuplCertificateReqMsgT_v02, suplCertId_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteSuplCertificateReqMsgT_v02, suplCertId)
-};
-
-static const uint8_t qmiLocDeleteSuplCertificateIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteSuplCertificateIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocSetPositionEngineConfigParametersReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, injectedPositionControl) - QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, injectedPositionControl_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, injectedPositionControl),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, filterSvUsage) - QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, filterSvUsage_valid)),
-  0x11,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, filterSvUsage),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, storeAssistData) - QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, storeAssistData_valid)),
-  0x12,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, storeAssistData),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, enableFasterTTFF) - QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, enableFasterTTFF_valid)),
-  0x13,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersReqMsgT_v02, enableFasterTTFF)
-};
-
-static const uint8_t qmiLocSetPositionEngineConfigParametersIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersIndMsgT_v02, failedPositionEngineConfigParamMask) - QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersIndMsgT_v02, failedPositionEngineConfigParamMask_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetPositionEngineConfigParametersIndMsgT_v02, failedPositionEngineConfigParamMask)
-};
-
-static const uint8_t qmiLocGetPositionEngineConfigParametersReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersReqMsgT_v02, getPositionEngineConfigParamMask)
-};
-
-static const uint8_t qmiLocGetPositionEngineConfigParametersIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, injectedPositionControl) - QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, injectedPositionControl_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, injectedPositionControl),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, filterSvUsage) - QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, filterSvUsage_valid)),
-  0x11,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, filterSvUsage),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, storeAssistData) - QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, storeAssistData_valid)),
-  0x12,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, storeAssistData),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, enableFasterTTFF) - QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, enableFasterTTFF_valid)),
-  0x13,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetPositionEngineConfigParametersIndMsgT_v02, enableFasterTTFF)
-};
-
-static const uint8_t qmiLocAddCircularGeofenceReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceReqMsgT_v02, transactionId),
-
-  0x02,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceReqMsgT_v02, circularGeofenceArgs),
-  QMI_IDL_TYPE88(0, 32),
-
-  0x03,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceReqMsgT_v02, breachMask),
-
-  0x04,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceReqMsgT_v02, includePosition),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceReqMsgT_v02, responsiveness) - QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceReqMsgT_v02, responsiveness_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceReqMsgT_v02, responsiveness),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceReqMsgT_v02, confidence) - QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceReqMsgT_v02, confidence_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceReqMsgT_v02, confidence)
-};
-
-static const uint8_t qmiLocAddCircularGeofenceIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceIndMsgT_v02, transactionId) - QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceIndMsgT_v02, transactionId_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceIndMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceIndMsgT_v02, geofenceId) - QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceIndMsgT_v02, geofenceId_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocAddCircularGeofenceIndMsgT_v02, geofenceId)
-};
-
-static const uint8_t qmiLocDeleteGeofenceReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteGeofenceReqMsgT_v02, geofenceId),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteGeofenceReqMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocDeleteGeofenceIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteGeofenceIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocDeleteGeofenceIndMsgT_v02, geofenceId) - QMI_IDL_OFFSET8(qmiLocDeleteGeofenceIndMsgT_v02, geofenceId_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteGeofenceIndMsgT_v02, geofenceId),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocDeleteGeofenceIndMsgT_v02, transactionId) - QMI_IDL_OFFSET8(qmiLocDeleteGeofenceIndMsgT_v02, transactionId_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocDeleteGeofenceIndMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocQueryGeofenceReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocQueryGeofenceReqMsgT_v02, geofenceId),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocQueryGeofenceReqMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocQueryGeofenceIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, geofenceId) - QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, geofenceId_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, geofenceId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, transactionId) - QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, transactionId_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, geofenceOrigin) - QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, geofenceOrigin_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, geofenceOrigin),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, posWrtGeofence) - QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, posWrtGeofence_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, posWrtGeofence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, circularGeofenceArgs) - QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, circularGeofenceArgs_valid)),
-  0x14,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, circularGeofenceArgs),
-  QMI_IDL_TYPE88(0, 32),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, geofenceState) - QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, geofenceState_valid)),
-  0x15,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocQueryGeofenceIndMsgT_v02, geofenceState)
-};
-
-static const uint8_t qmiLocEditGeofenceReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEditGeofenceReqMsgT_v02, geofenceId),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEditGeofenceReqMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEditGeofenceReqMsgT_v02, geofenceState) - QMI_IDL_OFFSET8(qmiLocEditGeofenceReqMsgT_v02, geofenceState_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEditGeofenceReqMsgT_v02, geofenceState),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEditGeofenceReqMsgT_v02, breachMask) - QMI_IDL_OFFSET8(qmiLocEditGeofenceReqMsgT_v02, breachMask_valid)),
-  0x11,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEditGeofenceReqMsgT_v02, breachMask),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEditGeofenceReqMsgT_v02, responsiveness) - QMI_IDL_OFFSET8(qmiLocEditGeofenceReqMsgT_v02, responsiveness_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEditGeofenceReqMsgT_v02, responsiveness)
-};
-
-static const uint8_t qmiLocEditGeofenceIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEditGeofenceIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEditGeofenceIndMsgT_v02, geofenceId) - QMI_IDL_OFFSET8(qmiLocEditGeofenceIndMsgT_v02, geofenceId_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEditGeofenceIndMsgT_v02, geofenceId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEditGeofenceIndMsgT_v02, transactionId) - QMI_IDL_OFFSET8(qmiLocEditGeofenceIndMsgT_v02, transactionId_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEditGeofenceIndMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEditGeofenceIndMsgT_v02, failedParams) - QMI_IDL_OFFSET8(qmiLocEditGeofenceIndMsgT_v02, failedParams_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEditGeofenceIndMsgT_v02, failedParams)
-};
-
-static const uint8_t qmiLocGetBestAvailablePositionReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionReqMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocGetBestAvailablePositionIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, transactionId) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, transactionId_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, latitude) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, latitude_valid)),
-  0x11,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, latitude),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, longitude) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, longitude_valid)),
-  0x12,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, longitude),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncCircular) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncCircular_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncCircular),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, altitudeWrtEllipsoid) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, altitudeWrtEllipsoid_valid)),
-  0x14,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, altitudeWrtEllipsoid),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertUnc) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertUnc_valid)),
-  0x15,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, timestampUtc) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, timestampUtc_valid)),
-  0x16,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, timestampUtc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, timeUnc) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, timeUnc_valid)),
-  0x17,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, timeUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncEllipseSemiMinor) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncEllipseSemiMinor_valid)),
-  0x18,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncEllipseSemiMinor),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncEllipseSemiMajor) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncEllipseSemiMajor_valid)),
-  0x19,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncEllipseSemiMajor),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncEllipseOrientAzimuth) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncEllipseOrientAzimuth_valid)),
-  0x1A,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horUncEllipseOrientAzimuth),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horCircularConfidence) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horCircularConfidence_valid)),
-  0x1B,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horCircularConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horEllipticalConfidence) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horEllipticalConfidence_valid)),
-  0x1C,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horEllipticalConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horReliability) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horReliability_valid)),
-  0x1D,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horReliability),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horSpeed) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horSpeed_valid)),
-  0x1E,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horSpeed),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horSpeedUnc) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horSpeedUnc_valid)),
-  0x1F,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, horSpeedUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, altitudeWrtMeanSeaLevel) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, altitudeWrtMeanSeaLevel_valid)),
-  0x20,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, altitudeWrtMeanSeaLevel),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertConfidence) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertConfidence_valid)),
-  0x21,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertReliability) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertReliability_valid)),
-  0x22,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertReliability),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertSpeed) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertSpeed_valid)),
-  0x23,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertSpeed),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertSpeedUnc) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertSpeedUnc_valid)),
-  0x24,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, vertSpeedUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, heading) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, heading_valid)),
-  0x25,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, heading),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, headingUnc) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, headingUnc_valid)),
-  0x26,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, headingUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, magneticDeviation) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, magneticDeviation_valid)),
-  0x27,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, magneticDeviation),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, technologyMask) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, technologyMask_valid)),
-  0x28,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, technologyMask),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, DOP) - QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, DOP_valid)),
-  0x29,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetBestAvailablePositionIndMsgT_v02, DOP),
-  QMI_IDL_TYPE88(0, 2),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocGetBestAvailablePositionIndMsgT_v02, gpsTime) - QMI_IDL_OFFSET16RELATIVE(qmiLocGetBestAvailablePositionIndMsgT_v02, gpsTime_valid)),
-  0x2A,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocGetBestAvailablePositionIndMsgT_v02, gpsTime),
-  QMI_IDL_TYPE88(0, 1),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocGetBestAvailablePositionIndMsgT_v02, timeSrc) - QMI_IDL_OFFSET16RELATIVE(qmiLocGetBestAvailablePositionIndMsgT_v02, timeSrc_valid)),
-  0x2B,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocGetBestAvailablePositionIndMsgT_v02, timeSrc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocGetBestAvailablePositionIndMsgT_v02, sensorDataUsage) - QMI_IDL_OFFSET16RELATIVE(qmiLocGetBestAvailablePositionIndMsgT_v02, sensorDataUsage_valid)),
-  0x2C,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocGetBestAvailablePositionIndMsgT_v02, sensorDataUsage),
-  QMI_IDL_TYPE88(0, 3),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocGetBestAvailablePositionIndMsgT_v02, gnssSvUsedList) - QMI_IDL_OFFSET16RELATIVE(qmiLocGetBestAvailablePositionIndMsgT_v02, gnssSvUsedList_valid)),
-  0x2D,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocGetBestAvailablePositionIndMsgT_v02, gnssSvUsedList),
-  QMI_LOC_MAX_SV_USED_LIST_LENGTH_V02,
-  QMI_IDL_OFFSET16RELATIVE(qmiLocGetBestAvailablePositionIndMsgT_v02, gnssSvUsedList) - QMI_IDL_OFFSET16RELATIVE(qmiLocGetBestAvailablePositionIndMsgT_v02, gnssSvUsedList_len)
-};
-
-static const uint8_t qmiLocInjectMotionDataReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInjectMotionDataReqMsgT_v02, motion_data),
-  QMI_IDL_TYPE88(0, 33)
-};
-
-static const uint8_t qmiLocInjectMotionDataIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectMotionDataIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocGetNiGeofenceIdListReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetNiGeofenceIdListReqMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocGetNiGeofenceIdListIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetNiGeofenceIdListIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetNiGeofenceIdListIndMsgT_v02, transactionId) - QMI_IDL_OFFSET8(qmiLocGetNiGeofenceIdListIndMsgT_v02, transactionId_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetNiGeofenceIdListIndMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetNiGeofenceIdListIndMsgT_v02, niGeofenceIdList) - QMI_IDL_OFFSET8(qmiLocGetNiGeofenceIdListIndMsgT_v02, niGeofenceIdList_valid)),
-  0x11,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetNiGeofenceIdListIndMsgT_v02, niGeofenceIdList),
-  QMI_LOC_MAX_NI_GEOFENCE_ID_LIST_LENGTH_V02,
-  QMI_IDL_OFFSET8(qmiLocGetNiGeofenceIdListIndMsgT_v02, niGeofenceIdList) - QMI_IDL_OFFSET8(qmiLocGetNiGeofenceIdListIndMsgT_v02, niGeofenceIdList_len)
-};
-
-static const uint8_t qmiLocInjectGSMCellInfoReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInjectGSMCellInfoReqMsgT_v02, gsmCellId),
-  QMI_IDL_TYPE88(0, 34),
-
-  0x02,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectGSMCellInfoReqMsgT_v02, roamingStatus),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectGSMCellInfoReqMsgT_v02, timingAdvance) - QMI_IDL_OFFSET8(qmiLocInjectGSMCellInfoReqMsgT_v02, timingAdvance_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectGSMCellInfoReqMsgT_v02, timingAdvance)
-};
-
-static const uint8_t qmiLocInjectGSMCellInfoIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectGSMCellInfoIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocInjectNetworkInitiatedMessageReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectNetworkInitiatedMessageReqMsgT_v02, injectedNIMessageType),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN | QMI_IDL_FLAGS_SZ_IS_16 |   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectNetworkInitiatedMessageReqMsgT_v02, injectedNIMessage),
-  ((QMI_LOC_MAX_INJECTED_NETWORK_INITIATED_MESSAGE_LENGTH_V02) & 0xFF), ((QMI_LOC_MAX_INJECTED_NETWORK_INITIATED_MESSAGE_LENGTH_V02) >> 8),
-  QMI_IDL_OFFSET8(qmiLocInjectNetworkInitiatedMessageReqMsgT_v02, injectedNIMessage) - QMI_IDL_OFFSET8(qmiLocInjectNetworkInitiatedMessageReqMsgT_v02, injectedNIMessage_len)
-};
-
-static const uint8_t qmiLocInjectNetworkInitiatedMessageIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectNetworkInitiatedMessageIndMsgT_v02, status)
-};
-
-/*
- * qmiLocWWANOutOfServiceNotificationReqMsgT is empty
- * static const uint8_t qmiLocWWANOutOfServiceNotificationReqMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocWWANOutOfServiceNotificationIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocWWANOutOfServiceNotificationIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocEventPedometerControlIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPedometerControlIndMsgT_v02, requestPedometerData),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPedometerControlIndMsgT_v02, resetStepCount) - QMI_IDL_OFFSET8(qmiLocEventPedometerControlIndMsgT_v02, resetStepCount_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPedometerControlIndMsgT_v02, resetStepCount),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventPedometerControlIndMsgT_v02, stepCountThreshold) - QMI_IDL_OFFSET8(qmiLocEventPedometerControlIndMsgT_v02, stepCountThreshold_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventPedometerControlIndMsgT_v02, stepCountThreshold)
-};
-
-static const uint8_t qmiLocEventMotionDataControlIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventMotionDataControlIndMsgT_v02, requestMotionData)
-};
-
-static const uint8_t qmiLocPedometerReportReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, timeSource),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, timestamp),
-
-  0x03,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, timeInterval),
-
-  0x04,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, stepCount),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, stepConfidence) - QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, stepConfidence_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, stepConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, stepCountUncertainty) - QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, stepCountUncertainty_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, stepCountUncertainty),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, stepRate) - QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, stepRate_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPedometerReportReqMsgT_v02, stepRate)
-};
-
-static const uint8_t qmiLocPedometerReportIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocPedometerReportIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocInjectWCDMACellInfoReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInjectWCDMACellInfoReqMsgT_v02, wcdmaCellId),
-  QMI_IDL_TYPE88(0, 38),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectWCDMACellInfoReqMsgT_v02, roamingStatus),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectWCDMACellInfoReqMsgT_v02, freq) - QMI_IDL_OFFSET8(qmiLocInjectWCDMACellInfoReqMsgT_v02, freq_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectWCDMACellInfoReqMsgT_v02, freq),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectWCDMACellInfoReqMsgT_v02, psc) - QMI_IDL_OFFSET8(qmiLocInjectWCDMACellInfoReqMsgT_v02, psc_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectWCDMACellInfoReqMsgT_v02, psc)
-};
-
-static const uint8_t qmiLocInjectWCDMACellInfoIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectWCDMACellInfoIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocInjectTDSCDMACellInfoReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInjectTDSCDMACellInfoReqMsgT_v02, tdscdmaCellId),
-  QMI_IDL_TYPE88(0, 39),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectTDSCDMACellInfoReqMsgT_v02, roamingStatus),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectTDSCDMACellInfoReqMsgT_v02, freq) - QMI_IDL_OFFSET8(qmiLocInjectTDSCDMACellInfoReqMsgT_v02, freq_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectTDSCDMACellInfoReqMsgT_v02, freq)
-};
-
-static const uint8_t qmiLocInjectTDSCDMACellInfoIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectTDSCDMACellInfoIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocInjectSubscriberIDReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectSubscriberIDReqMsgT_v02, preferredIMSI) - QMI_IDL_OFFSET8(qmiLocInjectSubscriberIDReqMsgT_v02, preferredIMSI_valid)),
-  0x10,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSubscriberIDReqMsgT_v02, preferredIMSI),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectSubscriberIDReqMsgT_v02, preferredMSISDN) - QMI_IDL_OFFSET8(qmiLocInjectSubscriberIDReqMsgT_v02, preferredMSISDN_valid)),
-  0x11,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSubscriberIDReqMsgT_v02, preferredMSISDN)
-};
-
-static const uint8_t qmiLocInjectSubscriberIDIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectSubscriberIDIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocSetGeofenceEngineConfigReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, gnssUnavailableIndicationTimeout) - QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, gnssUnavailableIndicationTimeout_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, gnssUnavailableIndicationTimeout),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, maxGeofences) - QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, maxGeofences_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, maxGeofences),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, enableMotionDetectionSources) - QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, enableMotionDetectionSources_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, enableMotionDetectionSources),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, enableCpiUsage) - QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, enableCpiUsage_valid)),
-  0x13,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, enableCpiUsage),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, gnssPositionSessionTimeout) - QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, gnssPositionSessionTimeout_valid)),
-  0x14,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, gnssPositionSessionTimeout),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, gnssPositionMaxPuncAcceptable) - QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, gnssPositionMaxPuncAcceptable_valid)),
-  0x15,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, gnssPositionMaxPuncAcceptable),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, mediumResponsivenessValue) - QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, mediumResponsivenessValue_valid)),
-  0x16,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, mediumResponsivenessValue),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, chalGnssEnvMinCpiWaitInterval) - QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, chalGnssEnvMinCpiWaitInterval_valid)),
-  0x17,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, chalGnssEnvMinCpiWaitInterval),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, motionStateInfo) - QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, motionStateInfo_valid)),
-  0x18,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, motionStateInfo),
-  QMI_LOC_GEOFENCE_MAX_MOTION_STATES_V02,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, motionStateInfo) - QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigReqMsgT_v02, motionStateInfo_len),
-  QMI_IDL_TYPE88(0, 48)
-};
-
-static const uint8_t qmiLocSetGeofenceEngineConfigIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigIndMsgT_v02, transactionId) - QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigIndMsgT_v02, transactionId_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGeofenceEngineConfigIndMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocGetGeofenceEngineConfigReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigReqMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocGetGeofenceEngineConfigIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, transactionId) - QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, transactionId_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, gnssUnavailableIndicationTimeout) - QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, gnssUnavailableIndicationTimeout_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, gnssUnavailableIndicationTimeout),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, maxGeofences) - QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, maxGeofences_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, maxGeofences),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, enabledMotionDetectionSources) - QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, enabledMotionDetectionSources_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, enabledMotionDetectionSources),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, enabledCpiUsage) - QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, enabledCpiUsage_valid)),
-  0x14,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetGeofenceEngineConfigIndMsgT_v02, enabledCpiUsage)
-};
-
-static const uint8_t qmiLocEventGeofenceBatchedBreachIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, breachType),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofenceIdContinuousList) - QMI_IDL_OFFSET8(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofenceIdContinuousList_valid)),
-  0x10,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofenceIdContinuousList),
-  QMI_LOC_MAX_GEOFENCE_ID_CONTINUOUS_LIST_LENGTH_V02,
-  QMI_IDL_OFFSET8(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofenceIdContinuousList) - QMI_IDL_OFFSET8(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofenceIdContinuousList_len),
-  QMI_IDL_TYPE88(0, 41),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofenceIdDiscreteList) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofenceIdDiscreteList_valid)),
-  0x11,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofenceIdDiscreteList),
-  QMI_LOC_MAX_GEOFENCE_ID_DISCRETE_LIST_LENGTH_V02,
-  QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofenceIdDiscreteList) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofenceIdDiscreteList_len),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofencePosition) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofencePosition_valid)),
-  0x12,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, geofencePosition),
-  QMI_IDL_TYPE88(0, 22),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, breachConfidence) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, breachConfidence_valid)),
-  0x13,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, breachConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, headingUnc) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, headingUnc_valid)),
-  0x14,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, headingUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, vertUnc) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, vertUnc_valid)),
-  0x15,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, vertUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, speedUnc) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, speedUnc_valid)),
-  0x16,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, speedUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, horConfidence) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, horConfidence_valid)),
-  0x17,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, horConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, vertConfidence) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, vertConfidence_valid)),
-  0x18,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, vertConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, DOP) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, DOP_valid)),
-  0x19,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, DOP),
-  QMI_IDL_TYPE88(0, 2),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, gnssSvUsedList) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, gnssSvUsedList_valid)),
-  0x1A,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, gnssSvUsedList),
-  QMI_LOC_MAX_SV_USED_LIST_LENGTH_V02,
-  QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, gnssSvUsedList) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGeofenceBatchedBreachIndMsgT_v02, gnssSvUsedList_len)
-};
-
-static const uint8_t qmiLocGetBatchSizeReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBatchSizeReqMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBatchSizeReqMsgT_v02, batchSize)
-};
-
-static const uint8_t qmiLocGetBatchSizeIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBatchSizeIndMsgT_v02, status),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBatchSizeIndMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x03,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetBatchSizeIndMsgT_v02, batchSize)
-};
-
-static const uint8_t qmiLocStartBatchingReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocStartBatchingReqMsgT_v02, minInterval) - QMI_IDL_OFFSET8(qmiLocStartBatchingReqMsgT_v02, minInterval_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStartBatchingReqMsgT_v02, minInterval),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocStartBatchingReqMsgT_v02, horizontalAccuracyLevel) - QMI_IDL_OFFSET8(qmiLocStartBatchingReqMsgT_v02, horizontalAccuracyLevel_valid)),
-  0x11,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStartBatchingReqMsgT_v02, horizontalAccuracyLevel),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocStartBatchingReqMsgT_v02, fixSessionTimeout) - QMI_IDL_OFFSET8(qmiLocStartBatchingReqMsgT_v02, fixSessionTimeout_valid)),
-  0x12,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStartBatchingReqMsgT_v02, fixSessionTimeout)
-};
-
-static const uint8_t qmiLocStartBatchingIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStartBatchingIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocEventBatchFullIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventBatchFullIndMsgT_v02, batchCount)
-};
-
-static const uint8_t qmiLocEventLiveBatchedPositionReportIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventLiveBatchedPositionReportIndMsgT_v02, liveBatchedReport),
-  QMI_IDL_TYPE88(0, 42)
-};
-
-static const uint8_t qmiLocReadFromBatchReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocReadFromBatchReqMsgT_v02, numberOfEntries),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocReadFromBatchReqMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocReadFromBatchIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocReadFromBatchIndMsgT_v02, status),
-
-  0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocReadFromBatchIndMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocReadFromBatchIndMsgT_v02, numberOfEntries) - QMI_IDL_OFFSET8(qmiLocReadFromBatchIndMsgT_v02, numberOfEntries_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocReadFromBatchIndMsgT_v02, numberOfEntries),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocReadFromBatchIndMsgT_v02, batchedReportList) - QMI_IDL_OFFSET8(qmiLocReadFromBatchIndMsgT_v02, batchedReportList_valid)),
-  0x11,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocReadFromBatchIndMsgT_v02, batchedReportList),
-  QMI_LOC_READ_FROM_BATCH_MAX_SIZE_V02,
-  QMI_IDL_OFFSET8(qmiLocReadFromBatchIndMsgT_v02, batchedReportList) - QMI_IDL_OFFSET8(qmiLocReadFromBatchIndMsgT_v02, batchedReportList_len),
-  QMI_IDL_TYPE88(0, 42)
-};
-
-static const uint8_t qmiLocStopBatchingReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStopBatchingReqMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocStopBatchingIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStopBatchingIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocStopBatchingIndMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocReleaseBatchReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocReleaseBatchReqMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocReleaseBatchIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocReleaseBatchIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocReleaseBatchIndMsgT_v02, transactionId)
-};
-
-/*
- * qmiLocEventInjectWifiApDataReqIndMsgT is empty
- * static const uint8_t qmiLocEventInjectWifiApDataReqIndMsgT_data_v02[] = {
- * };
- */
-
-static const uint8_t qmiLocInjectWifiApDataReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInjectWifiApDataReqMsgT_v02, wifiApInfo),
-  QMI_LOC_WIFI_MAX_REPORTED_APS_PER_MSG_V02,
-  QMI_IDL_OFFSET8(qmiLocInjectWifiApDataReqMsgT_v02, wifiApInfo) - QMI_IDL_OFFSET8(qmiLocInjectWifiApDataReqMsgT_v02, wifiApInfo_len),
-  QMI_IDL_TYPE88(0, 43)
-};
-
-static const uint8_t qmiLocInjectWifiApDataIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectWifiApDataIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocNotifyWifiAttachmentStatusReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNotifyWifiAttachmentStatusReqMsgT_v02, attachState),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocNotifyWifiAttachmentStatusReqMsgT_v02, accessPointMacAddress) - QMI_IDL_OFFSET8(qmiLocNotifyWifiAttachmentStatusReqMsgT_v02, accessPointMacAddress_valid)),
-  0x10,
-  QMI_IDL_FLAGS_IS_ARRAY |  QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNotifyWifiAttachmentStatusReqMsgT_v02, accessPointMacAddress),
-  QMI_LOC_WIFI_MAC_ADDR_LENGTH_V02
-};
-
-static const uint8_t qmiLocNotifyWifiAttachmentStatusIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNotifyWifiAttachmentStatusIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocNotifyWifiEnabledStatusReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNotifyWifiEnabledStatusReqMsgT_v02, enabledStatus)
-};
-
-static const uint8_t qmiLocNotifyWifiEnabledStatusIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocNotifyWifiEnabledStatusIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocEventVehicleDataReadyIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventVehicleDataReadyIndMsgT_v02, vehicleAccelReadyStatus) - QMI_IDL_OFFSET8(qmiLocEventVehicleDataReadyIndMsgT_v02, vehicleAccelReadyStatus_valid)),
-  0x10,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventVehicleDataReadyIndMsgT_v02, vehicleAccelReadyStatus),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventVehicleDataReadyIndMsgT_v02, vehicleAngularRateReadyStatus) - QMI_IDL_OFFSET8(qmiLocEventVehicleDataReadyIndMsgT_v02, vehicleAngularRateReadyStatus_valid)),
-  0x11,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventVehicleDataReadyIndMsgT_v02, vehicleAngularRateReadyStatus),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventVehicleDataReadyIndMsgT_v02, vehicleOdometryReadyStatus) - QMI_IDL_OFFSET8(qmiLocEventVehicleDataReadyIndMsgT_v02, vehicleOdometryReadyStatus_valid)),
-  0x12,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventVehicleDataReadyIndMsgT_v02, vehicleOdometryReadyStatus)
-};
-
-static const uint8_t qmiLocInjectVehicleSensorDataReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocInjectVehicleSensorDataReqMsgT_v02, accelData) - QMI_IDL_OFFSET8(qmiLocInjectVehicleSensorDataReqMsgT_v02, accelData_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocInjectVehicleSensorDataReqMsgT_v02, accelData),
-  QMI_IDL_TYPE88(0, 45),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocInjectVehicleSensorDataReqMsgT_v02, angRotationData) - QMI_IDL_OFFSET16RELATIVE(qmiLocInjectVehicleSensorDataReqMsgT_v02, angRotationData_valid)),
-  0x11,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocInjectVehicleSensorDataReqMsgT_v02, angRotationData),
-  QMI_IDL_TYPE88(0, 45),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocInjectVehicleSensorDataReqMsgT_v02, odometryData) - QMI_IDL_OFFSET16RELATIVE(qmiLocInjectVehicleSensorDataReqMsgT_v02, odometryData_valid)),
-  0x12,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocInjectVehicleSensorDataReqMsgT_v02, odometryData),
-  QMI_IDL_TYPE88(0, 47),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocInjectVehicleSensorDataReqMsgT_v02, changeInTimeScales) - QMI_IDL_OFFSET16RELATIVE(qmiLocInjectVehicleSensorDataReqMsgT_v02, changeInTimeScales_valid)),
-  0x13,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocInjectVehicleSensorDataReqMsgT_v02, changeInTimeScales)
-};
-
-static const uint8_t qmiLocInjectVehicleSensorDataIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocInjectVehicleSensorDataIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocGetAvailWwanPositionReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionReqMsgT_v02, transactionId)
-};
-
-static const uint8_t qmiLocGetAvailWwanPositionIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, status),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, transactionId) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, transactionId_valid)),
-  0x10,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, transactionId),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, latitude) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, latitude_valid)),
-  0x11,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, latitude),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, longitude) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, longitude_valid)),
-  0x12,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, longitude),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncCircular) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncCircular_valid)),
-  0x13,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncCircular),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, altitudeWrtEllipsoid) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, altitudeWrtEllipsoid_valid)),
-  0x14,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, altitudeWrtEllipsoid),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, vertUnc) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, vertUnc_valid)),
-  0x15,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, vertUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, timestampUtc) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, timestampUtc_valid)),
-  0x16,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, timestampUtc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, timeUnc) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, timeUnc_valid)),
-  0x17,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, timeUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncEllipseSemiMinor) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncEllipseSemiMinor_valid)),
-  0x18,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncEllipseSemiMinor),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncEllipseSemiMajor) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncEllipseSemiMajor_valid)),
-  0x19,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncEllipseSemiMajor),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncEllipseOrientAzimuth) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncEllipseOrientAzimuth_valid)),
-  0x1A,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horUncEllipseOrientAzimuth),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horCircularConfidence) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horCircularConfidence_valid)),
-  0x1B,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horCircularConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horEllipticalConfidence) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horEllipticalConfidence_valid)),
-  0x1C,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horEllipticalConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horReliability) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horReliability_valid)),
-  0x1D,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, horReliability),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, altitudeWrtMeanSeaLevel) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, altitudeWrtMeanSeaLevel_valid)),
-  0x1E,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, altitudeWrtMeanSeaLevel),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, vertConfidence) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, vertConfidence_valid)),
-  0x1F,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, vertConfidence),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, vertReliability) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, vertReliability_valid)),
-  0x20,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, vertReliability),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, gpsTime) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, gpsTime_valid)),
-  0x21,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, gpsTime),
-  QMI_IDL_TYPE88(0, 1),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, timeSrc) - QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, timeSrc_valid)),
-  0x22,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocGetAvailWwanPositionIndMsgT_v02, timeSrc)
-};
-
-static const uint8_t qmiLocSetPremiumServicesCfgReqMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetPremiumServicesCfgReqMsgT_v02, premiumServiceType),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x02,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetPremiumServicesCfgReqMsgT_v02, premiumServiceCfg)
-};
-
-static const uint8_t qmiLocSetPremiumServicesCfgIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetPremiumServicesCfgIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocSetXtraVersionCheckReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetXtraVersionCheckReqMsgT_v02, xtraVersionCheckMode)
-};
-
-static const uint8_t qmiLocSetXtraVersionCheckIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetXtraVersionCheckIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocSetGNSSConstRepConfigReqMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGNSSConstRepConfigReqMsgT_v02, measReportConfig) - QMI_IDL_OFFSET8(qmiLocSetGNSSConstRepConfigReqMsgT_v02, measReportConfig_valid)),
-  0x10,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGNSSConstRepConfigReqMsgT_v02, measReportConfig),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocSetGNSSConstRepConfigReqMsgT_v02, svPolyReportConfig) - QMI_IDL_OFFSET8(qmiLocSetGNSSConstRepConfigReqMsgT_v02, svPolyReportConfig_valid)),
-  0x11,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGNSSConstRepConfigReqMsgT_v02, svPolyReportConfig)
-};
-
-static const uint8_t qmiLocSetGNSSConstRepConfigIndMsgT_data_v02[] = {
-  QMI_IDL_TLV_FLAGS_LAST_TLV | 0x01,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocSetGNSSConstRepConfigIndMsgT_v02, status)
-};
-
-static const uint8_t qmiLocEventGnssSvMeasInfoIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, seqNum),
-
-  0x02,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, maxMessageNum),
-
-  0x03,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, system),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, rcvrClockFrequencyInfo) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, rcvrClockFrequencyInfo_valid)),
-  0x10,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, rcvrClockFrequencyInfo),
-  QMI_IDL_TYPE88(0, 49),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, leapSecondInfo) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, leapSecondInfo_valid)),
-  0x11,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, leapSecondInfo),
-  QMI_IDL_TYPE88(0, 50),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gpsGloInterSystemBias) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gpsGloInterSystemBias_valid)),
-  0x12,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gpsGloInterSystemBias),
-  QMI_IDL_TYPE88(0, 51),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gpsBdsInterSystemBias) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gpsBdsInterSystemBias_valid)),
-  0x13,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gpsBdsInterSystemBias),
-  QMI_IDL_TYPE88(0, 51),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gpsGalInterSystemBias) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gpsGalInterSystemBias_valid)),
-  0x14,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gpsGalInterSystemBias),
-  QMI_IDL_TYPE88(0, 51),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, bdsGloInterSystemBias) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, bdsGloInterSystemBias_valid)),
-  0x15,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, bdsGloInterSystemBias),
-  QMI_IDL_TYPE88(0, 51),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, galGloInterSystemBias) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, galGloInterSystemBias_valid)),
-  0x16,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, galGloInterSystemBias),
-  QMI_IDL_TYPE88(0, 51),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, galBdsInterSystemBias) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, galBdsInterSystemBias_valid)),
-  0x17,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, galBdsInterSystemBias),
-  QMI_IDL_TYPE88(0, 51),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, systemTime) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, systemTime_valid)),
-  0x18,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, systemTime),
-  QMI_IDL_TYPE88(0, 52),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gloTime) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gloTime_valid)),
-  0x19,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, gloTime),
-  QMI_IDL_TYPE88(0, 53),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, systemTimeExt) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, systemTimeExt_valid)),
-  0x1A,
-   QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, systemTimeExt),
-  QMI_IDL_TYPE88(0, 54),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, svMeasurement) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, svMeasurement_valid)),
-  0x1B,
-  QMI_IDL_FLAGS_IS_ARRAY | QMI_IDL_FLAGS_IS_VARIABLE_LEN |  QMI_IDL_AGGREGATE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, svMeasurement),
-  QMI_LOC_SV_MEAS_LIST_MAX_SIZE_V02,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, svMeasurement) - QMI_IDL_OFFSET8(qmiLocEventGnssSvMeasInfoIndMsgT_v02, svMeasurement_len),
-  QMI_IDL_TYPE88(0, 56)
-};
-
-static const uint8_t qmiLocEventGnssSvPolyIndMsgT_data_v02[] = {
-  0x01,
-   QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, gnssSvId),
-
-  0x02,
-   QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, T0),
-
-  0x03,
-   QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, svPolyFlagValid),
-
-  0x04,
-   QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, svPolyFlags),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, polyCoeffXYZ0) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, polyCoeffXYZ0_valid)),
-  0x10,
-  QMI_IDL_FLAGS_IS_ARRAY |  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, polyCoeffXYZ0),
-  QMI_LOC_SV_POLY_XYZ_0_TH_ORDER_COEFF_SIZE_V02,
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, polyCoefXYZN) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, polyCoefXYZN_valid)),
-  0x11,
-  QMI_IDL_FLAGS_IS_ARRAY |  QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, polyCoefXYZN),
-  QMI_LOC_SV_POLY_XYZ_N_TH_ORDER_COEFF_SIZE_V02,
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, polyCoefClockBias) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, polyCoefClockBias_valid)),
-  0x12,
-  QMI_IDL_FLAGS_IS_ARRAY |  QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, polyCoefClockBias),
-  QMI_LOC_SV_POLY_SV_CLKBIAS_COEFF_SIZE_V02,
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, gloFrequency) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, gloFrequency_valid)),
-  0x13,
-   QMI_IDL_GENERIC_1_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, gloFrequency),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, IODE) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, IODE_valid)),
-  0x14,
-   QMI_IDL_GENERIC_2_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, IODE),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, enhancedIOD) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, enhancedIOD_valid)),
-  0x15,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, enhancedIOD),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, svPosUnc) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, svPosUnc_valid)),
-  0x16,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, svPosUnc),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, ionoDelay) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, ionoDelay_valid)),
-  0x17,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, ionoDelay),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, ionoDot) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, ionoDot_valid)),
-  0x18,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, ionoDot),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, sbasIonoDelay) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, sbasIonoDelay_valid)),
-  0x19,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, sbasIonoDelay),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, sbasIonoDot) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, sbasIonoDot_valid)),
-  0x1A,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, sbasIonoDot),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, tropoDelay) - QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, tropoDelay_valid)),
-  0x1B,
-   QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET8(qmiLocEventGnssSvPolyIndMsgT_v02, tropoDelay),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGnssSvPolyIndMsgT_v02, elevation) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGnssSvPolyIndMsgT_v02, elevation_valid)),
-  0x1C,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGnssSvPolyIndMsgT_v02, elevation),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGnssSvPolyIndMsgT_v02, elevationDot) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGnssSvPolyIndMsgT_v02, elevationDot_valid)),
-  0x1D,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGnssSvPolyIndMsgT_v02, elevationDot),
-
-  QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGnssSvPolyIndMsgT_v02, elenationUnc) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGnssSvPolyIndMsgT_v02, elenationUnc_valid)),
-  0x1E,
-   QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_4_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGnssSvPolyIndMsgT_v02, elenationUnc),
-
-  QMI_IDL_TLV_FLAGS_LAST_TLV | QMI_IDL_TLV_FLAGS_OPTIONAL | (QMI_IDL_OFFSET16RELATIVE(qmiLocEventGnssSvPolyIndMsgT_v02, velCoef) - QMI_IDL_OFFSET16RELATIVE(qmiLocEventGnssSvPolyIndMsgT_v02, velCoef_valid)),
-  0x1F,
-  QMI_IDL_FLAGS_IS_ARRAY |  QMI_IDL_FLAGS_OFFSET_IS_16 | QMI_IDL_GENERIC_8_BYTE,
-  QMI_IDL_OFFSET16ARRAY(qmiLocEventGnssSvPolyIndMsgT_v02, velCoef),
-  QMI_LOC_SV_POLY_VELOCITY_COEF_SIZE_V02
-};
-
-/* Type Table */
-static const qmi_idl_type_table_entry  loc_type_table_v02[] = {
-  {sizeof(qmiLocApplicationIdStructT_v02), qmiLocApplicationIdStructT_data_v02},
-  {sizeof(qmiLocGPSTimeStructT_v02), qmiLocGPSTimeStructT_data_v02},
-  {sizeof(qmiLocDOPStructT_v02), qmiLocDOPStructT_data_v02},
-  {sizeof(qmiLocSensorUsageIndicatorStructT_v02), qmiLocSensorUsageIndicatorStructT_data_v02},
-  {sizeof(qmiLocSvInfoStructT_v02), qmiLocSvInfoStructT_data_v02},
-  {sizeof(qmiLocNiVxNotifyVerifyStructT_v02), qmiLocNiVxNotifyVerifyStructT_data_v02},
-  {sizeof(qmiLocNiSuplFormattedStringStructT_v02), qmiLocNiSuplFormattedStringStructT_data_v02},
-  {sizeof(qmiLocNiSuplQopStructT_v02), qmiLocNiSuplQopStructT_data_v02},
-  {sizeof(qmiLocIpV4AddrStructType_v02), qmiLocIpV4AddrStructType_data_v02},
-  {sizeof(qmiLocIpV6AddrStructType_v02), qmiLocIpV6AddrStructType_data_v02},
-  {sizeof(qmiLocNiSuplServerInfoStructT_v02), qmiLocNiSuplServerInfoStructT_data_v02},
-  {sizeof(qmiLocNiSuplNotifyVerifyStructT_v02), qmiLocNiSuplNotifyVerifyStructT_data_v02},
-  {sizeof(qmiLocNiUmtsCpCodedStringStructT_v02), qmiLocNiUmtsCpCodedStringStructT_data_v02},
-  {sizeof(qmiLocNiUmtsCpNotifyVerifyStructT_v02), qmiLocNiUmtsCpNotifyVerifyStructT_data_v02},
-  {sizeof(qmiLocNiVxServiceInteractionStructT_v02), qmiLocNiVxServiceInteractionStructT_data_v02},
-  {sizeof(qmiLocNiSuplVer2ExtStructT_v02), qmiLocNiSuplVer2ExtStructT_data_v02},
-  {sizeof(qmiLocAssistanceServerUrlStructT_v02), qmiLocAssistanceServerUrlStructT_data_v02},
-  {sizeof(qmiLocTimeServerListStructT_v02), qmiLocTimeServerListStructT_data_v02},
-  {sizeof(qmiLocPredictedOrbitsAllowedSizesStructT_v02), qmiLocPredictedOrbitsAllowedSizesStructT_data_v02},
-  {sizeof(qmiLocPredictedOrbitsServerListStructT_v02), qmiLocPredictedOrbitsServerListStructT_data_v02},
-  {sizeof(qmiLocSensorControlConfigSamplingSpecStructT_v02), qmiLocSensorControlConfigSamplingSpecStructT_data_v02},
-  {sizeof(qmiLocSensorReadyStatusStructT_v02), qmiLocSensorReadyStatusStructT_data_v02},
-  {sizeof(qmiLocGeofencePositionStructT_v02), qmiLocGeofencePositionStructT_data_v02},
-  {sizeof(qmiLocPredictedOrbitsDataValidityStructT_v02), qmiLocPredictedOrbitsDataValidityStructT_data_v02},
-  {sizeof(qmiLocAltitudeSrcInfoStructT_v02), qmiLocAltitudeSrcInfoStructT_data_v02},
-  {sizeof(qmiLocDeleteSvInfoStructT_v02), qmiLocDeleteSvInfoStructT_data_v02},
-  {sizeof(qmiLocWifiFixTimeStructT_v02), qmiLocWifiFixTimeStructT_data_v02},
-  {sizeof(qmiLocWifiFixPosStructT_v02), qmiLocWifiFixPosStructT_data_v02},
-  {sizeof(qmiLocWifiApInfoStructT_v02), qmiLocWifiApInfoStructT_data_v02},
-  {sizeof(qmiLoc3AxisSensorSampleStructT_v02), qmiLoc3AxisSensorSampleStructT_data_v02},
-  {sizeof(qmiLoc3AxisSensorSampleListStructT_v02), qmiLoc3AxisSensorSampleListStructT_data_v02},
-  {sizeof(qmiLocApnProfilesStructT_v02), qmiLocApnProfilesStructT_data_v02},
-  {sizeof(qmiLocCircularGeofenceArgsStructT_v02), qmiLocCircularGeofenceArgsStructT_data_v02},
-  {sizeof(qmiLocMotionDataStructT_v02), qmiLocMotionDataStructT_data_v02},
-  {sizeof(qmiLocGSMCellIdStructT_v02), qmiLocGSMCellIdStructT_data_v02},
-  {sizeof(qmiLocEmergencyNotificationStructT_v02), qmiLocEmergencyNotificationStructT_data_v02},
-  {sizeof(qmiLocSensorTemperatureSampleStructT_v02), qmiLocSensorTemperatureSampleStructT_data_v02},
-  {sizeof(qmiLocSensorTemperatureSampleListStructT_v02), qmiLocSensorTemperatureSampleListStructT_data_v02},
-  {sizeof(qmiLocWCDMACellIdStructT_v02), qmiLocWCDMACellIdStructT_data_v02},
-  {sizeof(qmiLocTDSCDMACellIdStructT_v02), qmiLocTDSCDMACellIdStructT_data_v02},
-  {sizeof(qmiLocDeleteBDSSvInfoStructT_v02), qmiLocDeleteBDSSvInfoStructT_data_v02},
-  {sizeof(qmiLocGeofenceIdContinuousStructT_v02), qmiLocGeofenceIdContinuousStructT_data_v02},
-  {sizeof(qmiLocBatchedReportStructT_v02), qmiLocBatchedReportStructT_data_v02},
-  {sizeof(qmiLocWifiApDataStructT_v02), qmiLocWifiApDataStructT_data_v02},
-  {sizeof(qmiLocVehicleSensorSampleStructT_v02), qmiLocVehicleSensorSampleStructT_data_v02},
-  {sizeof(qmiLocVehicleSensorSampleListStructType_v02), qmiLocVehicleSensorSampleListStructType_data_v02},
-  {sizeof(qmiLocVehicleOdometrySampleStructT_v02), qmiLocVehicleOdometrySampleStructT_data_v02},
-  {sizeof(qmiLocVehicleOdometrySampleListStructT_v02), qmiLocVehicleOdometrySampleListStructT_data_v02},
-  {sizeof(qmiLocGeofenceMotionStateConfigStructT_v02), qmiLocGeofenceMotionStateConfigStructT_data_v02},
-  {sizeof(qmiLocRcvrClockFrequencyInfoStructT_v02), qmiLocRcvrClockFrequencyInfoStructT_data_v02},
-  {sizeof(qmiLocLeapSecondInfoStructT_v02), qmiLocLeapSecondInfoStructT_data_v02},
-  {sizeof(qmiLocInterSystemBiasStructT_v02), qmiLocInterSystemBiasStructT_data_v02},
-  {sizeof(qmiLocGnssTimeStructT_v02), qmiLocGnssTimeStructT_data_v02},
-  {sizeof(qmiLocGloTimeStructT_v02), qmiLocGloTimeStructT_data_v02},
-  {sizeof(qmiLocGnssTimeExtStructT_v02), qmiLocGnssTimeExtStructT_data_v02},
-  {sizeof(qmiLocSVTimeSpeedStructT_v02), qmiLocSVTimeSpeedStructT_data_v02},
-  {sizeof(qmiLocSVMeasurementStructT_v02), qmiLocSVMeasurementStructT_data_v02}
-};
-
-/* Message Table */
-static const qmi_idl_message_table_entry loc_message_table_v02[] = {
-  {sizeof(qmiLocGenRespMsgT_v02), qmiLocGenRespMsgT_data_v02},
-  {sizeof(qmiLocInformClientRevisionReqMsgT_v02), qmiLocInformClientRevisionReqMsgT_data_v02},
-  {sizeof(qmiLocRegEventsReqMsgT_v02), qmiLocRegEventsReqMsgT_data_v02},
-  {sizeof(qmiLocStartReqMsgT_v02), qmiLocStartReqMsgT_data_v02},
-  {sizeof(qmiLocStopReqMsgT_v02), qmiLocStopReqMsgT_data_v02},
-  {sizeof(qmiLocEventPositionReportIndMsgT_v02), qmiLocEventPositionReportIndMsgT_data_v02},
-  {sizeof(qmiLocEventGnssSvInfoIndMsgT_v02), qmiLocEventGnssSvInfoIndMsgT_data_v02},
-  {sizeof(qmiLocEventNmeaIndMsgT_v02), qmiLocEventNmeaIndMsgT_data_v02},
-  {sizeof(qmiLocEventNiNotifyVerifyReqIndMsgT_v02), qmiLocEventNiNotifyVerifyReqIndMsgT_data_v02},
-  {sizeof(qmiLocEventInjectTimeReqIndMsgT_v02), qmiLocEventInjectTimeReqIndMsgT_data_v02},
-  {sizeof(qmiLocEventInjectPredictedOrbitsReqIndMsgT_v02), qmiLocEventInjectPredictedOrbitsReqIndMsgT_data_v02},
-  {sizeof(qmiLocEventInjectPositionReqIndMsgT_v02), qmiLocEventInjectPositionReqIndMsgT_data_v02},
-  {sizeof(qmiLocEventEngineStateIndMsgT_v02), qmiLocEventEngineStateIndMsgT_data_v02},
-  {sizeof(qmiLocEventFixSessionStateIndMsgT_v02), qmiLocEventFixSessionStateIndMsgT_data_v02},
-  {sizeof(qmiLocEventWifiReqIndMsgT_v02), qmiLocEventWifiReqIndMsgT_data_v02},
-  {sizeof(qmiLocEventSensorStreamingReadyStatusIndMsgT_v02), qmiLocEventSensorStreamingReadyStatusIndMsgT_data_v02},
-  {sizeof(qmiLocEventTimeSyncReqIndMsgT_v02), qmiLocEventTimeSyncReqIndMsgT_data_v02},
-  {sizeof(qmiLocEventSetSpiStreamingReportIndMsgT_v02), qmiLocEventSetSpiStreamingReportIndMsgT_data_v02},
-  {sizeof(qmiLocEventLocationServerConnectionReqIndMsgT_v02), qmiLocEventLocationServerConnectionReqIndMsgT_data_v02},
-  {sizeof(qmiLocEventNiGeofenceNotificationIndMsgT_v02), qmiLocEventNiGeofenceNotificationIndMsgT_data_v02},
-  {sizeof(qmiLocEventGeofenceGenAlertIndMsgT_v02), qmiLocEventGeofenceGenAlertIndMsgT_data_v02},
-  {sizeof(qmiLocEventGeofenceBreachIndMsgT_v02), qmiLocEventGeofenceBreachIndMsgT_data_v02},
-  {sizeof(qmiLocGetServiceRevisionReqMsgT_v02), 0},
-  {sizeof(qmiLocGetServiceRevisionIndMsgT_v02), qmiLocGetServiceRevisionIndMsgT_data_v02},
-  {sizeof(qmiLocGetFixCriteriaReqMsgT_v02), 0},
-  {sizeof(qmiLocGetFixCriteriaIndMsgT_v02), qmiLocGetFixCriteriaIndMsgT_data_v02},
-  {sizeof(qmiLocNiUserRespReqMsgT_v02), qmiLocNiUserRespReqMsgT_data_v02},
-  {sizeof(qmiLocNiUserRespIndMsgT_v02), qmiLocNiUserRespIndMsgT_data_v02},
-  {sizeof(qmiLocInjectPredictedOrbitsDataReqMsgT_v02), qmiLocInjectPredictedOrbitsDataReqMsgT_data_v02},
-  {sizeof(qmiLocInjectPredictedOrbitsDataIndMsgT_v02), qmiLocInjectPredictedOrbitsDataIndMsgT_data_v02},
-  {sizeof(qmiLocGetPredictedOrbitsDataSourceReqMsgT_v02), 0},
-  {sizeof(qmiLocGetPredictedOrbitsDataSourceIndMsgT_v02), qmiLocGetPredictedOrbitsDataSourceIndMsgT_data_v02},
-  {sizeof(qmiLocGetPredictedOrbitsDataValidityReqMsgT_v02), 0},
-  {sizeof(qmiLocGetPredictedOrbitsDataValidityIndMsgT_v02), qmiLocGetPredictedOrbitsDataValidityIndMsgT_data_v02},
-  {sizeof(qmiLocInjectUtcTimeReqMsgT_v02), qmiLocInjectUtcTimeReqMsgT_data_v02},
-  {sizeof(qmiLocInjectUtcTimeIndMsgT_v02), qmiLocInjectUtcTimeIndMsgT_data_v02},
-  {sizeof(qmiLocInjectPositionReqMsgT_v02), qmiLocInjectPositionReqMsgT_data_v02},
-  {sizeof(qmiLocInjectPositionIndMsgT_v02), qmiLocInjectPositionIndMsgT_data_v02},
-  {sizeof(qmiLocSetEngineLockReqMsgT_v02), qmiLocSetEngineLockReqMsgT_data_v02},
-  {sizeof(qmiLocSetEngineLockIndMsgT_v02), qmiLocSetEngineLockIndMsgT_data_v02},
-  {sizeof(qmiLocGetEngineLockReqMsgT_v02), 0},
-  {sizeof(qmiLocGetEngineLockIndMsgT_v02), qmiLocGetEngineLockIndMsgT_data_v02},
-  {sizeof(qmiLocSetSbasConfigReqMsgT_v02), qmiLocSetSbasConfigReqMsgT_data_v02},
-  {sizeof(qmiLocSetSbasConfigIndMsgT_v02), qmiLocSetSbasConfigIndMsgT_data_v02},
-  {sizeof(qmiLocGetSbasConfigReqMsgT_v02), 0},
-  {sizeof(qmiLocGetSbasConfigIndMsgT_v02), qmiLocGetSbasConfigIndMsgT_data_v02},
-  {sizeof(qmiLocSetNmeaTypesReqMsgT_v02), qmiLocSetNmeaTypesReqMsgT_data_v02},
-  {sizeof(qmiLocSetNmeaTypesIndMsgT_v02), qmiLocSetNmeaTypesIndMsgT_data_v02},
-  {sizeof(qmiLocGetNmeaTypesReqMsgT_v02), 0},
-  {sizeof(qmiLocGetNmeaTypesIndMsgT_v02), qmiLocGetNmeaTypesIndMsgT_data_v02},
-  {sizeof(qmiLocSetLowPowerModeReqMsgT_v02), qmiLocSetLowPowerModeReqMsgT_data_v02},
-  {sizeof(qmiLocSetLowPowerModeIndMsgT_v02), qmiLocSetLowPowerModeIndMsgT_data_v02},
-  {sizeof(qmiLocGetLowPowerModeReqMsgT_v02), 0},
-  {sizeof(qmiLocGetLowPowerModeIndMsgT_v02), qmiLocGetLowPowerModeIndMsgT_data_v02},
-  {sizeof(qmiLocSetServerReqMsgT_v02), qmiLocSetServerReqMsgT_data_v02},
-  {sizeof(qmiLocSetServerIndMsgT_v02), qmiLocSetServerIndMsgT_data_v02},
-  {sizeof(qmiLocGetServerReqMsgT_v02), qmiLocGetServerReqMsgT_data_v02},
-  {sizeof(qmiLocGetServerIndMsgT_v02), qmiLocGetServerIndMsgT_data_v02},
-  {sizeof(qmiLocDeleteAssistDataReqMsgT_v02), qmiLocDeleteAssistDataReqMsgT_data_v02},
-  {sizeof(qmiLocDeleteAssistDataIndMsgT_v02), qmiLocDeleteAssistDataIndMsgT_data_v02},
-  {sizeof(qmiLocSetXtraTSessionControlReqMsgT_v02), qmiLocSetXtraTSessionControlReqMsgT_data_v02},
-  {sizeof(qmiLocSetXtraTSessionControlIndMsgT_v02), qmiLocSetXtraTSessionControlIndMsgT_data_v02},
-  {sizeof(qmiLocGetXtraTSessionControlReqMsgT_v02), 0},
-  {sizeof(qmiLocGetXtraTSessionControlIndMsgT_v02), qmiLocGetXtraTSessionControlIndMsgT_data_v02},
-  {sizeof(qmiLocInjectWifiPositionReqMsgT_v02), qmiLocInjectWifiPositionReqMsgT_data_v02},
-  {sizeof(qmiLocInjectWifiPositionIndMsgT_v02), qmiLocInjectWifiPositionIndMsgT_data_v02},
-  {sizeof(qmiLocNotifyWifiStatusReqMsgT_v02), qmiLocNotifyWifiStatusReqMsgT_data_v02},
-  {sizeof(qmiLocNotifyWifiStatusIndMsgT_v02), qmiLocNotifyWifiStatusIndMsgT_data_v02},
-  {sizeof(qmiLocGetRegisteredEventsReqMsgT_v02), 0},
-  {sizeof(qmiLocGetRegisteredEventsIndMsgT_v02), qmiLocGetRegisteredEventsIndMsgT_data_v02},
-  {sizeof(qmiLocSetOperationModeReqMsgT_v02), qmiLocSetOperationModeReqMsgT_data_v02},
-  {sizeof(qmiLocSetOperationModeIndMsgT_v02), qmiLocSetOperationModeIndMsgT_data_v02},
-  {sizeof(qmiLocGetOperationModeReqMsgT_v02), 0},
-  {sizeof(qmiLocGetOperationModeIndMsgT_v02), qmiLocGetOperationModeIndMsgT_data_v02},
-  {sizeof(qmiLocSetSpiStatusReqMsgT_v02), qmiLocSetSpiStatusReqMsgT_data_v02},
-  {sizeof(qmiLocSetSpiStatusIndMsgT_v02), qmiLocSetSpiStatusIndMsgT_data_v02},
-  {sizeof(qmiLocInjectSensorDataReqMsgT_v02), qmiLocInjectSensorDataReqMsgT_data_v02},
-  {sizeof(qmiLocInjectSensorDataIndMsgT_v02), qmiLocInjectSensorDataIndMsgT_data_v02},
-  {sizeof(qmiLocInjectTimeSyncDataReqMsgT_v02), qmiLocInjectTimeSyncDataReqMsgT_data_v02},
-  {sizeof(qmiLocInjectTimeSyncDataIndMsgT_v02), qmiLocInjectTimeSyncDataIndMsgT_data_v02},
-  {sizeof(qmiLocGetCradleMountConfigReqMsgT_v02), 0},
-  {sizeof(qmiLocGetCradleMountConfigIndMsgT_v02), qmiLocGetCradleMountConfigIndMsgT_data_v02},
-  {sizeof(qmiLocSetCradleMountConfigReqMsgT_v02), qmiLocSetCradleMountConfigReqMsgT_data_v02},
-  {sizeof(qmiLocSetCradleMountConfigIndMsgT_v02), qmiLocSetCradleMountConfigIndMsgT_data_v02},
-  {sizeof(qmiLocGetExternalPowerConfigReqMsgT_v02), 0},
-  {sizeof(qmiLocGetExternalPowerConfigIndMsgT_v02), qmiLocGetExternalPowerConfigIndMsgT_data_v02},
-  {sizeof(qmiLocSetExternalPowerConfigReqMsgT_v02), qmiLocSetExternalPowerConfigReqMsgT_data_v02},
-  {sizeof(qmiLocSetExternalPowerConfigIndMsgT_v02), qmiLocSetExternalPowerConfigIndMsgT_data_v02},
-  {sizeof(qmiLocInformLocationServerConnStatusReqMsgT_v02), qmiLocInformLocationServerConnStatusReqMsgT_data_v02},
-  {sizeof(qmiLocInformLocationServerConnStatusIndMsgT_v02), qmiLocInformLocationServerConnStatusIndMsgT_data_v02},
-  {sizeof(qmiLocSetProtocolConfigParametersReqMsgT_v02), qmiLocSetProtocolConfigParametersReqMsgT_data_v02},
-  {sizeof(qmiLocSetProtocolConfigParametersIndMsgT_v02), qmiLocSetProtocolConfigParametersIndMsgT_data_v02},
-  {sizeof(qmiLocGetProtocolConfigParametersReqMsgT_v02), qmiLocGetProtocolConfigParametersReqMsgT_data_v02},
-  {sizeof(qmiLocGetProtocolConfigParametersIndMsgT_v02), qmiLocGetProtocolConfigParametersIndMsgT_data_v02},
-  {sizeof(qmiLocSetSensorControlConfigReqMsgT_v02), qmiLocSetSensorControlConfigReqMsgT_data_v02},
-  {sizeof(qmiLocSetSensorControlConfigIndMsgT_v02), qmiLocSetSensorControlConfigIndMsgT_data_v02},
-  {sizeof(qmiLocGetSensorControlConfigReqMsgT_v02), 0},
-  {sizeof(qmiLocGetSensorControlConfigIndMsgT_v02), qmiLocGetSensorControlConfigIndMsgT_data_v02},
-  {sizeof(qmiLocSetSensorPropertiesReqMsgT_v02), qmiLocSetSensorPropertiesReqMsgT_data_v02},
-  {sizeof(qmiLocSetSensorPropertiesIndMsgT_v02), qmiLocSetSensorPropertiesIndMsgT_data_v02},
-  {sizeof(qmiLocGetSensorPropertiesReqMsgT_v02), qmiLocGetSensorPropertiesReqMsgT_data_v02},
-  {sizeof(qmiLocGetSensorPropertiesIndMsgT_v02), qmiLocGetSensorPropertiesIndMsgT_data_v02},
-  {sizeof(qmiLocSetSensorPerformanceControlConfigReqMsgT_v02), qmiLocSetSensorPerformanceControlConfigReqMsgT_data_v02},
-  {sizeof(qmiLocSetSensorPerformanceControlConfigIndMsgT_v02), qmiLocSetSensorPerformanceControlConfigIndMsgT_data_v02},
-  {sizeof(qmiLocGetSensorPerformanceControlConfigReqMsgT_v02), 0},
-  {sizeof(qmiLocGetSensorPerformanceControlConfigIndMsgT_v02), qmiLocGetSensorPerformanceControlConfigIndMsgT_data_v02},
-  {sizeof(qmiLocInjectSuplCertificateReqMsgT_v02), qmiLocInjectSuplCertificateReqMsgT_data_v02},
-  {sizeof(qmiLocInjectSuplCertificateIndMsgT_v02), qmiLocInjectSuplCertificateIndMsgT_data_v02},
-  {sizeof(qmiLocDeleteSuplCertificateReqMsgT_v02), qmiLocDeleteSuplCertificateReqMsgT_data_v02},
-  {sizeof(qmiLocDeleteSuplCertificateIndMsgT_v02), qmiLocDeleteSuplCertificateIndMsgT_data_v02},
-  {sizeof(qmiLocSetPositionEngineConfigParametersReqMsgT_v02), qmiLocSetPositionEngineConfigParametersReqMsgT_data_v02},
-  {sizeof(qmiLocSetPositionEngineConfigParametersIndMsgT_v02), qmiLocSetPositionEngineConfigParametersIndMsgT_data_v02},
-  {sizeof(qmiLocGetPositionEngineConfigParametersReqMsgT_v02), qmiLocGetPositionEngineConfigParametersReqMsgT_data_v02},
-  {sizeof(qmiLocGetPositionEngineConfigParametersIndMsgT_v02), qmiLocGetPositionEngineConfigParametersIndMsgT_data_v02},
-  {sizeof(qmiLocAddCircularGeofenceReqMsgT_v02), qmiLocAddCircularGeofenceReqMsgT_data_v02},
-  {sizeof(qmiLocAddCircularGeofenceIndMsgT_v02), qmiLocAddCircularGeofenceIndMsgT_data_v02},
-  {sizeof(qmiLocDeleteGeofenceReqMsgT_v02), qmiLocDeleteGeofenceReqMsgT_data_v02},
-  {sizeof(qmiLocDeleteGeofenceIndMsgT_v02), qmiLocDeleteGeofenceIndMsgT_data_v02},
-  {sizeof(qmiLocQueryGeofenceReqMsgT_v02), qmiLocQueryGeofenceReqMsgT_data_v02},
-  {sizeof(qmiLocQueryGeofenceIndMsgT_v02), qmiLocQueryGeofenceIndMsgT_data_v02},
-  {sizeof(qmiLocEditGeofenceReqMsgT_v02), qmiLocEditGeofenceReqMsgT_data_v02},
-  {sizeof(qmiLocEditGeofenceIndMsgT_v02), qmiLocEditGeofenceIndMsgT_data_v02},
-  {sizeof(qmiLocGetBestAvailablePositionReqMsgT_v02), qmiLocGetBestAvailablePositionReqMsgT_data_v02},
-  {sizeof(qmiLocGetBestAvailablePositionIndMsgT_v02), qmiLocGetBestAvailablePositionIndMsgT_data_v02},
-  {sizeof(qmiLocInjectMotionDataReqMsgT_v02), qmiLocInjectMotionDataReqMsgT_data_v02},
-  {sizeof(qmiLocInjectMotionDataIndMsgT_v02), qmiLocInjectMotionDataIndMsgT_data_v02},
-  {sizeof(qmiLocGetNiGeofenceIdListReqMsgT_v02), qmiLocGetNiGeofenceIdListReqMsgT_data_v02},
-  {sizeof(qmiLocGetNiGeofenceIdListIndMsgT