Update plugin to compile with new libtcore

modem name is based on cp_name

diff --git a/src/context.c b/src/context.c
index db775a8..d636685 100644 (file)
--- a/src/context.c
+++ b/src/context.c
@@ -590,7 +590,7 @@ static gboolean __ps_context_create_co_context(gpointer object, GHashTable *prop
        path = __ps_context_create_path(profile_name, profile_id, svc_ctg_id);
 
        context = (PsContext *) object;
-       co_context = tcore_context_new(context->plg, path, NULL);
+       co_context = tcore_context_new(context->plg, NULL);
        tcore_context_set_state(co_context, CONTEXT_STATE_DEACTIVATED);
        tcore_context_set_role(co_context, svc_ctg_id);
        tcore_context_set_apn(co_context, apn);

diff --git a/src/master.c b/src/master.c
index d931798..7dac5c8 100644 (file)
--- a/src/master.c
+++ b/src/master.c
@@ -498,19 +498,14 @@ gboolean _ps_master_create_modems(gpointer object)
        for (; plist != NULL; plist = g_slist_next(plist)) {
                TcorePlugin *p = NULL;
                CoreObject *co_modem = NULL;
-               GSList *modemlists = NULL;
                gchar *modem_name = NULL;
 
                p = plist->data;
-               modemlists = tcore_plugin_get_core_objects_bytype(p, CORE_OBJECT_TYPE_MODEM);
-               dbg("plug-in %p, modemlists(%p)", p, modemlists);
-               if (!modemlists)
+               co_modem = tcore_plugin_ref_core_object(p, CORE_OBJECT_TYPE_MODEM);
+               if (!co_modem)
                        continue;
 
-               co_modem = modemlists->data;
-               g_slist_free(modemlists);
-
-               modem_name = g_strdup_printf("/%s", tcore_object_ref_name(co_modem));
+               modem_name = g_strdup_printf("/%s", tcore_server_get_cp_name_by_plugin(p));
                tmp = g_hash_table_lookup(master->modems, modem_name);
                if (tmp != NULL) {
                        dbg("modem (%p) already existed", tmp);

diff --git a/src/modem.c b/src/modem.c
index ab60e78..81d2a33 100644 (file)
--- a/src/modem.c
+++ b/src/modem.c
@@ -346,29 +346,20 @@ static void __ps_modem_create_service(DBusGConnection *conn, TcorePlugin *p,
        gchar *t_path = NULL;
        GObject *object = NULL;
 
-       GSList *co_pslist = NULL;
-       GSList *co_networks = NULL;
        CoreObject *co_ps = NULL;
        CoreObject *co_network = NULL;
        TcorePlugin *target_plg = NULL;
 
        target_plg = tcore_object_ref_plugin(co_modem);
-       co_pslist = tcore_plugin_get_core_objects_bytype(target_plg, CORE_OBJECT_TYPE_PS);
-       if (!co_pslist)
+       co_ps = tcore_plugin_ref_core_object(target_plg, CORE_OBJECT_TYPE_PS);
+       if (!co_ps)
                return;
-       co_ps = co_pslist->data;
-       g_slist_free(co_pslist);
 
-       co_networks = tcore_plugin_get_core_objects_bytype(target_plg, CORE_OBJECT_TYPE_NETWORK);
-       if (!co_networks)
+       co_network = tcore_plugin_ref_core_object(target_plg, CORE_OBJECT_TYPE_NETWORK);
+       if (!co_network)
                return;
-       co_network = co_networks->data;
-       g_slist_free(co_networks);
 
-       if(!co_ps || !co_network)
-               return;
-
-       t_path = g_strdup_printf("%s_%s", _ps_modem_ref_path(modem), tcore_object_ref_name(co_ps));
+       t_path = g_strdup_printf("%s_ps", _ps_modem_ref_path(modem));
        dbg("service path (%s)", t_path);
        object = _ps_service_create_service(conn,p, modem, co_network, co_ps, t_path);
 

diff --git a/src/tcore-interface.c b/src/tcore-interface.c
index 43c2b3e..89bffa8 100644 (file)
--- a/src/tcore-interface.c
+++ b/src/tcore-interface.c
@@ -40,20 +40,20 @@ static enum tcore_hook_return __on_hook_call_status(Server *s, CoreObject *sourc
        g_return_val_if_fail(service != NULL, TCORE_HOOK_RETURN_STOP_PROPAGATION);
 
        cstatus = (struct tnoti_ps_call_status *) data;
-       dbg("call status event cid(%d) state(%d) reason(%d)",
-                       cstatus->context_id, cstatus->state, cstatus->result);
+       dbg("call status event cid(%d) state(%d)",
+                       cstatus->context_id, cstatus->state);
 
        //send activation event / deactivation event
-       if (cstatus->state == 0) {/* OK: PDP define is complete. */
+       if (cstatus->state == PS_DATA_CALL_CTX_DEFINED) {/* OK: PDP define is complete. */
                dbg("service is ready to activate");
                _ps_service_set_ps_defined(service, TRUE, cstatus->context_id);
                //_ps_service_connect_default_context(service);
        }
-       else if (cstatus->state == 1) {/* CONNECTED */
+       else if (cstatus->state == PS_DATA_CALL_CONNECTED) {/* CONNECTED */
                dbg("service is activated");
                _ps_service_set_connected(service, cstatus->context_id, TRUE);
        }
-       else if (cstatus->state == 3) { /* NO CARRIER */
+       else if (cstatus->state == PS_DATA_CALL_NOT_CONNECTED) { /* NO CARRIER */
                dbg("service is deactivated");
                _ps_service_set_ps_defined(service, FALSE, cstatus->context_id);
                _ps_service_set_connected(service, cstatus->context_id, FALSE);
@@ -216,7 +216,6 @@ gboolean _ps_get_co_modem_values(gpointer modem)
        CoreObject *co_modem = NULL;
        CoreObject *co_sim = NULL;
 
-       GSList *co_lists = NULL;
        gboolean sim_init = FALSE, modem_powered = FALSE, flight_mode = FALSE;
        int sim_status = 0;
        struct tel_sim_imsi *sim_imsi = NULL;
@@ -231,13 +230,10 @@ gboolean _ps_get_co_modem_values(gpointer modem)
        if (!plg)
                return FALSE;
 
-       co_lists = tcore_plugin_get_core_objects_bytype(plg, CORE_OBJECT_TYPE_SIM);
-       if (!co_lists)
+       co_sim = tcore_plugin_ref_core_object(plg, CORE_OBJECT_TYPE_SIM);
+       if (!co_sim)
                return FALSE;
 
-       co_sim = co_lists->data;
-       g_slist_free(co_lists);
-
        sim_status = tcore_sim_get_status(co_sim);
        if(sim_status == SIM_STATUS_INIT_COMPLETED)
                sim_init = TRUE;