Skip to content

Commit c6094f7

Browse files
authored
Merge pull request #13869 from evedon/cleanup-usb-drivers
Create a USB drivers library
2 parents 1bd5ce6 + 7f92ba0 commit c6094f7

Some content is hidden

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

68 files changed

+47
-46
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ matrix:
284284
# Check that example compiles without rtos
285285
- sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp
286286
- |
287-
rm -r cmsis/CMSIS_5/CMSIS/RTOS2 cmsis/device/rtos drivers/source/usb connectivity/cellular connectivity/drivers/cellular \
287+
rm -r cmsis/CMSIS_5/CMSIS/RTOS2 cmsis/device/rtos drivers/usb connectivity/cellular connectivity/drivers/cellular \
288288
connectivity/libraries/ppp connectivity/netsocket connectivity/nanostack connectivity/lwipstack features/frameworks/greentea-client \
289289
features/frameworks/utest features/frameworks/unity BUILD
290290
- python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ add_subdirectory(events EXCLUDE_FROM_ALL)
114114
add_subdirectory(connectivity EXCLUDE_FROM_ALL)
115115
add_subdirectory(storage EXCLUDE_FROM_ALL)
116116
add_subdirectory(drivers/device_key EXCLUDE_FROM_ALL)
117-
add_subdirectory(drivers/source/usb EXCLUDE_FROM_ALL)
117+
add_subdirectory(drivers/usb EXCLUDE_FROM_ALL)
118118
add_subdirectory(features EXCLUDE_FROM_ALL)
119119
add_subdirectory(platform/FEATURE_EXPERIMENTAL_API EXCLUDE_FROM_ALL)
120120
add_subdirectory(cmsis/CMSIS_5/CMSIS/RTOS2 EXCLUDE_FROM_ALL)

drivers/source/usb/CMakeLists.txt

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

drivers/usb/CMakeLists.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Copyright (c) 2020 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
add_library(mbed-usb INTERFACE)
5+
6+
target_include_directories(mbed-usb
7+
INTERFACE
8+
include
9+
include/usb
10+
)
11+
12+
target_sources(mbed-usb
13+
INTERFACE
14+
source/AsyncOp.cpp
15+
source/ByteBuffer.cpp
16+
source/EndpointResolver.cpp
17+
source/LinkedListBase.cpp
18+
source/OperationListBase.cpp
19+
source/PolledQueue.cpp
20+
source/TaskBase.cpp
21+
source/USBAudio.cpp
22+
source/USBCDC.cpp
23+
source/USBCDC_ECM.cpp
24+
source/USBDevice.cpp
25+
source/USBHID.cpp
26+
source/USBKeyboard.cpp
27+
source/USBMIDI.cpp
28+
source/USBMSD.cpp
29+
source/USBMouse.cpp
30+
source/USBMouseKeyboard.cpp
31+
source/USBSerial.cpp
32+
)
33+
34+
target_link_libraries(mbed-usb INTERFACE mbed-storage)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)