From 6fc83cf601079459132b749d5d35113025695a7e Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 1 Sep 2013 20:53:51 +0200 Subject: [PATCH] Initialize tcpip process before resolver process. Since introduction of mDNS (https://github.com/contiki-os/contiki/commit/f145c17039b778cde1d53b6828757cd91dc8480a) the resolver process initialization depends on the tcpip process already being initialized (because of the call to udp_new()). --- platform/apple2enh/contiki-main.c | 6 +++--- platform/atari/contiki-main.c | 6 +++--- platform/atarixl/contiki-main.c | 6 +++--- platform/c128/contiki-main.c | 6 +++--- platform/c64/contiki-main.c | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/platform/apple2enh/contiki-main.c b/platform/apple2enh/contiki-main.c index c529b137a..5ebccb017 100644 --- a/platform/apple2enh/contiki-main.c +++ b/platform/apple2enh/contiki-main.c @@ -45,15 +45,15 @@ #endif /* WITH_GUI */ #if WITH_DNS -#define RESOLV_PROCESS &resolv_process, +#define RESOLV_PROCESS ,&resolv_process #else /* WITH_DNS */ #define RESOLV_PROCESS #endif /* WITH_DNS */ PROCINIT(&etimer_process, CTK_PROCESS - RESOLV_PROCESS - &tcpip_process); + &tcpip_process + RESOLV_PROCESS); void clock_update(void); diff --git a/platform/atari/contiki-main.c b/platform/atari/contiki-main.c index fa4fd7844..5efd80d80 100644 --- a/platform/atari/contiki-main.c +++ b/platform/atari/contiki-main.c @@ -45,15 +45,15 @@ #endif /* WITH_GUI */ #if WITH_DNS -#define RESOLV_PROCESS &resolv_process, +#define RESOLV_PROCESS ,&resolv_process #else /* WITH_DNS */ #define RESOLV_PROCESS #endif /* WITH_DNS */ PROCINIT(&etimer_process, CTK_PROCESS - RESOLV_PROCESS - &tcpip_process); + &tcpip_process + RESOLV_PROCESS); /*-----------------------------------------------------------------------------------*/ void diff --git a/platform/atarixl/contiki-main.c b/platform/atarixl/contiki-main.c index fa4fd7844..5efd80d80 100644 --- a/platform/atarixl/contiki-main.c +++ b/platform/atarixl/contiki-main.c @@ -45,15 +45,15 @@ #endif /* WITH_GUI */ #if WITH_DNS -#define RESOLV_PROCESS &resolv_process, +#define RESOLV_PROCESS ,&resolv_process #else /* WITH_DNS */ #define RESOLV_PROCESS #endif /* WITH_DNS */ PROCINIT(&etimer_process, CTK_PROCESS - RESOLV_PROCESS - &tcpip_process); + &tcpip_process + RESOLV_PROCESS); /*-----------------------------------------------------------------------------------*/ void diff --git a/platform/c128/contiki-main.c b/platform/c128/contiki-main.c index f870fa95a..316070c24 100644 --- a/platform/c128/contiki-main.c +++ b/platform/c128/contiki-main.c @@ -47,15 +47,15 @@ #endif /* WITH_GUI */ #if WITH_DNS -#define RESOLV_PROCESS &resolv_process, +#define RESOLV_PROCESS ,&resolv_process #else /* WITH_DNS */ #define RESOLV_PROCESS #endif /* WITH_DNS */ PROCINIT(&etimer_process, CTK_PROCESS - RESOLV_PROCESS - &tcpip_process); + &tcpip_process + RESOLV_PROCESS); /*-----------------------------------------------------------------------------------*/ void diff --git a/platform/c64/contiki-main.c b/platform/c64/contiki-main.c index d6e46f1be..99413aad7 100644 --- a/platform/c64/contiki-main.c +++ b/platform/c64/contiki-main.c @@ -47,15 +47,15 @@ #endif /* WITH_GUI */ #if WITH_DNS -#define RESOLV_PROCESS &resolv_process, +#define RESOLV_PROCESS ,&resolv_process #else /* WITH_DNS */ #define RESOLV_PROCESS #endif /* WITH_DNS */ PROCINIT(&etimer_process, CTK_PROCESS - RESOLV_PROCESS - &tcpip_process); + &tcpip_process + RESOLV_PROCESS); /*-----------------------------------------------------------------------------------*/ void