diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-11-10 21:46:34 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-11-10 21:46:34 +0000 |
| commit | a7b039fae4798eb96b28a8cb59267d26fb9261a9 (patch) | |
| tree | e3a6f761bf1e85786b7b2f6dfbc30a3617cbc94e | |
| parent | e4cdc96106cefcc970f4b06e7ffed1032e6db0d2 (diff) | |
| download | ChibiOS-a7b039fae4798eb96b28a8cb59267d26fb9261a9.tar.gz ChibiOS-a7b039fae4798eb96b28a8cb59267d26fb9261a9.tar.bz2 ChibiOS-a7b039fae4798eb96b28a8cb59267d26fb9261a9.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2345 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/vectors.c | 12 | ||||
| -rw-r--r-- | demos/STM8L-STM8L152-DISCOVERY-STVD/demo/halconf.h | 4 | ||||
| -rw-r--r-- | demos/STM8L-STM8L152-DISCOVERY-STVD/demo/main.c | 14 | ||||
| -rw-r--r-- | os/hal/platforms/STM8L/hal_lld.c | 4 | ||||
| -rw-r--r-- | os/hal/platforms/STM8L/hal_lld.h | 2 |
5 files changed, 13 insertions, 23 deletions
diff --git a/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/vectors.c b/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/vectors.c index 76ebd1736..5c041d9df 100644 --- a/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/vectors.c +++ b/demos/STM8L-STM8L152-DISCOVERY-STVD/cosmic/vectors.c @@ -76,25 +76,15 @@ exception_vector_t const _vectab[] = { #endif
{0x82, vector}, /* vector11 */
{0x82, vector}, /* vector12 */
- {0x82, vector13}, /* vector13 */
+ {0x82, vector}, /* vector13 */
{0x82, vector}, /* vector14 */
{0x82, vector}, /* vector15 */
{0x82, vector}, /* vector16 */
-#if HAL_USE_SERIAL && STM8_SERIAL_USE_UART1
- {0x82, vector17}, /* vector17 */
- {0x82, vector18}, /* vector18 */
-#else
{0x82, vector}, /* vector17 */
{0x82, vector}, /* vector18 */
-#endif
{0x82, vector}, /* vector19 */
-#if HAL_USE_SERIAL && (STM8_SERIAL_USE_UART2 || STM8_SERIAL_USE_UART3)
{0x82, vector20}, /* vector20 */
- {0x82, vector21}, /* vector21 */
-#else
- {0x82, vector}, /* vector20 */
{0x82, vector}, /* vector21 */
-#endif
{0x82, vector}, /* vector22 */
{0x82, vector}, /* vector23 */
{0x82, vector}, /* vector24 */
diff --git a/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/halconf.h b/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/halconf.h index 3186be527..e75f8b89d 100644 --- a/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/halconf.h +++ b/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/halconf.h @@ -41,7 +41,7 @@ * @brief Enables the PAL subsystem.
*/
#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
-#define HAL_USE_PAL TRUE
+#define HAL_USE_PAL FALSE
#endif
/**
@@ -90,7 +90,7 @@ * @brief Enables the SERIAL subsystem.
*/
#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL TRUE
+#define HAL_USE_SERIAL FALSE
#endif
/**
diff --git a/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/main.c b/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/main.c index 35321bf62..c8c8e44fe 100644 --- a/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/main.c +++ b/demos/STM8L-STM8L152-DISCOVERY-STVD/demo/main.c @@ -29,9 +29,9 @@ static msg_t Thread1(void *arg) { (void)arg;
while (TRUE) {
- palClearPad(GPIOD, PD_LD10);
+// palClearPad(GPIOD, PD_LD10);
chThdSleepMilliseconds(500);
- palSetPad(GPIOD, PD_LD10);
+// palSetPad(GPIOD, PD_LD10);
chThdSleepMilliseconds(500);
}
return 0;
@@ -55,7 +55,7 @@ void main(void) { /*
* Activates the serial driver 1 using the driver default configuration.
*/
- sdStart(&SD2, NULL);
+// sdStart(&SD2, NULL);
/*
* Creates the blinker thread.
@@ -66,10 +66,10 @@ void main(void) { * Normal main() thread activity.
*/
while (TRUE) {
- if (palReadPad(GPIOG, 0) == PAL_LOW)
- TestThread(&SD2);
- if (palReadPad(GPIOG, 1) == PAL_LOW)
- sdWriteTimeout(&SD2, "Hello World!\r\n", 14, TIME_INFINITE);
+// if (palReadPad(GPIOG, 0) == PAL_LOW)
+// TestThread(&SD2);
+// if (palReadPad(GPIOG, 1) == PAL_LOW)
+// sdWriteTimeout(&SD2, "Hello World!\r\n", 14, TIME_INFINITE);
chThdSleepMilliseconds(1000);
}
}
diff --git a/os/hal/platforms/STM8L/hal_lld.c b/os/hal/platforms/STM8L/hal_lld.c index 881a09fdd..8c0f645a6 100644 --- a/os/hal/platforms/STM8L/hal_lld.c +++ b/os/hal/platforms/STM8L/hal_lld.c @@ -39,7 +39,7 @@ /**
* @brief PAL setup.
* @details Digital I/O ports static configuration as defined in @p board.h.
- */
+ *//*
ROMCONST PALConfig pal_default_config =
{
{
@@ -55,7 +55,7 @@ ROMCONST PALConfig pal_default_config = {VAL_GPIOIODR, 0, VAL_GPIOIDDR, VAL_GPIOICR1, VAL_GPIOICR2},
#endif
}
-};
+};*/
/*===========================================================================*/
/* Driver local functions. */
diff --git a/os/hal/platforms/STM8L/hal_lld.h b/os/hal/platforms/STM8L/hal_lld.h index c7a62baae..891f2650b 100644 --- a/os/hal/platforms/STM8L/hal_lld.h +++ b/os/hal/platforms/STM8L/hal_lld.h @@ -228,7 +228,7 @@ #define RTCCLK (LSICLK / (1 << STM8L_RTCCLK_DIVIDER))
#elif STM8L_RTCCLK_SOURCE == CLK_RTCSEL_HSE
#define RTCCLK (HSECLK / (1 << STM8L_RTCCLK_DIVIDER))
-#elif STM8L_SYSCLK_SOURCE == CLK_RTCSEL_LSE
+#elif STM8L_RTCCLK_SOURCE == CLK_RTCSEL_LSE
#define RTCCLK (LSECLK / (1 << STM8L_RTCCLK_DIVIDER))
#else
#error "specified invalid RTCCLK source"
|