net: cosmetic: tftp.* checkpatch compliance

[u-boot] / net / rarp.c

diff --git a/net/rarp.c b/net/rarp.c
index 71056962629f710dcb15db6040aaac09d0ca91c7..5a813a290b574be823719f0078550a8bfaee25b8 100644 (file)
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -29,8 +29,6 @@
 #include "rarp.h"
 #include "tftp.h"
 
-#if defined(CONFIG_CMD_NET)
-
 #define TIMEOUT                5000UL  /* Milliseconds before trying BOOTP again */
 #ifndef        CONFIG_NET_RETRY_COUNT
 # define TIMEOUT_COUNT 5               /* # of timeouts before giving up  */
@@ -45,28 +43,11 @@ int         RarpTry;
  *     Handle a RARP received packet.
  */
 static void
-RarpHandler(uchar * dummi0, unsigned dummi1, unsigned dummi2, unsigned dummi3)
+RarpHandler(uchar *dummi0, unsigned dummi1, IPaddr_t sip, unsigned dummi2,
+           unsigned dummi3)
 {
-       char *s;
-#ifdef DEBUG
-       puts ("Got good RARP\n");
-#endif
-       if ((s = getenv("autoload")) != NULL) {
-               if (*s == 'n') {
-                       /*
-                        * Just use RARP to configure system;
-                        * Do not use TFTP/NFS to to load the bootfile.
-                        */
-                       NetState = NETLOOP_SUCCESS;
-                       return;
-#if defined(CONFIG_CMD_NFS)
-               } else if ((s != NULL) && !strcmp(s, "NFS")) {
-                       NfsStart();
-                       return;
-#endif
-               }
-       }
-       TftpStart ();
+       debug("Got good RARP\n");
+       net_auto_load();
 }
 
 
@@ -77,21 +58,21 @@ static void
 RarpTimeout(void)
 {
        if (RarpTry >= TIMEOUT_COUNT) {
-               puts ("\nRetry count exceeded; starting again\n");
-               NetStartAgain ();
+               puts("\nRetry count exceeded; starting again\n");
+               NetStartAgain();
        } else {
-               NetSetTimeout (TIMEOUT, RarpTimeout);
-               RarpRequest ();
+               NetSetTimeout(TIMEOUT, RarpTimeout);
+               RarpRequest();
        }
 }
 
 
 void
-RarpRequest (void)
+RarpRequest(void)
 {
        int i;
-       volatile uchar *pkt;
-       ARP_t * rarp;
+       uchar *pkt;
+       ARP_t *rarp;
 
        printf("RARP broadcast %d\n", ++RarpTry);
        pkt = NetTxPacket;
@@ -100,23 +81,21 @@ RarpRequest (void)
 
        rarp = (ARP_t *)pkt;
 
-       rarp->ar_hrd = htons (ARP_ETHER);
-       rarp->ar_pro = htons (PROT_IP);
+       rarp->ar_hrd = htons(ARP_ETHER);
+       rarp->ar_pro = htons(PROT_IP);
        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[10], NetOurEther, 6);    /* dest ET addr = source ET addr ??*/
+       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 */
+       /* dest ET addr = source ET addr ??*/
+       memcpy(&rarp->ar_data[10], NetOurEther, 6);
        /* dest. IP addr set to broadcast */
-       for (i = 0; i <= 3; i++) {
+       for (i = 0; i <= 3; i++)
                rarp->ar_data[16 + i] = 0xff;
-       }
 
        NetSendPacket(NetTxPacket, (pkt - NetTxPacket) + ARP_HDR_SIZE);
 
        NetSetTimeout(TIMEOUT, RarpTimeout);
        NetSetHandler(RarpHandler);
 }
-
-#endif