Merge "Loc api v02 support for QMI_LOC rev 2.17"

loc_api/loc_api_v02/loc_api_v02_client.c

@@ -159,7 +159,17 @@ static locClientEventIndTableStructT locClientEventIndTable[]= {
   //Geofence Breach event
   { QMI_LOC_EVENT_GEOFENCE_BREACH_NOTIFICATION_IND_V02,
     sizeof(qmiLocEventGeofenceBreachIndMsgT_v02),
-    QMI_LOC_EVENT_MASK_GEOFENCE_BREACH_NOTIFICATION_V02}
+    QMI_LOC_EVENT_MASK_GEOFENCE_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 }
 };
 
 /* table to relate the respInd Id with its size */
@@ -384,7 +394,7 @@ static locClientRespIndTableStructT locClientRespIndTable[]= {
 
    //Inject GSM Cell Info
    { QMI_LOC_INJECT_GSM_CELL_INFO_IND_V02,
-     sizeof(qmiLocInjectNetworkInitiatedMessageIndMsgT_v02)},
+     sizeof(qmiLocInjectGSMCellInfoIndMsgT_v02)},
 
    //Inject Network Initiated Message
    { QMI_LOC_INJECT_NETWORK_INITIATED_MESSAGE_IND_V02,
@@ -392,7 +402,11 @@ static locClientRespIndTableStructT locClientRespIndTable[]= {
 
    //WWAN Out of Service Notification
    { QMI_LOC_WWAN_OUT_OF_SERVICE_NOTIFICATION_IND_V02,
-     sizeof(qmiLocWWANOutOfServiceNotificationIndMsgT_v02)}
+     sizeof(qmiLocWWANOutOfServiceNotificationIndMsgT_v02)},
+
+   //Pedomete Report
+   { QMI_LOC_PEDOMETER_REPORT_IND_V02,
+     sizeof(qmiLocPedometerReportIndMsgT_v02)}
 };
 
 
@@ -824,6 +838,20 @@ static bool locClientHandleIndication(
       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;
+    }
+
     //-------------------------------------------------------------------------
 
     // handle the response indications
@@ -995,6 +1023,12 @@ static bool locClientHandleIndication(
       break;
     }
 
+    case QMI_LOC_PEDOMETER_REPORT_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:
@@ -1534,6 +1568,7 @@ static bool validateRequest(
       *pOutLen = sizeof(qmiLocGetBestAvailablePositionReqMsgT_v02);
       break;
     }
+
     case QMI_LOC_INJECT_MOTION_DATA_REQ_V02:
     {
       *pOutLen = sizeof(qmiLocInjectMotionDataReqMsgT_v02);
@@ -1558,6 +1593,11 @@ static bool validateRequest(
       break;
     }
 
+    case QMI_LOC_PEDOMETER_REPORT_REQ_V02:
+    {
+      *pOutLen = sizeof(qmiLocPedometerReportReqMsgT_v02);
+      break;
+    }
 
     // ALL requests with no payload
     case QMI_LOC_GET_SERVICE_REVISION_REQ_V02:

loc_api/loc_api_v02/loc_api_v02_client.h

@@ -600,6 +600,16 @@ typedef union
          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 */
+
 }locClientReqUnionType;
 
 
@@ -750,6 +760,18 @@ typedef union
         The eventIndId field in the event indication callback is set to
         QMI_LOC_EVENT_GEOFENCE_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 */
+
 }locClientEventIndUnionType;
 
 
@@ -1124,6 +1146,12 @@ typedef union
         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. */
+
 }locClientRespIndUnionType;
 
 /** @} */ /* end_addtogroup data_types */

loc_api/loc_api_v02/loc_api_v02_log.c

@@ -209,6 +209,26 @@ static loc_name_val_s_type loc_v02_event_name[] =
     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)
 };
 static int loc_v02_event_num = sizeof(loc_v02_event_name) / sizeof(loc_name_val_s_type);