Mercurial > flash_v2

changeset 1246:55fbbf4dffb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up warnings
author gthomas
date Fri, 26 Sep 2003 10:35:43 +0000
parents 844ff6aec80b
children 20067ba8b7d9
files packages/redboot/current/ChangeLog packages/redboot/current/src/fs/ide.c packages/redboot/current/src/net/bootp.c
diffstat 3 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-26  Gary Thomas  <gary@mlbassoc.com>
+
+	* src/net/bootp.c: 
+	* src/fs/ide.c: Clean up some compiler warnings.
+
 2003-09-25  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/net/bootp.c: Rework DHCP process to handle really stubborn
--- a/packages/redboot/current/src/fs/ide.c
+++ b/packages/redboot/current/src/fs/ide.c
@@ -207,7 +207,7 @@ send_packet_command(int ctlr, int dev, c
           HAL_IDE_READ_UINT8(ctlr, IDE_REG_LBAMID, tmp); \
           (x) = tmp;                                     \
           HAL_IDE_READ_UINT8(ctlr, IDE_REG_LBAHI, tmp);  \
-          (x) = cdcount |= (tmp << 8);                   \
+          (x) = (x) | (tmp << 8);                        \
         }
 
 
--- a/packages/redboot/current/src/net/bootp.c
+++ b/packages/redboot/current/src/net/bootp.c
@@ -241,6 +241,9 @@ int
             memset(&b.bp_yiaddr, 0x00, 4);
             memset(&b.bp_siaddr, 0x00, 4);
             break;
+        case DHCP_ACK:
+            // Ignore these states (they won't happen)
+            break;
         }
      
         // Some servers insist on a minimum amount of "vendor" data