Stop Usage of raw pointers(SE Handlers) in API of nfc

Change-Id: I1e260ab19716a003fdbcbdcd3eefc8f696cbf52c
Signed-off-by: Himanshu Kumar <himanshu.kr@samsung.com>

diff --git a/include/net_nfc_client_se.h b/include/net_nfc_client_se.h
index 097646f..0c818aa 100755 (executable)
--- a/include/net_nfc_client_se.h
+++ b/include/net_nfc_client_se.h
@@ -22,7 +22,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
+typedef void *nfc_se_h;
 /*************Secure Element Callbacks*********/
 typedef void (*net_nfc_se_set_se_cb)(
        net_nfc_error_e result,
@@ -106,39 +106,39 @@ net_nfc_error_e net_nfc_client_se_open_internal_secure_element(
 
 net_nfc_error_e net_nfc_client_se_open_internal_secure_element_sync(
                                        net_nfc_se_type_e se_type,
-                                       net_nfc_target_handle_h *handle);
+                                       nfc_se_h  *handle);
 
 
 net_nfc_error_e net_nfc_client_se_close_internal_secure_element(
-                                       net_nfc_target_handle_h handle,
+                                       nfc_se_h handle,
                                        net_nfc_se_close_se_cb callback,
                                        void *user_data);
 
 
 net_nfc_error_e net_nfc_client_se_close_internal_secure_element_sync(
-                                       net_nfc_target_handle_h handle);
+                                       nfc_se_h handle);
 
 
 net_nfc_error_e net_nfc_client_se_get_atr(
-                               net_nfc_target_handle_h handle,
+                               nfc_se_h handle,
                                net_nfc_se_get_atr_cb callback,
                                void *user_data);
 
 
 net_nfc_error_e net_nfc_client_se_get_atr_sync(
-                               net_nfc_target_handle_h handle,
+                               nfc_se_h handle,
                                data_h *atr);
 
 
 net_nfc_error_e net_nfc_client_se_send_apdu(
-                               net_nfc_target_handle_h handle,
+                               nfc_se_h handle,
                                data_h apdu_data,
                                net_nfc_se_send_apdu_cb callback,
                                void *user_data);
 
 
 net_nfc_error_e net_nfc_client_se_send_apdu_sync(
-                               net_nfc_target_handle_h handle,
+                               nfc_se_h handle,
                                data_h apdu_data,
                                data_h *response);
 

diff --git a/packaging/capi-network-nfc.spec b/packaging/capi-network-nfc.spec
index c984f1e..75e21fb 100644 (file)
--- a/packaging/capi-network-nfc.spec
+++ b/packaging/capi-network-nfc.spec
@@ -1,6 +1,6 @@
 Name:       capi-network-nfc
 Summary:    A NFC library in Native API
-Version:    0.3.12
+Version:    0.4.0
 Release:    0
 Group:      Network & Connectivity/NFC
 License:    Apache-2.0

