[PATCH] Fix the options and protocols used by the loadx command.
Owen Kirby
osk at exegin.com
Thu May 8 13:36:14 PDT 2014
>From 3cd970250ff17ac406e46e18ebb26aa35949d1db Mon Sep 17 00:00:00 2001
From: Owen Kirby <osk at exegin.com>
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 <osk at exegin.com>
---
commands/loadxy.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/commands/loadxy.c b/commands/loadxy.c
index 7a91286..e023468 100644
--- a/commands/loadxy.c
+++ b/commands/loadxy.c
@@ -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);
--
1.7.9.5
More information about the barebox
mailing list