projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release version 2.0.0.
[bertos.git]
/
bertos
/
net
/
xmodem.c
diff --git
a/bertos/net/xmodem.c
b/bertos/net/xmodem.c
index d38824836b302dd14652701c276878884934ef43..ca59a99394e17604fa2c264b292bb29c9e405d1c 100644
(file)
--- a/
bertos/net/xmodem.c
+++ b/
bertos/net/xmodem.c
@@
-27,7
+27,7
@@
* the GNU General Public License.
*
* Copyright 2004, 2005, 2006, 2007 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2004, 2005, 2006, 2007 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2001 Bern
ardo Innocenti <bernie@develer.com
>
+ * Copyright 1999, 2001 Bern
ie Innocenti <bernie@codewiz.org
>
*
* -->
*
*
* -->
*
@@
-40,21
+40,21
@@
*
* \version $Id$
*
*
* \version $Id$
*
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
* \author Francesco Sacchi <batt@develer.com>
*/
#include "xmodem.h"
* \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/debug.h>
+#include "cfg/cfg_xmodem.h"
+#include <drv/ser.h>
+#include <algo/crc.h>
+#include <string.h> /* for memset() */
/**
* \name Protocol control codes
/**
* \name Protocol control codes
@@
-69,9
+69,6
@@
#define XM_CAN 0x18 /**< CANcel transmission */
/*\}*/
#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
#if CONFIG_XMODEM_1KCRC == 1
#define XM_BUFSIZE 1024 /**< 1024 bytes of block buffer */
#else
@@
-88,7
+85,7
@@
*
* \note This function allocates a large amount of stack (\see XM_BUFSIZE).
*/
*
* \note This function allocates a large amount of stack (\see XM_BUFSIZE).
*/
-bool xmodem_recv(struct
KFile
Serial *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;
{
char block_buffer[XM_BUFSIZE]; /* Buffer to hold a block of data */
int c, i, blocksize;
@@
-129,7
+126,7
@@
bool xmodem_recv(struct KFileSerial *port, KFile *fd)
ser_resync(port, 200);
retries++;
ser_resync(port, 200);
retries++;
- if (retries >=
X
M_MAXRETRIES)
+ if (retries >=
CONFIG_XMODE
M_MAXRETRIES)
{
kfile_putc(XM_CAN, &port->fd);
kfile_putc(XM_CAN, &port->fd);
{
kfile_putc(XM_CAN, &port->fd);
kfile_putc(XM_CAN, &port->fd);
@@
-140,7
+137,7
@@
bool xmodem_recv(struct KFileSerial *port, KFile *fd)
/* Transmission start? */
if (blocknr == 0)
{
/* Transmission start? */
if (blocknr == 0)
{
- if (retries <
X
M_MAXCRCRETRIES)
+ if (retries <
CONFIG_XMODE
M_MAXCRCRETRIES)
{
XMODEM_PROGRESS("Request Tx (CRC)\n");
kfile_putc(XM_C, &port->fd);
{
XMODEM_PROGRESS("Request Tx (CRC)\n");
kfile_putc(XM_C, &port->fd);
@@
-273,7
+270,7
@@
bool xmodem_recv(struct KFileSerial *port, KFile *fd)
else
{
/* User callback failed: abort transfer immediately */
else
{
/* User callback failed: abort transfer immediately */
- retries =
X
M_MAXRETRIES;
+ retries =
CONFIG_XMODE
M_MAXRETRIES;
purge = true;
}
}
purge = true;
}
}
@@
-308,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).
*/
* \note This function allocates a large amount of stack for
* the XModem transfer buffer (\see XM_BUFSIZE).
*/
-bool xmodem_send(struct
KFile
Serial *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;
{
char block_buffer[XM_BUFSIZE]; /* Buffer to hold a block of data */
size_t size = -1;
@@
-374,7
+371,7
@@
bool xmodem_send(struct KFileSerial *port, KFile *fd)
kfile_clearerr(&port->fd);
retries++;
XMODEM_PROGRESS("Retries %d\n", retries);
kfile_clearerr(&port->fd);
retries++;
XMODEM_PROGRESS("Retries %d\n", retries);
- if (retries <=
X
M_MAXRETRIES)
+ if (retries <=
CONFIG_XMODE
M_MAXRETRIES)
break;
/* falling through! */
break;
/* falling through! */