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

Prefer UART0 for stdout; move DEBUFGLOW macro below definition of uint8_t

Browse source
This commit is contained in:
David Kopf 2012-05-28 13:08:30 -04:00
parent e9a55cc222
commit e0dab7c2fc
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
platform/avr-atmega128rfa1/contiki-main.c
View file

@ -45,14 +45,6 @@
#define PRINTD(...)
#endif
/* Track interrupt flow through mac, rdc and radio driver */
#if DEBUGFLOWSIZE
uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
#define DEBUGFLOW(c) if (debugflowsize<(DEBUGFLOWSIZE-1)) debugflow[debugflowsize++]=c
#else
#define DEBUGFLOW(c)
#endif
#include <avr/pgmspace.h>
#include <avr/fuse.h>
#include <avr/eeprom.h>
@ -98,6 +90,15 @@ uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
#include "net/rime.h"
/* Track interrupt flow through mac, rdc and radio driver */
//#define DEBUGFLOWSIZE 32
#if DEBUGFLOWSIZE
uint8_t debugflowsize,debugflow[DEBUGFLOWSIZE];
#define DEBUGFLOW(c) if (debugflowsize<(DEBUGFLOWSIZE-1)) debugflow[debugflowsize++]=c
#else
#define DEBUGFLOW(c)
#endif
/* Get periodic prints from idle loop, from clock seconds or rtimer interrupts */
/* Use of rtimer will conflict with other rtimer interrupts such as contikimac radio cycling */
/* STAMPS will print ENERGEST outputs if that is enabled. */
@ -187,8 +188,12 @@ void initialize(void)
/* Second rs232 port for debugging or slip alternative */
rs232_init(RS232_PORT_1, USART_BAUD_57600,USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
/* Redirect stdout to second port */
/* Redirect stdout */
#if RF230BB_CONF_LEDONPORTE1 || defined(RAVEN_LCD_INTERFACE)
rs232_redirect_stdout(RS232_PORT_1);
#else
rs232_redirect_stdout(RS232_PORT_0);
#endif
clock_init();
if(MCUSR & (1<<PORF )) PRINTD("Power-on reset.\n");