|
@@ -76,6 +76,7 @@ static int kwboot_verbose;
|
|
|
|
|
|
static int msg_req_delay = KWBOOT_MSG_REQ_DELAY;
|
|
|
static int msg_rsp_timeo = KWBOOT_MSG_RSP_TIMEO;
|
|
|
+static int blk_rsp_timeo = KWBOOT_BLK_RSP_TIMEO;
|
|
|
|
|
|
static void
|
|
|
kwboot_printv(const char *fmt, ...)
|
|
@@ -380,7 +381,7 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block)
|
|
|
break;
|
|
|
|
|
|
do {
|
|
|
- rc = kwboot_tty_recv(fd, &c, 1, KWBOOT_BLK_RSP_TIMEO);
|
|
|
+ rc = kwboot_tty_recv(fd, &c, 1, blk_rsp_timeo);
|
|
|
if (rc)
|
|
|
break;
|
|
|
|
|
@@ -696,6 +697,8 @@ kwboot_usage(FILE *stream, char *progname)
|
|
|
fprintf(stream, " -a: use timings for Armada XP\n");
|
|
|
fprintf(stream, " -q <req-delay>: use specific request-delay\n");
|
|
|
fprintf(stream, " -s <resp-timeo>: use specific response-timeout\n");
|
|
|
+ fprintf(stream,
|
|
|
+ " -o <block-timeo>: use specific xmodem block timeout\n");
|
|
|
fprintf(stream, "\n");
|
|
|
fprintf(stream, " -t: mini terminal\n");
|
|
|
fprintf(stream, "\n");
|
|
@@ -728,7 +731,7 @@ main(int argc, char **argv)
|
|
|
kwboot_verbose = isatty(STDOUT_FILENO);
|
|
|
|
|
|
do {
|
|
|
- int c = getopt(argc, argv, "hb:ptaB:dD:q:s:");
|
|
|
+ int c = getopt(argc, argv, "hb:ptaB:dD:q:s:o:");
|
|
|
if (c < 0)
|
|
|
break;
|
|
|
|
|
@@ -768,6 +771,10 @@ main(int argc, char **argv)
|
|
|
msg_rsp_timeo = atoi(optarg);
|
|
|
break;
|
|
|
|
|
|
+ case 'o':
|
|
|
+ blk_rsp_timeo = atoi(optarg);
|
|
|
+ break;
|
|
|
+
|
|
|
case 'B':
|
|
|
speed = kwboot_tty_speed(atoi(optarg));
|
|
|
if (speed == -1)
|