Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

drivers/wireless/bluetooth: Fix error in testing if interrupts enabled.

Browse Source
This commit is contained in:
Gregory Nutt
2018-04-17 07:13:03 -06:00
parent 8814533e78
commit 0271a6a5e9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32/stm32_hciuart.c
+4 -2
View File
@@ -827,13 +827,15 @@ static bool hciuart_isenabled(const struct hciuart_config_s *config,
*/ */
regval = hciuart_getreg32(config, STM32_USART_CR1_OFFSET); regval = hciuart_getreg32(config, STM32_USART_CR1_OFFSET);
if ((regval & USART_CR1_USED_INTS) != 0) regval &= USART_CR1_USED_INTS;
if ((regval & intset) != 0)
{ {
return true; return true;
} }
regval = hciuart_getreg32(config, STM32_USART_CR3_OFFSET); regval = hciuart_getreg32(config, STM32_USART_CR3_OFFSET);
if ((regval & USART_CR3_EIE) != 0) regval &= USART_CR3_EIE;
if ((regval & intset) != 0)
{ {
return true; return true;
} }
drivers/wireless/bluetooth/bt_uart.c
+2
View File
@@ -339,6 +339,8 @@ static int btuart_open(FAR const struct bt_driver_s *dev)
FAR struct btuart_upperhalf_s *upper; FAR struct btuart_upperhalf_s *upper;
FAR const struct btuart_lowerhalf_s *lower; FAR const struct btuart_lowerhalf_s *lower;
wlinfo("dev %p\n", dev);
upper = (FAR struct btuart_upperhalf_s *)dev; upper = (FAR struct btuart_upperhalf_s *)dev;
DEBUGASSERT(upper != NULL && upper->lower != NULL); DEBUGASSERT(upper != NULL && upper->lower != NULL);
lower = upper->lower; lower = upper->lower;