[PATCH 2/6] main: Turn default transfer size into a macro

Tormod Volden lists.tormod at gmail.com
Wed Aug 31 23:26:21 CEST 2011


From: Tormod Volden <debian.tormod at gmail.com>

It is not a variable. Eventually we should get rid of it. All
supported devices should report their preferred transfer size.
---
 src/main.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main.c b/src/main.c
index aaad39a..9fbaed9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -51,6 +51,9 @@
 int debug;
 int verbose = 0;
 
+/* If we really have to guess (non-compliant devices) */
+#define DEFAULT_TRANSFER_SIZE 1024
+
 /* define a portable function for reading a 16bit little-endian word */
 unsigned short get_int16_le(const void *p)
 {
@@ -511,7 +514,6 @@ int main(int argc, char **argv)
 	int num_devs;
 	int num_ifs;
 	unsigned int transfer_size = 0;
-	unsigned int default_transfer_size = 1024;
 	unsigned int host_page_size;
 	enum mode mode = MODE_NONE;
 	struct dfu_status status;
@@ -889,7 +891,7 @@ status_again:
 	}
 	/* if returned zero or not detected (and not user specified) */
 	if (!transfer_size) {
-		transfer_size = default_transfer_size;
+		transfer_size = DEFAULT_TRANSFER_SIZE;
 		printf("Warning: Trying default transfer size %i\n",
 			transfer_size);
 	}
-- 
1.7.5.4




More information about the devel mailing list