From: Jihoon Jung Date: Tue, 4 Feb 2025 08:32:56 +0000 (+0900) Subject: Fix build errors X-Git-Tag: accepted/tizen/unified/20250210.160146^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen;p=platform%2Fcore%2Fapi%2Fnfc.git Fix build errors Change-Id: I4e6c1fe3e8cbb4bed1a24e19554f8dfdd8b7da75 Signed-off-by: Jihoon Jung --- diff --git a/include/net_nfc_client_handover.h b/include/net_nfc_client_handover.h old mode 100755 new mode 100644 index afa69c3..f2bee2e --- a/include/net_nfc_client_handover.h +++ b/include/net_nfc_client_handover.h @@ -31,15 +31,15 @@ net_nfc_handover_event_e; typedef void (*net_nfc_p2p_connection_handover_completed_cb)( net_nfc_error_e result, net_nfc_conn_handover_carrier_type_e carrier, - data_h ac_data, + net_nfc_data_h ac_data, void *user_data); typedef void (*net_nfc_connection_handover_event_cb)( net_nfc_handover_event_e event, net_nfc_error_e result, net_nfc_conn_handover_carrier_type_e carrier, - data_h ac_data, - data_h ndef_message, + net_nfc_data_h ac_data, + net_nfc_data_h ndef_message, void *user_data); net_nfc_error_e net_nfc_client_handover_free_alternative_carrier_data( @@ -53,7 +53,7 @@ net_nfc_error_e net_nfc_client_handover_get_alternative_carrier_type( net_nfc_error_e net_nfc_client_handover_get_alternative_carrier_data( net_nfc_connection_handover_info_h info_handle, - data_h *data); + net_nfc_data_h *data); net_nfc_error_e net_nfc_client_p2p_connection_handover( @@ -67,7 +67,7 @@ net_nfc_error_e net_nfc_client_p2p_connection_handover_sync( net_nfc_target_handle_h handle, net_nfc_conn_handover_carrier_type_e arg_type, net_nfc_conn_handover_carrier_type_e *out_carrier, - data_h *out_ac_data); + net_nfc_data_h *out_ac_data); void net_nfc_client_handover_set_handover_event_cb( diff --git a/include/net_nfc_client_hce.h b/include/net_nfc_client_hce.h old mode 100755 new mode 100644 index 84de71a..7995bf1 --- a/include/net_nfc_client_hce.h +++ b/include/net_nfc_client_hce.h @@ -28,7 +28,7 @@ extern "C" { typedef void (*net_nfc_client_hce_event_cb)( net_nfc_target_handle_h handle, net_nfc_hce_event_t event, - data_h apdu, + net_nfc_data_h apdu, void *user_data); /************* Hce API's*************/ @@ -38,7 +38,7 @@ net_nfc_error_e net_nfc_client_hce_set_event_received_cb( net_nfc_error_e net_nfc_client_hce_unset_event_received_cb(void); net_nfc_error_e net_nfc_client_hce_response_apdu_sync( - net_nfc_target_handle_h handle, data_h resp_apdu_data); + net_nfc_target_handle_h handle, net_nfc_data_h resp_apdu_data); /* internal */ @@ -46,7 +46,7 @@ net_nfc_error_e net_nfc_client_hce_init(void); void net_nfc_client_hce_deinit(void); void net_nfc_client_hce_process_received_event(int event, - net_nfc_target_handle_h handle, data_h data); + net_nfc_target_handle_h handle, net_nfc_data_h data); #ifdef __cplusplus } diff --git a/include/net_nfc_client_hce_ipc.h b/include/net_nfc_client_hce_ipc.h old mode 100755 new mode 100644 index 259780c..fcc17fc --- a/include/net_nfc_client_hce_ipc.h +++ b/include/net_nfc_client_hce_ipc.h @@ -29,7 +29,7 @@ void net_nfc_client_hce_ipc_deinit(); bool net_nfc_client_hce_ipc_is_initialized(); bool net_nfc_server_hce_ipc_send_to_server(int type, - net_nfc_target_handle_s *handle, data_s *data); + net_nfc_target_handle_s *handle, net_nfc_data_s *data); #ifdef __cplusplus } diff --git a/include/net_nfc_client_llcp.h b/include/net_nfc_client_llcp.h old mode 100755 new mode 100644 index 7e8de1f..191399f --- a/include/net_nfc_client_llcp.h +++ b/include/net_nfc_client_llcp.h @@ -51,13 +51,13 @@ typedef void (*net_nfc_client_llcp_send_to_completed)(net_nfc_error_e result, void *user_data); typedef void (*net_nfc_client_llcp_receive_completed)(net_nfc_error_e result, - data_h data, + net_nfc_data_h data, void *user_data); typedef void (*net_nfc_client_llcp_receive_from_completed)( net_nfc_error_e result, sap_t sap, - data_h data, + net_nfc_data_h data, void *user_data); typedef void (*net_nfc_client_llcp_close_completed)(net_nfc_error_e result, @@ -110,22 +110,22 @@ net_nfc_error_e net_nfc_client_llcp_connect_sync(net_nfc_llcp_socket_t socket, net_nfc_llcp_socket_t *out_socket); net_nfc_error_e net_nfc_client_llcp_send(net_nfc_llcp_socket_t socket, - data_h data, + net_nfc_data_h data, net_nfc_client_llcp_send_completed callback, void *user_data); net_nfc_error_e net_nfc_client_llcp_send_sync(net_nfc_llcp_socket_t socket, - data_h data); + net_nfc_data_h data); net_nfc_error_e net_nfc_client_llcp_send_to(net_nfc_llcp_socket_t socket, sap_t sap, - data_h data, + net_nfc_data_h data, net_nfc_client_llcp_send_to_completed callback, void *user_data); net_nfc_error_e net_nfc_client_llcp_send_to_sync(net_nfc_llcp_socket_t socket, sap_t sap, - data_h data); + net_nfc_data_h data); net_nfc_error_e net_nfc_client_llcp_receive(net_nfc_llcp_socket_t socket, size_t request_length, @@ -134,7 +134,7 @@ net_nfc_error_e net_nfc_client_llcp_receive(net_nfc_llcp_socket_t socket, net_nfc_error_e net_nfc_client_llcp_receive_sync(net_nfc_llcp_socket_t socket, size_t request_length, - data_h *out_data); + net_nfc_data_h *out_data); net_nfc_error_e net_nfc_client_llcp_receive_from(net_nfc_llcp_socket_t socket, size_t request_length, @@ -145,7 +145,7 @@ net_nfc_error_e net_nfc_client_llcp_receive_from_sync( net_nfc_llcp_socket_t socket, size_t request_length, sap_t *out_sap, - data_h *out_data); + net_nfc_data_h *out_data); net_nfc_error_e net_nfc_client_llcp_close(net_nfc_llcp_socket_t socket, net_nfc_client_llcp_close_completed callback, diff --git a/include/net_nfc_client_ndef.h b/include/net_nfc_client_ndef.h old mode 100755 new mode 100644 index 00ec8ed..0081c1b --- a/include/net_nfc_client_ndef.h +++ b/include/net_nfc_client_ndef.h @@ -61,13 +61,13 @@ net_nfc_error_e net_nfc_client_ndef_make_read_only_sync( net_nfc_target_handle_h handle); net_nfc_error_e net_nfc_client_ndef_format(net_nfc_target_handle_h handle, - data_h key, + net_nfc_data_h key, net_nfc_client_ndef_format_completed callback, void *user_data); net_nfc_error_e net_nfc_client_ndef_format_sync( net_nfc_target_handle_h handle, - data_h key); + net_nfc_data_h key); /* TODO : move to internal header */ net_nfc_error_e net_nfc_client_ndef_init(void); diff --git a/include/net_nfc_client_p2p.h b/include/net_nfc_client_p2p.h old mode 100755 new mode 100644 index 547e267..f254d73 --- a/include/net_nfc_client_p2p.h +++ b/include/net_nfc_client_p2p.h @@ -33,17 +33,17 @@ typedef void (*net_nfc_client_p2p_device_discovered)( typedef void (*net_nfc_client_p2p_device_detached)(void *user_data); -typedef void (*net_nfc_client_p2p_data_received)(data_h p2p_data, +typedef void (*net_nfc_client_p2p_data_received)(net_nfc_data_h p2p_data, void *user_data); /* P2P client API's*/ net_nfc_error_e net_nfc_client_p2p_send(net_nfc_target_handle_h handle, - data_h data, + net_nfc_data_h data, net_nfc_client_p2p_send_completed callback, void *user_data); net_nfc_error_e net_nfc_client_p2p_send_sync(net_nfc_target_handle_h handle, - data_h data); + net_nfc_data_h data); /* P2P client API's - used for registering callbacks*/ diff --git a/include/net_nfc_client_se.h b/include/net_nfc_client_se.h old mode 100755 new mode 100644 index 0c818aa..e83fe29 --- a/include/net_nfc_client_se.h +++ b/include/net_nfc_client_se.h @@ -48,12 +48,12 @@ typedef void (*net_nfc_se_close_se_cb)( typedef void (*net_nfc_se_get_atr_cb)( net_nfc_error_e result, - data_h data, + net_nfc_data_h data, void *user_data); typedef void (*net_nfc_se_send_apdu_cb)( net_nfc_error_e result, - data_h data, + net_nfc_data_h data, void *user_data); typedef void (*net_nfc_client_se_event)( @@ -62,14 +62,14 @@ typedef void (*net_nfc_client_se_event)( typedef void (*net_nfc_client_se_transaction_event)( net_nfc_se_type_e se_type, - data_h aid, - data_h param, + net_nfc_data_h aid, + net_nfc_data_h param, void *user_data); typedef void (*net_nfc_client_se_ese_detected_event)( net_nfc_target_handle_h handle, int dev_type, - data_h data, + net_nfc_data_h data, void *user_data); typedef bool (*net_nfc_client_se_registered_aid_cb)(net_nfc_se_type_e se_type, @@ -127,20 +127,20 @@ net_nfc_error_e net_nfc_client_se_get_atr( net_nfc_error_e net_nfc_client_se_get_atr_sync( nfc_se_h handle, - data_h *atr); + net_nfc_data_h *atr); net_nfc_error_e net_nfc_client_se_send_apdu( nfc_se_h handle, - data_h apdu_data, + net_nfc_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( nfc_se_h handle, - data_h apdu_data, - data_h *response); + net_nfc_data_h apdu_data, + net_nfc_data_h *response); /************* Secure Element CallBack Register/Deregister functions*************/ @@ -223,7 +223,7 @@ net_nfc_error_e net_nfc_client_se_get_conflict_handlers_sync( net_nfc_error_e net_nfc_client_se_set_preferred_handler_sync(bool state); -/*net_nfc_error_e net_nfc_client_hce_get_route_table_sync(data_h arg_aid);*/ +/*net_nfc_error_e net_nfc_client_hce_get_route_table_sync(net_nfc_data_h arg_aid);*/ /* TODO : move to internal header */ diff --git a/include/net_nfc_client_tag_felica.h b/include/net_nfc_client_tag_felica.h old mode 100755 new mode 100644 index c28c52c..3f89172 --- a/include/net_nfc_client_tag_felica.h +++ b/include/net_nfc_client_tag_felica.h @@ -219,7 +219,7 @@ net_nfc_error_e net_nfc_client_felica_write_without_encryption( uint16_t service_list[], uint8_t number_of_blocks, uint8_t block_list[], - data_h data, + net_nfc_data_h data, nfc_transceive_data_callback callback, void *user_data); diff --git a/include/net_nfc_client_tag_internal.h b/include/net_nfc_client_tag_internal.h old mode 100755 new mode 100644 index 680fb40..9034428 --- a/include/net_nfc_client_tag_internal.h +++ b/include/net_nfc_client_tag_internal.h @@ -30,7 +30,7 @@ net_nfc_target_info_s *net_nfc_client_tag_get_client_target_info(void); net_nfc_error_e net_nfc_get_target_info_from_device_type(net_nfc_target_handle_h handle, net_nfc_target_type_e device_type, net_nfc_target_info_s** target_info); -net_nfc_error_e net_nfc_get_tag_info_value_from_key(net_nfc_target_info_s* target_info, const char* key, int valid_length, data_h* data); +net_nfc_error_e net_nfc_get_tag_info_value_from_key(net_nfc_target_info_s* target_info, const char* key, int valid_length, net_nfc_data_h* data); #ifdef __cplusplus } diff --git a/include/net_nfc_client_test.h b/include/net_nfc_client_test.h old mode 100755 new mode 100644 index 89f698c..c842358 --- a/include/net_nfc_client_test.h +++ b/include/net_nfc_client_test.h @@ -68,13 +68,13 @@ net_nfc_error_e net_nfc_client_test_get_firmware_version_sync(char **version); net_nfc_error_e net_nfc_client_test_set_ee_data(int mode, int reg_id, - data_h data, + net_nfc_data_h data, net_nfc_client_test_set_ee_data_completed callback, void *user_data); net_nfc_error_e net_nfc_client_test_set_ee_data_sync(int mode, int reg_id, - data_h data); + net_nfc_data_h data); net_nfc_error_e net_nfc_client_test_ese_test( net_nfc_client_test_sim_test_completed callback, diff --git a/include/net_nfc_client_transceive.h b/include/net_nfc_client_transceive.h old mode 100755 new mode 100644 index 771d7bd..2a7a306 --- a/include/net_nfc_client_transceive.h +++ b/include/net_nfc_client_transceive.h @@ -27,26 +27,26 @@ typedef void (*nfc_transceive_callback)(net_nfc_error_e result, void *user_data); typedef void (*nfc_transceive_data_callback)(net_nfc_error_e result, - data_h data, + net_nfc_data_h data, void *user_data); net_nfc_error_e net_nfc_client_transceive(net_nfc_target_handle_h handle, - data_h rawdata, + net_nfc_data_h rawdata, nfc_transceive_callback callback, void *user_data); net_nfc_error_e net_nfc_client_transceive_data(net_nfc_target_handle_h handle, - data_h rawdata, + net_nfc_data_h rawdata, nfc_transceive_data_callback callback, void *user_data); net_nfc_error_e net_nfc_client_transceive_sync(net_nfc_target_handle_h handle, - data_h rawdata); + net_nfc_data_h rawdata); net_nfc_error_e net_nfc_client_transceive_data_sync( net_nfc_target_handle_h handle, - data_h rawdata, - data_h *response); + net_nfc_data_h rawdata, + net_nfc_data_h *response); /* TODO : move to internal header */ net_nfc_error_e net_nfc_client_transceive_init(void); diff --git a/include/net_nfc_data.h b/include/net_nfc_data.h old mode 100755 new mode 100644 index dbc82cf..185acf5 --- a/include/net_nfc_data.h +++ b/include/net_nfc_data.h @@ -47,7 +47,7 @@ extern "C" { @exception NET_NFC_ALLOC_FAIL memory allocation is failed */ -net_nfc_error_e net_nfc_create_data_only(data_h *data); +net_nfc_error_e net_nfc_create_data_only(net_nfc_data_h *data); /** create data handler with initial values, bytes will be copied into the data handler. @@ -61,7 +61,7 @@ net_nfc_error_e net_nfc_create_data_only(data_h *data); @exception NET_NFC_NULL_PARAMETER parameter(s) has(have) illegal NULL pointer(s) @exception NET_NFC_ALLOC_FAIL memory allocation is failed */ -net_nfc_error_e net_nfc_create_data(data_h *data, const uint8_t *bytes, size_t length); +net_nfc_error_e net_nfc_create_data(net_nfc_data_h *data, const uint8_t *bytes, size_t length); /** get the byes and length from data handler. data handler assume bytes may have '0x0' value. @@ -75,7 +75,7 @@ net_nfc_error_e net_nfc_create_data(data_h *data, const uint8_t *bytes, size_t l @exception NET_NFC_NULL_PARAMETER parameter(s) has(have) illegal NULL pointer(s) */ -net_nfc_error_e net_nfc_get_data(const data_h data, uint8_t **bytes, size_t *length); +net_nfc_error_e net_nfc_get_data(const net_nfc_data_h data, uint8_t **bytes, size_t *length); /** replace the data handler with given bytes. binary data (bytes) will be copied to data hander. @@ -90,7 +90,7 @@ net_nfc_error_e net_nfc_get_data(const data_h data, uint8_t **bytes, size_t *len @exception NET_NFC_NULL_PARAMETER parameter(s) has(have) illegal NULL pointer(s) */ -net_nfc_error_e net_nfc_set_data(data_h data, const uint8_t *bytes, size_t length); +net_nfc_error_e net_nfc_set_data(net_nfc_data_h data, const uint8_t *bytes, size_t length); /** get length of data handler's bytes. @@ -102,7 +102,7 @@ net_nfc_error_e net_nfc_set_data(data_h data, const uint8_t *bytes, size_t lengt @exception 0 is returned if data is NULL */ -size_t net_nfc_get_data_length(const data_h data); +size_t net_nfc_get_data_length(const net_nfc_data_h data); /** get pointer of the handler's bytes (do not free this. it should be freed when the application call "net_nfc_free_data" function) @@ -114,7 +114,7 @@ size_t net_nfc_get_data_length(const data_h data); @exception NULL is returned if data is NULL */ -uint8_t *net_nfc_get_data_buffer(const data_h data); +uint8_t *net_nfc_get_data_buffer(const net_nfc_data_h data); /** free data handler. (it also free the copied bytes) @@ -126,7 +126,7 @@ uint8_t *net_nfc_get_data_buffer(const data_h data); @exception NET_NFC_NULL_PARAMETER parameter(s) has(have) illegal NULL pointer(s) */ -net_nfc_error_e net_nfc_free_data(data_h data); +net_nfc_error_e net_nfc_free_data(net_nfc_data_h data); /** diff --git a/include/net_nfc_ndef_message.h b/include/net_nfc_ndef_message.h old mode 100755 new mode 100644 index ff5a2d4..9937a62 --- a/include/net_nfc_ndef_message.h +++ b/include/net_nfc_ndef_message.h @@ -132,7 +132,7 @@ net_nfc_error_e net_nfc_get_ndef_message_record_count(ndef_message_h ndef_messag @code net_nfc_error_e result = NET_NFC_OK; - data_h rawdata; + net_nfc_data_h rawdata; ndef_message_h msg = NULL; ndef_record_h record = NULL; int idx; @@ -164,7 +164,7 @@ net_nfc_error_e net_nfc_get_ndef_message_record_count(ndef_message_h ndef_messag */ -net_nfc_error_e net_nfc_create_rawdata_from_ndef_message(ndef_message_h ndef_message, data_h *rawdata); +net_nfc_error_e net_nfc_create_rawdata_from_ndef_message(ndef_message_h ndef_message, net_nfc_data_h *rawdata); /** This function return the structure of ndef_message from serial format of ndef message. @@ -197,8 +197,8 @@ net_nfc_error_e net_nfc_create_rawdata_from_ndef_message(ndef_message_h ndef_mes { record_h record; ndef_message_h url; - data_h ndef_type; - data_h payload; + net_nfc_data_h ndef_type; + net_nfc_data_h payload; ndef_message_h ndef = (ndef_message_h)(data); net_nfc_get_record_by_index (ndef, 0, &record); @@ -218,7 +218,7 @@ net_nfc_error_e net_nfc_create_rawdata_from_ndef_message(ndef_message_h ndef_mes */ -net_nfc_error_e net_nfc_create_ndef_message_from_rawdata(ndef_message_h *ndef_message, data_h rawdata); +net_nfc_error_e net_nfc_create_ndef_message_from_rawdata(ndef_message_h *ndef_message, net_nfc_data_h rawdata); /** it returns the total size of ndef message bytes. parse the structure data and count the bytes @@ -257,7 +257,7 @@ net_nfc_error_e net_nfc_get_ndef_message_byte_length(ndef_message_h ndef_message @code net_nfc_error_e result = NET_NFC_OK; - data_h rawdata; + net_nfc_data_h rawdata; ndef_message_h msg = NULL; ndef_record_h record = NULL; int idx; @@ -389,7 +389,7 @@ net_nfc_error_e net_nfc_append_record_by_index(ndef_message_h ndef_message, int @endcode */ -net_nfc_error_e net_nfc_search_record_by_type(ndef_message_h ndef_message, net_nfc_record_tnf_e tnf, data_h type, ndef_record_h *record); +net_nfc_error_e net_nfc_search_record_by_type(ndef_message_h ndef_message, net_nfc_record_tnf_e tnf, net_nfc_data_h type, ndef_record_h *record); /** diff --git a/include/net_nfc_ndef_record.h b/include/net_nfc_ndef_record.h old mode 100755 new mode 100644 index 2b9e6d2..2bfa16d --- a/include/net_nfc_ndef_record.h +++ b/include/net_nfc_ndef_record.h @@ -103,7 +103,7 @@ uint8_t net_nfc_get_record_sr(uint8_t flag); char uri[] = " yahoo.com"; ndef_record_s uriRecord; - data_h payload; + net_nfc_data_h payload; net_nfc_create_data (&payload, uri, strlen (uri)); uri[0] = 0x01; @@ -114,7 +114,7 @@ uint8_t net_nfc_get_record_sr(uint8_t flag); } @endcode */ -net_nfc_error_e net_nfc_create_record(ndef_record_h *record, net_nfc_record_tnf_e tnf, data_h typeName, data_h id, data_h payload); +net_nfc_error_e net_nfc_create_record(ndef_record_h *record, net_nfc_record_tnf_e tnf, net_nfc_data_h typeName, net_nfc_data_h id, net_nfc_data_h payload); /** @@ -186,14 +186,14 @@ net_nfc_error_e net_nfc_create_uri_type_record(ndef_record_h *record, const char Do not free the payload. it will be freed when the record is freed @param[in] record Record handler - @param[out] payload data_h type payload pointer (it gives you the pointer of payload; not copied) + @param[out] payload net_nfc_data_h type payload pointer (it gives you the pointer of payload; not copied) @return return the result of the calling the function @exception NET_NFC_NULL_PARAMETER parameter(s) has(have) illigal NULL pointer(s) */ -net_nfc_error_e net_nfc_get_record_payload(ndef_record_h record, data_h *payload); +net_nfc_error_e net_nfc_get_record_payload(ndef_record_h record, net_nfc_data_h *payload); /** this function is getter of record type. @@ -208,7 +208,7 @@ net_nfc_error_e net_nfc_get_record_payload(ndef_record_h record, data_h *payload @exception NET_NFC_NULL_PARAMETER parameter(s) has(have) illigal NULL pointer(s) */ -net_nfc_error_e net_nfc_get_record_type(ndef_record_h record, data_h *type); +net_nfc_error_e net_nfc_get_record_type(ndef_record_h record, net_nfc_data_h *type); /** this function is getter of record ID. @@ -223,7 +223,7 @@ net_nfc_error_e net_nfc_get_record_type(ndef_record_h record, data_h *type); @exception NET_NFC_NULL_PARAMETER parameter(s) has(have) illigal NULL pointer(s) */ -net_nfc_error_e net_nfc_get_record_id(ndef_record_h record, data_h *id); +net_nfc_error_e net_nfc_get_record_id(ndef_record_h record, net_nfc_data_h *id); /** this function is getter of record TNF value. @@ -283,7 +283,7 @@ net_nfc_error_e net_nfc_get_record_flags(ndef_record_h record, uint8_t *flag); @exception NET_NFC_NULL_PARAMETER parameter(s) has(have) illigal NULL pointer(s) */ -net_nfc_error_e net_nfc_set_record_id(ndef_record_h record, data_h id); +net_nfc_error_e net_nfc_set_record_id(ndef_record_h record, net_nfc_data_h id); /** this function free the record handler. do not use this function after appending the ndef message diff --git a/include/net_nfc_tag_mifare.h b/include/net_nfc_tag_mifare.h old mode 100755 new mode 100644 index 7909179..1305686 --- a/include/net_nfc_tag_mifare.h +++ b/include/net_nfc_tag_mifare.h @@ -68,7 +68,7 @@ extern "C" { net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyA( net_nfc_target_handle_h handle, uint8_t sector, - data_h auth_key, + net_nfc_data_h auth_key, void *callback, void *user_data); @@ -115,7 +115,7 @@ net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyA( net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyB( net_nfc_target_handle_h handle, uint8_t sector, - data_h auth_key, + net_nfc_data_h auth_key, void *callback, void *user_data); @@ -185,7 +185,7 @@ net_nfc_error_e net_nfc_client_mifare_read(net_nfc_target_handle_h handle, net_nfc_error_e net_nfc_client_mifare_write_block( net_nfc_target_handle_h handle, uint8_t addr, - data_h data, + net_nfc_data_h data, void *callback, void *user_data); @@ -220,7 +220,7 @@ net_nfc_error_e net_nfc_client_mifare_write_block( net_nfc_error_e net_nfc_client_mifare_write_page( net_nfc_target_handle_h handle, uint8_t addr, - data_h data, + net_nfc_data_h data, void *callback, void *user_data); @@ -376,7 +376,7 @@ net_nfc_error_e net_nfc_client_mifare_restore(net_nfc_target_handle_h handle, */ -net_nfc_error_e net_nfc_client_mifare_create_default_key(data_h* key); +net_nfc_error_e net_nfc_client_mifare_create_default_key(net_nfc_data_h* key); /** create mifare application directory key. The key is 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5 @@ -394,7 +394,7 @@ net_nfc_error_e net_nfc_client_mifare_create_default_key(data_h* key); */ net_nfc_error_e net_nfc_client_mifare_create_application_directory_key( - data_h* key); + net_nfc_data_h* key); /** create nfc forum key. The key is 0xD3, 0xF7, 0xD3, 0xF7, 0xD3, 0xF7 @@ -411,7 +411,7 @@ net_nfc_error_e net_nfc_client_mifare_create_application_directory_key( */ -net_nfc_error_e net_nfc_client_mifare_create_net_nfc_forum_key(data_h* key); +net_nfc_error_e net_nfc_client_mifare_create_net_nfc_forum_key(net_nfc_data_h* key); /** @} */ diff --git a/include/net_nfc_target_info.h b/include/net_nfc_target_info.h old mode 100755 new mode 100644 index 77968ac..1db247c --- a/include/net_nfc_target_info.h +++ b/include/net_nfc_target_info.h @@ -225,7 +225,7 @@ net_nfc_error_e net_nfc_get_tag_info_keys(net_nfc_target_info_h target_info, cha for(; index < keys_length; index++) { char* key = keys[index]; - data_h value; + net_nfc_data_h value; net_nfc_get_tag_info_value(target_info, key, &value); net_nfc_free_data(value); } @@ -243,7 +243,7 @@ net_nfc_error_e net_nfc_get_tag_info_keys(net_nfc_target_info_h target_info, cha @exception NET_NFC_NO_DATA_FOUND No data is returned */ -net_nfc_error_e net_nfc_get_tag_info_value(net_nfc_target_info_h target_info, const char *key, data_h *value); +net_nfc_error_e net_nfc_get_tag_info_value(net_nfc_target_info_h target_info, const char *key, net_nfc_data_h *value); /** Get ndef message of current tag diff --git a/include/nfc_common.h b/include/nfc_common.h index 0639d68..9a5bf89 100644 --- a/include/nfc_common.h +++ b/include/nfc_common.h @@ -166,7 +166,7 @@ typedef struct _nfc_callback_s extern _nfc_context_s gdbus_nfc_context; pid_t nfc_common_get_focus_app_pid(); -char * nfc_common_get_bt_address_string(data_h data); +char * nfc_common_get_bt_address_string(net_nfc_data_h data); bool nfc_common_check_app_permission(); int nfc_common_convert_error_code(const char *func, int native_error_code); bool nfc_common_is_initialized(); diff --git a/src/net_nfc_client_data.c b/src/net_nfc_client_data.c old mode 100755 new mode 100644 index a11604e..6f1c7a0 --- a/src/net_nfc_client_data.c +++ b/src/net_nfc_client_data.c @@ -26,15 +26,15 @@ /* LCOV_EXCL_START */ -NET_NFC_EXPORT_API net_nfc_error_e net_nfc_create_data_only(data_h *data) +NET_NFC_EXPORT_API net_nfc_error_e net_nfc_create_data_only(net_nfc_data_h *data) { return net_nfc_create_data(data, NULL, 0); } -NET_NFC_EXPORT_API net_nfc_error_e net_nfc_create_data(data_h *data, +NET_NFC_EXPORT_API net_nfc_error_e net_nfc_create_data(net_nfc_data_h *data, const uint8_t *bytes, size_t length) { - data_s *tmp_data = NULL; + net_nfc_data_s *tmp_data = NULL; if (data == NULL) return NET_NFC_NULL_PARAMETER; @@ -48,15 +48,15 @@ NET_NFC_EXPORT_API net_nfc_error_e net_nfc_create_data(data_h *data, if (length > 0 && bytes != NULL) memcpy(tmp_data->buffer, bytes, length); - *data = (data_h)tmp_data; + *data = (net_nfc_data_h)tmp_data; return NET_NFC_OK; } -NET_NFC_EXPORT_API net_nfc_error_e net_nfc_get_data(const data_h data, +NET_NFC_EXPORT_API net_nfc_error_e net_nfc_get_data(const net_nfc_data_h data, uint8_t **bytes, size_t *length) { - data_s *tmp_data = (data_s *)data; + net_nfc_data_s *tmp_data = (net_nfc_data_s *)data; if (bytes == NULL || length == NULL) return NET_NFC_NULL_PARAMETER; @@ -73,10 +73,10 @@ NET_NFC_EXPORT_API net_nfc_error_e net_nfc_get_data(const data_h data, return NET_NFC_OK; } -NET_NFC_EXPORT_API net_nfc_error_e net_nfc_set_data(data_h data, +NET_NFC_EXPORT_API net_nfc_error_e net_nfc_set_data(net_nfc_data_h data, const uint8_t *bytes, size_t length) { - data_s *tmp_data = (data_s *)data; + net_nfc_data_s *tmp_data = (net_nfc_data_s *)data; if (data == NULL) return NET_NFC_NULL_PARAMETER; @@ -96,9 +96,9 @@ NET_NFC_EXPORT_API net_nfc_error_e net_nfc_set_data(data_h data, return NET_NFC_OK; } -NET_NFC_EXPORT_API size_t net_nfc_get_data_length(const data_h data) +NET_NFC_EXPORT_API size_t net_nfc_get_data_length(const net_nfc_data_h data) { - data_s *tmp_data = (data_s *)data; + net_nfc_data_s *tmp_data = (net_nfc_data_s *)data; if (data == NULL) return 0; @@ -106,9 +106,9 @@ NET_NFC_EXPORT_API size_t net_nfc_get_data_length(const data_h data) return tmp_data->length; } -NET_NFC_EXPORT_API uint8_t *net_nfc_get_data_buffer(const data_h data) +NET_NFC_EXPORT_API uint8_t *net_nfc_get_data_buffer(const net_nfc_data_h data) { - data_s *tmp_data = (data_s *)data; + net_nfc_data_s *tmp_data = (net_nfc_data_s *)data; if (data == NULL) return NULL; @@ -116,9 +116,9 @@ NET_NFC_EXPORT_API uint8_t *net_nfc_get_data_buffer(const data_h data) return tmp_data->buffer; } -NET_NFC_EXPORT_API net_nfc_error_e net_nfc_free_data(data_h data) +NET_NFC_EXPORT_API net_nfc_error_e net_nfc_free_data(net_nfc_data_h data) { - data_s *tmp_data = (data_s *)data; + net_nfc_data_s *tmp_data = (net_nfc_data_s *)data; if (data == NULL) return NET_NFC_NULL_PARAMETER; diff --git a/src/net_nfc_client_handover.c b/src/net_nfc_client_handover.c old mode 100755 new mode 100644 index 370a709..20d4082 --- a/src/net_nfc_client_handover.c +++ b/src/net_nfc_client_handover.c @@ -48,11 +48,11 @@ static void p2p_connection_handover(GObject *source_object, static void __started(NetNfcGDbusHandover *object, GVariant *arg_message) { - data_s message; + net_nfc_data_s message; INFO_MSG(">>> SIGNAL arrived"); - net_nfc_util_gdbus_variant_to_data_s(arg_message, &message); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(arg_message, &message); if (handover_callbacks.handover_event_cb != NULL) { handover_callbacks.handover_event_cb(NET_NFC_HANDOVER_START, @@ -70,12 +70,12 @@ static void __finished(NetNfcGDbusHandover *object, GVariant *arg_address, GVariant *arg_message) { - data_s address, message; + net_nfc_data_s address, message; INFO_MSG(">>> SIGNAL arrived"); - net_nfc_util_gdbus_variant_to_data_s(arg_address, &address); - net_nfc_util_gdbus_variant_to_data_s(arg_message, &message); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(arg_address, &address); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(arg_message, &message); if (handover_callbacks.handover_event_cb != NULL) { handover_callbacks.handover_event_cb(NET_NFC_HANDOVER_FINISH, @@ -97,7 +97,7 @@ static void p2p_connection_handover(GObject *source_object, net_nfc_conn_handover_carrier_type_e type = NET_NFC_CONN_HANDOVER_CARRIER_UNKNOWN; GError *error = NULL; - data_s arg_data; + net_nfc_data_s arg_data; g_assert(user_data != NULL); @@ -127,7 +127,7 @@ static void p2p_connection_handover(GObject *source_object, net_nfc_p2p_connection_handover_completed_cb callback = (net_nfc_p2p_connection_handover_completed_cb)func_data->callback; - net_nfc_util_gdbus_variant_to_data_s(data, &arg_data); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(data, &arg_data); callback(result, type, @@ -179,7 +179,7 @@ net_nfc_error_e net_nfc_client_handover_get_alternative_carrier_type( NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_handover_get_alternative_carrier_data( net_nfc_connection_handover_info_h info_handle, - data_h *data) + net_nfc_data_h *data) { net_nfc_connection_handover_info_s *info = (net_nfc_connection_handover_info_s *)info_handle; @@ -236,7 +236,7 @@ net_nfc_error_e net_nfc_client_p2p_connection_handover_sync( net_nfc_target_handle_h handle, net_nfc_conn_handover_carrier_type_e arg_type, net_nfc_conn_handover_carrier_type_e *out_carrier, - data_h *out_ac_data) + net_nfc_data_h *out_ac_data) { net_nfc_target_handle_s *tag_handle = (net_nfc_target_handle_s *)handle; GVariant *out_data = NULL; diff --git a/src/net_nfc_client_hce.c b/src/net_nfc_client_hce.c old mode 100755 new mode 100644 index 7cbc817..4a08ce3 --- a/src/net_nfc_client_hce.c +++ b/src/net_nfc_client_hce.c @@ -62,9 +62,9 @@ static void hce_event_received(GObject *source_object, guint arg_handle, if (hce_handler.hce_event_cb != NULL) { - data_s apdu = { NULL, 0 }; + net_nfc_data_s apdu = { NULL, 0 }; - net_nfc_util_gdbus_variant_to_data_s(arg_apdu, &apdu); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(arg_apdu, &apdu); hce_handler.hce_event_cb((net_nfc_target_handle_h)GUINT_TO_POINTER(arg_handle), (net_nfc_hce_event_t)arg_event, &apdu, @@ -75,7 +75,7 @@ static void hce_event_received(GObject *source_object, guint arg_handle, } void net_nfc_client_hce_process_received_event(int event, - net_nfc_target_handle_h handle, data_h data) + net_nfc_target_handle_h handle, net_nfc_data_h data) { INFO_MSG(">>> SIGNAL arrived"); @@ -165,7 +165,7 @@ net_nfc_error_e net_nfc_client_hce_unset_event_received_cb(void) NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_hce_response_apdu_sync( net_nfc_target_handle_h handle, - data_h resp_apdu_data) + net_nfc_data_h resp_apdu_data) { net_nfc_error_e result = NET_NFC_OK; GError *error = NULL; @@ -182,7 +182,7 @@ net_nfc_error_e net_nfc_client_hce_response_apdu_sync( } } - arg_data = net_nfc_util_gdbus_data_to_variant((data_s *)resp_apdu_data); + arg_data = net_nfc_util_gdbus_data_to_variant((net_nfc_data_s *)resp_apdu_data); if (arg_data == NULL) { INFO_MSG(">>> resp_apdu_data is null !!"); @@ -209,7 +209,7 @@ net_nfc_error_e net_nfc_client_hce_response_apdu_sync( NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_hce_response_apdu_sync( net_nfc_target_handle_h handle, - data_h resp_apdu_data) + net_nfc_data_h resp_apdu_data) { net_nfc_error_e result; diff --git a/src/net_nfc_client_hce_ipc.c b/src/net_nfc_client_hce_ipc.c old mode 100755 new mode 100644 index d1b81d7..656b1aa --- a/src/net_nfc_client_hce_ipc.c +++ b/src/net_nfc_client_hce_ipc.c @@ -61,7 +61,7 @@ static void __set_non_block_socket(int socket) DEBUG_ERR_MSG("fcntl, executing nonblock error"); } -static bool __receive_data_from_server(int socket, data_s *data) +static bool __receive_data_from_server(int socket, net_nfc_data_s *data) { bool result; ssize_t ret; @@ -113,11 +113,11 @@ static bool __receive_data_from_server(int socket, data_s *data) static bool __process_server_message() { bool result = false; - data_s data; + net_nfc_data_s data; if (__receive_data_from_server(hce_client_socket, &data) == true) { net_nfc_hce_data_t *header; - data_s temp; + net_nfc_data_s temp; header = (net_nfc_hce_data_t *)data.buffer; @@ -125,7 +125,7 @@ static bool __process_server_message() temp.length = data.length - sizeof(net_nfc_hce_data_t); net_nfc_client_hce_process_received_event(header->type, - (net_nfc_target_handle_h)GUINT_TO_POINTER(header->handle), (data_h)&temp); + (net_nfc_target_handle_h)GUINT_TO_POINTER(header->handle), (net_nfc_data_h)&temp); result = true; } else { @@ -137,7 +137,7 @@ static bool __process_server_message() return result; } -static bool __send_data_to_server(int socket, data_s *data) +static bool __send_data_to_server(int socket, net_nfc_data_s *data) { ssize_t ret; @@ -152,10 +152,10 @@ static bool __send_data_to_server(int socket, data_s *data) } bool net_nfc_server_hce_ipc_send_to_server(int type, - net_nfc_target_handle_s *handle, data_s *data) + net_nfc_target_handle_s *handle, net_nfc_data_s *data) { bool ret = false; - data_s temp; + net_nfc_data_s temp; uint32_t len = sizeof(net_nfc_hce_data_t); if (data != NULL && data->length > 0) diff --git a/src/net_nfc_client_llcp.c b/src/net_nfc_client_llcp.c index 83eac19..85c16d5 100644 --- a/src/net_nfc_client_llcp.c +++ b/src/net_nfc_client_llcp.c @@ -522,9 +522,9 @@ static void llcp_call_receive(GObject *source_object, if (func_data->callback != NULL) { net_nfc_client_llcp_receive_completed callback = (net_nfc_client_llcp_receive_completed)func_data->callback; - data_s data = { NULL, 0 }; + net_nfc_data_s data = { NULL, 0 }; - net_nfc_util_gdbus_variant_to_data_s(variant, &data); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(variant, &data); callback(result, &data, func_data->user_data); @@ -564,9 +564,9 @@ static void llcp_call_receive_from(GObject *source_object, if (func_data->callback != NULL) { net_nfc_client_llcp_receive_from_completed callback = (net_nfc_client_llcp_receive_from_completed)func_data->callback; - data_s data = { NULL, 0 }; + net_nfc_data_s data = { NULL, 0 }; - net_nfc_util_gdbus_variant_to_data_s(variant, &data); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(variant, &data); callback(result, sap, &data, func_data->user_data); @@ -1147,7 +1147,7 @@ net_nfc_error_e net_nfc_client_llcp_connect_sap_sync( NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_llcp_send(net_nfc_llcp_socket_t socket, - data_h data, + net_nfc_data_h data, net_nfc_client_llcp_send_completed callback, void *user_data) { @@ -1186,7 +1186,7 @@ net_nfc_error_e net_nfc_client_llcp_send(net_nfc_llcp_socket_t socket, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_llcp_send_sync(net_nfc_llcp_socket_t socket, - data_h data) + net_nfc_data_h data) { net_nfc_error_e result; GVariant *variant; @@ -1241,7 +1241,7 @@ net_nfc_error_e net_nfc_client_llcp_send_sync(net_nfc_llcp_socket_t socket, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_llcp_send_to(net_nfc_llcp_socket_t socket, sap_t sap, - data_h data, + net_nfc_data_h data, net_nfc_client_llcp_send_to_completed callback, void *user_data) { @@ -1282,7 +1282,7 @@ net_nfc_error_e net_nfc_client_llcp_send_to(net_nfc_llcp_socket_t socket, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_llcp_send_to_sync(net_nfc_llcp_socket_t socket, sap_t sap, - data_h data) + net_nfc_data_h data) { net_nfc_error_e result; GVariant *variant; @@ -1370,7 +1370,7 @@ net_nfc_error_e net_nfc_client_llcp_receive(net_nfc_llcp_socket_t socket, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_llcp_receive_sync(net_nfc_llcp_socket_t socket, size_t request_length, - data_h *out_data) + net_nfc_data_h *out_data) { net_nfc_error_e result; GVariant *variant; @@ -1452,7 +1452,7 @@ net_nfc_error_e net_nfc_client_llcp_receive_from_sync( net_nfc_llcp_socket_t socket, size_t request_length, sap_t *out_sap, - data_h *out_data) + net_nfc_data_h *out_data) { net_nfc_error_e result; GError *error = NULL; diff --git a/src/net_nfc_client_ndef.c b/src/net_nfc_client_ndef.c old mode 100755 new mode 100644 index f803e9f..ec313b5 --- a/src/net_nfc_client_ndef.c +++ b/src/net_nfc_client_ndef.c @@ -486,7 +486,7 @@ net_nfc_error_e net_nfc_client_ndef_make_read_only_sync( NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_ndef_format(net_nfc_target_handle_h handle, - data_h key, + net_nfc_data_h key, net_nfc_client_ndef_format_completed callback, void *user_data) { @@ -517,7 +517,7 @@ net_nfc_error_e net_nfc_client_ndef_format(net_nfc_target_handle_h handle, func_data->callback = (gpointer)callback; func_data->user_data = user_data; - arg_data = net_nfc_util_gdbus_data_to_variant((data_s *)key); + arg_data = net_nfc_util_gdbus_data_to_variant((net_nfc_data_s *)key); net_nfc_gdbus_ndef_call_format(ndef_proxy , GPOINTER_TO_UINT(handle), @@ -532,7 +532,7 @@ net_nfc_error_e net_nfc_client_ndef_format(net_nfc_target_handle_h handle, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_ndef_format_sync( net_nfc_target_handle_h handle, - data_h key) + net_nfc_data_h key) { net_nfc_error_e out_result = NET_NFC_OK; GVariant *arg_data; @@ -555,7 +555,7 @@ net_nfc_error_e net_nfc_client_ndef_format_sync( if (net_nfc_client_tag_is_connected() == FALSE) return NET_NFC_NOT_CONNECTED; - arg_data = net_nfc_util_gdbus_data_to_variant((data_s *)key); + arg_data = net_nfc_util_gdbus_data_to_variant((net_nfc_data_s *)key); if (net_nfc_gdbus_ndef_call_format_sync(ndef_proxy , GPOINTER_TO_UINT(handle), diff --git a/src/net_nfc_client_ndef_message.c b/src/net_nfc_client_ndef_message.c old mode 100755 new mode 100644 index 5d80f23..2a418b5 --- a/src/net_nfc_client_ndef_message.c +++ b/src/net_nfc_client_ndef_message.c @@ -52,11 +52,11 @@ net_nfc_error_e net_nfc_create_ndef_message(ndef_message_h *ndef_message) NET_NFC_EXPORT_API net_nfc_error_e net_nfc_create_rawdata_from_ndef_message( - ndef_message_h ndef_message, data_h *rawdata) + ndef_message_h ndef_message, net_nfc_data_h *rawdata) { uint32_t count; net_nfc_error_e result; - data_h data; + net_nfc_data_h data; if (ndef_message == NULL || rawdata == NULL) return NET_NFC_NULL_PARAMETER; @@ -72,7 +72,7 @@ net_nfc_error_e net_nfc_create_rawdata_from_ndef_message( return result; result = net_nfc_util_convert_ndef_message_to_rawdata( - (ndef_message_s *)ndef_message, (data_s *)data); + (ndef_message_s *)ndef_message, (net_nfc_data_s *)data); if (result == NET_NFC_OK) *rawdata = data; else @@ -83,7 +83,7 @@ net_nfc_error_e net_nfc_create_rawdata_from_ndef_message( NET_NFC_EXPORT_API net_nfc_error_e net_nfc_create_ndef_message_from_rawdata( - ndef_message_h *ndef_message, data_h rawdata) + ndef_message_h *ndef_message, net_nfc_data_h rawdata) { net_nfc_error_e result = NET_NFC_OK; ndef_message_h msg; @@ -98,7 +98,7 @@ net_nfc_error_e net_nfc_create_ndef_message_from_rawdata( return result; result = net_nfc_util_convert_rawdata_to_ndef_message( - (data_s *)rawdata, (ndef_message_s *)msg); + (net_nfc_data_s *)rawdata, (ndef_message_s *)msg); if (result == NET_NFC_OK) *ndef_message = msg; else @@ -168,11 +168,11 @@ NET_NFC_EXPORT_API void net_nfc_ndef_print_message(ndef_message_h ndef_message) NET_NFC_EXPORT_API net_nfc_error_e net_nfc_search_record_by_type(ndef_message_h ndef_message, - net_nfc_record_tnf_e tnf, data_h type, ndef_record_h *record) + net_nfc_record_tnf_e tnf, net_nfc_data_h type, ndef_record_h *record) { return net_nfc_util_search_record_by_type( (ndef_message_s *)ndef_message, tnf, - (data_s *)type, (ndef_record_s **)record); + (net_nfc_data_s *)type, (ndef_record_s **)record); } NET_NFC_EXPORT_API @@ -228,7 +228,7 @@ net_nfc_error_e net_nfc_retrieve_current_ndef_message( DEBUG_CLIENT_MSG("message length = [%ld]", size); if (size > 0) { - data_s data = { NULL, 0 }; + net_nfc_data_s data = { NULL, 0 }; if (net_nfc_util_init_data(&data, size) == true) { int current; diff --git a/src/net_nfc_client_ndef_record.c b/src/net_nfc_client_ndef_record.c old mode 100755 new mode 100644 index e0ee455..7858b40 --- a/src/net_nfc_client_ndef_record.c +++ b/src/net_nfc_client_ndef_record.c @@ -29,10 +29,10 @@ NET_NFC_EXPORT_API net_nfc_error_e net_nfc_create_record(ndef_record_h *record, - net_nfc_record_tnf_e tnf, data_h typeName, data_h id, data_h payload) + net_nfc_record_tnf_e tnf, net_nfc_data_h typeName, net_nfc_data_h id, net_nfc_data_h payload) { - return net_nfc_util_create_record(tnf, (data_s *)typeName, - (data_s *)id, (data_s *)payload, (ndef_record_s **)record); + return net_nfc_util_create_record(tnf, (net_nfc_data_s *)typeName, + (net_nfc_data_s *)id, (net_nfc_data_s *)payload, (ndef_record_s **)record); } NET_NFC_EXPORT_API @@ -60,40 +60,40 @@ net_nfc_error_e net_nfc_free_record(ndef_record_h record) NET_NFC_EXPORT_API net_nfc_error_e net_nfc_get_record_payload(ndef_record_h record, - data_h *payload) + net_nfc_data_h *payload) { ndef_record_s *struct_record = (ndef_record_s *)record; if (record == NULL || payload == NULL) return NET_NFC_NULL_PARAMETER; - *payload = (data_h)&(struct_record->payload_s); + *payload = (net_nfc_data_h)&(struct_record->payload_s); return NET_NFC_OK; } NET_NFC_EXPORT_API -net_nfc_error_e net_nfc_get_record_type(ndef_record_h record, data_h *type) +net_nfc_error_e net_nfc_get_record_type(ndef_record_h record, net_nfc_data_h *type) { ndef_record_s *struct_record = (ndef_record_s *)record; if (record == NULL || type == NULL) return NET_NFC_NULL_PARAMETER; - *type = (data_h)&(struct_record->type_s); + *type = (net_nfc_data_h)&(struct_record->type_s); return NET_NFC_OK; } NET_NFC_EXPORT_API -net_nfc_error_e net_nfc_get_record_id(ndef_record_h record, data_h *id) +net_nfc_error_e net_nfc_get_record_id(ndef_record_h record, net_nfc_data_h *id) { ndef_record_s *struct_record = (ndef_record_s *)record; if (record == NULL || id == NULL) return NET_NFC_NULL_PARAMETER; - *id = (data_h)&(struct_record->id_s); + *id = (net_nfc_data_h)&(struct_record->id_s); return NET_NFC_OK; } @@ -113,9 +113,9 @@ net_nfc_error_e net_nfc_get_record_tnf(ndef_record_h record, } NET_NFC_EXPORT_API -net_nfc_error_e net_nfc_set_record_id(ndef_record_h record, data_h id) +net_nfc_error_e net_nfc_set_record_id(ndef_record_h record, net_nfc_data_h id) { - data_s *tmp_id = (data_s *)id; + net_nfc_data_s *tmp_id = (net_nfc_data_s *)id; if (record == NULL || tmp_id == NULL) return NET_NFC_NULL_PARAMETER; @@ -175,7 +175,7 @@ NET_NFC_EXPORT_API uint8_t net_nfc_get_record_il(uint8_t flag) static bool _is_text_record(ndef_record_h record) { bool result = false; - data_h type; + net_nfc_data_h type; if ((net_nfc_get_record_type(record, &type) == NET_NFC_OK) && (strncmp((char *)net_nfc_get_data_buffer(type), @@ -191,7 +191,7 @@ net_nfc_error_e net_nfc_create_text_string_from_text_record( ndef_record_h record, char **buffer) { net_nfc_error_e result; - data_h payload; + net_nfc_data_h payload; if (record == NULL || buffer == NULL) return NET_NFC_NULL_PARAMETER; @@ -236,7 +236,7 @@ net_nfc_error_e net_nfc_get_languange_code_string_from_text_record( ndef_record_h record, char **lang_code_str) { net_nfc_error_e result; - data_h payload; + net_nfc_data_h payload; if (record == NULL || lang_code_str == NULL) return NET_NFC_NULL_PARAMETER; @@ -278,7 +278,7 @@ net_nfc_error_e net_nfc_get_encoding_type_from_text_record(ndef_record_h record, net_nfc_encode_type_e *encoding) { net_nfc_error_e result; - data_h payload; + net_nfc_data_h payload; if (record == NULL || encoding == NULL) return NET_NFC_NULL_PARAMETER; diff --git a/src/net_nfc_client_p2p.c b/src/net_nfc_client_p2p.c old mode 100755 new mode 100644 index 5760beb..9a83bb7 --- a/src/net_nfc_client_p2p.c +++ b/src/net_nfc_client_p2p.c @@ -101,9 +101,9 @@ static void p2p_device_data_received(GObject *source_object, INFO_MSG(">>> SIGNAL arrived"); if (p2p_signal_handler.p2p_data_received_cb) { - data_s p2p_data = { NULL, }; + net_nfc_data_s p2p_data = { NULL, }; - net_nfc_util_gdbus_variant_to_data_s(arg_data, &p2p_data); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(arg_data, &p2p_data); p2p_signal_handler.p2p_data_received_cb(&p2p_data, p2p_signal_handler.p2p_data_received_data); @@ -148,7 +148,7 @@ static void p2p_call_send(GObject *source_object, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_p2p_send(net_nfc_target_handle_h handle, - data_h data, + net_nfc_data_h data, net_nfc_client_p2p_send_completed callback, void *user_data) { @@ -188,7 +188,7 @@ net_nfc_error_e net_nfc_client_p2p_send(net_nfc_target_handle_h handle, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_p2p_send_sync(net_nfc_target_handle_h handle, - data_h data) + net_nfc_data_h data) { GVariant *arg_data; GError *error = NULL; diff --git a/src/net_nfc_client_se.c b/src/net_nfc_client_se.c old mode 100755 new mode 100644 index fb460c9..23b9313 --- a/src/net_nfc_client_se.c +++ b/src/net_nfc_client_se.c @@ -161,11 +161,11 @@ static void se_ese_detected(GObject *source_object, INFO_MSG(">>> SIGNAL arrived"); if (se_esedetecthandler.se_ese_detected_cb != NULL) { - data_s buffer_data = { NULL, 0 }; + net_nfc_data_s buffer_data = { NULL, 0 }; net_nfc_client_se_ese_detected_event callback = (net_nfc_client_se_ese_detected_event)se_esedetecthandler.se_ese_detected_cb; - net_nfc_util_gdbus_variant_to_data_s(arg_data, &buffer_data); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(arg_data, &buffer_data); callback((net_nfc_target_handle_h)GUINT_TO_POINTER(arg_handle), arg_se_type, &buffer_data, @@ -264,11 +264,11 @@ static void se_transaction_event(GObject *source_object, } if (callback != NULL) { - data_s aid = { NULL, 0 }; - data_s param = { NULL, 0 }; + net_nfc_data_s aid = { NULL, 0 }; + net_nfc_data_s param = { NULL, 0 }; - net_nfc_util_gdbus_variant_to_data_s(arg_aid, &aid); - net_nfc_util_gdbus_variant_to_data_s(arg_param, ¶m); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(arg_aid, &aid); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(arg_param, ¶m); callback(arg_se_type, &aid, ¶m, user_data); @@ -423,9 +423,9 @@ static void send_apdu_secure_element(GObject *source_object, if (func_data->se_callback != NULL) { net_nfc_se_send_apdu_cb se_callback = (net_nfc_se_send_apdu_cb)func_data->se_callback; - data_s data = { NULL, }; + net_nfc_data_s data = { NULL, }; - net_nfc_util_gdbus_variant_to_data_s(out_response, &data); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(out_response, &data); se_callback(result, &data, func_data->se_data); @@ -464,9 +464,9 @@ static void get_atr_secure_element(GObject *source_object, if (func_data->se_callback != NULL) { net_nfc_se_get_atr_cb se_callback = (net_nfc_se_get_atr_cb)func_data->se_callback; - data_s data = { NULL, }; + net_nfc_data_s data = { NULL, }; - net_nfc_util_gdbus_variant_to_data_s(out_atr, &data); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(out_atr, &data); se_callback(result, &data, func_data->se_data); @@ -782,7 +782,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( nfc_se_h handle, - data_h *atr) + net_nfc_data_h *atr) { net_nfc_error_e result = NET_NFC_OK; GVariant *out_atr = NULL; @@ -821,7 +821,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( nfc_se_h handle, - data_h apdu_data, + net_nfc_data_h apdu_data, net_nfc_se_send_apdu_cb callback, void *user_data) { @@ -832,7 +832,7 @@ net_nfc_error_e net_nfc_client_se_send_apdu( /* allow this function even nfc is off */ - arg_data = net_nfc_util_gdbus_data_to_variant((data_s *)apdu_data); + arg_data = net_nfc_util_gdbus_data_to_variant((net_nfc_data_s *)apdu_data); if (arg_data == NULL) return NET_NFC_INVALID_PARAM; @@ -853,8 +853,8 @@ 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( nfc_se_h handle, - data_h apdu_data, - data_h *response) + net_nfc_data_h apdu_data, + net_nfc_data_h *response) { net_nfc_error_e result = NET_NFC_OK; GVariant *out_data = NULL; @@ -870,7 +870,7 @@ net_nfc_error_e net_nfc_client_se_send_apdu_sync( /* allow this function even nfc is off */ - arg_data = net_nfc_util_gdbus_data_to_variant((data_s *)apdu_data); + arg_data = net_nfc_util_gdbus_data_to_variant((net_nfc_data_s *)apdu_data); if (arg_data == NULL) return NET_NFC_INVALID_PARAM; diff --git a/src/net_nfc_client_snep.c b/src/net_nfc_client_snep.c old mode 100755 new mode 100644 index 3a9a47a..3011bc9 --- a/src/net_nfc_client_snep.c +++ b/src/net_nfc_client_snep.c @@ -264,9 +264,9 @@ net_nfc_error_e net_nfc_client_snep_send_client_request_sync( &resp_msg, NULL, &error) == TRUE) { - data_s ndef_data = { NULL, }; + net_nfc_data_s ndef_data = { NULL, }; - net_nfc_util_gdbus_variant_to_data_s(resp_msg, &ndef_data); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(resp_msg, &ndef_data); if (ndef_data.buffer != NULL && ndef_data.length > 0) { result = net_nfc_create_ndef_message_from_rawdata( diff --git a/src/net_nfc_client_tag.c b/src/net_nfc_client_tag.c old mode 100755 new mode 100644 index b6d735c..c3e3999 --- a/src/net_nfc_client_tag.c +++ b/src/net_nfc_client_tag.c @@ -136,7 +136,7 @@ static void tag_get_info_list(guint8 *buffer, while (i < number_of_keys) { gchar *str = NULL; - data_h value = NULL; + net_nfc_data_h value = NULL; /* key */ length = *pos; /* first values is length of key */ @@ -204,7 +204,7 @@ static void tag_get_target_info(guint handle, info_data->number_of_keys = number_of_keys; info_data->tag_info_list = list; - net_nfc_util_gdbus_variant_to_data_s(raw_data, + net_nfc_util_gdbus_variant_to_net_nfc_data_s(raw_data, &info_data->raw_data); *info = info_data; @@ -475,7 +475,7 @@ net_nfc_error_e net_nfc_get_target_info_from_device_type(net_nfc_target_handle_h return NET_NFC_OK; } -net_nfc_error_e net_nfc_get_tag_info_value_from_key(net_nfc_target_info_s* target_info, const char* key, int valid_length, data_h* data) +net_nfc_error_e net_nfc_get_tag_info_value_from_key(net_nfc_target_info_s* target_info, const char* key, int valid_length, net_nfc_data_h* data) { if (net_nfc_get_tag_info_value((net_nfc_target_info_h)target_info, key, @@ -483,7 +483,7 @@ net_nfc_error_e net_nfc_get_tag_info_value_from_key(net_nfc_target_info_s* targe return NET_NFC_NO_DATA_FOUND; } - if (((data_s*)*data)->length != valid_length) + if (((net_nfc_data_s*)*data)->length != valid_length) return NET_NFC_OUT_OF_BOUND; return NET_NFC_OK; @@ -548,7 +548,7 @@ NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_barcode_get_barcode_sync( unsigned char **barcode, int* barcode_len) { - data_s *data; + net_nfc_data_s *data; GError *error = NULL; GVariant *out_barcode = NULL; net_nfc_error_e result = NET_NFC_OK; @@ -576,8 +576,8 @@ net_nfc_error_e net_nfc_client_barcode_get_barcode_sync( } if (result == NET_NFC_OK) { - data = g_new0(data_s, 1); - net_nfc_util_gdbus_variant_to_data_s(out_barcode, data); + data = g_new0(net_nfc_data_s, 1); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(out_barcode, data); if (data == NULL) return NET_NFC_OPERATION_FAIL; diff --git a/src/net_nfc_client_tag_felica.c b/src/net_nfc_client_tag_felica.c old mode 100755 new mode 100644 index 45e126b..53b9757 --- a/src/net_nfc_client_tag_felica.c +++ b/src/net_nfc_client_tag_felica.c @@ -48,7 +48,7 @@ net_nfc_error_e net_nfc_client_felica_poll(net_nfc_target_handle_h handle, { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; uint8_t send_buffer[6] = { 0x00, }; @@ -73,7 +73,7 @@ net_nfc_error_e net_nfc_client_felica_poll(net_nfc_target_handle_h handle, rawdata.length = 6; return net_nfc_client_transceive_data(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); } @@ -89,9 +89,9 @@ net_nfc_error_e net_nfc_client_felica_request_service( { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; - data_h IDm = NULL; + net_nfc_data_h IDm = NULL; uint32_t send_buffer_length; uint8_t* send_buffer = NULL; @@ -131,8 +131,8 @@ net_nfc_error_e net_nfc_client_felica_request_service( send_buffer++; /* set IDm */ - memcpy(send_buffer, ((data_s*)IDm)->buffer, ((data_s*)IDm)->length); - send_buffer = send_buffer + ((data_s*)IDm)->length; + memcpy(send_buffer, ((net_nfc_data_s*)IDm)->buffer, ((net_nfc_data_s*)IDm)->length); + send_buffer = send_buffer + ((net_nfc_data_s*)IDm)->length; /* set the number of service codes */ *send_buffer = number_of_area_service; @@ -150,7 +150,7 @@ net_nfc_error_e net_nfc_client_felica_request_service( net_nfc_error_e result = NET_NFC_OK; result = net_nfc_client_transceive_data(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); @@ -168,9 +168,9 @@ net_nfc_error_e net_nfc_client_felica_request_response( { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; - data_h IDm = NULL; + net_nfc_data_h IDm = NULL; uint8_t send_buffer[10] = { 0x00, }; @@ -186,8 +186,8 @@ net_nfc_error_e net_nfc_client_felica_request_response( send_buffer[1] = FELICA_CMD_REQ_RESPONSE; memcpy(send_buffer + 2, - ((data_s*)IDm)->buffer, - ((data_s*)IDm)->length); + ((net_nfc_data_s*)IDm)->buffer, + ((net_nfc_data_s*)IDm)->length); DEBUG_MSG_PRINT_BUFFER(send_buffer, 10); @@ -195,7 +195,7 @@ net_nfc_error_e net_nfc_client_felica_request_response( rawdata.length = 10; return net_nfc_client_transceive_data(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); } @@ -212,9 +212,9 @@ net_nfc_error_e net_nfc_client_felica_read_without_encryption( { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; - data_h IDm = NULL; + net_nfc_data_h IDm = NULL; uint32_t send_buffer_length; uint8_t* send_buffer = NULL; @@ -252,8 +252,8 @@ net_nfc_error_e net_nfc_client_felica_read_without_encryption( *send_buffer = FELICA_CMD_READ_WITHOUT_ENC; send_buffer++; - memcpy(send_buffer, ((data_s*)IDm)->buffer, ((data_s*)IDm)->length); - send_buffer = send_buffer + ((data_s*)IDm)->length; + memcpy(send_buffer, ((net_nfc_data_s*)IDm)->buffer, ((net_nfc_data_s*)IDm)->length); + send_buffer = send_buffer + ((net_nfc_data_s*)IDm)->length; *send_buffer = number_of_services; send_buffer++; @@ -278,7 +278,7 @@ net_nfc_error_e net_nfc_client_felica_read_without_encryption( net_nfc_error_e result = NET_NFC_OK; result = net_nfc_client_transceive_data(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); @@ -295,15 +295,15 @@ net_nfc_error_e net_nfc_client_felica_write_without_encryption( uint16_t service_list[], uint8_t number_of_blocks, uint8_t block_list[], - data_h data, + net_nfc_data_h data, nfc_transceive_data_callback callback, void *user_data) { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; - data_h IDm = NULL; + net_nfc_data_h IDm = NULL; uint32_t send_buffer_length; uint8_t* send_buffer = NULL; @@ -327,12 +327,12 @@ net_nfc_error_e net_nfc_client_felica_write_without_encryption( if (number_of_services > 16) return NET_NFC_OUT_OF_BOUND; - if (((data_s*)data)->length > 16 * number_of_blocks) + if (((net_nfc_data_s*)data)->length > 16 * number_of_blocks) return NET_NFC_OUT_OF_BOUND; send_buffer_length = 1 + 1 + 8 + 1 + (2 * number_of_services) + 1 + number_of_blocks - +((data_s*)data)->length; + +((net_nfc_data_s*)data)->length; _net_nfc_util_alloc_mem(send_buffer, send_buffer_length * sizeof(uint8_t)); @@ -347,8 +347,8 @@ net_nfc_error_e net_nfc_client_felica_write_without_encryption( *send_buffer = FELICA_CMD_WRITE_WITHOUT_ENC; send_buffer++; - memcpy(send_buffer, ((data_s*)IDm)->buffer, ((data_s*)IDm)->length); - send_buffer = send_buffer + ((data_s*)IDm)->length; + memcpy(send_buffer, ((net_nfc_data_s*)IDm)->buffer, ((net_nfc_data_s*)IDm)->length); + send_buffer = send_buffer + ((net_nfc_data_s*)IDm)->length; *send_buffer = number_of_services; send_buffer++; @@ -366,7 +366,7 @@ net_nfc_error_e net_nfc_client_felica_write_without_encryption( send_buffer++; } - memcpy(send_buffer, ((data_s*)data)->buffer, ((data_s*)data)->length); + memcpy(send_buffer, ((net_nfc_data_s*)data)->buffer, ((net_nfc_data_s*)data)->length); DEBUG_MSG_PRINT_BUFFER(temp, send_buffer_length); @@ -376,7 +376,7 @@ net_nfc_error_e net_nfc_client_felica_write_without_encryption( net_nfc_error_e result = NET_NFC_OK; result = net_nfc_client_transceive_data(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); @@ -394,9 +394,9 @@ net_nfc_error_e net_nfc_client_felica_request_system_code( { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; - data_h IDm = NULL; + net_nfc_data_h IDm = NULL; uint8_t send_buffer[10] = { 0x00, }; @@ -412,8 +412,8 @@ net_nfc_error_e net_nfc_client_felica_request_system_code( send_buffer[1] = FELICA_CMD_REQ_SYSTEM_CODE; memcpy(send_buffer + 2, - ((data_s *)IDm)->buffer, - ((data_s *)IDm)->length); + ((net_nfc_data_s *)IDm)->buffer, + ((net_nfc_data_s *)IDm)->length); DEBUG_MSG_PRINT_BUFFER(send_buffer, 10); @@ -421,7 +421,7 @@ net_nfc_error_e net_nfc_client_felica_request_system_code( rawdata.length = 10; return net_nfc_client_transceive_data(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); } diff --git a/src/net_nfc_client_tag_jewel.c b/src/net_nfc_client_tag_jewel.c old mode 100755 new mode 100644 index c3b27f5..95edb04 --- a/src/net_nfc_client_tag_jewel.c +++ b/src/net_nfc_client_tag_jewel.c @@ -49,7 +49,7 @@ net_nfc_error_e net_nfc_client_jewel_read_id(net_nfc_target_handle_h handle, { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; uint8_t send_buffer[9] = {0x00, }; @@ -67,7 +67,7 @@ net_nfc_error_e net_nfc_client_jewel_read_id(net_nfc_target_handle_h handle, rawdata.length = 9; return net_nfc_client_transceive_data(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); } @@ -81,9 +81,9 @@ net_nfc_error_e net_nfc_client_jewel_read_byte(net_nfc_target_handle_h handle, { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; - data_h UID = NULL; + net_nfc_data_h UID = NULL; uint8_t send_buffer[9] = {0x00, }; @@ -109,8 +109,8 @@ net_nfc_error_e net_nfc_client_jewel_read_byte(net_nfc_target_handle_h handle, /* UID0 ~ 3 */ memcpy(&(send_buffer[3]), - ((data_s*)UID)->buffer, - ((data_s*)UID)->length); + ((net_nfc_data_s*)UID)->buffer, + ((net_nfc_data_s*)UID)->length); net_nfc_util_compute_CRC(CRC_B, send_buffer, 9); @@ -120,7 +120,7 @@ net_nfc_error_e net_nfc_client_jewel_read_byte(net_nfc_target_handle_h handle, rawdata.length = 9; return net_nfc_client_transceive_data(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); } @@ -132,9 +132,9 @@ net_nfc_error_e net_nfc_client_jewel_read_all(net_nfc_target_handle_h handle, { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; - data_h UID = NULL; + net_nfc_data_h UID = NULL; uint8_t send_buffer[9] = {0x00, }; @@ -157,8 +157,8 @@ net_nfc_error_e net_nfc_client_jewel_read_all(net_nfc_target_handle_h handle, /* UID0 ~ 3 */ memcpy(&(send_buffer[3]), - ((data_s*)UID)->buffer, - ((data_s*)UID)->length); + ((net_nfc_data_s*)UID)->buffer, + ((net_nfc_data_s*)UID)->length); net_nfc_util_compute_CRC(CRC_B, send_buffer, 9); @@ -168,7 +168,7 @@ net_nfc_error_e net_nfc_client_jewel_read_all(net_nfc_target_handle_h handle, rawdata.length = 9; return net_nfc_client_transceive_data(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); } @@ -184,9 +184,9 @@ net_nfc_error_e net_nfc_client_jewel_write_with_erase( { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; - data_h UID = NULL; + net_nfc_data_h UID = NULL; uint8_t send_buffer[9] = {0x00, }; @@ -212,8 +212,8 @@ net_nfc_error_e net_nfc_client_jewel_write_with_erase( /* UID0 ~ 3 */ memcpy(&(send_buffer[3]), - ((data_s*)UID)->buffer, - ((data_s*)UID)->length); + ((net_nfc_data_s*)UID)->buffer, + ((net_nfc_data_s*)UID)->length); net_nfc_util_compute_CRC(CRC_B, send_buffer, 9); @@ -223,7 +223,7 @@ net_nfc_error_e net_nfc_client_jewel_write_with_erase( rawdata.length = 9; return net_nfc_client_transceive(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); @@ -240,9 +240,9 @@ net_nfc_error_e net_nfc_client_jewel_write_with_no_erase( { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; - data_h UID = NULL; + net_nfc_data_h UID = NULL; uint8_t send_buffer[9] = {0x00, }; @@ -268,8 +268,8 @@ net_nfc_error_e net_nfc_client_jewel_write_with_no_erase( /* UID0 ~ 3 */ memcpy(&(send_buffer[3]), - ((data_s*)UID)->buffer, - ((data_s*)UID)->length); + ((net_nfc_data_s*)UID)->buffer, + ((net_nfc_data_s*)UID)->length); net_nfc_util_compute_CRC(CRC_B, send_buffer, 9); @@ -279,7 +279,7 @@ net_nfc_error_e net_nfc_client_jewel_write_with_no_erase( rawdata.length = 9; return net_nfc_client_transceive(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); } diff --git a/src/net_nfc_client_tag_mifare.c b/src/net_nfc_client_tag_mifare.c old mode 100755 new mode 100644 index 30d47dd..3943463 --- a/src/net_nfc_client_tag_mifare.c +++ b/src/net_nfc_client_tag_mifare.c @@ -67,16 +67,16 @@ NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyA( net_nfc_target_handle_h handle, uint8_t sector, - data_h auth_key, + net_nfc_data_h auth_key, void *callback, void *user_data) { net_nfc_target_info_s* target_info = NULL; - data_s *key; - data_s rawdata; + net_nfc_data_s *key; + net_nfc_data_s rawdata; - data_h UID = NULL; + net_nfc_data_h UID = NULL; uint8_t* send_buffer = NULL; uint8_t* temp = NULL; @@ -92,7 +92,7 @@ net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyA( if (net_nfc_client_tag_is_connected() == FALSE) return NET_NFC_OPERATION_FAIL; - key = (data_s *)auth_key; + key = (net_nfc_data_s *)auth_key; if (key->length != 6) return NET_NFC_OUT_OF_BOUND; @@ -157,7 +157,7 @@ net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyA( /* cmd + addr + UID + AUTH_KEY + CRC_A */ - send_buffer_length = 1 + 1 + ((data_s*)UID)->length + send_buffer_length = 1 + 1 + ((net_nfc_data_s*)UID)->length + key->length + 2; _net_nfc_util_alloc_mem(send_buffer, @@ -175,8 +175,8 @@ net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyA( *temp = sector_to_block; temp++; - memcpy(temp, ((data_s*)UID)->buffer, ((data_s*)UID)->length); - temp = temp + ((data_s*)UID)->length; + memcpy(temp, ((net_nfc_data_s*)UID)->buffer, ((net_nfc_data_s*)UID)->length); + temp = temp + ((net_nfc_data_s*)UID)->length; memcpy(temp, key->buffer, key->length); @@ -187,7 +187,7 @@ net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyA( rawdata.length = send_buffer_length; net_nfc_error_e result = net_nfc_client_transceive(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); @@ -201,16 +201,16 @@ NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyB( net_nfc_target_handle_h handle, uint8_t sector, - data_h auth_key, + net_nfc_data_h auth_key, void *callback, void *user_data) { net_nfc_target_info_s* target_info = NULL; - data_s *key; - data_s rawdata; + net_nfc_data_s *key; + net_nfc_data_s rawdata; - data_h UID = NULL; + net_nfc_data_h UID = NULL; uint8_t* send_buffer = NULL; uint8_t* temp = NULL; @@ -226,7 +226,7 @@ net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyB( if (net_nfc_client_tag_is_connected() == FALSE) return NET_NFC_OPERATION_FAIL; - key = (data_s *)auth_key; + key = (net_nfc_data_s *)auth_key; if (key->length != 6) return NET_NFC_OUT_OF_BOUND; @@ -289,7 +289,7 @@ net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyB( break; } - send_buffer_length = 1 + 1 + ((data_s*)UID)->length + send_buffer_length = 1 + 1 + ((net_nfc_data_s*)UID)->length + key->length + 2; /* cmd + addr + UID + AUTH_KEY + CRC_A */ _net_nfc_util_alloc_mem(send_buffer, send_buffer_length @@ -307,8 +307,8 @@ net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyB( *temp = sector_to_block; temp++; - memcpy(temp, ((data_s*)UID)->buffer, ((data_s*)UID)->length); - temp = temp + ((data_s*)UID)->length; + memcpy(temp, ((net_nfc_data_s*)UID)->buffer, ((net_nfc_data_s*)UID)->length); + temp = temp + ((net_nfc_data_s*)UID)->length; memcpy(temp, key->buffer, key->length); @@ -318,7 +318,7 @@ net_nfc_error_e net_nfc_client_mifare_authenticate_with_keyB( rawdata.length = send_buffer_length; net_nfc_error_e result = net_nfc_client_transceive(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); @@ -336,7 +336,7 @@ net_nfc_error_e net_nfc_client_mifare_read(net_nfc_target_handle_h handle, { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; uint8_t send_buffer[2] = { 0 }; @@ -372,7 +372,7 @@ net_nfc_error_e net_nfc_client_mifare_read(net_nfc_target_handle_h handle, rawdata.length = 2; return net_nfc_client_transceive_data(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); } @@ -381,13 +381,13 @@ NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_mifare_write_block( net_nfc_target_handle_h handle, uint8_t addr, - data_h data, + net_nfc_data_h data, void *callback, void *user_data) { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; uint8_t* send_buffer = NULL; @@ -419,7 +419,7 @@ net_nfc_error_e net_nfc_client_mifare_write_block( } if (target_info->devType == NET_NFC_MIFARE_ULTRA_PICC) { - if (((data_s *)data)->length > MIFARE_PAGE_SIZE) { + if (((net_nfc_data_s *)data)->length > MIFARE_PAGE_SIZE) { uint8_t* temp = NULL; /* cmd + addr + page */ @@ -439,7 +439,7 @@ net_nfc_error_e net_nfc_client_mifare_write_block( temp++; memcpy(temp, - ((data_s*)data)->buffer, + ((net_nfc_data_s*)data)->buffer, MIFARE_PAGE_SIZE); } else { @@ -447,7 +447,7 @@ net_nfc_error_e net_nfc_client_mifare_write_block( /* cmd + addr + page */ send_buffer_length = 1 + 1 + - ((data_s*)data)->length; + ((net_nfc_data_s*)data)->length; _net_nfc_util_alloc_mem(send_buffer, send_buffer_length * sizeof(uint8_t)); @@ -463,12 +463,12 @@ net_nfc_error_e net_nfc_client_mifare_write_block( temp++; memcpy(temp, - ((data_s*)data)->buffer, - ((data_s*)data)->length); + ((net_nfc_data_s*)data)->buffer, + ((net_nfc_data_s*)data)->length); } } else { - if (((data_s*)data)->length > MIFARE_BLOCK_SIZE) { + if (((net_nfc_data_s*)data)->length > MIFARE_BLOCK_SIZE) { uint8_t* temp = NULL; /* cmd + addr + page*/ @@ -488,13 +488,13 @@ net_nfc_error_e net_nfc_client_mifare_write_block( temp++; memcpy(temp, - ((data_s*)data)->buffer, + ((net_nfc_data_s*)data)->buffer, MIFARE_BLOCK_SIZE); } else { uint8_t* temp = NULL; /* cmd + addr + page */ - send_buffer_length = 1 + 1 + ((data_s*)data)->length; + send_buffer_length = 1 + 1 + ((net_nfc_data_s*)data)->length; _net_nfc_util_alloc_mem(send_buffer, send_buffer_length * sizeof(uint8_t)); @@ -510,8 +510,8 @@ net_nfc_error_e net_nfc_client_mifare_write_block( temp++; memcpy(temp, - ((data_s*)data)->buffer, - ((data_s*)data)->length); + ((net_nfc_data_s*)data)->buffer, + ((net_nfc_data_s*)data)->length); } } @@ -520,7 +520,7 @@ net_nfc_error_e net_nfc_client_mifare_write_block( rawdata.length = send_buffer_length; net_nfc_error_e result = net_nfc_client_transceive(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); @@ -534,7 +534,7 @@ NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_mifare_write_page( net_nfc_target_handle_h handle, uint8_t addr, - data_h data, + net_nfc_data_h data, void *callback, void *user_data) { @@ -568,7 +568,7 @@ net_nfc_error_e net_nfc_client_mifare_write_page( } if (target_info->devType == NET_NFC_MIFARE_ULTRA_PICC) { - if (((data_s*)data)->length > MIFARE_PAGE_SIZE) { + if (((net_nfc_data_s*)data)->length > MIFARE_PAGE_SIZE) { uint8_t* temp = NULL; /* cmd + addr + page */ @@ -588,13 +588,13 @@ net_nfc_error_e net_nfc_client_mifare_write_page( temp++; memcpy(temp, - ((data_s*)data)->buffer, + ((net_nfc_data_s*)data)->buffer, MIFARE_PAGE_SIZE); } else { uint8_t* temp = NULL; /* cmd + addr + page */ - send_buffer_length = 1 + 1 + ((data_s*)data)->length; + send_buffer_length = 1 + 1 + ((net_nfc_data_s*)data)->length; _net_nfc_util_alloc_mem(send_buffer, send_buffer_length * sizeof(uint8_t)); @@ -610,12 +610,12 @@ net_nfc_error_e net_nfc_client_mifare_write_page( temp++; memcpy(temp, - ((data_s*)data)->buffer, - ((data_s*)data)->length); + ((net_nfc_data_s*)data)->buffer, + ((net_nfc_data_s*)data)->length); } } else { - if (((data_s*)data)->length > MIFARE_PAGE_SIZE) { + if (((net_nfc_data_s*)data)->length > MIFARE_PAGE_SIZE) { uint8_t* temp = NULL; /* cmd + addr + page */ @@ -635,14 +635,14 @@ net_nfc_error_e net_nfc_client_mifare_write_page( temp++; memcpy(temp, - ((data_s*)data)->buffer, + ((net_nfc_data_s*)data)->buffer, MIFARE_PAGE_SIZE); } else { uint8_t* temp = NULL; /* cmd + addr + page */ - send_buffer_length = 1 + 1 + ((data_s*)data)->length; + send_buffer_length = 1 + 1 + ((net_nfc_data_s*)data)->length; _net_nfc_util_alloc_mem(send_buffer, send_buffer_length * sizeof(uint8_t)); @@ -658,20 +658,20 @@ net_nfc_error_e net_nfc_client_mifare_write_page( temp++; memcpy(temp, - ((data_s*)data)->buffer, - ((data_s*)data)->length); + ((net_nfc_data_s*)data)->buffer, + ((net_nfc_data_s*)data)->length); } } - data_s rawdata; + net_nfc_data_s rawdata; rawdata.buffer = send_buffer; rawdata.length = send_buffer_length; net_nfc_error_e result = net_nfc_client_transceive(handle, - (data_h)&rawdata, + (net_nfc_data_h)&rawdata, callback, user_data); @@ -690,7 +690,7 @@ net_nfc_error_e net_nfc_client_mifare_increment(net_nfc_target_handle_h handle, { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; uint8_t send_buffer[8] = { 0 }; @@ -729,7 +729,7 @@ net_nfc_error_e net_nfc_client_mifare_increment(net_nfc_target_handle_h handle, rawdata.buffer = send_buffer; rawdata.length = 8; - return net_nfc_client_transceive(handle, (data_h)&rawdata, callback, + return net_nfc_client_transceive(handle, (net_nfc_data_h)&rawdata, callback, user_data); } @@ -742,7 +742,7 @@ net_nfc_error_e net_nfc_client_mifare_decrement(net_nfc_target_handle_h handle, { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; uint8_t send_buffer[8] = { 0 }; @@ -781,7 +781,7 @@ net_nfc_error_e net_nfc_client_mifare_decrement(net_nfc_target_handle_h handle, rawdata.buffer = send_buffer; rawdata.length = 8; - return net_nfc_client_transceive(handle, (data_h)&rawdata, callback, + return net_nfc_client_transceive(handle, (net_nfc_data_h)&rawdata, callback, user_data); } @@ -793,7 +793,7 @@ net_nfc_error_e net_nfc_client_mifare_transfer(net_nfc_target_handle_h handle, { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; uint8_t send_buffer[4] = { 0 }; @@ -822,7 +822,7 @@ net_nfc_error_e net_nfc_client_mifare_transfer(net_nfc_target_handle_h handle, rawdata.buffer = send_buffer; rawdata.length = 4; - return net_nfc_client_transceive(handle, (data_h)&rawdata, callback, + return net_nfc_client_transceive(handle, (net_nfc_data_h)&rawdata, callback, user_data); } @@ -834,7 +834,7 @@ net_nfc_error_e net_nfc_client_mifare_restore(net_nfc_target_handle_h handle, { net_nfc_target_info_s* target_info = NULL; - data_s rawdata; + net_nfc_data_s rawdata; uint8_t send_buffer[4] = { 0 }; @@ -863,12 +863,12 @@ net_nfc_error_e net_nfc_client_mifare_restore(net_nfc_target_handle_h handle, rawdata.buffer = send_buffer; rawdata.length = 4; - return net_nfc_client_transceive(handle, (data_h)&rawdata, callback, + return net_nfc_client_transceive(handle, (net_nfc_data_h)&rawdata, callback, user_data); } NET_NFC_EXPORT_API -net_nfc_error_e net_nfc_client_mifare_create_default_key(data_h* key) +net_nfc_error_e net_nfc_client_mifare_create_default_key(net_nfc_data_h* key) { if (key == NULL) return NET_NFC_NULL_PARAMETER; @@ -878,7 +878,7 @@ net_nfc_error_e net_nfc_client_mifare_create_default_key(data_h* key) NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_mifare_create_application_directory_key( - data_h* key) + net_nfc_data_h* key) { if (key == NULL) return NET_NFC_NULL_PARAMETER; @@ -887,7 +887,7 @@ net_nfc_error_e net_nfc_client_mifare_create_application_directory_key( } NET_NFC_EXPORT_API -net_nfc_error_e net_nfc_client_mifare_create_net_nfc_forum_key(data_h* key) +net_nfc_error_e net_nfc_client_mifare_create_net_nfc_forum_key(net_nfc_data_h* key) { if (key == NULL) return NET_NFC_NULL_PARAMETER; diff --git a/src/net_nfc_client_target_info.c b/src/net_nfc_client_target_info.c old mode 100755 new mode 100644 index c2f9364..1bbc17e --- a/src/net_nfc_client_target_info.c +++ b/src/net_nfc_client_target_info.c @@ -174,7 +174,7 @@ net_nfc_error_e net_nfc_get_tag_info_keys(net_nfc_target_info_h target_info, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_get_tag_info_value(net_nfc_target_info_h target_info, - const char *key, data_h *value) + const char *key, net_nfc_data_h *value) { net_nfc_target_info_s *handle = (net_nfc_target_info_s *)target_info; net_nfc_tag_info_s *tag_info; @@ -218,7 +218,7 @@ net_nfc_error_e net_nfc_get_tag_ndef_message(net_nfc_target_info_h target_info, return NET_NFC_NULL_PARAMETER; result = net_nfc_create_ndef_message_from_rawdata(msg, - (data_h)&target_info_private->raw_data); + (net_nfc_data_h)&target_info_private->raw_data); return result; } @@ -259,7 +259,7 @@ net_nfc_error_e net_nfc_duplicate_target_info(net_nfc_target_info_h origin, _net_nfc_util_strdup(temp->tag_info_list[i].key, handle->tag_info_list[i].key); if (handle->tag_info_list[i].value != NULL) { - data_s *data = (data_s *)handle->tag_info_list[i].value; + net_nfc_data_s *data = (net_nfc_data_s *)handle->tag_info_list[i].value; net_nfc_create_data(&temp->tag_info_list[i].value, data->buffer, data->length); } diff --git a/src/net_nfc_client_test.c b/src/net_nfc_client_test.c old mode 100755 new mode 100644 index 72a64a6..125d0b6 --- a/src/net_nfc_client_test.c +++ b/src/net_nfc_client_test.c @@ -433,7 +433,7 @@ net_nfc_error_e net_nfc_client_test_get_firmware_version_sync(char **version) NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_test_set_ee_data(int mode, int reg_id, - data_h data, + net_nfc_data_h data, net_nfc_client_test_set_ee_data_completed callback, void *user_data) { @@ -458,7 +458,7 @@ net_nfc_error_e net_nfc_client_test_set_ee_data(int mode, func_data->callback = (gpointer)callback; func_data->user_data = user_data; - variant = net_nfc_util_gdbus_data_to_variant((data_s *)data); + variant = net_nfc_util_gdbus_data_to_variant((net_nfc_data_s *)data); net_nfc_gdbus_test_call_set_ee_data(test_proxy, mode, @@ -474,7 +474,7 @@ net_nfc_error_e net_nfc_client_test_set_ee_data(int mode, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_test_set_ee_data_sync(int mode, int reg_id, - data_h data) + net_nfc_data_h data) { net_nfc_error_e out_result = NET_NFC_OK; GVariant *variant = NULL; @@ -491,7 +491,7 @@ net_nfc_error_e net_nfc_client_test_set_ee_data_sync(int mode, if (net_nfc_client_manager_is_activated() == false) return NET_NFC_NOT_ACTIVATED; - variant = net_nfc_util_gdbus_data_to_variant((data_s *)data); + variant = net_nfc_util_gdbus_data_to_variant((net_nfc_data_s *)data); if (net_nfc_gdbus_test_call_set_ee_data_sync(test_proxy, mode, diff --git a/src/net_nfc_client_transceive.c b/src/net_nfc_client_transceive.c old mode 100755 new mode 100644 index d26c1a7..67f4980 --- a/src/net_nfc_client_transceive.c +++ b/src/net_nfc_client_transceive.c @@ -37,7 +37,7 @@ static NetNfcGDbusTransceive *transceive_proxy = NULL; static GVariant *transceive_data_to_transceive_variant( net_nfc_target_type_e dev_type, - data_s *data); + net_nfc_data_s *data); static void transceive_call(GObject *source_object, GAsyncResult *res, @@ -49,9 +49,9 @@ static void transceive_data_call(GObject *source_object, static GVariant *transceive_data_to_transceive_variant( net_nfc_target_type_e devType, - data_s *data) + net_nfc_data_s *data) { - data_s transceive_info = { NULL, }; + net_nfc_data_s transceive_info = { NULL, }; GVariant *variant; if (data == NULL) { @@ -138,9 +138,9 @@ static void transceive_data_call(GObject *source_object, } if (func_data->callback != NULL) { - data_s resp = { NULL, }; + net_nfc_data_s resp = { NULL, }; - net_nfc_util_gdbus_variant_to_data_s(out_data, &resp); + net_nfc_util_gdbus_variant_to_net_nfc_data_s(out_data, &resp); ((nfc_transceive_data_callback)func_data->callback)( out_result, @@ -187,7 +187,7 @@ static void transceive_call(GObject *source_object, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_transceive(net_nfc_target_handle_h handle, - data_h rawdata, + net_nfc_data_h rawdata, nfc_transceive_callback callback, void *user_data) { @@ -243,7 +243,7 @@ net_nfc_error_e net_nfc_client_transceive(net_nfc_target_handle_h handle, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_transceive_data(net_nfc_target_handle_h handle, - data_h rawdata, + net_nfc_data_h rawdata, nfc_transceive_data_callback callback, void *user_data) { @@ -299,7 +299,7 @@ net_nfc_error_e net_nfc_client_transceive_data(net_nfc_target_handle_h handle, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_transceive_sync(net_nfc_target_handle_h handle, - data_h rawdata) + net_nfc_data_h rawdata) { net_nfc_target_info_s *target_info; net_nfc_error_e out_result = NET_NFC_OK; @@ -352,8 +352,8 @@ net_nfc_error_e net_nfc_client_transceive_sync(net_nfc_target_handle_h handle, NET_NFC_EXPORT_API net_nfc_error_e net_nfc_client_transceive_data_sync( net_nfc_target_handle_h handle, - data_h rawdata, - data_h *response) + net_nfc_data_h rawdata, + net_nfc_data_h *response) { net_nfc_target_info_s *target_info; net_nfc_error_e out_result = NET_NFC_OK; diff --git a/src/nfc_card_emulation.c b/src/nfc_card_emulation.c index 66e1fdd..12ef9be 100644 --- a/src/nfc_card_emulation.c +++ b/src/nfc_card_emulation.c @@ -64,7 +64,7 @@ int nfc_se_send_apdu_internal(nfc_se_h handle, unsigned int *resp_len) { net_nfc_error_e result; - data_h command = NULL; // LCOV_EXCL_LINE + net_nfc_data_h command = NULL; // LCOV_EXCL_LINE LOG_BEGIN(); // LCOV_EXCL_LINE @@ -88,7 +88,7 @@ int nfc_se_send_apdu_internal(nfc_se_h handle, result = net_nfc_create_data(&command, cmd, cmd_len); if (result == NET_NFC_OK) { - data_h response = NULL; + net_nfc_data_h response = NULL; result = net_nfc_client_se_send_apdu_sync( handle, @@ -129,7 +129,7 @@ int nfc_se_send_apdu_internal(nfc_se_h handle, int nfc_se_get_atr_internal(nfc_se_h handle, unsigned char **atr, unsigned int *atr_len) { net_nfc_error_e result; - data_h response = NULL; // LCOV_EXCL_LINE + net_nfc_data_h response = NULL; // LCOV_EXCL_LINE LOG_BEGIN(); // LCOV_EXCL_LINE @@ -258,7 +258,7 @@ int nfc_se_get_card_emulation_mode(nfc_se_card_emulation_mode_type_e *mode) int nfc_hce_send_apdu_response(nfc_se_h handle, unsigned char *resp, unsigned int resp_len) { net_nfc_error_e result; - data_h data; + net_nfc_data_h data; LOG_BEGIN(); // LCOV_EXCL_LINE diff --git a/src/nfc_common.c b/src/nfc_common.c old mode 100755 new mode 100644 index 6040e0b..cb890aa --- a/src/nfc_common.c +++ b/src/nfc_common.c @@ -34,7 +34,7 @@ pid_t nfc_common_get_focus_app_pid() } } -char * nfc_common_get_bt_address_string(data_h data) +char * nfc_common_get_bt_address_string(net_nfc_data_h data) { uint8_t *buffer; uint32_t length; diff --git a/src/nfc_manager.c b/src/nfc_manager.c index cdc480e..31d0c83 100644 --- a/src/nfc_manager.c +++ b/src/nfc_manager.c @@ -768,8 +768,8 @@ void nfc_manager_unset_se_event_cb(void) } /* LCOV_EXCL_START */ -static void _se_transaction_event_cb(net_nfc_se_type_e se_type, data_h aid, - data_h param, void *user_data) +static void _se_transaction_event_cb(net_nfc_se_type_e se_type, net_nfc_data_h aid, + net_nfc_data_h param, void *user_data) { LOG_BEGIN(); @@ -974,7 +974,7 @@ int nfc_manager_get_se_type(nfc_se_type_e *type) /* LCOV_EXCL_START */ static void _hce_event_cb(net_nfc_target_handle_h handle, - net_nfc_hce_event_t event, data_h apdu, void *user_data) + net_nfc_hce_event_t event, net_nfc_data_h apdu, void *user_data) { LOG_BEGIN(); diff --git a/src/nfc_ndef.c b/src/nfc_ndef.c old mode 100755 new mode 100644 index 9ad7d68..091b1b0 --- a/src/nfc_ndef.c +++ b/src/nfc_ndef.c @@ -63,9 +63,9 @@ int nfc_ndef_record_create(nfc_ndef_record_h *record, unsigned int payload_size) { int ret; - data_h type_data = NULL; - data_h id_data = NULL; - data_h payload_data = NULL; + net_nfc_data_h type_data = NULL; + net_nfc_data_h id_data = NULL; + net_nfc_data_h payload_data = NULL; LOG_BEGIN(); @@ -242,7 +242,7 @@ int nfc_ndef_record_set_id(nfc_ndef_record_h record, int id_size) { int ret; - data_h id_data = NULL; + net_nfc_data_h id_data = NULL; LOG_BEGIN(); @@ -271,7 +271,7 @@ int nfc_ndef_record_get_payload(nfc_ndef_record_h record, unsigned int *size) { int ret; - data_h payload_data; + net_nfc_data_h payload_data; LOG_BEGIN(); @@ -304,7 +304,7 @@ int nfc_ndef_record_get_type(nfc_ndef_record_h record, int *size) { int ret; - data_h type_data; + net_nfc_data_h type_data; LOG_BEGIN(); @@ -337,7 +337,7 @@ int nfc_ndef_record_get_id(nfc_ndef_record_h record, int *size) { int ret; - data_h id_data; + net_nfc_data_h id_data; LOG_BEGIN(); @@ -502,7 +502,7 @@ int nfc_ndef_message_create_from_rawdata( unsigned int rawdata_size) { int ret; - data_h rawdata_data = NULL; + net_nfc_data_h rawdata_data = NULL; LOG_BEGIN(); @@ -572,7 +572,7 @@ int nfc_ndef_message_get_rawdata(nfc_ndef_message_h ndef_message, unsigned int *rawdata_size) { int ret; - data_h rawdata_data; + net_nfc_data_h rawdata_data; LOG_BEGIN(); diff --git a/src/nfc_p2p.c b/src/nfc_p2p.c old mode 100755 new mode 100644 index 97d819a..124ce8d --- a/src/nfc_p2p.c +++ b/src/nfc_p2p.c @@ -42,7 +42,7 @@ int nfc_p2p_send(nfc_p2p_target_h target, void *user_data) { int ret; - data_h rawdata; + net_nfc_data_h rawdata; LOG_BEGIN(); @@ -88,7 +88,7 @@ int nfc_p2p_send_no_permission( void *user_data) { int ret; - data_h rawdata; + net_nfc_data_h rawdata; GVariant *parameter; LOG_BEGIN(); @@ -125,7 +125,7 @@ int nfc_p2p_send_no_permission( } /* LCOV_EXCL_START */ -static void _p2p_set_data_received_cb(data_h data, void *user_data) +static void _p2p_set_data_received_cb(net_nfc_data_h data, void *user_data) { LOG_BEGIN(); diff --git a/src/nfc_p2p_handover.c b/src/nfc_p2p_handover.c index 58ce301..e13f82a 100644 --- a/src/nfc_p2p_handover.c +++ b/src/nfc_p2p_handover.c @@ -18,7 +18,7 @@ /* LCOV_EXCL_START */ static void _p2p_handover_cb(net_nfc_error_e result, - net_nfc_conn_handover_carrier_type_e carrier, data_h ac_data, void *user_data) + net_nfc_conn_handover_carrier_type_e carrier, net_nfc_data_h ac_data, void *user_data) { nfc_p2p_connection_handover_completed_cb callback; void *user_param; @@ -143,8 +143,8 @@ static void _connection_handover_event_cb( net_nfc_handover_event_e event, net_nfc_error_e result, net_nfc_conn_handover_carrier_type_e carrier, - data_h ac_data, - data_h ndef_message, + net_nfc_data_h ac_data, + net_nfc_data_h ndef_message, void *user_data) { LOG_BEGIN(); diff --git a/src/nfc_tag.c b/src/nfc_tag.c old mode 100755 new mode 100644 index e26ef87..25badbe --- a/src/nfc_tag.c +++ b/src/nfc_tag.c @@ -114,7 +114,7 @@ static void _tag_write_ndef_cb(net_nfc_error_e result, void* user_data) free(user_param); } -static void _tag_transceive_data_cb(net_nfc_error_e result, data_h arg_data, void* user_data) +static void _tag_transceive_data_cb(net_nfc_error_e result, net_nfc_data_h arg_data, void* user_data) { nfc_callback_s* user_param = user_data; nfc_tag_transceive_completed_cb callback = NULL; @@ -183,7 +183,7 @@ static void _mifare_authenticate_with_keyB_cb(net_nfc_error_e result, void* user free(user_param); } -static void _mifare_read_block_cb(net_nfc_error_e result, data_h data, void* user_data) +static void _mifare_read_block_cb(net_nfc_error_e result, net_nfc_data_h data, void* user_data) { nfc_callback_s* user_param = user_data; nfc_mifare_read_block_completed_cb callback; @@ -468,7 +468,7 @@ int nfc_tag_format_ndef(nfc_tag_h tag, void* user_data) { int ret; - data_h key_data = NULL; + net_nfc_data_h key_data = NULL; LOG_BEGIN(); @@ -569,7 +569,7 @@ int nfc_tag_transceive(nfc_tag_h tag, void* user_data) { int ret; - data_h rawdata = NULL; + net_nfc_data_h rawdata = NULL; CHECK_SUPPORTED(NFC_TAG_FEATURE); @@ -677,7 +677,7 @@ int nfc_tag_foreach_information(nfc_tag_h tag, int ret; int i, count = 0; char **keys = NULL; - data_h value = NULL; + net_nfc_data_h value = NULL; bool cont; @@ -719,7 +719,7 @@ int nfc_mifare_authenticate_with_keyA(nfc_tag_h tag, void *user_data) { int ret; - data_h auth_key_data = NULL; + net_nfc_data_h auth_key_data = NULL; CHECK_SUPPORTED(NFC_TAG_FEATURE); @@ -749,7 +749,7 @@ int nfc_mifare_authenticate_with_keyB(nfc_tag_h tag, void *user_data) { int ret; - data_h auth_key_data = NULL; + net_nfc_data_h auth_key_data = NULL; LOG_BEGIN(); @@ -833,7 +833,7 @@ int nfc_mifare_write_block(nfc_tag_h tag, void *user_data) { int ret; - data_h block_data = NULL; + net_nfc_data_h block_data = NULL; LOG_BEGIN(); @@ -867,7 +867,7 @@ int nfc_mifare_write_page(nfc_tag_h tag, void *user_data) { int ret; - data_h block_data = NULL; + net_nfc_data_h block_data = NULL; LOG_BEGIN(); CHECK_SUPPORTED(NFC_TAG_FEATURE);