diff --git a/docs/Doxyfile b/docs/Doxyfile index 863de6aa0..9a0cee15a 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.2.9 +PROJECT_NUMBER = 2.2.10 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/os/hal/platforms/AT91SAM7/serial_lld.c b/os/hal/platforms/AT91SAM7/serial_lld.c index eb5d72d67..7458f9715 100644 --- a/os/hal/platforms/AT91SAM7/serial_lld.c +++ b/os/hal/platforms/AT91SAM7/serial_lld.c @@ -38,7 +38,8 @@ #if HAL_USE_SERIAL || defined(__DOXYGEN__) -#if SAM7_PLATFORM == SAM7S256 +#if (SAM7_PLATFORM == SAM7S64) || (SAM7_PLATFORM == SAM7S128) || \ + (SAM7_PLATFORM == SAM7S256) || (SAM7_PLATFORM == SAM7S512) #define SAM7_USART0_RX AT91C_PA5_RXD0 #define SAM7_USART0_TX AT91C_PA6_TXD0 @@ -47,7 +48,8 @@ #define SAM7_DBGU_RX AT91C_PA9_DRXD #define SAM7_DBGU_TX AT91C_PA10_DTXD -#elif SAM7_PLATFORM == SAM7X256 +#elif (SAM7_PLATFORM == SAM7X128) || (SAM7_PLATFORM == SAM7X256) || \ + (SAM7_PLATFORM == SAM7X512) #define SAM7_USART0_RX AT91C_PA0_RXD0 #define SAM7_USART0_TX AT91C_PA1_TXD0 diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h index dfc45bd1b..f704131d3 100644 --- a/os/kernel/include/ch.h +++ b/os/kernel/include/ch.h @@ -47,7 +47,7 @@ /** * @brief Kernel version string. */ -#define CH_KERNEL_VERSION "2.2.9" +#define CH_KERNEL_VERSION "2.2.10" /** * @brief Kernel version major number. @@ -62,7 +62,7 @@ /** * @brief Kernel version patch number. */ -#define CH_KERNEL_PATCH 9 +#define CH_KERNEL_PATCH 10 /* * Common values. diff --git a/readme.txt b/readme.txt index 278e8f702..e14b9f31a 100644 --- a/readme.txt +++ b/readme.txt @@ -70,6 +70,10 @@ *** Releases *** ***************************************************************************** +*** 2.2.10 *** +- FIX: Fixed missing serial driver functionality for SAM7S64, SAM7S128 and + SAM7S512 (bug 3517648). + *** 2.2.9 *** - FIX: Fixed chMBFetchI does not decrement mb_fullsem (bug 3504450). - FIX: Fixed STM8S HSI clock initialization error (bug 3489727).