mpc52xx, manroland: add some commands

[u-boot] / net / tftp.c

diff --git a/net/tftp.c b/net/tftp.c
index ce6ea3d9f5ae126678f7e61192ef83aa13a74bb2..cc60a3bd1ca888705b6b0375dfba61aa535291cb 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -10,8 +10,6 @@
 #include "tftp.h"
 #include "bootp.h"
 
-#undef ET_DEBUG
-
 #if defined(CONFIG_CMD_NET)
 
 #define WELL_KNOWN_PORT        69              /* Well known TFTP port #               */
@@ -58,6 +56,10 @@ static ulong TftpLastBlock;          /* last packet sequence number received */
 static ulong   TftpBlockWrap;          /* count of sequence number wraparounds */
 static ulong   TftpBlockWrapOffset;    /* memory offset due to wrapping        */
 static int     TftpState;
+#ifdef CONFIG_TFTP_TSIZE
+static int     TftpTsize;              /* The file size reported by the server */
+static short   TftpNumchars;           /* The number of hashes we printed      */
+#endif
 
 #define STATE_RRQ      1
 #define STATE_DATA     2
@@ -86,8 +88,14 @@ extern flash_info_t flash_info[];
 /* 512 is poor choice for ethernet, MTU is typically 1500.
  * Minus eth.hdrs thats 1468.  Can get 2x better throughput with
  * almost-MTU block sizes.  At least try... fall back to 512 if need be.
+ * (but those using CONFIG_IP_DEFRAG may want to set a larger block in cfg file)
  */
+#ifdef CONFIG_TFTP_BLOCKSIZE
+#define TFTP_MTU_BLOCKSIZE CONFIG_TFTP_BLOCKSIZE
+#else
 #define TFTP_MTU_BLOCKSIZE 1468
+#endif
+
 static unsigned short TftpBlkSize=TFTP_BLOCK_SIZE;
 static unsigned short TftpBlkSizeOption=TFTP_MTU_BLOCKSIZE;
 
@@ -196,10 +204,12 @@ TftpSend (void)
                strcpy ((char *)pkt, "timeout");
                pkt += 7 /*strlen("timeout")*/ + 1;
                sprintf((char *)pkt, "%lu", TIMEOUT / 1000);
-#ifdef ET_DEBUG
-               printf("send option \"timeout %s\"\n", (char *)pkt);
-#endif
+               debug("send option \"timeout %s\"\n", (char *)pkt);
                pkt += strlen((char *)pkt) + 1;
+#ifdef CONFIG_TFTP_TSIZE
+               memcpy((char *)pkt, "tsize\0000\0", 8);
+               pkt += 8;
+#endif
                /* try for more effic. blk size */
                pkt += sprintf((char *)pkt,"blksize%c%d%c",
                                0,TftpBlkSizeOption,0);
@@ -295,9 +305,9 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
                break;
 
        case TFTP_OACK:
-#ifdef ET_DEBUG
-               printf("Got OACK: %s %s\n", pkt, pkt+strlen(pkt)+1);
-#endif
+               debug("Got OACK: %s %s\n",
+                       pkt,
+                       pkt + strlen((char *)pkt) + 1);
                TftpState = STATE_OACK;
                TftpServerPort = src;
                /*
@@ -309,12 +319,16 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
                        if (strcmp ((char*)pkt+i,"blksize") == 0) {
                                TftpBlkSize = (unsigned short)
                                        simple_strtoul((char*)pkt+i+8,NULL,10);
-#ifdef ET_DEBUG
-                               printf ("Blocksize ack: %s, %d\n",
+                               debug("Blocksize ack: %s, %d\n",
                                        (char*)pkt+i+8,TftpBlkSize);
-#endif
-                               break;
                        }
+#ifdef CONFIG_TFTP_TSIZE
+                       if (strcmp ((char*)pkt+i,"tsize") == 0) {
+                               TftpTsize = simple_strtoul((char*)pkt+i+6,NULL,10);
+                               debug("size = %s, %d\n",
+                                        (char*)pkt+i+6, TftpTsize);
+                       }
+#endif
                }
 #ifdef CONFIG_MCAST_TFTP
                parse_multicast_oack((char *)pkt,len-1);
@@ -340,7 +354,16 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
                        TftpBlockWrap++;
                        TftpBlockWrapOffset += TftpBlkSize * TFTP_SEQUENCE_SIZE;
                        printf ("\n\t %lu MB received\n\t ", TftpBlockWrapOffset>>20);
-               } else {
+               }
+#ifdef CONFIG_TFTP_TSIZE
+               else if (TftpTsize) {
+                       while (TftpNumchars < NetBootFileXferSize * 50 / TftpTsize) {
+                               putc('#');
+                               TftpNumchars++;
+                       }
+               }
+#endif
+               else {
                        if (((TftpBlock - 1) % 10) == 0) {
                                putc ('#');
                        } else if ((TftpBlock % (10 * HASHES_PER_LINE)) == 0) {
@@ -348,11 +371,8 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
                        }
                }
 
-#ifdef ET_DEBUG
-               if (TftpState == STATE_RRQ) {
-                       puts ("Server did not acknowledge timeout option!\n");
-               }
-#endif
+               if (TftpState == STATE_RRQ)
+                       debug("Server did not acknowledge timeout option!\n");
 
                if (TftpState == STATE_RRQ || TftpState == STATE_OACK) {
                        /* first block received */
