From bb8522b73704a8a997a6b2818dcfbda2010d38d3 Mon Sep 17 00:00:00 2001
From: goldsimon <goldsimon>
Date: Sat, 3 Mar 2007 16:22:38 +0000
Subject: [PATCH] tcpip.c: Moved call to ip_init(), udp_init() and tcp_init()
 from tcpip_thread() to tcpip_init()

---
 CHANGELOG       |  6 +++++
 src/api/tcpip.c | 59 ++++++++++++++++++++++++-------------------------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8db2e113..1d154da3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -42,6 +42,12 @@ HISTORY
 
   ++ Bug fixes:
 
+  2007-03-02 Simon Goldschmidt
+  * tcpip.c: Moved call to ip_init(), udp_init() and tcp_init() from
+    tcpip_thread() to tcpip_init(). This way, raw API connections can be
+    initialized before tcpip_thread is running (e.g. before OS is started)
+
+=======
   2007-03-02 Frédéric Bernon
   * rawapi.txt: Fix documentation mismatch with etharp.h about etharp_tmr's call interval.
 
diff --git a/src/api/tcpip.c b/src/api/tcpip.c
index f0626378..bb4445ae 100644
--- a/src/api/tcpip.c
+++ b/src/api/tcpip.c
@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * All rights reserved. 
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
  *
  * 1. Redistributions of source code must retain the above copyright notice,
@@ -11,21 +11,21 @@
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission. 
+ *    derived from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  *
  * This file is part of the lwIP TCP/IP stack.
- * 
+ *
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
@@ -97,15 +97,6 @@ tcpip_thread(void *arg)
 {
   struct tcpip_msg *msg;
 
-  (void)arg;
-
-  ip_init();
-#if LWIP_UDP  
-  udp_init();
-#endif
-#if LWIP_TCP
-  tcp_init();
-#endif
 #if IP_REASSEMBLY
   sys_timeout(1000, ip_timer, NULL);
 #endif
@@ -139,13 +130,13 @@ err_t
 tcpip_input(struct pbuf *p, struct netif *inp)
 {
   struct tcpip_msg *msg;
-  
+
   msg = memp_malloc(MEMP_TCPIP_MSG);
   if (msg == NULL) {
-    pbuf_free(p);    
-    return ERR_MEM;  
+    pbuf_free(p);
+    return ERR_MEM;
   }
-  
+
   msg->type = TCPIP_MSG_INPUT;
   msg->msg.inp.p = p;
   msg->msg.inp.netif = inp;
@@ -157,12 +148,12 @@ err_t
 tcpip_callback(void (*f)(void *ctx), void *ctx)
 {
   struct tcpip_msg *msg;
-  
+
   msg = memp_malloc(MEMP_TCPIP_MSG);
   if (msg == NULL) {
-    return ERR_MEM;  
+    return ERR_MEM;
   }
-  
+
   msg->type = TCPIP_MSG_CALLBACK;
   msg->msg.cb.f = f;
   msg->msg.cb.ctx = ctx;
@@ -186,6 +177,14 @@ tcpip_apimsg(struct api_msg *apimsg)
 void
 tcpip_init(void (* initfunc)(void *), void *arg)
 {
+  ip_init();
+#if LWIP_UDP
+  udp_init();
+#endif
+#if LWIP_TCP
+  tcp_init();
+#endif
+
   tcpip_init_done = initfunc;
   tcpip_init_done_arg = arg;
   mbox = sys_mbox_new();