# HG changeset patch
# User gthomas
# Date 1064572543 0
# Node ID 55fbbf4dffb254ba1f35b6560097c9dfa32cd5fb
# Parent  844ff6aec80b27749f92e09d7e7916db1efacb79
Clean up warnings

diff --git a/packages/redboot/current/ChangeLog b/packages/redboot/current/ChangeLog
--- 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
diff --git a/packages/redboot/current/src/fs/ide.c b/packages/redboot/current/src/fs/ide.c
--- 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);                        \
         }
 
 
diff --git a/packages/redboot/current/src/net/bootp.c b/packages/redboot/current/src/net/bootp.c
--- 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