@@ -437,6 +457,13 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
                         *      We received the whole thing.  Try to
                         *      run it.
                         */
+#ifdef CONFIG_TFTP_TSIZE
+                       /* Print out the hash marks for the last packet received */
+                       while (TftpTsize && TftpNumchars < 49) {
+                               putc('#');
+                               TftpNumchars++;
+                       }
+#endif
                        puts ("\ndone\n");
                        NetState = NETLOOP_SUCCESS;
                }
@@ -475,9 +502,12 @@ TftpTimeout (void)
 void
 TftpStart (void)
 {
-#ifdef CONFIG_TFTP_PORT
        char *ep;             /* Environment pointer */
-#endif
+
+       /* Allow the user to choose tftpblocksize */
+       if ((ep = getenv("tftpblocksize")) != NULL)
+               TftpBlkSizeOption = simple_strtol(ep, NULL, 10);
+       debug("tftp block size is %i\n", TftpBlkSizeOption);
 
        TftpServerIP = NetServerIP;
        if (BootFile[0] == '\0') {
@@ -499,9 +529,8 @@ TftpStart (void)
                        strncpy(tftp_filename, BootFile, MAX_LEN);
                        tftp_filename[MAX_LEN-1] = 0;
                } else {
-                       *p++ = '\0';
                        TftpServerIP = string_to_ip (BootFile);
-                       strncpy(tftp_filename, p, MAX_LEN);
+                       strncpy(tftp_filename, p + 1, MAX_LEN);
                        tftp_filename[MAX_LEN-1] = 0;
                }
        }
@@ -509,18 +538,16 @@ TftpStart (void)
 #if defined(CONFIG_NET_MULTI)
        printf ("Using %s device\n", eth_get_name());
 #endif
-       puts ("TFTP from server ");     print_IPaddr (TftpServerIP);
-       puts ("; our IP address is ");  print_IPaddr (NetOurIP);
+       printf("TFTP from server %pI4"
+               "; our IP address is %pI4", &TftpServerIP, &NetOurIP);
 
        /* Check if we need to send across this subnet */
        if (NetOurGatewayIP && NetOurSubnetMask) {
            IPaddr_t OurNet     = NetOurIP    & NetOurSubnetMask;
            IPaddr_t ServerNet  = TftpServerIP & NetOurSubnetMask;
 
-           if (OurNet != ServerNet) {
-               puts ("; sending through gateway ");
-               print_IPaddr (NetOurGatewayIP) ;
-           }
+           if (OurNet != ServerNet)
+               printf("; sending through gateway %pI4", &NetOurGatewayIP);
        }
        putc ('\n');
 
@@ -566,6 +593,10 @@ TftpStart (void)
 #ifdef CONFIG_MCAST_TFTP
        mcast_cleanup();
 #endif
+#ifdef CONFIG_TFTP_TSIZE
+       TftpTsize = 0;
+       TftpNumchars = 0;
+#endif
 
        TftpSend ();
 }