Skip to content

Commit 9a63e73

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 22b6585 + 371aaa5 commit 9a63e73

File tree

471 files changed

+15485
-27790
lines changed

Some content is hidden

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

471 files changed

+15485
-27790
lines changed

TESTS/mbedmicro-mbed/attributes/attributes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "toolchain.h"
1+
#include "mbed_toolchain.h"
22

33
#include <stdio.h>
44
#include <stdint.h>

TESTS/mbedmicro-mbed/attributes/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <stdio.h>
22
#include <stdint.h>
33

4-
#include "toolchain.h"
4+
#include "mbed_toolchain.h"
55
#include "greentea-client/test_env.h"
66
#include "unity.h"
77
#include "utest.h"

TESTS/mbedmicro-mbed/attributes/weak.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "toolchain.h"
1+
#include "mbed_toolchain.h"
22

33
int testWeak1() {
44
return 0;

TESTS/mbedmicro-mbed/static_assert/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <stdio.h>
22
#include <stdint.h>
33

4-
#include "toolchain.h"
4+
#include "mbed_toolchain.h"
55
#include "greentea-client/test_env.h"
66
#include "unity.h"
77
#include "utest.h"

drivers/DigitalIn.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "platform/platform.h"
2020

2121
#include "hal/gpio_api.h"
22-
#include "platform/critical.h"
22+
#include "platform/mbed_critical.h"
2323

2424
namespace mbed {
2525
/** \addtogroup drivers */

drivers/DigitalInOut.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "platform/platform.h"
2020

2121
#include "hal/gpio_api.h"
22-
#include "platform/critical.h"
22+
#include "platform/mbed_critical.h"
2323

2424
namespace mbed {
2525
/** \addtogroup drivers */

drivers/DigitalOut.h

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

1919
#include "platform/platform.h"
2020
#include "hal/gpio_api.h"
21-
#include "platform/critical.h"
21+
#include "platform/mbed_critical.h"
2222

2323
namespace mbed {
2424
/** \addtogroup drivers */

drivers/InterruptIn.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "hal/gpio_api.h"
2424
#include "hal/gpio_irq_api.h"
2525
#include "platform/Callback.h"
26-
#include "platform/critical.h"
27-
#include "platform/toolchain.h"
26+
#include "platform/mbed_critical.h"
27+
#include "platform/mbed_toolchain.h"
2828

2929
namespace mbed {
3030
/** \addtogroup drivers */

drivers/InterruptManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#if defined(NVIC_NUM_VECTORS)
1818

1919
#include "drivers/InterruptManager.h"
20-
#include "platform/critical.h"
20+
#include "platform/mbed_critical.h"
2121
#include <string.h>
2222

2323
#define CHAIN_INITIAL_SIZE 4

drivers/LocalFileSystem.cpp

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

1818
#if DEVICE_LOCALFILESYSTEM
1919

20-
#include "platform/semihost_api.h"
20+
#include "platform/mbed_semihost_api.h"
2121
#include <string.h>
2222
#include <stdio.h>
2323

drivers/PortIn.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#if DEVICE_PORTIN
2222

2323
#include "hal/port_api.h"
24-
#include "platform/critical.h"
24+
#include "platform/mbed_critical.h"
2525

2626
namespace mbed {
2727
/** \addtogroup drivers */

drivers/PortInOut.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#if DEVICE_PORTINOUT
2222

2323
#include "hal/port_api.h"
24-
#include "platform/critical.h"
24+
#include "platform/mbed_critical.h"
2525

2626
namespace mbed {
2727
/** \addtogroup drivers */

drivers/PortOut.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#if DEVICE_PORTOUT
2222

2323
#include "hal/port_api.h"
24-
#include "platform/critical.h"
24+
#include "platform/mbed_critical.h"
2525

2626
namespace mbed {
2727
/** \addtogroup drivers */

drivers/PwmOut.h

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

2121
#if DEVICE_PWMOUT
2222
#include "hal/pwmout_api.h"
23-
#include "platform/critical.h"
23+
#include "platform/mbed_critical.h"
2424

2525
namespace mbed {
2626
/** \addtogroup drivers */

drivers/RawSerial.cpp

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 "drivers/RawSerial.h"
17-
#include "platform/wait_api.h"
17+
#include "platform/mbed_wait_api.h"
1818
#include <cstdarg>
1919

2020
#if DEVICE_SERIAL

drivers/SPI.cpp

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 "drivers/SPI.h"
17-
#include "platform/critical.h"
17+
#include "platform/mbed_critical.h"
1818

1919
#if DEVICE_SPI
2020

drivers/Serial.cpp

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 "drivers/Serial.h"
17-
#include "platform/wait_api.h"
17+
#include "platform/mbed_wait_api.h"
1818

1919
#if DEVICE_SERIAL
2020

drivers/SerialBase.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616
#include "drivers/SerialBase.h"
17-
#include "platform/wait_api.h"
18-
#include "platform/critical.h"
17+
#include "platform/mbed_wait_api.h"
18+
#include "platform/mbed_critical.h"
1919

2020
#if DEVICE_SERIAL
2121

drivers/SerialBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "Stream.h"
2424
#include "Callback.h"
2525
#include "serial_api.h"
26-
#include "toolchain.h"
26+
#include "mbed_toolchain.h"
2727

2828
#if DEVICE_SERIAL_ASYNCH
2929
#include "CThunk.h"

drivers/Ticker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "drivers/TimerEvent.h"
1919
#include "platform/FunctionPointer.h"
2020
#include "hal/ticker_api.h"
21-
#include "platform/critical.h"
21+
#include "platform/mbed_critical.h"
2222

2323
namespace mbed {
2424

drivers/Ticker.h

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

1919
#include "drivers/TimerEvent.h"
2020
#include "platform/Callback.h"
21-
#include "platform/toolchain.h"
21+
#include "platform/mbed_toolchain.h"
2222

2323
namespace mbed {
2424
/** \addtogroup drivers */

drivers/Timer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "drivers/Timer.h"
1717
#include "hal/ticker_api.h"
1818
#include "hal/us_ticker_api.h"
19-
#include "platform/critical.h"
19+
#include "platform/mbed_critical.h"
2020

2121
namespace mbed {
2222

0 commit comments

Comments
 (0)