Fix compile warnings in common/xyzModem.c

Patch by Stefan Roese, 10 May 2006

2 files changed, 12 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 46b80dd..e4f4f00 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 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
   Patch by John Otken, 08 May 2006
 
diff --git a/common/xyzModem.c b/common/xyzModem.c
index 4a137bf..9b455a3 100644
--- a/common/xyzModem.c
+++ b/common/xyzModem.c
@@ -379,13 +379,13 @@ xyzModem_get_hdr(void)
     }
 
     /* 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));
     if (!res) {
         ZM_DEBUG(zm_dump(__LINE__));
         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));
     if (!res) {
         ZM_DEBUG(zm_dump(__LINE__));
@@ -403,14 +403,14 @@ xyzModem_get_hdr(void)
             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));
     if (!res) {
         ZM_DEBUG(zm_dump(__LINE__));
         return xyzModem_timeout;
     }
     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));
         if (!res) {
             ZM_DEBUG(zm_dump(__LINE__));
@@ -450,7 +450,10 @@ xyzModem_get_hdr(void)
 int
 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 crc_retries = xyzModem_MAX_RETRIES_WITH_CRC;
 
@@ -510,7 +513,7 @@ xyzModem_stream_open(connection_info_t *info, int *err)
                 /* skip filename */
                 while (*xyz.bufp++);
                 /* get the length */
-                parse_num(xyz.bufp, &xyz.file_length, NULL, " ");
+                parse_num((char *)xyz.bufp, &xyz.file_length, NULL, " ");
 #endif
                 /* The rest of the file name data block quietly discarded */
                 xyz.tx_ack = true;