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 /os/kernel | |
| 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
Diffstat (limited to 'os/kernel')
| -rw-r--r-- | os/kernel/include/ch.h | 4 | ||||
| -rw-r--r-- | os/kernel/templates/chcore.c | 2 |
2 files changed, 3 insertions, 3 deletions
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) {
}
/**
|