diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-10-31 08:34:16 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-10-31 08:34:16 +0000 |
| commit | 37e7834f456837979cef502be97a0afa07e36897 (patch) | |
| tree | c1a430d83ee571ffd3069be138f622bca812e937 /os | |
| parent | 35d05f85d17de7ebd5cad4638ecd92d91e5be9aa (diff) | |
| download | ChibiOS-37e7834f456837979cef502be97a0afa07e36897.tar.gz ChibiOS-37e7834f456837979cef502be97a0afa07e36897.tar.bz2 ChibiOS-37e7834f456837979cef502be97a0afa07e36897.zip | |
New version numbers, fixed bug 3099701.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2311 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/platforms/STM32/hal_lld.c | 2 | ||||
| -rw-r--r-- | os/kernel/include/ch.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/os/hal/platforms/STM32/hal_lld.c b/os/hal/platforms/STM32/hal_lld.c index 58efada69..f099be983 100644 --- a/os/hal/platforms/STM32/hal_lld.c +++ b/os/hal/platforms/STM32/hal_lld.c @@ -83,7 +83,7 @@ void hal_lld_init(void) { SysTick_CTRL_ENABLE_Msk |
SysTick_CTRL_TICKINT_Msk;
-#if CH_HAL_USE_ADC || CH_HAL_USE_SPI
+#if CH_HAL_USE_ADC || CH_HAL_USE_SPI || CH_HAL_USE_UART
dmaInit();
#endif
}
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h index d048b99b7..58be5472a 100644 --- a/os/kernel/include/ch.h +++ b/os/kernel/include/ch.h @@ -39,7 +39,7 @@ /**
* @brief Kernel version string.
*/
-#define CH_KERNEL_VERSION "2.1.2unstable"
+#define CH_KERNEL_VERSION "2.1.3unstable"
/**
* @brief Kernel version major number.
@@ -54,7 +54,7 @@ /**
* @brief Kernel version patch number.
*/
-#define CH_KERNEL_PATCH 2
+#define CH_KERNEL_PATCH 3
/*
* Common values.
|