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

* updated with correction in pinmap_function_sercom function usage for serial.

pull/1243/head
akhilpanayam 2015-07-08 14:11:07 +05:30 committed by Karthik Purushothaman
parent 7cda3e9352
commit 70e1dd0178
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM21/serial_api.c
View File

@ -285,7 +285,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
uint32_t current_pin = pSERIAL_S(obj)->pins[pad];
if (current_pin != NC) {
pin_conf.mux_position = pinmap_function_sercom(current_pin, sercom_index);
if (NC != pin_conf.mux_position) {
if ((uint8_t)NC != pin_conf.mux_position) {
system_pinmux_pin_set_config(current_pin, &pin_conf);
}
}
@ -472,7 +472,7 @@ void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, Pi
uint32_t current_pin = pSERIAL_S(obj)->pins[pad];
if (current_pin != NC) {
pin_conf.mux_position = pinmap_function_sercom(current_pin, sercom_index);
if (NC != pin_conf.mux_position) {
if ((uint8_t)NC != pin_conf.mux_position) {
system_pinmux_pin_set_config(current_pin, &pin_conf);
}
}
@ -482,7 +482,9 @@ void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, Pi
pin_conf.direction = SYSTEM_PINMUX_PIN_DIR_OUTPUT; // setting for rxflow
pin_conf.input_pull = SYSTEM_PINMUX_PIN_PULL_UP;
pin_conf.mux_position = pinmap_function_sercom(pSERIAL_S(obj)->pins[USART_RXFLOW_INDEX] , sercom_index);
system_pinmux_pin_set_config(pSERIAL_S(obj)->pins[USART_RXFLOW_INDEX], &pin_conf);
if ((uint8_t)NC != pin_conf.mux_position) {
system_pinmux_pin_set_config(pSERIAL_S(obj)->pins[USART_RXFLOW_INDEX], &pin_conf);
}
}
}
if((FlowControlCTS == type) || (FlowControlRTSCTS== type)) {
@ -490,7 +492,9 @@ void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, Pi
pin_conf.direction = SYSTEM_PINMUX_PIN_DIR_INPUT; // setting for txflow
pin_conf.input_pull = SYSTEM_PINMUX_PIN_PULL_UP;
pin_conf.mux_position = pinmap_function_sercom(pSERIAL_S(obj)->pins[USART_TXFLOW_INDEX] , sercom_index);
system_pinmux_pin_set_config(pSERIAL_S(obj)->pins[USART_TXFLOW_INDEX], &pin_conf);
if ((uint8_t)NC != pin_conf.mux_position) {
system_pinmux_pin_set_config(pSERIAL_S(obj)->pins[USART_TXFLOW_INDEX], &pin_conf);
}
}
}
enable_usart(obj);
@ -507,9 +511,7 @@ void serial_break_set(serial_t *obj)
pin_conf.powersave = false;
if (pSERIAL_S(obj)->pins[USART_TX_INDEX] != NC) {
if (NC != pin_conf.mux_position) {
system_pinmux_pin_set_config(pSERIAL_S(obj)->pins[USART_TX_INDEX], &pin_conf);
}
system_pinmux_pin_set_config(pSERIAL_S(obj)->pins[USART_TX_INDEX], &pin_conf);
}
}
@ -524,7 +526,7 @@ void serial_break_clear(serial_t *obj)
if (pSERIAL_S(obj)->pins[USART_TX_INDEX] != NC) {
pin_conf.mux_position = pinmap_function_sercom(pSERIAL_S(obj)->pins[USART_TX_INDEX], sercom_index);
if (NC != pin_conf.mux_position) {
if ((uint8_t)NC != pin_conf.mux_position) {
system_pinmux_pin_set_config(pSERIAL_S(obj)->pins[USART_TX_INDEX], &pin_conf);
}
}