mpc83xx: tqm8349 - remove pci & flash window conflict

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

diff --git a/net/tftp.c b/net/tftp.c
index 3dd2b06aae16a79e7b94f72bc4e6ef7cc4dbb74d..fb98a346ea6e55fe2fdbcf6d5c0992cc1c56d13b 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -10,12 +10,10 @@
 #include "tftp.h"
 #include "bootp.h"
 
-#undef ET_DEBUG
-
 #if defined(CONFIG_CMD_NET)
 
 #define WELL_KNOWN_PORT        69              /* Well known TFTP port #               */
-#define TIMEOUT                5UL             /* Seconds to timeout for a lost pkt    */
+#define TIMEOUT                5000UL          /* Millisecs to timeout for lost pkt */
 #ifndef        CONFIG_NET_RETRY_COUNT
 # define TIMEOUT_COUNT 10              /* # of timeouts before giving up  */
 #else
@@ -34,6 +32,21 @@
 #define TFTP_ERROR     5
 #define TFTP_OACK      6
 
+static ulong TftpTimeoutMSecs = TIMEOUT;
+static int TftpTimeoutCountMax = TIMEOUT_COUNT;
+
+/*
+ * These globals govern the timeout behavior when attempting a connection to a
+ * TFTP server. TftpRRQTimeoutMSecs specifies the number of milliseconds to
+ * wait for the server to respond to initial connection. Second global,
+ * TftpRRQTimeoutCountMax, gives the number of such connection retries.
+ * TftpRRQTimeoutCountMax must be non-negative and TftpRRQTimeoutMSecs must be
+ * positive. The globals are meant to be set (and restored) by code needing
+ * non-standard timeout behavior when initiating a TFTP transfer.
+ */
+ulong TftpRRQTimeoutMSecs = TIMEOUT;
+int TftpRRQTimeoutCountMax = TIMEOUT_COUNT;
+
 static IPaddr_t TftpServerIP;
 static int     TftpServerPort;         /* The UDP port at their end            */
 static int     TftpOurPort;            /* The UDP port at our end              */
@@ -64,7 +77,7 @@ static char default_filename[DEFAULT_NAME_LEN];
 
 static char tftp_filename[MAX_LEN];
 
-#ifdef CFG_DIRECT_FLASH_TFTP
+#ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
 extern flash_info_t flash_info[];
 #endif
 
@@ -106,11 +119,13 @@ store_block (unsigned block, uchar * src, unsigned len)
 {
        ulong offset = block * TftpBlkSize + TftpBlockWrapOffset;
        ulong newsize = offset + len;
-#ifdef CFG_DIRECT_FLASH_TFTP
+#ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
        int i, rc = 0;
 
-       for (i=0; i<CFG_MAX_FLASH_BANKS; i++) {
+       for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; i++) {
                /* start address in flash? */
+               if (flash_info[i].flash_id == FLASH_UNKNOWN)
+                       continue;
                if (load_addr + offset >= flash_info[i].start[0]) {
                        rc = 1;
                        break;
@@ -126,7 +141,7 @@ store_block (unsigned block, uchar * src, unsigned len)
                }
        }
        else
-#endif /* CFG_DIRECT_FLASH_TFTP */
+#endif /* CONFIG_SYS_DIRECT_FLASH_TFTP */
        {
                (void)memcpy((void *)(load_addr + offset), src, len);
        }
@@ -178,10 +193,8 @@ TftpSend (void)
                pkt += 5 /*strlen("octet")*/ + 1;
                strcpy ((char *)pkt, "timeout");
                pkt += 7 /*strlen("timeout")*/ + 1;
-               sprintf((char *)pkt, "%d", TIMEOUT);
-#ifdef ET_DEBUG
-               printf("send option \"timeout %s\"\n", (char *)pkt);
-#endif
+               sprintf((char *)pkt, "%lu", TIMEOUT / 1000);
+               debug("send option \"timeout %s\"\n", (char *)pkt);
                pkt += strlen((char *)pkt) + 1;
                /* try for more effic. blk size */
                pkt += sprintf((char *)pkt,"blksize%c%d%c",
@@ -278,9 +291,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;
                /*
@@ -292,10 +305,8 @@ 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;
                        }
                }
@@ -331,11 +342,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 */
@@ -368,7 +376,9 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
                }
 
                TftpLastBlock = TftpBlock;
-               NetSetTimeout (TIMEOUT * CFG_HZ, TftpTimeout);
+               TftpTimeoutMSecs = TIMEOUT;
+               TftpTimeoutCountMax = TIMEOUT_COUNT;
+               NetSetTimeout (TftpTimeoutMSecs, TftpTimeout);
 
                store_block (TftpBlock - 1, pkt + 2, len);
 
@@ -439,7 +449,7 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
 static void
 TftpTimeout (void)
 {
-       if (++TftpTimeoutCount > TIMEOUT_COUNT) {
+       if (++TftpTimeoutCount > TftpTimeoutCountMax) {
                puts ("\nRetry count exceeded; starting again\n");
 #ifdef CONFIG_MCAST_TFTP
                mcast_cleanup();
@@ -447,7 +457,7 @@ TftpTimeout (void)
                NetStartAgain ();
        } else {
                puts ("T ");
-               NetSetTimeout (TIMEOUT * CFG_HZ, TftpTimeout);
+               NetSetTimeout (TftpTimeoutMSecs, TftpTimeout);
                TftpSend ();
        }
 }
@@ -474,15 +484,14 @@ TftpStart (void)
                printf ("*** Warning: no boot file name; using '%s'\n",
                        tftp_filename);
        } else {
-               char *p = strchr (p, ':');
+               char *p = strchr (BootFile, ':');
 
                if (p == NULL) {
                        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;
                }
        }
@@ -490,18 +499,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');
 
@@ -518,7 +525,10 @@ TftpStart (void)
 
        puts ("Loading: *\b");
 
-       NetSetTimeout (TIMEOUT * CFG_HZ, TftpTimeout);
+       TftpTimeoutMSecs = TftpRRQTimeoutMSecs;
+       TftpTimeoutCountMax = TftpRRQTimeoutCountMax;
+
+       NetSetTimeout (TftpTimeoutMSecs, TftpTimeout);
        NetSetHandler (TftpHandler);
 
        TftpServerPort = WELL_KNOWN_PORT;