From 5ed3eb8eb99eecad0138843118e2e6d39a3189f8 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 18 Jul 2009 12:19:47 +0000
Subject: [PATCH] Version numbers, doxygen files, and readme updated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1066 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/ARMCM3-STM32F103-GCC/Makefile |  4 +++-
 demos/ARMCM3-STM32F103-GCC/board.c  | 11 +++++++----
 demos/ARMCM3-STM32F103-GCC/board.h  |  4 ++--
 docs/Doxyfile                       |  5 +++--
 readme.txt                          |  8 ++++++++
 src/include/ch.h                    |  4 ++--
 6 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/demos/ARMCM3-STM32F103-GCC/Makefile b/demos/ARMCM3-STM32F103-GCC/Makefile
index a6a0ecee5..fc36a80d2 100644
--- a/demos/ARMCM3-STM32F103-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-GCC/Makefile
@@ -61,7 +61,8 @@ include ../../test/test.mk
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC = ../../ports/ARMCM3/chcore.c \
+CSRC = ../../ports/ARMCM3/cmsis/core_cm3.c \
+       ../../ports/ARMCM3/chcore.c \
        ../../ports/ARMCM3/nvic.c \
        ../../ports/ARMCM3-STM32F103/stm32_serial.c \
        ../../ports/ARMCM3-STM32F103/pal_lld.c \
@@ -102,6 +103,7 @@ ASMSRC =  ../../ports/ARMCM3/crt0.s \
 INCDIR = $(KERNINC) $(TESTINC) \
          ../../src/lib \
          ../../ports/ARMCM3 \
+         ../../ports/ARMCM3/cmsis \
          ../../ports/ARMCM3-STM32F103 \
          ./stm32lib/inc
 
diff --git a/demos/ARMCM3-STM32F103-GCC/board.c b/demos/ARMCM3-STM32F103-GCC/board.c
index 25b88511f..6cdedea2e 100644
--- a/demos/ARMCM3-STM32F103-GCC/board.c
+++ b/demos/ARMCM3-STM32F103-GCC/board.c
@@ -24,6 +24,8 @@
 #include "board.h"
 #include "stm32_serial.h"
 
+#define AIRCR_VECTKEY           0x05FA0000
+
 /*
  * Digital I/O ports static configuration as defined in @p board.h.
  */
@@ -86,8 +88,9 @@ void hwinit1(void) {
 
   /*
    * NVIC/SCB initialization.
+   * Note: PRIGROUP 4:0 (4:4).
    */
-  SCB_AIRCR = AIRCR_VECTKEY | AIRCR_PRIGROUP(0x3); // PRIGROUP 4:0 (4:4).
+  SCB->AIRCR = AIRCR_VECTKEY | SCB_AIRCR_PRIGROUP_0 | SCB_AIRCR_PRIGROUP_1;
   NVICSetSystemHandlerPriority(HANDLER_SVCALL, PRIORITY_SVCALL);
   NVICSetSystemHandlerPriority(HANDLER_SYSTICK, PRIORITY_SYSTICK);
   NVICSetSystemHandlerPriority(HANDLER_PENDSV, PRIORITY_PENDSV);
@@ -95,9 +98,9 @@ void hwinit1(void) {
   /*
    * SysTick initialization.
    */
-  ST_RVR = SYSCLK / (8000000 / CH_FREQUENCY) - 1;
-  ST_CVR = 0;
-  ST_CSR = ENABLE_ON_BITS | TICKINT_ENABLED_BITS | CLKSOURCE_EXT_BITS;
+  SysTick->LOAD = SYSCLK / (8000000 / CH_FREQUENCY) - 1;
+  SysTick->VAL = 0;
+  SysTick->CTRL = SysTick_CTRL_ENABLE | SysTick_CTRL_TICKINT;
 
   /*
    * Other subsystems initialization.
diff --git a/demos/ARMCM3-STM32F103-GCC/board.h b/demos/ARMCM3-STM32F103-GCC/board.h
index dcf8f8a33..c32b3d9da 100644
--- a/demos/ARMCM3-STM32F103-GCC/board.h
+++ b/demos/ARMCM3-STM32F103-GCC/board.h
@@ -24,10 +24,10 @@
  * Tricks required to make the TRUE/FALSE declaration inside the library
  * compatible.
  */
-#ifndef __STM32F10x_MAP_H
+#ifndef __STM32F10x_H
 #undef FALSE
 #undef TRUE
-#include "stm32f10x_map.h"
+#include <stm32f10x.h>
 #define FALSE 0
 #define TRUE (!FALSE)
 #endif
diff --git a/docs/Doxyfile b/docs/Doxyfile
index d518c61ac..b26a2d37d 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = ChibiOS/RT
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.3.1
+PROJECT_NUMBER         = 1.3.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
@@ -644,7 +644,8 @@ RECURSIVE              = NO
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                =
+EXCLUDE                = ../ports/ARMCM3/cmsis \
+                         ../ports/ARMCM3-STM32F103/stm32f10x.h
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
diff --git a/readme.txt b/readme.txt
index 1ed86bc23..1913d48f3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -63,6 +63,14 @@ GNU-Linux-GCC          - ChibiOS/RT simulator for x86 Linux systems, it is
 *** Releases                                                              ***
 *****************************************************************************
 
+*** 1.3.2 ***
+- NEW: Added standard CMSIS 1.2.0 support to the Cortex-M3 port. The kernel
+  does not use it (the OS uses its own optimized code) but the functionality
+  is available to the applications. The CMSIS files were patched in order
+  to correct some warnings.
+- NEW: Updated the STM32 port to use the newest ST firmware library files
+  (version 3.1.0).
+
 *** 1.3.1 ***
 - FIX: Removed mention of an obsolete option from the documentation (bug
   2799507).
diff --git a/src/include/ch.h b/src/include/ch.h
index 80a8a7706..0584b167e 100644
--- a/src/include/ch.h
+++ b/src/include/ch.h
@@ -35,7 +35,7 @@
 /**
  * Kernel version string.
  */
-#define CH_KERNEL_VERSION       "1.3.1unstable"
+#define CH_KERNEL_VERSION       "1.3.2unstable"
 
 /**
  * Kernel version major number.
@@ -50,7 +50,7 @@
 /**
  * Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         1
+#define CH_KERNEL_PATCH         2
 
 /*
  * Common values.