tpm: Move the I2C TPM code into one file

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

diff --git a/net/rarp.c b/net/rarp.c
index a8e085126d4fa27c9837323e5ea3c2e81ac6cdaa..4ce2f37a8a69c2b8ad70e3ea5e0f2605bf589bbc 100644 (file)
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -20,7 +20,7 @@
 #define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT)
 #endif
 
-int RarpTry;
+int rarp_try;
 
 /*
  *     Handle a RARP received packet.
@@ -37,16 +37,15 @@ void rarp_receive(struct ip_udp_hdr *ip, unsigned len)
        }
 
        if ((ntohs(arp->ar_op) != RARPOP_REPLY) ||
-               (ntohs(arp->ar_hrd) != ARP_ETHER)   ||
-               (ntohs(arp->ar_pro) != PROT_IP)     ||
-               (arp->ar_hln != 6) || (arp->ar_pln != 4)) {
-
+           (ntohs(arp->ar_hrd) != ARP_ETHER)   ||
+           (ntohs(arp->ar_pro) != PROT_IP)     ||
+           (arp->ar_hln != 6) || (arp->ar_pln != 4)) {
                puts("invalid RARP header\n");
        } else {
-               NetCopyIP(&NetOurIP, &arp->ar_data[16]);
-               if (NetServerIP == 0)
-                       NetCopyIP(&NetServerIP, &arp->ar_data[6]);
-               memcpy(NetServerEther, &arp->ar_data[0], 6);
+               net_copy_ip(&net_ip, &arp->ar_data[16]);
+               if (net_server_ip.s_addr == 0)
+                       net_copy_ip(&net_server_ip, &arp->ar_data[6]);
+               memcpy(net_server_ethaddr, &arp->ar_data[0], 6);
                debug_cond(DEBUG_DEV_PKT, "Got good RARP\n");
                net_auto_load();
        }
@@ -56,28 +55,28 @@ void rarp_receive(struct ip_udp_hdr *ip, unsigned len)
 /*
  *     Timeout on BOOTP request.
  */
-static void RarpTimeout(void)
+static void rarp_timeout_handler(void)
 {
-       if (RarpTry >= TIMEOUT_COUNT) {
+       if (rarp_try >= TIMEOUT_COUNT) {
                puts("\nRetry count exceeded; starting again\n");
-               NetStartAgain();
+               net_start_again();
        } else {
-               NetSetTimeout(TIMEOUT, RarpTimeout);
-               RarpRequest();
+               net_set_timeout_handler(TIMEOUT, rarp_timeout_handler);
+               rarp_request();
        }
 }
 
 
-void RarpRequest(void)
+void rarp_request(void)
 {
        uchar *pkt;
        struct arp_hdr *rarp;
        int eth_hdr_size;
 
-       printf("RARP broadcast %d\n", ++RarpTry);
-       pkt = NetTxPacket;
+       printf("RARP broadcast %d\n", ++rarp_try);
+       pkt = net_tx_packet;
 
-       eth_hdr_size = NetSetEther(pkt, NetBcastAddr, PROT_RARP);
+       eth_hdr_size = net_set_ether(pkt, net_bcast_ethaddr, PROT_RARP);
        pkt += eth_hdr_size;
 
        rarp = (struct arp_hdr *)pkt;
@@ -87,14 +86,14 @@ void RarpRequest(void)
        rarp->ar_hln = 6;
        rarp->ar_pln = 4;
        rarp->ar_op  = htons(RARPOP_REQUEST);
-       memcpy(&rarp->ar_data[0],  NetOurEther, 6);     /* source ET addr */
-       memcpy(&rarp->ar_data[6],  &NetOurIP,   4);     /* source IP addr */
+       memcpy(&rarp->ar_data[0],  net_ethaddr, 6);     /* source ET addr */
+       memcpy(&rarp->ar_data[6],  &net_ip,   4);       /* source IP addr */
        /* dest ET addr = source ET addr ??*/
-       memcpy(&rarp->ar_data[10], NetOurEther, 6);
+       memcpy(&rarp->ar_data[10], net_ethaddr, 6);
        /* dest IP addr set to broadcast */
        memset(&rarp->ar_data[16], 0xff,        4);
 
-       NetSendPacket(NetTxPacket, eth_hdr_size + ARP_HDR_SIZE);
+       net_send_packet(net_tx_packet, eth_hdr_size + ARP_HDR_SIZE);
 
-       NetSetTimeout(TIMEOUT, RarpTimeout);
+       net_set_timeout_handler(TIMEOUT, rarp_timeout_handler);
 }