From 58996ccf9883a5792e084584697df6830d94cdd1 Mon Sep 17 00:00:00 2001 From: Wiktor Lawski Date: Wed, 19 Sep 2012 15:20:46 +0200 Subject: [PATCH] plugins: Standardize function signatures Now nfctypes have more similar interface (both inside and outside). --- plugins/nfctype1.c | 16 ++++++++-------- plugins/nfctype3.c | 26 ++++++++++++++------------ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/plugins/nfctype1.c b/plugins/nfctype1.c index 1cc8953..7aae387 100644 --- a/plugins/nfctype1.c +++ b/plugins/nfctype1.c @@ -133,7 +133,7 @@ static void t1_cookie_release(struct t1_cookie *cookie) } /* Read segments (128 bytes) and store them to the tag data block */ -static int segment_read_recv(uint8_t *resp, int length, void *data) +static int data_recv(uint8_t *resp, int length, void *data) { struct type1_tag *t1_tag = data; struct type1_cmd t1_cmd; @@ -168,7 +168,7 @@ static int segment_read_recv(uint8_t *resp, int length, void *data) err = near_adapter_send(t1_tag->adapter_idx, (uint8_t *) &t1_cmd, sizeof(t1_cmd), - segment_read_recv, t1_tag); + data_recv, t1_tag); if (err < 0) goto out_err; } else { /* This is the end */ @@ -234,7 +234,7 @@ static int read_dynamic_tag(uint8_t *cc, int length, void *data) return near_adapter_send(t1_tag->adapter_idx, (uint8_t *)&t1_cmd, sizeof(t1_cmd), - segment_read_recv, t1_tag); + data_recv, t1_tag); } static int meta_recv(uint8_t *resp, int length, void *data) @@ -505,7 +505,7 @@ static int write_nmn_e1(struct t1_cookie *cookie) sizeof(cmd), write_nmn_e1_resp, cookie); } -static int data_write(uint8_t *resp, int length, void *data) +static int data_write_resp(uint8_t *resp, int length, void *data) { struct t1_cookie *cookie = data; uint8_t addr = 0; @@ -541,7 +541,7 @@ static int data_write(uint8_t *resp, int length, void *data) cookie->current_byte++; err = near_adapter_send(cookie->adapter_idx, (uint8_t *) &cmd, - sizeof(cmd), data_write, cookie); + sizeof(cmd), data_write_resp, cookie); if (err < 0) goto out; @@ -556,7 +556,7 @@ out: return err; } -static int write_nmn_0(uint32_t adapter_idx, uint32_t target_idx, +static int data_write(uint32_t adapter_idx, uint32_t target_idx, struct near_ndef_message *ndef, near_tag_io_cb cb) { int err; @@ -595,7 +595,7 @@ static int write_nmn_0(uint32_t adapter_idx, uint32_t target_idx, g_free(uid); err = near_adapter_send(cookie->adapter_idx, (uint8_t *) &cmd, - sizeof(cmd), data_write, cookie); + sizeof(cmd), data_write_resp, cookie); if (err < 0) goto out; @@ -642,7 +642,7 @@ static int nfctype1_write(uint32_t adapter_idx, uint32_t target_idx, } } - return write_nmn_0(adapter_idx, target_idx, ndef, cb); + return data_write(adapter_idx, target_idx, ndef, cb); } static int check_presence(uint8_t *resp, int length, void *data) diff --git a/plugins/nfctype3.c b/plugins/nfctype3.c index a5d7166..b3443c8 100644 --- a/plugins/nfctype3.c +++ b/plugins/nfctype3.c @@ -204,7 +204,7 @@ static int check_recv_frame(uint8_t *resp, uint8_t reply_code) return err; } -static int nfctype3_data_recv(uint8_t *resp, int length, void *data) +static int data_recv(uint8_t *resp, int length, void *data) { struct type3_tag *tag = data; struct type3_cmd cmd; @@ -255,7 +255,8 @@ static int nfctype3_data_recv(uint8_t *resp, int length, void *data) tag->IDm, &cmd); err = near_adapter_send(adapter_idx, (uint8_t *) &cmd, cmd.len, - nfctype3_data_recv, tag); + data_recv, tag); + if (err < 0) goto out; @@ -270,7 +271,7 @@ out: return err; } -static int nfctype3_data_read(struct type3_tag *tag) +static int data_read(struct type3_tag *tag) { struct type3_cmd cmd; uint32_t adapter_idx; @@ -286,7 +287,7 @@ static int nfctype3_data_read(struct type3_tag *tag) return near_adapter_send(adapter_idx, (uint8_t *) &cmd, cmd.len, - nfctype3_data_recv, tag); + data_recv, tag); } /* Read block 0 to retrieve the data length */ @@ -356,7 +357,7 @@ static int nfctype3_recv_block_0(uint8_t *resp, int length, void *data) t3_tag->cb = cookie->cb; t3_tag->tag = tag; - err = nfctype3_data_read(t3_tag); + err = data_read(t3_tag); out: if (err < 0) { @@ -778,9 +779,9 @@ static int nfctype3_write(uint32_t adapter_idx, uint32_t target_idx, return data_write(adapter_idx, target_idx, ndef, tag, cb); } -static int nfctype3_check_recv_UID(uint8_t *resp, int length, void *data) +static int check_presence(uint8_t *resp, int length, void *data) { - struct t3_cookie *rcv_cookie = data; + struct t3_cookie *cookie = data; int err = 0; DBG("length %d", length); @@ -788,11 +789,11 @@ static int nfctype3_check_recv_UID(uint8_t *resp, int length, void *data) if (length < 0) err = -EIO; - if (rcv_cookie->cb) - rcv_cookie->cb(rcv_cookie->adapter_idx, - rcv_cookie->target_idx, err); + if (cookie->cb) + cookie->cb(cookie->adapter_idx, + cookie->target_idx, err); - t3_cookie_release(rcv_cookie); + t3_cookie_release(cookie); return err; } @@ -825,7 +826,8 @@ static int nfctype3_check_presence(uint32_t adapter_idx, cookie->cb = cb; err = near_adapter_send(adapter_idx, (uint8_t *) &cmd, - cmd.len, nfctype3_check_recv_UID, cookie); + cmd.len, check_presence, cookie); + if (err < 0) goto out; -- 2.7.4