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

Moved mandatory low-level initialization into main file, moved all uIP and network initialization into int_net()

Browse source
This commit is contained in:
adamdunkels 2006-10-06 07:49:31 +00:00
parent d239998175
commit 60c7228675
3 changed files with 47 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
platform/esb/contiki-esb-default-init-lowlevel.c
View file

@ -28,54 +28,17 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: contiki-esb-default-init-lowlevel.c,v 1.1 2006/06/17 22:41:27 adamdunkels Exp $ * @(#)$Id: contiki-esb-default-init-lowlevel.c,v 1.2 2006/10/06 07:49:31 adamdunkels Exp $
*/ */
#include "contiki-esb.h" #include "contiki-esb.h"
#include "dev/esb-sensors.h" #include "dev/esb-sensors.h"
static void init_ports_toberemoved() {
////////// Port 1 ////
P1SEL = 0x00;
P1DIR = 0x81; // Outputs: P10=IRSend, P17=RS232RTS
// Inputs: P11=Light, P12=IRRec, P13=PIR, P14=Vibration,
// P15=Clockalarm, P16=RS232CTS
P1OUT = 0x00;
////////// Port 2 ////
P2SEL = 0x00; // No Sels
P2DIR = 0x7F; // Outpus: P20..P23=Leds+Beeper, P24..P26=Poti
// Inputs: P27=Taster
P2OUT = 0x77;
////////// Port 3 ////
P3SEL = 0xE0; // Sels for P34..P37 to activate UART,
P3DIR = 0x5F; // Inputs: P30..P33=CON4, P35/P37=RXD Transceiver/RS232
// OutPuts: P36/P38=TXD Transceiver/RS232
P3OUT = 0xE0; // Output a Zero on P34(TXD Transceiver) and turn SELECT off when receiving!!!
////////// Port 4 ////
P4SEL = 0x00; // CON5 Stecker
P4DIR = 0xFF;
P4OUT = 0x00;
////////// Port 5 ////
P5SEL = 0x00; // P50/P51= Clock SDA/SCL, P52/P53/P54=EEPROM SDA/SCL/WP
P5DIR = 0xDA; // P56/P57=Transceiver CNTRL0/1
P5OUT = 0x0F;
////////// Port 6 ////
P6SEL = 0x00; // P60=Microphone, P61=PIR digital (same as P13), P62=PIR analog
P6DIR = 0x00; // P63=extern voltage, P64=battery voltage, P65=Receive power
P6OUT = 0x00;
}
void void
init_lowlevel(void) init_lowlevel(void)
{ {
init_ports_toberemoved();
esb_sensors_init(); esb_sensors_init();
esb_sensors_on(); esb_sensors_on();
leds_init(); leds_init();
rs232_init(); rs232_init();
tr1001_init();
} }

6
platform/esb/contiki-esb-default-init-net.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: contiki-esb-default-init-net.c,v 1.2 2006/08/09 16:13:40 bg- Exp $ * @(#)$Id: contiki-esb-default-init-net.c,v 1.3 2006/10/06 07:49:31 adamdunkels Exp $
*/ */
#include "contiki-esb.h" #include "contiki-esb.h"
@ -45,9 +45,13 @@ void
init_net(void) init_net(void)
{ {
uip_ipaddr_t hostaddr; uip_ipaddr_t hostaddr;
uip_init();
uip_fw_init();
rs232_set_input(slip_input_byte); rs232_set_input(slip_input_byte);
tr1001_init();
process_start(&tr1001_drv_process, NULL); process_start(&tr1001_drv_process, NULL);
process_start(&slip_process, NULL); process_start(&slip_process, NULL);

45
platform/esb/contiki-esb-main.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: contiki-esb-main.c,v 1.1 2006/06/17 22:41:27 adamdunkels Exp $ * @(#)$Id: contiki-esb-main.c,v 1.2 2006/10/06 07:49:31 adamdunkels Exp $
*/ */
#include <io.h> #include <io.h>
@ -80,11 +80,49 @@ PROCESS_THREAD(contiki_esb_main_init_process, ev, data)
PROCESS_END(); PROCESS_END();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void init_ports_toberemoved() {
////////// Port 1 ////
P1SEL = 0x00;
P1DIR = 0x81; // Outputs: P10=IRSend, P17=RS232RTS
// Inputs: P11=Light, P12=IRRec, P13=PIR, P14=Vibration,
// P15=Clockalarm, P16=RS232CTS
P1OUT = 0x00;
////////// Port 2 ////
P2SEL = 0x00; // No Sels
P2DIR = 0x7F; // Outpus: P20..P23=Leds+Beeper, P24..P26=Poti
// Inputs: P27=Taster
P2OUT = 0x77;
////////// Port 3 ////
P3SEL = 0xE0; // Sels for P34..P37 to activate UART,
P3DIR = 0x5F; // Inputs: P30..P33=CON4, P35/P37=RXD Transceiver/RS232
// OutPuts: P36/P38=TXD Transceiver/RS232
P3OUT = 0xE0; // Output a Zero on P34(TXD Transceiver) and turn SELECT off when receiving!!!
////////// Port 4 ////
P4SEL = 0x00; // CON5 Stecker
P4DIR = 0xFF;
P4OUT = 0x00;
////////// Port 5 ////
P5SEL = 0x00; // P50/P51= Clock SDA/SCL, P52/P53/P54=EEPROM SDA/SCL/WP
P5DIR = 0xDA; // P56/P57=Transceiver CNTRL0/1
P5OUT = 0x0F;
////////// Port 6 ////
P6SEL = 0x00; // P60=Microphone, P61=PIR digital (same as P13), P62=PIR analog
P6DIR = 0x00; // P63=extern voltage, P64=battery voltage, P65=Receive power
P6OUT = 0x00;
}
/*---------------------------------------------------------------------------*/
int int
main(void) main(void)
{ {
msp430_cpu_init(); msp430_cpu_init();
init_ports_toberemoved();
init_lowlevel(); init_lowlevel();
clock_init(); clock_init();
@ -93,9 +131,8 @@ main(void)
random_init(0); random_init(0);
uip_init(); node_id_restore();
uip_fw_init();
process_start(&contiki_esb_main_init_process, NULL); process_start(&contiki_esb_main_init_process, NULL);
/* watchdog_init();*/ /* watchdog_init();*/