Merge branch 'master' of git://github.com/sg-/mbed into sg--master

Bogdan Marinescu · Bogdan Marinescu · commit efbbb2f3070b · 2014-04-11T17:19:53.000+01:00
Conflicts:
	libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c
	libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c
	libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c
diff --git a/libraries/mbed/common/exit.c b/libraries/mbed/common/exit.c
@@ -15,6 +15,9 @@
  */
 #include "semihost_api.h"
 #include "mbed_interface.h"
+#if DEVICE_STDIO_MESSAGES
+#include <stdio.h>
+#endif
 
 #ifdef TOOLCHAIN_GCC_CW
 // TODO: Ideally, we would like to define directly "_ExitProcess"
@@ -23,6 +26,11 @@ void mbed_exit(int return_code) {
 void exit(int return_code) {
 #endif
 
+#if DEVICE_STDIO_MESSAGES
+    fflush(stdout);
+    fflush(stderr);
+#endif
+
 #if DEVICE_SEMIHOST
     if (mbed_interface_connected()) {
         semihost_exit();
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_irq_api.c
@@ -108,7 +108,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
             break;
 
         default:
-            error("gpio_irq only supported on port A-E.\n");
+            error("gpio_irq only supported on port A-E.");
             break;
     }
     NVIC_SetVector(irq_n, vector);
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/serial_api.c
@@ -126,7 +126,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
 
     // 8 data bits = 0 ... 9 data bits = 1
     if ((data_bits < 8) || (data_bits > 9))
-        error("Invalid number of bits (%d) in serial format, should be 8..9\r\n", data_bits);
+        error("Invalid number of bits (%d) in serial format, should be 8..9", data_bits);
 
     data_bits -= 8;
 
@@ -136,13 +136,13 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
         case ParityOdd : parity_enable = 1; parity_select = 1; data_bits++; break;
         case ParityEven: parity_enable = 1; parity_select = 0; data_bits++; break;
         default:
-            error("Invalid serial parity setting\r\n");
+            error("Invalid serial parity setting");
             return;
     }
 
     // 1 stop bits = 0, 2 stop bits = 1
     if ((stop_bits != 1) && (stop_bits != 2))
-        error("Invalid stop bits specified\r\n");
+        error("Invalid stop bits specified");
     stop_bits -= 1;
 
     uint32_t m10 = 0;
@@ -151,7 +151,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
     if (data_bits == 2) {
         // only uart0 supports 10 bit communication
         if (obj->index != 0)
-            error("Invalid number of bits (9) to be used with parity\r\n");
+            error("Invalid number of bits (9) to be used with parity");
         data_bits = 0;
         m10 = 1;
     }
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/gpio_irq_api.c
@@ -99,7 +99,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
           break;
 
       default:
-          error("gpio_irq only supported on Port A and B\n");
+          error("gpio_irq only supported on Port A and B");
           break;
     }
     NVIC_SetVector(irq_n, vector);
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/gpio_irq_api.c
@@ -89,7 +89,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
                 break;
 
             default:
-                error("gpio_irq only supported on port A and D\n");
+                error("gpio_irq only supported on port A and D");
                 break;
     }
     NVIC_SetVector(irq_n, vector);
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/gpio_irq_api.c
@@ -109,7 +109,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
                 break;
 
             default:
-                error("gpio_irq only supported on port A,C and D\n");
+                error("gpio_irq only supported on port A,C and D");
                 break;
     }
     NVIC_SetVector(irq_n, vector);
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/serial_api.c
@@ -159,7 +159,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
     
     // TODO: Support other number of data bits (also in the write method!)
     if ((data_bits < 8) || (data_bits > 8)) {
-        error("Invalid number of bits (%d) in serial format, should be 8\r\n", data_bits);
+        error("Invalid number of bits (%d) in serial format, should be 8", data_bits);
     }
 
     uint8_t parity_enable, parity_select;
