mbed library sources

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Comitter:
mbed_official
Date:
Tue Jul 08 11:15:08 2014 +0100
Parent:
249:5706c6e2db45
Child:
251:de9a1e4ffd79
Commit message:
Synchronized with git revision 3197042b65f8d28e856e1a7812d45e2fbe80e3f1

Full URL: https://github.com/mbedmicro/mbed/commit/3197042b65f8d28e856e1a7812d45e2fbe80e3f1/

error.h -> mbed_error.h

Changed in this revision

api/error.h Show diff for this revision Revisions of this file
api/mbed.h Show annotated file Show diff for this revision Revisions of this file
api/mbed_error.h Show annotated file Show diff for this revision Revisions of this file
common/error.c Show annotated file Show diff for this revision Revisions of this file
common/mbed_interface.c Show annotated file Show diff for this revision Revisions of this file
common/pinmap_common.c Show annotated file Show diff for this revision Revisions of this file
common/retarget.cpp Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/TARGET_LPC11CXX/can_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC15XX/can_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC176X/ethernet_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC23XX/ethernet_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC408X/ethernet_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F051R8/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F100RB/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F303VC/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F407VG/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_DISCO_F407VG/rtc_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/analogout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/analogout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/rtc_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/rtc_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pwmout_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/rtc_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_irq_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_STM32F3XX/port_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c Show annotated file Show diff for this revision Revisions of this file
--- a/api/error.h	Wed Jul 02 13:45:08 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef MBED_ERROR_H
-#define MBED_ERROR_H
-
-/** To generate a fatal compile-time error, you can use the pre-processor #error directive.
- *
- * @code
- * #error "That shouldn't have happened!"
- * @endcode
- *
- * If the compiler evaluates this line, it will report the error and stop the compile.
- *
- * For example, you could use this to check some user-defined compile-time variables:
- *
- * @code
- * #define NUM_PORTS 7
- * #if (NUM_PORTS > 4)
- *     #error "NUM_PORTS must be less than 4"
- * #endif
- * @endcode
- *
- * Reporting Run-Time Errors:
- * To generate a fatal run-time error, you can use the mbed error() function.
- *
- * @code
- * error("That shouldn't have happened!");
- * @endcode
- *
- * If the mbed running the program executes this function, it will print the
- * message via the USB serial port, and then die with the blue lights of death!
- *
- * The message can use printf-style formatting, so you can report variables in the
- * message too. For example, you could use this to check a run-time condition:
- *
- * @code
- * if(x >= 5) {
- *     error("expected x to be less than 5, but got %d", x);
- * }
- * #endcode
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void error(const char* format, ...);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--- a/api/mbed.h	Wed Jul 02 13:45:08 2014 +0100
+++ b/api/mbed.h	Tue Jul 08 11:15:08 2014 +0100
@@ -25,7 +25,7 @@
 #include <time.h>
 
 // mbed Debug libraries
-#include "error.h"
+#include "mbed_error.h"
 #include "mbed_interface.h"
 
 // mbed Peripheral components
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/api/mbed_error.h	Tue Jul 08 11:15:08 2014 +0100
@@ -0,0 +1,66 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MBED_ERROR_H
+#define MBED_ERROR_H
+
+/** To generate a fatal compile-time error, you can use the pre-processor #error directive.
+ *
+ * @code
+ * #error "That shouldn't have happened!"
+ * @endcode
+ *
+ * If the compiler evaluates this line, it will report the error and stop the compile.
+ *
+ * For example, you could use this to check some user-defined compile-time variables:
+ *
+ * @code
+ * #define NUM_PORTS 7
+ * #if (NUM_PORTS > 4)
+ *     #error "NUM_PORTS must be less than 4"
+ * #endif
+ * @endcode
+ *
+ * Reporting Run-Time Errors:
+ * To generate a fatal run-time error, you can use the mbed error() function.
+ *
+ * @code
+ * error("That shouldn't have happened!");
+ * @endcode
+ *
+ * If the mbed running the program executes this function, it will print the
+ * message via the USB serial port, and then die with the blue lights of death!
+ *
+ * The message can use printf-style formatting, so you can report variables in the
+ * message too. For example, you could use this to check a run-time condition:
+ *
+ * @code
+ * if(x >= 5) {
+ *     error("expected x to be less than 5, but got %d", x);
+ * }
+ * #endcode
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void error(const char* format, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--- a/common/error.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/common/error.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include <stdarg.h>
 #include "device.h"
 #include "toolchain.h"
-#include "error.h"
+#include "mbed_error.h"
 #if DEVICE_STDIO_MESSAGES
 #include <stdio.h>
 #endif
--- a/common/mbed_interface.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/common/mbed_interface.c	Tue Jul 08 11:15:08 2014 +0100
@@ -19,7 +19,7 @@
 #include "gpio_api.h"
 #include "wait_api.h"
 #include "semihost_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "toolchain.h"
 
 #if DEVICE_SEMIHOST
--- a/common/pinmap_common.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/common/pinmap_common.c	Tue Jul 08 11:15:08 2014 +0100
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pinmap_pinout(PinName pin, const PinMap *map) {
     if (pin == NC)
--- a/common/retarget.cpp	Wed Jul 02 13:45:08 2014 +0100
+++ b/common/retarget.cpp	Tue Jul 08 11:15:08 2014 +0100
@@ -383,7 +383,7 @@
 
 #if defined(TOOLCHAIN_GCC)
 /* prevents the exception handling name demangling code getting pulled in */
