aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-08-16 09:52:47 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-08-16 09:52:47 +0000
commit545fbf71875b171904d6f55941b02906e3d41a41 (patch)
tree8f1a7e17e6d1f1cdbd52520ab29d2ac66871b0af
parent12dc959bac068fc717acf4afe882b8ada3f5ed6c (diff)
downloadChibiOS-545fbf71875b171904d6f55941b02906e3d41a41.tar.gz
ChibiOS-545fbf71875b171904d6f55941b02906e3d41a41.tar.bz2
ChibiOS-545fbf71875b171904d6f55941b02906e3d41a41.zip
Updated ST library to version 3.5.0, modified the header to include board.h if no MCU macro is defined.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3238 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--ext/readme.txt2
-rw-r--r--ext/stm32lib-3.3.0.zipbin172514 -> 0 bytes
-rw-r--r--ext/stm32lib-3.5.0.zipbin0 -> 176442 bytes
-rw-r--r--os/hal/platforms/STM32F1xx/stm32f10x.h8
4 files changed, 6 insertions, 4 deletions
diff --git a/ext/readme.txt b/ext/readme.txt
index 5c8a76b2e..0c3344477 100644
--- a/ext/readme.txt
+++ b/ext/readme.txt
@@ -11,7 +11,7 @@ The currently included items are:
1. uip-1.0, a minimal TCP/IP implementation: http://www.sics.se/~adam/uip/
2. lwip-1.4.0, lightweight TCP/IP stack: http://savannah.nongnu.org/projects/lwip/
-3. STM32 firmware library 3.3.0 (partial, library only) the full download is
+3. STM32 firmware library 3.5.0 (partial, library only) the full download is
available from http://www.st.com
4. FatFS 0.7e (patched), the original version is available from
http://elm-chan.org/fsw/ff/00index_e.html
diff --git a/ext/stm32lib-3.3.0.zip b/ext/stm32lib-3.3.0.zip
deleted file mode 100644
index e920c27e6..000000000
--- a/ext/stm32lib-3.3.0.zip
+++ /dev/null
Binary files differ
diff --git a/ext/stm32lib-3.5.0.zip b/ext/stm32lib-3.5.0.zip
new file mode 100644
index 000000000..c34d78ca4
--- /dev/null
+++ b/ext/stm32lib-3.5.0.zip
Binary files differ
diff --git a/os/hal/platforms/STM32F1xx/stm32f10x.h b/os/hal/platforms/STM32F1xx/stm32f10x.h
index 8773ef453..c7f447d18 100644
--- a/os/hal/platforms/STM32F1xx/stm32f10x.h
+++ b/os/hal/platforms/STM32F1xx/stm32f10x.h
@@ -15,15 +15,15 @@
* is using in the C source code, usually in main.c. This file contains:
* - Configuration section that allows to select:
* - The device used in the target application
- * - To use or not the peripheral’s drivers in application code(i.e.
- * code will be based on direct access to peripheral’s registers
+ * - To use or not the peripheral�s drivers in application code(i.e.
+ * code will be based on direct access to peripheral�s registers
* rather than drivers API), this option is controlled by
* "#define USE_STDPERIPH_DRIVER"
* - To change few application-specific parameters such as the HSE
* crystal frequency
* - Data structures and the address mapping for all peripherals
* - Peripheral's registers declarations and bits definition
- * - Macros to access peripheral’s registers hardware
+ * - Macros to access peripheral�s registers hardware
*
******************************************************************************
* @attention
@@ -63,6 +63,8 @@
*/
#if !defined (STM32F10X_LD) && !defined (STM32F10X_LD_VL) && !defined (STM32F10X_MD) && !defined (STM32F10X_MD_VL) && !defined (STM32F10X_HD) && !defined (STM32F10X_HD_VL) && !defined (STM32F10X_XL) && !defined (STM32F10X_CL)
+ /* CHIBIOS FIX */
+#include "board.h"
/* #define STM32F10X_LD */ /*!< STM32F10X_LD: STM32 Low density devices */
/* #define STM32F10X_LD_VL */ /*!< STM32F10X_LD_VL: STM32 Low density Value Line devices */
/* #define STM32F10X_MD */ /*!< STM32F10X_MD: STM32 Medium density devices */