@@ -168,13 +168,13 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
         case ParityOdd : parity_enable = 1; parity_select = 1; data_bits++; break;
         case ParityEven: parity_enable = 1; parity_select = 0; data_bits++; break;
         default:
-            error("Invalid serial parity setting\r\n");
+            error("Invalid serial parity setting");
             return;
     }
 
     // 1 stop bits = 0, 2 stop bits = 1
     if ((stop_bits != 1) && (stop_bits != 2)) {
-        error("Invalid stop bits specified\r\n");
+        error("Invalid stop bits specified");
     }
     stop_bits -= 1;
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/device.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/device.h
@@ -49,7 +49,7 @@
 
 #define DEVICE_DEBUG_AWARENESS  0
 
-#define DEVICE_STDIO_MESSAGES   0
+#define DEVICE_STDIO_MESSAGES   1
 
 #define DEVICE_ERROR_RED        1
 
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_irq_api.c
@@ -109,7 +109,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
             break;
 
         default:
-            error("gpio_irq only supported on port A-E.\n");
+            error("gpio_irq only supported on port A-E.");
             break;
     }
     NVIC_SetVector(irq_n, vector);
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c
@@ -42,8 +42,7 @@ static const PinMap PinMap_SPI_MOSI[] = {
     {PTB16, SPI_1, 2},
     {PTB22, SPI_2, 2},
     {PTC6 , SPI_0, 2},
-    {PTD2 , SPI_0, 2},
-    {PTD6 , SPI_0, 7},
+    {PTD6 , SPI_1, 7},
     {NC   , NC   , 0}
 };
 
@@ -55,7 +54,6 @@ static const PinMap PinMap_SPI_MISO[] = {
     {PTB17, SPI_1, 2},
     {PTB23, SPI_2, 2},
     {PTC7 , SPI_0, 2},
-    {PTD3 , SPI_0, 2},
     {PTD7 , SPI_1, 7},
     {NC   , NC   , 0}
 };
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_irq_api.c
@@ -89,7 +89,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
     
     // Interrupts available only on GPIO0 and GPIO2
     if (obj->port != LPC_GPIO0_BASE && obj->port != LPC_GPIO2_BASE) {
-        error("pins on this port cannot generate interrupts\n");
+        error("pins on this port cannot generate interrupts");
     }
     
     // put us in the interrupt table
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_irq_api.c
@@ -80,7 +80,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
     
     // Interrupts available only on GPIO0 and GPIO2
     if (obj->port != LPC_GPIO0_BASE && obj->port != LPC_GPIO2_BASE) {
-        error("pins on this port cannot generate interrupts\n");
+        error("pins on this port cannot generate interrupts");
     }
     
     // put us in the interrupt table
diff --git a/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_irq_api.c
@@ -102,7 +102,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
     
     // Interrupts available only on GPIO0 and GPIO2
     if (obj->port != LPC_GPIO0_BASE && obj->port != LPC_GPIO2_BASE) {
-        error("pins on this port cannot generate interrupts\n");
+        error("pins on this port cannot generate interrupts");
     }
     
     // put us in the interrupt table
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_irq_api.c
@@ -104,7 +104,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
             irq_index = 2;
             break;
         default:
-            error("This pin is not supported\n");
+            error("This pin is not supported");
             return -1;
     }
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_irq_api.c
@@ -110,7 +110,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
             irq_index = 3;
             break;
         default:
-            error("This pin is not supported with InterruptIn.\n");
+            error("This pin is not supported with InterruptIn.");
             return -1;
     }
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_irq_api.c
@@ -138,7 +138,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
             irq_index = 6;
             break;
         default:
-            error("InterruptIn error: pin not supported.\n");
+            error("InterruptIn error: pin not supported.");
             return -1;
     }
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_irq_api.c
@@ -154,7 +154,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
             irq_index = 6;
             break;
         default:
-            error("This pin is not supported with InterruptIn.\n");
+            error("This pin is not supported with InterruptIn.");
             return -1;
     }
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c
@@ -138,7 +138,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
             irq_index = 6;
             break;
         default:
