samsung: move ril client out of exynos4

Change-Id: I8aa0470652c060a531d2cc7f2d8c68d3c40f5f95

5 files changed, 1195 insertions, 0 deletions

diff --git a/ril/libsecril-client-sap/Android.mk b/ril/libsecril-client-sap/Android.mk
new file mode 100755
index 0000000..d427271
--- /dev/null
+++ b/ril/libsecril-client-sap/Android.mk
@@ -0,0 +1,22 @@
+# Copyright 2006 The Android Open Source Project
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES:= \
+    secril-client-sap.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+    libutils \
+    libbinder \
+    libcutils \
+    libhardware_legacy
+
+LOCAL_CFLAGS := 
+
+LOCAL_MODULE:= libsecril-client-sap
+LOCAL_PRELINK_MODULE := false
+LOCAL_LDLIBS += -lpthread
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/ril/libsecril-client-sap/MODULE_LICENSE_APACHE2 b/ril/libsecril-client-sap/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ril/libsecril-client-sap/MODULE_LICENSE_APACHE2
diff --git a/ril/libsecril-client-sap/NOTICE b/ril/libsecril-client-sap/NOTICE
new file mode 100755
index 0000000..c5b1efa
--- /dev/null
+++ b/ril/libsecril-client-sap/NOTICE
@@ -0,0 +1,190 @@
+
+   Copyright (c) 2005-2008, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
diff --git a/ril/libsecril-client-sap/secril-client-sap.cpp b/ril/libsecril-client-sap/secril-client-sap.cpp
new file mode 100755
index 0000000..33f6851
--- /dev/null
+++ b/ril/libsecril-client-sap/secril-client-sap.cpp
@@ -0,0 +1,855 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "SapClient"
+
+#include <binder/Parcel.h>
+#include <telephony/ril.h>
+#include <cutils/record_stream.h>
+
+#include <unistd.h>
+#include <errno.h>
+#include <cutils/sockets.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <string.h>
+#include <fcntl.h>
+#include <utils/Log.h>
+#include <pthread.h>
+#include "secril-client-sap.h"
+#include <hardware_legacy/power.h> // For wakelock
+
+#define RIL_CLIENT_WAKE_LOCK "client-sap-interface"
+
+namespace android {
+
+//---------------------------------------------------------------------------
+// Defines
+//---------------------------------------------------------------------------
+#define DBG 0
+
+#define MULTI_CLIENT_SOCKET_NAME "Multiclient"
+
+#define MAX_COMMAND_BYTES       (8 * 1024)
+#define REQ_POOL_SIZE           32
+#define TOKEN_POOL_SIZE         32
+
+// Constants for response types
+#define RESPONSE_SOLICITED      0
+#define RESPONSE_UNSOLICITED    1
+
+#define max(a, b)   ((a) > (b) ? (a) : (b))
+
+#define REQ_OEM_HOOK_RAW        RIL_REQUEST_OEM_HOOK_RAW
+
+//---------------------------------------------------------------------------
+// Type definitions
+//---------------------------------------------------------------------------
+typedef struct _ReqHistory {
+    int         token;  // token used for request
+    uint32_t    id;     // request ID
+} ReqHistory;
+
+typedef struct _ReqRespHandler {
+    uint32_t        id;         // request ID
+    RilOnComplete   handler;    // handler function
+} ReqRespHandler;
+
+typedef struct _UnsolHandler {
+    uint32_t            id;         // unsolicited response ID
+    RilOnUnsolicited    handler;    // handler function
+} UnsolHandler;
+
+typedef struct _RilClientPrv {
+    HRilClient      parent;
+    uint8_t         b_connect;  // connected to server?
+    int             sock;       // socket
+    int             pipefd[2];
+    fd_set          sock_rfds;  // for read with select()
+    RecordStream    *p_rs;
+    uint32_t        token_pool; // each bit in token_pool used for token.
+                                // so, pool size is 32.
+    pthread_t       tid_reader; // socket reader thread id
+    ReqHistory      history[TOKEN_POOL_SIZE];       // request history
+    ReqRespHandler  req_handlers[REQ_POOL_SIZE];    // request response handler list
+    UnsolHandler    unsol_handlers[REQ_POOL_SIZE];  // unsolicited response handler list
+    RilOnError      err_cb;         // error callback
+    void            *err_cb_data;   // error callback data
+    uint8_t b_del_handler;
+} RilClientPrv;
+
+
+//---------------------------------------------------------------------------
+// Local static function prototypes
+//---------------------------------------------------------------------------
+static void * RxReaderFunc(void *param);
+static int processRxBuffer(RilClientPrv *prv, void *buffer, size_t buflen);
+static uint32_t AllocateToken(uint32_t *token_pool);
+static void FreeToken(uint32_t *token_pool, uint32_t token);
+static uint8_t IsValidToken(uint32_t *token_pool, uint32_t token);
+static int blockingWrite(int fd, const void *buffer, size_t len);
+static int RecordReqHistory(RilClientPrv *prv, int token, uint32_t id);
+static void ClearReqHistory(RilClientPrv *prv, int token);
+static RilOnComplete FindReqHandler(RilClientPrv *prv, int token, uint32_t *id);
+static RilOnUnsolicited FindUnsolHandler(RilClientPrv *prv, uint32_t id);
+static int SendOemRequestHookRaw(HRilClient client, int req_id, char *data, size_t len);
+
+/**
+ * @fn  int RegisterUnsolicitedHandler(HRilClient client, uint32_t id, RilOnUnsolicited handler)
+ *
+ * @params  client: Client handle.
+ *          id: Unsolicited response ID to which handler is registered.
+ *          handler: Unsolicited handler. NULL for deregistration.
+ *
+ * @return  0 on success or error code.
+ */
+extern "C"
+int RegisterUnsolicitedHandler(HRilClient client, uint32_t id, RilOnUnsolicited handler) {
+    RilClientPrv *client_prv;
+    int match_slot = -1;
+    int first_empty_slot = -1;
+    int i;
+
+    if (client == NULL || client->prv == NULL)
+        return RIL_CLIENT_ERR_INVAL;
+
+    client_prv = (RilClientPrv *)(client->prv);
+
+    for (i = 0; i < REQ_POOL_SIZE; i++) {
+        // Check if  there is matched handler.
+        if (id == client_prv->unsol_handlers[i].id) {
+            match_slot = i;
+        }
+        // Find first empty handler slot.
+        if (first_empty_slot == -1 && client_prv->unsol_handlers[i].id == 0) {
+            first_empty_slot = i;
+        }
+    }
+
+    if (handler == NULL) {  // Unregister.
+        if (match_slot >= 0) {
+            memset(&(client_prv->unsol_handlers[match_slot]), 0, sizeof(UnsolHandler));
+            return RIL_CLIENT_ERR_SUCCESS;
+        }
+        else {
+            return RIL_CLIENT_ERR_SUCCESS;
+        }
+    }
+    else {// Register.
+        if (match_slot >= 0) {
+            client_prv->unsol_handlers[match_slot].handler = handler;   // Just update.
+        }
+        else if (first_empty_slot >= 0) {
+            client_prv->unsol_handlers[first_empty_slot].id = id;
+            client_prv->unsol_handlers[first_empty_slot].handler = handler;
+        }
+        else {
+            return RIL_CLIENT_ERR_RESOURCE;
+        }
+    }
+
+    return RIL_CLIENT_ERR_SUCCESS;
+}
+
+
+/**
+ * @fn  int RegisterRequestCompleteHandler(HRilClient client, uint32_t id, RilOnComplete handler)
+ *
+ * @params  client: Client handle.
+ *          id: Request ID to which handler is registered.
+ *          handler: Request complete handler. NULL for deregistration.
+ *
+ * @return  0 on success or error code.
+ */
+extern "C"
+int RegisterRequestCompleteHandler(HRilClient client, uint32_t id, RilOnComplete handler) {
+    RilClientPrv *client_prv;
+    int match_slot = -1;
+    int first_empty_slot = -1;
+    int i;
+
+    if (client == NULL || client->prv == NULL)
+        return RIL_CLIENT_ERR_INVAL;
+
+    client_prv = (RilClientPrv *)(client->prv);
+
+    for (i = 0; i < REQ_POOL_SIZE; i++) {
+        // Check if  there is matched handler.
+        if (id == client_prv->req_handlers[i].id) {
+            match_slot = i;
+        }
+        // Find first empty handler slot.
+        if (first_empty_slot == -1 && client_prv->req_handlers[i].id == 0) {
+            first_empty_slot = i;
+        }
+    }
+
+    if (handler == NULL) {  // Unregister.
+        if (match_slot >= 0) {
+            memset(&(client_prv->req_handlers[match_slot]), 0, sizeof(ReqRespHandler));
+            return RIL_CLIENT_ERR_SUCCESS;
+        }
+        else {
+            return RIL_CLIENT_ERR_SUCCESS;
+        }
+    }
+    else {  // Register.
+        if (match_slot >= 0) {
+            client_prv->req_handlers[match_slot].handler = handler; // Just update.
+        }
+        else if (first_empty_slot >= 0) {
+            client_prv->req_handlers[first_empty_slot].id = id;
+            client_prv->req_handlers[first_empty_slot].handler = handler;
+        }
+        else {
+            return RIL_CLIENT_ERR_RESOURCE;
+        }
+    }
+
+    return RIL_CLIENT_ERR_SUCCESS;
+}
+
+
+/**
+ * @fn  int RegisterErrorCallback(HRilClient client, RilOnError cb, void *data)
+ *
+ * @params  client: Client handle.
+ *          cb: Error callback. NULL for unregistration.
+ *          data: Callback data.
+ *
+ * @return  0 for success or error code.
+ */
+extern "C"
+int RegisterErrorCallback(HRilClient client, RilOnError cb, void *data) {
+    RilClientPrv *client_prv;
+
+    if (client == NULL || client->prv == NULL)
+        return RIL_CLIENT_ERR_INVAL;
+
+    client_prv = (RilClientPrv *)(client->prv);
+
+    client_prv->err_cb = cb;
+    client_prv->err_cb_data = data;
+
+    return RIL_CLIENT_ERR_SUCCESS;
+}
+
+
+/**
+ * @fn  HRilClient OpenClient_RILD(void)
+ *
+ * @params  None.
+ *
+ * @return  Client handle, NULL on error.
+ */
+extern "C"
+HRilClient OpenClient_RILD(void) {
+    HRilClient client = (HRilClient)malloc(sizeof(struct RilClient));
+    if (client == NULL)
+        return NULL;
+
+    client->prv = (RilClientPrv *)malloc(sizeof(RilClientPrv));
+    if (client->prv == NULL) {
+        free(client);
+        return NULL;
+    }
+
+    memset(client->prv, 0, sizeof(RilClientPrv));
+
+    ((RilClientPrv *)(client->prv))->parent = client;
+    ((RilClientPrv *)(client->prv))->sock = -1;
+
+    return client;
+}
+
+
+/**
+ * @fn  int Connect_RILD(void)
+ *
+ * @params  client: Client handle.
+ *
+ * @return  0, or error code.
+ */
+extern "C"
+int Connect_RILD(HRilClient client) {
+    RilClientPrv *client_prv;
+
+    if (client == NULL || client->prv == NULL) {
+        ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+        return RIL_CLIENT_ERR_INVAL;
+    }
+
+    client_prv = (RilClientPrv *)(client->prv);
+
+    // Open client socket and connect to server.
+    client_prv->sock = socket_local_client(MULTI_CLIENT_SOCKET_NAME, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM );
+
+    if (client_prv->sock < 0) {
+        ALOGE("%s: Connecting failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
+        return RIL_CLIENT_ERR_CONNECT;
+    }
+
+    client_prv->b_connect = 1;
+
+    if (fcntl(client_prv->sock, F_SETFL, O_NONBLOCK) < 0) {
+        close(client_prv->sock);
+        return RIL_CLIENT_ERR_IO;
+    }
+
+    client_prv->p_rs = record_stream_new(client_prv->sock, MAX_COMMAND_BYTES);
+
+    if (pipe(client_prv->pipefd) < 0) {
+        close(client_prv->sock);
+        ALOGE("%s: Creating command pipe failed. %s(%d)", __FUNCTION__, strerror(errno), errno);
+        return RIL_CLIENT_ERR_IO;
+    }
+
+    if (fcntl(client_prv->pipefd[0], F_SETFL, O_NONBLOCK) < 0) {
+        close(client_prv->sock);
+        close(client_prv->pipefd[0]);
+        close(client_prv->pipefd[1]);
+        return RIL_CLIENT_ERR_IO;
+    }
+
+    // Start socket read thread.
+    if (pthread_create(&(client_prv->tid_reader), NULL, RxReaderFunc, (void *)client_prv) != 0) {
+        close(client_prv->sock);
+        close(client_prv->pipefd[0]);
+        close(client_prv->pipefd[1]);
+
+        memset(client_prv, 0, sizeof(RilClientPrv));
+        client_prv->sock = -1;
+        ALOGE("%s: Can't create Reader thread. %s(%d)", __FUNCTION__, strerror(errno), errno);
+        return RIL_CLIENT_ERR_CONNECT;
+    }
+
+    return RIL_CLIENT_ERR_SUCCESS;
+}
+
+/**
+ * @fn  int Disconnect_RILD(HRilClient client)
+ *
+ * @params  client: Client handle.
+ *
+ * @return  0 on success, or error code.
+ */
+extern "C"
+int Disconnect_RILD(HRilClient client) {
+    RilClientPrv *client_prv;
+    int ret = 0;
+
+    if (client == NULL || client->prv == NULL) {
+        ALOGE("%s: invalid client %p", __FUNCTION__, client);
+        return RIL_CLIENT_ERR_INVAL;
+    }
+
+    client_prv = (RilClientPrv *)(client->prv);
+
+    if (client_prv->sock == -1)
+        return RIL_CLIENT_ERR_SUCCESS;
+
+    ALOGD("[*] %s(): sock=%d\n", __FUNCTION__, client_prv->sock);
+
+    if (client_prv->sock > 0) {
+        do {
+            ret = write(client_prv->pipefd[1], "close", strlen("close"));
+        } while (ret < 0 && errno == EINTR);
+    }
+
+    client_prv->b_connect = 0;
+
+    pthread_join(client_prv->tid_reader, NULL);
+
+    return RIL_CLIENT_ERR_SUCCESS;
+}
+
+
+/**
+ * @fn  int CloseClient_RILD(HRilClient client)
+ *
+ * @params  client: Client handle.
+ *
+ * @return  0 on success, or error code.
+ */
+extern "C"
+int CloseClient_RILD(HRilClient client) {
+    if (client == NULL || client->prv == NULL) {
+        ALOGE("%s: invalid client %p", __FUNCTION__, client);
+        return RIL_CLIENT_ERR_INVAL;
+    }
+
+    Disconnect_RILD(client);
+
+    free(client->prv);
+    free(client);
+
+    return RIL_CLIENT_ERR_SUCCESS;
+}
+
+/**
+ * @fn  int InvokeOemRequestHookRaw(HRilClient client, char *data, size_t len)
+ *
+ * @params  client: Client handle.
+ *          data: Request data.
+ *          len: Request data length.
+ *
+ * @return  0 for success or error code. On receiving RIL_CLIENT_ERR_AGAIN,
+ *          caller should retry.
+ */
+extern "C"
+int InvokeOemRequestHookRaw(HRilClient client, char *data, size_t len) {
+    RilClientPrv *client_prv;
+
+    if (client == NULL || client->prv == NULL) {
+        ALOGE("%s: Invalid client %p", __FUNCTION__, client);
+        return RIL_CLIENT_ERR_INVAL;
+    }
+
+    client_prv = (RilClientPrv *)(client->prv);
+
+    if (client_prv->sock < 0 ) {
+        ALOGE("%s: Not connected.", __FUNCTION__);
+        return RIL_CLIENT_ERR_CONNECT;
+    }
+
+    return SendOemRequestHookRaw(client, REQ_OEM_HOOK_RAW, data, len);
+}
+
+
+static int SendOemRequestHookRaw(HRilClient client, int req_id, char *data, size_t len) {
+    int token = 0;
+    int ret = 0;
+    uint32_t header = 0;
+    android::Parcel p;
+    RilClientPrv *client_prv;
+    int maxfd = -1;
+
+    client_prv = (RilClientPrv *)(client->prv);
+
+    // Allocate a token.
+    token = AllocateToken(&(client_prv->token_pool));
+    if (token == 0) {
+        ALOGE("%s: No token.", __FUNCTION__);
+        return RIL_CLIENT_ERR_AGAIN;
+    }
+
+    // Record token for the request sent.
+    if (RecordReqHistory(client_prv, token, req_id) != RIL_CLIENT_ERR_SUCCESS) {
+        goto error;
+    }
+
+    // Make OEM request data.
+    p.writeInt32(RIL_REQUEST_OEM_HOOK_RAW);
+    p.writeInt32(token);
+    p.writeInt32(len);
+    p.write((void *)data, len);
+
+    // DO TX: header(size).
+    header = htonl(p.dataSize());
+
+    if (DBG) ALOGD("%s(): token = %d\n", __FUNCTION__, token);
+
+    ret = blockingWrite(client_prv->sock, (void *)&header, sizeof(header));
+    if (ret < 0) {
+        ALOGE("%s: send request header failed. (%d)", __FUNCTION__, ret);
+        goto error;
+    }
+
+    // Do TX: response data.
+    ret = blockingWrite(client_prv->sock, p.data(), p.dataSize());
+    if (ret < 0) {
+        ALOGE("%s: send request data failed. (%d)", __FUNCTION__, ret);
+        goto error;
+    }
+
+    return RIL_CLIENT_ERR_SUCCESS;
+
+error:
+    FreeToken(&(client_prv->token_pool), token);
+    ClearReqHistory(client_prv, token);
+
+    return RIL_CLIENT_ERR_UNKNOWN;
+}
+
+static void * RxReaderFunc(void *param) {
+    RilClientPrv *client_prv = (RilClientPrv *)param;
+    int maxfd = 0;
+    int token = 0;
+    void *p_record = NULL;
+    size_t recordlen = 0;
+    int ret = 0;
+    int n;
+
+    if (client_prv == NULL)
+        return NULL;
+
+    maxfd = max(client_prv->sock, client_prv->pipefd[0]) + 1;
+
+    ALOGD("[*] %s() b_connect=%d, maxfd=%d\n", __FUNCTION__, client_prv->b_connect, maxfd);
+    while (client_prv->b_connect) {
+        FD_ZERO(&(client_prv->sock_rfds));
+
+        FD_SET(client_prv->sock, &(client_prv->sock_rfds));
+        FD_SET(client_prv->pipefd[0], &(client_prv->sock_rfds));
+
+        if (DBG) ALOGD("[*] %s() b_connect=%d\n", __FUNCTION__, client_prv->b_connect);
+        if (select(maxfd, &(client_prv->sock_rfds), NULL, NULL, NULL) > 0) {
+            if (FD_ISSET(client_prv->sock, &(client_prv->sock_rfds))) {
+                // Read incoming data
+                for (;;) {
+                    // loop until EAGAIN/EINTR, end of stream, or other error
+                    ret = record_stream_get_next(client_prv->p_rs, &p_record, &recordlen);
+                    if (ret == 0 && p_record == NULL) { // end-of-stream
+                        break;
+                    }
+                    else if (ret < 0) {
+                        break;
+                    }
+                    else if (ret == 0) {    // && p_record != NULL
+                        n = processRxBuffer(client_prv, p_record, recordlen);
+                        if (n != RIL_CLIENT_ERR_SUCCESS) {
+                            ALOGE("%s: processRXBuffer returns %d", __FUNCTION__, n);
+                        }
+                    }
+                    else {
+                        ALOGD("[*] %s()\n", __FUNCTION__);
+                    }
+                }
+
+                if (ret == 0 || !(errno == EAGAIN || errno == EINTR)) {
+                    // fatal error or end-of-stream
+                    if (client_prv->sock > 0) {
+                        close(client_prv->sock);
+                        client_prv->sock = -1;
+                        client_prv->b_connect = 0;
+                    }
+
+                    if (client_prv->p_rs)
+                        record_stream_free(client_prv->p_rs);
+
+                    // EOS
+                    if (client_prv->err_cb) {
+                        client_prv->err_cb(client_prv->err_cb_data, RIL_CLIENT_ERR_CONNECT);
+                        return NULL;
+                    }
+
+                    break;
+                }
+            }
+            if (FD_ISSET(client_prv->pipefd[0], &(client_prv->sock_rfds))) {
+                char end_cmd[10];
+
+                if (DBG) ALOGD("%s(): close\n", __FUNCTION__);
+
+                if (read(client_prv->pipefd[0], end_cmd, sizeof(end_cmd)) > 0) {
+                    close(client_prv->sock);
+                    close(client_prv->pipefd[0]);
+                    close(client_prv->pipefd[1]);
+
+                    client_prv->sock = -1;
+                    client_prv->b_connect = 0;
+                }
+            }
+        }
+    }
+
+    return NULL;
+}
+
+
+static int processUnsolicited(RilClientPrv *prv, Parcel &p) {
+    int32_t resp_id, len;
+    status_t status;
+    const void *data = NULL;
+    RilOnUnsolicited unsol_func = NULL;
+
+    status = p.readInt32(&resp_id);
+    if (status != NO_ERROR) {
+        ALOGE("%s: read resp_id failed.", __FUNCTION__);
+        return RIL_CLIENT_ERR_IO;
+    }
+
+    status = p.readInt32(&len);
+    if (status != NO_ERROR) {
+        //LOGE("%s: read length failed. assume zero length.", __FUNCTION__);
+        len = 0;
+    }
+
+    ALOGD("%s(): resp_id (%d), len(%d)\n", __FUNCTION__, resp_id, len);
+
+    if (len)
+        data = p.readInplace(len);
+
+    // Find unsolicited response handler.
+    unsol_func = FindUnsolHandler(prv, (uint32_t)resp_id);
+    if (unsol_func) {
+        unsol_func(prv->parent, data, len);
+    }
+
+    return RIL_CLIENT_ERR_SUCCESS;
+}
+
+
+static int processSolicited(RilClientPrv *prv, Parcel &p) {
+    int32_t token, err, len;
+    status_t status;
+    const void *data = NULL;
+    RilOnComplete req_func = NULL;
+    int ret = RIL_CLIENT_ERR_SUCCESS;
+    uint32_t req_id = 0;
+
+    if (DBG) ALOGD("%s()", __FUNCTION__);
+
+    status = p.readInt32(&token);
+    if (status != NO_ERROR) {
+        ALOGE("%s: Read token fail. Status %d\n", __FUNCTION__, status);
+        return RIL_CLIENT_ERR_IO;
+    }
+
+    if (IsValidToken(&(prv->token_pool), token) == 0) {
+        ALOGE("%s: Invalid Token", __FUNCTION__);
+        return RIL_CLIENT_ERR_INVAL;    // Invalid token.
+    }
+
+    status = p.readInt32(&err);
+    if (status != NO_ERROR) {
+        ALOGE("%s: Read err fail. Status %d\n", __FUNCTION__, status);
+        ret = RIL_CLIENT_ERR_IO;
+        goto error;
+    }
+
+    // Don't go further for error response.
+    if (err != RIL_CLIENT_ERR_SUCCESS) {
+        ALOGE("%s: Error %d\n", __FUNCTION__, err);
+        if (prv->err_cb)
+            prv->err_cb(prv->err_cb_data, err);
+        ret = RIL_CLIENT_ERR_SUCCESS;
+        goto error;
+    }
+
+    status = p.readInt32(&len);
+    if (status != NO_ERROR) {
+        /* no length field */
+        len = 0;
+    }
+
+    if (len)
+        data = p.readInplace(len);
+
+    // Find request handler for the token.
+    // First, FindReqHandler() searches request history with the token
+    // and finds out a request ID. Then, it search request handler table
+    // with the request ID.
+    req_func = FindReqHandler(prv, token, &req_id);
+    if (req_func)
+    {
+        if (DBG) ALOGD("[*] Call handler");
+        req_func(prv->parent, data, len);
+
+        if(prv->b_del_handler) {
+         prv->b_del_handler = 0;
+            RegisterRequestCompleteHandler(prv->parent, req_id, NULL);
+        }
+    } else {
+        if (DBG) ALOGD("%s: No handler for token %d\n", __FUNCTION__, token);
+    }
+
+error:
+    FreeToken(&(prv->token_pool), token);
+    ClearReqHistory(prv, token);
+    return ret;
+}
+
+
+static int processRxBuffer(RilClientPrv *prv, void *buffer, size_t buflen) {
+    Parcel p;
+    int32_t response_type;
+    status_t status;
+    int ret = RIL_CLIENT_ERR_SUCCESS;
+
+    acquire_wake_lock(PARTIAL_WAKE_LOCK, RIL_CLIENT_WAKE_LOCK);
+
+    p.setData((uint8_t *)buffer, buflen);
+
+    status = p.readInt32(&response_type);
+    if (DBG) ALOGD("%s: status %d response_type %d", __FUNCTION__, status, response_type);
+
+    if (status != NO_ERROR) {
+     ret = RIL_CLIENT_ERR_IO;
+        goto EXIT;
+    }
+
+    // FOr unsolicited response.
+    if (response_type == RESPONSE_UNSOLICITED) {
+        ret = processUnsolicited(prv, p);
+    }
+    // For solicited response.
+    else if (response_type == RESPONSE_SOLICITED) {
+        ret = processSolicited(prv, p);
+        if (ret != RIL_CLIENT_ERR_SUCCESS && prv->err_cb) {
+            prv->err_cb(prv->err_cb_data, ret);
+        }
+    }
+    else {
+        ret =  RIL_CLIENT_ERR_INVAL;
+    }
+
+EXIT:
+    release_wake_lock(RIL_CLIENT_WAKE_LOCK);
+    return ret;
+}
+
+
+static uint32_t AllocateToken(uint32_t *token_pool) {
+    int i;
+
+    // Token pool is full.
+    if (*token_pool == 0xFFFFFFFF)
+        return 0;
+
+    for (i = 0; i < 32; i++) {
+        uint32_t new_token = 0x00000001 << i;
+
+        if ((*token_pool & new_token) == 0) {
+            *token_pool |= new_token;
+            return new_token;
+        }
+    }
+
+    return 0;
+}
+
+
+static void FreeToken(uint32_t *token_pool, uint32_t token) {
+    *token_pool &= ~token;
+}
+
+
+static uint8_t IsValidToken(uint32_t *token_pool, uint32_t token) {
+    if (token == 0)
+        return 0;
+
+    if ((*token_pool & token) == token)
+        return 1;
+    else
+        return 0;
+}
+
+
+static int RecordReqHistory(RilClientPrv *prv, int token, uint32_t id) {
+    int i = 0;
+
+    if (DBG) ALOGD("[*] %s(): token(%d), ID(%d)\n", __FUNCTION__, token, id);
+    for (i = 0; i < TOKEN_POOL_SIZE; i++) {
+        if (prv->history[i].token == 0) {
+            prv->history[i].token = token;
+            prv->history[i].id = id;
+
+            if (DBG) ALOGD("[*] %s(): token(%d), ID(%d)\n", __FUNCTION__, token, id);
+
+            return RIL_CLIENT_ERR_SUCCESS;
+        }
+    }
+
+    ALOGE("%s: No free record for token %d", __FUNCTION__, token);
+
+    return RIL_CLIENT_ERR_RESOURCE;
+}
+
+static void ClearReqHistory(RilClientPrv *prv, int token) {
+    int i = 0;
+
+    if (DBG) ALOGD("[*] %s(): token(%d)\n", __FUNCTION__, token);
+    for (i = 0; i < TOKEN_POOL_SIZE; i++) {
+        if (prv->history[i].token == token) {
+            memset(&(prv->history[i]), 0, sizeof(ReqHistory));
+            break;
+        }
+    }
+}
+
+
+static RilOnUnsolicited FindUnsolHandler(RilClientPrv *prv, uint32_t id) {
+    int i;
+
+    // Search unsolicited handler table.
+    for (i = 0; i < REQ_POOL_SIZE; i++) {
+        if (prv->unsol_handlers[i].id == id)
+            return prv->unsol_handlers[i].handler;
+    }
+
+    return (RilOnUnsolicited)NULL;
+}
+
+
+static RilOnComplete FindReqHandler(RilClientPrv *prv, int token, uint32_t *id) {
+    int i = 0;
+    int j = 0;
+
+    if (DBG) ALOGD("[*] %s(): token(%d)\n", __FUNCTION__, token);
+
+    // Search request history.
+    for (i = 0; i < TOKEN_POOL_SIZE; i++) {
+        ALOGD("[*] %s(): history_token(%d)\n", __FUNCTION__, prv->history[i].token);
+        if (prv->history[i].token == token) {
+            // Search request handler with request ID found.
+            for (j = 0; j < REQ_POOL_SIZE; j++) {
+                ALOGD("[*] %s(): token(%d), req_id(%d), history_id(%d)\n", __FUNCTION__, token, prv->history[i].id, prv->history[i].id);
+                if (prv->req_handlers[j].id == prv->history[i].id) {
+              *id = prv->req_handlers[j].id;
+                    return prv->req_handlers[j].handler;
+                }
+            }
+        }
+    }
+
+    return NULL;
+}
+
+
+static int blockingWrite(int fd, const void *buffer, size_t len) {
+    size_t writeOffset = 0;
+    const uint8_t *toWrite;
+    ssize_t written = 0;
+
+    if (buffer == NULL)
+        return -1;
+
+    toWrite = (const uint8_t *)buffer;
+
+    while (writeOffset < len) {
+        do
+        {
+            written = write(fd, toWrite + writeOffset, len - writeOffset);
+        } while (written < 0 && errno == EINTR);
+
+        if (written >= 0) {
+            writeOffset += written;
+        }
+        else {
+            ALOGE ("RIL Response: unexpected error on write errno:%d", errno);
+            close(fd);
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+} // namespace android
+
+// end of file
+
diff --git a/ril/libsecril-client-sap/secril-client-sap.h b/ril/libsecril-client-sap/secril-client-sap.h
new file mode 100755
index 0000000..45e2301
--- /dev/null
+++ b/ril/libsecril-client-sap/secril-client-sap.h
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __SECRIL_CLIENT_H__
+#define __SECRIL_CLIENT_H__
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct RilClient {
+    void *prv;
+};
+
+typedef struct RilClient * HRilClient;
+
+
+//---------------------------------------------------------------------------
+// Defines
+//---------------------------------------------------------------------------
+#define RIL_CLIENT_ERR_SUCCESS      0
+#define RIL_CLIENT_ERR_AGAIN        1
+#define RIL_CLIENT_ERR_INIT         2   // Client is not initialized
+#define RIL_CLIENT_ERR_INVAL        3   // Invalid value
+#define RIL_CLIENT_ERR_CONNECT      4   // Connection error
+#define RIL_CLIENT_ERR_IO           5   // IO error
+#define RIL_CLIENT_ERR_RESOURCE     6   // Resource not available
+#define RIL_CLIENT_ERR_UNKNOWN      7
+
+
+//---------------------------------------------------------------------------
+// Type definitions
+//---------------------------------------------------------------------------
+
+typedef int (*RilOnComplete)(HRilClient handle, const void *data, size_t datalen);
+
+typedef int (*RilOnUnsolicited)(HRilClient handle, const void *data, size_t datalen);
+
+typedef int (*RilOnError)(void *data, int error);
+
+
+//---------------------------------------------------------------------------
+// Client APIs
+//---------------------------------------------------------------------------
+
+/**
+ * Open RILD multi-client.
+ * Return is client handle, NULL on error.
+ */
+HRilClient OpenClient_RILD(void);
+
+/**
+ * Stop RILD multi-client. If client socket was connected,
+ * it will be disconnected.
+ */
+int CloseClient_RILD(HRilClient client);
+
+/**
+ * Connect to RIL deamon. One client task starts.
+ * Return is 0 or error code.
+ */
+int Connect_RILD(HRilClient client);
+
+/**
+ * check whether RILD is connected
+ * Returns 0 or 1
+ */
+int isConnected_RILD(HRilClient client);
+
+/**
+ * Disconnect connection to RIL deamon(socket close).
+ * Return is 0 or error code.
+ */
+int Disconnect_RILD(HRilClient client);
+
+/**
+ * Register unsolicited response handler. If handler is NULL,
+ * the handler for the request ID is unregistered.
+ * The response handler is invoked in the client task context.
+ * Return is 0 or error code.
+ */
+int RegisterUnsolicitedHandler(HRilClient client, uint32_t id, RilOnUnsolicited handler);
+
+/**
+ * Register solicited response handler. If handler is NULL,
+ * the handler for the ID is unregistered.
+ * The response handler is invoked in the client task context.
+ * Return is 0 or error code.
+ */
+int RegisterRequestCompleteHandler(HRilClient client, uint32_t id, RilOnComplete handler);
+
+/**
+ * Register error callback. If handler is NULL,
+ * the callback is unregistered.
+ * The response handler is invoked in the client task context.
+ * Return is 0 or error code.
+ */
+int RegisterErrorCallback(HRilClient client, RilOnError cb, void *data);
+
+/**
+ * Invoke OEM request. Request ID is RIL_REQUEST_OEM_HOOK_RAW.
+ * Return is 0 or error code. For RIL_CLIENT_ERR_AGAIN caller should retry.
+ */
+int InvokeOemRequestHookRaw(HRilClient client, char *data, size_t len);
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif // __SECRIL_CLIENT_H__
+
+// end of file
+