From 5f9052b284b04c40a73d2d3bf9f336bf8a42ff47 Mon Sep 17 00:00:00 2001 From: jakubovsky Date: Mon, 9 Jul 2012 10:48:13 +0200 Subject: [PATCH] Renamed mbus_recv_frame_dummy() to more descriptive mbus_purge_frames() --- bin/mbus-serial-request-data-multi-reply.c | 4 ++-- bin/mbus-serial-scan.c | 4 ++-- bin/mbus-tcp-scan.c | 4 ++-- mbus/mbus-protocol-aux.c | 6 +++--- mbus/mbus-protocol-aux.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/mbus-serial-request-data-multi-reply.c b/bin/mbus-serial-request-data-multi-reply.c index a719cab..0f1fb7a 100755 --- a/bin/mbus-serial-request-data-multi-reply.c +++ b/bin/mbus-serial-request-data-multi-reply.c @@ -116,7 +116,7 @@ main(int argc, char **argv) return 1; } - mbus_recv_frame_dummy(handle); + mbus_purge_frames(handle); // // resend SND_NKE, maybe the first get lost @@ -135,7 +135,7 @@ main(int argc, char **argv) return 1; } - mbus_recv_frame_dummy(handle); + mbus_purge_frames(handle); if (strlen(addr_str) == 16) { diff --git a/bin/mbus-serial-scan.c b/bin/mbus-serial-scan.c index 845b1ca..ac5470a 100755 --- a/bin/mbus-serial-scan.c +++ b/bin/mbus-serial-scan.c @@ -114,7 +114,7 @@ main(int argc, char **argv) if (ret == -2) { /* check for more data (collision) */ - mbus_recv_frame_dummy(handle); + mbus_purge_frames(handle); printf("Collision at address %d\n", address); continue; } @@ -122,7 +122,7 @@ main(int argc, char **argv) if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK) { /* check for more data (collision) */ - if (mbus_recv_frame_dummy(handle)) + if (mbus_purge_frames(handle)) { printf("Collision at address %d\n", address); diff --git a/bin/mbus-tcp-scan.c b/bin/mbus-tcp-scan.c index 4f88bac..015c525 100755 --- a/bin/mbus-tcp-scan.c +++ b/bin/mbus-tcp-scan.c @@ -97,7 +97,7 @@ main(int argc, char **argv) if (ret == -2) { /* check for more data (collision) */ - mbus_recv_frame_dummy(handle); + mbus_purge_frames(handle); printf("Collision at address %d\n", address); continue; } @@ -105,7 +105,7 @@ main(int argc, char **argv) if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK) { /* check for more data (collision) */ - if (mbus_recv_frame_dummy(handle)) + if (mbus_purge_frames(handle)) { printf("Collision at address %d\n", address); continue; diff --git a/mbus/mbus-protocol-aux.c b/mbus/mbus-protocol-aux.c index cbb614f..f1b4018 100755 --- a/mbus/mbus-protocol-aux.c +++ b/mbus/mbus-protocol-aux.c @@ -1454,7 +1454,7 @@ mbus_recv_frame(mbus_handle * handle, mbus_frame *frame) return result; } -int mbus_recv_frame_dummy(mbus_handle *handle) +int mbus_purge_frames(mbus_handle *handle) { int err, received; mbus_frame reply; @@ -1810,14 +1810,14 @@ mbus_select_secondary_address(mbus_handle * handle, const char *mask) if (ret == -2) { /* check for more data (collision) */ - mbus_recv_frame_dummy(handle); + mbus_purge_frames(handle); return MBUS_PROBE_COLLISION; } if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK) { /* check for more data (collision) */ - if (mbus_recv_frame_dummy(handle)) + if (mbus_purge_frames(handle)) { return MBUS_PROBE_COLLISION; } diff --git a/mbus/mbus-protocol-aux.h b/mbus/mbus-protocol-aux.h index f127c2a..71eeecd 100755 --- a/mbus/mbus-protocol-aux.h +++ b/mbus/mbus-protocol-aux.h @@ -205,7 +205,7 @@ int mbus_recv_frame(mbus_handle * handle, mbus_frame *frame); * * @return Zero when nothing received, one otherwise. */ -int mbus_recv_frame_dummy(mbus_handle * handle); +int mbus_purge_frames(mbus_handle * handle); /** * Sends frame using "unified" handle