Add WEA 3.0 CB message info and chipset info

Change-Id: I96e4f3013f1222e52383de34d5a717d6e540852b
Signed-off-by: sinikang <sinikang@samsung.com>

diff --git a/introspection/modem.xml b/introspection/modem.xml
index 3e78df9..6846752 100644 (file)
--- a/introspection/modem.xml
+++ b/introspection/modem.xml
@@ -59,6 +59,7 @@
                        <arg direction="out" type="s" name="product_code"/>
                        <arg direction="out" type="s" name="prl_version"/>
                        <arg direction="out" type="s" name="eri_version"/>
+                       <arg direction="out" type="s" name="cp_chipset"/>
                </method>
 
                <!--

diff --git a/introspection/sms.xml b/introspection/sms.xml
index c7e35ee..545734f 100644 (file)
--- a/introspection/sms.xml
+++ b/introspection/sms.xml
@@ -16,7 +16,7 @@
                        @moreMsg: MoreMsgToSend
                        @result: Success(0)
 
-                       Sends an SMS message to the networ
+                       Sends an SMS message to the network
                -->
                <method name="SendMsg">
                        <arg direction="in" type="i" name="format"/>
@@ -386,6 +386,8 @@
                        <arg type="i" name="cbMsgType"/>
                        <arg type="i" name="msgLength"/>
                        <arg type="s" name="tpdu"/>
+                       <arg type="i" name="wacLen"/>
+                       <arg type="s" name="wacData"/>
                </signal>
 
                <!--

diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec
index 9b69365..a2652f3 100644 (file)
--- a/packaging/tel-plugin-dbus_tapi.spec
+++ b/packaging/tel-plugin-dbus_tapi.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 4
-%define patchlevel 07
+%define patchlevel 8
 
 Name:           tel-plugin-dbus_tapi
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/dtapi_modem.c b/src/dtapi_modem.c
index d729a35..dc87f53 100644 (file)
--- a/src/dtapi_modem.c
+++ b/src/dtapi_modem.c
@@ -363,7 +363,8 @@ gboolean dbus_plugin_modem_response(struct custom_data *ctx,
                        dbus_info->invocation, resp_get_version->result,
                        resp_get_version->software, resp_get_version->hardware,
                        resp_get_version->calibration, resp_get_version->product_code,
-                       resp_get_version->prl_version, resp_get_version->eri_version);
+                       resp_get_version->prl_version, resp_get_version->eri_version,
+                       resp_get_version->cp_chipset);
        }
        break;
 

diff --git a/src/dtapi_sms.c b/src/dtapi_sms.c
index 46384cd..cc0fd93 100644 (file)
--- a/src/dtapi_sms.c
+++ b/src/dtapi_sms.c
@@ -1055,17 +1055,22 @@ gboolean dbus_plugin_sms_notification(struct custom_data *ctx,
        case TNOTI_SMS_CB_INCOM_MSG: {
                const struct tnoti_sms_cellBroadcast_msg *noti = data;
                gchar *tpdu = NULL;
+               gchar *wac = NULL;
 
                info("[%s] SMS_CB_INCOM_MSG (len[%d])", cp_name, data_len);
 
                tpdu = g_base64_encode((const guchar*)(noti->cbMsg.msgData), SMS_CB_SIZE_MAX+1);
+               wac = g_base64_encode((const guchar*)(noti->cbMsg.wacData), noti->cbMsg.wacLen);
 
                telephony_sms_emit_incomming_cb_msg(sms,
                        noti->cbMsg.cbMsgType,
                        noti->cbMsg.length,
-                       tpdu);
+                       tpdu,
+                       noti->cbMsg.wacLen,
+                       wac);
 
                g_free(tpdu);
+               g_free(wac);
        }
        break;