This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
RedBoot - fix compiler warnings
- From: Gary Thomas <gary at mlbassoc dot com>
- To: eCos patches <ecos-patches at sources dot redhat dot com>
- Date: 26 Sep 2003 04:36:14 -0600
- Subject: RedBoot - fix compiler warnings
- Organization: MLB Associates
Just tidying up
--
Gary Thomas <gary@mlbassoc.com>
MLB Associates
Index: redboot/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.137
diff -u -5 -p -r1.137 ChangeLog
--- redboot/current/ChangeLog 25 Sep 2003 23:49:56 -0000 1.137
+++ redboot/current/ChangeLog 26 Sep 2003 10:35:08 -0000
@@ -1,5 +1,10 @@
+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
servers.
Index: redboot/current/src/fs/ide.c
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/redboot/current/src/fs/ide.c,v
retrieving revision 1.8
diff -u -5 -p -r1.8 ide.c
--- redboot/current/src/fs/ide.c 20 Sep 2003 19:22:19 -0000 1.8
+++ redboot/current/src/fs/ide.c 26 Sep 2003 10:31:16 -0000
@@ -205,11 +205,11 @@ send_packet_command(int ctlr, int dev, c
#define READ_COUNT(x) \
{ unsigned char tmp; \
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); \
}
// Read the sense data
static int
Index: redboot/current/src/net/bootp.c
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/redboot/current/src/net/bootp.c,v
retrieving revision 1.17
diff -u -5 -p -r1.17 bootp.c
--- redboot/current/src/net/bootp.c 25 Sep 2003 23:49:57 -0000 1.17
+++ redboot/current/src/net/bootp.c 26 Sep 2003 10:28:58 -0000
@@ -239,10 +239,13 @@ __bootp_find_local_ip(bootp_header_t *in
memset(&b.bp_yiaddr, 0xFF, 4);
memset(&b.bp_siaddr, 0xFF, 4);
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
if (p < &b.bp_vend[BP_MIN_VEND_SIZE]) p = &b.bp_vend[BP_MIN_VEND_SIZE];
txSize = p - (unsigned char*)&b;