Add additional Bazel defines for tinyUSB and pico_stdio_usb

This change the makes the following defines setable in Bazel:
- `LIB_TINYUSB_HOST`
- `LIB_TINYUSB_DEVICE`
- `PICO_STDIO_USB_ENABLE_RESET_VIA_BAUD_RATE`
- `PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE`

This also adds `//bazel/config:PICO_TINYUSB_CONFIG`, which allows
overriding the "tusb_config.h" header used to build tinyUSB. This might
be used to add additional USB interfaces while preserving the
functionality from pico_stdio_usb.

Author: mbrase

bazel/config/BUILD.bazel

@@ -186,6 +186,36 @@ int_flag(
     build_setting_default = 0,
 )
 
+# PICO_BAZEL_CONFIG: PICO_STDIO_USB_ENABLE_RESET_VIA_BAUD_RATE, Enable/disable resetting into BOOTSEL mode if the host sets the baud rate to a magic value (PICO_STDIO_USB_RESET_MAGIC_BAUD_RATE), type=bool, default=1, group=pico_stdio_usb
+bool_flag(
+    name = "PICO_STDIO_USB_ENABLE_RESET_VIA_BAUD_RATE",
+    build_setting_default = True,
+)
+
+# PICO_BAZEL_CONFIG: PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE, Enable/disable resetting into BOOTSEL mode via an additional VENDOR USB interface - enables picotool based reset, type=bool, default=1, group=pico_stdio_usb
+bool_flag(
+    name = "PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE",
+    build_setting_default = True,
+)
+
+# PICO_BAZEL_CONFIG: PICO_TINYUSB_CONFIG, [Bazel only] The library that provides TinyUSB config header (e.g. tusb_config.h), default=//src/rp2_common/pico_stdio_usb:tusb_config, group=build
+label_flag(
+    name = "PICO_TINYUSB_CONFIG",
+    build_setting_default = "//src/rp2_common/pico_stdio_usb:tusb_config",
+)
+
+# PICO_BAZEL_CONFIG: PICO_TINYUSB_DEVICE, Indicates user code is using tinyusb in device mode, type=bool, default=0, group=pico_stdio_usb
+bool_flag(
+    name = "PICO_TINYUSB_DEVICE",
+    build_setting_default = False,
+)
+
+# PICO_BAZEL_CONFIG: PICO_TINYUSB_HOST, Indicates user code is using tinyusb in host mode, type=bool, default=0, group=pico_stdio_usb
+bool_flag(
+    name = "PICO_TINYUSB_HOST",
+    build_setting_default = False,
+)
+
 # PICO_BAZEL_CONFIG: PICO_TINYUSB_LIB, [Bazel only] The library that provides TinyUSB, default=@tinyusb//:tinyusb, group=build
 label_flag(
     name = "PICO_TINYUSB_LIB",

bazel/util/sdk_define.bzl

@@ -11,7 +11,9 @@ def _pico_sdk_define_impl(ctx):
         val = 1 if val else 0
     cc_ctx = cc_common.create_compilation_context(
         defines = depset(
-            direct = ["{}={}".format(ctx.attr.define_name, val)],
+            direct = [
+                "{}={}".format(ctx.attr.define_name, val)
+            ] if val or not ctx.attr.undef_if_falsy else [],
         ),
     )
     return [CcInfo(compilation_context = cc_ctx)]
@@ -39,5 +41,6 @@ Example:
     attrs = {
         "define_name": attr.string(mandatory = True),
         "from_flag": attr.label(mandatory = True),
+        "undef_if_falsy": attr.bool(default = False),
     },
 )

src/rp2_common/pico_stdio_usb/BUILD.bazel

