diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-07-29 06:56:10 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-07-29 06:56:10 +0000 |
| commit | b0b485d70c2a0f38a785103ea1d1181e755e2dad (patch) | |
| tree | 4215242da599016a22f02e9ec3529eb374665d37 /os | |
| parent | 4a4cf02fd5fe41339922f59b62ca95491d4178b2 (diff) | |
| download | ChibiOS-b0b485d70c2a0f38a785103ea1d1181e755e2dad.tar.gz ChibiOS-b0b485d70c2a0f38a785103ea1d1181e755e2dad.tar.bz2 ChibiOS-b0b485d70c2a0f38a785103ea1d1181e755e2dad.zip | |
Fixed bugs #619 and #620.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8124 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/ports/STM32/STM32F0xx/stm32_registry.h | 12 | ||||
| -rw-r--r-- | os/hal/src/can.c | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h index a6176310f..4a7798258 100644 --- a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h @@ -732,14 +732,7 @@ #define STM32_HAS_USART6 FALSE
/* USB attributes.*/
-#if defined(STM32F042x6)
-#define STM32_HAS_USB TRUE
-#define STM32_USB_ACCESS_SCHEME_2x16 TRUE
-#define STM32_USB_PMA_SIZE 768
-#define STM32_USB_HAS_BCDR TRUE
-#else
#define STM32_HAS_USB FALSE
-#endif
#define STM32_HAS_OTG1 FALSE
#define STM32_HAS_OTG2 FALSE
@@ -893,7 +886,10 @@ #define STM32_UART_USART1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
#define STM32_UART_USART1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
-#define STM32_HAS_USART2 FALSE
+#define STM32_HAS_USART2 TRUE
+#define STM32_UART_USART1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
+#define STM32_UART_USART1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
+
#define STM32_HAS_USART3 FALSE
#define STM32_HAS_UART4 FALSE
#define STM32_HAS_UART5 FALSE
diff --git a/os/hal/src/can.c b/os/hal/src/can.c index 38a71873f..cfaa7264e 100644 --- a/os/hal/src/can.c +++ b/os/hal/src/can.c @@ -213,7 +213,7 @@ msg_t canReceive(CANDriver *canp, systime_t timeout) {
osalDbgCheck((canp != NULL) && (crfp != NULL) &&
- (mailbox < (canmbx_t)CAN_RX_MAILBOXES));
+ (mailbox <= (canmbx_t)CAN_RX_MAILBOXES));
osalSysLock();
osalDbgAssert((canp->state == CAN_READY) || (canp->state == CAN_SLEEP),
|