-#include "error.h"
+#include "mbed_error.h"
 namespace __gnu_cxx {
     void __verbose_terminate_handler() {
         error("Exception");
--- a/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_K20D5M/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "cmsis.h"
 
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    160
 
--- a/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -18,7 +18,7 @@
 
 #include "gpio_irq_api.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    64   // 31 pins on 2 ports
 
--- a/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -18,7 +18,7 @@
 
 #include "gpio_irq_api.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    64
 
--- a/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -18,7 +18,7 @@
 
 #include "gpio_irq_api.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    96
 
--- a/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define RANGE_12BIT     0xFFF
 
--- a/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -20,7 +20,7 @@
 #include "gpio_api.h"
 #include "fsl_gpio_hal.h"
 #include "fsl_port_hal.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    160
 
--- a/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "fsl_clock_manager.h"
 #include "fsl_port_hal.h"
 
--- a/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "fsl_clock_manager.h"
 #include "fsl_dspi_hal.h"
 
--- a/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_NRF51822/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "cmsis.h"
 
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    31
 
--- a/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
 }
--- a/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_NRF51822/pwmout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "pwmout_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define NO_PWMS         3
 #define TIMER_PRECISION 4 //4us ticks   
--- a/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -18,7 +18,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {SPI_PSELSCK0 , SPI_0, 0x01},
--- a/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "analogin_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_ANALOGIN
 
--- a/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_INTERRUPTIN
 
--- a/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
--- a/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "pwmout_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PWMOUT
 
--- a/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_SPI
 
--- a/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "analogin_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define ANALOGIN_MEDIAN_FILTER      1
 
--- a/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -16,7 +16,7 @@
 #include <stddef.h>
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    8
 #define LPC_GPIO_X LPC_GPIO_PIN_INT
--- a/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define LPC_IOCON0_BASE (LPC_IOCON_BASE)
 #define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60)
--- a/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -18,7 +18,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_6 , SPI_0, 0x02},
--- a/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/TARGET_LPC11CXX/can_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/TARGET_LPC11CXX/can_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -16,7 +16,7 @@
 #include "can_api.h"
 
 #include "cmsis.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #include <math.h>
 #include <string.h>
--- a/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "analogin_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_ADC[] = {
     {P0_11, ADC0_0, 2},
--- a/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -16,7 +16,7 @@
 #include <stddef.h>
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "gpio_api.h"
 
 // The chip is capable of 42 GPIO interrupts.
--- a/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "i2c_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_I2C_SDA[] = {
     {P0_5, I2C_0, 1},
--- a/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
--- a/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -18,7 +18,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_6 , SPI_0, 0x02},
--- a/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "analogin_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define ANALOGIN_MEDIAN_FILTER      1
 
--- a/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -16,7 +16,7 @@
 #include <stddef.h>
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    8
 #define LPC_GPIO_X LPC_GPIO_PIN_INT
