From: Wootak Jung Date: Mon, 30 May 2016 04:39:29 +0000 (+0900) Subject: Add telephony feature check logic X-Git-Tag: submit/tizen/20160602.021644^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21c61dbb886a968238c35fa9344b28927d6efb24;p=platform%2Fcore%2Ftelephony%2Flibtapi.git Add telephony feature check logic Change-Id: I81ceec1a10acaf8a5387474002e4594019c7413c --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c2ee33..e5352be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ SET(INCLUDEDIR "\${prefix}/include") # Set required packages INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs REQUIRED glib-2.0 gio-2.0 gthread-2.0 dlog vconf) +pkg_check_modules(pkgs REQUIRED glib-2.0 gio-2.0 gthread-2.0 dlog vconf capi-system-info) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/include/TapiUtility.h b/include/TapiUtility.h index d1a555b..c47f2e8 100644 --- a/include/TapiUtility.h +++ b/include/TapiUtility.h @@ -30,6 +30,8 @@ #ifndef _TEL_UTILITY_H_ #define _TEL_UTILITY_H_ +#include + __BEGIN_DECLS /** @@ -123,6 +125,34 @@ typedef enum { TAPI_API_MISC_OUTPARAM_NULL = -803, /**< MISC output parameter NULL */ } TapiResult_t; +#define TELEPHONY_FEATURE "http://tizen.org/feature/network.telephony" + +#define TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(feature_name) { \ + bool telephony_supported = FALSE; \ + if (!system_info_get_platform_bool(feature_name, &telephony_supported)) { \ + if (telephony_supported == FALSE) { \ + err("telephony feature is disabled"); \ + return TAPI_API_NOT_SUPPORTED; \ + } \ + } else { \ + err("Error - Feature getting from System Info"); \ + return TAPI_API_OPERATION_FAILED; \ + } \ +} + +#define TAPI_RET_ERR_NULL_IF_NOT_SUPPORTED(feature_name) { \ + bool telephony_supported = FALSE; \ + if (!system_info_get_platform_bool(feature_name, &telephony_supported)) { \ + if (telephony_supported == FALSE) { \ + err("telephony feature is disabled"); \ + return NULL; \ + } \ + } else { \ + err("Error - Feature getting from System Info"); \ + return NULL; \ + } \ +} + /** * @brief Checks the 'scalar_exp' for TRUE, if failed then it returns 'err_value' from the function. */ diff --git a/packaging/libtapi.spec b/packaging/libtapi.spec index 0616e97..f4200d4 100644 --- a/packaging/libtapi.spec +++ b/packaging/libtapi.spec @@ -13,6 +13,7 @@ BuildRequires: cmake BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(vconf) +BuildRequires: pkgconfig(capi-system-info) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig diff --git a/src/tapi_call.c b/src/tapi_call.c index 4a4ad5e..6adf543 100644 --- a/src/tapi_call.c +++ b/src/tapi_call.c @@ -468,6 +468,7 @@ EXPORT_API int tel_dial_call(TapiHandle *handle, const TelCallDial_t *pParams, t struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pParams, TAPI_API_INVALID_PTR); @@ -492,6 +493,7 @@ EXPORT_API int tel_answer_call(TapiHandle *handle, unsigned int CallHandle, TelC struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); if (AnsType > TAPI_CALL_ANSWER_HOLD_AND_ACCEPT) @@ -517,6 +519,7 @@ EXPORT_API int tel_end_call(TapiHandle *handle, unsigned int CallHandle, TelCall struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); if (EndType > TAPI_CALL_END_HOLD_ALL) @@ -542,6 +545,7 @@ EXPORT_API int tel_hold_call(TapiHandle *handle, unsigned int CallHandle, tapi_r struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -564,6 +568,7 @@ EXPORT_API int tel_active_call(TapiHandle *handle, unsigned int CallHandle, tapi struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -586,6 +591,7 @@ EXPORT_API int tel_swap_call(TapiHandle *handle, unsigned int CallHandle1, unsig struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -608,6 +614,7 @@ EXPORT_API int tel_join_call(TapiHandle *handle, unsigned int CallHandle1, unsig struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -630,6 +637,7 @@ EXPORT_API int tel_split_call(TapiHandle *handle, unsigned int CallHandle, tapi_ struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -652,6 +660,7 @@ EXPORT_API int tel_transfer_call(TapiHandle *handle, unsigned int CallHandle, ta struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -674,6 +683,7 @@ EXPORT_API int tel_start_call_cont_dtmf(TapiHandle *handle, unsigned char dtmf_d struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -695,6 +705,7 @@ EXPORT_API int tel_stop_call_cont_dtmf(TapiHandle *handle, tapi_response_cb call { struct tapi_resp_data *evt_cb_data = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -715,6 +726,7 @@ EXPORT_API int tel_send_call_burst_dtmf(TapiHandle *handle, const TelCallBurstDt struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(info, TAPI_API_INVALID_PTR); @@ -738,6 +750,7 @@ EXPORT_API int tel_deflect_call(TapiHandle *handle, unsigned int CallHandle, con struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pInfo, TAPI_API_INVALID_PTR); @@ -770,6 +783,7 @@ EXPORT_API int tel_get_call_status(TapiHandle *handle, int callHandle, TelCallSt gboolean call_multiparty_state = FALSE; gboolean volte_call = FALSE; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(out, TAPI_API_INVALID_PTR); @@ -816,6 +830,7 @@ EXPORT_API int tel_get_call_status_all(TapiHandle *handle, TelCallStatusCallback GVariantIter *iter = 0, *iter_row = 0; GError *gerr = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(cb, TAPI_API_INVALID_PTR); @@ -876,6 +891,7 @@ EXPORT_API int tel_get_call_privacy_mode(TapiHandle *handle, tapi_response_cb ca { struct tapi_resp_data *evt_cb_data = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -896,6 +912,7 @@ EXPORT_API int tel_set_call_privacy_mode(TapiHandle *handle, TelCallPrivacyMode_ struct tapi_resp_data *evt_cb_data = 0; GVariant *pParam = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -918,6 +935,7 @@ EXPORT_API int tel_get_call_volume_info(TapiHandle *handle, TelSoundDevice_t dev struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -940,6 +958,7 @@ EXPORT_API int tel_set_call_volume_info(TapiHandle *handle, TelCallVolumeInfo_t struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(info, TAPI_API_INVALID_PTR); @@ -964,6 +983,7 @@ EXPORT_API int tel_set_call_sound_path(TapiHandle *handle, TelCallSoundPathInfo_ struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(info, TAPI_API_INVALID_PTR); @@ -987,6 +1007,7 @@ EXPORT_API int tel_set_call_mute_status(TapiHandle *handle, TelSoundMuteStatus_t struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -1008,6 +1029,7 @@ EXPORT_API int tel_get_call_mute_status(TapiHandle *handle, tapi_response_cb cal { struct tapi_resp_data *evt_cb_data = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -1030,6 +1052,7 @@ EXPORT_API int tel_set_call_preferred_voice_subscription(TapiHandle *handle, Tel struct tapi_resp_data *evt_cb_data = NULL; GVariant *param = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -1057,6 +1080,7 @@ EXPORT_API int tel_get_call_preferred_voice_subscription(TapiHandle *handle, Tel int result = 0; TapiResult_t ret = TAPI_API_OPERATION_FAILED; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(preferred_subscription, TAPI_API_INVALID_PTR); diff --git a/src/tapi_common.c b/src/tapi_common.c index 4486bfd..9fbd620 100644 --- a/src/tapi_common.c +++ b/src/tapi_common.c @@ -1295,6 +1295,8 @@ EXPORT_API char **tel_get_cp_name_list(void) int i = 0, element_cnt = 0; gchar **cp_list = NULL; + TAPI_RET_ERR_NULL_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); + d_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); if (!d_conn) { err("Error creating dbus connection: %s\n", error->message); @@ -1418,6 +1420,7 @@ EXPORT_API int tel_get_property_int (TapiHandle *handle, { char *data; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_INPUT); TAPI_RET_ERR_NUM_IF_FAIL(property, TAPI_API_INVALID_INPUT); TAPI_RET_ERR_NUM_IF_FAIL(result, TAPI_API_INVALID_INPUT); @@ -1439,6 +1442,7 @@ EXPORT_API int tel_get_property_string(TapiHandle *handle, const char *property, { char *data; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_INPUT); TAPI_RET_ERR_NUM_IF_FAIL(property, TAPI_API_INVALID_INPUT); TAPI_RET_ERR_NUM_IF_FAIL(result, TAPI_API_INVALID_INPUT); @@ -1459,6 +1463,8 @@ EXPORT_API TapiHandle *tel_init(const char *cp_name) GError *error = NULL; struct tapi_handle *handle; + TAPI_RET_ERR_NULL_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); + #if !GLIB_CHECK_VERSION(2, 35, 0) g_type_init(); #endif @@ -1535,6 +1541,7 @@ static gboolean _unregister_noti(gpointer key, gpointer value, gpointer user_dat EXPORT_API int tel_deinit(TapiHandle *handle) { + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_INPUT); msg("tel_deinit: [%s]", handle->cp_name); @@ -1570,6 +1577,7 @@ EXPORT_API int tel_register_noti_event(TapiHandle *handle, const char *noti_id, gpointer tmp = NULL; struct tapi_evt_cb *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_INPUT); TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_INPUT); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_INPUT); @@ -1636,6 +1644,7 @@ EXPORT_API int tel_deregister_noti_event(TapiHandle *handle, gchar **dbus_str = NULL; gboolean rv = FALSE; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_INPUT); TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_INPUT); @@ -1729,6 +1738,7 @@ EXPORT_API int tel_register_ready_state_cb(tapi_state_cb callback, void *user_da gboolean exist = FALSE; GSList *list = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_INPUT); G_LOCK(state_mutex); @@ -1771,6 +1781,7 @@ EXPORT_API int tel_deregister_ready_state_cb(tapi_state_cb callback) GSList *list = NULL; guint count = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_INPUT); G_LOCK(state_mutex); @@ -1802,6 +1813,7 @@ EXPORT_API int tel_get_ready_state(int *state) int res = 0; int value = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(state, TAPI_API_INVALID_INPUT); res = vconf_get_bool(VCONFKEY_TELEPHONY_READY, &value); diff --git a/src/tapi_modem.c b/src/tapi_modem.c index fe4635c..1e59d12 100644 --- a/src/tapi_modem.c +++ b/src/tapi_modem.c @@ -228,6 +228,7 @@ EXPORT_API int tel_process_power_command(TapiHandle *handle, tapi_power_phone_cm struct tapi_resp_data *evt_cb_data = NULL; GVariant *param; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); msg("[%s] tel_process_power_command:[%d] (0:ON,1:OFF,2:RST,3:LOW)", handle->cp_name, cmd); @@ -264,6 +265,7 @@ EXPORT_API int tel_set_flight_mode(TapiHandle *handle, tapi_power_flight_mode_ty GVariant *param; gboolean b_mode; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); msg("[%s] requested flight mode:[%d] (1:enter, 2:leave)", handle->cp_name, mode); @@ -294,6 +296,7 @@ EXPORT_API int tel_get_flight_mode(TapiHandle *handle, tapi_response_cb callback dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -314,6 +317,7 @@ EXPORT_API int tel_get_misc_me_version(TapiHandle *handle, tapi_response_cb call dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -338,6 +342,7 @@ EXPORT_API TelMiscVersionInformation *tel_get_misc_me_version_sync(TapiHandle *h dbg("Func Entrance"); + TAPI_RET_ERR_NULL_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, NULL); dbus_result = g_dbus_connection_call_sync(handle->dbus_connection, @@ -388,6 +393,7 @@ EXPORT_API int tel_get_misc_me_imei(TapiHandle *handle, tapi_response_cb callbac { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -411,6 +417,7 @@ EXPORT_API char *tel_get_misc_me_imei_sync(TapiHandle *handle) char *imei = NULL; int result = 0; + TAPI_RET_ERR_NULL_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, NULL); sdbg("[%s] Func Entrance", handle->cp_name); @@ -443,6 +450,7 @@ EXPORT_API int tel_get_misc_me_sn(TapiHandle *handle, tapi_response_cb callback, { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -467,6 +475,7 @@ EXPORT_API TelMiscSNInformation *tel_get_misc_me_sn_sync(TapiHandle *handle) TelMiscSNInformation *data = NULL; int result = 0; + TAPI_RET_ERR_NULL_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, NULL); sdbg("[%s] Func Entrance", handle->cp_name); @@ -511,6 +520,7 @@ EXPORT_API int tel_check_modem_power_status(TapiHandle *handle, int *result) { int ret = TAPI_API_SUCCESS; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(result, TAPI_API_INVALID_PTR); @@ -531,6 +541,8 @@ EXPORT_API int tel_get_device_info(TapiHandle *handle, tapi_response_cb callback { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); + dbg("Func Entrance"); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); diff --git a/src/tapi_network.c b/src/tapi_network.c index 99febb8..2ea914d 100644 --- a/src/tapi_network.c +++ b/src/tapi_network.c @@ -871,6 +871,7 @@ EXPORT_API int tel_search_network(TapiHandle *handle, tapi_response_cb callback, { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && callback != NULL, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -892,6 +893,7 @@ EXPORT_API int tel_get_network_selection_mode(struct tapi_handle *handle, tapi_r dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && callback != NULL, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -910,6 +912,7 @@ EXPORT_API int tel_select_network_automatic(struct tapi_handle *handle, tapi_res struct tapi_resp_data *evt_cb_data = NULL; GVariant *param; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -935,6 +938,7 @@ EXPORT_API int tel_select_network_manual(struct tapi_handle *handle, const char struct tapi_resp_data *evt_cb_data = NULL; GVariant *param; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && _check_plmn(plmn), TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -966,6 +970,7 @@ EXPORT_API int tel_set_network_preferred_plmn( GVariant *param; int act = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && info != NULL && _check_operation(operation) && _check_plmn((const char *)&info->Plmn), TAPI_API_INVALID_PTR); @@ -1021,6 +1026,7 @@ EXPORT_API int tel_get_network_preferred_plmn(TapiHandle *handle, tapi_response_ dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && callback != NULL, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -1039,6 +1045,7 @@ EXPORT_API int tel_set_network_mode(TapiHandle *handle, int mode, tapi_response_ struct tapi_resp_data *evt_cb_data = NULL; GVariant *param; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && _check_network_mode(mode), TAPI_API_INVALID_PTR); @@ -1062,6 +1069,7 @@ EXPORT_API int tel_get_network_mode(TapiHandle *handle, tapi_response_cb callbac { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && callback != NULL, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -1081,6 +1089,7 @@ EXPORT_API int tel_cancel_network_manual_search(TapiHandle *handle, tapi_respons { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -1100,6 +1109,7 @@ EXPORT_API int tel_get_network_serving(TapiHandle *handle, tapi_response_cb call { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && callback != NULL, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -1119,6 +1129,7 @@ EXPORT_API int tel_get_network_neighboring_cell_info(TapiHandle *handle, tapi_re { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && callback != NULL, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -1138,6 +1149,7 @@ EXPORT_API int tel_set_network_default_data_subscription(TapiHandle *handle, tap { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -1160,6 +1172,7 @@ EXPORT_API int tel_set_network_emergency_callback_mode(TapiHandle *handle, TelNe struct tapi_resp_data *evt_cb_data = NULL; GVariant *param; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && _check_emergency_callback_mode(mode), TAPI_API_INVALID_PTR); @@ -1183,6 +1196,7 @@ EXPORT_API int tel_set_network_roaming_preference(TapiHandle *handle, TelNetwork struct tapi_resp_data *evt_cb_data = NULL; GVariant *param; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && _check_roaming_preference(roam_pref), TAPI_API_INVALID_PTR); @@ -1206,6 +1220,7 @@ EXPORT_API int tel_get_network_roaming_preference(TapiHandle *handle, tapi_respo { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle != NULL && callback != NULL, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -1230,6 +1245,7 @@ EXPORT_API int tel_get_network_default_data_subscription(TapiHandle *handle, Tel int result = 0; TapiResult_t ret = TAPI_API_OPERATION_FAILED; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(default_subscription, TAPI_API_INVALID_PTR); @@ -1264,6 +1280,7 @@ EXPORT_API int tel_set_network_default_subscription(TapiHandle *handle, tapi_res { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -1289,6 +1306,7 @@ EXPORT_API int tel_get_network_default_subscription(TapiHandle *handle, TelNetwo int result = 0; TapiResult_t ret = TAPI_API_OPERATION_FAILED; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(default_subscription, TAPI_API_INVALID_PTR); diff --git a/src/tapi_oem.c b/src/tapi_oem.c index 35b0ae4..6403618 100644 --- a/src/tapi_oem.c +++ b/src/tapi_oem.c @@ -99,6 +99,7 @@ EXPORT_API int tel_send_oem_data(TapiHandle *handle, int oem_id, dbg("oem_id(0x%x) data(%p) data len(%d)", oem_id, data, data_len); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(data, TAPI_API_INVALID_PTR); @@ -142,6 +143,7 @@ EXPORT_API int tel_send_oem_data_sync(TapiHandle *handle, int oem_id, dbg("oem_id(0x%x) data(%p) data len(%d)", oem_id, data, data_len); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(data, TAPI_API_INVALID_PTR); @@ -183,6 +185,7 @@ EXPORT_API int tel_send_oem_data_async(TapiHandle *handle, int oem_id, gchar *encoded_data = NULL; struct oem_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(data, TAPI_API_INVALID_PTR); diff --git a/src/tapi_phonebook.c b/src/tapi_phonebook.c index b412e70..1460958 100644 --- a/src/tapi_phonebook.c +++ b/src/tapi_phonebook.c @@ -305,6 +305,7 @@ EXPORT_API int tel_get_sim_pb_init_info(TapiHandle *handle, int *init_completed, GVariant *sync_gv = NULL; int init_status = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(init_completed, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pb_list, TAPI_API_INVALID_PTR); @@ -343,6 +344,7 @@ EXPORT_API int tel_get_sim_pb_count(TapiHandle *handle, TelSimPbType_t pb_type, dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -370,6 +372,7 @@ EXPORT_API int tel_get_sim_pb_meta_info(TapiHandle *handle, TelSimPbType_t pb_ty dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -397,6 +400,7 @@ EXPORT_API int tel_get_sim_pb_usim_meta_info(TapiHandle *handle, tapi_response_c dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -418,6 +422,7 @@ EXPORT_API int tel_read_sim_pb_record(TapiHandle *handle, TelSimPbType_t pb_type msg("read type:[%d] index:[%d]", pb_type, pb_index); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -448,6 +453,7 @@ EXPORT_API int tel_update_sim_pb_record(TapiHandle *handle, const TelSimPbRecord dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL((req_data != NULL) , TAPI_API_INVALID_PTR); @@ -513,9 +519,9 @@ EXPORT_API int tel_delete_sim_pb_record(TapiHandle *handle, TelSimPbType_t pb_ty msg("delete type:[%d] index:[%d]", pb_type, pb_index); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); - if (pb_index == 0) return TAPI_API_INVALID_INPUT; diff --git a/src/tapi_sap.c b/src/tapi_sap.c index 47d15c0..07799ac 100644 --- a/src/tapi_sap.c +++ b/src/tapi_sap.c @@ -63,6 +63,7 @@ EXPORT_API int tel_req_sap_connect(TapiHandle *handle, int max_msg_size, tapi_re dbg("Func Entrance w/ max_msg_size[%d]", max_msg_size); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -107,6 +108,7 @@ EXPORT_API int tel_req_sap_disconnect(TapiHandle *handle, tapi_response_cb callb dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -150,6 +152,7 @@ EXPORT_API int tel_req_sap_connection_status(TapiHandle *handle, tapi_response_c dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -213,6 +216,7 @@ EXPORT_API int tel_req_sap_transfer_atr(TapiHandle *handle, tapi_response_cb cal dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -279,6 +283,7 @@ EXPORT_API int tel_req_sap_transfer_apdu(TapiHandle *handle, TelSapApduData_t *a dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(apdu_data, TAPI_API_INVALID_PTR); @@ -333,6 +338,7 @@ EXPORT_API int tel_req_sap_transport_protocol(TapiHandle *handle, dbg("Func Entrance w/ protocol[%d]", protocol); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -379,6 +385,7 @@ EXPORT_API int tel_req_sap_power_operation(TapiHandle *handle, gint mode = 0; dbg("Func Entrance w/ power_mode[%d]", power_mode); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -442,6 +449,7 @@ EXPORT_API int tel_req_sap_cardreader_status(TapiHandle *handle, tapi_response_c dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); diff --git a/src/tapi_sat.c b/src/tapi_sat.c index 9c55033..c641ebd 100644 --- a/src/tapi_sat.c +++ b/src/tapi_sat.c @@ -310,6 +310,7 @@ EXPORT_API int tel_select_sat_menu(TapiHandle *handle, const TelSatMenuSelection dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pMenuSelect, TAPI_API_INVALID_PTR); @@ -354,6 +355,7 @@ EXPORT_API int tel_download_sat_event(TapiHandle *handle, const TelSatEventDownl dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pEventData, TAPI_API_INVALID_PTR); @@ -416,6 +418,7 @@ EXPORT_API int tel_get_sat_main_menu_info(TapiHandle *handle, TelSatSetupMenuInf dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pMainMenu, TAPI_API_INVALID_PTR); @@ -511,6 +514,7 @@ EXPORT_API int tel_send_sat_ui_display_status(TapiHandle *handle, int commandId, dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_PTR); @@ -573,6 +577,7 @@ EXPORT_API int tel_send_sat_ui_user_confirm(TapiHandle *handle, TelSatUiUserConf dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pUserConfirmData, TAPI_API_INVALID_PTR); @@ -641,6 +646,7 @@ EXPORT_API int tel_send_sat_app_exec_result(TapiHandle *handle, TelSatAppsRetInf dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(handle->dbus_connection, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pAppRetInfo, TAPI_API_INVALID_PTR); diff --git a/src/tapi_sim.c b/src/tapi_sim.c index de9b3d6..93eade3 100644 --- a/src/tapi_sim.c +++ b/src/tapi_sim.c @@ -1403,6 +1403,7 @@ EXPORT_API int tel_get_sim_init_info(TapiHandle *handle, TelSimCardStatus_t init_status = 0; int changed = FALSE; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(sim_status, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(card_changed, TAPI_API_INVALID_PTR); @@ -1432,6 +1433,7 @@ EXPORT_API int tel_get_sim_type(TapiHandle *handle, TelSimCardType_t *card_type) GError *gerr = NULL; GVariant *sync_gv = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(card_type, TAPI_API_INVALID_PTR); @@ -1455,6 +1457,7 @@ EXPORT_API int tel_get_sim_imsi(TapiHandle *handle, TelSimImsiInfo_t *imsi) GError *gerr = NULL; GVariant *sync_gv = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(imsi, TAPI_API_INVALID_PTR); @@ -1504,6 +1507,7 @@ EXPORT_API int tel_get_sim_ecc(TapiHandle *handle, TelSimEccList_t *ecc) const gchar *str_value = NULL; int i = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(ecc, TAPI_API_INVALID_PTR); @@ -1550,6 +1554,7 @@ EXPORT_API int tel_get_sim_iccid(TapiHandle *handle, tapi_response_cb callback, { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1567,6 +1572,7 @@ EXPORT_API int tel_get_sim_language(TapiHandle *handle, tapi_response_cb callbac { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1586,6 +1592,7 @@ EXPORT_API int tel_set_sim_language(TapiHandle *handle, TelSimLanguagePreference struct tapi_resp_data *evt_cb_data = NULL; GVariant *param = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1606,6 +1613,7 @@ EXPORT_API int tel_get_sim_callforwarding_info(TapiHandle *handle, tapi_response { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1626,6 +1634,7 @@ EXPORT_API int tel_set_sim_callforwarding_info(TapiHandle *handle, TelSimCallFor GVariant *param = NULL; gchar *g_number = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(req_cf, TAPI_API_INVALID_PTR); @@ -1671,6 +1680,7 @@ EXPORT_API int tel_get_sim_messagewaiting_info(TapiHandle *handle, tapi_response { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1690,6 +1700,7 @@ EXPORT_API int tel_set_sim_messagewaiting_info(TapiHandle *handle, TelSimMessage struct tapi_resp_data *evt_cb_data = NULL; GVariant *param = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(req_mw, TAPI_API_INVALID_PTR); @@ -1738,6 +1749,7 @@ EXPORT_API int tel_get_sim_mailbox_info(TapiHandle *handle, tapi_response_cb cal { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1759,6 +1771,7 @@ EXPORT_API int tel_set_sim_mailbox_info(TapiHandle *handle, TelSimMailBoxNumber_ gchar *g_alpha = NULL; gchar *g_number = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(req_mb, TAPI_API_INVALID_PTR); @@ -1829,6 +1842,7 @@ EXPORT_API int tel_get_sim_cphs_info(TapiHandle *handle, tapi_response_cb callba { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1847,6 +1861,7 @@ EXPORT_API int tel_get_sim_service_table(TapiHandle *handle, tapi_response_cb ca { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1864,6 +1879,7 @@ EXPORT_API int tel_get_sim_msisdn(TapiHandle *handle, tapi_response_cb callback, { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1882,6 +1898,7 @@ EXPORT_API int tel_get_sim_oplmnwact(TapiHandle *handle, tapi_response_cb callba { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1900,6 +1917,7 @@ EXPORT_API int tel_get_sim_spn(TapiHandle *handle, tapi_response_cb callback, { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1918,6 +1936,7 @@ EXPORT_API int tel_get_sim_cphs_netname(TapiHandle *handle, tapi_response_cb cal { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -1941,6 +1960,7 @@ EXPORT_API int tel_req_sim_authentication(TapiHandle *handle, GVariant *autn_gv = NULL; int i = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(authentication_data, TAPI_API_INVALID_PTR); @@ -1995,6 +2015,7 @@ EXPORT_API int tel_verify_sim_pins(TapiHandle *handle, const TelSimSecPw_t *pin_ GVariant *param = NULL; gchar *gpw = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pin_data, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pin_data->pw, TAPI_API_INVALID_PTR); @@ -2041,6 +2062,7 @@ EXPORT_API int tel_verify_sim_puks(TapiHandle *handle, const TelSimSecPw_t *puk_ gchar *gpin = NULL; gchar *gpuk = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL((puk_data != NULL && new_pin_data != NULL), TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL((puk_data->pw != NULL && new_pin_data->pw != NULL), TAPI_API_INVALID_PTR); @@ -2103,6 +2125,7 @@ EXPORT_API int tel_change_sim_pins(TapiHandle *handle, const TelSimSecPw_t *old_ gchar *gpin_o = NULL; gchar *gpin_n = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL((old_pin != NULL && new_pin != NULL), TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL((old_pin->pw != NULL && new_pin->pw != NULL), TAPI_API_INVALID_PTR); @@ -2166,6 +2189,7 @@ EXPORT_API int tel_disable_sim_facility(TapiHandle *handle, TelSimFacilityPw_t * GVariant *param = NULL; gchar *gpw = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pw, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pw->pw, TAPI_API_INVALID_PTR); @@ -2211,6 +2235,7 @@ EXPORT_API int tel_enable_sim_facility(TapiHandle *handle, TelSimFacilityPw_t *p GVariant *param = NULL; gchar *gpw = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pw, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pw->pw, TAPI_API_INVALID_PTR); @@ -2255,6 +2280,7 @@ EXPORT_API int tel_get_sim_facility(TapiHandle *handle, TelSimLockType_t type, struct tapi_resp_data *evt_cb_data = NULL; GVariant *param = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -2280,6 +2306,7 @@ EXPORT_API int tel_get_sim_lock_info(TapiHandle *handle, TelSimLockType_t type, struct tapi_resp_data *evt_cb_data = NULL; GVariant *param = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -2305,6 +2332,7 @@ EXPORT_API int tel_set_sim_power_state(TapiHandle *handle, TelSimPowerState_t st struct tapi_resp_data *evt_cb_data = NULL; GVariant *param = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); dbg("Func Enterance. cp_name[%s], state[%d]", handle->cp_name, state); @@ -2333,6 +2361,7 @@ EXPORT_API int tel_req_sim_apdu(TapiHandle *handle, TelSimApdu_t* apdu_data, GVariant *inner_gv = NULL; int i = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(apdu_data, TAPI_API_INVALID_PTR); @@ -2357,6 +2386,7 @@ EXPORT_API int tel_req_sim_atr(TapiHandle *handle, tapi_response_cb callback, vo { struct tapi_resp_data *evt_cb_data = NULL; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_SIM_CHECK_TAPI_STATE(); @@ -2376,6 +2406,7 @@ EXPORT_API int tel_get_sim_impi(TapiHandle *handle, tapi_response_cb callback, v dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -2395,6 +2426,7 @@ EXPORT_API int tel_get_sim_impu(TapiHandle *handle, tapi_response_cb callback, v dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -2414,6 +2446,7 @@ EXPORT_API int tel_get_sim_domain(TapiHandle *handle, tapi_response_cb callback, dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -2433,6 +2466,7 @@ EXPORT_API int tel_get_sim_pcscf(TapiHandle *handle, tapi_response_cb callback, dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); @@ -2453,6 +2487,7 @@ EXPORT_API int tel_get_sim_application_list(TapiHandle *handle, unsigned char *a dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(app_list, TAPI_API_INVALID_PTR); @@ -2477,6 +2512,7 @@ EXPORT_API int tel_get_sim_isim_service_table(TapiHandle *handle, dbg("Func Entrance"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_MAKE_RESP_CB_DATA(evt_cb_data, handle, callback, user_data); diff --git a/src/tapi_sms.c b/src/tapi_sms.c index ff43dc8..740cd09 100644 --- a/src/tapi_sms.c +++ b/src/tapi_sms.c @@ -418,6 +418,7 @@ EXPORT_API int tel_send_sms(struct tapi_handle *handle, dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pDataPackage, TAPI_API_INVALID_PTR); @@ -460,6 +461,7 @@ EXPORT_API int tel_read_sms_in_sim(struct tapi_handle *handle, int read_index, t dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -493,6 +495,7 @@ EXPORT_API int tel_write_sms_in_sim(struct tapi_handle *handle, const TelSmsData dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pWriteData, TAPI_API_INVALID_PTR); @@ -533,6 +536,7 @@ EXPORT_API int tel_delete_sms_in_sim(struct tapi_handle *handle, int del_index, dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -560,6 +564,7 @@ EXPORT_API int tel_get_sms_count(struct tapi_handle *handle, tapi_response_cb ca dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -581,6 +586,7 @@ EXPORT_API int tel_get_sms_sca(struct tapi_handle *handle, int sca_index, tapi_r dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -612,6 +618,7 @@ EXPORT_API int tel_set_sms_sca(struct tapi_handle *handle, const TelSmsAddressIn dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pSCA, TAPI_API_INVALID_PTR); @@ -649,6 +656,7 @@ EXPORT_API int tel_get_sms_cb_config(struct tapi_handle *handle, tapi_response_c dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -673,6 +681,7 @@ EXPORT_API int tel_set_sms_cb_config(struct tapi_handle *handle, const TelSmsCbC dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pCBConfig, TAPI_API_INVALID_PTR); @@ -728,6 +737,7 @@ EXPORT_API int tel_set_sms_memory_status(struct tapi_handle *handle, int memoryS dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); if ((memoryStatus < TAPI_NETTEXT_PDA_MEMORY_STATUS_AVAILABLE) || (memoryStatus > TAPI_NETTEXT_PDA_MEMORY_STATUS_FULL)) { @@ -760,6 +770,7 @@ EXPORT_API int tel_send_sms_deliver_report(struct tapi_handle *handle, dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pDataPackage, TAPI_API_INVALID_PTR); @@ -805,6 +816,7 @@ EXPORT_API int tel_set_sms_message_status(struct tapi_handle *handle, int set_in dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); if ((set_index < 0) || (set_index > TAPI_NETTEXT_MAX_INDEX) || @@ -833,6 +845,7 @@ EXPORT_API int tel_get_sms_parameters(struct tapi_handle *handle, int get_index, dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -866,6 +879,7 @@ EXPORT_API int tel_set_sms_parameters(struct tapi_handle *handle, const TelSmsPa dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pSmsSetParameters, TAPI_API_INVALID_PTR); @@ -921,6 +935,7 @@ EXPORT_API int tel_get_sms_parameter_count(struct tapi_handle *handle, tapi_resp dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -942,6 +957,7 @@ EXPORT_API int tel_check_sms_device_status(struct tapi_handle *handle, int *pRea dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(pReadyStatus, TAPI_API_INVALID_PTR); diff --git a/src/tapi_ss.c b/src/tapi_ss.c index 7c8c755..883ce76 100644 --- a/src/tapi_ss.c +++ b/src/tapi_ss.c @@ -286,6 +286,7 @@ EXPORT_API int tel_set_ss_barring(TapiHandle *handle, TelSsBarringInfo_t *info, dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(info, TAPI_API_INVALID_PTR); @@ -319,6 +320,7 @@ EXPORT_API int tel_get_ss_barring_status(TapiHandle *handle, TelSsClass_t class, dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -357,6 +359,7 @@ EXPORT_API int tel_change_ss_barring_password(TapiHandle *handle, msg("barring_password change request"); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(old_password, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(new_password, TAPI_API_INVALID_PTR); @@ -392,6 +395,7 @@ EXPORT_API int tel_set_ss_forward(TapiHandle *handle, const TelSsForwardInfo_t * dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(info, TAPI_API_INVALID_PTR); @@ -456,6 +460,7 @@ EXPORT_API int tel_get_ss_forward_status(TapiHandle *handle, TelSsClass_t class, dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -489,6 +494,7 @@ EXPORT_API int tel_set_ss_waiting(TapiHandle *handle, const TelSsWaitingInfo_t * dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(info, TAPI_API_INVALID_PTR); @@ -530,6 +536,7 @@ EXPORT_API int tel_get_ss_waiting_status(TapiHandle *handle, const TelSsClass_t dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -562,6 +569,7 @@ EXPORT_API int tel_set_ss_cli_status(TapiHandle *handle, TelSsCliType_t type, Te msg("set cli type:[%d] status:[%d]", type, status); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -594,6 +602,7 @@ EXPORT_API int tel_get_ss_cli_status(TapiHandle *handle, TelSsCliType_t type, ta dbg("Func Entrance "); + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(callback, TAPI_API_INVALID_PTR); @@ -625,6 +634,7 @@ EXPORT_API int tel_send_ss_ussd_request(TapiHandle *handle, const TelSsUssdMsgIn struct tapi_resp_data *evt_cb_data = 0; GVariant *param = 0; + TAPI_RET_ERR_NUM_IF_NOT_SUPPORTED(TELEPHONY_FEATURE); TAPI_RET_ERR_NUM_IF_FAIL(handle, TAPI_API_INVALID_PTR); TAPI_RET_ERR_NUM_IF_FAIL(info, TAPI_API_INVALID_PTR);