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/08/08 07:19:52 UTC
[GitHub] andrzej-kaczmarek closed pull request #1317:
hw/mcu/nordic/nrf52xxx: Fix minor issues after refactor
andrzej-kaczmarek closed pull request #1317: hw/mcu/nordic/nrf52xxx: Fix minor issues after refactor
URL: https://github.com/apache/mynewt-core/pull/1317
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/mcu/nordic/nrf52xxx/src/nrf52_periph.c b/hw/mcu/nordic/nrf52xxx/src/nrf52_periph.c
index c8aafbdfab..ce723c7356 100644
--- a/hw/mcu/nordic/nrf52xxx/src/nrf52_periph.c
+++ b/hw/mcu/nordic/nrf52xxx/src/nrf52_periph.c
@@ -23,6 +23,7 @@
#include "mcu/nrf52_hal.h"
#include "hal/hal_i2c.h"
#include "hal/hal_spi.h"
+#include "bsp/bsp.h"
#include "nrfx.h"
#if MYNEWT_VAL(ADC_0)
#include "adc/adc.h"
@@ -194,7 +195,7 @@ nrf52_periph_create_adc(void)
(void)rc;
#if MYNEWT_VAL(ADC_0)
- rc = os_dev_create((struct os_dev *)&os_bsp_adc0, "adc0",
+ rc = os_dev_create(&os_bsp_adc0.ad_dev, "adc0",
OS_DEV_INIT_KERNEL, OS_DEV_INIT_PRIO_DEFAULT,
nrf52_adc_dev_init, &os_bsp_adc0_config);
assert(rc == 0);
@@ -212,7 +213,7 @@ nrf52_periph_create_pwm(void)
#if MYNEWT_VAL(PWM_0)
idx = 0;
- rc = os_dev_create((struct os_dev *) &os_bsp_pwm0, "pwm0",
+ rc = os_dev_create(&os_bsp_pwm0.pwm_os_dev, "pwm0",
OS_DEV_INIT_KERNEL, OS_DEV_INIT_PRIO_DEFAULT,
nrf52_pwm_dev_init, &idx);
assert(rc == 0);
@@ -284,14 +285,10 @@ nrf52_periph_create_i2c(void)
(void)rc;
#if MYNEWT_VAL(I2C_0)
- assert(hal_i2c0_cfg.scl_pin >= 0);
- assert(hal_i2c0_cfg.sda_pin >= 0);
rc = hal_i2c_init(0, (void *)&hal_i2c0_cfg);
assert(rc == 0);
#endif
#if MYNEWT_VAL(I2C_1)
- assert(hal_i2c1_cfg.scl_pin >= 0);
- assert(hal_i2c1_cfg.sda_pin >= 0);
rc = hal_i2c_init(1, (void *)&hal_i2c1_cfg);
assert(rc == 0);
#endif
diff --git a/hw/mcu/nordic/nrf52xxx/syscfg.yml b/hw/mcu/nordic/nrf52xxx/syscfg.yml
index ad3201406d..379973ed31 100644
--- a/hw/mcu/nordic/nrf52xxx/syscfg.yml
+++ b/hw/mcu/nordic/nrf52xxx/syscfg.yml
@@ -48,10 +48,10 @@ syscfg.defs:
- "!SPI_0_SLAVE"
I2C_0_PIN_SCL:
description: 'SCL pin for I2C_0'
- value: -1
+ value: ''
I2C_0_PIN_SDA:
description: 'SDA pin for I2C_0'
- value: -1
+ value: ''
I2C_0_FREQ_KHZ:
description: 'Frequency [kHz] for I2C_0'
value: 100
@@ -64,10 +64,10 @@ syscfg.defs:
- "!SPI_1_SLAVE"
I2C_1_PIN_SCL:
description: 'SCL pin for I2C_1'
- value: -1
+ value: ''
I2C_1_PIN_SDA:
description: 'SDA pin for I2C_1'
- value: -1
+ value: ''
I2C_1_FREQ_KHZ:
description: 'Frequency [kHz] for I2C_1'
value: 100
@@ -80,13 +80,13 @@ syscfg.defs:
- "!I2C_0"
SPI_0_MASTER_PIN_SCK:
description: 'SCK pin for SPI_0_MASTER'
- value: -1
+ value: ''
SPI_0_MASTER_PIN_MOSI:
description: 'MOSI pin for SPI_0_MASTER'
- value: -1
+ value: ''
SPI_0_MASTER_PIN_MISO:
description: 'MISO pin for SPI_0_MASTER'
- value: -1
+ value: ''
SPI_0_SLAVE:
description: 'Enable nRF52xxx SPI Slave 0'
@@ -96,16 +96,16 @@ syscfg.defs:
- "!I2C_0"
SPI_0_SLAVE_PIN_SCK:
description: 'SCK pin for SPI_0_SLAVE'
- value: -1
+ value: ''
SPI_0_SLAVE_PIN_MOSI:
description: 'MOSI pin for SPI_0_SLAVE'
- value: -1
+ value: ''
SPI_0_SLAVE_PIN_MISO:
description: 'MISO pin for SPI_0_SLAVE'
- value: -1
+ value: ''
SPI_0_SLAVE_PIN_SS:
description: 'SS pin for SPI_0_SLAVE'
- value: -1
+ value: ''
SPI_1_MASTER:
description: 'Enable nRF52xxx SPI Master 1'
@@ -115,13 +115,13 @@ syscfg.defs:
- "!I2C_1"
SPI_1_MASTER_PIN_SCK:
description: 'SCK pin for SPI_1_MASTER'
- value: -1
+ value: ''
SPI_1_MASTER_PIN_MOSI:
description: 'MOSI pin for SPI_1_MASTER'
- value: -1
+ value: ''
SPI_1_MASTER_PIN_MISO:
description: 'MISO pin for SPI_1_MASTER'
- value: -1
+ value: ''
SPI_1_SLAVE:
description: 'Enable nRF52xxx SPI Slave 1'
@@ -131,16 +131,16 @@ syscfg.defs:
- "!I2C_1"
SPI_1_SLAVE_PIN_SCK:
description: 'SCK pin for SPI_1_SLAVE'
- value: -1
+ value: ''
SPI_1_SLAVE_PIN_MOSI:
description: 'MOSI pin for SPI_1_SLAVE'
- value: -1
+ value: ''
SPI_1_SLAVE_PIN_MISO:
description: 'MISO pin for SPI_1_SLAVE'
- value: -1
+ value: ''
SPI_1_SLAVE_PIN_SS:
description: 'SS pin for SPI_1_SLAVE'
- value: -1
+ value: ''
SPI_2_MASTER:
description: 'Enable nRF52xxx SPI Master 2'
@@ -150,13 +150,13 @@ syscfg.defs:
- "MCU_NRF52840"
SPI_2_MASTER_PIN_SCK:
description: 'SCK pin for SPI_2_MASTER'
- value: -1
+ value: ''
SPI_2_MASTER_PIN_MOSI:
description: 'MOSI pin for SPI_2_MASTER'
- value: -1
+ value: ''
SPI_2_MASTER_PIN_MISO:
description: 'MISO pin for SPI_2_MASTER'
- value: -1
+ value: ''
SPI_2_SLAVE:
description: 'Enable nRF52xxx SPI Slave 2'
@@ -166,16 +166,16 @@ syscfg.defs:
- "MCU_NRF52840"
SPI_2_SLAVE_PIN_SCK:
description: 'SCK pin for SPI_2_SLAVE'
- value: -1
+ value: ''
SPI_2_SLAVE_PIN_MOSI:
description: 'MOSI pin for SPI_2_SLAVE'
- value: -1
+ value: ''
SPI_2_SLAVE_PIN_MISO:
description: 'MISO pin for SPI_2_SLAVE'
- value: -1
+ value: ''
SPI_2_SLAVE_PIN_SS:
description: 'SS pin for SPI_2_SLAVE'
- value: -1
+ value: ''
ADC_0:
description: 'Enable nRF52xxx ADC 0'
@@ -209,10 +209,10 @@ syscfg.defs:
value: 1
UART_0_PIN_TX:
description: 'TX pin for UART0'
- value: -1
+ value: ''
UART_0_PIN_RX:
description: 'RX pin for UART0'
- value: -1
+ value: ''
UART_0_PIN_RTS:
description: 'RTS pin for UART0'
value: -1
@@ -227,10 +227,10 @@ syscfg.defs:
- "MCU_NRF52840"
UART_1_PIN_TX:
description: 'TX pin for UART1'
- value: -1
+ value: ''
UART_1_PIN_RX:
description: 'RX pin for UART1'
- value: -1
+ value: ''
UART_1_PIN_RTS:
description: 'RTS pin for UART1'
value: -1
@@ -363,13 +363,13 @@ syscfg.defs:
syscfg.restrictions:
- "MCU_NRF52832 ^^ MCU_NRF52840"
- - "!I2C_0 || (I2C_0_PIN_SCL >= 0 && I2C_0_PIN_SDA >= 0)"
- - "!I2C_1 || (I2C_1_PIN_SCL >= 0 && I2C_1_PIN_SDA >= 0)"
- - "!SPI_0_MASTER || (SPI_0_MASTER_PIN_SCK >= 0 && SPI_0_MASTER_PIN_MOSI >=0 && SPI_0_MASTER_PIN_MISO >= 0)"
- - "!SPI_1_MASTER || (SPI_1_MASTER_PIN_SCK >= 0 && SPI_1_MASTER_PIN_MOSI >=0 && SPI_1_MASTER_PIN_MISO >= 0)"
- - "!SPI_2_MASTER || (SPI_2_MASTER_PIN_SCK >= 0 && SPI_2_MASTER_PIN_MOSI >=0 && SPI_2_MASTER_PIN_MISO >= 0)"
- - "!SPI_0_SLAVE || (SPI_0_SLAVE_PIN_SCK >= 0 && SPI_0_SLAVE_PIN_MOSI >=0 && SPI_0_SLAVE_PIN_MISO >= 0 && SPI_0_SLAVE_PIN_SS >= 0)"
- - "!SPI_1_SLAVE || (SPI_1_SLAVE_PIN_SCK >= 0 && SPI_1_SLAVE_PIN_MOSI >=0 && SPI_1_SLAVE_PIN_MISO >= 0 && SPI_1_SLAVE_PIN_SS >= 0)"
- - "!SPI_2_SLAVE || (SPI_2_SLAVE_PIN_SCK >= 0 && SPI_2_SLAVE_PIN_MOSI >=0 && SPI_2_SLAVE_PIN_MISO >= 0 && SPI_2_SLAVE_PIN_SS >= 0)"
- - "!UART_0 || (UART_0_PIN_TX >= 0 && UART_0_PIN_RX >= 0)"
- - "!UART_1 || (UART_1_PIN_TX >= 0 && UART_1_PIN_RX >= 0)"
+ - "!I2C_0 || (I2C_0_PIN_SCL && I2C_0_PIN_SDA)"
+ - "!I2C_1 || (I2C_1_PIN_SCL && I2C_1_PIN_SDA)"
+ - "!SPI_0_MASTER || (SPI_0_MASTER_PIN_SCK && SPI_0_MASTER_PIN_MOSI && SPI_0_MASTER_PIN_MISO)"
+ - "!SPI_1_MASTER || (SPI_1_MASTER_PIN_SCK && SPI_1_MASTER_PIN_MOSI && SPI_1_MASTER_PIN_MISO)"
+ - "!SPI_2_MASTER || (SPI_2_MASTER_PIN_SCK && SPI_2_MASTER_PIN_MOSI && SPI_2_MASTER_PIN_MISO)"
+ - "!SPI_0_SLAVE || (SPI_0_SLAVE_PIN_SCK && SPI_0_SLAVE_PIN_MOSI && SPI_0_SLAVE_PIN_MISO && SPI_0_SLAVE_PIN_SS)"
+ - "!SPI_1_SLAVE || (SPI_1_SLAVE_PIN_SCK && SPI_1_SLAVE_PIN_MOSI && SPI_1_SLAVE_PIN_MISO && SPI_1_SLAVE_PIN_SS)"
+ - "!SPI_2_SLAVE || (SPI_2_SLAVE_PIN_SCK && SPI_2_SLAVE_PIN_MOSI && SPI_2_SLAVE_PIN_MISO && SPI_2_SLAVE_PIN_SS)"
+ - "!UART_0 || (UART_0_PIN_TX && UART_0_PIN_RX)"
+ - "!UART_1 || (UART_1_PIN_TX && UART_1_PIN_RX)"
----------------------------------------------------------------
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