zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
gdisirio 2012-07-01 11:44:40 +00:00
parent 228be31cd6
commit 8fabd4641a
7 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
demos/STM8S-STM8S105-DISCOVERY-IAR/ch.ewp
View File

@ -780,7 +780,7 @@
<debug>0</debug>
<option>
<name>GenDeviceSelectMenu</name>
<state></state>
<state>STM8S105C6 STM8S105C6</state>
</option>
<option>
<name>GenCodeModel</name>
@ -820,11 +820,11 @@
</option>
<option>
<name>GenRTDescription</name>
<state></state>
<state>Use the normal configuration of the C/EC++ runtime library. No locale interface, C locale, no file descriptor support, no multibytes in printf and scanf, and no hex floats in strtod.</state>
</option>
<option>
<name>GenRTConfigPath</name>
<state></state>
<state>$TOOLKIT_DIR$\LIB\dlstm8smn.h</state>
</option>
<option>
<name>GenLibInFormatter</name>
@ -833,7 +833,7 @@
</option>
<option>
<name>GenLibInFormatterDescription</name>
<state></state>
<state>No specifier n, no float, no scan set, no assignment suppressing.</state>
</option>
<option>
<name>GenLibOutFormatter</name>
@ -842,15 +842,15 @@
</option>
<option>
<name>GenLibOutFormatterDescription</name>
<state></state>
<state>No specifier a or A, no specifier n, no float.</state>
</option>
<option>
<name>GenStackSize</name>
<state>###Uninitialized###</state>
<state>0x100</state>
</option>
<option>
<name>GenHeapSize</name>
<state>###Uninitialized###</state>
<state>0x100</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@ -910,12 +910,12 @@
</option>
<option>
<name>IccOptLevelSlave</name>
<state>1</state>
<state>3</state>
</option>
<option>
<name>IccOptAllowList</name>
<version>0</version>
<state>111110</state>
<state>111111</state>
</option>
<option>
<name>IccGenerateDebugInfo</name>
@ -923,7 +923,7 @@
</option>
<option>
<name>IccOutputFile</name>
<state></state>
<state>$FILE_BNAME$.o</state>
</option>
<option>
<name>IccCodeModel</name>
@ -1011,7 +1011,12 @@
</option>
<option>
<name>CCIncludePath2</name>
<state></state>
<state>$PROJ_DIR$</state>
<state>$PROJ_DIR$\..\..\os\kernel\include</state>
<state>$PROJ_DIR$\..\..\os\ports\IAR\STM8</state>
<state>$PROJ_DIR$\..\..\os\hal\include</state>
<state>$PROJ_DIR$\..\..\os\hal\platforms\STM8S</state>
<state>$PROJ_DIR$\..\..\boards\ST_STM8S_DISCOVERY</state>
</option>
<option>
<name>CCStdIncCheck</name>
@ -1132,7 +1137,8 @@
</option>
<option>
<name>AsmIncludePath</name>
<state></state>
<state>$PROJ_DIR$</state>
<state>$PROJ_DIR$\..\..\os\ports\IAR\STM8</state>
</option>
<option>
<name>AsmDefines</name>
@ -1280,7 +1286,7 @@
</option>
<option>
<name>IlinkOutputFile</name>
<state>###Unitialized###</state>
<state>ch.out</state>
</option>
<option>
<name>IlinkDebugInfoEnable</name>

1
demos/STM8S-STM8S105-DISCOVERY-IAR/mcuconf.h
View File

@ -36,7 +36,6 @@
#define STM8S_SYSCLK_SOURCE CLK_SYSSEL_HSE
#define STM8S_HSI_DIVIDER CLK_HSI_DIV1
#define STM8S_CPU_DIVIDER CLK_CPU_DIV1
#define STM8S_CAN_DIVIDER_VALUE 1
/*
* SERIAL driver system settings.

1
demos/STM8S-STM8S105-DISCOVERY-STVD/demo/mcuconf.h
View File

@ -36,7 +36,6 @@
#define STM8S_SYSCLK_SOURCE CLK_SYSSEL_HSE
#define STM8S_HSI_DIVIDER CLK_HSI_DIV1
#define STM8S_CPU_DIVIDER CLK_CPU_DIV1
#define STM8S_CAN_DIVIDER_VALUE 1
/*
* SERIAL driver system settings.

1
demos/STM8S-STM8S208-RC/mcuconf.h
View File

@ -36,7 +36,6 @@
#define STM8S_SYSCLK_SOURCE CLK_SYSSEL_HSI
#define STM8S_HSI_DIVIDER CLK_HSI_DIV1
#define STM8S_CPU_DIVIDER CLK_CPU_DIV1
#define STM8S_CAN_DIVIDER_VALUE 1
/*
* SERIAL driver system settings.

3
os/hal/platforms/STM8S/hal_lld.c
View File

@ -99,9 +99,6 @@ void hal_lld_init(void) {
/* Other clock related initializations.*/
CLK->CSSR = 0;
CLK->CCOR = 0;
#if defined(STM8S208)
CLK->CANCCR = STM8S_CAN_DIVIDER_VALUE;
#endif
/* HSI disabled if it is no more required.*/
#if !STM8S_HSI_ENABLED

11
os/hal/platforms/STM8S/hal_lld.h
View File

@ -141,13 +141,6 @@
#define STM8S_CPU_DIVIDER CLK_CPU_DIV1
#endif
/**
* @brief bxCAN divider value.
*/
#if !defined(STM8S_CAN_DIVIDER_VALUE) || defined(__DOXYGEN__)
#define STM8S_CAN_DIVIDER_VALUE 1
#endif
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/
@ -170,10 +163,6 @@
#error "specified invalid CPU divider"
#endif
#if (STM8S_CAN_DIVIDER_VALUE < 1) || (STM8S_CAN_DIVIDER_VALUE > 8)
#error "specified invalid CAN divider value"
#endif
#if STM8S_HSE_ENABLED && (HSECLK == 0)
#error "impossible to activate HSE"
#endif

1
testhal/STM8S/SPI/demo/mcuconf.h
View File

@ -36,7 +36,6 @@
#define STM8S_SYSCLK_SOURCE CLK_SYSSEL_HSE
#define STM8S_HSI_DIVIDER CLK_HSI_DIV1
#define STM8S_CPU_DIVIDER CLK_CPU_DIV1
#define STM8S_CAN_DIVIDER_VALUE 1
/*
* SERIAL driver system settings.