From c185060244a1f6840c7f7080706b2979e3c1c519 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Thu, 14 May 2015 13:27:17 +0000
Subject: Fixed bug #594. Updated version numbers.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7982 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/include/hal.h             | 2 +-
 os/hal/ports/STM32/LLD/sdc_lld.c | 2 --
 os/nil/include/nil.h             | 2 +-
 os/rt/include/ch.h               | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'os')

diff --git a/os/hal/include/hal.h b/os/hal/include/hal.h
index 82771d8cd..6935a5951 100644
--- a/os/hal/include/hal.h
+++ b/os/hal/include/hal.h
@@ -101,7 +101,7 @@
 /**
  * @brief   HAL version string.
  */
-#define HAL_VERSION             "3.0.0p4"
+#define HAL_VERSION             "3.0.0p5"
 
 /**
  * @brief   HAL version major number.
diff --git a/os/hal/ports/STM32/LLD/sdc_lld.c b/os/hal/ports/STM32/LLD/sdc_lld.c
index eb588c088..f4d23e6d2 100644
--- a/os/hal/ports/STM32/LLD/sdc_lld.c
+++ b/os/hal/ports/STM32/LLD/sdc_lld.c
@@ -348,9 +348,7 @@ void sdc_lld_init(void) {
   sdcObjectInit(&SDCD1);
   SDCD1.thread = NULL;
   SDCD1.dma    = STM32_DMA_STREAM(STM32_SDC_SDIO_DMA_STREAM);
-#if CH_DBG_ENABLE_ASSERTS
   SDCD1.sdio   = SDIO;
-#endif
 }
 
 /**
diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h
index 2bf0a126e..be16991d7 100644
--- a/os/nil/include/nil.h
+++ b/os/nil/include/nil.h
@@ -61,7 +61,7 @@ typedef struct nil_thread thread_t;
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "1.0.0p4"
+#define CH_KERNEL_VERSION       "1.0.0p5"
 
 /**
  * @brief   Kernel version major number.
diff --git a/os/rt/include/ch.h b/os/rt/include/ch.h
index 85adda117..862d31776 100644
--- a/os/rt/include/ch.h
+++ b/os/rt/include/ch.h
@@ -48,7 +48,7 @@
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "3.0.0p4"
+#define CH_KERNEL_VERSION       "3.0.0p5"
 
 /**
  * @brief   Kernel version major number.
-- 
cgit v1.2.3