Janek Mann / mbed-src-openwear

mbed library sources modified for open wear

Dependents:   openwear-lifelogger-example

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 289:17565898c031, committed 2014-08-19

Comitter:
mbed_official
Date:
Tue Aug 19 14:45:07 2014 +0100
Parent:
288:9567fed63582
Child:
290:bade01f4d529
Commit message:
Synchronized with git revision 0cb4ae69ce427a6eb8e705dc3981e5617d4f505d

Full URL: https://github.com/mbedmicro/mbed/commit/0cb4ae69ce427a6eb8e705dc3981e5617d4f505d/

Adds standard DONT_CARE pin name for specifying that any pin will work

Changed in this revision

targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c	Mon Aug 18 09:30:06 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/serial_api.c	Tue Aug 19 14:45:07 2014 +0100
@@ -27,16 +27,6 @@
  ******************************************************************************/
 #define UART_NUM    1
 
-static const PinMap PinMap_UART_TX[] = {
-    {TX_PIN_NUMBER, UART_0, 1},
-    { NC  , NC    , 0}
-};
-
-static const PinMap PinMap_UART_RX[] = {
-    {RX_PIN_NUMBER, UART_0, 1},
-    {NC   , NC    , 0}
-};
-
 static uint32_t serial_irq_ids[UART_NUM] = {0};
 static uart_irq_handler irq_handler;
 static uint32_t acceptedSpeeds[16][2] = {{1200,UART_BAUDRATE_BAUDRATE_Baud1200},
@@ -61,10 +51,7 @@
 
 
 void serial_init(serial_t *obj, PinName tx, PinName rx) {
-    // determine the UART to use -- for mcu's with multiple uart connections
-    UARTName uart_tx = (UARTName)pinmap_peripheral(tx, PinMap_UART_TX);
-    UARTName uart_rx = (UARTName)pinmap_peripheral(rx, PinMap_UART_RX);
-    UARTName uart = (UARTName)pinmap_merge(uart_tx, uart_rx);
+    UARTName uart = UART_0;
     
     MBED_ASSERT((int)uart != NC);