--- a/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "i2c_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_I2C_SDA[] = {
     {P0_5, I2C_0, 1},
--- a/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define LPC_IOCON0_BASE (LPC_IOCON_BASE)
 #define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60)
--- a/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -18,7 +18,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_6 , SPI_0, 0x02},
--- a/targets/hal/TARGET_NXP/TARGET_LPC15XX/can_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC15XX/can_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "can_api.h"
 
 #include "cmsis.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #include <math.h>
 #include <string.h>
--- a/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM 8
 #define LPC_GPIO_X LPC_PINT
--- a/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
 }
--- a/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "pwmout_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static LPC_SCT0_Type *SCTs[4] = {
     (LPC_SCT0_Type*)LPC_SCT0,
--- a/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -21,7 +21,7 @@
 #include "serial_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /******************************************************************************
  * INITIALIZATION
--- a/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const SWM_Map SWM_SPI_SSEL[] = {
     {4, 0},
--- a/targets/hal/TARGET_NXP/TARGET_LPC176X/ethernet_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC176X/ethernet_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -19,7 +19,7 @@
 #include "cmsis.h"
 #include "mbed_interface.h"
 #include "toolchain.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define NEW_LOGIC       0
 #define NEW_ETH_BUFFER  0
--- a/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC176X/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -16,7 +16,7 @@
 #include <stddef.h>
 
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "cmsis.h"
 
 #define CHANNEL_NUM     48
--- a/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC176X/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
--- a/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC176X/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_7 , SPI_1, 2},
--- a/targets/hal/TARGET_NXP/TARGET_LPC23XX/ethernet_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC23XX/ethernet_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -19,7 +19,7 @@
 #include "cmsis.h"
 #include "mbed_interface.h"
 #include "toolchain.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define NEW_LOGIC       0
 #define NEW_ETH_BUFFER  0
--- a/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC23XX/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include <stddef.h>
 #include "cmsis.h"
 
--- a/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC23XX/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
--- a/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC23XX/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_7 , SPI_1, 2},
--- a/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC408X/analogin_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 #include "analogin_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define ANALOGIN_MEDIAN_FILTER      1
 
--- a/targets/hal/TARGET_NXP/TARGET_LPC408X/ethernet_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC408X/ethernet_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -19,7 +19,7 @@
 #include "cmsis.h"
 #include "mbed_interface.h"
 #include "toolchain.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define NEW_LOGIC       0
 #define NEW_ETH_BUFFER  0
--- a/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC408X/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include <stddef.h>
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "cmsis.h"
 
 #define CHANNEL_NUM    64
--- a/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC408X/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
--- a/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC408X/serial_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -21,7 +21,7 @@
 #include "serial_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /******************************************************************************
  * INITIALIZATION
