Revert "am 9a2f5113: merge from open-source master"

This reverts commit bb1375f6bdc6cf7d8c3642367cf35565ddb094a8, reversing
changes made to ca5e347ce4b2b51385c4b7395d51c30498c41a6b.

diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index 82d2ca3..4bd9442 100644 (file)
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -3481,14 +3481,8 @@ struct RIL_Env {
      * soon as possible
      */
 
-    void* (*RequestTimedCallback) (RIL_TimedCallback callback,
+    void (*RequestTimedCallback) (RIL_TimedCallback callback,
                                    void *param, const struct timeval *relativeTime);
-
-
-    /**
-     * Remove user-specified callback function
-     */
-    void (*RemoveTimedCallback) (void *callbackInfo);
 };
 
 
@@ -3552,15 +3546,8 @@ void RIL_onUnsolicitedResponse(int unsolResponse, const void *data,
  * @param relativeTime a relative time value at which the callback is invoked
  */
 
-void* RIL_requestTimedCallback (RIL_TimedCallback callback,
-                                void *param, const struct timeval *relativeTime);
-
-/**
- * Remove user-specified callback function
- *  @param callbackInfo  Pointer returned to the caller when timer was scheduled
- */
-
-void RIL_removeTimedCallback(void *callbackInfo);
+void RIL_requestTimedCallback (RIL_TimedCallback callback,
+                               void *param, const struct timeval *relativeTime);
 
 
 #endif /* RIL_SHLIB */

diff --git a/libril/ril.cpp b/libril/ril.cpp
index 4d0ea6f..944c860 100644 (file)
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -142,6 +142,7 @@ typedef struct UserCallbackInfo {
     struct UserCallbackInfo *p_next;
 } UserCallbackInfo;
 
+
 /*******************************************************************/
 
 RIL_RadioFunctions s_callbacks = {0, NULL, NULL, NULL, NULL, NULL};
@@ -239,9 +240,8 @@ extern "C" void RIL_onUnsolicitedResponse(int unsolResponse, void *data,
 #endif
 
 static UserCallbackInfo * internalRequestTimedCallback
-    (RIL_TimedCallback callback, void *param, const struct timeval *relativeTime);
-
-static void internalRemoveTimedCallback(void *callbackInfo);
+    (RIL_TimedCallback callback, void *param,
+        const struct timeval *relativeTime);
 
 /** Index == requestNumber */
 static CommandInfo s_commands[] = {
@@ -2862,7 +2862,7 @@ error_exit:
 */
 static UserCallbackInfo *
 internalRequestTimedCallback (RIL_TimedCallback callback, void *param,
-                              const struct timeval *relativeTime)
+                                const struct timeval *relativeTime)
 {
     struct timeval myRelativeTime;
     UserCallbackInfo *p_info;
@@ -2871,6 +2871,7 @@ internalRequestTimedCallback (RIL_TimedCallback callback, void *param,
 
     p_info->p_callback = callback;
     p_info->userParam = param;
+
     if (relativeTime == NULL) {
         /* treat null parameter as a 0 relative time */
         memset (&myRelativeTime, 0, sizeof(myRelativeTime));
@@ -2887,27 +2888,11 @@ internalRequestTimedCallback (RIL_TimedCallback callback, void *param,
     return p_info;
 }
 
-static void
-internalRemoveTimedCallback(void *callbackInfo)
-{
-    UserCallbackInfo *p_info;
-    p_info = (UserCallbackInfo *)callbackInfo;
-    LOGI("remove timer callback event");
-    if(p_info) {
-        ril_timer_delete(&(p_info->event));
-        free(p_info);
-    }
-}
 
-extern "C" void *
+extern "C" void
 RIL_requestTimedCallback (RIL_TimedCallback callback, void *param,
                                 const struct timeval *relativeTime) {
-   return internalRequestTimedCallback (callback, param, relativeTime);
-}
-
-extern "C" void
-RIL_removeTimedCallback (void *callbackInfo) {
-    internalRemoveTimedCallback(callbackInfo);
+    internalRequestTimedCallback (callback, param, relativeTime);
 }
 
 const char *

diff --git a/libril/ril_event.cpp b/libril/ril_event.cpp
index c24c655..e40e72b 100644 (file)
--- a/libril/ril_event.cpp
+++ b/libril/ril_event.cpp
@@ -312,23 +312,13 @@ void ril_timer_add(struct ril_event * ev, struct timeval * tv)
     dlog("~~~~ -ril_timer_add ~~~~");
 }
 
-// Remove event from timer list
-void ril_timer_delete(struct ril_event *tev)
-{
-    dlog("~~~~timer event delete=%x",(unsigned int)tev);
-    MUTEX_ACQUIRE();
-    removeFromList(tev);
-    MUTEX_RELEASE();
-}
-
 // Remove event from watch or timer list
 void ril_event_del(struct ril_event * ev)
 {
-    dlog("~~~~ +ril_event_del event= %x ~~~~", (unsigned int)ev);
+    dlog("~~~~ +ril_event_del ~~~~");
     MUTEX_ACQUIRE();
 
     if (ev->index < 0 || ev->index >= MAX_FD_EVENTS) {
-        MUTEX_RELEASE();
         return;
     }
 

diff --git a/libril/ril_event.h b/libril/ril_event.h
index 2b9980a..7ba231b 100644 (file)
--- a/libril/ril_event.h
+++ b/libril/ril_event.h
@@ -47,9 +47,6 @@ void ril_timer_add(struct ril_event * ev, struct timeval * tv);
 // Remove event from watch list
 void ril_event_del(struct ril_event * ev);
 
-// Remove event from timer list
-void ril_timer_delete(struct ril_event * ev);
-
 // Event loop
 void ril_event_loop();
 

diff --git a/rild/rild.c b/rild/rild.c
index df78539..14a6ea9 100644 (file)
--- a/rild/rild.c
+++ b/rild/rild.c
@@ -52,16 +52,14 @@ extern void RIL_onRequestComplete(RIL_Token t, RIL_Errno e,
 extern void RIL_onUnsolicitedResponse(int unsolResponse, const void *data,
                                 size_t datalen);
 
-extern void* RIL_requestTimedCallback (RIL_TimedCallback callback,
+extern void RIL_requestTimedCallback (RIL_TimedCallback callback,
                                void *param, const struct timeval *relativeTime);
 
-extern void RIL_removeTimedCallback(void *callbackInfo);
 
 static struct RIL_Env s_rilEnv = {
     RIL_onRequestComplete,
     RIL_onUnsolicitedResponse,
-    RIL_requestTimedCallback,
-    RIL_removeTimedCallback
+    RIL_requestTimedCallback
 };
 
 extern void RIL_startEventLoop();