@@ -24,6 +24,11 @@ cc_library(
     hdrs = ["include/tusb_config.h"],
     includes = ["include"],
     target_compatible_with = compatible_with_rp2(),
+    deps = [
+        ":LIB_TINYUSB_DEVICE",
+        ":LIB_TINYUSB_HOST",
+        ":pico_stdio_usb_headers",
+    ],
 )
 
 pico_sdk_define(
@@ -38,18 +43,44 @@ pico_sdk_define(
     from_flag = "//bazel/config:PICO_STDIO_USB_CONNECT_WAIT_TIMEOUT_MS",
 )
 
+pico_sdk_define(
+    name = "PICO_STDIO_USB_ENABLE_RESET_VIA_BAUD_RATE",
+    define_name = "PICO_STDIO_USB_ENABLE_RESET_VIA_BAUD_RATE",
+    from_flag = "//bazel/config:PICO_STDIO_USB_ENABLE_RESET_VIA_BAUD_RATE",
+)
+
+pico_sdk_define(
+    name = "PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE",
+    define_name = "PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE",
+    from_flag = "//bazel/config:PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE",
+)
+
+pico_sdk_define(
+    name = "LIB_TINYUSB_HOST",
+    define_name = "LIB_TINYUSB_HOST",
+    from_flag = "//bazel/config:PICO_TINYUSB_HOST",
+    undef_if_falsy = True,
+)
+
+pico_sdk_define(
+    name = "LIB_TINYUSB_DEVICE",
+    define_name = "LIB_TINYUSB_DEVICE",
+    from_flag = "//bazel/config:PICO_TINYUSB_DEVICE",
+    undef_if_falsy = True,
+)
+
 cc_library(
     name = "pico_stdio_usb_headers",
     hdrs = ["include/pico/stdio_usb.h"],
     includes = ["include"],
     target_compatible_with = compatible_with_rp2(),
-    visibility = [
-        ":__pkg__",
-        "//src/rp2_common/tinyusb:__pkg__",
-    ],
     deps = [
         ":LIB_PICO_STDIO_USB",
+        ":LIB_TINYUSB_DEVICE",
+        ":LIB_TINYUSB_HOST",
         ":PICO_STDIO_USB_CONNECT_WAIT_TIMEOUT_MS",
+        ":PICO_STDIO_USB_ENABLE_RESET_VIA_BAUD_RATE",
+        ":PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE",
     ],
 )
 
@@ -65,7 +96,11 @@ cc_library(
     ) + compatible_with_rp2(),
     deps = [
         ":LIB_PICO_STDIO_USB",
+        ":LIB_TINYUSB_DEVICE",
+        ":LIB_TINYUSB_HOST",
         ":PICO_STDIO_USB_CONNECT_WAIT_TIMEOUT_MS",
+        ":PICO_STDIO_USB_ENABLE_RESET_VIA_BAUD_RATE",
+        ":PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE",
         ":pico_stdio_usb_headers",
         ":reset_interface_headers",
         "//bazel/config:PICO_TINYUSB_LIB",

src/rp2_common/pico_stdio_usb/include/pico/stdio_usb.h

@@ -48,6 +48,8 @@
 #ifndef PICO_STDIO_USB_ENABLE_RESET_VIA_BAUD_RATE
 #if !defined(LIB_TINYUSB_HOST) && !defined(LIB_TINYUSB_DEVICE)
 #define PICO_STDIO_USB_ENABLE_RESET_VIA_BAUD_RATE 1
+#else
+#define PICO_STDIO_USB_ENABLE_RESET_VIA_BAUD_RATE 0
 #endif
 #endif
 
@@ -93,6 +95,8 @@
 #ifndef PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE
 #if !defined(LIB_TINYUSB_HOST) && !defined(LIB_TINYUSB_DEVICE)
 #define PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE 1
+#else
+#define PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE 0
 #endif
 #endif
 

src/rp2_common/tinyusb/BUILD.bazel

@@ -15,6 +15,7 @@ cc_library(
     includes = ["include"],
     target_compatible_with = compatible_with_rp2(),
     deps = [
+        "//bazel/config:PICO_TINYUSB_CONFIG",
         "//src/common/pico_binary_info",
         "//src/common/pico_stdlib_headers",
         "//src/common/pico_sync",
@@ -30,7 +31,6 @@ cc_library(
         "//src/rp2_common/pico_stdio_semihosting",
         "//src/rp2_common/pico_stdio_uart",
         "//src/rp2_common/pico_stdio_usb:pico_stdio_usb_headers",
-        "//src/rp2_common/pico_stdio_usb:tusb_config",
         "//src/rp2_common/pico_unique_id",
     ],
 )