ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

serial_api: Fixes to compile with SDK15.0

pull/10652/head
Naveen Kaje 2018-08-19 13:40:01 -05:00 committed by desmond.chen
parent 9593a53e25
commit af8d171a73
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/serial_api.c
View File

@ -41,8 +41,7 @@
#include "hal/serial_api.h" #include "hal/serial_api.h"
#include "nrf_uarte.h" #include "nrf_uarte.h"
#include "nrf_drv_uart.h" #include "nrfx_uart.h"
#include "nrf_drv_common.h"
#include "nrf_atfifo.h" #include "nrf_atfifo.h"
#include "app_util_platform.h" #include "app_util_platform.h"
#include "pinmap_ex.h" #include "pinmap_ex.h"
@ -165,12 +164,12 @@ typedef enum {
/** /**
* UARTE state. One for each instance. * UARTE state. One for each instance.
*/ */
static nordic_uart_state_t nordic_nrf5_uart_state[UART_ENABLED_COUNT] = { 0 }; static nordic_uart_state_t nordic_nrf5_uart_state[NRFX_UART_ENABLED_COUNT] = { 0 };
/** /**
* Array with UARTE register pointers for easy access. * Array with UARTE register pointers for easy access.
*/ */
static NRF_UARTE_Type *nordic_nrf5_uart_register[UART_ENABLED_COUNT] = { static NRF_UARTE_Type *nordic_nrf5_uart_register[NRFX_UART_ENABLED_COUNT] = {
NRF_UARTE0, NRF_UARTE0,
#if UART1_ENABLED #if UART1_ENABLED
NRF_UARTE1, NRF_UARTE1,