net: cosmetic: Clean up ARP variables and functions

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

diff --git a/net/sntp.c b/net/sntp.c
index 69cddb16b5c053ae278ade14bf412161eb8016ff..1e2b67840f36b9ff828f9d02c280eab01ac7244d 100644 (file)
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -31,27 +31,26 @@ 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);
        sport = NTP_SERVICE_PORT;
 
-       NetSendUDPPacket(NetServerEther, NetNtpServerIP, sport, SntpOurPort,
-               pktlen);
+       net_send_udp_packet(net_server_ethaddr, net_ntp_server, sport,
+                           SntpOurPort, pktlen);
 }
 
 static void
 SntpTimeout(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;
@@ -76,7 +75,7 @@ SntpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
                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
@@ -85,8 +84,8 @@ SntpStart(void)
        debug("%s\n", __func__);
 
        NetSetTimeout(SNTP_TIMEOUT, SntpTimeout);
-       NetSetHandler(SntpHandler);
-       memset(NetServerEther, 0, sizeof(NetServerEther));
+       net_set_udp_handler(sntp_handler);
+       memset(net_server_ethaddr, 0, sizeof(net_server_ethaddr));
 
        SntpSend();
 }