diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-02-14 10:28:41 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-02-14 10:28:41 +0000 |
| commit | 95058cdab40e0300cb17a12ea0b50c8ccab3e90b (patch) | |
| tree | bf716f245515f8b28024ea4807abe7b91c69d996 | |
| parent | 4f37deada8ee204662935e59370cb87cde193386 (diff) | |
| download | ChibiOS-95058cdab40e0300cb17a12ea0b50c8ccab3e90b.tar.gz ChibiOS-95058cdab40e0300cb17a12ea0b50c8ccab3e90b.tar.bz2 ChibiOS-95058cdab40e0300cb17a12ea0b50c8ccab3e90b.zip | |
Fixed bug 2951529.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1607 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | docs/Doxyfile | 2 | ||||
| -rw-r--r-- | os/kernel/include/ch.h | 4 | ||||
| -rw-r--r-- | os/kernel/templates/chcore.c | 2 | ||||
| -rw-r--r-- | readme.txt | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/docs/Doxyfile b/docs/Doxyfile index e0546572b..4af466d85 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.5.1 +PROJECT_NUMBER = 1.5.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h index 0607e2d52..a0b2ca6fd 100644 --- a/os/kernel/include/ch.h +++ b/os/kernel/include/ch.h @@ -38,7 +38,7 @@ /**
* @brief Kernel version string. */
-#define CH_KERNEL_VERSION "1.5.1unstable"
+#define CH_KERNEL_VERSION "1.5.2unstable"
/**
* @brief Kernel version major number. @@ -53,7 +53,7 @@ /**
* @brief Kernel version patch number. */
-#define CH_KERNEL_PATCH 1
+#define CH_KERNEL_PATCH 2
/*
* Common values.
diff --git a/os/kernel/templates/chcore.c b/os/kernel/templates/chcore.c index cfa87bf30..d1bad3c02 100644 --- a/os/kernel/templates/chcore.c +++ b/os/kernel/templates/chcore.c @@ -76,7 +76,7 @@ void port_unlock_from_isr(void) { * @brief Disables all the interrupt sources.
* @note Of course non maskable interrupt sources are not included. */
-void port_disable() {
+void port_disable(void) {
}
/**
diff --git a/readme.txt b/readme.txt index f0f513737..63244fd33 100644 --- a/readme.txt +++ b/readme.txt @@ -51,6 +51,10 @@ *** Releases ***
*****************************************************************************
+*** 1.5.2 ***
+- FIX: Wrong prototype in template file chcore.c (bug 2951529)(backported
+ in 1.4.1).
+
*** 1.5.1 ***
- FIX: Fixed insufficient stack space for the idle thread in the ARMCM3 port
when compiling without optimizations (bug 2946233)(backported in 1.4.1).
|