X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fxmodem.c;h=ca59a99394e17604fa2c264b292bb29c9e405d1c;hb=refs%2Ftags%2F2.0.0;hp=ec899cb130b8f59ad2802817dbddcce4d8a40f3e;hpb=df94a4b7d8102b20810f889fbc926ac4823b61d9;p=bertos.git diff --git a/bertos/net/xmodem.c b/bertos/net/xmodem.c index ec899cb1..ca59a993 100644 --- a/bertos/net/xmodem.c +++ b/bertos/net/xmodem.c @@ -69,9 +69,6 @@ #define XM_CAN 0x18 /**< CANcel transmission */ /*\}*/ -#define XM_MAXRETRIES 15 /**< Max retries before giving up */ -#define XM_MAXCRCRETRIES 7 /**< Max retries before switching to BCC */ - #if CONFIG_XMODEM_1KCRC == 1 #define XM_BUFSIZE 1024 /**< 1024 bytes of block buffer */ #else @@ -129,7 +126,7 @@ bool xmodem_recv(struct Serial *port, KFile *fd) ser_resync(port, 200); retries++; - if (retries >= XM_MAXRETRIES) + if (retries >= CONFIG_XMODEM_MAXRETRIES) { kfile_putc(XM_CAN, &port->fd); kfile_putc(XM_CAN, &port->fd); @@ -140,7 +137,7 @@ bool xmodem_recv(struct Serial *port, KFile *fd) /* Transmission start? */ if (blocknr == 0) { - if (retries < XM_MAXCRCRETRIES) + if (retries < CONFIG_XMODEM_MAXCRCRETRIES) { XMODEM_PROGRESS("Request Tx (CRC)\n"); kfile_putc(XM_C, &port->fd); @@ -273,7 +270,7 @@ bool xmodem_recv(struct Serial *port, KFile *fd) else { /* User callback failed: abort transfer immediately */ - retries = XM_MAXRETRIES; + retries = CONFIG_XMODEM_MAXRETRIES; purge = true; } } @@ -374,7 +371,7 @@ bool xmodem_send(struct Serial *port, KFile *fd) kfile_clearerr(&port->fd); retries++; XMODEM_PROGRESS("Retries %d\n", retries); - if (retries <= XM_MAXRETRIES) + if (retries <= CONFIG_XMODEM_MAXRETRIES) break; /* falling through! */