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

PrzemekWirkus · PrzemekWirkus · commit f47daa917379 · 2014-03-03T12:16:00.000Z
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/PeripheralPins.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/PeripheralPins.c
@@ -19,7 +19,7 @@
 
 /************RTC***************/
 const PinMap PinMap_RTC[] = {
-    {PTC1, RTC_CLKIN, 2},
+    {PTC1, RTC_CLKIN, 1},
 };
 
 /************ADC***************/
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PeripheralPins.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PeripheralPins.c
@@ -18,7 +18,7 @@
 
 /************RTC***************/
 const PinMap PinMap_RTC[] = {
-    {PTC1, RTC_CLKIN, 2},
+    {PTC1, RTC_CLKIN, 1},
 };
 
 /************ADC***************/
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c
@@ -364,12 +364,10 @@ int serial_readable(serial_t *obj) {
 }
 
 int serial_writable(serial_t *obj) {
-    int isWritable = 1;
     if (NC != uart_data[obj->index].sw_cts.pin)
-        isWritable = gpio_read(&uart_data[obj->index].sw_cts) == 0;
-    if (isWritable)
-        isWritable = obj->uart->LSR & 0x40;
-    return isWritable;
+        return (gpio_read(&uart_data[obj->index].sw_cts) == 0) && (obj->uart->LSR & 0x40);  //If flow control: writable if CTS low + UART done
+    else
+        return obj->uart->LSR & 0x20;                                                       //No flow control: writable if space in holding register
 }
 
 void serial_clear(serial_t *obj) {

Original file line number	Diff line number	Diff line change
`@@ -364,12 +364,10 @@ int serial_readable(serial_t *obj) {`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`int serial_writable(serial_t *obj) {`
`367`		`- int isWritable = 1;`
`368`	`367`	`if (NC != uart_data[obj->index].sw_cts.pin)`
`369`		`- isWritable = gpio_read(&uart_data[obj->index].sw_cts) == 0;`
`370`		`- if (isWritable)`
`371`		`- isWritable = obj->uart->LSR & 0x40;`
`372`		`- return isWritable;`
	`368`	`+ return (gpio_read(&uart_data[obj->index].sw_cts) == 0) && (obj->uart->LSR & 0x40); //If flow control: writable if CTS low + UART done`
	`369`	`+ else`
	`370`	`+ return obj->uart->LSR & 0x20; //No flow control: writable if space in holding register`
`373`	`371`	`}`
`374`	`372`
`375`	`373`	`void serial_clear(serial_t *obj) {`