dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Coding Style cleanup.

Browse Source 
Patch by Stefano Babic, 31 Aug 2006
This commit is contained in:
Wolfgang Denk
2006-08-31 16:46:53 +02:00
parent e8143e72e1
commit 7d0432c9e4
2 changed files with 546 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Coding Style cleanup.
Patch by Stefano Babic, 31 Aug 2006
* Add splashscreen support for MCC200 board. * Add splashscreen support for MCC200 board.
* Make the serial driver framework work with CONFIG_SERIAL_MULTI * Make the serial driver framework work with CONFIG_SERIAL_MULTI

517
common/xyzModem.c
View File

@@ -74,14 +74,15 @@
#define USE_YMODEM_LENGTH #define USE_YMODEM_LENGTH
/* Data & state local to the protocol */ /* Data & state local to the protocol */
static struct { static struct
{
#ifdef REDBOOT #ifdef REDBOOT
hal_virtual_comm_table_t* __chan; hal_virtual_comm_table_t *__chan;
#else #else
int *__chan; int *__chan;
#endif #endif
unsigned char pkt[1024], *bufp; unsigned char pkt[1024], *bufp;
unsigned char blk,cblk,crc1,crc2; unsigned char blk, cblk, crc1, crc2;
unsigned char next_blk; /* Expected block */ unsigned char next_blk; /* Expected block */
int len, mode, total_retries; int len, mode, total_retries;
int total_SOH, total_STX, total_CAN; int total_SOH, total_STX, total_CAN;
@@ -99,44 +100,54 @@ static struct {
#ifndef REDBOOT /*SB */ #ifndef REDBOOT /*SB */
typedef int cyg_int32; typedef int cyg_int32;
int CYGACC_COMM_IF_GETC_TIMEOUT (char chan,char *c) { int
CYGACC_COMM_IF_GETC_TIMEOUT (char chan, char *c)
{
#define DELAY 20 #define DELAY 20
unsigned long counter=0; unsigned long counter = 0;
while (!tstc() && (counter < xyzModem_CHAR_TIMEOUT*1000/DELAY)) { while (!tstc () && (counter < xyzModem_CHAR_TIMEOUT * 1000 / DELAY))
udelay(DELAY); {
udelay (DELAY);
counter++; counter++;
} }
if (tstc()) { if (tstc ())
*c=getc(); {
*c = getc ();
return 1; return 1;
} }
return 0; return 0;
} }
void CYGACC_COMM_IF_PUTC(char x,char y) { void
putc(y); CYGACC_COMM_IF_PUTC (char x, char y)
{
putc (y);
} }
/* Validate a hex character */ /* Validate a hex character */
__inline__ static bool __inline__ static bool
_is_hex(char c) _is_hex (char c)
{ {
return (((c >= '0') && (c <= '9')) || return (((c >= '0') && (c <= '9')) ||
((c >= 'A') && (c <= 'F')) || ((c >= 'A') && (c <= 'F')) || ((c >= 'a') && (c <= 'f')));
((c >= 'a') && (c <= 'f')));
} }
/* Convert a single hex nibble */ /* Convert a single hex nibble */
__inline__ static int __inline__ static int
_from_hex(char c) _from_hex (char c)
{ {
int ret = 0; int ret = 0;
if ((c >= '0') && (c <= '9')) { if ((c >= '0') && (c <= '9'))
{
ret = (c - '0'); ret = (c - '0');
} else if ((c >= 'a') && (c <= 'f')) { }
else if ((c >= 'a') && (c <= 'f'))
{
ret = (c - 'a' + 0x0a); ret = (c - 'a' + 0x0a);
} else if ((c >= 'A') && (c <= 'F')) { }
else if ((c >= 'A') && (c <= 'F'))
{
ret = (c - 'A' + 0x0A); ret = (c - 'A' + 0x0A);
} }
return ret; return ret;
@@ -144,9 +155,10 @@ _from_hex(char c)
/* Convert a character to lower case */ /* Convert a character to lower case */
__inline__ static char __inline__ static char
_tolower(char c) _tolower (char c)
{ {
if ((c >= 'A') && (c <= 'Z')) { if ((c >= 'A') && (c <= 'Z'))
{
c = (c - 'A') + 'a'; c = (c - 'A') + 'a';
} }
return c; return c;
@@ -154,7 +166,7 @@ _tolower(char c)
/* Parse (scan) a number */ /* Parse (scan) a number */
bool bool
parse_num(char *s, unsigned long *val, char **es, char *delim) parse_num (char *s, unsigned long *val, char **es, char *delim)
{ {
bool first = true; bool first = true;
int radix = 10; int radix = 10;
@@ -162,15 +174,19 @@ parse_num(char *s, unsigned long *val, char **es, char *delim)
unsigned long result = 0; unsigned long result = 0;
int digit; int digit;
while (*s == ' ') s++; while (*s == ' ')
while (*s) { s++;
if (first && (s[0] == '0') && (_tolower(s[1]) == 'x')) { while (*s)
{
if (first && (s[0] == '0') && (_tolower (s[1]) == 'x'))
{
radix = 16; radix = 16;
s += 2; s += 2;
} }
first = false; first = false;
c = *s++; c = *s++;
if (_is_hex(c) && ((digit = _from_hex(c)) < radix)) { if (_is_hex (c) && ((digit = _from_hex (c)) < radix))
{
/* Valid digit */ /* Valid digit */
#ifdef CYGPKG_HAL_MIPS #ifdef CYGPKG_HAL_MIPS
/* FIXME: tx49 compiler generates 0x2539018 for MUL which */ /* FIXME: tx49 compiler generates 0x2539018 for MUL which */
@@ -183,18 +199,24 @@ parse_num(char *s, unsigned long *val, char **es, char *delim)
#else #else
result = (result * radix) + digit; result = (result * radix) + digit;
#endif #endif
} else { }
if (delim != (char *)0) { else
{
if (delim != (char *) 0)
{
/* See if this character is one of the delimiters */ /* See if this character is one of the delimiters */
char *dp = delim; char *dp = delim;
while (*dp && (c != *dp)) dp++; while (*dp && (c != *dp))
if (*dp) break; /* Found a good delimiter */ dp++;
if (*dp)
break; /* Found a good delimiter */
} }
return false; /* Malformatted number */ return false; /* Malformatted number */
} }
} }
*val = result; *val = result;
if (es != (char **)0) { if (es != (char **) 0)
{
*es = s; *es = s;
} }
return true; return true;
@@ -211,24 +233,26 @@ parse_num(char *s, unsigned long *val, char **es, char *delim)
* messages. * messages.
*/ */
static int static int
zm_dprintf(char *fmt, ...) zm_dprintf (char *fmt, ...)
{ {
int cur_console; int cur_console;
va_list args; va_list args;
va_start(args, fmt); va_start (args, fmt);
#ifdef REDBOOT #ifdef REDBOOT
cur_console = CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT); cur_console =
CYGACC_CALL_IF_SET_CONSOLE_COMM(1); CYGACC_CALL_IF_SET_CONSOLE_COMM
(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
CYGACC_CALL_IF_SET_CONSOLE_COMM (1);
#endif #endif
diag_vprintf(fmt, args); diag_vprintf (fmt, args);
#ifdef REDBOOT #ifdef REDBOOT
CYGACC_CALL_IF_SET_CONSOLE_COMM(cur_console); CYGACC_CALL_IF_SET_CONSOLE_COMM (cur_console);
#endif #endif
} }
static void static void
zm_flush(void) zm_flush (void)
{ {
} }
@@ -238,42 +262,43 @@ zm_flush(void)
*/ */
#define FINAL #define FINAL
#ifdef FINAL #ifdef FINAL
static char *zm_out = (char *)0x00380000; static char *zm_out = (char *) 0x00380000;
static char *zm_out_start = (char *)0x00380000; static char *zm_out_start = (char *) 0x00380000;
#else #else
static char zm_buf[8192]; static char zm_buf[8192];
static char *zm_out=zm_buf; static char *zm_out = zm_buf;
static char *zm_out_start = zm_buf; static char *zm_out_start = zm_buf;
#endif #endif
static int static int
zm_dprintf(char *fmt, ...) zm_dprintf (char *fmt, ...)
{ {
int len; int len;
va_list args; va_list args;
va_start(args, fmt); va_start (args, fmt);
len = diag_vsprintf(zm_out, fmt, args); len = diag_vsprintf (zm_out, fmt, args);
zm_out += len; zm_out += len;
return len; return len;
} }
static void static void
zm_flush(void) zm_flush (void)
{ {
#ifdef REDBOOT #ifdef REDBOOT
char *p = zm_out_start; char *p = zm_out_start;
while (*p) mon_write_char(*p++); while (*p)
mon_write_char (*p++);
#endif #endif
zm_out = zm_out_start; zm_out = zm_out_start;
} }
#endif #endif
static void static void
zm_dump_buf(void *buf, int len) zm_dump_buf (void *buf, int len)
{ {
#ifdef REDBOOT #ifdef REDBOOT
diag_vdump_buf_with_offset(zm_dprintf, buf, len, 0); diag_vdump_buf_with_offset (zm_dprintf, buf, len, 0);
#else #else
#endif #endif
@@ -283,22 +308,22 @@ static unsigned char zm_buf[2048];
static unsigned char *zm_bp; static unsigned char *zm_bp;
static void static void
zm_new(void) zm_new (void)
{ {
zm_bp = zm_buf; zm_bp = zm_buf;
} }
static void static void
zm_save(unsigned char c) zm_save (unsigned char c)
{ {
*zm_bp++ = c; *zm_bp++ = c;
} }
static void static void
zm_dump(int line) zm_dump (int line)
{ {
zm_dprintf("Packet at line: %d\n", line); zm_dprintf ("Packet at line: %d\n", line);
zm_dump_buf(zm_buf, zm_bp-zm_buf); zm_dump_buf (zm_buf, zm_bp - zm_buf);
} }
#define ZM_DEBUG(x) x #define ZM_DEBUG(x) x
@@ -308,18 +333,20 @@ zm_dump(int line)
/* Wait for the line to go idle */ /* Wait for the line to go idle */
static void static void
xyzModem_flush(void) xyzModem_flush (void)
{ {
int res; int res;
char c; char c;
while (true) { while (true)
res = CYGACC_COMM_IF_GETC_TIMEOUT(*xyz.__chan, &c); {
if (!res) return; res = CYGACC_COMM_IF_GETC_TIMEOUT (*xyz.__chan, &c);
if (!res)
return;
} }
} }
static int static int
xyzModem_get_hdr(void) xyzModem_get_hdr (void)
{ {
char c; char c;
int res; int res;
@@ -327,119 +354,150 @@ xyzModem_get_hdr(void)
int i, can_total, hdr_chars; int i, can_total, hdr_chars;
unsigned short cksum; unsigned short cksum;
ZM_DEBUG(zm_new()); ZM_DEBUG (zm_new ());
/* Find the start of a header */ /* Find the start of a header */
can_total = 0; can_total = 0;
hdr_chars = 0; hdr_chars = 0;
if (xyz.tx_ack) { if (xyz.tx_ack)
CYGACC_COMM_IF_PUTC(*xyz.__chan, ACK); {
CYGACC_COMM_IF_PUTC (*xyz.__chan, ACK);
xyz.tx_ack = false; xyz.tx_ack = false;
} }
while (!hdr_found) { while (!hdr_found)
res = CYGACC_COMM_IF_GETC_TIMEOUT(*xyz.__chan, &c); {
ZM_DEBUG(zm_save(c)); res = CYGACC_COMM_IF_GETC_TIMEOUT (*xyz.__chan, &c);
if (res) { ZM_DEBUG (zm_save (c));
if (res)
{
hdr_chars++; hdr_chars++;
switch (c) { switch (c)
{
case SOH: case SOH:
xyz.total_SOH++; xyz.total_SOH++;
case STX: case STX:
if (c == STX) xyz.total_STX++; if (c == STX)
xyz.total_STX++;
hdr_found = true; hdr_found = true;
break; break;
case CAN: case CAN:
xyz.total_CAN++; xyz.total_CAN++;
ZM_DEBUG(zm_dump(__LINE__)); ZM_DEBUG (zm_dump (__LINE__));
if (++can_total == xyzModem_CAN_COUNT) { if (++can_total == xyzModem_CAN_COUNT)
{
return xyzModem_cancel; return xyzModem_cancel;
} else { }
else
{
/* Wait for multiple CAN to avoid early quits */ /* Wait for multiple CAN to avoid early quits */
break; break;
} }
case EOT: case EOT:
/* EOT only supported if no noise */ /* EOT only supported if no noise */
if (hdr_chars == 1) { if (hdr_chars == 1)
CYGACC_COMM_IF_PUTC(*xyz.__chan, ACK); {
ZM_DEBUG(zm_dprintf("ACK on EOT #%d\n", __LINE__)); CYGACC_COMM_IF_PUTC (*xyz.__chan, ACK);
ZM_DEBUG(zm_dump(__LINE__)); ZM_DEBUG (zm_dprintf ("ACK on EOT #%d\n", __LINE__));
ZM_DEBUG (zm_dump (__LINE__));
return xyzModem_eof; return xyzModem_eof;
} }
default: default:
/* Ignore, waiting for start of header */ /* Ignore, waiting for start of header */
; ;
} }
} else { }
else
{
/* Data stream timed out */ /* Data stream timed out */
xyzModem_flush(); /* Toss any current input */ xyzModem_flush (); /* Toss any current input */
ZM_DEBUG(zm_dump(__LINE__)); ZM_DEBUG (zm_dump (__LINE__));
CYGACC_CALL_IF_DELAY_US((cyg_int32)250000); CYGACC_CALL_IF_DELAY_US ((cyg_int32) 250000);
return xyzModem_timeout; return xyzModem_timeout;
} }
} }
/* Header found, now read the data */ /* Header found, now read the data */
res = CYGACC_COMM_IF_GETC_TIMEOUT(*xyz.__chan, (char *)&xyz.blk); res = CYGACC_COMM_IF_GETC_TIMEOUT (*xyz.__chan, (char *) &xyz.blk);
ZM_DEBUG(zm_save(xyz.blk)); ZM_DEBUG (zm_save (xyz.blk));
if (!res) { if (!res)
ZM_DEBUG(zm_dump(__LINE__)); {
ZM_DEBUG (zm_dump (__LINE__));
return xyzModem_timeout; return xyzModem_timeout;
} }
res = CYGACC_COMM_IF_GETC_TIMEOUT(*xyz.__chan, (char *)&xyz.cblk); res = CYGACC_COMM_IF_GETC_TIMEOUT (*xyz.__chan, (char *) &xyz.cblk);
ZM_DEBUG(zm_save(xyz.cblk)); ZM_DEBUG (zm_save (xyz.cblk));
if (!res) { if (!res)
ZM_DEBUG(zm_dump(__LINE__)); {
ZM_DEBUG (zm_dump (__LINE__));
return xyzModem_timeout; return xyzModem_timeout;
} }
xyz.len = (c == SOH) ? 128 : 1024; xyz.len = (c == SOH) ? 128 : 1024;
xyz.bufp = xyz.pkt; xyz.bufp = xyz.pkt;
for (i = 0; i < xyz.len; i++) { for (i = 0; i < xyz.len; i++)
res = CYGACC_COMM_IF_GETC_TIMEOUT(*xyz.__chan, &c); {
ZM_DEBUG(zm_save(c)); res = CYGACC_COMM_IF_GETC_TIMEOUT (*xyz.__chan, &c);
if (res) { ZM_DEBUG (zm_save (c));
if (res)
{
xyz.pkt[i] = c; xyz.pkt[i] = c;
} else { }
ZM_DEBUG(zm_dump(__LINE__)); else
{
ZM_DEBUG (zm_dump (__LINE__));
return xyzModem_timeout; return xyzModem_timeout;
} }
} }
res = CYGACC_COMM_IF_GETC_TIMEOUT(*xyz.__chan, (char *)&xyz.crc1); res = CYGACC_COMM_IF_GETC_TIMEOUT (*xyz.__chan, (char *) &xyz.crc1);
ZM_DEBUG(zm_save(xyz.crc1)); ZM_DEBUG (zm_save (xyz.crc1));
if (!res) { if (!res)
ZM_DEBUG(zm_dump(__LINE__)); {
ZM_DEBUG (zm_dump (__LINE__));
return xyzModem_timeout; return xyzModem_timeout;
} }
if (xyz.crc_mode) { if (xyz.crc_mode)
res = CYGACC_COMM_IF_GETC_TIMEOUT(*xyz.__chan, (char *)&xyz.crc2); {
ZM_DEBUG(zm_save(xyz.crc2)); res = CYGACC_COMM_IF_GETC_TIMEOUT (*xyz.__chan, (char *) &xyz.crc2);
if (!res) { ZM_DEBUG (zm_save (xyz.crc2));
ZM_DEBUG(zm_dump(__LINE__)); if (!res)
{
ZM_DEBUG (zm_dump (__LINE__));
return xyzModem_timeout; return xyzModem_timeout;
} }
} }
ZM_DEBUG(zm_dump(__LINE__)); ZM_DEBUG (zm_dump (__LINE__));
/* Validate the message */ /* Validate the message */
if ((xyz.blk ^ xyz.cblk) != (unsigned char)0xFF) { if ((xyz.blk ^ xyz.cblk) != (unsigned char) 0xFF)
ZM_DEBUG(zm_dprintf("Framing error - blk: %x/%x/%x\n", xyz.blk, xyz.cblk, (xyz.blk ^ xyz.cblk))); {
ZM_DEBUG(zm_dump_buf(xyz.pkt, xyz.len)); ZM_DEBUG (zm_dprintf
xyzModem_flush(); ("Framing error - blk: %x/%x/%x\n", xyz.blk, xyz.cblk,
(xyz.blk ^ xyz.cblk)));
ZM_DEBUG (zm_dump_buf (xyz.pkt, xyz.len));
xyzModem_flush ();
return xyzModem_frame; return xyzModem_frame;
} }
/* Verify checksum/CRC */ /* Verify checksum/CRC */
if (xyz.crc_mode) { if (xyz.crc_mode)
cksum = cyg_crc16(xyz.pkt, xyz.len); {
if (cksum != ((xyz.crc1 << 8) | xyz.crc2)) { cksum = cyg_crc16 (xyz.pkt, xyz.len);
ZM_DEBUG(zm_dprintf("CRC error - recvd: %02x%02x, computed: %x\n", if (cksum != ((xyz.crc1 << 8) | xyz.crc2))
{
ZM_DEBUG (zm_dprintf ("CRC error - recvd: %02x%02x, computed: %x\n",
xyz.crc1, xyz.crc2, cksum & 0xFFFF)); xyz.crc1, xyz.crc2, cksum & 0xFFFF));
return xyzModem_cksum; return xyzModem_cksum;
} }
} else { }
else
{
cksum = 0; cksum = 0;
for (i = 0; i < xyz.len; i++) { for (i = 0; i < xyz.len; i++)
{
cksum += xyz.pkt[i]; cksum += xyz.pkt[i];
} }
if (xyz.crc1 != (cksum & 0xFF)) { if (xyz.crc1 != (cksum & 0xFF))
ZM_DEBUG(zm_dprintf("Checksum error - recvd: %x, computed: %x\n", xyz.crc1, cksum & 0xFF)); {
ZM_DEBUG (zm_dprintf
("Checksum error - recvd: %x, computed: %x\n", xyz.crc1,
cksum & 0xFF));
return xyzModem_cksum; return xyzModem_cksum;
} }
} }
@@ -448,7 +506,7 @@ xyzModem_get_hdr(void)
} }
int int
xyzModem_stream_open(connection_info_t *info, int *err) xyzModem_stream_open (connection_info_t * info, int *err)
{ {
#ifdef REDBOOT #ifdef REDBOOT
int console_chan; int console_chan;
@@ -459,7 +517,8 @@ xyzModem_stream_open(connection_info_t *info, int *err)
/* ZM_DEBUG(zm_out = zm_out_start); */ /* ZM_DEBUG(zm_out = zm_out_start); */
#ifdef xyzModem_zmodem #ifdef xyzModem_zmodem
if (info->mode == xyzModem_zmodem) { if (info->mode == xyzModem_zmodem)
{
*err = xyzModem_noZmodem; *err = xyzModem_noZmodem;
return -1; return -1;
} }
@@ -467,20 +526,26 @@ xyzModem_stream_open(connection_info_t *info, int *err)
#ifdef REDBOOT #ifdef REDBOOT
/* Set up the I/O channel. Note: this allows for using a different port in the future */ /* Set up the I/O channel. Note: this allows for using a different port in the future */
console_chan = CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT); console_chan =
if (info->chan >= 0) { CYGACC_CALL_IF_SET_CONSOLE_COMM
CYGACC_CALL_IF_SET_CONSOLE_COMM(info->chan); (CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
} else { if (info->chan >= 0)
CYGACC_CALL_IF_SET_CONSOLE_COMM(console_chan); {
CYGACC_CALL_IF_SET_CONSOLE_COMM (info->chan);
} }
xyz.__chan = CYGACC_CALL_IF_CONSOLE_PROCS(); else
{
CYGACC_CALL_IF_SET_CONSOLE_COMM (console_chan);
}
xyz.__chan = CYGACC_CALL_IF_CONSOLE_PROCS ();
CYGACC_CALL_IF_SET_CONSOLE_COMM(console_chan); CYGACC_CALL_IF_SET_CONSOLE_COMM (console_chan);
CYGACC_COMM_IF_CONTROL(*xyz.__chan, __COMMCTL_SET_TIMEOUT, xyzModem_CHAR_TIMEOUT); CYGACC_COMM_IF_CONTROL (*xyz.__chan, __COMMCTL_SET_TIMEOUT,
xyzModem_CHAR_TIMEOUT);
#else #else
/* TODO: CHECK ! */ /* TODO: CHECK ! */
int dummy; int dummy;
xyz.__chan=&dummy; xyz.__chan = &dummy;
#endif #endif
xyz.len = 0; xyz.len = 0;
xyz.crc_mode = true; xyz.crc_mode = true;
@@ -496,24 +561,28 @@ xyzModem_stream_open(connection_info_t *info, int *err)
xyz.file_length = 0; xyz.file_length = 0;
#endif #endif
CYGACC_COMM_IF_PUTC(*xyz.__chan, (xyz.crc_mode ? 'C' : NAK)); CYGACC_COMM_IF_PUTC (*xyz.__chan, (xyz.crc_mode ? 'C' : NAK));
if (xyz.mode == xyzModem_xmodem) { if (xyz.mode == xyzModem_xmodem)
{
/* X-modem doesn't have an information header - exit here */ /* X-modem doesn't have an information header - exit here */
xyz.next_blk = 1; xyz.next_blk = 1;
return 0; return 0;
} }
while (retries-- > 0) { while (retries-- > 0)
stat = xyzModem_get_hdr(); {
if (stat == 0) { stat = xyzModem_get_hdr ();
if (stat == 0)
{
/* Y-modem file information header */ /* Y-modem file information header */
if (xyz.blk == 0) { if (xyz.blk == 0)
{
#ifdef USE_YMODEM_LENGTH #ifdef USE_YMODEM_LENGTH
/* skip filename */ /* skip filename */
while (*xyz.bufp++); while (*xyz.bufp++);
/* get the length */ /* get the length */
parse_num((char *)xyz.bufp, &xyz.file_length, NULL, " "); parse_num ((char *) xyz.bufp, &xyz.file_length, NULL, " ");
#endif #endif
/* The rest of the file name data block quietly discarded */ /* The rest of the file name data block quietly discarded */
xyz.tx_ack = true; xyz.tx_ack = true;
@@ -521,25 +590,28 @@ xyzModem_stream_open(connection_info_t *info, int *err)
xyz.next_blk = 1; xyz.next_blk = 1;
xyz.len = 0; xyz.len = 0;
return 0; return 0;
} else
if (stat == xyzModem_timeout) {
if (--crc_retries <= 0) xyz.crc_mode = false;
CYGACC_CALL_IF_DELAY_US(5*100000); /* Extra delay for startup */
CYGACC_COMM_IF_PUTC(*xyz.__chan, (xyz.crc_mode ? 'C' : NAK));
xyz.total_retries++;
ZM_DEBUG(zm_dprintf("NAK (%d)\n", __LINE__));
} }
if (stat == xyzModem_cancel) { else if (stat == xyzModem_timeout)
{
if (--crc_retries <= 0)
xyz.crc_mode = false;
CYGACC_CALL_IF_DELAY_US (5 * 100000); /* Extra delay for startup */
CYGACC_COMM_IF_PUTC (*xyz.__chan, (xyz.crc_mode ? 'C' : NAK));
xyz.total_retries++;
ZM_DEBUG (zm_dprintf ("NAK (%d)\n", __LINE__));
}
if (stat == xyzModem_cancel)
{
break; break;
} }
} }
*err = stat; *err = stat;
ZM_DEBUG(zm_flush()); ZM_DEBUG (zm_flush ());
return -1; return -1;
} }
int int
xyzModem_stream_read(char *buf, int size, int *err) xyzModem_stream_read (char *buf, int size, int *err)
{ {
int stat, total, len; int stat, total, len;
int retries; int retries;
@@ -547,28 +619,39 @@ xyzModem_stream_read(char *buf, int size, int *err)
total = 0; total = 0;
stat = xyzModem_cancel; stat = xyzModem_cancel;
/* Try and get 'size' bytes into the buffer */ /* Try and get 'size' bytes into the buffer */
while (!xyz.at_eof && (size > 0)) { while (!xyz.at_eof && (size > 0))
if (xyz.len == 0) { {
if (xyz.len == 0)
{
retries = xyzModem_MAX_RETRIES; retries = xyzModem_MAX_RETRIES;
while (retries-- > 0) { while (retries-- > 0)
stat = xyzModem_get_hdr(); {
if (stat == 0) { stat = xyzModem_get_hdr ();
if (xyz.blk == xyz.next_blk) { if (stat == 0)
{
if (xyz.blk == xyz.next_blk)
{
xyz.tx_ack = true; xyz.tx_ack = true;
ZM_DEBUG(zm_dprintf("ACK block %d (%d)\n", xyz.blk, __LINE__)); ZM_DEBUG (zm_dprintf
("ACK block %d (%d)\n", xyz.blk, __LINE__));
xyz.next_blk = (xyz.next_blk + 1) & 0xFF; xyz.next_blk = (xyz.next_blk + 1) & 0xFF;
#if defined(xyzModem_zmodem) || defined(USE_YMODEM_LENGTH) #if defined(xyzModem_zmodem) || defined(USE_YMODEM_LENGTH)
if (xyz.mode == xyzModem_xmodem || xyz.file_length == 0) { if (xyz.mode == xyzModem_xmodem || xyz.file_length == 0)
{
#else #else
if (1) { if (1)
{
#endif #endif
/* Data blocks can be padded with ^Z (EOF) characters */ /* Data blocks can be padded with ^Z (EOF) characters */
/* This code tries to detect and remove them */ /* This code tries to detect and remove them */
if ((xyz.bufp[xyz.len-1] == EOF) && if ((xyz.bufp[xyz.len - 1] == EOF) &&
(xyz.bufp[xyz.len-2] == EOF) && (xyz.bufp[xyz.len - 2] == EOF) &&
(xyz.bufp[xyz.len-3] == EOF)) { (xyz.bufp[xyz.len - 3] == EOF))
while (xyz.len && (xyz.bufp[xyz.len-1] == EOF)) { {
while (xyz.len
&& (xyz.bufp[xyz.len - 1] == EOF))
{
xyz.len--; xyz.len--;
} }
} }
@@ -581,54 +664,67 @@ xyzModem_stream_read(char *buf, int size, int *err)
* Only do this for Y-modem (and Z-modem should it ever * Only do this for Y-modem (and Z-modem should it ever
* be supported since it can fall back to Y-modem mode). * be supported since it can fall back to Y-modem mode).
*/ */
if (xyz.mode != xyzModem_xmodem && 0 != xyz.file_length) { if (xyz.mode != xyzModem_xmodem && 0 != xyz.file_length)
{
xyz.read_length += xyz.len; xyz.read_length += xyz.len;
if (xyz.read_length > xyz.file_length) { if (xyz.read_length > xyz.file_length)
{
xyz.len -= (xyz.read_length - xyz.file_length); xyz.len -= (xyz.read_length - xyz.file_length);
} }
} }
#endif #endif
break; break;
} else if (xyz.blk == ((xyz.next_blk - 1) & 0xFF)) { }
else if (xyz.blk == ((xyz.next_blk - 1) & 0xFF))
{
/* Just re-ACK this so sender will get on with it */ /* Just re-ACK this so sender will get on with it */
CYGACC_COMM_IF_PUTC(*xyz.__chan, ACK); CYGACC_COMM_IF_PUTC (*xyz.__chan, ACK);
continue; /* Need new header */ continue; /* Need new header */
} else { }
else
{
stat = xyzModem_sequence; stat = xyzModem_sequence;
} }
} }
if (stat == xyzModem_cancel) { if (stat == xyzModem_cancel)
{
break; break;
} }
if (stat == xyzModem_eof) { if (stat == xyzModem_eof)
CYGACC_COMM_IF_PUTC(*xyz.__chan, ACK); {
ZM_DEBUG(zm_dprintf("ACK (%d)\n", __LINE__)); CYGACC_COMM_IF_PUTC (*xyz.__chan, ACK);
if (xyz.mode == xyzModem_ymodem) { ZM_DEBUG (zm_dprintf ("ACK (%d)\n", __LINE__));
CYGACC_COMM_IF_PUTC(*xyz.__chan, (xyz.crc_mode ? 'C' : NAK)); if (xyz.mode == xyzModem_ymodem)
{
CYGACC_COMM_IF_PUTC (*xyz.__chan,
(xyz.crc_mode ? 'C' : NAK));
xyz.total_retries++; xyz.total_retries++;
ZM_DEBUG(zm_dprintf("Reading Final Header\n")); ZM_DEBUG (zm_dprintf ("Reading Final Header\n"));
stat = xyzModem_get_hdr(); stat = xyzModem_get_hdr ();
CYGACC_COMM_IF_PUTC(*xyz.__chan, ACK); CYGACC_COMM_IF_PUTC (*xyz.__chan, ACK);
ZM_DEBUG(zm_dprintf("FINAL ACK (%d)\n", __LINE__)); ZM_DEBUG (zm_dprintf ("FINAL ACK (%d)\n", __LINE__));
} }
xyz.at_eof = true; xyz.at_eof = true;
break; break;
} }
CYGACC_COMM_IF_PUTC(*xyz.__chan, (xyz.crc_mode ? 'C' : NAK)); CYGACC_COMM_IF_PUTC (*xyz.__chan, (xyz.crc_mode ? 'C' : NAK));
xyz.total_retries++; xyz.total_retries++;
ZM_DEBUG(zm_dprintf("NAK (%d)\n", __LINE__)); ZM_DEBUG (zm_dprintf ("NAK (%d)\n", __LINE__));
} }
if (stat < 0) { if (stat < 0)
{
*err = stat; *err = stat;
xyz.len = -1; xyz.len = -1;
return total; return total;
} }
} }
/* Don't "read" data from the EOF protocol package */ /* Don't "read" data from the EOF protocol package */
if (!xyz.at_eof) { if (!xyz.at_eof)
{
len = xyz.len; len = xyz.len;
if (size < len) len = size; if (size < len)
memcpy(buf, xyz.bufp, len); len = size;
memcpy (buf, xyz.bufp, len);
size -= len; size -= len;
buf += len; buf += len;
total += len; total += len;
@@ -640,39 +736,42 @@ xyzModem_stream_read(char *buf, int size, int *err)
} }
void void
xyzModem_stream_close(int *err) xyzModem_stream_close (int *err)
{ {
diag_printf("xyzModem - %s mode, %d(SOH)/%d(STX)/%d(CAN) packets, %d retries\n", diag_printf
xyz.crc_mode ? "CRC" : "Cksum", ("xyzModem - %s mode, %d(SOH)/%d(STX)/%d(CAN) packets, %d retries\n",
xyz.total_SOH, xyz.total_STX, xyz.total_CAN, xyz.crc_mode ? "CRC" : "Cksum", xyz.total_SOH, xyz.total_STX,
xyz.total_retries); xyz.total_CAN, xyz.total_retries);
ZM_DEBUG(zm_flush()); ZM_DEBUG (zm_flush ());
} }
/* Need to be able to clean out the input buffer, so have to take the */ /* Need to be able to clean out the input buffer, so have to take the */
/* getc */ /* getc */
void xyzModem_stream_terminate(bool abort, int (*getc)(void)) void
xyzModem_stream_terminate (bool abort, int (*getc) (void))
{ {
int c; int c;
if (abort) { if (abort)
ZM_DEBUG(zm_dprintf("!!!! TRANSFER ABORT !!!!\n")); {
switch (xyz.mode) { ZM_DEBUG (zm_dprintf ("!!!! TRANSFER ABORT !!!!\n"));
switch (xyz.mode)
{
case xyzModem_xmodem: case xyzModem_xmodem:
case xyzModem_ymodem: case xyzModem_ymodem:
/* The X/YMODEM Spec seems to suggest that multiple CAN followed by an equal */ /* The X/YMODEM Spec seems to suggest that multiple CAN followed by an equal */
/* number of Backspaces is a friendly way to get the other end to abort. */ /* number of Backspaces is a friendly way to get the other end to abort. */
CYGACC_COMM_IF_PUTC(*xyz.__chan,CAN); CYGACC_COMM_IF_PUTC (*xyz.__chan, CAN);
CYGACC_COMM_IF_PUTC(*xyz.__chan,CAN); CYGACC_COMM_IF_PUTC (*xyz.__chan, CAN);
CYGACC_COMM_IF_PUTC(*xyz.__chan,CAN); CYGACC_COMM_IF_PUTC (*xyz.__chan, CAN);
CYGACC_COMM_IF_PUTC(*xyz.__chan,CAN); CYGACC_COMM_IF_PUTC (*xyz.__chan, CAN);
CYGACC_COMM_IF_PUTC(*xyz.__chan,BSP); CYGACC_COMM_IF_PUTC (*xyz.__chan, BSP);
CYGACC_COMM_IF_PUTC(*xyz.__chan,BSP); CYGACC_COMM_IF_PUTC (*xyz.__chan, BSP);
CYGACC_COMM_IF_PUTC(*xyz.__chan,BSP); CYGACC_COMM_IF_PUTC (*xyz.__chan, BSP);
CYGACC_COMM_IF_PUTC(*xyz.__chan,BSP); CYGACC_COMM_IF_PUTC (*xyz.__chan, BSP);
/* Now consume the rest of what's waiting on the line. */ /* Now consume the rest of what's waiting on the line. */
ZM_DEBUG(zm_dprintf("Flushing serial line.\n")); ZM_DEBUG (zm_dprintf ("Flushing serial line.\n"));
xyzModem_flush(); xyzModem_flush ();
xyz.at_eof = true; xyz.at_eof = true;
break; break;
#ifdef xyzModem_zmodem #ifdef xyzModem_zmodem
@@ -681,30 +780,33 @@ void xyzModem_stream_terminate(bool abort, int (*getc)(void))
#endif #endif
break; break;
} }
} else { }
ZM_DEBUG(zm_dprintf("Engaging cleanup mode...\n")); else
{
ZM_DEBUG (zm_dprintf ("Engaging cleanup mode...\n"));
/* /*
* Consume any trailing crap left in the inbuffer from * Consume any trailing crap left in the inbuffer from
* previous recieved blocks. Since very few files are an exact multiple * previous recieved blocks. Since very few files are an exact multiple
* of the transfer block size, there will almost always be some gunk here. * of the transfer block size, there will almost always be some gunk here.
* If we don't eat it now, RedBoot will think the user typed it. * If we don't eat it now, RedBoot will think the user typed it.
*/ */
ZM_DEBUG(zm_dprintf("Trailing gunk:\n")); ZM_DEBUG (zm_dprintf ("Trailing gunk:\n"));
while ((c = (*getc)()) > -1) ; while ((c = (*getc) ()) > -1);
ZM_DEBUG(zm_dprintf("\n")); ZM_DEBUG (zm_dprintf ("\n"));
/* /*
* Make a small delay to give terminal programs like minicom * Make a small delay to give terminal programs like minicom
* time to get control again after their file transfer program * time to get control again after their file transfer program
* exits. * exits.
*/ */
CYGACC_CALL_IF_DELAY_US((cyg_int32)250000); CYGACC_CALL_IF_DELAY_US ((cyg_int32) 250000);
} }
} }
char * char *
xyzModem_error(int err) xyzModem_error (int err)
{ {
switch (err) { switch (err)
{
case xyzModem_access: case xyzModem_access:
return "Can't access file"; return "Can't access file";
break; break;
@@ -739,8 +841,9 @@ xyzModem_error(int err)
* RedBoot interface * RedBoot interface
*/ */
#if 0 /* SB */ #if 0 /* SB */
GETC_IO_FUNCS(xyzModem_io, xyzModem_stream_open, xyzModem_stream_close, GETC_IO_FUNCS (xyzModem_io, xyzModem_stream_open, xyzModem_stream_close,
xyzModem_stream_terminate, xyzModem_stream_read, xyzModem_error); xyzModem_stream_terminate, xyzModem_stream_read,
RedBoot_load(xmodem, xyzModem_io, false, false, xyzModem_xmodem); xyzModem_error);
RedBoot_load(ymodem, xyzModem_io, false, false, xyzModem_ymodem); RedBoot_load (xmodem, xyzModem_io, false, false, xyzModem_xmodem);
RedBoot_load (ymodem, xyzModem_io, false, false, xyzModem_ymodem);
#endif #endif