buildman: Permit branch names with an embedded '/'

[karo-tx-uboot.git] / net / sntp.c

diff --git a/net/sntp.c b/net/sntp.c
index 404587e80ea686372026ce578f1c0ea2beb37c29..5de19526e6394b213cd2204d594026d6201a5175 100644 (file)
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -17,72 +17,76 @@
 static int SntpOurPort;
 
 static void
-SntpSend (void)
+SntpSend(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 *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE,
+               (char *)&pkt, pktlen);
 
        SntpOurPort = 10000 + (get_timer(0) % 4096);
        sport = NTP_SERVICE_PORT;
 
-       NetSendUDPPacket (NetServerEther, NetNtpServerIP, sport, SntpOurPort, pktlen);
+       NetSendUDPPacket(NetServerEther, NetNtpServerIP, sport, SntpOurPort,
+               pktlen);
 }
 
 static void
-SntpTimeout (void)
+SntpTimeout(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)
+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;
 
-       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.
         */
-       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)
-       rtc_set (&tm);
+       rtc_set(&tm);
 #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);
 
-       NetState = NETLOOP_SUCCESS;
+       net_set_state(NETLOOP_SUCCESS);
 }
 
 void
-SntpStart (void)
+SntpStart(void)
 {
-       debug ("%s\n", __FUNCTION__);
+       debug("%s\n", __func__);
 
-       NetSetTimeout (SNTP_TIMEOUT, SntpTimeout);
-       NetSetHandler(SntpHandler);
-       memset (NetServerEther, 0, 6);
+       NetSetTimeout(SNTP_TIMEOUT, SntpTimeout);
+       net_set_udp_handler(SntpHandler);
+       memset(NetServerEther, 0, sizeof(NetServerEther));
 
-       SntpSend ();
+       SntpSend();
 }