Skip to content

Restructure directory layout #2878

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.

Sign up for GitHub

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 20 commits into from
Oct 2, 2016
Merged

Restructure directory layout #2878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0bad622
restructure - Moved targets out to top level
geky Sep 30, 2016
15904b7
restructure - Split hal into drivers+platform+hal
geky Sep 30, 2016
8ad8327
restructure - Moved stdio-config into platform
geky Sep 30, 2016
bf643bc
restructure - Moved libraries to features/unsupported
geky Sep 30, 2016
175ae6b
restructure - Fixed include bug in features/unsupported/net/lwip
geky Sep 30, 2016
c0ffbc1
restructure - Removed misplaced metadata from top-level directory
geky Sep 30, 2016
2dd90bb
restructure - Restructured rtos directory
geky Sep 30, 2016
ba99a1f
restructure - Restructured features/net directory
geky Sep 30, 2016
960d69f
restructure - Updated tools to point to restructured modules
geky Sep 30, 2016
c2d9fc2
restructure - Fixed include paths damaged by the restructure
geky Sep 30, 2016
03bbc86
restructure - Added FEATURE_LWIP to __allowed_features
geky Sep 30, 2016
e35050d
restructure - Reverted move of requirements.txt
geky Sep 30, 2016
7a44db8
Move CircularBuffer.h into platform/ given there is no hardware requi…
sg- Oct 1, 2016
3a714c1
Move Transaction.h into platform/ given there is no hardware required.
sg- Oct 1, 2016
b7fcfd9
Move can_helper.h into hal/ given its a requirement of the can c hal.
sg- Oct 1, 2016
301b77c
For drivers, events, hal, platform, rtos and mbed.h add one level of …
sg- Oct 1, 2016
db8d1f6
Add feature LWIP to LPC1768, UBLOX_C027 and ARCH_PRO targets.
sg- Oct 1, 2016
04a2af7
Update net tests to use feature name LWIP and not IPv4
sg- Oct 1, 2016
a7ddc46
restructure - Added single-nested inc_dir support to legacy build_lib
geky Oct 1, 2016
b8fb7a6
restructure - Changed legacy build_lib to respect lib name in path
geky Oct 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 0 additions & 3 deletions MANIFEST.in
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions hal/common/AnalogIn.cpp → drivers/AnalogIn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
* limitations under the License.
*/

#include "mbed.h"

#include "AnalogIn.h"
#include "drivers/AnalogIn.h"

#if DEVICE_ANALOGIN

Expand Down
8 changes: 4 additions & 4 deletions hal/api/AnalogIn.h → drivers/AnalogIn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
#ifndef MBED_ANALOGIN_H
#define MBED_ANALOGIN_H

#include "platform.h"
#include "platform/platform.h"

#if DEVICE_ANALOGIN

#include "analogin_api.h"
#include "SingletonPtr.h"
#include "PlatformMutex.h"
#include "hal/analogin_api.h"
#include "platform/SingletonPtr.h"
#include "platform/PlatformMutex.h"

