From 5e393674d76a3d2f9e389a348823c7e17688d38f Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:18:42 +0900 Subject: [PATCH] merge with master --- ...bus-create-interfaces-when-modem-is-added.patch | 120 --------------------- packaging/0002-sms-PDU-Trace-enhancement.patch | 43 -------- packaging/tel-plugin-dbus_tapi.spec | 14 +-- src/sat_ui_support/TelSim.h | 6 +- 4 files changed, 4 insertions(+), 179 deletions(-) delete mode 100644 packaging/0001-desc-dbus-create-interfaces-when-modem-is-added.patch delete mode 100644 packaging/0002-sms-PDU-Trace-enhancement.patch diff --git a/packaging/0001-desc-dbus-create-interfaces-when-modem-is-added.patch b/packaging/0001-desc-dbus-create-interfaces-when-modem-is-added.patch deleted file mode 100644 index 840ce75..0000000 --- a/packaging/0001-desc-dbus-create-interfaces-when-modem-is-added.patch +++ /dev/null @@ -1,120 +0,0 @@ -From ec42dbbe5a71887c55766891f9c340d824a07659 Mon Sep 17 00:00:00 2001 -From: Caiwen Zhang -Date: Thu, 27 Dec 2012 22:07:29 +0800 -Subject: [PATCH 1/2] desc-dbus: create interfaces when modem is added -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Merge "Change Ic4376ea2: desc-dbus: Create interfaces when modem -is added", Oct 16, submitted by Guillaume on master branch. ---- - src/desc-dbus.c | 51 ++++++--------------------------------------------- - 1 file changed, 6 insertions(+), 45 deletions(-) - -diff --git a/src/desc-dbus.c b/src/desc-dbus.c -index a2a135f..42e4b0f 100644 ---- a/src/desc-dbus.c -+++ b/src/desc-dbus.c -@@ -135,43 +135,6 @@ OUT: - g_free(path); - } - --static void refresh_object(struct custom_data *ctx) --{ -- GSList *plugins; -- GSList *cur; -- GSList *co_list; -- TcorePlugin *p; -- -- if (!ctx->manager) { -- dbg("not ready.."); -- return; -- } -- -- plugins = tcore_server_ref_plugins(ctx->server); -- if (!plugins) -- return; -- -- cur = plugins; -- for (cur = plugins; cur; cur = cur->next) { -- p = cur->data; -- if (!p) -- continue; -- -- co_list = tcore_plugin_get_core_objects_bytype(p, CORE_OBJECT_TYPE_MODEM); -- if (!co_list) -- continue; -- -- if (!tcore_object_get_hal(co_list->data)) { -- g_slist_free(co_list); -- continue; -- } -- -- g_slist_free(co_list); -- -- add_modem(ctx, p); -- } --} -- - static TReturn send_response(Communicator *comm, UserRequest *ur, enum tcore_response_command command, unsigned int data_len, const void *data) - { - struct custom_data *ctx = NULL; -@@ -247,6 +210,7 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc - char *plugin_name; - char *path; - TelephonyObjectSkeleton *object; -+ TcorePlugin *p = tcore_object_ref_plugin(source); - - dbg("notification !!! (command = 0x%x, data_len = %d)", command, data_len); - -@@ -256,7 +220,7 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc - return FALSE; - } - -- plugin_name = tcore_plugin_ref_plugin_name(tcore_object_ref_plugin(source)); -+ plugin_name = tcore_plugin_ref_plugin_name(p); - if (plugin_name) { - path = g_strdup_printf("%s/%s", MY_DBUS_PATH, plugin_name); - } -@@ -293,7 +257,10 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc - break; - - case TNOTI_MODEM: -- dbus_plugin_modem_notification(ctx, plugin_name, object, command, data_len, data); -+ if (command == TNOTI_MODEM_ADDED) -+ add_modem(ctx, p); -+ else -+ dbus_plugin_modem_notification(ctx, plugin_name, object, command, data_len, data); - break; - - case TNOTI_SMS: -@@ -315,9 +282,6 @@ static TReturn send_notification(Communicator *comm, CoreObject *source, enum tc - break; - - case TNOTI_SERVER: -- if (command == TNOTI_SERVER_RUN) { -- refresh_object(ctx); -- } - break; - - default: -@@ -394,8 +358,6 @@ static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer u - - info("dbus registered"); - -- refresh_object(ctx); -- - /* Add interface to default object path */ - mgr = telephony_manager_skeleton_new(); - g_signal_connect (mgr, -@@ -468,7 +430,6 @@ static gboolean on_init(TcorePlugin *p) - NULL); - - data->manager = g_dbus_object_manager_server_new (MY_DBUS_PATH); -- refresh_object(data); - - return TRUE; - } --- -1.7.10.4 - diff --git a/packaging/0002-sms-PDU-Trace-enhancement.patch b/packaging/0002-sms-PDU-Trace-enhancement.patch deleted file mode 100644 index d0e7962..0000000 --- a/packaging/0002-sms-PDU-Trace-enhancement.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 757427f10bc55b32995c6ffb6ed4f3b75287e9cc Mon Sep 17 00:00:00 2001 -From: Nicolas Bertrand -Date: Mon, 21 Jan 2013 10:30:16 +0100 -Subject: [PATCH 2/2] sms: PDU Trace enhancement -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - ---- - src/sms.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/sms.c b/src/sms.c -index 5443568..ee8ed4e 100644 ---- a/src/sms.c -+++ b/src/sms.c -@@ -60,14 +60,22 @@ on_sms_send_msg(TelephonySms *sms, GDBusMethodInvocation *invocation, - guchar *decoded_tpdu = NULL; - - memset(&sendUmtsMsg, 0 , sizeof(struct treq_sms_send_umts_msg)); -+ dbg("tpdu_length = %d", tpdu_length); -+ -+ dbg("sca: <%s>", sca); -+ dbg("pdu: <%s>", tpdu_data); - - decoded_sca = g_base64_decode(sca, &length); -+ dbg("decoded_sca length = %d", length); -+ - memcpy(&(sendUmtsMsg.msgDataPackage.sca[0]), decoded_sca, SMS_SMSP_ADDRESS_LEN); - - sendUmtsMsg.msgDataPackage.msgLength = tpdu_length; -- dbg("tpdu_length = 0x%x", tpdu_length); -+ -+ decoded_tpdu = g_base64_decode(tpdu_data, &length); -+ -+ dbg("decoded_tpu length = %d", length); - -- decoded_tpdu = g_base64_decode(tpdu_data, &length); - memcpy(&(sendUmtsMsg.msgDataPackage.tpduData[0]), decoded_tpdu, SMS_SMDATA_SIZE_MAX + 1); - sendUmtsMsg.more = moreMsg; - --- -1.7.10.4 - diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec index 611b2f7..5402ab0 100644 --- a/packaging/tel-plugin-dbus_tapi.spec +++ b/packaging/tel-plugin-dbus_tapi.spec @@ -1,6 +1,6 @@ %define major 0 %define minor 1 -%define patchlevel 115 +%define patchlevel 215 Name: tel-plugin-dbus_tapi Summary: dbus-tapi plugin for telephony Version: %{major}.%{minor}.%{patchlevel} @@ -8,12 +8,6 @@ Release: 1 Group: System/Libraries License: Apache Source0: tel-plugin-dbus_tapi-%{version}.tar.gz -%ifarch %ix86 -%if "%{simulator}" != "1" -patch0: 0001-desc-dbus-create-interfaces-when-modem-is-added.patch -patch1: 0002-sms-PDU-Trace-enhancement.patch -%endif -%endif Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: cmake @@ -34,12 +28,6 @@ dbus-tapi plugin for telephony %prep %setup -q -%ifarch %ix86 -%if "%{simulator}" != "1" -%patch0 -p1 -%patch1 -p1 -%endif -%endif %build versionint=$[%{major} * 1000000 + %{minor} * 1000 + %{patchlevel}] diff --git a/src/sat_ui_support/TelSim.h b/src/sat_ui_support/TelSim.h index 652e3aa..dde946a 100644 --- a/src/sat_ui_support/TelSim.h +++ b/src/sat_ui_support/TelSim.h @@ -724,7 +724,7 @@ typedef struct { * This data structure defines the data for the apdu. */ typedef struct { - unsigned char apdu_len; + unsigned short apdu_len; unsigned char* apdu; } TelSimApdu_t; @@ -732,7 +732,7 @@ typedef struct { * This data structure defines the data for the Response of sending apdu. */ typedef struct { - unsigned char apdu_resp_len; + unsigned short apdu_resp_len; unsigned char apdu_resp[TAPI_SIM_APDU_MAX_LEN]; } TelSimApduResp_t; @@ -740,7 +740,7 @@ typedef struct { * This data structure defines the data for the Response of sending apdu. */ typedef struct { - unsigned char atr_resp_len; + unsigned short atr_resp_len; unsigned char atr_resp[TAPI_SIM_APDU_MAX_LEN]; } TelSimAtrResp_t; -- 2.7.4