deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added initalization of the serial library. Changed LPM3 to LPM2 since the current serial driver does not work with LPM3 yet (we need to add start edge detection interrupt support to fix that).

Browse source
This commit is contained in:
adamdunkels 2008-01-08 08:21:03 +00:00
parent 690805ebe7
commit f935be10c9
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
platform/sky/contiki-sky-main.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)$Id: contiki-sky-main.c,v 1.20 2007/12/17 12:35:23 adamdunkels Exp $ * @(#)$Id: contiki-sky-main.c,v 1.21 2008/01/08 08:21:03 adamdunkels Exp $
*/ */
#include <signal.h> #include <signal.h>
@ -45,6 +45,7 @@
#include "dev/xmem.h" #include "dev/xmem.h"
#include "dev/simple-cc2420.h" #include "dev/simple-cc2420.h"
#include "dev/watchdog.h" #include "dev/watchdog.h"
#include "dev/serial.h"
#include "dev/slip.h" #include "dev/slip.h"
#include "dev/uart1.h" #include "dev/uart1.h"
@ -150,7 +151,7 @@ main(int argc, char **argv)
#endif /* WITH_UIP */ #endif /* WITH_UIP */
/* printf("Starting %s " */ /* printf("Starting %s " */
/* "($Id: contiki-sky-main.c,v 1.20 2007/12/17 12:35:23 adamdunkels Exp $)\n", __FILE__); */ /* "($Id: contiki-sky-main.c,v 1.21 2008/01/08 08:21:03 adamdunkels Exp $)\n", __FILE__); */
leds_on(LEDS_GREEN); leds_on(LEDS_GREEN);
ds2411_init(); ds2411_init();
sensors_light_init(); sensors_light_init();
@ -192,6 +193,12 @@ main(int argc, char **argv)
process_init(); process_init();
process_start(&etimer_process, NULL); process_start(&etimer_process, NULL);
process_start(&sensors_process, NULL); process_start(&sensors_process, NULL);
#if !WITH_UIP
uart1_set_input(serial_input_byte);
serial_init();
#endif
#if PROFILE_CONF_ON #if PROFILE_CONF_ON
profile_init(); profile_init();
#endif /* PROFILE_CONF_ON */ #endif /* PROFILE_CONF_ON */
@ -230,8 +237,6 @@ main(int argc, char **argv)
/* /*
* This is the scheduler loop. * This is the scheduler loop.
*/ */
printf("process_run()...\n");
watchdog_start(); watchdog_start();
while (1) { while (1) {
int r; int r;
@ -263,7 +268,7 @@ main(int argc, char **argv)
were awake. */ were awake. */
energest_type_set(ENERGEST_TYPE_IRQ, irq_energest); energest_type_set(ENERGEST_TYPE_IRQ, irq_energest);
watchdog_stop(); watchdog_stop();
_BIS_SR(GIE | SCG0 | SCG1 | CPUOFF); /* LPM3 sleep. This _BIS_SR(GIE | SCG0 | /*SCG1 | */CPUOFF); /* LPM3 sleep. This
statement will block statement will block
until the CPU is until the CPU is
woken up by an woken up by an