Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-22 10:30:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix to allow building without LCD interface

Browse Source
This commit is contained in:
c_oflynn 2008-10-15 14:38:20 +00:00
parent 0a6ae9b7aa
commit 1375511179
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/raven-lcd-interface/Makefile.raven-lcd-interface
View File

@ -1,3 +1,4 @@
raven-lcd-interface_src = raven-lcd.c raven-lcd-interface_src = raven-lcd.c
CFLAGS+=-DRAVEN_LCD_INTERFACE=1

9
platform/avr-raven/contiki-raven-main.c
View File

@ -61,7 +61,9 @@
#include "dev/serial.h" #include "dev/serial.h"
#include "dev/slip.h" #include "dev/slip.h"
#ifdef RAVEN_LCD_INTERFACE
#include "raven-lcd.h" #include "raven-lcd.h"
#endif
#include "sicslowmac.h" #include "sicslowmac.h"
@ -76,18 +78,23 @@ FUSES =
/* Put default MAC address in EEPROM */ /* Put default MAC address in EEPROM */
uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; uint8_t mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
#ifdef RAVEN_LCD_INTERFACE
PROCINIT(&etimer_process, &mac_process, &tcpip_process, &raven_lcd_process); PROCINIT(&etimer_process, &mac_process, &tcpip_process, &raven_lcd_process);
#else
PROCINIT(&etimer_process, &mac_process, &tcpip_process);
#endif
void void
init_lowlevel(void) init_lowlevel(void)
{ {
#ifdef RAVEN_LCD_INTERFACE
/* First rs232 port for Raven 3290 port */ /* First rs232 port for Raven 3290 port */
rs232_init(RS232_PORT_0, USART_BAUD_38400, rs232_init(RS232_PORT_0, USART_BAUD_38400,
USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8); USART_PARITY_NONE | USART_STOP_BITS_1 | USART_DATA_BITS_8);
/* Set input handler for 3290 port */ /* Set input handler for 3290 port */
rs232_set_input(0,raven_lcd_serial_input); rs232_set_input(0,raven_lcd_serial_input);
#endif
/* Second rs232 port for debugging */ /* Second rs232 port for debugging */
rs232_init(RS232_PORT_1, USART_BAUD_57600, rs232_init(RS232_PORT_1, USART_BAUD_57600,