AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index e2c9829..f7faf8e 100644
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -39,7 +39,7 @@
#define MAX_AT_RESPONSE 0x1000
-/* pathname returned from RIL_REQUEST_SETUP_DEFAULT_PDP */
+/* pathname returned from RIL_REQUEST_SETUP_DATA_CALL / RIL_REQUEST_SETUP_DEFAULT_PDP */
#define PPP_TTY_PATH "/dev/omap_csmi_tty1"
#ifdef USE_TI_COMMANDS
@@ -63,7 +63,7 @@
static const char *getVersion();
static int isRadioOn();
static int getSIMStatus();
-static void onPDPContextListChanged(void *param);
+static void onDataCallListChanged(void *param);
extern const char * requestToString(int request);
@@ -268,19 +268,19 @@
RIL_onRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
}
-static void requestOrSendPDPContextList(RIL_Token *t);
+static void requestOrSendDataCallList(RIL_Token *t);
-static void onPDPContextListChanged(void *param)
+static void onDataCallListChanged(void *param)
{
- requestOrSendPDPContextList(NULL);
+ requestOrSendDataCallList(NULL);
}
-static void requestPDPContextList(void *data, size_t datalen, RIL_Token t)
+static void requestDataCallList(void *data, size_t datalen, RIL_Token t)
{
- requestOrSendPDPContextList(&t);
+ requestOrSendDataCallList(&t);
}
-static void requestOrSendPDPContextList(RIL_Token *t)
+static void requestOrSendDataCallList(RIL_Token *t)
{
ATResponse *p_response;
ATLine *p_cur;
@@ -293,7 +293,7 @@
if (t != NULL)
RIL_onRequestComplete(*t, RIL_E_GENERIC_FAILURE, NULL, 0);
else
- RIL_onUnsolicitedResponse(RIL_UNSOL_PDP_CONTEXT_LIST_CHANGED,
+ RIL_onUnsolicitedResponse(RIL_UNSOL_DATA_CALL_LIST_CHANGED,
NULL, 0);
return;
}
@@ -302,8 +302,8 @@
p_cur = p_cur->p_next)
n++;
- RIL_PDP_Context_Response *responses =
- alloca(n * sizeof(RIL_PDP_Context_Response));
+ RIL_Data_Call_Response *responses =
+ alloca(n * sizeof(RIL_Data_Call_Response));
int i;
for (i = 0; i < n; i++) {
@@ -314,7 +314,7 @@
responses[i].address = "";
}
- RIL_PDP_Context_Response *response = responses;
+ RIL_Data_Call_Response *response = responses;
for (p_cur = p_response->p_intermediates; p_cur != NULL;
p_cur = p_cur->p_next) {
char *line = p_cur->line;
@@ -341,7 +341,7 @@
if (t != NULL)
RIL_onRequestComplete(*t, RIL_E_GENERIC_FAILURE, NULL, 0);
else
- RIL_onUnsolicitedResponse(RIL_UNSOL_PDP_CONTEXT_LIST_CHANGED,
+ RIL_onUnsolicitedResponse(RIL_UNSOL_DATA_CALL_LIST_CHANGED,
NULL, 0);
return;
}
@@ -399,11 +399,11 @@
if (t != NULL)
RIL_onRequestComplete(*t, RIL_E_SUCCESS, responses,
- n * sizeof(RIL_PDP_Context_Response));
+ n * sizeof(RIL_Data_Call_Response));
else
- RIL_onUnsolicitedResponse(RIL_UNSOL_PDP_CONTEXT_LIST_CHANGED,
+ RIL_onUnsolicitedResponse(RIL_UNSOL_DATA_CALL_LIST_CHANGED,
responses,
- n * sizeof(RIL_PDP_Context_Response));
+ n * sizeof(RIL_Data_Call_Response));
return;
@@ -411,7 +411,7 @@
if (t != NULL)
RIL_onRequestComplete(*t, RIL_E_GENERIC_FAILURE, NULL, 0);
else
- RIL_onUnsolicitedResponse(RIL_UNSOL_PDP_CONTEXT_LIST_CHANGED,
+ RIL_onUnsolicitedResponse(RIL_UNSOL_DATA_CALL_LIST_CHANGED,
NULL, 0);
at_response_free(p_response);
@@ -941,7 +941,7 @@
at_response_free(p_response);
}
-static void requestSetupDefaultPDP(void *data, size_t datalen, RIL_Token t)
+static void requestSetupDataCall(void *data, size_t datalen, RIL_Token t)
{
const char *apn;
char *cmd;
@@ -949,7 +949,7 @@
ATResponse *p_response = NULL;
char *response[2] = { "1", PPP_TTY_PATH };
- apn = ((const char **)data)[0];
+ apn = ((const char **)data)[2];
#ifdef USE_TI_COMMANDS
// Config for multislot class 10 (probably default anyway eh?)
@@ -1347,8 +1347,8 @@
case RIL_REQUEST_SEND_SMS:
requestSendSMS(data, datalen, t);
break;
- case RIL_REQUEST_SETUP_DEFAULT_PDP:
- requestSetupDefaultPDP(data, datalen, t);
+ case RIL_REQUEST_SETUP_DATA_CALL:
+ requestSetupDataCall(data, datalen, t);
break;
case RIL_REQUEST_SMS_ACKNOWLEDGE:
requestSMSAcknowledge(data, datalen, t);
@@ -1405,8 +1405,8 @@
at_send_command("AT+COPS=0", NULL);
break;
- case RIL_REQUEST_PDP_CONTEXT_LIST:
- requestPDPContextList(data, datalen, t);
+ case RIL_REQUEST_DATA_CALL_LIST:
+ requestDataCallList(data, datalen, t);
break;
case RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE:
@@ -1831,7 +1831,7 @@
RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED,
NULL, 0);
#ifdef WORKAROUND_FAKE_CGEV
- RIL_requestTimedCallback (onPDPContextListChanged, NULL, NULL);
+ RIL_requestTimedCallback (onDataCallListChanged, NULL, NULL); //TODO use new function
#endif /* WORKAROUND_FAKE_CGEV */
} else if (strStartsWith(s,"+CREG:")
|| strStartsWith(s,"+CGREG:")
@@ -1840,7 +1840,7 @@
RIL_UNSOL_RESPONSE_NETWORK_STATE_CHANGED,
NULL, 0);
#ifdef WORKAROUND_FAKE_CGEV
- RIL_requestTimedCallback (onPDPContextListChanged, NULL, NULL);
+ RIL_requestTimedCallback (onDataCallListChanged, NULL, NULL);
#endif /* WORKAROUND_FAKE_CGEV */
} else if (strStartsWith(s, "+CMT:")) {
RIL_onUnsolicitedResponse (
@@ -1853,13 +1853,13 @@
} else if (strStartsWith(s, "+CGEV:")) {
/* Really, we can ignore NW CLASS and ME CLASS events here,
* but right now we don't since extranous
- * RIL_UNSOL_PDP_CONTEXT_LIST_CHANGED calls are tolerated
+ * RIL_UNSOL_DATA_CALL_LIST_CHANGED calls are tolerated
*/
/* can't issue AT commands here -- call on main thread */
- RIL_requestTimedCallback (onPDPContextListChanged, NULL, NULL);
+ RIL_requestTimedCallback (onDataCallListChanged, NULL, NULL);
#ifdef WORKAROUND_FAKE_CGEV
} else if (strStartsWith(s, "+CME ERROR: 150")) {
- RIL_requestTimedCallback (onPDPContextListChanged, NULL, NULL);
+ RIL_requestTimedCallback (onDataCallListChanged, NULL, NULL);
#endif /* WORKAROUND_FAKE_CGEV */
}
}
@@ -2068,3 +2068,4 @@
}
#endif /* RIL_SHLIB */
+