sync with tizen branch

Change-Id: Ic3d0e701d882f8684c5f5b19eb3a57977c41a8ba
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>

diff --git a/src/commonlib/include/net_nfc_typedef.h b/src/commonlib/include/net_nfc_typedef.h
index 1920a938a7eb6ec08abff14138d17ac98d5e6cda..a79c0dda8132d354139a2368f97b40a02ce78647 100644 (file)
--- a/src/commonlib/include/net_nfc_typedef.h
+++ b/src/commonlib/include/net_nfc_typedef.h
@@ -454,7 +454,7 @@ extern "C" {
                NET_NFC_NPP,
        } llcp_app_protocol_e;
 
-       typedef struct _net_nfc_data_s *data_h;
+       typedef struct _net_nfc_data_s *net_nfc_data_h;
 
        typedef struct _ndef_record_s *ndef_record_h;
 

diff --git a/src/commonlib/include/net_nfc_typedef_internal.h b/src/commonlib/include/net_nfc_typedef_internal.h
index 077ab27725af6118c7c6c4d47cf38c39a7efc472..5cafc07a21ae89db781700129c72605e5a68f6bb 100644 (file)
--- a/src/commonlib/include/net_nfc_typedef_internal.h
+++ b/src/commonlib/include/net_nfc_typedef_internal.h
@@ -36,6 +36,8 @@ typedef struct _net_nfc_data_t {
        uint8_t buffer[0];
 } net_nfc_data_internal_s;
 
+typedef struct _net_nfc_data_s *net_nfc_data_h;
+
 typedef enum _net_nfc_connection_type_e {
        NET_NFC_TAG_CONNECTION = 0x00,
        NET_NFC_P2P_CONNECTION_TARGET,
@@ -133,7 +135,7 @@ typedef struct _ndef_message_s {
 
 typedef struct _net_nfc_tag_info_s {
        char *key;
-       data_h value;
+       net_nfc_data_h value;
 } net_nfc_tag_info_s;
 
 typedef struct _net_nfc_target_info_s {

diff --git a/src/manager/include/net_nfc_server_p2p.h b/src/manager/include/net_nfc_server_p2p.h
index 1f9e88592b0a43d00b47fc5f6292d1bd79a88d2a..b1b997a2618e417827551e917540a061cf916646 100644 (file)
--- a/src/manager/include/net_nfc_server_p2p.h
+++ b/src/manager/include/net_nfc_server_p2p.h
@@ -29,7 +29,7 @@ void net_nfc_server_p2p_detached(gpointer user_data);
 
 void net_nfc_server_p2p_discovered(net_nfc_target_handle_h handle);
 
-void net_nfc_server_p2p_received(data_h user_data);
+void net_nfc_server_p2p_received(net_nfc_data_h user_data);
 
 void net_nfc_server_p2p_net_nfc_data_sent(net_nfc_error_e result, gpointer user_data);
 

diff --git a/src/manager/net_nfc_server_p2p.c b/src/manager/net_nfc_server_p2p.c
index 5c36ba713a9e98b99b76a64f64f3a00d24b9cf37..abcca2f0741c1d0618519b269f25c108a8906a2a 100644 (file)
--- a/src/manager/net_nfc_server_p2p.c
+++ b/src/manager/net_nfc_server_p2p.c
@@ -191,7 +191,7 @@ void net_nfc_server_p2p_discovered(net_nfc_target_handle_h handle)
        net_nfc_manager_util_play_sound(NET_NFC_TASK_START);
 }
 
-void net_nfc_server_p2p_received(data_h user_data)
+void net_nfc_server_p2p_received(net_nfc_data_h user_data)
 {
        GVariant *arg_data;
 

diff --git a/src/manager/net_nfc_server_process_handover.c b/src/manager/net_nfc_server_process_handover.c
index 617c95fbdc4d56ec7064188953cc018af3c129c4..9f7d590ee81ba85c4f6b2754d0645b8bffb720c5 100644 (file)
--- a/src/manager/net_nfc_server_process_handover.c
+++ b/src/manager/net_nfc_server_process_handover.c
@@ -62,7 +62,7 @@ typedef struct _net_nfc_server_handover_process_config_context_t {
        net_nfc_server_handover_process_carrier_cb cb;
 } _process_config_context_t;
 
-static void _send_response(net_nfc_error_e result, net_nfc_conn_handover_carrier_type_e carrier, data_h ac_data, void *user_param);
+static void _send_response(net_nfc_error_e result, net_nfc_conn_handover_carrier_type_e carrier, net_nfc_data_h ac_data, void *user_param);
 
 static void _client_process(net_nfc_handover_context_t * context);
 
@@ -103,7 +103,7 @@ static net_nfc_error_e _net_nfc_server_handover_create_low_power_selector_messag
 ////////////////////////////////////////////////////////////////////////////
 
 /* LCOV_EXCL_START */
-static void _send_response(net_nfc_error_e result, net_nfc_conn_handover_carrier_type_e carrier, data_h ac_data, void *user_param)
+static void _send_response(net_nfc_error_e result, net_nfc_conn_handover_carrier_type_e carrier, net_nfc_data_h ac_data, void *user_param)
 {
        HandoverRequestData *handover_data = (HandoverRequestData *) user_param;