Skip to content
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

Jump to bottom

add freertos version of tinyusb tinyusb_device_freertos and tinyusb_host_freertos #1438

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

add freertos version of tinyusb tinyusb_device_freertos and tinyusb_host_freertos #1438

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 35 additions & 17 deletions src/rp2_common/tinyusb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,46 @@ if (EXISTS ${PICO_TINYUSB_PATH}/${TINYUSB_TEST_PATH})
set(FAMILY rp2040)
include(${PICO_TINYUSB_PATH}/hw/bsp/family_support.cmake)

add_library(tinyusb_common INTERFACE)
target_link_libraries(tinyusb_common INTERFACE tinyusb_common_base)
function(add_tinyusb_library RTOS)
if (RTOS STREQUAL noos)
set(RTOS pico)
set(SUFFIX "")
else()
set(SUFFIX _${RTOS})
endif()
string(TOUPPER ${RTOS} RTOS_UPPER)

add_library(tinyusb_common${SUFFIX} INTERFACE)
target_compile_definitions(tinyusb_common${SUFFIX} INTERFACE CFG_TUSB_OS=OPT_OS_${RTOS_UPPER})
target_link_libraries(tinyusb_common${SUFFIX} INTERFACE tinyusb_common_base)

add_library(tinyusb_device_unmarked${SUFFIX} INTERFACE)
target_link_libraries(tinyusb_device_unmarked${SUFFIX} INTERFACE tinyusb_device_base)
target_compile_definitions(tinyusb_device_unmarked${SUFFIX} INTERFACE
# off by default note TUD_OPT_RP2040_USB_DEVICE_ENUMERATION_FIX defaults from PICO_RP2040_USB_DEVICE_ENUMERATION_FIX
# TUD_OPT_RP2040_USB_DEVICE_ENUMERATION_FIX=1
PICO_RP2040_USB_DEVICE_UFRAME_FIX=1
)

add_library(tinyusb_device_unmarked INTERFACE)
target_link_libraries(tinyusb_device_unmarked INTERFACE tinyusb_device_base)
target_compile_definitions(tinyusb_device_unmarked INTERFACE
# off by default note TUD_OPT_RP2040_USB_DEVICE_ENUMERATION_FIX defaults from PICO_RP2040_USB_DEVICE_ENUMERATION_FIX
# TUD_OPT_RP2040_USB_DEVICE_ENUMERATION_FIX=1
PICO_RP2040_USB_DEVICE_UFRAME_FIX=1
)
# unmarked version used by stdio USB
target_link_libraries(tinyusb_device_unmarked${SUFFIX} INTERFACE tinyusb_common${SUFFIX} pico_fix_rp2040_usb_device_enumeration tinyusb_device_base)

# unmarked version used by stdio USB
target_link_libraries(tinyusb_device_unmarked INTERFACE tinyusb_common pico_fix_rp2040_usb_device_enumeration tinyusb_device_base)
pico_add_library(tinyusb_device${SUFFIX})
target_link_libraries(tinyusb_device${SUFFIX} INTERFACE tinyusb_device_unmarked${SUFFIX})

pico_add_library(tinyusb_device)
target_link_libraries(tinyusb_device INTERFACE tinyusb_device_unmarked)
pico_add_library(tinyusb_host${SUFFIX})
target_link_libraries(tinyusb_host${SUFFIX} INTERFACE tinyusb_host_base tinyusb_common${SUFFIX})

pico_add_library(tinyusb_board${SUFFIX})
target_link_libraries(tinyusb_board${SUFFIX} INTERFACE tinyusb_bsp)
endfunction()

pico_add_library(tinyusb_host)
target_link_libraries(tinyusb_host INTERFACE tinyusb_host_base tinyusb_common)
# no RTOS: tinyusb_device, tinyusb_host
add_tinyusb_library(noos)

pico_add_library(tinyusb_board)
target_link_libraries(tinyusb_board INTERFACE tinyusb_bsp)
# FreeRTOS: tinyusb_device_freertos, tinyusb_host_freertos
add_tinyusb_library(freertos)
#target_link_libraries(tinyusb_common_freertos INTERFACE freertos_kernel)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to link with freeRTOS kernel lib for osal API.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hathach function add_tinyusb_library as written has default freertos and exception noos. I think line 27 should be if (RTOS STREQUAL freertos) and the logic that follows should be reversed. Reason is that until now, FreeRTOS has not really been supported for the RP2040.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is for adding other rtos if pico intend to do that in the future, just upper and add the OPT_OS_RTOS to common.


# Override suppress_tinyusb_warnings to add suppression of (falsely) reported GCC 11.2 warnings
function(suppress_tinyusb_warnings)
Expand Down