Some USB test code fixes (#775)

* Some USB test code fixes

* Fix build warning

* Fix tinyusb config issues

The latest version of freertos adds the following definition to every
tinyusb example

CFG_TUSB_OS=${TINYUSB_OPT_OS}

But due to cmake scoping rules and the inclusion of tinyusb in pico-sdk
TINYUSB_OPT_OS is unset when the definition is added.
Make sure it's defined to avoid lots of redefinition warnings.

For freertos examples, add the tinyusb freertos config folder to the
list of include directories.
Different freertos examples might have different requirements.

* Filter tinyusb examples

Override the tinyusb cmake function family_add_subdirectory to ignore
any examples that won't build

* Make sure LINKERMAP_PY is defined

This goes out of scope.

Author: peterharperuk

usb/CMakeLists.txt

@@ -1,3 +1,54 @@
+# family.cmake defines TINYUSB_OPT_OS and is included twice...
+# 1/ the first time by pico-sdk in src/rp2_common/tinyusb/CMakeLists.txt
+# 2/ before each tinyusb example via family_support.cmake
+# family.cmake has include_guard(GLOBAL) so the second include doesn't happen
+# But each example calls the cmake function family_configure_device_example
+# as the second include didn't happen TINYUSB_OPT_OS has gone out of scope
+# So make sure it's defined to avoid a redefinition with an invalid value
+# For freertos examples TINYUSB_OPT_OS is actually defined in FreeRTOSConfig.h
+set(TINYUSB_OPT_OS OPT_OS_PICO)
+
+# Same issue as above - this variable goes out of scope
+set(LINKERMAP_PY ${PICO_TINYUSB_PATH}/tools/linkermap/linkermap.py)
+
+# List of freertos examples
+set(tinyusb_freertos_examples
+    audio_4_channel_mic_freertos
+    audio_test_freertos
+    cdc_msc_freertos
+    hid_composite_freertos
+    midi_test_freertos
+    msc_file_explorer_freertos
+)
+
+# This is used to filter the tinyusb examples
+# Ignore examples that don't build properly without extra code
+# Ignore freertos examples unless FREERTOS_KERNEL_PATH is defined
+function(family_add_subdirectory DIR)
+family_filter(SHOULD_ADD "${DIR}")
+if (SHOULD_ADD)
+    if (NOT IS_DIRECTORY ${PICO_TINYUSB_PATH}/lib/fatfs)
+        list(APPEND tinyusb_example_ignore_list
+            msc_file_explorer msc_file_explorer_freertos # need fatfs repo
+        )
+    endif()
+    if (NOT DEFINED FREERTOS_KERNEL_PATH)
+        # skip freertos examples
+        list(APPEND tinyusb_example_ignore_list
+            ${tinyusb_freertos_examples}
+        )
+    endif()
+    list(FIND tinyusb_example_ignore_list ${DIR} skip_pos)
+    if (skip_pos GREATER_EQUAL 0)
+        set(SHOULD_ADD 0)
+    endif()
+    if (SHOULD_ADD)
+        add_subdirectory(${DIR})
+    endif()
+endif()
+endfunction()
+
+
 if (TARGET tinyusb_device)
     add_subdirectory(device)
 else ()
@@ -13,3 +64,15 @@ if (TARGET tinyusb_pico_pio_usb)
 else ()
     message("Skipping TinyUSB dual examples, as TinyUSB hw/mcu/raspberry_pi/Pico-PIO-USB submodule unavailable")
 endif ()
+
+# tinyusb freertos examples want to use FREERTOS_CONFIG_FILE_DIRECTORY to set the freertos config directory
+# we have other freertos examples and we want the config to be under the control of each example
+# We prefer to add the freertos config directory to the include directory list
+# Add the directory now for the tinyusb freertos examples
+foreach(tinyusb_freertos_example ${tinyusb_freertos_examples})
+    if (TARGET ${tinyusb_freertos_example})
+        target_include_directories(${tinyusb_freertos_example} PRIVATE
+            ${PICO_TINYUSB_PATH}/hw/bsp/rp2040/FreeRTOSConfig
+        )
+    endif()
+endforeach()

usb/device/dev_hid_composite/main.c

@@ -58,11 +58,12 @@ int main(void)
   board_init();
 
   // init device stack on configured roothub port
-  tud_init(BOARD_TUD_RHPORT);
-
-  if (board_init_after_tusb) {
-    board_init_after_tusb();
-  }
+  const tusb_rhport_init_t rh_init = {
+    .role = TUSB_ROLE_DEVICE,
+    .speed = TUD_OPT_HIGH_SPEED ? TUSB_SPEED_HIGH : TUSB_SPEED_FULL
+  };
+  TU_ASSERT(tud_rhport_init(BOARD_TUD_RHPORT, &rh_init));
+  board_init_after_tusb();
 
   while (1)
   {
@@ -198,6 +199,11 @@ static void send_hid_report(uint8_t report_id, uint32_t btn)
   }
 }
 
+#if TUSB_VERSION_NUMBER > 1800
+// board_millis has been removed from tinyusb. Use tusb_time_millis_api instead
+#define board_millis tusb_time_millis_api
+#endif
+
 // Every 10ms, we will sent 1 report for each HID profile (keyboard, mouse etc ..)
 // tud_hid_report_complete_cb() is used to send the next report after previous one is complete
 void hid_task(void)

usb/device/dev_multi_cdc/usb_descriptors.c

@@ -6,6 +6,7 @@
 
 #include <tusb.h>
 #include <bsp/board_api.h>
+#include <assert.h>
 
 #include "pico/usb_reset.h"
 

usb/host/host_cdc_msc_hid/main.c

@@ -50,11 +50,13 @@ int main(void) {
   printf("TinyUSB Host CDC MSC HID Example\r\n");
 
   // init host stack on configured roothub port
-  tuh_init(BOARD_TUH_RHPORT);
+  const tusb_rhport_init_t rh_init = {
+    .role = TUSB_ROLE_HOST,
+    .speed = TUH_OPT_HIGH_SPEED ? TUSB_SPEED_HIGH : TUSB_SPEED_FULL,
+  };
+  TU_ASSERT(tuh_rhport_init(BOARD_TUH_RHPORT, &rh_init));
 
-  if (board_init_after_tusb) {
-    board_init_after_tusb();
-  }
+  board_init_after_tusb();
 
 #if CFG_TUH_ENABLED && CFG_TUH_MAX3421
   // FeatherWing MAX3421E use MAX3421E's GPIO0 for VBUS enable
@@ -86,6 +88,10 @@ void tuh_umount_cb(uint8_t dev_addr) {
   printf("A device with address %d is unmounted \r\n", dev_addr);
 }
 
+#if TUSB_VERSION_NUMBER > 1800
+// board_millis has been removed from tinyusb. Use tusb_time_millis_api instead
+#define board_millis tusb_time_millis_api
+#endif
 
 //--------------------------------------------------------------------+
 // Blinking Task

usb/host/host_cdc_msc_hid/msc_app.c

@@ -26,6 +26,7 @@
 #include "tusb.h"
 
 #include <inttypes.h>
+#include <stdio.h>
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION