Skip to content

Commit 561502c

Browse files
kilograhamkilograham
authored
Move to Tinyusb 0.10.0 (still with RP patches) (#462)
Most build related items have moved into <tinyusb>/hw/bsp/rp2040/family.cmake which is now the source of truth force merging as same code save submodule was already reviewed
1 parent 496ff66 commit 561502c

File tree

6 files changed

+45
-84
lines changed

6 files changed

+45
-84
lines changed

‎CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,9 @@ if (NOT TARGET _pico_sdk_inclusion_marker)
5050

5151
# add docs at the end, as we gather documentation dirs as we go
5252
add_subdirectory(docs)
53+
54+
if (NOT PICO_SDK_TOP_LEVEL_PROJECT)
55+
pico_promote_common_scope_vars()
56+
endif()
5357
endif()
5458

‎lib/tinyusb‎

Submodule tinyusb updated 818 files

‎pico_sdk_init.cmake‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ if (NOT TARGET _pico_sdk_pre_init_marker)
5353
message(WARNING "pico_sdk_init() should be called after the project is created (and languages added)")
5454
endif()
5555
add_subdirectory(${PICO_SDK_PATH} pico-sdk)
56+
pico_is_top_level_project(ISTOP)
5657
endmacro()
5758

5859
macro(add_sub_list_dirs var)
@@ -70,11 +71,24 @@ if (NOT TARGET _pico_sdk_pre_init_marker)
7071
endforeach()
7172
endmacro()
7273

74+
macro(pico_register_common_scope_var NAME)
75+
if (NOT ${NAME} IN_LIST PICO_PROMOTE_COMMON_SCOPE_VARS)
76+
list(APPEND PICO_PROMOTE_COMMON_SCOPE_VARS ${NAME})
77+
endif()
78+
endmacro()
79+
80+
set(PICO_PROMOTE_COMMON_SCOPE_VARS
81+
PICO_INCLUDE_DIRS
82+
PICO_SDK_POST_LIST_DIRS
83+
PICO_SDK_POST_LIST_FILES
84+
PICO_CONFIG_HEADER_FILES
85+
PICO_RP2040_CONFIG_HEADER_FILES
86+
)
87+
7388
macro(pico_promote_common_scope_vars)
74-
set(PICO_INCLUDE_DIRS ${PICO_INCLUDE_DIRS} PARENT_SCOPE)
75-
set(PICO_SDK_POST_LIST_DIRS ${PICO_SDK_POST_LIST_DIRS} PARENT_SCOPE)
76-
set(PICO_SDK_POST_LIST_FILES ${PICO_SDK_POST_LIST_FILES} PARENT_SCOPE)
77-
set(PICO_CONFIG_HEADER_FILES ${PICO_CONFIG_HEADER_FILES} PARENT_SCOPE)
78-
set(PICO_RP2040_CONFIG_HEADER_FILES ${PICO_RP2040_CONFIG_HEADER_FILES} PARENT_SCOPE)
89+
set(PICO_PROMOTE_COMMON_SCOPE_VARS ${PICO_PROMOTE_COMMON_SCOPE_VARS} PARENT_SCOPE)
90+
foreach(VAR IN LISTS PICO_PROMOTE_COMMON_SCOPE_VARS)
91+
SET(${VAR} ${${VAR}} PARENT_SCOPE)
92+
endforeach()
7993
endmacro()
8094
endif()

‎src/rp2_common/hardware_uart/include/hardware/uart.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@ static inline uint uart_get_index(uart_inst_t *uart) {
101101
return uart == uart1 ? 1 : 0;
102102
}
103103

104+
static inline uart_inst_t *uart_get_instance(uint instance) {
105+
static_assert(NUM_UARTS == 2, "");
106+
invalid_params_if(UART, instance >= NUM_UARTS);
107+
return instance ? uart1 : uart0;
108+
}
109+
104110
static inline uart_hw_t *uart_get_hw(uart_inst_t *uart) {
105111
uart_get_index(uart); // check it is a hw uart
106112
return (uart_hw_t *)uart;

‎src/rp2_common/pico_stdio_usb/reset_interface.c‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ static uint16_t resetd_open(uint8_t __unused rhport, tusb_desc_interface_t const
3838
}
3939

4040
// Support for parameterized reset via vendor interface control request
41-
static bool resetd_control_request_cb(uint8_t __unused rhport, tusb_control_request_t const *request) {
41+
static bool resetd_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const * request) {
42+
// nothing to do with DATA & ACK stage
43+
if (stage != CONTROL_STAGE_SETUP) return true;
44+
4245
if (request->wIndex == itf_num) {
4346

4447
#if PICO_STDIO_USB_RESET_INTERFACE_SUPPORT_RESET_TO_BOOTSEL
@@ -69,10 +72,6 @@ static bool resetd_control_request_cb(uint8_t __unused rhport, tusb_control_requ
6972
return false;
7073
}
7174

72-
static bool resetd_control_complete_cb(uint8_t __unused rhport, tusb_control_request_t __unused const *request) {
73-
return true;
74-
}
75-
7675
static bool resetd_xfer_cb(uint8_t __unused rhport, uint8_t __unused ep_addr, xfer_result_t __unused result, uint32_t __unused xferred_bytes) {
7776
return true;
7877
}
@@ -85,8 +84,7 @@ static usbd_class_driver_t const _resetd_driver =
8584
.init = resetd_init,
8685
.reset = resetd_reset,
8786
.open = resetd_open,
88-
.control_request = resetd_control_request_cb,
89-
.control_complete = resetd_control_complete_cb,
87+
.control_xfer_cb = resetd_control_xfer_cb,
9088
.xfer_cb = resetd_xfer_cb,
9189
.sof = NULL
9290
};

‎src/rp2_common/tinyusb/CMakeLists.txt‎

Lines changed: 10 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -17,93 +17,32 @@ endif()
1717
if (EXISTS ${PICO_TINYUSB_PATH}/${TINYUSB_TEST_PATH})
1818
message("TinyUSB available at ${PICO_TINYUSB_PATH}/${TINYUSB_TEST_PATH}; adding USB support.")
1919

20-
add_library(tinyusb_common INTERFACE)
21-
target_link_libraries(tinyusb_common INTERFACE
22-
hardware_structs
23-
hardware_irq
24-
hardware_resets
25-
pico_sync
26-
)
27-
28-
target_sources(tinyusb_common INTERFACE
29-
${PICO_TINYUSB_PATH}/src/tusb.c
30-
${PICO_TINYUSB_PATH}/src/common/tusb_fifo.c
31-
)
20+
pico_register_common_scope_var(PICO_TINYUSB_PATH)
3221

33-
set(TINYUSB_DEBUG_LEVEL 0)
34-
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
35-
message("Compiling TinyUSB with CFG_TUSB_DEBUG=1")
36-
set(TINYUSB_DEBUG_LEVEL 1)
37-
endif ()
22+
set(BOARD pico_sdk)
23+
include(${PICO_TINYUSB_PATH}/hw/bsp/rp2040/family.cmake)
3824

39-
target_compile_definitions(tinyusb_common INTERFACE
40-
CFG_TUSB_MCU=OPT_MCU_RP2040
41-
CFG_TUSB_OS=OPT_OS_PICO #seems examples are hard coded to OPT_OS_NONE
42-
CFG_TUSB_DEBUG=${TINYUSB_DEBUG_LEVEL}
43-
)
44-
45-
target_include_directories(tinyusb_common INTERFACE
46-
${PICO_TINYUSB_PATH}/src
47-
${PICO_TINYUSB_PATH}/src/common
48-
${PICO_TINYUSB_PATH}/hw
49-
)
25+
add_library(tinyusb_common INTERFACE)
26+
target_link_libraries(tinyusb_common INTERFACE tinyusb_common_base)
5027

5128
add_library(tinyusb_device_unmarked INTERFACE)
52-
target_sources(tinyusb_device_unmarked INTERFACE
53-
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/rp2040/dcd_rp2040.c
54-
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/rp2040/rp2040_usb.c
55-
${PICO_TINYUSB_PATH}/src/device/usbd.c
56-
${PICO_TINYUSB_PATH}/src/device/usbd_control.c
57-
${PICO_TINYUSB_PATH}/src/class/audio/audio_device.c
58-
${PICO_TINYUSB_PATH}/src/class/cdc/cdc_device.c
59-
${PICO_TINYUSB_PATH}/src/class/dfu/dfu_rt_device.c
60-
${PICO_TINYUSB_PATH}/src/class/hid/hid_device.c
61-
${PICO_TINYUSB_PATH}/src/class/midi/midi_device.c
62-
${PICO_TINYUSB_PATH}/src/class/msc/msc_device.c
63-
${PICO_TINYUSB_PATH}/src/class/net/net_device.c
64-
${PICO_TINYUSB_PATH}/src/class/usbtmc/usbtmc_device.c
65-
${PICO_TINYUSB_PATH}/src/class/vendor/vendor_device.c
66-
)
67-
29+
target_link_libraries(tinyusb_device_unmarked INTERFACE tinyusb_device_base)
6830
target_compile_definitions(tinyusb_device_unmarked INTERFACE
6931
# off by default note TUD_OPT_RP2040_USB_DEVICE_ENUMERATION_FIX defaults from PICO_RP2040_USB_DEVICE_ENUMERATION_FIX
7032
# TUD_OPT_RP2040_USB_DEVICE_ENUMERATION_FIX=1
7133
)
7234

7335
# unmarked version used by stdio USB
74-
target_link_libraries(tinyusb_device_unmarked INTERFACE tinyusb_common pico_fix_rp2040_usb_device_enumeration)
36+
target_link_libraries(tinyusb_device_unmarked INTERFACE tinyusb_common pico_fix_rp2040_usb_device_enumeration tinyusb_device_base)
7537

7638
pico_add_impl_library(tinyusb_device)
7739
target_link_libraries(tinyusb_device INTERFACE tinyusb_device_unmarked)
78-
target_compile_definitions(tinyusb_device INTERFACE
79-
RP2040_USB_DEVICE_MODE=1 #define is used by tinyusb still
80-
)
8140

8241
pico_add_impl_library(tinyusb_host)
83-
target_sources(tinyusb_host INTERFACE
84-
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/rp2040/hcd_rp2040.c
85-
${PICO_TINYUSB_PATH}/src/portable/raspberrypi/rp2040/rp2040_usb.c
86-
${PICO_TINYUSB_PATH}/src/host/usbh.c
87-
${PICO_TINYUSB_PATH}/src/host/usbh_control.c
88-
${PICO_TINYUSB_PATH}/src/host/hub.c
89-
${PICO_TINYUSB_PATH}/src/class/cdc/cdc_host.c
90-
${PICO_TINYUSB_PATH}/src/class/hid/hid_host.c
91-
${PICO_TINYUSB_PATH}/src/class/msc/msc_host.c
92-
${PICO_TINYUSB_PATH}/src/class/vendor/vendor_host.c
93-
)
94-
95-
# Sometimes have to do host specific actions in mostly
96-
# common functions
97-
target_compile_definitions(tinyusb_host INTERFACE
98-
RP2040_USB_HOST_MODE=1 #define is used by tinyusb still
99-
)
100-
101-
target_link_libraries(tinyusb_host INTERFACE tinyusb_common)
42+
target_link_libraries(tinyusb_host INTERFACE tinyusb_host_base tinyusb_common)
10243

10344
pico_add_impl_library(tinyusb_board)
104-
target_sources(tinyusb_board INTERFACE
105-
${PICO_TINYUSB_PATH}/hw/bsp/raspberry_pi_pico/board_raspberry_pi_pico.c
106-
)
45+
target_link_libraries(tinyusb_board INTERFACE tinyusb_bsp)
10746

47+
pico_promote_common_scope_vars()
10848
endif()
109-

0 commit comments

Comments
 (0)