#include <common.h>
#include <command.h>
+#include <dm.h>
+#include <log.h>
#include <net.h>
#include <rtc.h>
-#include "sntp.h"
+#include <net/sntp.h>
-#if (defined(CONFIG_CMD_NET) \
- && defined(CONFIG_CMD_SNTP)
+#define SNTP_TIMEOUT 10000UL
-#define SNTP_TIMEOUT 10
+static int sntp_our_port;
-static int SntpOurPort;
+/* NTP server IP address */
+struct in_addr net_ntp_server;
+/* offset time from UTC */
+int net_ntp_time_offset;
-static void
-SntpSend (void)
+static void sntp_send(void)
{
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;
- memcpy ((char *)NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE, (char *)&pkt, pktlen);
+ memcpy((char *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE,
+ (char *)&pkt, pktlen);
- SntpOurPort = 10000 + (get_timer(0) % 4096);
+ sntp_our_port = 10000 + (get_timer(0) % 4096);
sport = NTP_SERVICE_PORT;
- NetSendUDPPacket (NetServerEther, NetNtpServerIP, sport, SntpOurPort, pktlen);
+ net_send_udp_packet(net_server_ethaddr, net_ntp_server, sport,
+ sntp_our_port, pktlen);
}
-static void
-SntpTimeout (void)
+static void sntp_timeout_handler(void)
{
- puts ("Timeout\n");
- NetState = NETLOOP_FAIL;
+ puts("Timeout\n");
+ net_set_state(NETLOOP_FAIL);
return;
}
-static void
-SntpHandler (uchar *pkt, unsigned dest, unsigned src, unsigned len)
+static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
+ unsigned src, unsigned len)
{
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 != sntp_our_port)
+ return;
/*
- * As the RTC's used in U-Boot sepport second resolution only
+ * As the RTC's used in U-Boot support second resolution only
* we simply ignore the sub-second field.
*/
- memcpy (&seconds, &rpktp->transmit_timestamp, sizeof(ulong));
-
- to_tm(ntohl(seconds) - 2208988800UL + NetTimeOffset, &tm);
-#if defined(CONFIG_CMD_DATE)
- rtc_set (&tm);
+ memcpy(&seconds, &rpktp->transmit_timestamp, sizeof(ulong));
+
+ rtc_to_tm(ntohl(seconds) - 2208988800UL + net_ntp_time_offset, &tm);
+#ifdef CONFIG_DM_RTC
+ struct udevice *dev;
+ int ret;
+
+ ret = uclass_get_device(UCLASS_RTC, 0, &dev);
+ if (ret)
+ printf("SNTP: cannot find RTC: err=%d\n", ret);
+ else
+ dm_rtc_set(dev, &tm);
+#elif defined(CONFIG_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);
+ 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);
- NetState = NETLOOP_SUCCESS;
+ net_set_state(NETLOOP_SUCCESS);
}
-void
-SntpStart (void)
+/*
+ * SNTP:
+ *
+ * Prerequisites: - own ethernet address
+ * - own IP address
+ * We want: - network time
+ * Next step: none
+ */
+int sntp_prereq(void *data)
{
- debug ("%s\n", __FUNCTION__);
-
- NetSetTimeout (SNTP_TIMEOUT * CFG_HZ, SntpTimeout);
- NetSetHandler(SntpHandler);
- memset (NetServerEther, 0, 6);
+ if (net_ntp_server.s_addr == 0) {
+ puts("*** ERROR: NTP server address not given\n");
+ return 1;
+ }
- SntpSend ();
+ return 0;
}
-#endif
+int sntp_start(void *data)
+{
+ debug("%s\n", __func__);
+
+ net_set_timeout_handler(SNTP_TIMEOUT, sntp_timeout_handler);
+ net_set_udp_handler(sntp_handler);
+ memset(net_server_ethaddr, 0, sizeof(net_server_ethaddr));
+
+ sntp_send();
+
+ return 0;
+}