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

Merge branch 'master' of https://github.com/mbedmicro/mbed

pull/196/head
Przemek Wirkus 2014-03-03 12:16:00 +00:00
parent 724bf1debb 8431561fc7
commit f47daa9173
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/PeripheralPins.c
View File

@ -19,7 +19,7 @@
/************RTC***************/ /************RTC***************/
const PinMap PinMap_RTC[] = { const PinMap PinMap_RTC[] = {
{PTC1, RTC_CLKIN, 2}, {PTC1, RTC_CLKIN, 1},
}; };
/************ADC***************/ /************ADC***************/

2
libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PeripheralPins.c
View File

@ -18,7 +18,7 @@
/************RTC***************/ /************RTC***************/
const PinMap PinMap_RTC[] = { const PinMap PinMap_RTC[] = {
{PTC1, RTC_CLKIN, 2}, {PTC1, RTC_CLKIN, 1},
}; };
/************ADC***************/ /************ADC***************/

8
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c
View File

@ -364,12 +364,10 @@ int serial_readable(serial_t *obj) {
} }
int serial_writable(serial_t *obj) { int serial_writable(serial_t *obj) {
int isWritable = 1;
if (NC != uart_data[obj->index].sw_cts.pin) if (NC != uart_data[obj->index].sw_cts.pin)
isWritable = gpio_read(&uart_data[obj->index].sw_cts) == 0; return (gpio_read(&uart_data[obj->index].sw_cts) == 0) && (obj->uart->LSR & 0x40); //If flow control: writable if CTS low + UART done
if (isWritable) else
isWritable = obj->uart->LSR & 0x40; return obj->uart->LSR & 0x20; //No flow control: writable if space in holding register
return isWritable;
} }
void serial_clear(serial_t *obj) { void serial_clear(serial_t *obj) {