Rename mf_desfire_send_chunks() to mf_desfire_poller_send_chunks()

This commit is contained in:
Willy-JL
2025-03-20 02:50:17 +00:00
parent f7198c6105
commit 19ee0f4598
3 changed files with 27 additions and 14 deletions

View File

@@ -51,11 +51,16 @@ typedef struct {
* @param[out] rx_buffer pointer to the buffer to be filled with received data. * @param[out] rx_buffer pointer to the buffer to be filled with received data.
* @return MfDesfireErrorNone on success, an error code on failure. * @return MfDesfireErrorNone on success, an error code on failure.
*/ */
MfDesfireError mf_desfire_send_chunks( MfDesfireError mf_desfire_poller_send_chunks(
MfDesfirePoller* instance, MfDesfirePoller* instance,
const BitBuffer* tx_buffer, const BitBuffer* tx_buffer,
BitBuffer* rx_buffer); BitBuffer* rx_buffer);
/**
* @warning deprecated, use mf_desfire_poller_send_chunks instead
*/
#define mf_desfire_send_chunks mf_desfire_poller_send_chunks
/** /**
* @brief Read MfDesfire card version. * @brief Read MfDesfire card version.
* *

View File

@@ -33,7 +33,7 @@ MfDesfireError mf_desfire_process_status_code(uint8_t status_code) {
} }
} }
MfDesfireError mf_desfire_send_chunks( MfDesfireError mf_desfire_poller_send_chunks(
MfDesfirePoller* instance, MfDesfirePoller* instance,
const BitBuffer* tx_buffer, const BitBuffer* tx_buffer,
BitBuffer* rx_buffer) { BitBuffer* rx_buffer) {
@@ -103,7 +103,8 @@ MfDesfireError mf_desfire_poller_read_version(MfDesfirePoller* instance, MfDesfi
MfDesfireError error; MfDesfireError error;
do { do {
error = mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer); error = mf_desfire_poller_send_chunks(
instance, instance->input_buffer, instance->result_buffer);
if(error != MfDesfireErrorNone) break; if(error != MfDesfireErrorNone) break;
@@ -125,7 +126,8 @@ MfDesfireError
MfDesfireError error; MfDesfireError error;
do { do {
error = mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer); error = mf_desfire_poller_send_chunks(
instance, instance->input_buffer, instance->result_buffer);
if(error != MfDesfireErrorNone) break; if(error != MfDesfireErrorNone) break;
@@ -147,7 +149,8 @@ MfDesfireError
MfDesfireError error; MfDesfireError error;
do { do {
error = mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer); error = mf_desfire_poller_send_chunks(
instance, instance->input_buffer, instance->result_buffer);
if(error != MfDesfireErrorNone) break; if(error != MfDesfireErrorNone) break;
@@ -171,7 +174,7 @@ MfDesfireError mf_desfire_poller_read_key_version(
bit_buffer_set_byte(instance->input_buffer, 1, key_num); bit_buffer_set_byte(instance->input_buffer, 1, key_num);
MfDesfireError error = MfDesfireError error =
mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer); mf_desfire_poller_send_chunks(instance, instance->input_buffer, instance->result_buffer);
if(error == MfDesfireErrorNone) { if(error == MfDesfireErrorNone) {
if(!mf_desfire_key_version_parse(data, instance->result_buffer)) { if(!mf_desfire_key_version_parse(data, instance->result_buffer)) {
error = MfDesfireErrorProtocol; error = MfDesfireErrorProtocol;
@@ -211,7 +214,8 @@ MfDesfireError
MfDesfireError error; MfDesfireError error;
do { do {
error = mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer); error = mf_desfire_poller_send_chunks(
instance, instance->input_buffer, instance->result_buffer);
if(error != MfDesfireErrorNone) break; if(error != MfDesfireErrorNone) break;
@@ -244,7 +248,7 @@ MfDesfireError mf_desfire_poller_select_application(
instance->input_buffer, (const uint8_t*)id, sizeof(MfDesfireApplicationId)); instance->input_buffer, (const uint8_t*)id, sizeof(MfDesfireApplicationId));
MfDesfireError error = MfDesfireError error =
mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer); mf_desfire_poller_send_chunks(instance, instance->input_buffer, instance->result_buffer);
return error; return error;
} }
@@ -259,7 +263,8 @@ MfDesfireError mf_desfire_poller_read_file_ids(MfDesfirePoller* instance, Simple
MfDesfireError error; MfDesfireError error;
do { do {
error = mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer); error = mf_desfire_poller_send_chunks(
instance, instance->input_buffer, instance->result_buffer);
if(error != MfDesfireErrorNone) break; if(error != MfDesfireErrorNone) break;
@@ -294,7 +299,8 @@ MfDesfireError mf_desfire_poller_read_file_settings(
MfDesfireError error; MfDesfireError error;
do { do {
error = mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer); error = mf_desfire_poller_send_chunks(
instance, instance->input_buffer, instance->result_buffer);
if(error != MfDesfireErrorNone) break; if(error != MfDesfireErrorNone) break;
@@ -359,7 +365,7 @@ MfDesfireError mf_desfire_poller_create_application(
} }
MfDesfireError error = MfDesfireError error =
mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer); mf_desfire_poller_send_chunks(instance, instance->input_buffer, instance->result_buffer);
return error; return error;
} }
@@ -389,7 +395,8 @@ static MfDesfireError mf_desfire_poller_read_file(
bit_buffer_append_bytes(instance->input_buffer, (const uint8_t*)&current_offset, 3); bit_buffer_append_bytes(instance->input_buffer, (const uint8_t*)&current_offset, 3);
bit_buffer_append_bytes(instance->input_buffer, (const uint8_t*)&bytes_to_read, 3); bit_buffer_append_bytes(instance->input_buffer, (const uint8_t*)&bytes_to_read, 3);
error = mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer); error = mf_desfire_poller_send_chunks(
instance, instance->input_buffer, instance->result_buffer);
if(error != MfDesfireErrorNone) break; if(error != MfDesfireErrorNone) break;
size_t bytes_received = bit_buffer_get_size_bytes(instance->result_buffer); size_t bytes_received = bit_buffer_get_size_bytes(instance->result_buffer);
@@ -435,7 +442,8 @@ MfDesfireError mf_desfire_poller_read_file_value(
MfDesfireError error; MfDesfireError error;
do { do {
error = mf_desfire_send_chunks(instance, instance->input_buffer, instance->result_buffer); error = mf_desfire_poller_send_chunks(
instance, instance->input_buffer, instance->result_buffer);
if(error != MfDesfireErrorNone) break; if(error != MfDesfireErrorNone) break;

View File

@@ -2653,9 +2653,9 @@ Function,+,mf_desfire_poller_read_key_version,MfDesfireError,"MfDesfirePoller*,
Function,+,mf_desfire_poller_read_key_versions,MfDesfireError,"MfDesfirePoller*, SimpleArray*, uint32_t" Function,+,mf_desfire_poller_read_key_versions,MfDesfireError,"MfDesfirePoller*, SimpleArray*, uint32_t"
Function,+,mf_desfire_poller_read_version,MfDesfireError,"MfDesfirePoller*, MfDesfireVersion*" Function,+,mf_desfire_poller_read_version,MfDesfireError,"MfDesfirePoller*, MfDesfireVersion*"
Function,+,mf_desfire_poller_select_application,MfDesfireError,"MfDesfirePoller*, const MfDesfireApplicationId*" Function,+,mf_desfire_poller_select_application,MfDesfireError,"MfDesfirePoller*, const MfDesfireApplicationId*"
Function,+,mf_desfire_poller_send_chunks,MfDesfireError,"MfDesfirePoller*, const BitBuffer*, BitBuffer*"
Function,+,mf_desfire_reset,void,MfDesfireData* Function,+,mf_desfire_reset,void,MfDesfireData*
Function,+,mf_desfire_save,_Bool,"const MfDesfireData*, FlipperFormat*" Function,+,mf_desfire_save,_Bool,"const MfDesfireData*, FlipperFormat*"
Function,+,mf_desfire_send_chunks,MfDesfireError,"MfDesfirePoller*, const BitBuffer*, BitBuffer*"
Function,+,mf_desfire_set_uid,_Bool,"MfDesfireData*, const uint8_t*, size_t" Function,+,mf_desfire_set_uid,_Bool,"MfDesfireData*, const uint8_t*, size_t"
Function,+,mf_desfire_verify,_Bool,"MfDesfireData*, const FuriString*" Function,+,mf_desfire_verify,_Bool,"MfDesfireData*, const FuriString*"
Function,+,mf_plus_alloc,MfPlusData*, Function,+,mf_plus_alloc,MfPlusData*,
1 entry status name type params
2653 Function + mf_desfire_poller_read_key_versions MfDesfireError MfDesfirePoller*, SimpleArray*, uint32_t
2654 Function + mf_desfire_poller_read_version MfDesfireError MfDesfirePoller*, MfDesfireVersion*
2655 Function + mf_desfire_poller_select_application MfDesfireError MfDesfirePoller*, const MfDesfireApplicationId*
2656 Function + mf_desfire_poller_send_chunks MfDesfireError MfDesfirePoller*, const BitBuffer*, BitBuffer*
2657 Function + mf_desfire_reset void MfDesfireData*
2658 Function + mf_desfire_save _Bool const MfDesfireData*, FlipperFormat*
Function + mf_desfire_send_chunks MfDesfireError MfDesfirePoller*, const BitBuffer*, BitBuffer*
2659 Function + mf_desfire_set_uid _Bool MfDesfireData*, const uint8_t*, size_t
2660 Function + mf_desfire_verify _Bool MfDesfireData*, const FuriString*
2661 Function + mf_plus_alloc MfPlusData*