Changeset 1917

Timestamp:

11/10/08 15:44:52 (2 months ago)

Author:

batt

Message:

Merged from external project:

**********
r22609 | batt | 2008-11-08 14:43:34 +0100 (sab, 08 nov 2008) | 1 line

Add configurable options for xmodem max retries.
**********

Files:

• trunk/bertos/cfg/cfg_xmodem.h (modified) (2 diffs)
• trunk/bertos/net/xmodem.c (modified) (5 diffs)

trunk/bertos/cfg/cfg_xmodem.h

@@ -41 +41 @@
-#define CFG_XMODEM_H
-
- 
+
-#define CONFIG_XMODEM_RECV   1
-
@@ -50 +50 @@
-#define CONFIG_XMODEM_1KCRC  1
-
+/// Max retries before giving up
+#define CONFIG_XMODEM_MAXRETRIES     15
+
+/// Max retries before switching to BCC
+#define CONFIG_XMODEM_MAXCRCRETRIES   7
+
-#endif /* CFG_XMODEM_H */
-

trunk/bertos/net/xmodem.c

@@ -70 +70 @@
-/*\}*/
-
-#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 */
@@ -130 +127 @@
-                        retries++;
-
-X
+CONFIG_XMODE
-                        {
-                                kfile_putc(XM_CAN, &port->fd);
@@ -141 +138 @@
-                        if (blocknr == 0)
-                        {
-X
+CONFIG_XMODE
-                                {
-                                        XMODEM_PROGRESS("Request Tx (CRC)\n");
@@ -274 +271 @@
-                                {
-                                        /* User callback failed: abort transfer immediately */
-X
+CONFIG_XMODE
-                                        purge = true;
-                                }
@@ -375 +372 @@
-                                retries++;
-                                XMODEM_PROGRESS("Retries %d\n", retries);
-X
+CONFIG_XMODE
-                                        break;
-                                /* falling through! */