Skip to content

Commit a681b14

Browse files
0xc0170Bogdan Marinescu
authored andcommitted
Change "error.h" to "mbed_error.h" to avoid conflicts with 3rd party code
1 parent cc0476d commit a681b14

File tree

160 files changed

+159
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+159
-160
lines changed

libraries/mbed/api/mbed.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <time.h>
2626

2727
// mbed Debug libraries
28-
#include "error.h"
28+
#include "mbed_error.h"
2929
#include "mbed_interface.h"
3030

3131
// mbed Peripheral components
File renamed without changes.

libraries/mbed/common/error.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <stdarg.h>
1818
#include "device.h"
1919
#include "toolchain.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121
#if DEVICE_STDIO_MESSAGES
2222
#include <stdio.h>
2323
#endif

libraries/mbed/common/mbed_interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "gpio_api.h"
2020
#include "wait_api.h"
2121
#include "semihost_api.h"
22-
#include "error.h"
22+
#include "mbed_error.h"
2323
#include "toolchain.h"
2424

2525
#if DEVICE_SEMIHOST

libraries/mbed/common/pinmap_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616
#include "pinmap.h"
17-
#include "error.h"
17+
#include "mbed_error.h"
1818

1919
void pinmap_pinout(PinName pin, const PinMap *map) {
2020
if (pin == NC)

libraries/mbed/common/retarget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ extern "C" int mkdir(const char *path, mode_t mode) {
392392

393393
#if defined(TOOLCHAIN_GCC)
394394
/* prevents the exception handling name demangling code getting pulled in */
395-
#include "error.h"
395+
#include "mbed_error.h"
396396
namespace __gnu_cxx {
397397
void __verbose_terminate_handler() {
398398
error("Exception");

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D50M/gpio_irq_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "cmsis.h"
1818

1919
#include "gpio_irq_api.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
#define CHANNEL_NUM 160
2323

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/gpio_irq_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "gpio_irq_api.h"
2020
#include "gpio_api.h"
21-
#include "error.h"
21+
#include "mbed_error.h"
2222

2323
#define CHANNEL_NUM 64 // 31 pins on 2 ports
2424

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/gpio_irq_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "gpio_irq_api.h"
2020
#include "gpio_api.h"
21-
#include "error.h"
21+
#include "mbed_error.h"
2222

2323
#define CHANNEL_NUM 64
2424

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/gpio_irq_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "gpio_irq_api.h"
2020
#include "gpio_api.h"
21-
#include "error.h"
21+
#include "mbed_error.h"
2222

2323
#define CHANNEL_NUM 96
2424

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogout_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "cmsis.h"
2121
#include "pinmap.h"
22-
#include "error.h"
22+
#include "mbed_error.h"
2323
#include "PeripheralPins.h"
2424

2525
#define RANGE_12BIT 0xFFF

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_irq_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "gpio_api.h"
2424
#include "fsl_gpio_hal.h"
2525
#include "fsl_port_hal.h"
26-
#include "error.h"
26+
#include "mbed_error.h"
2727

2828
#define CHANNEL_NUM 160
2929

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "pinmap.h"
18-
#include "error.h"
18+
#include "mbed_error.h"
1919
#include "fsl_clock_manager.h"
2020
#include "fsl_port_hal.h"
2121

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "cmsis.h"
2424
#include "pinmap.h"
25-
#include "error.h"
25+
#include "mbed_error.h"
2626
#include "fsl_clock_manager.h"
2727
#include "fsl_dspi_hal.h"
2828
#include "PeripheralPins.h"

libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/gpio_irq_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "cmsis.h"
1818

1919
#include "gpio_irq_api.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
#define CHANNEL_NUM 31
2323

libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/pinmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "pinmap.h"
18-
#include "error.h"
18+
#include "mbed_error.h"
1919

2020
void pin_function(PinName pin, int function) {
2121
}

libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/pwmout_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "pwmout_api.h"
1818
#include "cmsis.h"
1919
#include "pinmap.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
#define NO_PWMS 3
2323
#define TIMER_PRECISION 4 //4us ticks

libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/spi_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "spi_api.h"
1919
#include "cmsis.h"
2020
#include "pinmap.h"
21-
#include "error.h"
21+
#include "mbed_error.h"
2222

2323
static const PinMap PinMap_SPI_SCLK[] = {
2424
{SPI_PSELSCK0 , SPI_0, 0x01},

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/analogin_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "analogin_api.h"
1818
#include "cmsis.h"
1919
#include "pinmap.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
#if DEVICE_ANALOGIN
2323

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/gpio_irq_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include "cmsis.h"
1919
#include "gpio_irq_api.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
#if DEVICE_INTERRUPTIN
2323

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pinmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "pinmap.h"
18-
#include "error.h"
18+
#include "mbed_error.h"
1919

2020
void pin_function(PinName pin, int function) {
2121
MBED_ASSERT(pin != (PinName)NC);

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/pwmout_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "pwmout_api.h"
1818
#include "cmsis.h"
1919
#include "pinmap.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
#if DEVICE_PWMOUT
2323

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11U6X/spi_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "spi_api.h"
2020
#include "cmsis.h"
2121
#include "pinmap.h"
22-
#include "error.h"
22+
#include "mbed_error.h"
2323

2424
#if DEVICE_SPI
2525

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "analogin_api.h"
1818
#include "cmsis.h"
1919
#include "pinmap.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121
#include "PeripheralPins.h" // For the Peripheral to Pin Definitions found in the individual Target's Platform
2222

2323
#define ANALOGIN_MEDIAN_FILTER 1

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_irq_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <stddef.h>
1717
#include "cmsis.h"
1818
#include "gpio_irq_api.h"
19-
#include "error.h"
19+
#include "mbed_error.h"
2020

2121
#define CHANNEL_NUM 8
2222
#define LPC_GPIO_X LPC_GPIO_PIN_INT

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "pinmap.h"
18-
#include "error.h"
18+
#include "mbed_error.h"
1919

2020
#define LPC_IOCON0_BASE (LPC_IOCON_BASE)
2121
#define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60)

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "spi_api.h"
1919
#include "cmsis.h"
2020
#include "pinmap.h"
21-
#include "error.h"
21+
#include "mbed_error.h"
2222
#include "PeripheralPins.h" // For the Peripheral to Pin Definitions found in the individual Target's Platform
2323

2424
static inline int ssp_disable(spi_t *obj);

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/TARGET_LPC11CXX/can_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "can_api.h"
1717

1818
#include "cmsis.h"
19-
#include "error.h"
19+
#include "mbed_error.h"
2020

2121
#include <math.h>
2222
#include <string.h>

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/analogin_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "analogin_api.h"
1818
#include "cmsis.h"
1919
#include "pinmap.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
static const PinMap PinMap_ADC[] = {
2323
{P0_11, ADC0_0, 2},

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/gpio_irq_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <stddef.h>
1717
#include "cmsis.h"
1818
#include "gpio_irq_api.h"
19-
#include "error.h"
19+
#include "mbed_error.h"
2020
#include "gpio_api.h"
2121

2222
// The chip is capable of 42 GPIO interrupts.

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/i2c_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "i2c_api.h"
1818
#include "cmsis.h"
1919
#include "pinmap.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
static const PinMap PinMap_I2C_SDA[] = {
2323
{P0_5, I2C_0, 1},

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/pinmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "pinmap.h"
18-
#include "error.h"
18+
#include "mbed_error.h"
1919

2020
void pin_function(PinName pin, int function) {
2121
MBED_ASSERT(pin != (PinName)NC);

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX_11CXX/spi_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "spi_api.h"
1919
#include "cmsis.h"
2020
#include "pinmap.h"
21-
#include "error.h"
21+
#include "mbed_error.h"
2222

2323
static const PinMap PinMap_SPI_SCLK[] = {
2424
{P0_6 , SPI_0, 0x02},

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/analogin_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "analogin_api.h"
1818
#include "cmsis.h"
1919
#include "pinmap.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
#define ANALOGIN_MEDIAN_FILTER 1
2323

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/gpio_irq_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <stddef.h>
1717
#include "cmsis.h"
1818
#include "gpio_irq_api.h"
19-
#include "error.h"
19+
#include "mbed_error.h"
2020

2121
#define CHANNEL_NUM 8
2222
#define LPC_GPIO_X LPC_GPIO_PIN_INT

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/i2c_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "i2c_api.h"
1818
#include "cmsis.h"
1919
#include "pinmap.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
static const PinMap PinMap_I2C_SDA[] = {
2323
{P0_5, I2C_0, 1},

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/pinmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "pinmap.h"
18-
#include "error.h"
18+
#include "mbed_error.h"
1919

2020
#define LPC_IOCON0_BASE (LPC_IOCON_BASE)
2121
#define LPC_IOCON1_BASE (LPC_IOCON_BASE + 0x60)

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC13XX/spi_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "spi_api.h"
1919
#include "cmsis.h"
2020
#include "pinmap.h"
21-
#include "error.h"
21+
#include "mbed_error.h"
2222

2323
static const PinMap PinMap_SPI_SCLK[] = {
2424
{P0_6 , SPI_0, 0x02},

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/can_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "can_api.h"
1818

1919
#include "cmsis.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
#include <math.h>
2323
#include <string.h>

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/gpio_irq_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include "cmsis.h"
1919
#include "gpio_irq_api.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
#define CHANNEL_NUM 8
2323
#define LPC_GPIO_X LPC_PINT

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pinmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
#include "mbed_assert.h"
1717
#include "pinmap.h"
18-
#include "error.h"
18+
#include "mbed_error.h"
1919

2020
void pin_function(PinName pin, int function) {
2121
}

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/pwmout_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "pwmout_api.h"
1818
#include "cmsis.h"
1919
#include "pinmap.h"
20-
#include "error.h"
20+
#include "mbed_error.h"
2121

2222
static LPC_SCT0_Type *SCTs[4] = {
2323
(LPC_SCT0_Type*)LPC_SCT0,

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/serial_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "serial_api.h"
2222
#include "cmsis.h"
2323
#include "pinmap.h"
24-
#include "error.h"
24+
#include "mbed_error.h"
2525

2626
/******************************************************************************
2727
* INITIALIZATION

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC15XX/spi_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "spi_api.h"
2020
#include "cmsis.h"
2121
#include "pinmap.h"
22-
#include "error.h"
22+
#include "mbed_error.h"
2323

2424
static const SWM_Map SWM_SPI_SSEL[] = {
2525
{4, 0},

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/ethernet_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "cmsis.h"
2020
#include "mbed_interface.h"
2121
#include "toolchain.h"
22-
#include "error.h"
22+
#include "mbed_error.h"
2323

2424
#define NEW_LOGIC 0
2525
#define NEW_ETH_BUFFER 0

0 commit comments

Comments
 (0)