X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fxmodem.c;h=ca59a99394e17604fa2c264b292bb29c9e405d1c;hb=refs%2Ftags%2F2.0.0;hp=d6653a49d6c37d635a87af142685063599e20e23;hpb=c9081d442fb19d46c69ef37847b167b8b702b747;p=bertos.git

diff --git a/bertos/net/xmodem.c b/bertos/net/xmodem.c
index d6653a49..ca59a993 100644
--- a/bertos/net/xmodem.c
+++ b/bertos/net/xmodem.c
@@ -27,9 +27,10 @@
  * the GNU General Public License.
  *
  * Copyright 2004, 2005, 2006, 2007 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2001 Bernardo Innocenti <bernie@develer.com>
+ * Copyright 1999, 2001 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
+ *
  * \brief X-Modem serial transmission protocol (implementation)
  *
  * Supports the CRC-16 and 1K-blocks variants of the standard.
@@ -38,21 +39,22 @@
  * \todo Break xmodem_send() and xmodem_recv() in smaller functions.
  *
  * \version $Id$
- * \author Bernardo Innocenti <bernie@develer.com>
+ *
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Francesco Sacchi <batt@develer.com>
  */
 
 
 #include "xmodem.h"
 
-#include <appconfig.h>
-#include <string.h> /* for memset() */
-#include <drv/ser.h>
-#include <algo/crc.h>
 #include <cfg/debug.h>
+#include "cfg/cfg_xmodem.h"
 
+#include <drv/ser.h>
 
+#include <algo/crc.h>
 
+#include <string.h> /* for memset() */
 
 /**
  * \name Protocol control codes
@@ -67,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
@@ -86,7 +85,7 @@
  *
  * \note This function allocates a large amount of stack (\see XM_BUFSIZE).
  */
-bool xmodem_recv(struct KFileSerial *port, KFile *fd)
+bool xmodem_recv(struct Serial *port, KFile *fd)
 {
 	char block_buffer[XM_BUFSIZE]; /* Buffer to hold a block of data */
 	int c, i, blocksize;
@@ -100,7 +99,7 @@ bool xmodem_recv(struct KFileSerial *port, KFile *fd)
 
 	XMODEM_PROGRESS("Starting Transfer...\n");
 	purge = true;
-	ser_clearerr(port);
+	kfile_clearerr(&port->fd);
 
 	/* Send initial NAK to start transmission */
 	for(;;)
@@ -127,7 +126,7 @@ bool xmodem_recv(struct KFileSerial *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);
@@ -138,7 +137,7 @@ bool xmodem_recv(struct KFileSerial *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);
@@ -271,14 +270,14 @@ bool xmodem_recv(struct KFileSerial *port, KFile *fd)
 				else
 				{
 					/* User callback failed: abort transfer immediately */
-					retries = XM_MAXRETRIES;
+					retries = CONFIG_XMODEM_MAXRETRIES;
 					purge = true;
 				}
 			}
 			break;
 
 		case XM_EOT:	/* End of transmission */
-			kfile_putchar(XM_ACK, &port->fd);
+			kfile_putc(XM_ACK, &port->fd);
 			XMODEM_PROGRESS("Transfer completed\n");
 			return true;
 
@@ -306,7 +305,7 @@ bool xmodem_recv(struct KFileSerial *port, KFile *fd)
  * \note This function allocates a large amount of stack for
  *       the XModem transfer buffer (\see XM_BUFSIZE).
  */
-bool xmodem_send(struct KFileSerial *port, KFile *fd)
+bool xmodem_send(struct Serial *port, KFile *fd)
 {
 	char block_buffer[XM_BUFSIZE]; /* Buffer to hold a block of data */
 	size_t size = -1;
@@ -372,7 +371,7 @@ bool xmodem_send(struct KFileSerial *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! */
 
@@ -420,8 +419,8 @@ bool xmodem_send(struct KFileSerial *port, KFile *fd)
 		{
 			crc = UPDCRC16(0, crc);
 			crc = UPDCRC16(0, crc);
-			ser_putchar(crc >> 8, port);
-			ser_putchar(crc & 0xFF, port);
+			kfile_putc(crc >> 8, &port->fd);
+			kfile_putc(crc & 0xFF, &port->fd);
 		}
 		else
 			kfile_putc(sum, &port->fd);