net: cosmetic: Fix checkpatch.pl failures in net.c

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

diff --git a/net/sntp.c b/net/sntp.c
index 69cddb16b5c053ae278ade14bf412161eb8016ff..d3427d880b6acdc03cf4439a6301c7eda6e4f0fe 100644 (file)
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -14,10 +14,9 @@
 
 #define SNTP_TIMEOUT 10000UL
 
-static int SntpOurPort;
+static int sntp_our_port;
 
-static void
-SntpSend(void)
+static void sntp_send(void)
 {
        struct sntp_pkt_t pkt;
        int pktlen = SNTP_PACKET_LEN;
@@ -31,27 +30,25 @@ SntpSend(void)
        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;
+       net_set_state(NETLOOP_FAIL);
        return;
 }
 
-static void
-SntpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, 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;
@@ -59,7 +56,7 @@ SntpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
 
        debug("%s\n", __func__);
 
-       if (dest != SntpOurPort)
+       if (dest != sntp_our_port)
                return;
 
        /*
@@ -68,25 +65,24 @@ SntpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
         */
        memcpy(&seconds, &rpktp->transmit_timestamp, sizeof(ulong));
 
-       to_tm(ntohl(seconds) - 2208988800UL + NetTimeOffset, &tm);
+       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);
+              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)
+void sntp_start(void)
 {
        debug("%s\n", __func__);
 
-       NetSetTimeout(SNTP_TIMEOUT, SntpTimeout);
-       NetSetHandler(SntpHandler);
-       memset(NetServerEther, 0, sizeof(NetServerEther));
+       net_set_timeout_handler(SNTP_TIMEOUT, sntp_timeout_handler);
+       net_set_udp_handler(sntp_handler);
+       memset(net_server_ethaddr, 0, sizeof(net_server_ethaddr));
 
-       SntpSend();
+       sntp_send();
 }