STM8L Demo and PAL driver working now.

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

4 files changed, 22 insertions, 13 deletions

diff --git a/boards/ST_STM8L_DISCOVERY/board.c b/boards/ST_STM8L_DISCOVERY/board.c
index dd4a27472..8a013fa26 100644
--- a/boards/ST_STM8L_DISCOVERY/board.c
+++ b/boards/ST_STM8L_DISCOVERY/board.c
@@ -39,13 +39,13 @@ void hwinit(void) {
   /*

    * TIM2 initialization as system tick.

    */

-  CLK->PCKENR1 |= 32;           /* PCKEN15, TIM2 clock source.*/

+  CLK->PCKENR1 |= CLK_PCKENR1_TIM2;

   TIM2->PSCR    = 4;            /* Prescaler divide by 2^4=16.*/

   TIM2->ARRH    = (uint8_t)(TIM2_ARR >> 8);

   TIM2->ARRL    = (uint8_t)(TIM2_ARR);

   TIM2->CNTRH   = 0;

   TIM2->CNTRL   = 0;

   TIM2->SR1     = 0;

-  TIM2->IER     = 1;            /* UIE */

-  TIM2->CR1     = 1;            /* CEN */

+  TIM2->IER     = TIM_IER_UIE;

+  TIM2->CR1     = TIM_CR1_CEN;

 }

diff --git a/boards/ST_STM8L_DISCOVERY/board.h b/boards/ST_STM8L_DISCOVERY/board.h
index a349aa9e4..3355c28c9 100644
--- a/boards/ST_STM8L_DISCOVERY/board.h
+++ b/boards/ST_STM8L_DISCOVERY/board.h
@@ -116,7 +116,7 @@
  * Port C initial setup.

  */

 #define VAL_GPIOCODR        0

-#define VAL_GPIOCDDR        (1 < PC_LED4)

+#define VAL_GPIOCDDR        (1 << PC_LED4)

 #define VAL_GPIOCCR1        0xFF            /* All pull-up/push-pull.       */

 #define VAL_GPIOCCR2        0

 

@@ -132,7 +132,7 @@
  * Port E initial setup.

  */

 #define VAL_GPIOEODR        0

-#define VAL_GPIOEDDR        (1 < PE_LED3)

+#define VAL_GPIOEDDR        (1 << PE_LED3)

 #define VAL_GPIOECR1        0xFF            /* All pull-up/push-pull.       */

 #define VAL_GPIOECR2        0

 

@@ -144,6 +144,19 @@
 #define VAL_GPIOFCR1        0xFF            /* All pull-up/push-pull.       */

 #define VAL_GPIOFCR2        0

 

+/*

+ * TIM2-update ISR segment code. This code is injected into the appropriate

+ * ISR by the HAL.

+ */

+#define _TIM2_UPDATE_ISR() {                                                \

+  if (TIM2->SR1 & TIM_SR1_UIF) {                                            \

+    chSysLockFromIsr();                                                     \

+    chSysTimerHandlerI();                                                   \

+    chSysUnlockFromIsr();                                                   \

+    TIM2->SR1 = 0;                                                          \

+  }                                                                         \

+}

+

 #ifdef __cplusplus

 extern "C" {

 #endif

diff --git a/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/vectors.c b/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/vectors.c
index d35e6a51e..ea2f03c9a 100644
--- a/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/vectors.c
+++ b/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/vectors.c
@@ -211,7 +211,7 @@ exception_vector_t const _vectab[] = {
 	{0x82, _unhandled_exception},               /* vector18 */

 #endif

 

-#if defined(_TIM2_OVERFLOW_ISR) || defined(_USART2_TRANSMIT_ISR)

+#if defined(_TIM2_UPDATE_ISR) || defined(_USART2_TRANSMIT_ISR)

 	{0x82, vector19},

 #else

 	{0x82, _unhandled_exception},               /* vector19 */

diff --git a/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/main.c b/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/main.c
index d0d7b4060..6e61e0521 100644
--- a/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/main.c
+++ b/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/main.c
@@ -29,14 +29,14 @@ static msg_t Thread1(void *arg) {
 

   (void)arg;

   while (TRUE) {

-    palClearPad(GPIOC, PC_LED4);

-    chThdSleepMilliseconds(500);

     palSetPad(GPIOC, PC_LED4);

     chThdSleepMilliseconds(500);

-    palClearPad(GPIOE, PE_LED3);

+    palClearPad(GPIOC, PC_LED4);

     chThdSleepMilliseconds(500);

     palSetPad(GPIOE, PE_LED3);

     chThdSleepMilliseconds(500);

+    palClearPad(GPIOE, PE_LED3);

+    chThdSleepMilliseconds(500);

   }

   return 0;

 }

@@ -51,10 +51,6 @@ void main(void) {
    */

   hwinit();

 

-    palClearPad(GPIOC, PC_LED4);

-    palSetPad(GPIOE, PE_LED3);

-    while(1);

-

   /*

    * OS initialization.

    */