dm: rtc: Rename to_tm() to rtc_to_tm() and add error code

[u-boot] / net / sntp.c

diff --git a/net/sntp.c b/net/sntp.c
index 8073ca69388ad8349c200b2e1a32cd450c459b78..d7b9e5563a7da1fdbfc1d407995d27a3080ee5bf 100644 (file)
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -50,28 +50,32 @@ static void sntp_timeout_handler(void)
 static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
                         unsigned src, unsigned len)
 {
+#ifdef CONFIG_TIMESTAMP
        struct sntp_pkt_t *rpktp = (struct sntp_pkt_t *)pkt;
        struct rtc_time tm;
        ulong seconds;
+#endif
 
        debug("%s\n", __func__);
 
        if (dest != sntp_our_port)
                return;
 
+#ifdef CONFIG_TIMESTAMP
        /*
-        * 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);
+       rtc_to_tm(ntohl(seconds) - 2208988800UL + net_ntp_time_offset, &tm);
 #if 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);
+#endif
 
        net_set_state(NETLOOP_SUCCESS);
 }
@@ -80,7 +84,7 @@ void sntp_start(void)
 {
        debug("%s\n", __func__);
 
-       NetSetTimeout(SNTP_TIMEOUT, sntp_timeout_handler);
+       net_set_timeout_handler(SNTP_TIMEOUT, sntp_timeout_handler);
        net_set_udp_handler(sntp_handler);
        memset(net_server_ethaddr, 0, sizeof(net_server_ethaddr));