commit 3d54e74bc450bb40977e3ae6fab6185fe687bdae
author Wink Saville <wink@google.com> Mon May 18 18:00:44 2009 -0700
committer Wink Saville <wink@google.com> Mon May 18 18:00:44 2009 -0700
tree cfbfb1ce010143ec3a4283c9d9643eb836b46ad0
parent f8bc167551e4a5af4c22dab4855468a166b9ed30

Teleca 2b changes.

reference-ril/reference-ril.c

diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index bf3889c..348234d 100644
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -141,7 +141,11 @@
  * Note: directly modified line and has *p_call point directly into
  * modified line
  */
+#if NEWRIL
+static int callFromCLCCLine(char *line, RIL_Call *p_call)
+#else
 static int callFromCLCCLine(char *line, RIL_CallOld *p_call)
+#endif
 {
         //+CLCC: 1,0,2,0,0,\"+18005551212\",145
         //     index,isMT,state,mode,isMpty(,number,TOA)?
@@ -470,8 +474,13 @@
     ATLine *p_cur;
     int countCalls;
     int countValidCalls;
+#if NEWRIL
+    RIL_Call *p_calls;
+    RIL_Call **pp_calls;
+#else
     RIL_CallOld *p_calls;
     RIL_CallOld **pp_calls;
+#endif
     int i;
     int needRepoll = 0;
 
@@ -499,9 +508,15 @@
 
     /* yes, there's an array of pointers and then an array of structures */
 
+#if NEWRIL
+    pp_calls = (RIL_Call **)alloca(countCalls * sizeof(RIL_Call *));
+    p_calls = (RIL_Call *)alloca(countCalls * sizeof(RIL_Call));
+    memset (p_calls, 0, countCalls * sizeof(RIL_Call));
+#else
     pp_calls = (RIL_CallOld **)alloca(countCalls * sizeof(RIL_CallOld *));
     p_calls = (RIL_CallOld *)alloca(countCalls * sizeof(RIL_CallOld));
     memset (p_calls, 0, countCalls * sizeof(RIL_CallOld));
+#endif
 
     /* init the pointer array */
     for(i = 0; i < countCalls ; i++) {
@@ -566,8 +581,13 @@
     s_repollCallsCount = 0;
 #endif /*WORKAROUND_ERRONEOUS_ANSWER*/
 
+#if NEWRIL
+    RIL_onRequestComplete(t, RIL_E_SUCCESS, pp_calls,
+            countValidCalls * sizeof (RIL_Call *));
+#else
     RIL_onRequestComplete(t, RIL_E_SUCCESS, pp_calls,
             countValidCalls * sizeof (RIL_CallOld *));
+#endif
 
     at_response_free(p_response);