--- a/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC408X/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -18,7 +18,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P0_7 , SPI_1, 2},
--- a/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC43XX/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
  */
 #include <stddef.h>
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "cmsis.h"
 
 /* The LPC43xx implements GPIO pin and group interrupts. Any pin in the
--- a/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC43XX/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 void pin_function(PinName pin, int function) {
     MBED_ASSERT(pin != (PinName)NC);
--- a/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC43XX/serial_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -23,7 +23,7 @@
 #include "serial_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /******************************************************************************
  * INITIALIZATION
--- a/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC43XX/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -21,7 +21,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
     {P3_0 , SPI_0, (SCU_PINIO_FAST | 2)},
--- a/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC81X/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -17,7 +17,7 @@
 
 #include "cmsis.h"
 #include "gpio_irq_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define CHANNEL_NUM    8
 #define LPC_GPIO_X LPC_PIN_INT
--- a/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC81X/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 __IO uint32_t* IOCON_REGISTERS[18] = {
         &LPC_IOCON->PIO0_0 , &LPC_IOCON->PIO0_1 , &LPC_IOCON->PIO0_2 ,
--- a/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC81X/serial_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -21,7 +21,7 @@
 #include "serial_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /******************************************************************************
  * INITIALIZATION
--- a/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC81X/spi_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -19,7 +19,7 @@
 #include "spi_api.h"
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const SWM_Map SWM_SPI_SSEL[] = {
     {4, 16},
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/analogin_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -32,7 +32,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "wait_api.h"
 
 static const PinMap PinMap_ADC[] = {
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F051R8/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "device.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Alternate-function mapping
 static const uint32_t AF_mapping[] = {
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F100RB/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/i2c_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -34,7 +34,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /* Timeout values for flags and events waiting loops. These timeouts are
    not based on accurate values, they just guarantee that the application will
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F303VC/pwmout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM2 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/analogout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "stm32f4xx_hal.h"
 
 #define RANGE_12BIT (0xFFF)
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/pwmout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM5 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
--- a/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/rtc_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_DISCO_F407VG/rtc_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "rtc_api.h"
 
 #if DEVICE_RTC
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -32,7 +32,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 #include "wait_api.h"
 
 static const PinMap PinMap_ADC[] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/analogout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/analogout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -32,7 +32,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define DAC_RANGE (0xFFF) // 12 bits
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pwmout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/pwmout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM2 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F072RB/rtc_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 
 #if DEVICE_RTC
 
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Alternate-function mapping
 #define AF_NUM (10)
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -34,7 +34,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /* Timeout values for flags and events waiting loops. These timeouts are
    not based on accurate values, they just guarantee that the application will
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pwmout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/pwmout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM2 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/analogout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/analogout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -32,7 +32,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define DAC_RANGE (0xFFF) // 12 bits
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pwmout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/pwmout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM2 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/rtc_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/rtc_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 
 #if DEVICE_RTC
 
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/pwmout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM5 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/rtc_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 
 #if DEVICE_RTC
 
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pwmout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/pwmout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM5 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/rtc_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F411RE/rtc_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 
 #if DEVICE_RTC
 
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -32,7 +32,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define DAC_RANGE (0xFFF) // 12 bits
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/i2c_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -34,7 +34,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /* Timeout values for flags and events waiting loops. These timeouts are
    not based on accurate values, they just guarantee that the application will
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // GPIO mode look-up table
 static const uint32_t gpio_mode[12] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pwmout_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/pwmout_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // TIM21 cannot be used because already used by the us_ticker
 static const PinMap PinMap_PWM[] = {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/rtc_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/rtc_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 
 #if DEVICE_RTC
 
-#include "error.h"
+#include "mbed_error.h"
 
 static int rtc_inited = 0;
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -31,7 +31,7 @@
 #include "cmsis.h"
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -33,7 +33,7 @@
 
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
 
--- a/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_irq_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_STM32F3XX/gpio_irq_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -32,7 +32,7 @@
 
 #include "gpio_irq_api.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define EDGE_NONE (0)
 #define EDGE_RISE (1)
--- a/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_STM32F3XX/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "mbed_assert.h"
 #include "pinmap.h"
 #include "PortNames.h"
-#include "error.h"
+#include "mbed_error.h"
 
 // Enable GPIO clock and return GPIO base address
 uint32_t Set_GPIO_Clock(uint32_t port_idx) {
--- a/targets/hal/TARGET_STM/TARGET_STM32F3XX/port_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_STM32F3XX/port_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -30,7 +30,7 @@
 #include "port_api.h"
 #include "pinmap.h"
 #include "gpio_api.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #if DEVICE_PORTIN || DEVICE_PORTOUT
 
--- a/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_STM32F4XX/analogin_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -20,7 +20,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 #define ADC_10BIT_RANGE             0x3FF
 #define ADC_12BIT_RANGE             0xFFF
--- a/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_STM32F4XX/i2c_api.c	Tue Jul 08 11:15:08 2014 +0100
@@ -20,7 +20,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 static const PinMap PinMap_I2C_SDA[] = {
     {PB_7,  I2C_1, STM_PIN_DATA(2, 4)},
--- a/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c	Wed Jul 02 13:45:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_STM32F4XX/pinmap.c	Tue Jul 08 11:15:08 2014 +0100
@@ -15,7 +15,7 @@
  */
 #include "mbed_assert.h"
 #include "pinmap.h"
-#include "error.h"
+#include "mbed_error.h"
 
 /**
  * Set the pin into input, output, alternate function or analog mode