diff options
| -rw-r--r-- | doc/hal/Doxyfile_chm | 2 | ||||
| -rw-r--r-- | doc/hal/Doxyfile_html | 2 | ||||
| -rw-r--r-- | doc/nil/Doxyfile_chm | 2 | ||||
| -rw-r--r-- | doc/nil/Doxyfile_html | 2 | ||||
| -rw-r--r-- | doc/rt/Doxyfile_chm | 2 | ||||
| -rw-r--r-- | doc/rt/Doxyfile_html | 2 | ||||
| -rw-r--r-- | os/hal/include/hal.h | 2 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/sdc_lld.c | 2 | ||||
| -rw-r--r-- | os/nil/include/nil.h | 2 | ||||
| -rw-r--r-- | os/rt/include/ch.h | 2 | ||||
| -rw-r--r-- | readme.txt | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/doc/hal/Doxyfile_chm b/doc/hal/Doxyfile_chm index 24c0c48b3..ae80d1cfd 100644 --- a/doc/hal/Doxyfile_chm +++ b/doc/hal/Doxyfile_chm @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/HAL # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.0.0p4
+PROJECT_NUMBER = 3.0.0p5
# 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 a
diff --git a/doc/hal/Doxyfile_html b/doc/hal/Doxyfile_html index 777fda76e..e43ef8ae2 100644 --- a/doc/hal/Doxyfile_html +++ b/doc/hal/Doxyfile_html @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/HAL # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.0.0p4
+PROJECT_NUMBER = 3.0.0p5
# 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 a
diff --git a/doc/nil/Doxyfile_chm b/doc/nil/Doxyfile_chm index e80143570..d8b63babf 100644 --- a/doc/nil/Doxyfile_chm +++ b/doc/nil/Doxyfile_chm @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/NIL # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 1.0.0p4
+PROJECT_NUMBER = 1.0.0p5
# 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 a
diff --git a/doc/nil/Doxyfile_html b/doc/nil/Doxyfile_html index a68ae9600..7dde94bfc 100644 --- a/doc/nil/Doxyfile_html +++ b/doc/nil/Doxyfile_html @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/NIL # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 1.0.0p4
+PROJECT_NUMBER = 1.0.0p5
# 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 a
diff --git a/doc/rt/Doxyfile_chm b/doc/rt/Doxyfile_chm index e61f020a9..2971988fa 100644 --- a/doc/rt/Doxyfile_chm +++ b/doc/rt/Doxyfile_chm @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/RT # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.0.0p4
+PROJECT_NUMBER = 3.0.0p5
# 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 a
diff --git a/doc/rt/Doxyfile_html b/doc/rt/Doxyfile_html index 647aa1bfe..2a68c9ebf 100644 --- a/doc/rt/Doxyfile_html +++ b/doc/rt/Doxyfile_html @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/RT # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.0.0p4
+PROJECT_NUMBER = 3.0.0p5
# 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 a
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.
diff --git a/readme.txt b/readme.txt index f9d7ae22f..47acd4ddf 100644 --- a/readme.txt +++ b/readme.txt @@ -76,6 +76,8 @@ *** 3.0.0p5 ***
- HAL: Added DAC support to all STM32 sub-platforms, added another demo for
the STM32F3xx.
+- HAL: Fixed STM32 SDC LLD driver initialization with Asserts disabled
+ (bug #594).
*** 3.0.0p4 ***
- BLD: New "smart build" mode added to makefiles, now only used files are
|