diff --git a/src/net_nfc_client_se.c b/src/net_nfc_client_se.c
index 98be4ff..50d5b01 100755 (executable)
--- a/src/net_nfc_client_se.c
+++ b/src/net_nfc_client_se.c
@@ -655,7 +655,7 @@ net_nfc_error_e net_nfc_client_se_open_internal_secure_element(
 NET_NFC_EXPORT_API
 net_nfc_error_e net_nfc_client_se_open_internal_secure_element_sync(
                                        net_nfc_se_type_e se_type,
-                                       net_nfc_target_handle_h *handle)
+                                       nfc_se_h* handle)
 {
        net_nfc_error_e result = NET_NFC_OK;
        guint out_handle = 0;
@@ -706,7 +706,7 @@ net_nfc_error_e net_nfc_client_se_open_internal_secure_element_sync(
 
 NET_NFC_EXPORT_API
 net_nfc_error_e net_nfc_client_se_close_internal_secure_element(
-                               net_nfc_target_handle_h handle,
+                               nfc_se_h handle,
                                net_nfc_se_close_se_cb callback,
                                void *user_data)
 {
@@ -752,7 +752,7 @@ net_nfc_error_e net_nfc_client_se_close_internal_secure_element(
 
 NET_NFC_EXPORT_API
 net_nfc_error_e net_nfc_client_se_close_internal_secure_element_sync(
-                                       net_nfc_target_handle_h handle)
+                                       nfc_se_h handle)
 {
        net_nfc_error_e result = NET_NFC_OK;
        GError *error = NULL;
@@ -796,7 +796,7 @@ net_nfc_error_e net_nfc_client_se_close_internal_secure_element_sync(
 
 NET_NFC_EXPORT_API
 net_nfc_error_e net_nfc_client_se_get_atr(
-                               net_nfc_target_handle_h handle,
+                               nfc_se_h handle,
                                net_nfc_se_get_atr_cb callback,
                                void *user_data)
 {
@@ -842,7 +842,7 @@ net_nfc_error_e net_nfc_client_se_get_atr(
 
 NET_NFC_EXPORT_API
 net_nfc_error_e net_nfc_client_se_get_atr_sync(
-                               net_nfc_target_handle_h handle,
+                               nfc_se_h handle,
                                data_h *atr)
 {
        net_nfc_error_e result = NET_NFC_OK;
@@ -895,7 +895,7 @@ net_nfc_error_e net_nfc_client_se_get_atr_sync(
 
 NET_NFC_EXPORT_API
 net_nfc_error_e net_nfc_client_se_send_apdu(
-                               net_nfc_target_handle_h handle,
+                               nfc_se_h handle,
                                data_h apdu_data,
                                net_nfc_se_send_apdu_cb callback,
                                void *user_data)
@@ -951,7 +951,7 @@ net_nfc_error_e net_nfc_client_se_send_apdu(
 
 NET_NFC_EXPORT_API
 net_nfc_error_e net_nfc_client_se_send_apdu_sync(
-                               net_nfc_target_handle_h handle,
+                               nfc_se_h handle,
                                data_h apdu_data,
                                data_h *response)
 {

diff --git a/src/nfc_card_emulation.c b/src/nfc_card_emulation.c
index 082003b..66e1fdd 100644 (file)
--- a/src/nfc_card_emulation.c
+++ b/src/nfc_card_emulation.c
@@ -22,7 +22,7 @@ int nfc_se_open_secure_element_internal(
 {
        net_nfc_error_e result;
        net_nfc_se_type_e type;
-       net_nfc_target_handle_h temp = NULL;
+       nfc_se_h temp = NULL;
 
        LOG_BEGIN(); // LCOV_EXCL_LINE
 
@@ -50,7 +50,7 @@ int nfc_se_open_secure_element_internal(
                type,
                &temp);
        if (result == NET_NFC_OK)
-               *handle = (nfc_se_h)temp;
+               *handle = temp;
 
        return nfc_common_convert_error_code(__func__, result);
        /* LCOV_EXCL_STOP */
@@ -91,7 +91,7 @@ int nfc_se_send_apdu_internal(nfc_se_h handle,
                data_h response = NULL;
 
                result = net_nfc_client_se_send_apdu_sync(
-                       (net_nfc_target_handle_h)handle,
+                       handle,
                        command,
                        &response);
                if (result == NET_NFC_OK && response != NULL) {
@@ -145,7 +145,7 @@ int nfc_se_get_atr_internal(nfc_se_h handle, unsigned char **atr, unsigned int *
        *atr_len = 0;
 
        result = net_nfc_client_se_get_atr_sync(
-               (net_nfc_target_handle_h)handle,
+               handle,
                &response);
        if (result == NET_NFC_OK && response != NULL) {
                uint8_t *buffer;
@@ -186,7 +186,7 @@ int nfc_se_close_secure_element_internal(nfc_se_h handle)
        CHECK_INVALID(handle == NULL);
 
        result = net_nfc_client_se_close_internal_secure_element_sync(
-               (net_nfc_target_handle_h)handle);
+               handle);
 
        return nfc_common_convert_error_code(__func__, result);
        /* LCOV_EXCL_STOP */