STM8 board files and demos updated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2509 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2010-12-19 12:50:56 +00:00
parent 7c1828c96c
commit 675adde160
18 changed files with 81 additions and 81 deletions

View File

@ -25,6 +25,7 @@
* @details Digital I/O ports static configuration as defined in @p board.h. * @details Digital I/O ports static configuration as defined in @p board.h.
* This variable is used by the HAL when initializing the PAL driver. * This variable is used by the HAL when initializing the PAL driver.
*/ */
#if HAL_USE_PAL || defined(__DOXYGEN__)
const PALConfig pal_default_config = const PALConfig pal_default_config =
{ {
{VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH}, {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH},
@ -33,6 +34,7 @@ const PALConfig pal_default_config =
{VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH}, {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},
{VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH}, {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH},
}; };
#endif
/* /*
* Early initialization code. * Early initialization code.

View File

@ -24,6 +24,7 @@
* @brief PAL setup. * @brief PAL setup.
* @details Digital I/O ports static configuration as defined in @p board.h. * @details Digital I/O ports static configuration as defined in @p board.h.
*/ */
#if HAL_USE_PAL || defined(__DOXYGEN__)
ROMCONST PALConfig pal_default_config = ROMCONST PALConfig pal_default_config =
{ {
{ {
@ -36,6 +37,7 @@ ROMCONST PALConfig pal_default_config =
{VAL_GPIOGODR, 0, VAL_GPIOGDDR, VAL_GPIOGCR1, VAL_GPIOGCR2}, {VAL_GPIOGODR, 0, VAL_GPIOGDDR, VAL_GPIOGCR1, VAL_GPIOGCR2},
} }
}; };
#endif
/* /*
* TIM 2 clock after the prescaler. * TIM 2 clock after the prescaler.
@ -60,14 +62,9 @@ CH_IRQ_HANDLER(13) {
} }
/* /*
* Board initialization code. * Board-specific initialization code.
*/ */
void hwinit(void) { void boardInit(void) {
/*
* HAL initialization.
*/
halInit();
/* /*
* TIM2 initialization as system tick. * TIM2 initialization as system tick.

View File

@ -174,12 +174,14 @@
#define VAL_GPIOICR1 0xFF /* All pull-up. */ #define VAL_GPIOICR1 0xFF /* All pull-up. */
#define VAL_GPIOICR2 0 #define VAL_GPIOICR2 0
#if !defined(_FROM_ASM_)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void hwinit(void); void boardInit(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _FROM_ASM_ */
#endif /* _BOARD_H_ */ #endif /* _BOARD_H_ */

View File

@ -25,6 +25,7 @@
* @details Digital I/O ports static configuration as defined in @p board.h. * @details Digital I/O ports static configuration as defined in @p board.h.
* This variable is used by the HAL when initializing the PAL driver. * This variable is used by the HAL when initializing the PAL driver.
*/ */
#if HAL_USE_PAL || defined(__DOXYGEN__)
ROMCONST PALConfig pal_default_config = ROMCONST PALConfig pal_default_config =
{ {
{ {
@ -36,6 +37,7 @@ ROMCONST PALConfig pal_default_config =
{VAL_GPIOFODR, 0, VAL_GPIOFDDR, VAL_GPIOFCR1, VAL_GPIOFCR2}, {VAL_GPIOFODR, 0, VAL_GPIOFDDR, VAL_GPIOFCR1, VAL_GPIOFCR2},
} }
}; };
#endif
/* /*
* TIM 2 clock after the prescaler. * TIM 2 clock after the prescaler.
@ -44,14 +46,9 @@ ROMCONST PALConfig pal_default_config =
#define TIM2_ARR ((TIM2_CLOCK / CH_FREQUENCY) - 1) #define TIM2_ARR ((TIM2_CLOCK / CH_FREQUENCY) - 1)
/* /*
* Board initialization code. * Board-specific initialization code.
*/ */
void hwinit(void) { void boardInit(void) {
/*
* HAL initialization.
*/
halInit();
/* /*
* TIM2 initialization as system tick. * TIM2 initialization as system tick.

View File

@ -157,12 +157,14 @@
} \ } \
} }
#if !defined(_FROM_ASM_)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void hwinit(void); void boardInit(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _FROM_ASM_ */
#endif /* _BOARD_H_ */ #endif /* _BOARD_H_ */

View File

@ -24,6 +24,7 @@
* @brief PAL setup. * @brief PAL setup.
* @details Digital I/O ports static configuration as defined in @p board.h. * @details Digital I/O ports static configuration as defined in @p board.h.
*/ */
#if HAL_USE_PAL || defined(__DOXYGEN__)
ROMCONST PALConfig pal_default_config = ROMCONST PALConfig pal_default_config =
{ {
{ {
@ -36,6 +37,7 @@ ROMCONST PALConfig pal_default_config =
{VAL_GPIOGODR, 0, VAL_GPIOGDDR, VAL_GPIOGCR1, VAL_GPIOGCR2}, {VAL_GPIOGODR, 0, VAL_GPIOGDDR, VAL_GPIOGCR1, VAL_GPIOGCR2},
} }
}; };
#endif
/* /*
* TIM 2 clock after the prescaler. * TIM 2 clock after the prescaler.
@ -60,14 +62,9 @@ CH_IRQ_HANDLER(13) {
} }
/* /*
* Board initialization code. * Board-specific initialization code.
*/ */
void hwinit(void) { void boardInit(void) {
/*
* HAL initialization.
*/
halInit();
/* /*
* TIM2 initialization as system tick. * TIM2 initialization as system tick.

View File

@ -111,12 +111,14 @@
#define VAL_GPIOGCR1 0xFF /* All pull-up or push-pull. */ #define VAL_GPIOGCR1 0xFF /* All pull-up or push-pull. */
#define VAL_GPIOGCR2 0 #define VAL_GPIOGCR2 0
#if !defined(_FROM_ASM_)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void hwinit(void); void boardInit(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _FROM_ASM_ */
#endif /* _BOARD_H_ */ #endif /* _BOARD_H_ */

View File

@ -42,18 +42,18 @@ static msg_t Thread1(void *arg) {
} }
/* /*
* Entry point. * Application entry point.
*/ */
void main(void) { void main(void) {
/* /*
* Board/HAL initialization. * System initializations.
*/ * - HAL initialization, this also initializes the configured device drivers
hwinit(); * and performs the board-specific initializations.
* - Kernel initialization, the main() function becomes a thread and the
/* * RTOS is active.
* OS initialization.
*/ */
halInit();
chSysInit(); chSysInit();
/* /*

View File

@ -11,6 +11,6 @@ Dependencies=
Filename=raisonance\raisonance.stp Filename=raisonance\raisonance.stp
Dependencies= Dependencies=
[Options] [Options]
ActiveProject=raisonance ActiveProject=cosmic
ActiveConfig=Release ActiveConfig=Release
AddSortedElements=0 AddSortedElements=0

View File

@ -38,18 +38,18 @@ static msg_t Thread1(void *arg) {
} }
/* /*
* Entry point. * Application entry point.
*/ */
void main(void) { void main(void) {
/* /*
* Board/HAL initialization. * System initializations.
*/ * - HAL initialization, this also initializes the configured device drivers
hwinit(); * and performs the board-specific initializations.
* - Kernel initialization, the main() function becomes a thread and the
/* * RTOS is active.
* OS initialization.
*/ */
halInit();
chSysInit(); chSysInit();
/* /*

View File

@ -1,6 +1,6 @@
<ApplicationBuild Header="ch" Extern=".\ch.rapp" Path=".\ch.rapp" OutputFile="..\STM8S-STM8S208-RC/bin\ch.aof" sate="2" AsyncBuild="" > <ApplicationBuild Header="ch" Extern=".\ch.rapp" Path=".\ch.rapp" OutputFile="..\STM8S-STM8S208-RC/bin\ch.aof" sate="98" AsyncBuild="" >
<Group Header="kernel" Marker="-1" OutputFile="" sate="96" AsyncBuild="" > <Group Header="kernel" Marker="-1" OutputFile="" sate="0" AsyncBuild="" >
<NodeC Path="..\..\os\kernel\src\chcond.c" Header="chcond.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chcond.obj" sate="0" AsyncBuild="" /> <NodeC Path="..\..\os\kernel\src\chcond.c" Header="chcond.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chcond.obj" sate="0" AsyncBuild="" />
<NodeC Path="..\..\os\kernel\src\chdebug.c" Header="chdebug.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chdebug.obj" sate="0" AsyncBuild="" /> <NodeC Path="..\..\os\kernel\src\chdebug.c" Header="chdebug.c" Marker="-1" OutputFile="..\STM8S-STM8S208-RC/bin\chdebug.obj" sate="0" AsyncBuild="" />
<NodeC Path="..\..\os\kernel\src\chdynamic.c" Header="chdynamic.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\chdynamic.obj" sate="0" /> <NodeC Path="..\..\os\kernel\src\chdynamic.c" Header="chdynamic.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\chdynamic.obj" sate="0" />
@ -88,6 +88,7 @@
<NodeC Path="..\..\os\hal\platforms\STM8S\pal_lld.c" Header="pal_lld.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\pal_lld.obj" sate="0" /> <NodeC Path="..\..\os\hal\platforms\STM8S\pal_lld.c" Header="pal_lld.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\pal_lld.obj" sate="0" />
<NodeC Path="..\..\os\hal\platforms\STM8S\serial_lld.c" Header="serial_lld.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\serial_lld.obj" sate="0" /> <NodeC Path="..\..\os\hal\platforms\STM8S\serial_lld.c" Header="serial_lld.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\serial_lld.obj" sate="0" />
<NodeC Path="..\..\os\hal\platforms\STM8S\spi_lld.c" Header="spi_lld.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\spi_lld.obj" sate="0" /> <NodeC Path="..\..\os\hal\platforms\STM8S\spi_lld.c" Header="spi_lld.c" Marker="-1" AsyncBuild="" OutputFile="..\STM8S-STM8S208-RC/bin\spi_lld.obj" sate="0" />
</Group> </Group>
</Group> </Group>

View File

@ -1,4 +1,4 @@
<Project Header="Project 'ch'" Path=".\ch.rprj" Project="Yes" OutputFile="" sate="96" ActiveApp="ch" AsyncBuild="" > <Project Header="Project 'ch'" Path=".\ch.rprj" Project="Yes" OutputFile="" sate="96" ActiveApp="ch" AsyncBuild="" >
<ApplicationBuild Header="ch" Extern=".\ch.rapp" Path=".\ch.rapp" OutputFile="..\STM8S-STM8S208-RC/bin\ch.aof" sate="2" AsyncBuild="" /> <ApplicationBuild Header="ch" Extern=".\ch.rapp" Path=".\ch.rapp" OutputFile="..\STM8S-STM8S208-RC/bin\ch.aof" sate="98" AsyncBuild="" />
</Project> </Project>

View File

@ -38,18 +38,18 @@ static msg_t Thread1(void *arg) {
} }
/* /*
* Entry point. * Application entry point.
*/ */
void main(void) { void main(void) {
/* /*
* Board/HAL initialization. * System initializations.
*/ * - HAL initialization, this also initializes the configured device drivers
hwinit(); * and performs the board-specific initializations.
* - Kernel initialization, the main() function becomes a thread and the
/* * RTOS is active.
* OS initialization.
*/ */
halInit();
chSysInit(); chSysInit();
/* /*

View File

@ -6,7 +6,7 @@ Compiler: Cosmic STM8 compiler 4.3.3.3.
*** ChibiOS/RT test suite *** ChibiOS/RT test suite
*** ***
*** Kernel: 2.1.4unstable *** Kernel: 2.1.6unstable
*** Architecture: STM8 *** Architecture: STM8
*** Platform: STM8L *** Platform: STM8L
*** Test Board: ST STM8L-Discovery *** Test Board: ST STM8L-Discovery

View File

@ -6,7 +6,7 @@ Compiler: Raisonance RKit-STM8_2.30.10.0175
*** ChibiOS/RT test suite *** ChibiOS/RT test suite
*** ***
*** Kernel: 2.1.4unstable *** Kernel: 2.1.6unstable
*** Architecture: STM8 *** Architecture: STM8
*** Platform: STM8L *** Platform: STM8L
*** Test Board: ST STM8L-Discovery *** Test Board: ST STM8L-Discovery

View File

@ -6,7 +6,7 @@ Compiler: Cosmic STM8 compiler 4.3.3.3.
*** ChibiOS/RT test suite *** ChibiOS/RT test suite
*** ***
*** Kernel: 2.1.4unstable *** Kernel: 2.1.6unstable
*** Architecture: STM8 *** Architecture: STM8
*** Platform: STM8S *** Platform: STM8S
*** Test Board: ST STM8S-Discovery *** Test Board: ST STM8S-Discovery

View File

@ -6,7 +6,7 @@ Compiler: Raisonance RKit-STM8_2.30.10.0175
*** ChibiOS/RT test suite *** ChibiOS/RT test suite
*** ***
*** Kernel: 2.1.4unstable *** Kernel: 2.1.6unstable
*** Architecture: STM8 *** Architecture: STM8
*** Platform: STM8S *** Platform: STM8S
*** Test Board: ST STM8S-Discovery *** Test Board: ST STM8S-Discovery

View File

@ -6,7 +6,7 @@ Compiler: Raisonance RKit-STM8_2.30.10.0175
*** ChibiOS/RT test suite *** ChibiOS/RT test suite
*** ***
*** Kernel: 2.1.4unstable *** Kernel: 2.1.6unstable
*** Architecture: STM8 *** Architecture: STM8
*** Platform: STM8S *** Platform: STM8S
*** Test Board: Raisonance REva V3 + STM8S208RB *** Test Board: Raisonance REva V3 + STM8S208RB