latest code merge from SISO - MUX enabled by default

Change-Id: Id47757c2f44d99798b80e8294cc218555b32221c

diff --git a/packaging/tel-plugin-imc.spec b/packaging/tel-plugin-imc.spec
index 0ccbe57..5000e1f 100755 (executable)
--- a/packaging/tel-plugin-imc.spec
+++ b/packaging/tel-plugin-imc.spec
@@ -2,7 +2,7 @@
 Name:       tel-plugin-imc
 Summary:    imc plugin for telephony
 ExclusiveArch:  %{arm}
-Version:    0.1.5
+Version:    0.1.6
 Release:    1
 Group:      System/Libraries
 License:    Apache

diff --git a/src/s_common.c b/src/s_common.c
index 6045f52..2ea710a 100755 (executable)
--- a/src/s_common.c
+++ b/src/s_common.c
@@ -47,7 +47,7 @@
 #define MASK_AND_SHIFT(width, offset, shift, data)  \\r
                   ((((signed) (shift)) < 0) ?       \\r
                     MASK((width), (offset), (data)) << -(shift) :  \\r
-                    MASK((width), (offset), (data)) >>  (((unsigned) (shift)))) \\r
+                    MASK((width), (offset), (data)) >>  (((signed) (shift)))) \\r
 \r
 char _util_unpackb(const char *src, int pos, int len);\r
 char _util_convert_byte_hexChar (char val);\r

diff --git a/src/s_modem.c b/src/s_modem.c
index a90aad5..9d1f052 100755 (executable)
--- a/src/s_modem.c
+++ b/src/s_modem.c
@@ -96,7 +96,6 @@ typedef struct {
        unsigned char szEriVersion[TAPI_MISC_PRL_ERI_VER_LEN_MAX * 3];/**< eri version (only for CDMA), null termination */\r
 } TelMiscVersionInformation;\r
 \r
-extern int g_cmux_enable;\r
        \r
 void prepare_and_send_pending_request(TcorePlugin *plugin, char *co_name, const char *at_cmd, const char* prefix, enum tcore_at_command_type at_cmd_type, TcorePendingResponseCallback callback);\r
 static void on_confirmation_modem_message_send(TcorePending *p, gboolean result, void *user_data); // from Kernel\r
@@ -517,11 +516,9 @@ static void _modem_subscribe_events(TcorePlugin *plugin)
 \r
        /* XSIMSTATE subscription */\r
        prepare_and_send_pending_request(plugin, "sim", "at+xsimstate=1", NULL, TCORE_AT_NO_RESULT, on_response_bootup_subscription);\r
-       if(1 == g_cmux_enable)\r
-       {\r
+\r
                prepare_and_send_pending_request(plugin, "umts_sms", "at+xsimstate=1", NULL, TCORE_AT_NO_RESULT, on_response_bootup_subscription);\r
                prepare_and_send_pending_request(plugin, "modem", "at+xsimstate=1", NULL, TCORE_AT_NO_RESULT, on_response_bootup_subscription);\r
-       }\r
 \r
        /* CREG subscription */\r
        prepare_and_send_pending_request(plugin, "umts_network", "at+creg=2", NULL, TCORE_AT_NO_RESULT, on_response_bootup_subscription);\r
@@ -580,6 +577,8 @@ static void on_response_setupmux(TcorePending *p, int data_len, const void *data
 {\r
        TcorePlugin *plugin = NULL;\r
        TcoreHal *hal = NULL;\r
+       TReturn ret;\r
+       dbg("Entry");\r
        \r
        /* IMC Plugin dereferenced from pending request */\r
        plugin = tcore_pending_ref_plugin(p);\r
@@ -588,8 +587,15 @@ static void on_response_setupmux(TcorePending *p, int data_len, const void *data
        hal = (TcoreHal *)user_data;\r
 \r
        /* Initialize CMUX */\r
-       tcore_cmux_init(plugin, hal);\r
+       ret = tcore_cmux_init(plugin, hal);\r
+       if(TCORE_RETURN_SUCCESS == ret) {\r
+               dbg("Successfully initialized CMUX");\r
+       }\r
+       else {\r
+               err("Failed to initialize CMUX");\r
+       }\r
        \r
+       dbg("Exit");\r
        return;\r
 }\r
 \r
@@ -613,6 +619,7 @@ static void setup_mux(CoreObject *o)
        /* Send callback */\r
        tcore_hal_send_request(hal, pending);\r
 \r
+       dbg("Exit");\r
        return;\r
 }\r
 \r
@@ -650,13 +657,9 @@ static void on_response_enable_logging(TcorePending *p, int data_len, const void
                dbg("Enabling CP logging is failed !!!\n");\r
        }\r
 \r
-       if(g_cmux_enable == 1){\r
                dbg("Calling setup_mux");\r
                setup_mux(tcore_pending_ref_core_object(p));\r
-       }\r
-       else{\r
-               _modem_subscribe_events(plugin);\r
-       }\r
+\r
 \r
        dbg("Exit");\r
        return;\r
@@ -731,7 +734,7 @@ static void on_response_poweron(TcorePending *p, int data_len, const void *data,
                        case CPAS_RES_UNAVAIL:\r
                        case CPAS_RES_UNKNOWN:\r
                        default:\r
-                               dbg("value is unvail/unknown - but forcefully proceed for test. should be changed -hyko20120803");\r
+                               dbg("value is unvail/unknown - but CP responded - proceed poweron");\r
                                //bpoweron = FALSE;\r
                                bpoweron = TRUE;\r
                        break;\r
@@ -903,10 +906,9 @@ gboolean s_modem_init(TcorePlugin *p, TcoreHal *h)
        sn_property = calloc(sizeof(TelMiscSNInformation), 1);\r
        tcore_plugin_link_property(p, "SN", sn_property);\r
 \r
-       if(g_cmux_enable == 1){\r
                dbg("Registerind for CMUX-UP event");\r
                tcore_object_add_callback(o, "CMUX-UP", on_event_mux_channel_up, p);\r
-       }\r
+\r
 \r
        dbg("Registering for +XSIM event");\r
        tcore_object_add_callback(o, "+XSIM", on_event_bootup_sim_status, NULL);\r