diff options
Diffstat (limited to 'demos/MSP430-MSP430x1611-GCC')
| -rw-r--r-- | demos/MSP430-MSP430x1611-GCC/Makefile | 33 | ||||
| -rw-r--r-- | demos/MSP430-MSP430x1611-GCC/board.c | 54 | ||||
| -rw-r--r-- | demos/MSP430-MSP430x1611-GCC/board.h | 71 |
3 files changed, 18 insertions, 140 deletions
diff --git a/demos/MSP430-MSP430x1611-GCC/Makefile b/demos/MSP430-MSP430x1611-GCC/Makefile index 97de20466..647080524 100644 --- a/demos/MSP430-MSP430x1611-GCC/Makefile +++ b/demos/MSP430-MSP430x1611-GCC/Makefile @@ -40,20 +40,22 @@ LDSCRIPT = mspgcc/msp430x1611.x # Imported source files
CHIBIOS = ../..
-include ${CHIBIOS}/os/hal/hal.mk
-include ${CHIBIOS}/os/hal/platforms/MSP430/platform.mk
-include ${CHIBIOS}/os/ports/GCC/MSP430/port.mk
-include ${CHIBIOS}/os/kernel/kernel.mk
-include ${CHIBIOS}/test/test.mk
+include $(CHIBIOS)/boards/OLIMEX_MSP430_P1611/board.mk
+include $(CHIBIOS)/os/hal/platforms/MSP430/platform.mk
+include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/os/ports/GCC/MSP430/port.mk
+include $(CHIBIOS)/os/kernel/kernel.mk
+include $(CHIBIOS)/test/test.mk
# C sources here.
-CSRC = ${PORTSRC} \
- ${KERNSRC} \
- ${TESTSRC} \
- ${HALSRC} \
- ${PLATFORMSRC} \
- ${CHIBIOS}/os/various/evtimer.c \
- board.c main.c
+CSRC = $(PORTSRC) \
+ $(KERNSRC) \
+ $(TESTSRC) \
+ $(HALSRC) \
+ $(PLATFORMSRC) \
+ $(BOARDSRC) \
+ $(CHIBIOS)/os/various/evtimer.c \
+ main.c
# C++ sources here.
CPPSRC =
@@ -61,8 +63,9 @@ CPPSRC = # List ASM source files here
ASMSRC = $(PORTASM)
-INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \
- ${CHIBIOS}/os/various
+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
+ $(HALINC) $(PLATFORMINC) $(BOARDINC) \
+ $(CHIBIOS)/os/various
#
# Project, sources and paths
@@ -144,4 +147,4 @@ ULIBS = # End of user defines
##############################################################################
-include ${CHIBIOS}/os/ports/GCC/MSP430/rules.mk
+include $(CHIBIOS)/os/ports/GCC/MSP430/rules.mk
diff --git a/demos/MSP430-MSP430x1611-GCC/board.c b/demos/MSP430-MSP430x1611-GCC/board.c deleted file mode 100644 index 93197bcfd..000000000 --- a/demos/MSP430-MSP430x1611-GCC/board.c +++ /dev/null @@ -1,54 +0,0 @@ -/*
- ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
-
- This file is part of ChibiOS/RT.
-
- ChibiOS/RT is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS/RT is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <signal.h>
-
-#include "ch.h"
-#include "hal.h"
-
-CH_IRQ_HANDLER(TIMERA0_VECTOR) {
-
- CH_IRQ_PROLOGUE();
-
- chSysLockFromIsr();
- chSysTimerHandlerI();
- chSysUnlockFromIsr();
-
- CH_IRQ_EPILOGUE();
-}
-
-/*
- * Hardware initialization goes here.
- * NOTE: Interrupts are still disabled.
- */
-void hwinit(void) {
-
- /*
- * HAL initialization.
- */
- halInit();
-
- /*
- * Timer 0 setup, uses SMCLK as source.
- */
- TACCR0 = SMCLK / 4 / CH_FREQUENCY - 1;/* Counter limit. */
- TACTL = TACLR; /* Clean start. */
- TACTL = TASSEL_2 | ID_2 | MC_1; /* Src=SMCLK, ID=4, cmp=TACCR0. */
- TACCTL0 = CCIE; /* Interrupt on compare. */
-}
diff --git a/demos/MSP430-MSP430x1611-GCC/board.h b/demos/MSP430-MSP430x1611-GCC/board.h deleted file mode 100644 index 8f22c6a8e..000000000 --- a/demos/MSP430-MSP430x1611-GCC/board.h +++ /dev/null @@ -1,71 +0,0 @@ -/*
- ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.
-
- This file is part of ChibiOS/RT.
-
- ChibiOS/RT is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS/RT is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-/*
- * Clock constants. - */
-#define LFXT1CLK 32768
-#define XT2CLK 8000000
-#define DCOCLK 750000
-
-/*
- * Pin definitions for the Olimex MSP430-P1611 board.
- */
-#define P3_O_TXD0 4
-#define P3_O_TXD0_MASK (1 << P3_O_TXD0)
-#define P3_I_RXD0 5
-#define P3_I_RXD0_MASK (1 << P3_I_RXD0)
-#define P6_O_LED 0
-#define P6_O_LED_MASK (1 << P6_O_LED)
-#define P6_I_BUTTON 1
-#define P6_I_BUTTON_MASK (1 << P6_I_BUTTON)
-
-/*
- * Initial I/O ports settings.
- */
-#define VAL_P1OUT 0x00
-#define VAL_P1DIR 0xFF
-
-#define VAL_P2OUT 0x00
-#define VAL_P2DIR 0xFF
-
-#define VAL_P3OUT P3_O_TXD0_MASK
-#define VAL_P3DIR ~P3_I_RXD0_MASK
-
-#define VAL_P4OUT 0x00
-#define VAL_P4DIR 0xFF
-
-#define VAL_P5OUT 0x00
-#define VAL_P5DIR 0xFF
-
-#define VAL_P6OUT P6_O_LED_MASK
-#define VAL_P6DIR ~P6_I_BUTTON_MASK
-
-#ifdef __cplusplus
-extern "C" {
-#endif
- void hwinit(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _BOARD_H_ */
|