patches 1492, 1493 and 1494 from Marc

diff --git a/doc/sys_arch.txt b/doc/sys_arch.txt
index 3a829991ba9920396738d5119514e0112aa02738..95d0add737a9c185549e5a9ed719cba88c99cd9e 100644 (file)
--- a/doc/sys_arch.txt
+++ b/doc/sys_arch.txt
@@ -63,8 +63,8 @@ The following functions must be implemented by the sys_arch:
   If the timeout argument is non-zero, the return value is the number of
   milliseconds spent waiting for the semaphore to be signaled. If the
   semaphore wasn't signaled within the specified time, the return value is
-  0xffffffff. If the thread didn't have to wait for the semaphore (i.e., it
-  was already signaled), the function may return zero.
+  SYS_ARCH_TIMEOUT. If the thread didn't have to wait for the semaphore
+  (i.e., it was already signaled), the function may return zero.
 
   Notice that lwIP implements a function with a similar name,
   sys_sem_wait(), that uses the sys_arch_sem_wait() function.
@@ -93,7 +93,8 @@ The following functions must be implemented by the sys_arch:
   should be dropped.
 
   The return values are the same as for the sys_arch_sem_wait() function:
-  Number of milliseconds spent waitng or 0xffffffff if there was a timeout.
+  Number of milliseconds spent waiting or SYS_ARCH_TIMEOUT if there was a
+  timeout.
 
   Note that a function with a similar name, sys_mbox_fetch(), is
   implemented by lwIP. 

diff --git a/src/api/api_lib.c b/src/api/api_lib.c
index a73756ae290abda6708552a5fbe42664de6b0897..9c29ba2fe9083617b715c23ebbcee806f5852266 100644 (file)
--- a/src/api/api_lib.c
+++ b/src/api/api_lib.c
@@ -511,7 +511,7 @@ netconn_recv(struct netconn *conn)
       if (conn->callback)
         (*conn->callback)(conn, NETCONN_EVT_RCVMINUS, len);
 