namespace mbed {

Expand Down
6 changes: 3 additions & 3 deletions hal/api/AnalogOut.h → drivers/AnalogOut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
#ifndef MBED_ANALOGOUT_H
#define MBED_ANALOGOUT_H

#include "platform.h"
#include "platform/platform.h"

#if DEVICE_ANALOGOUT

#include "analogout_api.h"
#include "PlatformMutex.h"
#include "hal/analogout_api.h"
#include "platform/PlatformMutex.h"

namespace mbed {

Expand Down
4 changes: 2 additions & 2 deletions hal/common/BusIn.cpp → drivers/BusIn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "BusIn.h"
#include "mbed_assert.h"
#include "drivers/BusIn.h"
#include "platform/mbed_assert.h"

namespace mbed {

Expand Down
6 changes: 3 additions & 3 deletions hal/api/BusIn.h → drivers/BusIn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#ifndef MBED_BUSIN_H
#define MBED_BUSIN_H

#include "platform.h"
#include "DigitalIn.h"
#include "PlatformMutex.h"
#include "platform/platform.h"
#include "drivers/DigitalIn.h"
#include "platform/PlatformMutex.h"

namespace mbed {

Expand Down
4 changes: 2 additions & 2 deletions hal/common/BusInOut.cpp → drivers/BusInOut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "BusInOut.h"
#include "mbed_assert.h"
#include "drivers/BusInOut.h"
#include "platform/mbed_assert.h"

namespace mbed {

Expand Down
4 changes: 2 additions & 2 deletions hal/api/BusInOut.h → drivers/BusInOut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#ifndef MBED_BUSINOUT_H
#define MBED_BUSINOUT_H

#include "DigitalInOut.h"
#include "PlatformMutex.h"
#include "drivers/DigitalInOut.h"
#include "platform/PlatformMutex.h"

namespace mbed {

Expand Down
4 changes: 2 additions & 2 deletions hal/common/BusOut.cpp → drivers/BusOut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "BusOut.h"
#include "mbed_assert.h"
#include "drivers/BusOut.h"
#include "platform/mbed_assert.h"

namespace mbed {

Expand Down
4 changes: 2 additions & 2 deletions hal/api/BusOut.h → drivers/BusOut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#ifndef MBED_BUSOUT_H
#define MBED_BUSOUT_H

#include "DigitalOut.h"
#include "PlatformMutex.h"
#include "drivers/DigitalOut.h"
#include "platform/PlatformMutex.h"

namespace mbed {

Expand Down
2 changes: 1 addition & 1 deletion hal/common/CAN.cpp → drivers/CAN.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "CAN.h"
#include "drivers/CAN.h"

#if DEVICE_CAN

Expand Down
9 changes: 4 additions & 5 deletions hal/api/CAN.h → drivers/CAN.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@
#ifndef MBED_CAN_H
#define MBED_CAN_H

#include "platform.h"
#include "platform/platform.h"

#if DEVICE_CAN

#include "can_api.h"
#include "can_helper.h"
#include "Callback.h"
#include "PlatformMutex.h"
#include "hal/can_api.h"
#include "platform/Callback.h"
#include "platform/PlatformMutex.h"

namespace mbed {

Expand Down
6 changes: 3 additions & 3 deletions hal/api/DigitalIn.h → drivers/DigitalIn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#ifndef MBED_DIGITALIN_H
#define MBED_DIGITALIN_H

#include "platform.h"
#include "platform/platform.h"

#include "gpio_api.h"
#include "critical.h"
#include "hal/gpio_api.h"
#include "platform/critical.h"

namespace mbed {

Expand Down
6 changes: 3 additions & 3 deletions hal/api/DigitalInOut.h → drivers/DigitalInOut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#ifndef MBED_DIGITALINOUT_H
#define MBED_DIGITALINOUT_H

#include "platform.h"
#include "platform/platform.h"

#include "gpio_api.h"
#include "critical.h"
#include "hal/gpio_api.h"
#include "platform/critical.h"

namespace mbed {

Expand Down
6 changes: 3 additions & 3 deletions hal/api/DigitalOut.h → drivers/DigitalOut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#ifndef MBED_DIGITALOUT_H
#define MBED_DIGITALOUT_H

#include "platform.h"
#include "gpio_api.h"
#include "critical.h"
#include "platform/platform.h"
#include "hal/gpio_api.h"
#include "platform/critical.h"

namespace mbed {

Expand Down
0 hal/api/DirHandle.h → drivers/DirHandle.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions hal/common/Ethernet.cpp → drivers/Ethernet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "Ethernet.h"
#include "drivers/Ethernet.h"

#if DEVICE_ETHERNET

#include "ethernet_api.h"
#include "hal/ethernet_api.h"

namespace mbed {

Expand Down
2 changes: 1 addition & 1 deletion hal/api/Ethernet.h → drivers/Ethernet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef MBED_ETHERNET_H
#define MBED_ETHERNET_H

#include "platform.h"
#include "platform/platform.h"

#if DEVICE_ETHERNET

Expand Down
2 changes: 1 addition & 1 deletion hal/common/FileBase.cpp → drivers/FileBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "FileBase.h"
#include "drivers/FileBase.h"

namespace mbed {

Expand Down
9 changes: 5 additions & 4 deletions hal/api/FileBase.h → drivers/FileBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

typedef int FILEHANDLE;

#include <stdio.h>
#include <cstdio>
#include <cstring>

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

#include "platform.h"
#include "SingletonPtr.h"
#include "PlatformMutex.h"
#include "platform/platform.h"
#include "platform/SingletonPtr.h"
#include "platform/PlatformMutex.h"

namespace mbed {

Expand Down
0 hal/api/FileHandle.h → drivers/FileHandle.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion hal/common/FileLike.cpp → drivers/FileLike.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "FileLike.h"
#include "drivers/FileLike.h"

namespace mbed {

Expand Down
4 changes: 2 additions & 2 deletions hal/api/FileLike.h → drivers/FileLike.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#ifndef MBED_FILELIKE_H
#define MBED_FILELIKE_H

#include "FileBase.h"
#include "FileHandle.h"
#include "drivers/FileBase.h"
#include "drivers/FileHandle.h"

namespace mbed {

Expand Down
2 changes: 1 addition & 1 deletion hal/common/FilePath.cpp → drivers/FilePath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "FilePath.h"
#include "drivers/FilePath.h"

namespace mbed {

Expand Down
6 changes: 3 additions & 3 deletions hal/api/FilePath.h → drivers/FilePath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#ifndef MBED_FILEPATH_H
#define MBED_FILEPATH_H

#include "platform.h"
#include "platform/platform.h"

#include "FileSystemLike.h"
#include "FileLike.h"
#include "drivers/FileSystemLike.h"
#include "drivers/FileLike.h"

namespace mbed {

Expand Down
2 changes: 1 addition & 1 deletion hal/common/FileSystemLike.cpp → drivers/FileSystemLike.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "FileSystemLike.h"
#include "drivers/FileSystemLike.h"

namespace mbed {

Expand Down
8 changes: 4 additions & 4 deletions hal/api/FileSystemLike.h → drivers/FileSystemLike.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#ifndef MBED_FILESYSTEMLIKE_H
#define MBED_FILESYSTEMLIKE_H

#include "platform.h"
#include "platform/platform.h"

#include "FileBase.h"
#include "FileHandle.h"
#include "DirHandle.h"
#include "drivers/FileBase.h"
#include "drivers/FileHandle.h"
#include "drivers/DirHandle.h"

namespace mbed {

Expand Down
2 changes: 1 addition & 1 deletion hal/common/I2C.cpp → drivers/I2C.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "I2C.h"
#include "drivers/I2C.h"

#if DEVICE_I2C

Expand Down
14 changes: 7 additions & 7 deletions hal/api/I2C.h → drivers/I2C.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
#ifndef MBED_I2C_H
#define MBED_I2C_H

#include "platform.h"
#include "platform/platform.h"

#if DEVICE_I2C

#include "i2c_api.h"
#include "SingletonPtr.h"
#include "PlatformMutex.h"
#include "hal/i2c_api.h"
#include "platform/SingletonPtr.h"
#include "platform/PlatformMutex.h"

#if DEVICE_I2C_ASYNCH
#include "CThunk.h"
#include "dma_api.h"
#include "FunctionPointer.h"
#include "platform/CThunk.h"
#include "hal/dma_api.h"
#include "platform/FunctionPointer.h"
#endif

namespace mbed {
Expand Down
2 changes: 1 addition & 1 deletion hal/common/I2CSlave.cpp → drivers/I2CSlave.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "I2CSlave.h"
#include "drivers/I2CSlave.h"

#if DEVICE_I2CSLAVE

Expand Down
4 changes: 2 additions & 2 deletions hal/api/I2CSlave.h → drivers/I2CSlave.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#ifndef MBED_I2C_SLAVE_H
#define MBED_I2C_SLAVE_H

#include "platform.h"
#include "platform/platform.h"

#if DEVICE_I2CSLAVE

#include "i2c_api.h"
#include "hal/i2c_api.h"

namespace mbed {

Expand Down
2 changes: 1 addition & 1 deletion hal/common/InterruptIn.cpp → drivers/InterruptIn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "InterruptIn.h"
#include "drivers/InterruptIn.h"

#if DEVICE_INTERRUPTIN

Expand Down
12 changes: 6 additions & 6 deletions hal/api/InterruptIn.h → drivers/InterruptIn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
#ifndef MBED_INTERRUPTIN_H
#define MBED_INTERRUPTIN_H

#include "platform.h"
#include "platform/platform.h"

#if DEVICE_INTERRUPTIN

#include "gpio_api.h"
#include "gpio_irq_api.h"
#include "Callback.h"
#include "critical.h"
#include "toolchain.h"
#include "hal/gpio_api.h"
#include "hal/gpio_irq_api.h"
#include "platform/Callback.h"
#include "platform/critical.h"
#include "platform/toolchain.h"

namespace mbed {

Expand Down
Loading