From d270e4943d5ab623bbef81e792f91708d2cc435a Mon Sep 17 00:00:00 2001 From: Fredrik Osterlind Date: Wed, 30 May 2012 12:59:42 +0200 Subject: [PATCH] bugfix: slip must be initialized after ctimer, as it uses ctimers --- platform/sky/contiki-sky-main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c index 888039702..c5f76f632 100644 --- a/platform/sky/contiki-sky-main.c +++ b/platform/sky/contiki-sky-main.c @@ -204,9 +204,6 @@ main(int argc, char **argv) uart1_init(BAUD2UBR(115200)); /* Must come before first printf */ -#if WITH_UIP - slip_arch_init(BAUD2UBR(115200)); -#endif /* WITH_UIP */ leds_on(LEDS_GREEN); ds2411_init(); @@ -253,6 +250,10 @@ main(int argc, char **argv) ctimer_init(); +#if WITH_UIP + slip_arch_init(BAUD2UBR(115200)); +#endif /* WITH_UIP */ + init_platform(); set_rime_addr();