aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2017-07-01 20:38:11 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2017-07-01 20:38:11 +0000
commitaf9a80ef87a72e6a67e796ef7df52d675a386517 (patch)
tree097869a7212930c1021fc102b807410a9b580b87
parentca841be38745f735407c73c76dbc447b0974ab64 (diff)
downloadChibiOS-af9a80ef87a72e6a67e796ef7df52d675a386517.tar.gz
ChibiOS-af9a80ef87a72e6a67e796ef7df52d675a386517.tar.bz2
ChibiOS-af9a80ef87a72e6a67e796ef7df52d675a386517.zip
Fixed bug #846.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10277 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/common/abstractions/cmsis_os/cmsis_os.c2
-rw-r--r--readme.txt3
2 files changed, 3 insertions, 2 deletions
diff --git a/os/common/abstractions/cmsis_os/cmsis_os.c b/os/common/abstractions/cmsis_os/cmsis_os.c
index eded466dc..3af580ee0 100644
--- a/os/common/abstractions/cmsis_os/cmsis_os.c
+++ b/os/common/abstractions/cmsis_os/cmsis_os.c
@@ -91,7 +91,7 @@ osStatus osKernelInitialize(void) {
chPoolObjectInit(&sempool, sizeof(semaphore_t), chCoreAllocAligned);
chPoolLoadArray(&sempool, semaphores, CMSIS_CFG_NUM_SEMAPHORES);
- chPoolObjectInit(&timpool, sizeof(virtual_timer_t), chCoreAllocAligned);
+ chPoolObjectInit(&timpool, sizeof(struct os_timer_cb), chCoreAllocAligned);
chPoolLoadArray(&timpool, timers, CMSIS_CFG_NUM_TIMERS);
return osOK;
diff --git a/readme.txt b/readme.txt
index fc8388efd..ac164ef23 100644
--- a/readme.txt
+++ b/readme.txt
@@ -93,4 +93,5 @@
- RT: Fixed leftover chcustomer.h file (bug #849)(backported to 17.6.1).
- RT: Fixed invalid check in chchecks.h (bug #848)(backported to 17.6.1).
- HAL: Fixed STM32F070xB: USART invalid DMA channels (bug #847)(backported
- to 17.6.1). \ No newline at end of file
+ to 17.6.1).
+- VAR: Fixed CMSIS_OS issue in timers (bug #846)(backported to 17.6.1).