GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compile warnings in common/xyzModem.c

Browse source 
Patch by Stefan Roese, 10 May 2006
This commit is contained in:
Stefan Roese 2006-05-10 15:01:40 +02:00
parent 512f8d5d78
commit f90a39213e
2 changed files with 12 additions and 6 deletions
Show stats 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:
====================================================================== ======================================================================
* Fix compile warnings in common/xyzModem.c
Patch by Stefan Roese, 10 May 2006
* Add support for AMCC 440EP Rev C and 440GR Rev B * Add support for AMCC 440EP Rev C and 440GR Rev B
Patch by John Otken, 08 May 2006 Patch by John Otken, 08 May 2006

15
common/xyzModem.c
View file

@ -379,13 +379,13 @@ xyzModem_get_hdr(void)
} }
/* Header found, now read the data */ /* Header found, now read the data */
res = CYGACC_COMM_IF_GETC_TIMEOUT(*xyz.__chan, &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, &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__));
@ -403,14 +403,14 @@ xyzModem_get_hdr(void)
return xyzModem_timeout; return xyzModem_timeout;
} }
} }
res = CYGACC_COMM_IF_GETC_TIMEOUT(*xyz.__chan, &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, &xyz.crc2); res = CYGACC_COMM_IF_GETC_TIMEOUT(*xyz.__chan, (char *)&xyz.crc2);
ZM_DEBUG(zm_save(xyz.crc2)); ZM_DEBUG(zm_save(xyz.crc2));
if (!res) { if (!res) {
ZM_DEBUG(zm_dump(__LINE__)); ZM_DEBUG(zm_dump(__LINE__));
@ -450,7 +450,10 @@ xyzModem_get_hdr(void)
int int
xyzModem_stream_open(connection_info_t *info, int *err) xyzModem_stream_open(connection_info_t *info, int *err)
{ {
int console_chan, stat=0; #ifdef REDBOOT
int console_chan;
#endif
int stat = 0;
int retries = xyzModem_MAX_RETRIES; int retries = xyzModem_MAX_RETRIES;
int crc_retries = xyzModem_MAX_RETRIES_WITH_CRC; int crc_retries = xyzModem_MAX_RETRIES_WITH_CRC;
@ -510,7 +513,7 @@ xyzModem_stream_open(connection_info_t *info, int *err)
/* skip filename */ /* skip filename */
while (*xyz.bufp++); while (*xyz.bufp++);
/* get the length */ /* get the length */
parse_num(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;