-            error("InterruptIn error: pin not supported.\n");
+            error("InterruptIn error: pin not supported.");
             return -1;
     }
 
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_irq_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_irq_api.c
@@ -154,7 +154,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
             irq_index = 6;
             break;
         default:
-            error("This pin is not supported with InterruptIn.\n");
+            error("This pin is not supported with InterruptIn.");
             return -1;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32`
`108`	`108`	`break;`
`109`	`109`
`110`	`110`	`default:`
`111`		`- error("gpio_irq only supported on port A-E.\n");`
	`111`	`+ error("gpio_irq only supported on port A-E.");`
`112`	`112`	`break;`
`113`	`113`	`}`
`114`	`114`	`NVIC_SetVector(irq_n, vector);`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32`
`99`	`99`	`break;`
`100`	`100`
`101`	`101`	`default:`
`102`		`- error("gpio_irq only supported on Port A and B\n");`
	`102`	`+ error("gpio_irq only supported on Port A and B");`
`103`	`103`	`break;`
`104`	`104`	`}`
`105`	`105`	`NVIC_SetVector(irq_n, vector);`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32`
`89`	`89`	`break;`
`90`	`90`
`91`	`91`	`default:`
`92`		`- error("gpio_irq only supported on port A and D\n");`
	`92`	`+ error("gpio_irq only supported on port A and D");`
`93`	`93`	`break;`
`94`	`94`	`}`
`95`	`95`	`NVIC_SetVector(irq_n, vector);`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32`
`109`	`109`	`break;`
`110`	`110`
`111`	`111`	`default:`
`112`		`- error("gpio_irq only supported on port A,C and D\n");`
	`112`	`+ error("gpio_irq only supported on port A,C and D");`
`113`	`113`	`break;`
`114`	`114`	`}`
`115`	`115`	`NVIC_SetVector(irq_n, vector);`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32`
`80`	`80`
`81`	`81`	`// Interrupts available only on GPIO0 and GPIO2`
`82`	`82`	`if (obj->port != LPC_GPIO0_BASE && obj->port != LPC_GPIO2_BASE) {`
`83`		`- error("pins on this port cannot generate interrupts\n");`
	`83`	`+ error("pins on this port cannot generate interrupts");`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`// put us in the interrupt table`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32`
`102`	`102`
`103`	`103`	`// Interrupts available only on GPIO0 and GPIO2`
`104`	`104`	`if (obj->port != LPC_GPIO0_BASE && obj->port != LPC_GPIO2_BASE) {`
`105`		`- error("pins on this port cannot generate interrupts\n");`
	`105`	`+ error("pins on this port cannot generate interrupts");`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`// put us in the interrupt table`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32`
`104`	`104`	`irq_index = 2;`
`105`	`105`	`break;`
`106`	`106`	`default:`
`107`		`- error("This pin is not supported\n");`
	`107`	`+ error("This pin is not supported");`
`108`	`108`	`return -1;`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32`
`110`	`110`	`irq_index = 3;`
`111`	`111`	`break;`
`112`	`112`	`default:`
`113`		`- error("This pin is not supported with InterruptIn.\n");`
	`113`	`+ error("This pin is not supported with InterruptIn.");`
`114`	`114`	`return -1;`
`115`	`115`	`}`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32`
`138`	`138`	`irq_index = 6;`
`139`	`139`	`break;`
`140`	`140`	`default:`
`141`		`- error("InterruptIn error: pin not supported.\n");`
	`141`	`+ error("InterruptIn error: pin not supported.");`
`142`	`142`	`return -1;`
`143`	`143`	`}`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32`
`154`	`154`	`irq_index = 6;`
`155`	`155`	`break;`
`156`	`156`	`default:`
`157`		`- error("This pin is not supported with InterruptIn.\n");`
	`157`	`+ error("This pin is not supported with InterruptIn.");`
`158`	`158`	`return -1;`
`159`	`159`	`}`
`160`	`160`