You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/03/09 20:27:53 UTC
[GitHub] utzig closed pull request #898: Fix build errors in BSPs
utzig closed pull request #898: Fix build errors in BSPs
URL: https://github.com/apache/mynewt-core/pull/898
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/bsp/ble400/src/hal_bsp.c b/hw/bsp/ble400/src/hal_bsp.c
index dbea6bc44..45e944534 100644
--- a/hw/bsp/ble400/src/hal_bsp.c
+++ b/hw/bsp/ble400/src/hal_bsp.c
@@ -31,8 +31,11 @@
#include "hal/hal_flash.h"
#include "hal/hal_spi.h"
#include "hal/hal_i2c.h"
+
+#if MYNEWT_VAL(UART_0)
#include "uart/uart.h"
#include "uart_hal/uart_hal.h"
+#endif
#if MYNEWT_VAL(ADC_0)
#include <adc_nrf51/adc_nrf51.h>
diff --git a/hw/bsp/bmd200/src/hal_bsp.c b/hw/bsp/bmd200/src/hal_bsp.c
index dbea6bc44..45e944534 100644
--- a/hw/bsp/bmd200/src/hal_bsp.c
+++ b/hw/bsp/bmd200/src/hal_bsp.c
@@ -31,8 +31,11 @@
#include "hal/hal_flash.h"
#include "hal/hal_spi.h"
#include "hal/hal_i2c.h"
+
+#if MYNEWT_VAL(UART_0)
#include "uart/uart.h"
#include "uart_hal/uart_hal.h"
+#endif
#if MYNEWT_VAL(ADC_0)
#include <adc_nrf51/adc_nrf51.h>
diff --git a/hw/bsp/bmd300eval/src/hal_bsp.c b/hw/bsp/bmd300eval/src/hal_bsp.c
index 7ffbfaf67..b7d9fa11e 100644
--- a/hw/bsp/bmd300eval/src/hal_bsp.c
+++ b/hw/bsp/bmd300eval/src/hal_bsp.c
@@ -181,6 +181,8 @@ hal_bsp_init(void)
{
int rc;
+ (void)rc;
+
/* Make sure system clocks have started */
hal_system_clock_start();
@@ -210,13 +212,13 @@ hal_bsp_init(void)
#endif
#if MYNEWT_VAL(ADC_0)
-rc = os_dev_create((struct os_dev *) &os_bsp_adc0,
- "adc0",
- OS_DEV_INIT_KERNEL,
- OS_DEV_INIT_PRIO_DEFAULT,
- nrf52_adc_dev_init,
- &os_bsp_adc0_config);
-assert(rc == 0);
+ rc = os_dev_create((struct os_dev *) &os_bsp_adc0,
+ "adc0",
+ OS_DEV_INIT_KERNEL,
+ OS_DEV_INIT_PRIO_DEFAULT,
+ nrf52_adc_dev_init,
+ &os_bsp_adc0_config);
+ assert(rc == 0);
#endif
#if MYNEWT_VAL(PWM_0)
diff --git a/hw/bsp/nrf51-arduino_101/src/hal_bsp.c b/hw/bsp/nrf51-arduino_101/src/hal_bsp.c
index 55b646c81..6d5005adc 100644
--- a/hw/bsp/nrf51-arduino_101/src/hal_bsp.c
+++ b/hw/bsp/nrf51-arduino_101/src/hal_bsp.c
@@ -33,8 +33,11 @@
#include "nrf51_bitfields.h"
#include "hal/hal_spi.h"
#include "os/os_dev.h"
+
+#if MYNEWT_VAL(UART_0)
#include "uart/uart.h"
#include "uart_hal/uart_hal.h"
+#endif
#if MYNEWT_VAL(ADC_0)
#include <adc_nrf51/adc_nrf51.h>
diff --git a/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c b/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
index e286f6a7e..6cff522cd 100644
--- a/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
+++ b/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
@@ -31,8 +31,11 @@
#include "hal/hal_flash.h"
#include "hal/hal_spi.h"
#include "hal/hal_i2c.h"
+
+#if MYNEWT_VAL(UART_0)
#include "uart/uart.h"
#include "uart_hal/uart_hal.h"
+#endif
#if MYNEWT_VAL(ADC_0)
#include <adc_nrf51/adc_nrf51.h>
diff --git a/hw/bsp/nrf52840pdk/src/hal_bsp.c b/hw/bsp/nrf52840pdk/src/hal_bsp.c
index 8f3d7529c..61fc7ff5a 100644
--- a/hw/bsp/nrf52840pdk/src/hal_bsp.c
+++ b/hw/bsp/nrf52840pdk/src/hal_bsp.c
@@ -32,8 +32,15 @@
#include "hal/hal_watchdog.h"
#include "hal/hal_i2c.h"
#include "mcu/nrf52_hal.h"
+#if MYNEWT_VAL(UART_0) || MYNEWT_VAL(UART_1)
#include "uart/uart.h"
+#endif
+#if MYNEWT_VAL(UART_0)
#include "uart_hal/uart_hal.h"
+#endif
+#if MYNEWT_VAL(UART_1)
+#include "uart_bitbang/uart_bitbang.h"
+#endif
#include "os/os_dev.h"
#include "bsp.h"
#if MYNEWT_VAL(ADC_0)
@@ -192,6 +199,8 @@ hal_bsp_init(void)
{
int rc;
+ (void)rc;
+
/* Make sure system clocks have started */
hal_system_clock_start();
diff --git a/hw/bsp/rb-blend2/src/hal_bsp.c b/hw/bsp/rb-blend2/src/hal_bsp.c
index ee5b1f0cc..605a82f77 100644
--- a/hw/bsp/rb-blend2/src/hal_bsp.c
+++ b/hw/bsp/rb-blend2/src/hal_bsp.c
@@ -192,6 +192,8 @@ hal_bsp_init(void)
{
int rc;
+ (void)rc;
+
/* Make sure system clocks have started */
hal_system_clock_start();
diff --git a/hw/bsp/rb-nano2/src/hal_bsp.c b/hw/bsp/rb-nano2/src/hal_bsp.c
index 046c92306..1da7de564 100644
--- a/hw/bsp/rb-nano2/src/hal_bsp.c
+++ b/hw/bsp/rb-nano2/src/hal_bsp.c
@@ -183,6 +183,8 @@ hal_bsp_init(void)
{
int rc;
+ (void)rc;
+
/* Make sure system clocks have started */
hal_system_clock_start();
diff --git a/hw/bsp/vbluno51/src/hal_bsp.c b/hw/bsp/vbluno51/src/hal_bsp.c
index b44de78ad..77c0a158a 100644
--- a/hw/bsp/vbluno51/src/hal_bsp.c
+++ b/hw/bsp/vbluno51/src/hal_bsp.c
@@ -31,8 +31,11 @@
#include "hal/hal_flash.h"
#include "hal/hal_spi.h"
#include "hal/hal_i2c.h"
+
+#if MYNEWT_VAL(UART_0)
#include "uart/uart.h"
#include "uart_hal/uart_hal.h"
+#endif
#if MYNEWT_VAL(ADC_0)
#include <adc_nrf51/adc_nrf51.h>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services