git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1371 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 14 insertions, 50 deletions

diff --git a/demos/MSP430-MSP430x1611-GCC/board.c b/demos/MSP430-MSP430x1611-GCC/board.c
index 32f7c325b..93197bcfd 100644
--- a/demos/MSP430-MSP430x1611-GCC/board.c
+++ b/demos/MSP430-MSP430x1611-GCC/board.c
@@ -17,26 +17,21 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include <ch.h>

-#include <pal.h>

-#include <serial.h>

-

 #include <signal.h>

 

-#include "board.h"

+#include "ch.h"

+#include "hal.h"

 

-/*

- * Digital I/O ports static configuration as defined in @p board.h.
- */

-static const MSP430DIOConfig config =

-{

-  {VAL_P1OUT, VAL_P1DIR},

-  {VAL_P2OUT, VAL_P2DIR},

-  {VAL_P3OUT, VAL_P3DIR},

-  {VAL_P4OUT, VAL_P4DIR},

-  {VAL_P5OUT, VAL_P5DIR},

-  {VAL_P6OUT, VAL_P6DIR},

-};

+CH_IRQ_HANDLER(TIMERA0_VECTOR) {

+

+  CH_IRQ_PROLOGUE();

+

+  chSysLockFromIsr();

+  chSysTimerHandlerI();

+  chSysUnlockFromIsr();

+

+  CH_IRQ_EPILOGUE();

+}

 

 /*

  * Hardware initialization goes here.

@@ -45,24 +40,9 @@ static const MSP430DIOConfig config =
 void hwinit(void) {

 

   /*

-   * Clock sources setup.

-   */

-  DCOCTL  = VAL_DCOCTL;

-  BCSCTL1 = VAL_BCSCTL1;

-#if defined(MSP_USE_XT2CLK)

-  do {

-    int i;

-    IFG1 &= ~OFIFG;

-     for (i = 255; i > 0; i--)

-       asm("nop");

-  } while (IFG1 & OFIFG);

-#endif

-  BCSCTL2 = VAL_BCSCTL2;

-

-  /*

-   * I/O ports initialization.

+   * HAL initialization.

    */

-  palInit(&config);

+  halInit();

 

   /*

    * Timer 0 setup, uses SMCLK as source.

@@ -71,20 +51,4 @@ void hwinit(void) {
   TACTL = TACLR;                        /* Clean start.                 */

   TACTL = TASSEL_2 | ID_2 | MC_1;       /* Src=SMCLK, ID=4, cmp=TACCR0. */

   TACCTL0 = CCIE;                       /* Interrupt on compare.        */

-

-  /*

-   * Other subsystems.

-   */

-  sdInit();

-}

-

-CH_IRQ_HANDLER(TIMERA0_VECTOR) {

-

-  CH_IRQ_PROLOGUE();

-

-  chSysLockFromIsr();

-  chSysTimerHandlerI();

-  chSysUnlockFromIsr();

-

-  CH_IRQ_EPILOGUE();

 }