Merge kwd to master

Change-Id: Id33008507cbafc88288b6483c7691d6db34cc5c3

3 files changed, 73 insertions, 11 deletions

diff --git a/rild/Android.mk b/rild/Android.mk
index 1f616b1..151cda6 100644
--- a/rild/Android.mk
+++ b/rild/Android.mk
@@ -18,6 +18,11 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 	librilutils_static
 
 LOCAL_CFLAGS := -DRIL_SHLIB
+#LOCAL_CFLAGS += -DANDROID_MULTI_SIM
+
+ifeq ($(SIM_COUNT), 2)
+    LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2
+endif
 
 LOCAL_MODULE:= rild
 LOCAL_MODULE_TAGS := optional
diff --git a/rild/radiooptions.c b/rild/radiooptions.c
index 1a4ec11..91c76da 100644
--- a/rild/radiooptions.c
+++ b/rild/radiooptions.c
@@ -21,6 +21,7 @@
 #include <cutils/sockets.h>
 
 #define SOCKET_NAME_RIL_DEBUG	"rild-debug"	/* from ril.cpp */
+#define SOCKET_NAME_RIL2_DEBUG	"rild2-debug"
 
 enum options {
     RADIO_RESET,
@@ -49,7 +50,15 @@ static void print_usage() {
            7 - DEACTIVE_PDP, \n\
            8 number - DIAL_CALL number, \n\
            9 - ANSWER_CALL, \n\
-           10 - END_CALL \n");
+           10 - END_CALL \n\
+          The argument before the last one must be SIM slot \n\
+           0 - SIM1, \n\
+           1 - SIM2, \n\
+           2 - SIM3, \n\
+           3 - SIM4, \n\
+          The last argument must be modem-socket style \n\
+           0 - one modem for one debug-socket, \n\
+           1 - one modem for multiple debug socket \n");
 }
 
 static int error_check(int argc, char * argv[]) {
@@ -59,9 +68,9 @@ static int error_check(int argc, char * argv[]) {
     const int option = atoi(argv[1]);
     if (option < 0 || option > 10) {
         return 0;
-    } else if ((option == DIAL_CALL || option == SETUP_PDP) && argc == 3) {
+    } else if ((option == DIAL_CALL || option == SETUP_PDP) && argc == 5) {
         return 0;
-    } else if ((option != DIAL_CALL && option != SETUP_PDP) && argc == 2) {
+    } else if ((option != DIAL_CALL && option != SETUP_PDP) && argc == 4) {
         return 0;
     }
     return -1;
@@ -70,9 +79,9 @@ static int error_check(int argc, char * argv[]) {
 static int get_number_args(char *argv[]) {
     const int option = atoi(argv[1]);
     if (option != DIAL_CALL && option != SETUP_PDP) {
-        return 1;
+        return 3;
     } else {
-        return 2;
+        return 4;
     }
 }
 
@@ -81,20 +90,36 @@ int main(int argc, char *argv[])
     int fd;
     int num_socket_args = 0;
     int i  = 0;
+    int modem_socket_type = 0;
+    int sim_id = 0;
+    char socket_name[20];
+
     if(error_check(argc, argv)) {
         print_usage();
         exit(-1);
     }
 
-    fd = socket_local_client(SOCKET_NAME_RIL_DEBUG,
-                             ANDROID_SOCKET_NAMESPACE_RESERVED,
-                             SOCK_STREAM);
+    num_socket_args = get_number_args(argv);
+    modem_socket_type = atoi(argv[(num_socket_args-1)]);
+    sim_id = atoi(argv[(num_socket_args-2)]);
+    memset(socket_name, 0, sizeof(char)*20);
+    if (sim_id == 0 || modem_socket_type == 1) {
+        strncpy(socket_name, SOCKET_NAME_RIL_DEBUG, 19);
+    } else if (sim_id == 1) {
+        strncpy(socket_name, SOCKET_NAME_RIL2_DEBUG, 19);
+    }
+    
+    fd = socket_local_client(socket_name,
+                                 ANDROID_SOCKET_NAMESPACE_RESERVED,
+                                 SOCK_STREAM);
     if (fd < 0) {
         perror ("opening radio debug socket");
         exit(-1);
     }
 
-    num_socket_args = get_number_args(argv);
+    
+    /* It is not necessacry to pass the argument "modem-socket style" to rild */
+    num_socket_args--;
     int ret = send(fd, (const void *)&num_socket_args, sizeof(int), 0);
     if(ret != sizeof(int)) {
         perror ("Socket write error when sending num args");
diff --git a/rild/rild.c b/rild/rild.c
index 0ef5c87..64508f4 100644
--- a/rild/rild.c
+++ b/rild/rild.c
@@ -1,6 +1,6 @@
 /* //device/system/rild/rild.c
 **
-** Copyright 2006, The Android Open Source Project
+** Copyright 2006 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.
@@ -45,13 +45,21 @@ static void usage(const char *argv0)
     exit(EXIT_FAILURE);
 }
 
+extern char rild[MAX_SOCKET_NAME_LENGTH];
+
 extern void RIL_register (const RIL_RadioFunctions *callbacks);
 
 extern void RIL_onRequestComplete(RIL_Token t, RIL_Errno e,
                            void *response, size_t responselen);
 
+
+#if defined(ANDROID_MULTI_SIM)
+extern void RIL_onUnsolicitedResponse(int unsolResponse, const void *data,
+                                size_t datalen, RIL_SOCKET_ID socket_id);
+#else
 extern void RIL_onUnsolicitedResponse(int unsolResponse, const void *data,
                                 size_t datalen);
+#endif
 
 extern void RIL_requestTimedCallback (RIL_TimedCallback callback,
                                void *param, const struct timeval *relativeTime);
@@ -119,6 +127,9 @@ int main(int argc, char **argv)
     unsigned char hasLibArgs = 0;
 
     int i;
+    const char *clientId = NULL;
+    RLOGD("**RIL Daemon Started**");
+    RLOGD("**RILd param count=%d**", argc);
 
     umask(S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH);
     for (i = 1; i < argc ;) {
@@ -129,11 +140,24 @@ int main(int argc, char **argv)
             i++;
             hasLibArgs = 1;
             break;
+        } else if (0 == strcmp(argv[i], "-c") &&  (argc - i > 1)) {
+            clientId = argv[i+1];
+            i += 2;
         } else {
             usage(argv[0]);
         }
     }
 
+    if (clientId == NULL) {
+        clientId = "0";
+    } else if (atoi(clientId) >= MAX_RILDS) {
+        RLOGE("Max Number of rild's supported is: %d", MAX_RILDS);
+        exit(0);
+    }
+    if (strncmp(clientId, "0", MAX_CLIENT_ID_LENGTH)) {
+        RIL_setRilSocketName(strncat(rild, clientId, MAX_SOCKET_NAME_LENGTH));
+    }
+
     if (rilLibPath == NULL) {
         if ( 0 == property_get(LIB_PATH_PROPERTY, libPath, NULL)) {
             // No lib sepcified on the command line, and nothing set in props.
@@ -147,7 +171,7 @@ int main(int argc, char **argv)
     /* special override when in the emulator */
 #if 1
     {
-        static char*  arg_overrides[3];
+        static char*  arg_overrides[5];
         static char   arg_device[32];
         int           done = 0;
 
@@ -280,15 +304,23 @@ OpenLib:
         argc = make_argv(args, rilArgv);
     }
 
+    rilArgv[argc++] = "-c";
+    rilArgv[argc++] = clientId;
+    RLOGD("RIL_Init argc = %d clientId = %s", argc, rilArgv[argc-1]);
+
     // Make sure there's a reasonable argv[0]
     rilArgv[0] = argv[0];
 
     funcs = rilInit(&s_rilEnv, argc, rilArgv);
+    RLOGD("RIL_Init rilInit completed");
 
     RIL_register(funcs);
 
+    RLOGD("RIL_Init RIL_register completed");
+
 done:
 
+    RLOGD("RIL_Init starting sleep loop");
     while (true) {
         sleep(UINT32_MAX);
     }