From 060e34a4090845aa08f07bc86b670df80ea65063 Mon Sep 17 00:00:00 2001 From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> Date: Wed, 8 Jun 2011 15:32:34 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3038 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- docs/Doxyfile_chm | 2 +- docs/Doxyfile_html | 2 +- os/kernel/include/ch.h | 4 ++-- readme.txt | 16 +++++++--------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/docs/Doxyfile_chm b/docs/Doxyfile_chm index f088be782..f6580b758 100644 --- a/docs/Doxyfile_chm +++ b/docs/Doxyfile_chm @@ -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 = 2.3.4 +PROJECT_NUMBER = 2.3.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/docs/Doxyfile_html b/docs/Doxyfile_html index ab9d037da..0d2e6e31b 100644 --- a/docs/Doxyfile_html +++ b/docs/Doxyfile_html @@ -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 = 2.3.4 +PROJECT_NUMBER = 2.3.3 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h index 250f6adbf..db96d4338 100644 --- a/os/kernel/include/ch.h +++ b/os/kernel/include/ch.h @@ -40,7 +40,7 @@ /** * @brief Kernel version string. */ -#define CH_KERNEL_VERSION "2.3.4unstable" +#define CH_KERNEL_VERSION "2.3.3unstable" /** * @brief Kernel version major number. @@ -55,7 +55,7 @@ /** * @brief Kernel version patch number. */ -#define CH_KERNEL_PATCH 4 +#define CH_KERNEL_PATCH 3 /* * Common values. diff --git a/readme.txt b/readme.txt index 253435901..2f7289d17 100644 --- a/readme.txt +++ b/readme.txt @@ -70,11 +70,17 @@ *** Releases *** ***************************************************************************** -*** 2.3.4 *** +*** 2.3.3 *** - FIX: Fixed wrong macro check in STM32 UART driver (bug 3311999)(backported to 2.2.6). - FIX: Fixed wrong macro definition in ARMv6-M architecture files (bug 3310084). +- FIX: Fixed race condition in output queues (bug 3303908)(backported + to 2.2.4). +- FIX: Fixed CH_USE_HEAP and CH_USE_MALLOC_HEAP conflict (bug 3303841) + (backported to 2.2.4). +- FIX: Fixed timeout problem in the lwIP interface layer (bug 3302420) + (backported to 2.2.4). - NEW: lwIP 1.4.0 has been integrated, this new version does not require custom hooks into the Thread structure and is thus much lighter. - NEW: FatFs demo for the STM32F103ZG using the SDC driver. @@ -85,14 +91,6 @@ IAR and RVCT ports support the new Compact mode. - NEW: Added to the ARMv6-M sub-port an option to use the PendSV exception instead of NMI for preemption (backported to 2.2.5). - -*** 2.3.3 *** -- FIX: Fixed race condition in output queues (bug 3303908)(backported - to 2.2.4). -- FIX: Fixed CH_USE_HEAP and CH_USE_MALLOC_HEAP conflict (bug 3303841) - (backported to 2.2.4). -- FIX: Fixed timeout problem in the lwIP interface layer (bug 3302420) - (backported to 2.2.4). - NEW: Reorganization of the Cortex-Mx ports in order to reduced code and comments duplication in the various headers (backported to 2.2.5). - NEW: Improved the ARMv7-M sub-port now there are two modes: Compact and -- cgit v1.2.3