From f83000af8ad68c6862aa9ef452f2936322a9ca22 Mon Sep 17 00:00:00 2001 From: nvt-se Date: Thu, 29 May 2008 22:06:18 +0000 Subject: [PATCH] clear bit when uart edge is set. --- platform/msb430/contiki-msb430-main.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/platform/msb430/contiki-msb430-main.c b/platform/msb430/contiki-msb430-main.c index 82cad450b..18376401c 100644 --- a/platform/msb430/contiki-msb430-main.c +++ b/platform/msb430/contiki-msb430-main.c @@ -66,6 +66,7 @@ main(void) { #ifdef WITH_SDC sd_cache_t sd_cache; + int r; #endif msp430_cpu_init(); @@ -111,18 +112,14 @@ main(void) leds_off(LEDS_ALL); -#ifdef WITH_SDC - { - int r; - sdspi_init(); - sd_init(); - r = sd_init_card(&sd_cache); - if (r == SD_INIT_SUCCESS) { - printf("Found SD card (%lu bytes)\n", sd_get_size()); - uart_set_mode(UART_MODE_SPI); - } else { - printf("SD card initialization failed: %d\n", r); - } +#if WITH_SDC + sdspi_init(); + sd_init(); + r = sd_init_card(&sd_cache); + if (r == SD_INIT_SUCCESS) { + printf("Found SD card (%lu bytes)\n", sd_get_size()); + } else { + printf("SD card initialization failed: %d\n", r); } #endif @@ -168,7 +165,7 @@ main(void) energest_type_set(ENERGEST_TYPE_IRQ, irq_energest); if (uart_edge) { - _BIS_SR(LPM1_bits + GIE); + _BIC_SR(LPM1_bits + GIE); } else { _BIS_SR(LPM1_bits + GIE); }