diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-08-21 13:11:31 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-08-21 13:11:31 +0000 |
| commit | b19be5d31de2003c7ff52df43f095a3d498b5bf3 (patch) | |
| tree | 00ac99e1917c051f5997ab4030230b87e3d3e3c5 /demos/MSP430-MSP430x1611-GCC | |
| parent | 9d359d8a3b3eb87a58764ac2c696bc10037c480f (diff) | |
| download | ChibiOS-b19be5d31de2003c7ff52df43f095a3d498b5bf3.tar.gz ChibiOS-b19be5d31de2003c7ff52df43f095a3d498b5bf3.tar.bz2 ChibiOS-b19be5d31de2003c7ff52df43f095a3d498b5bf3.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1102 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/MSP430-MSP430x1611-GCC')
| -rw-r--r-- | demos/MSP430-MSP430x1611-GCC/Makefile | 6 | ||||
| -rw-r--r-- | demos/MSP430-MSP430x1611-GCC/board.c | 4 | ||||
| -rw-r--r-- | demos/MSP430-MSP430x1611-GCC/main.c | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/demos/MSP430-MSP430x1611-GCC/Makefile b/demos/MSP430-MSP430x1611-GCC/Makefile index e316c3fa9..6183fccf5 100644 --- a/demos/MSP430-MSP430x1611-GCC/Makefile +++ b/demos/MSP430-MSP430x1611-GCC/Makefile @@ -48,8 +48,9 @@ CSRC = ${PORTSRC} \ ${KERNSRC} \
${TESTSRC} \
../../os/io/pal.c \
- ../../os/ports/GCC/MSP430/pal_lld.c \
- ../../os/ports/GCC/MSP430/msp430_serial.c \
+ ../../os/io/serial.c \
+ ../../os/io/platforms/MSP430/pal_lld.c \
+ ../../os/io/platforms/MSP430/serial_lld.c \
../../os/various/evtimer.c \
board.c main.c
@@ -61,6 +62,7 @@ ASMSRC = $(PORTASM) INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
../../os/io \
+ ../../os/io/platforms/MSP430 \
../../os/various
#
diff --git a/demos/MSP430-MSP430x1611-GCC/board.c b/demos/MSP430-MSP430x1611-GCC/board.c index 2d5341beb..32f7c325b 100644 --- a/demos/MSP430-MSP430x1611-GCC/board.c +++ b/demos/MSP430-MSP430x1611-GCC/board.c @@ -19,11 +19,11 @@ #include <ch.h>
#include <pal.h>
+#include <serial.h>
#include <signal.h>
#include "board.h"
-#include "msp430_serial.h"
/*
* Digital I/O ports static configuration as defined in @p board.h. @@ -75,7 +75,7 @@ void hwinit(void) { /*
* Other subsystems.
*/
- serial_init();
+ sdInit();
}
CH_IRQ_HANDLER(TIMERA0_VECTOR) {
diff --git a/demos/MSP430-MSP430x1611-GCC/main.c b/demos/MSP430-MSP430x1611-GCC/main.c index 2f9f6d8b9..d52f2bb07 100644 --- a/demos/MSP430-MSP430x1611-GCC/main.c +++ b/demos/MSP430-MSP430x1611-GCC/main.c @@ -19,10 +19,10 @@ #include <ch.h>
#include <pal.h>
+#include <serial.h>
#include <test.h>
#include "board.h"
-#include "msp430_serial.h"
/*
* Red LEDs blinker thread, times are in milliseconds.
@@ -50,6 +50,11 @@ int main(int argc, char **argv) { hwinit();
/*
+ * Activates the communication port 1 using the driver default configuration.
+ */
+ sdStart(&COM1, NULL);
+
+ /*
* The main() function becomes a thread here then the interrupts are
* enabled and ChibiOS/RT goes live.
*/
|