From 414eec35e3832f4f9ce8a25ace7ead638be1f76f Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sat, 2 Apr 2005 22:37:54 +0000
Subject: Fix problems with SNTP support; enable SNTP support in some boards.

---
 net/bootp.c |  4 ++--
 net/sntp.c  | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'net')

diff --git a/net/bootp.c b/net/bootp.c
index ee0982e60a..b907351f25 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -726,7 +726,7 @@ static void DhcpOptionsProcess (uchar * popt)
 		case 1:
 			NetCopyIP (&NetOurSubnetMask, (popt + 2));
 			break;
-#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET)
+#if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET)
 		case 2:		/* Time offset	*/
 			NetCopyLong (&NetTimeOffset, (ulong *) (popt + 2));
 			NetTimeOffset = ntohl (NetTimeOffset);
@@ -755,7 +755,7 @@ static void DhcpOptionsProcess (uchar * popt)
 			memcpy (&NetOurRootPath, popt + 2, size);
 			NetOurRootPath[size] = 0;
 			break;
-#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_NTPSERVER)
+#if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_NTPSERVER)
 		case 42:	/* NTP server IP */
 			NetCopyIP (&NetNtpServerIP, (popt + 2));
 			break;
diff --git a/net/sntp.c b/net/sntp.c
index 9e11eb4962..db8c2c2799 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -52,28 +52,27 @@ SntpTimeout (void)
 static void
 SntpHandler (uchar *pkt, unsigned dest, unsigned src, unsigned len)
 {
-	struct sntp_pkt_t rpkt;
+	struct sntp_pkt_t *rpktp = (struct sntp_pkt_t *)pkt;
 	struct rtc_time tm;
+	ulong seconds;
 
 	debug ("%s\n", __FUNCTION__);
 
 	if (dest != SntpOurPort) return;
 
-	memcpy ((unsigned char *)&rpkt, pkt, len);
+	/*
+	 * As the RTC's used in U-Boot sepport second resolution only
+	 * we simply ignore the sub-second field.
+	 */
+	memcpy (&seconds, &rpktp->transmit_timestamp, sizeof(ulong));
 
-#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
-to_tm(ntohl(rpkt.transmit_timestamp), &tm);
-printf ("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
-tm.tm_year, tm.tm_mon, tm.tm_mday,
-tm.tm_hour, tm.tm_min, tm.tm_sec);
-	to_tm(ntohl(rpkt.transmit_timestamp) - 2208988800u + NetTimeOffset, &tm);
+	to_tm(ntohl(seconds) - 2208988800UL + NetTimeOffset, &tm);
 #if (CONFIG_COMMANDS & CFG_CMD_DATE)
 	rtc_set (&tm);
 #endif
 	printf ("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
 		tm.tm_year, tm.tm_mon, tm.tm_mday,
 		tm.tm_hour, tm.tm_min, tm.tm_sec);
-#endif
 
 	NetState = NETLOOP_SUCCESS;
 }
-- 
cgit v1.2.1