projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
imx: Add support for the SabreSD shipped with i.MX6DL
[oweals/u-boot.git]
/
net
/
sntp.c
diff --git
a/net/sntp.c
b/net/sntp.c
index 95e75422c107dcdbd9eb8f25f021c0d21ba77e4a..5de19526e6394b213cd2204d594026d6201a5175 100644
(file)
--- a/
net/sntp.c
+++ b/
net/sntp.c
@@
-12,81
+12,81
@@
#include "sntp.h"
#include "sntp.h"
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_SNTP)
-
-#define SNTP_TIMEOUT 10
+#define SNTP_TIMEOUT 10000UL
static int SntpOurPort;
static void
static int SntpOurPort;
static void
-SntpSend
(void)
+SntpSend(void)
{
struct sntp_pkt_t pkt;
int pktlen = SNTP_PACKET_LEN;
int sport;
{
struct sntp_pkt_t pkt;
int pktlen = SNTP_PACKET_LEN;
int sport;
- debug
("%s\n", __FUNCTION
__);
+ debug
("%s\n", __func
__);
- memset
(&pkt, 0, sizeof(pkt));
+ memset(&pkt, 0, sizeof(pkt));
pkt.li = NTP_LI_NOLEAP;
pkt.vn = NTP_VERSION;
pkt.mode = NTP_MODE_CLIENT;
pkt.li = NTP_LI_NOLEAP;
pkt.vn = NTP_VERSION;
pkt.mode = NTP_MODE_CLIENT;
- memcpy ((char *)NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE, (char *)&pkt, pktlen);
+ memcpy((char *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE,
+ (char *)&pkt, pktlen);
SntpOurPort = 10000 + (get_timer(0) % 4096);
sport = NTP_SERVICE_PORT;
SntpOurPort = 10000 + (get_timer(0) % 4096);
sport = NTP_SERVICE_PORT;
- NetSendUDPPacket (NetServerEther, NetNtpServerIP, sport, SntpOurPort, pktlen);
+ NetSendUDPPacket(NetServerEther, NetNtpServerIP, sport, SntpOurPort,
+ pktlen);
}
static void
}
static void
-SntpTimeout
(void)
+SntpTimeout(void)
{
{
- puts
("Timeout\n");
-
NetState = NETLOOP_FAIL
;
+ puts("Timeout\n");
+
net_set_state(NETLOOP_FAIL)
;
return;
}
static void
return;
}
static void
-SntpHandler (uchar *pkt, unsigned dest, unsigned src, unsigned len)
+SntpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
+ unsigned len)
{
struct sntp_pkt_t *rpktp = (struct sntp_pkt_t *)pkt;
struct rtc_time tm;
ulong seconds;
{
struct sntp_pkt_t *rpktp = (struct sntp_pkt_t *)pkt;
struct rtc_time tm;
ulong seconds;
- debug
("%s\n", __FUNCTION
__);
+ debug
("%s\n", __func
__);
- if (dest != SntpOurPort) return;
+ if (dest != SntpOurPort)
+ return;
/*
* As the RTC's used in U-Boot sepport second resolution only
* we simply ignore the sub-second field.
*/
/*
* 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));
+ memcpy(&seconds, &rpktp->transmit_timestamp, sizeof(ulong));
to_tm(ntohl(seconds) - 2208988800UL + NetTimeOffset, &tm);
#if defined(CONFIG_CMD_DATE)
to_tm(ntohl(seconds) - 2208988800UL + NetTimeOffset, &tm);
#if defined(CONFIG_CMD_DATE)
- rtc_set
(&tm);
+ rtc_set(&tm);
#endif
#endif
- printf
("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
+ 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);
tm.tm_year, tm.tm_mon, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
-
NetState = NETLOOP_SUCCESS
;
+
net_set_state(NETLOOP_SUCCESS)
;
}
void
}
void
-SntpStart
(void)
+SntpStart(void)
{
{
- debug
("%s\n", __FUNCTION
__);
+ debug
("%s\n", __func
__);
- NetSetTimeout
(SNTP_TIMEOUT * CFG_HZ
, SntpTimeout);
-
NetSetH
andler(SntpHandler);
- memset
(NetServerEther, 0, 6
);
+ NetSetTimeout
(SNTP_TIMEOUT
, SntpTimeout);
+
net_set_udp_h
andler(SntpHandler);
+ memset
(NetServerEther, 0, sizeof(NetServerEther)
);
- SntpSend
();
+ SntpSend();
}
}
-
-#endif