diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-11-27 11:11:45 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-11-27 11:11:45 +0000 |
| commit | 59d0598d8f61d247b7e092d97f861fedb3a11a5b (patch) | |
| tree | a439cac1d65e3f5a811209641fac8e9e9394d0fb | |
| parent | e89ce00860c0c3df61c50f516e4fec59f75ad1df (diff) | |
| download | ChibiOS-59d0598d8f61d247b7e092d97f861fedb3a11a5b.tar.gz ChibiOS-59d0598d8f61d247b7e092d97f861fedb3a11a5b.tar.bz2 ChibiOS-59d0598d8f61d247b7e092d97f861fedb3a11a5b.zip | |
Fixed problem in STM8S vectors file for the Cosmic compiler.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2431 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/STM8S-STM8S105-DISCOVERY-STVD/cosmic/vectors.c | 6 | ||||
| -rw-r--r-- | testhal/STM8S/SPI/cosmic/vectors.c | 82 |
2 files changed, 44 insertions, 44 deletions
diff --git a/demos/STM8S-STM8S105-DISCOVERY-STVD/cosmic/vectors.c b/demos/STM8S-STM8S105-DISCOVERY-STVD/cosmic/vectors.c index f97703b7f..494943416 100644 --- a/demos/STM8S-STM8S105-DISCOVERY-STVD/cosmic/vectors.c +++ b/demos/STM8S-STM8S105-DISCOVERY-STVD/cosmic/vectors.c @@ -69,7 +69,7 @@ exception_vector_t const _vectab[] = { {0x82, vector}, /* vector7 */
{0x82, vector}, /* vector8 */
{0x82, vector}, /* vector9 */
-#if HAL_USE_SPI && STM8_SPI_USE_SPI
+#if HAL_USE_SPI && STM8S_SPI_USE_SPI
{0x82, vector10},
#else
{0x82, vector}, /* vector10 */
@@ -80,7 +80,7 @@ exception_vector_t const _vectab[] = { {0x82, vector}, /* vector14 */
{0x82, vector}, /* vector15 */
{0x82, vector}, /* vector16 */
-#if HAL_USE_SERIAL && STM8_SERIAL_USE_UART1
+#if HAL_USE_SERIAL && STM8S_SERIAL_USE_UART1
{0x82, vector17}, /* vector17 */
{0x82, vector18}, /* vector18 */
#else
@@ -88,7 +88,7 @@ exception_vector_t const _vectab[] = { {0x82, vector}, /* vector18 */
#endif
{0x82, vector}, /* vector19 */
-#if HAL_USE_SERIAL && (STM8_SERIAL_USE_UART2 || STM8_SERIAL_USE_UART3)
+#if HAL_USE_SERIAL && (STM8S_SERIAL_USE_UART2 || STM8S_SERIAL_USE_UART3)
{0x82, vector20}, /* vector20 */
{0x82, vector21}, /* vector21 */
#else
diff --git a/testhal/STM8S/SPI/cosmic/vectors.c b/testhal/STM8S/SPI/cosmic/vectors.c index 76ebd1736..494943416 100644 --- a/testhal/STM8S/SPI/cosmic/vectors.c +++ b/testhal/STM8S/SPI/cosmic/vectors.c @@ -40,8 +40,8 @@ void _stext(void); * @brief Exception vector type.
*/
typedef struct {
- uint8_t ev_instruction;
- interrupt_handler_t ev_handler;
+ uint8_t ev_instruction;
+ interrupt_handler_t ev_handler;
} exception_vector_t;
/**
@@ -50,57 +50,57 @@ typedef struct { */
@far @interrupt static void vector (void)
{
- return;
+ return;
}
/**
* @brief Exceptions table.
*/
exception_vector_t const _vectab[] = {
- {0x82, (interrupt_handler_t)_stext}, /* reset */
- {0x82, vector}, /* trap */
- {0x82, vector}, /* vector0 */
- {0x82, vector}, /* vector1 */
- {0x82, vector}, /* vector2 */
- {0x82, vector}, /* vector3 */
- {0x82, vector}, /* vector4 */
- {0x82, vector}, /* vector5 */
- {0x82, vector}, /* vector6 */
- {0x82, vector}, /* vector7 */
- {0x82, vector}, /* vector8 */
- {0x82, vector}, /* vector9 */
-#if HAL_USE_SPI && STM8_SPI_USE_SPI
- {0x82, vector10},
+ {0x82, (interrupt_handler_t)_stext}, /* reset */
+ {0x82, vector}, /* trap */
+ {0x82, vector}, /* vector0 */
+ {0x82, vector}, /* vector1 */
+ {0x82, vector}, /* vector2 */
+ {0x82, vector}, /* vector3 */
+ {0x82, vector}, /* vector4 */
+ {0x82, vector}, /* vector5 */
+ {0x82, vector}, /* vector6 */
+ {0x82, vector}, /* vector7 */
+ {0x82, vector}, /* vector8 */
+ {0x82, vector}, /* vector9 */
+#if HAL_USE_SPI && STM8S_SPI_USE_SPI
+ {0x82, vector10},
#else
- {0x82, vector}, /* vector10 */
+ {0x82, vector}, /* vector10 */
#endif
- {0x82, vector}, /* vector11 */
- {0x82, vector}, /* vector12 */
- {0x82, vector13}, /* vector13 */
- {0x82, vector}, /* vector14 */
- {0x82, vector}, /* vector15 */
- {0x82, vector}, /* vector16 */
-#if HAL_USE_SERIAL && STM8_SERIAL_USE_UART1
- {0x82, vector17}, /* vector17 */
- {0x82, vector18}, /* vector18 */
+ {0x82, vector}, /* vector11 */
+ {0x82, vector}, /* vector12 */
+ {0x82, vector13}, /* vector13 */
+ {0x82, vector}, /* vector14 */
+ {0x82, vector}, /* vector15 */
+ {0x82, vector}, /* vector16 */
+#if HAL_USE_SERIAL && STM8S_SERIAL_USE_UART1
+ {0x82, vector17}, /* vector17 */
+ {0x82, vector18}, /* vector18 */
#else
- {0x82, vector}, /* vector17 */
- {0x82, vector}, /* vector18 */
+ {0x82, vector}, /* vector17 */
+ {0x82, vector}, /* vector18 */
#endif
- {0x82, vector}, /* vector19 */
-#if HAL_USE_SERIAL && (STM8_SERIAL_USE_UART2 || STM8_SERIAL_USE_UART3)
+ {0x82, vector}, /* vector19 */
+#if HAL_USE_SERIAL && (STM8S_SERIAL_USE_UART2 || STM8S_SERIAL_USE_UART3)
{0x82, vector20}, /* vector20 */
- {0x82, vector21}, /* vector21 */
+ {0x82, vector21}, /* vector21 */
#else
{0x82, vector}, /* vector20 */
- {0x82, vector}, /* vector21 */
+ {0x82, vector}, /* vector21 */
#endif
- {0x82, vector}, /* vector22 */
- {0x82, vector}, /* vector23 */
- {0x82, vector}, /* vector24 */
- {0x82, vector}, /* vector25 */
- {0x82, vector}, /* vector26 */
- {0x82, vector}, /* vector27 */
- {0x82, vector}, /* vector28 */
- {0x82, vector}, /* vector29 */
+ {0x82, vector}, /* vector22 */
+ {0x82, vector}, /* vector23 */
+ {0x82, vector}, /* vector24 */
+ {0x82, vector}, /* vector25 */
+ {0x82, vector}, /* vector26 */
+ {0x82, vector}, /* vector27 */
+ {0x82, vector}, /* vector28 */
+ {0x82, vector}, /* vector29 */
};
|