From e065604f303d2e0a7cac3e97572a70d04cc21657 Mon Sep 17 00:00:00 2001
From: Kevin Tang <zhikait@codeaurora.org>
Date: Fri, 21 Sep 2012 16:56:18 -0700
Subject: [PATCH] OTDOA support

(must have CR 370306 as dependency)
CRs-Fixed: 402746

Change-Id: I505becab45f643b352e8ff3aeb242b15b623cb7b
---
 .../libloc_api-rpc-glue/src/LocApiRpcAdapter.cpp              | 1 +
 loc_api/libloc_api_50001/loc.h                                | 3 ++-
 loc_api/libloc_api_50001/loc_eng_log.cpp                      | 3 ++-
 loc_api/loc_api_v02/LocApiV02Adapter.cpp                      | 4 ++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/src/LocApiRpcAdapter.cpp b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/src/LocApiRpcAdapter.cpp
index a20820e8..5108780e 100644
--- a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/src/LocApiRpcAdapter.cpp
+++ b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/src/LocApiRpcAdapter.cpp
@@ -332,6 +332,7 @@ LocApiRpcAdapter::setPositionMode(const LocPosMode *posMode)
         op_mode = RPC_LOC_OPER_MODE_DATA_OPTIMAL;
         break;
     case LOC_POSITION_MODE_RESERVED_4:
+    case LOC_POSITION_MODE_RESERVED_5:
         op_mode = RPC_LOC_OPER_MODE_MSA;
         fix_criteria_ptr->preferred_response_time  = 0;
         break;
diff --git a/loc_api/libloc_api_50001/loc.h b/loc_api/libloc_api_50001/loc.h
index b823e476..b1eee671 100755
--- a/loc_api/libloc_api_50001/loc.h
+++ b/loc_api/libloc_api_50001/loc.h
@@ -54,7 +54,8 @@ typedef enum loc_position_mode_type {
     LOC_POSITION_MODE_RESERVED_1,
     LOC_POSITION_MODE_RESERVED_2,
     LOC_POSITION_MODE_RESERVED_3,
-    LOC_POSITION_MODE_RESERVED_4
+    LOC_POSITION_MODE_RESERVED_4,
+    LOC_POSITION_MODE_RESERVED_5
 } LocPositionMode;
 
 typedef void (*loc_location_cb_ext) (GpsLocation* location, void* locExt);
diff --git a/loc_api/libloc_api_50001/loc_eng_log.cpp b/loc_api/libloc_api_50001/loc_eng_log.cpp
index 843f558f..53548228 100644
--- a/loc_api/libloc_api_50001/loc_eng_log.cpp
+++ b/loc_api/libloc_api_50001/loc_eng_log.cpp
@@ -124,7 +124,8 @@ static loc_name_val_s_type loc_eng_position_modes[] =
     NAME_VAL( LOC_POSITION_MODE_RESERVED_1 ),
     NAME_VAL( LOC_POSITION_MODE_RESERVED_2 ),
     NAME_VAL( LOC_POSITION_MODE_RESERVED_3 ),
-    NAME_VAL( LOC_POSITION_MODE_RESERVED_4 )
+    NAME_VAL( LOC_POSITION_MODE_RESERVED_4 ),
+    NAME_VAL( LOC_POSITION_MODE_RESERVED_5 )
 };
 static int loc_eng_position_mode_num = sizeof(loc_eng_position_modes) / sizeof(loc_name_val_s_type);
 
diff --git a/loc_api/loc_api_v02/LocApiV02Adapter.cpp b/loc_api/loc_api_v02/LocApiV02Adapter.cpp
index 4c7b7124..046ef3b1 100755
--- a/loc_api/loc_api_v02/LocApiV02Adapter.cpp
+++ b/loc_api/loc_api_v02/LocApiV02Adapter.cpp
@@ -250,6 +250,10 @@ enum loc_api_adapter_err LocApiV02Adapter :: startFix()
       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;