From 52c87a8a46d368d6ef7a9ad120076b75cde895ed Mon Sep 17 00:00:00 2001 From: Evelyne Donnaes Date: Thu, 22 Oct 2020 18:05:52 +0100 Subject: [PATCH 1/3] =?UTF-8?q?USB=20drivers=20source=20files=20are=20move?= =?UTF-8?q?d=20under=20drivers/source/=20removing=20the=20need=20for=20a?= =?UTF-8?q?=20specific=20=E2=80=9Cdrivers-usb=E2=80=9D=20library.=20This?= =?UTF-8?q?=20means=20that=20USB=20drivers=20will=20be=20built=20by=20defa?= =?UTF-8?q?ult=20in=20bare=20metal.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "events" library is added to bare metal profile because USB drivers depend on it. This library provides functionality to schedule events without relying on a RTOS and so it is useful to have it enabled by default in the bare metal profile. --- TESTS/configs/baremetal.json | 3 +-- drivers/source/{usb => }/AsyncOp.cpp | 0 drivers/source/{usb => }/ByteBuffer.cpp | 0 drivers/source/{usb => }/EndpointResolver.cpp | 0 drivers/source/{usb => }/LinkedListBase.cpp | 0 drivers/source/{usb => }/OperationListBase.cpp | 0 drivers/source/{usb => }/PolledQueue.cpp | 0 drivers/source/{usb => }/TaskBase.cpp | 0 drivers/source/{usb => }/USBAudio.cpp | 0 drivers/source/{usb => }/USBCDC.cpp | 0 drivers/source/{usb => }/USBCDC_ECM.cpp | 0 drivers/source/{usb => }/USBDevice.cpp | 0 drivers/source/{usb => }/USBHID.cpp | 0 drivers/source/{usb => }/USBKeyboard.cpp | 0 drivers/source/{usb => }/USBMIDI.cpp | 0 drivers/source/{usb => }/USBMSD.cpp | 0 drivers/source/{usb => }/USBMouse.cpp | 0 drivers/source/{usb => }/USBMouseKeyboard.cpp | 0 drivers/source/{usb => }/USBSerial.cpp | 0 drivers/source/usb/mbed_lib.json | 3 --- platform/bare_metal/mbed_lib.json | 2 +- 21 files changed, 2 insertions(+), 6 deletions(-) rename drivers/source/{usb => }/AsyncOp.cpp (100%) rename drivers/source/{usb => }/ByteBuffer.cpp (100%) rename drivers/source/{usb => }/EndpointResolver.cpp (100%) rename drivers/source/{usb => }/LinkedListBase.cpp (100%) rename drivers/source/{usb => }/OperationListBase.cpp (100%) rename drivers/source/{usb => }/PolledQueue.cpp (100%) rename drivers/source/{usb => }/TaskBase.cpp (100%) rename drivers/source/{usb => }/USBAudio.cpp (100%) rename drivers/source/{usb => }/USBCDC.cpp (100%) rename drivers/source/{usb => }/USBCDC_ECM.cpp (100%) rename drivers/source/{usb => }/USBDevice.cpp (100%) rename drivers/source/{usb => }/USBHID.cpp (100%) rename drivers/source/{usb => }/USBKeyboard.cpp (100%) rename drivers/source/{usb => }/USBMIDI.cpp (100%) rename drivers/source/{usb => }/USBMSD.cpp (100%) rename drivers/source/{usb => }/USBMouse.cpp (100%) rename drivers/source/{usb => }/USBMouseKeyboard.cpp (100%) rename drivers/source/{usb => }/USBSerial.cpp (100%) delete mode 100644 drivers/source/usb/mbed_lib.json diff --git a/TESTS/configs/baremetal.json b/TESTS/configs/baremetal.json index 2d34ffe17b1..39f5e31ac54 100644 --- a/TESTS/configs/baremetal.json +++ b/TESTS/configs/baremetal.json @@ -32,8 +32,7 @@ "sd", "qspif", "spif-driver", - "cryptocell310", - "drivers-usb" + "cryptocell310" ], "target_overrides": { "*": { diff --git a/drivers/source/usb/AsyncOp.cpp b/drivers/source/AsyncOp.cpp similarity index 100% rename from drivers/source/usb/AsyncOp.cpp rename to drivers/source/AsyncOp.cpp diff --git a/drivers/source/usb/ByteBuffer.cpp b/drivers/source/ByteBuffer.cpp similarity index 100% rename from drivers/source/usb/ByteBuffer.cpp rename to drivers/source/ByteBuffer.cpp diff --git a/drivers/source/usb/EndpointResolver.cpp b/drivers/source/EndpointResolver.cpp similarity index 100% rename from drivers/source/usb/EndpointResolver.cpp rename to drivers/source/EndpointResolver.cpp diff --git a/drivers/source/usb/LinkedListBase.cpp b/drivers/source/LinkedListBase.cpp similarity index 100% rename from drivers/source/usb/LinkedListBase.cpp rename to drivers/source/LinkedListBase.cpp diff --git a/drivers/source/usb/OperationListBase.cpp b/drivers/source/OperationListBase.cpp similarity index 100% rename from drivers/source/usb/OperationListBase.cpp rename to drivers/source/OperationListBase.cpp diff --git a/drivers/source/usb/PolledQueue.cpp b/drivers/source/PolledQueue.cpp similarity index 100% rename from drivers/source/usb/PolledQueue.cpp rename to drivers/source/PolledQueue.cpp diff --git a/drivers/source/usb/TaskBase.cpp b/drivers/source/TaskBase.cpp similarity index 100% rename from drivers/source/usb/TaskBase.cpp rename to drivers/source/TaskBase.cpp diff --git a/drivers/source/usb/USBAudio.cpp b/drivers/source/USBAudio.cpp similarity index 100% rename from drivers/source/usb/USBAudio.cpp rename to drivers/source/USBAudio.cpp diff --git a/drivers/source/usb/USBCDC.cpp b/drivers/source/USBCDC.cpp similarity index 100% rename from drivers/source/usb/USBCDC.cpp rename to drivers/source/USBCDC.cpp diff --git a/drivers/source/usb/USBCDC_ECM.cpp b/drivers/source/USBCDC_ECM.cpp similarity index 100% rename from drivers/source/usb/USBCDC_ECM.cpp rename to drivers/source/USBCDC_ECM.cpp diff --git a/drivers/source/usb/USBDevice.cpp b/drivers/source/USBDevice.cpp similarity index 100% rename from drivers/source/usb/USBDevice.cpp rename to drivers/source/USBDevice.cpp diff --git a/drivers/source/usb/USBHID.cpp b/drivers/source/USBHID.cpp similarity index 100% rename from drivers/source/usb/USBHID.cpp rename to drivers/source/USBHID.cpp diff --git a/drivers/source/usb/USBKeyboard.cpp b/drivers/source/USBKeyboard.cpp similarity index 100% rename from drivers/source/usb/USBKeyboard.cpp rename to drivers/source/USBKeyboard.cpp diff --git a/drivers/source/usb/USBMIDI.cpp b/drivers/source/USBMIDI.cpp similarity index 100% rename from drivers/source/usb/USBMIDI.cpp rename to drivers/source/USBMIDI.cpp diff --git a/drivers/source/usb/USBMSD.cpp b/drivers/source/USBMSD.cpp similarity index 100% rename from drivers/source/usb/USBMSD.cpp rename to drivers/source/USBMSD.cpp diff --git a/drivers/source/usb/USBMouse.cpp b/drivers/source/USBMouse.cpp similarity index 100% rename from drivers/source/usb/USBMouse.cpp rename to drivers/source/USBMouse.cpp diff --git a/drivers/source/usb/USBMouseKeyboard.cpp b/drivers/source/USBMouseKeyboard.cpp similarity index 100% rename from drivers/source/usb/USBMouseKeyboard.cpp rename to drivers/source/USBMouseKeyboard.cpp diff --git a/drivers/source/usb/USBSerial.cpp b/drivers/source/USBSerial.cpp similarity index 100% rename from drivers/source/usb/USBSerial.cpp rename to drivers/source/USBSerial.cpp diff --git a/drivers/source/usb/mbed_lib.json b/drivers/source/usb/mbed_lib.json deleted file mode 100644 index 32a28d417d7..00000000000 --- a/drivers/source/usb/mbed_lib.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "drivers-usb" -} diff --git a/platform/bare_metal/mbed_lib.json b/platform/bare_metal/mbed_lib.json index 93b0553265b..1025c9f3a71 100644 --- a/platform/bare_metal/mbed_lib.json +++ b/platform/bare_metal/mbed_lib.json @@ -1,4 +1,4 @@ { "name": "bare-metal", - "requires": ["platform", "drivers", "rtos-api", "mbed-trace"] + "requires": ["platform", "drivers", "rtos-api", "mbed-trace", "events"] } From 7e972130f1220161963273e7d3ad3c3f6046b34e Mon Sep 17 00:00:00 2001 From: Evelyne Donnaes Date: Mon, 26 Oct 2020 16:16:57 +0000 Subject: [PATCH 2/3] Removed deleted directory --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 94999cfbe4b..a8cc65eaf1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -282,7 +282,7 @@ matrix: # Check that example compiles without rtos - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp - | - rm -r cmsis/CMSIS_5/CMSIS/RTOS2 cmsis/device/rtos drivers/source/usb connectivity/cellular connectivity/drivers/cellular \ + rm -r cmsis/CMSIS_5/CMSIS/RTOS2 cmsis/device/rtos connectivity/cellular connectivity/drivers/cellular \ connectivity/libraries/ppp connectivity/netsocket connectivity/nanostack connectivity/lwipstack features/frameworks/greentea-client \ features/frameworks/utest features/frameworks/unity BUILD - python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0 From 540ffbc0b5257dc2e25c7a523bd93266ee5ff885 Mon Sep 17 00:00:00 2001 From: Evelyne Donnaes Date: Thu, 29 Oct 2020 10:02:30 +0000 Subject: [PATCH 3/3] Adding the missing mbed_lib.json and explicitly adding the library to the bare metal profile --- platform/bare_metal/mbed_lib.json | 2 +- storage/blockdevice/mbed_lib.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 storage/blockdevice/mbed_lib.json diff --git a/platform/bare_metal/mbed_lib.json b/platform/bare_metal/mbed_lib.json index 1025c9f3a71..21f441e3040 100644 --- a/platform/bare_metal/mbed_lib.json +++ b/platform/bare_metal/mbed_lib.json @@ -1,4 +1,4 @@ { "name": "bare-metal", - "requires": ["platform", "drivers", "rtos-api", "mbed-trace", "events"] + "requires": ["platform", "drivers", "rtos-api", "mbed-trace", "events", "blockdevice"] } diff --git a/storage/blockdevice/mbed_lib.json b/storage/blockdevice/mbed_lib.json new file mode 100644 index 00000000000..d5c54e7b2af --- /dev/null +++ b/storage/blockdevice/mbed_lib.json @@ -0,0 +1,3 @@ +{ + "name": "blockdevice" +}