Skip to content

platform: fix internal platform headers #13459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion events/source/equeue_mbed.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ using namespace mbed;
#if MBED_CONF_RTOS_API_PRESENT

#include "rtos/Kernel.h"
#include "platform/source/mbed_os_timer.h"
#include "platform/internal/mbed_os_timer.h"

void equeue_tick_init()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define MBED_MBED_SLEEP_TIMER_H

#include <chrono>
#include "platform/source/SysTimer.h"
#include "platform/internal/SysTimer.h"

#if MBED_CONF_RTOS_PRESENT
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion platform/source/SysTimer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "mbed_assert.h"
#include "platform/mbed_power_mgmt.h"
#include "platform/CriticalSectionLock.h"
#include "platform/source/SysTimer.h"
#include "platform/internal/SysTimer.h"
extern "C" {
#if MBED_CONF_RTOS_PRESENT
#include "rtx_lib.h"
Expand Down
2 changes: 1 addition & 1 deletion platform/source/mbed_error.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
#include "platform/mbed_atomic.h"
#include "platform/mbed_critical.h"
#include "platform/mbed_error.h"
#include "platform/source/mbed_error_hist.h"
#include "platform/mbed_interface.h"
#include "platform/mbed_power_mgmt.h"
#include "platform/mbed_stats.h"
#include "platform/internal/mbed_fault_handler.h"
#include "platform/internal/mbed_error_hist.h"
#include "drivers/MbedCRC.h"
#include "mbed_rtx.h"
#ifdef MBED_CONF_RTOS_PRESENT
Expand Down
2 changes: 1 addition & 1 deletion platform/source/mbed_error_hist.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "platform/mbed_critical.h"

#if MBED_CONF_PLATFORM_ERROR_HIST_ENABLED
#include "platform/source/mbed_error_hist.h"
#include "platform/internal/mbed_error_hist.h"

static mbed_error_ctx mbed_error_ctx_log[MBED_CONF_PLATFORM_ERROR_HIST_SIZE] = {0};
static int error_log_count = -1;
Expand Down
4 changes: 2 additions & 2 deletions platform/source/mbed_os_timer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*/

#include "platform/mbed_power_mgmt.h"
#include "platform/source/mbed_os_timer.h"
#include "platform/CriticalSectionLock.h"
#include "platform/source/SysTimer.h"
#include "platform/internal/SysTimer.h"
#include "platform/internal/mbed_os_timer.h"
#include "us_ticker_api.h"
#include "lp_ticker_api.h"
#include "mbed_critical.h"
Expand Down
2 changes: 1 addition & 1 deletion platform/source/mbed_thread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "platform/mbed_thread.h"
#include "platform/mbed_critical.h"
#include "platform/source/mbed_os_timer.h"
#include "platform/internal/mbed_os_timer.h"

/* If the RTOS is present, we call the RTOS API to do the work */
/* If the RTOS is not present, the RTOS API calls us to do the work */
Expand Down
2 changes: 1 addition & 1 deletion rtos/include/rtos/Kernel.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "rtos/mbed_rtos_types.h"
#include "platform/mbed_toolchain.h"
#if !MBED_CONF_RTOS_PRESENT
#include "platform/source/mbed_os_timer.h"
#include "platform/internal/mbed_os_timer.h"
#endif


Expand Down
2 changes: 1 addition & 1 deletion rtos/source/EventFlags.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/
#include "rtos/EventFlags.h"
#include "rtos/ThisThread.h"
#include "mbed_os_timer.h"
#include "platform/internal/mbed_os_timer.h"
#include <string.h>
#include "platform/mbed_error.h"
#include "platform/mbed_assert.h"
Expand Down
2 changes: 1 addition & 1 deletion rtos/source/Kernel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "rtos_idle.h"
#include "rtos_handlers.h"
#include "platform/mbed_critical.h"
#include "platform/source/mbed_os_timer.h"
#include "platform/internal/mbed_os_timer.h"

#if !MBED_CONF_RTOS_PRESENT
/* If the RTOS is not present, we call mbed_thread.cpp to do the work */
Expand Down
2 changes: 1 addition & 1 deletion rtos/source/Semaphore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "platform/mbed_assert.h"
#include "platform/mbed_critical.h"
#include "platform/mbed_error.h"
#include "platform/source/mbed_os_timer.h"
#include "platform/internal/mbed_os_timer.h"

#include <string.h>

Expand Down
2 changes: 1 addition & 1 deletion rtos/source/TARGET_CORTEX/mbed_rtx_idle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "rtos/source/rtos_idle.h"
#include "rtos/Kernel.h"
#include "platform/mbed_power_mgmt.h"
#include "platform/source/mbed_os_timer.h"
#include "platform/internal/mbed_os_timer.h"
#include "TimerEvent.h"
#include "mbed_critical.h"
#include "mbed_assert.h"
Expand Down
2 changes: 1 addition & 1 deletion rtos/source/ThisThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "platform/CriticalSectionLock.h"
#include "platform/mbed_assert.h"
#include "platform/mbed_critical.h"
#include "platform/source/mbed_os_timer.h"
#include "platform/internal/mbed_os_timer.h"

using std::milli;
using std::chrono::duration;
Expand Down
2 changes: 1 addition & 1 deletion rtos/tests/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "utest.h"
#include "ticker_api.h"

#include "platform/source/SysTimer.h"
#include "platform/internal/SysTimer.h"

using namespace std::chrono;

Expand Down