-    /* If we are closed, we indicate that we no longer wish to recieve
+    /* If we are closed, we indicate that we no longer wish to receive
        data by setting conn->recvmbox to SYS_MBOX_NULL. */
     if (p == NULL) {
       memp_freep(MEMP_NETBUF, buf);

diff --git a/src/core/ipv6/ip6.c b/src/core/ipv6/ip6.c
index 283ea5d021ccc66cc053331d28325cd4a4396a48..e434b4d1c8ecd56ba24dc680625f6f7af1625231 100644 (file)
--- a/src/core/ipv6/ip6.c
+++ b/src/core/ipv6/ip6.c
@@ -237,7 +237,7 @@ ip_input(struct pbuf *p, struct netif *inp) {
     /* send ICMP destination protocol unreachable */
     icmp_dest_unreach(p, ICMP_DUR_PROTO);
     pbuf_free(p);
-    DEBUGF(IP_DEBUG, ("Unsupported transportation protocol %u\n",
+    DEBUGF(IP_DEBUG, ("Unsupported transport protocol %u\n",
                      iphdr->nexthdr));
 
 #ifdef IP_STATS

diff --git a/src/core/sys.c b/src/core/sys.c
index 8b2b4b09422eea36f5ca8760096ad1a0f96851a2..f3d4d34c78188cd31cebb372cbd3660512cbfabd 100644 (file)
--- a/src/core/sys.c
+++ b/src/core/sys.c
@@ -64,12 +64,12 @@ sys_mbox_fetch(sys_mbox_t mbox, void **msg)
     if (timeouts->next->time > 0) {
       time = sys_arch_mbox_fetch(mbox, msg, timeouts->next->time);
     } else {
-      time = 0xffffffff;
+      time = SYS_ARCH_TIMEOUT;
     }
 
-    if (time == 0xffffffff) {
-      /* If time == 0xffffffff, a timeout occured before a message could be
-        fetched. We should now call the timeout handler and
+    if (time == SYS_ARCH_TIMEOUT) {
+      /* If time == SYS_ARCH_TIMEOUT, a timeout occured before a message
+        could be fetched. We should now call the timeout handler and
         deallocate the memory allocated for the timeout. */
       tmptimeout = timeouts->next;
       timeouts->next = tmptimeout->next;
@@ -84,7 +84,7 @@ sys_mbox_fetch(sys_mbox_t mbox, void **msg)
       /* We try again to fetch a message from the mbox. */
       goto again;
     } else {
-      /* If time != 0xffffffff, a message was received before the timeout
+      /* If time != SYS_ARCH_TIMEOUT, a message was received before the timeout
         occured. The time variable is set to the number of
         milliseconds we waited for the message. */
       if (time <= timeouts->next->time) {
@@ -119,12 +119,12 @@ sys_sem_wait(sys_sem_t sem)
     if (timeouts->next->time > 0) {
       time = sys_arch_sem_wait(sem, timeouts->next->time);
     } else {
-      time = 0xffffffff;
+      time = SYS_ARCH_TIMEOUT;
     }
 
-    if (time == 0xffffffff) {
-      /* If time == 0xffffffff, a timeout occured before a message could be
-        fetched. We should now call the timeout handler and
+    if (time == SYS_ARCH_TIMEOUT) {
+      /* If time == SYS_ARCH_TIMEOUT, a timeout occured before a message
+        could be fetched. We should now call the timeout handler and
         deallocate the memory allocated for the timeout. */
       tmptimeout = timeouts->next;
       timeouts->next = tmptimeout->next;
@@ -140,7 +140,7 @@ sys_sem_wait(sys_sem_t sem)
       /* We try again to fetch a message from the mbox. */
       goto again;
     } else {
-      /* If time != 0xffffffff, a message was received before the timeout
+      /* If time != SYS_ARCH_TIMEOUT, a message was received before the timeout
         occured. The time variable is set to the number of
         milliseconds we waited for the message. */
       if (time <= timeouts->next->time) {

diff --git a/src/core/tcp.c b/src/core/tcp.c
index e1ae686731facff5e0d9204ad1333dfb7bad0ba2..ffc593af0a69518762bfec156d6bf72d3003b8b8 100644 (file)
--- a/src/core/tcp.c
+++ b/src/core/tcp.c
@@ -70,7 +70,7 @@ struct tcp_pcb *tcp_tw_pcbs;      /* List of all TCP PCBs in TIME-WAIT. */
 
 struct tcp_pcb *tcp_tmp_pcb;
 
-#define MIN(x,y) (x) < (y)? (x): (y)
+#define LWIP_MIN(x,y) (x) < (y)? (x): (y)
 
 static u8_t tcp_timer;
 
@@ -506,7 +506,7 @@ tcp_slowtmr(void)
         }
         tcp_rexmit(pcb);
         /* Reduce congestion window and ssthresh. */
-        eff_wnd = MIN(pcb->cwnd, pcb->snd_wnd);
+        eff_wnd = LWIP_MIN(pcb->cwnd, pcb->snd_wnd);
         pcb->ssthresh = eff_wnd >> 1;
         if (pcb->ssthresh < pcb->mss) {
           pcb->ssthresh = pcb->mss * 2;

diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c
index 5664bd575c42ebf382361368670c39fc90a00952..5c1b63403afafa888b459016b06347bd0b87bec5 100644 (file)
--- a/src/core/tcp_out.c
+++ b/src/core/tcp_out.c
@@ -59,7 +59,7 @@
 #include "lwip/stats.h"
 
 #if LWIP_TCP
-#define MIN(x,y) (x) < (y)? (x): (y)
+#define LWIP_MIN(x,y) (x) < (y)? (x): (y)
 
 
 
@@ -367,7 +367,7 @@ tcp_output(struct tcp_pcb *pcb)
     return ERR_OK;
   }
   
-  wnd = MIN(pcb->snd_wnd, pcb->cwnd);
+  wnd = LWIP_MIN(pcb->snd_wnd, pcb->cwnd);
 
   
   seg = pcb->unsent;

diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h
index 893b53b4ead1c457348bada4dad24906777b0e1c..77f24d5e3cccd3ed83ae80838415fa86acf7f267 100644 (file)
--- a/src/include/lwip/tcp.h
+++ b/src/include/lwip/tcp.h
@@ -252,8 +252,8 @@ struct tcp_pcb {
 
   u16_t acked;
   
-  u16_t snd_buf;   /* Avaliable buffer space for sending (in bytes). */
-  u8_t snd_queuelen; /* Avaliable buffer space for sending (in tcp_segs). */
+  u16_t snd_buf;   /* Available buffer space for sending (in bytes). */
+  u8_t snd_queuelen; /* Available buffer space for sending (in tcp_segs). */
   
   
   /* These are ordered by sequence number: */
@@ -424,7 +424,7 @@ extern struct tcp_pcb *tcp_tw_pcbs;      /* List of all TCP PCBs in TIME-WAIT. *
 
 extern struct tcp_pcb *tcp_tmp_pcb;      /* Only used for temporary storage. */
 
-/* Axoims about the above lists:   
+/* Axioms about the above lists:   
    1) Every TCP PCB that is not CLOSED is in one of the lists.
    2) A PCB is only in one of the lists.
    3) All PCBs in the tcp_listen_pcbs list is in LISTEN state.