You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/01/10 22:25:16 UTC
[incubator-nuttx] branch pr74 updated (275f4ba -> d5e39cc)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch pr74
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 275f4ba Fix USB issues
new b886474 drivers: serial: Fix a wrong variable in serial.c in SMP mode.
new d5e39cc Removed stray references to MPL115A in stm32_bmp180.c files.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
boards/arm/stm32/stm32f103-minimum/src/stm32_bmp180.c | 2 --
boards/arm/stm32/stm32f4discovery/src/stm32_bmp180.c | 4 +---
drivers/serial/serial.c | 4 ++--
3 files changed, 3 insertions(+), 7 deletions(-)
[incubator-nuttx] 02/02: Removed stray references to MPL115A in
stm32_bmp180.c files.
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch pr74
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d5e39cc37808bebf71993e8808b203cffee8b439
Author: Pieter du Preez <pd...@gmail.com>
AuthorDate: Fri Jan 10 21:59:19 2020 +0000
Removed stray references to MPL115A in stm32_bmp180.c files.
The references to MPL115A inside the stm32_bmp180.c files were
probably copy-paste errors. This commit removes them.
---
boards/arm/stm32/stm32f103-minimum/src/stm32_bmp180.c | 2 --
boards/arm/stm32/stm32f4discovery/src/stm32_bmp180.c | 4 +---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_bmp180.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_bmp180.c
index 645efad..167d8d1 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_bmp180.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_bmp180.c
@@ -55,8 +55,6 @@
* Pre-processor Definitions
****************************************************************************/
-#define MPL115A_I2C_PORTNO 1 /* On I2C1 */
-
/****************************************************************************
* Public Functions
****************************************************************************/
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_bmp180.c b/boards/arm/stm32/stm32f4discovery/src/stm32_bmp180.c
index d1f7f3f..9ca9604 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_bmp180.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_bmp180.c
@@ -55,8 +55,6 @@
* Pre-processor Definitions
****************************************************************************/
-#define MPL115A_I2C_PORTNO 1 /* On I2C1 */
-
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -102,4 +100,4 @@ int stm32_bmp180initialize(FAR const char *devpath)
return ret;
}
-#endif /* CONFIG_I2C && CONFIG_SENSORS_MPL115A && CONFIG_STM32_I2C1 */
+#endif /* CONFIG_I2C && CONFIG_STM32_I2C1 */
[incubator-nuttx] 01/02: drivers: serial: Fix a wrong variable in
serial.c in SMP mode.
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch pr74
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b88647417d3b630ba87071cf66d0c2745c6fae23
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Sat Jan 11 00:10:12 2020 +0900
drivers: serial: Fix a wrong variable in serial.c in SMP mode.
---
drivers/serial/serial.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 4957fa4..dd0a0b0 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -210,7 +210,7 @@ static int uart_putxmitchar(FAR uart_dev_t *dev, int ch, bool oktoblock)
int ret;
#ifdef CONFIG_SMP
- flags = enter_critical_section();
+ irqstate_t flags2 = enter_critical_section();
#endif
/* Increment to see what the next head pointer will be. We need to use the "next"
@@ -347,7 +347,7 @@ static int uart_putxmitchar(FAR uart_dev_t *dev, int ch, bool oktoblock)
err_out:
#ifdef CONFIG_SMP
- leave_critical_section(flags);
+ leave_critical_section(flags2);
#endif
return ret;