Skip to content

Commit 646cc89

Browse files
authored
Merge pull request #2878 from geky/restructure
Restructure directory layout
2 parents cf60b18 + b8fb7a6 commit 646cc89

File tree

7,948 files changed

+512
-671
lines changed

Some content is hidden

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

7,948 files changed

+512
-671
lines changed

MANIFEST.in

Lines changed: 0 additions & 3 deletions
This file was deleted.

hal/common/AnalogIn.cpp renamed to drivers/AnalogIn.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include "mbed.h"
18-
19-
#include "AnalogIn.h"
17+
#include "drivers/AnalogIn.h"
2018

2119
#if DEVICE_ANALOGIN
2220

hal/api/AnalogIn.h renamed to drivers/AnalogIn.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
#ifndef MBED_ANALOGIN_H
1717
#define MBED_ANALOGIN_H
1818

19-
#include "platform.h"
19+
#include "platform/platform.h"
2020

2121
#if DEVICE_ANALOGIN
2222

23-
#include "analogin_api.h"
24-
#include "SingletonPtr.h"
25-
#include "PlatformMutex.h"
23+
#include "hal/analogin_api.h"
24+
#include "platform/SingletonPtr.h"
25+
#include "platform/PlatformMutex.h"
2626

2727
namespace mbed {
2828

hal/api/AnalogOut.h renamed to drivers/AnalogOut.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
#ifndef MBED_ANALOGOUT_H
1717
#define MBED_ANALOGOUT_H
1818

19-
#include "platform.h"
19+
#include "platform/platform.h"
2020

2121
#if DEVICE_ANALOGOUT
2222

23-
#include "analogout_api.h"
24-
#include "PlatformMutex.h"
23+
#include "hal/analogout_api.h"
24+
#include "platform/PlatformMutex.h"
2525

2626
namespace mbed {
2727

hal/common/BusIn.cpp renamed to drivers/BusIn.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "BusIn.h"
17-
#include "mbed_assert.h"
16+
#include "drivers/BusIn.h"
17+
#include "platform/mbed_assert.h"
1818

1919
namespace mbed {
2020

hal/api/BusIn.h renamed to drivers/BusIn.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#ifndef MBED_BUSIN_H
1717
#define MBED_BUSIN_H
1818

19-
#include "platform.h"
20-
#include "DigitalIn.h"
21-
#include "PlatformMutex.h"
19+
#include "platform/platform.h"
20+
#include "drivers/DigitalIn.h"
21+
#include "platform/PlatformMutex.h"
2222

2323
namespace mbed {
2424

hal/common/BusInOut.cpp renamed to drivers/BusInOut.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "BusInOut.h"
17-
#include "mbed_assert.h"
16+
#include "drivers/BusInOut.h"
17+
#include "platform/mbed_assert.h"
1818

1919
namespace mbed {
2020

hal/api/BusInOut.h renamed to drivers/BusInOut.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#ifndef MBED_BUSINOUT_H
1717
#define MBED_BUSINOUT_H
1818

19-
#include "DigitalInOut.h"
20-
#include "PlatformMutex.h"
19+
#include "drivers/DigitalInOut.h"
20+
#include "platform/PlatformMutex.h"
2121

2222
namespace mbed {
2323

hal/common/BusOut.cpp renamed to drivers/BusOut.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "BusOut.h"
17-
#include "mbed_assert.h"
16+
#include "drivers/BusOut.h"
17+
#include "platform/mbed_assert.h"
1818

1919
namespace mbed {
2020

hal/api/BusOut.h renamed to drivers/BusOut.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#ifndef MBED_BUSOUT_H
1717
#define MBED_BUSOUT_H
1818

19-
#include "DigitalOut.h"
20-
#include "PlatformMutex.h"
19+
#include "drivers/DigitalOut.h"
20+
#include "platform/PlatformMutex.h"
2121

2222
namespace mbed {
2323

hal/common/CAN.cpp renamed to drivers/CAN.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "CAN.h"
16+
#include "drivers/CAN.h"
1717

1818
#if DEVICE_CAN
1919

hal/api/CAN.h renamed to drivers/CAN.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616
#ifndef MBED_CAN_H
1717
#define MBED_CAN_H
1818

19-
#include "platform.h"
19+
#include "platform/platform.h"
2020

2121
#if DEVICE_CAN
2222

23-
#include "can_api.h"
24-
#include "can_helper.h"
25-
#include "Callback.h"
26-
#include "PlatformMutex.h"
23+
#include "hal/can_api.h"
24+
#include "platform/Callback.h"
25+
#include "platform/PlatformMutex.h"
2726

2827
namespace mbed {
2928

hal/api/DigitalIn.h renamed to drivers/DigitalIn.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
#ifndef MBED_DIGITALIN_H
1717
#define MBED_DIGITALIN_H
1818

19-
#include "platform.h"
19+
#include "platform/platform.h"
2020

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

2424
namespace mbed {
2525

hal/api/DigitalInOut.h renamed to drivers/DigitalInOut.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
#ifndef MBED_DIGITALINOUT_H
1717
#define MBED_DIGITALINOUT_H
1818

19-
#include "platform.h"
19+
#include "platform/platform.h"
2020

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

2424
namespace mbed {
2525

hal/api/DigitalOut.h renamed to drivers/DigitalOut.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#ifndef MBED_DIGITALOUT_H
1717
#define MBED_DIGITALOUT_H
1818

19-
#include "platform.h"
20-
#include "gpio_api.h"
21-
#include "critical.h"
19+
#include "platform/platform.h"
20+
#include "hal/gpio_api.h"
21+
#include "platform/critical.h"
2222

2323
namespace mbed {
2424

File renamed without changes.

hal/common/Ethernet.cpp renamed to drivers/Ethernet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "Ethernet.h"
16+
#include "drivers/Ethernet.h"
1717

1818
#if DEVICE_ETHERNET
1919

20-
#include "ethernet_api.h"
20+
#include "hal/ethernet_api.h"
2121

2222
namespace mbed {
2323

hal/api/Ethernet.h renamed to drivers/Ethernet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifndef MBED_ETHERNET_H
1717
#define MBED_ETHERNET_H
1818

19-
#include "platform.h"
19+
#include "platform/platform.h"
2020

2121
#if DEVICE_ETHERNET
2222

hal/common/FileBase.cpp renamed to drivers/FileBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "FileBase.h"
16+
#include "drivers/FileBase.h"
1717

1818
namespace mbed {
1919

hal/api/FileBase.h renamed to drivers/FileBase.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
typedef int FILEHANDLE;
2020

21-
#include <stdio.h>
21+
#include <cstdio>
22+
#include <cstring>
2223

2324
#if defined(__ARMCC_VERSION) || defined(__ICCARM__)
2425
# define O_RDONLY 0
@@ -40,9 +41,9 @@ typedef long off_t;
4041
# include <sys/syslimits.h>
4142
#endif
4243

43-
#include "platform.h"
44-
#include "SingletonPtr.h"
45-
#include "PlatformMutex.h"
44+
#include "platform/platform.h"
45+
#include "platform/SingletonPtr.h"
46+
#include "platform/PlatformMutex.h"
4647

4748
namespace mbed {
4849

File renamed without changes.

hal/common/FileLike.cpp renamed to drivers/FileLike.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "FileLike.h"
16+
#include "drivers/FileLike.h"
1717

1818
namespace mbed {
1919

hal/api/FileLike.h renamed to drivers/FileLike.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#ifndef MBED_FILELIKE_H
1717
#define MBED_FILELIKE_H
1818

19-
#include "FileBase.h"
20-
#include "FileHandle.h"
19+
#include "drivers/FileBase.h"
20+
#include "drivers/FileHandle.h"
2121

2222
namespace mbed {
2323

hal/common/FilePath.cpp renamed to drivers/FilePath.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "FilePath.h"
16+
#include "drivers/FilePath.h"
1717

1818
namespace mbed {
1919

hal/api/FilePath.h renamed to drivers/FilePath.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
#ifndef MBED_FILEPATH_H
1717
#define MBED_FILEPATH_H
1818

19-
#include "platform.h"
19+
#include "platform/platform.h"
2020

21-
#include "FileSystemLike.h"
22-
#include "FileLike.h"
21+
#include "drivers/FileSystemLike.h"
22+
#include "drivers/FileLike.h"
2323

2424
namespace mbed {
2525

hal/common/FileSystemLike.cpp renamed to drivers/FileSystemLike.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "FileSystemLike.h"
16+
#include "drivers/FileSystemLike.h"
1717

1818
namespace mbed {
1919

hal/api/FileSystemLike.h renamed to drivers/FileSystemLike.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#ifndef MBED_FILESYSTEMLIKE_H
1717
#define MBED_FILESYSTEMLIKE_H
1818

19-
#include "platform.h"
19+
#include "platform/platform.h"
2020

21-
#include "FileBase.h"
22-
#include "FileHandle.h"
23-
#include "DirHandle.h"
21+
#include "drivers/FileBase.h"
22+
#include "drivers/FileHandle.h"
23+
#include "drivers/DirHandle.h"
2424

2525
namespace mbed {
2626

hal/common/I2C.cpp renamed to drivers/I2C.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "I2C.h"
16+
#include "drivers/I2C.h"
1717

1818
#if DEVICE_I2C
1919

hal/api/I2C.h renamed to drivers/I2C.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
#ifndef MBED_I2C_H
1717
#define MBED_I2C_H
1818

19-
#include "platform.h"
19+
#include "platform/platform.h"
2020

2121
#if DEVICE_I2C
2222

23-
#include "i2c_api.h"
24-
#include "SingletonPtr.h"
25-
#include "PlatformMutex.h"
23+
#include "hal/i2c_api.h"
24+
#include "platform/SingletonPtr.h"
25+
#include "platform/PlatformMutex.h"
2626

2727
#if DEVICE_I2C_ASYNCH
28-
#include "CThunk.h"
29-
#include "dma_api.h"
30-
#include "FunctionPointer.h"
28+
#include "platform/CThunk.h"
29+
#include "hal/dma_api.h"
30+
#include "platform/FunctionPointer.h"
3131
#endif
3232

3333
namespace mbed {

hal/common/I2CSlave.cpp renamed to drivers/I2CSlave.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "I2CSlave.h"
16+
#include "drivers/I2CSlave.h"
1717

1818
#if DEVICE_I2CSLAVE
1919

hal/api/I2CSlave.h renamed to drivers/I2CSlave.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#ifndef MBED_I2C_SLAVE_H
1717
#define MBED_I2C_SLAVE_H
1818

19-
#include "platform.h"
19+
#include "platform/platform.h"
2020

2121
#if DEVICE_I2CSLAVE
2222

23-
#include "i2c_api.h"
23+
#include "hal/i2c_api.h"
2424

2525
namespace mbed {
2626

hal/common/InterruptIn.cpp renamed to drivers/InterruptIn.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
#include "InterruptIn.h"
16+
#include "drivers/InterruptIn.h"
1717

1818
#if DEVICE_INTERRUPTIN
1919

hal/api/InterruptIn.h renamed to drivers/InterruptIn.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
#ifndef MBED_INTERRUPTIN_H
1717
#define MBED_INTERRUPTIN_H
1818

19-
#include "platform.h"
19+
#include "platform/platform.h"
2020

2121
#if DEVICE_INTERRUPTIN
2222

23-
#include "gpio_api.h"
24-
#include "gpio_irq_api.h"
25-
#include "Callback.h"
26-
#include "critical.h"
27-
#include "toolchain.h"
23+
#include "hal/gpio_api.h"
24+
#include "hal/gpio_irq_api.h"
25+
#include "platform/Callback.h"
26+
#include "platform/critical.h"
27+
#include "platform/toolchain.h"
2828

2929
namespace mbed {
3030

0 commit comments

Comments
 (0)