* 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.
* \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
*
* \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;
XMODEM_PROGRESS("Starting Transfer...\n");
purge = true;
- ser_clearerr(port);
+ kfile_clearerr(&port->fd);
/* Send initial NAK to start transmission */
for(;;)
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;
* \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;
{
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);