Skip to contentSkip to conversation

Fix the options and protocols used by the loadx command.

PATCH In review Owen Kirby 2 participants 3 messages May 8, 2014 – May 9, 2014

lore
Share & tools
lore

Owen Kirby

author
#0 lore raw

PATCH 1/1 Fix the options and protocols used by the loadx command.

From 3cd970250ff17ac406e46e18ebb26aa35949d1db Mon Sep 17 00:00:00 2001
From: Owen Kirby <[email protected]>
Date: Thu, 8 May 2014 13:27:11 -0700
Subject: [PATCH] Fix the options and protocols used by the loadx command.

It seems like the loadx command was improperly copy/pasted from the loady implementation, and was trying to load files using the ymodem protocol. This patch should fix the command so that it uses xmodem, implements the -t option and outputs the correct baudrate being used.

Signed-off-by Owen Kirby <[email protected]>
---
 commands/loadxy.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
commands/loadxy.c +5 -5
index 7a91286..e023468 100644
@@ -156,7 +156,7 @@ static int do_loadx(int argc, char *argv[])
 	char *output_file = NULL, *cname = NULL;
 	struct console_device *cdev = NULL;
 
-	while ((opt = getopt(argc, argv, "f:b:o:c")) > 0) {
+	while ((opt = getopt(argc, argv, "f:b:t:o:c")) > 0) {
 		switch (opt) {
 		case 'f':
 			output_file = optarg;

@@ -211,12 +211,12 @@ static int do_loadx(int argc, char *argv[])
 	}
 
 	current_baudrate = console_change_speed(cdev, load_baudrate);
-	printf("## Ready for binary (X-Modem) download "
+	printf("## Ready for binary (xmodem) download "
 	       "to 0x%08lX offset on %s device at %d bps...\n", offset,
-	       output_file, load_baudrate);
-	rcode = do_load_serial_ymodem(cdev);
+	       output_file, load_baudrate ? load_baudrate : current_baudrate);
+	rcode = do_load_serial_xmodem(cdev, ofd);
 	if (rcode < 0) {
-		printf("## Binary (kermit) download aborted (%d)\n", rcode);
+		printf("## Binary (xmodem) download aborted (%d)\n", rcode);
 		rcode = 1;
 	}
 	console_change_speed(cdev, current_baudrate);
Signature · 8 lines
1.7.9.5



_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw

Hi Owen,

Quoted 11 lines · Owen Kirby

From 3cd970250ff17ac406e46e18ebb26aa35949d1db Mon Sep 17 00:00:00 2001
From: Owen Kirby <[email protected]>
Date: Thu, 8 May 2014 13:27:11 -0700
Subject: [PATCH] Fix the options and protocols used by the loadx command.

It seems like the loadx command was improperly copy/pasted from the loady implementation, and was trying to load files using the ymodem protocol. This patch should fix the command so that it uses xmodem, implements the -t option and outputs the correct baudrate being used.

Signed-off-by Owen Kirby <[email protected]>

I'm always surprised to still see patches to the serial download protocols. I hardly ever use them. Anyway, patch looks good, so:
Applied, thanks

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
author
#2 lore raw
Quoted 13 lines · Sascha Hauer

Hi Owen,

Quoted 10 lines · Owen Kirby

From 3cd970250ff17ac406e46e18ebb26aa35949d1db Mon Sep 17 00:00:00 2001
From: Owen Kirby <[email protected]>
Date: Thu, 8 May 2014 13:27:11 -0700
Subject: [PATCH] Fix the options and protocols used by the loadx command.

It seems like the loadx command was improperly copy/pasted from the loady implementation, and was trying to load files using the ymodem protocol. This patch should fix the command so that it uses xmodem, implements the -t option and outputs the correct baudrate being used.

Quoted 7 lines
Quoted 1 line
Signed-off-by Owen Kirby <[email protected]>

I'm always surprised to still see patches to the serial download protocols. I hardly ever use them. Anyway, patch looks good, so:
Applied, thanks

Sascha

Old protocols never die :)

I'm not yet sure that I want to use xmodem over DFU just yet, but it seemed like an obvious bug.

Cheers,
Owen

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox