From ff724bd614b9bcc38a9a3dcffd08b69fbb6116bc Mon Sep 17 00:00:00 2001 From: Guillaume Zajac Date: Thu, 14 Mar 2013 12:28:35 +0100 Subject: [PATCH] Add missing core object operation table with NULL entries Change-Id: Ib46bde88b537a27961c8b166e2b1e315292ca47e --- src/at_call.c | 18 ++++++++++++++++++ src/at_gps.c | 6 +++++- src/at_sap.c | 14 +++++++++++++- src/at_sat.c | 8 +++++++- src/at_sim.c | 17 ++++++++++++++++- src/at_ss.c | 23 ++++++++++++++++++++++- 6 files changed, 81 insertions(+), 5 deletions(-) diff --git a/src/at_call.c b/src/at_call.c index 0bb45a2..628f3e2 100644 --- a/src/at_call.c +++ b/src/at_call.c @@ -123,6 +123,22 @@ static struct tcore_call_operations call_ops = { .set_sound_noise_reduction = NULL, }; +static struct tcore_call_control_operations call_control_ops = { + .answer_hold_and_accept = NULL, + .answer_replace = NULL, + .answer_reject = NULL, + .end_specific = NULL, + .end_all_active = NULL, + .end_all_held = NULL, + .active = NULL, + .hold = NULL, + .swap = NULL, + .join = NULL, + .split = NULL, + .transfer = NULL, + .deflect = NULL, +}; + gboolean at_call_init(TcorePlugin *cp) { CoreObject *co; @@ -132,6 +148,8 @@ gboolean at_call_init(TcorePlugin *cp) if (co == NULL) return FALSE; + tcore_call_control_set_operations(co, &call_control_ops); + server = tcore_plugin_ref_server(cp); tcore_server_add_template_object(server, co); diff --git a/src/at_gps.c b/src/at_gps.c index 50b3b2a..c6d5583 100644 --- a/src/at_gps.c +++ b/src/at_gps.c @@ -31,12 +31,16 @@ #include "at_gps.h" +static struct tcore_gps_operations gps_ops = { + .confirm_measure_pos = NULL, +}; + gboolean at_gps_init(TcorePlugin *cp) { CoreObject *co; Server *server; - co = tcore_gps_new(cp, NULL, NULL); + co = tcore_gps_new(cp, &gps_ops, NULL); if (co == NULL) return FALSE; diff --git a/src/at_sap.c b/src/at_sap.c index 37bd789..dc14394 100644 --- a/src/at_sap.c +++ b/src/at_sap.c @@ -31,12 +31,24 @@ #include "at_sap.h" +static struct tcore_sap_operations sap_ops = +{ + .connect = NULL, + .disconnect = NULL, + .req_status = NULL, + .set_transport_protocol = NULL, + .set_power = NULL, + .get_atr = NULL, + .transfer_apdu = NULL, + .get_cardreader_status = NULL, +}; + gboolean at_sap_init(TcorePlugin *cp) { CoreObject *co; Server *server; - co = tcore_sap_new(cp, NULL, NULL); + co = tcore_sap_new(cp, &sap_ops, NULL); if (co == NULL) return FALSE; diff --git a/src/at_sat.c b/src/at_sat.c index d20f75d..e195c81 100644 --- a/src/at_sat.c +++ b/src/at_sat.c @@ -31,12 +31,18 @@ #include "at_sat.h" +static struct tcore_sat_operations sat_ops = { + .envelope = NULL, + .terminal_response = NULL, +}; + + gboolean at_sat_init(TcorePlugin *cp) { CoreObject *co; Server *server; - co = tcore_sat_new(cp, NULL, NULL); + co = tcore_sat_new(cp, &sat_ops, NULL); if (co == NULL) return FALSE; diff --git a/src/at_sim.c b/src/at_sim.c index b6a3f12..f80bb9b 100644 --- a/src/at_sim.c +++ b/src/at_sim.c @@ -31,12 +31,27 @@ #include "at_sim.h" +static struct tcore_sim_operations sim_ops = { + .verify_pins = NULL, + .verify_puks = NULL, + .change_pins = NULL, + .get_facility_status = NULL, + .enable_facility = NULL, + .disable_facility = NULL, + .get_lock_info = NULL, + .read_file = NULL, + .update_file = NULL, + .transmit_apdu = NULL, + .get_atr = NULL, + .req_authentication = NULL, +}; + gboolean at_sim_init(TcorePlugin *cp) { CoreObject *co; Server *server; - co = tcore_sim_new(cp, NULL, NULL); + co = tcore_sim_new(cp, &sim_ops, NULL); if (co == NULL) return FALSE; diff --git a/src/at_ss.c b/src/at_ss.c index 96018ab..26b68cf 100644 --- a/src/at_ss.c +++ b/src/at_ss.c @@ -31,12 +31,33 @@ #include "at_ss.h" +static struct tcore_ss_operations ss_ops = { + .barring_activate = NULL, + .barring_deactivate = NULL, + .barring_change_password = NULL, + .barring_get_status = NULL, + .forwarding_activate = NULL, + .forwarding_deactivate = NULL, + .forwarding_register = NULL, + .forwarding_deregister = NULL, + .forwarding_get_status = NULL, + .waiting_activate = NULL, + .waiting_deactivate = NULL, + .waiting_get_status = NULL, + .cli_activate = NULL, + .cli_deactivate = NULL, + .cli_get_status = NULL, + .send_ussd = NULL, + .set_aoc = NULL, + .get_aoc = NULL, +}; + gboolean at_ss_init(TcorePlugin *cp) { CoreObject *co; Server *server; - co = tcore_ss_new(cp, NULL, NULL); + co = tcore_ss_new(cp, &ss_ops, NULL); if (co == NULL) return FALSE; -- 2.7.4