summaryrefslogtreecommitdiff
path: root/libusb
diff options
context:
space:
mode:
Diffstat (limited to 'libusb')
-rw-r--r--libusb/CMakeLists.txt6
-rw-r--r--libusb/include/libusb/usb_common.h2
-rw-r--r--libusb/usb_common.c61
3 files changed, 35 insertions, 34 deletions
diff --git a/libusb/CMakeLists.txt b/libusb/CMakeLists.txt
index c23f30e..b11e798 100644
--- a/libusb/CMakeLists.txt
+++ b/libusb/CMakeLists.txt
@@ -1,17 +1,15 @@
# libusb/CMakeLists.txt - Build script for libusb support library
#
-# Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com>
+# Copyright (C) 2024-2025 Luke T. Shumaker <lukeshu@lukeshu.com>
# SPDX-License-Identifier: AGPL-3.0-or-later
add_library(libusb INTERFACE)
-target_include_directories(libusb SYSTEM INTERFACE ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(libusb PUBLIC INTERFACE ${CMAKE_CURRENT_LIST_DIR}/include)
target_sources(libusb INTERFACE
usb_common.c
)
target_link_libraries(libusb INTERFACE
- pico_unique_id
tinyusb_device
- tinyusb_board
libcr_ipc
libmisc
diff --git a/libusb/include/libusb/usb_common.h b/libusb/include/libusb/usb_common.h
index e31b3ab..9fe0794 100644
--- a/libusb/include/libusb/usb_common.h
+++ b/libusb/include/libusb/usb_common.h
@@ -27,7 +27,7 @@ enum {
/* Globals ********************************************************************/
extern uint8_t cfgnum_std;
-void usb_common_earlyinit(void);
+void usb_common_earlyinit(uint16_t *serial, uint8_t serial_bytelen);
void usb_common_lateinit(void);
COROUTINE usb_common_cr(void *arg);
diff --git a/libusb/usb_common.c b/libusb/usb_common.c
index c9429e7..29dec42 100644
--- a/libusb/usb_common.c
+++ b/libusb/usb_common.c
@@ -6,10 +6,10 @@
#include <stdint.h> /* for uint{n}_t types */
#include <stddef.h> /* for size_t */
-#include <string.h> /* memcpy(newlib) */
-#include <stdlib.h> /* for malloc(pico_malloc), realloc(pico_malloc), reallocarray(pico_malloc) */
-#include "bsp/board_api.h" /* for board_init(), board_init_after_usb(), board_usb_get_serial(TinyUSB) */
-#include "tusb.h" /* for various tusb_*_t types */
+#include <string.h> /* memcpy() */
+#include <stdlib.h> /* for malloc(), realloc(), reallocarray() */
+
+#include <tusb.h> /* for various tusb_*_t types */
#include <libmisc/assert.h>
@@ -21,6 +21,17 @@
#include "config.h"
+/* Globals ********************************************************************/
+
+uint8_t cfgnum_std = 0;
+
+static struct {
+ uint8_t configc;
+ uint8_t **configv;
+ uint16_t *serial;
+ uint8_t serial_bytelen;
+} globals = {0};
+
/* Strings ********************************************************************/
/**
@@ -53,10 +64,8 @@ uint16_t const *tud_descriptor_string_cb(uint8_t strid, uint16_t langid) {
case STRID_CFG: CONST_STR(TU_UTF16("Standard Configuration")); break;
case STRID_KBD_IFC: CONST_STR(TU_UTF16("Keyboard Interface")); break;
case STRID_SERIAL:
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
- bytelen = 2 * board_usb_get_serial(desc.bString, TU_ARRAY_SIZE(desc.bString));
-#pragma GCC diagnostic pop
+ bytelen = globals.serial_bytelen;
+ memcpy(desc.bString, globals.serial, bytelen);
break;
default:
debugf("GET STRING: unknown string id=%"PRIu8, strid);
@@ -74,11 +83,11 @@ uint16_t const *tud_descriptor_string_cb(uint8_t strid, uint16_t langid) {
return (uint16_t *)&desc;
}
-/* Globals ********************************************************************/
+/* Main entrypoints ***********************************************************/
-uint8_t cfgnum_std = 0;
-
-void usb_common_earlyinit(void) {
+void usb_common_earlyinit(uint16_t *serial, uint8_t serial_bytelen) {
+ globals.serial = serial;
+ globals.serial_bytelen = serial_bytelen;
if (cfgnum_std)
return;
cfgnum_std = usb_add_config(
@@ -88,10 +97,7 @@ void usb_common_earlyinit(void) {
}
void usb_common_lateinit(void) {
- board_init();
- tud_init(BOARD_TUD_RHPORT);
- if (board_init_after_tusb)
- board_init_after_tusb();
+ tud_init(CONFIG_USB_COMMON_RHPORT);
}
COROUTINE usb_common_cr(void *_arg) {
@@ -108,19 +114,16 @@ COROUTINE usb_common_cr(void *_arg) {
/* Main utilities *************************************************************/
-static uint8_t configc = 0;
-static uint8_t **configv = NULL;
-
uint8_t usb_add_config(uint8_t iConfiguration, uint8_t bmAttributes, uint8_t bMaxPower_mA) {
uint8_t *desc;
- configv = reallocarray(configv, ++configc, sizeof configv[0]);
- desc = configv[configc-1] = malloc(TUD_CONFIG_DESC_LEN);
+ globals.configv = reallocarray(globals.configv, ++globals.configc, sizeof globals.configv[0]);
+ desc = globals.configv[globals.configc-1] = malloc(TUD_CONFIG_DESC_LEN);
memcpy(desc, (uint8_t[]){
/* USB configuration descriptor header (USB 2.0 §9.6.4 "Configuration") */
TUD_CONFIG_DESCRIPTOR(
- configc, /* bConfigurationValue */
+ globals.configc, /* bConfigurationValue */
0, /* bNumInterfaces (will be incremented by usb_add_interface() */
iConfiguration, /* iConfiguration */
TUD_CONFIG_DESC_LEN, /* wTotalLength (will be incremented by usb_add_interface() */
@@ -128,15 +131,15 @@ uint8_t usb_add_config(uint8_t iConfiguration, uint8_t bmAttributes, uint8_t bMa
bMaxPower_mA+1), /* bMaxPower (+1 because tusb just does n/2 instead of (n+1)/2) */
}, TUD_CONFIG_DESC_LEN);
- return configc;
+ return globals.configc;
}
uint8_t usb_add_interface(uint8_t cfg_num, uint16_t ifc_len, uint8_t *ifc_dat) {
- assert(cfg_num > 0 && cfg_num <= configc);
+ assert(cfg_num > 0 && cfg_num <= globals.configc);
assert(ifc_len >= 3);
assert(ifc_dat);
- uint8_t *desc = configv[cfg_num-1];
+ uint8_t *desc = globals.configv[cfg_num-1];
// wTotalLength
uint16_t total_len = TU_U16(desc[3], desc[2]) + ifc_len;
desc[3] = TU_U16_HIGH(total_len);
@@ -144,7 +147,7 @@ uint8_t usb_add_interface(uint8_t cfg_num, uint16_t ifc_len, uint8_t *ifc_dat) {
// bNumInterfaces
ifc_dat[3] = desc[4]++;
- desc = configv[cfg_num-1] = realloc(desc, total_len);
+ desc = globals.configv[cfg_num-1] = realloc(desc, total_len);
memcpy(&desc[total_len-ifc_len], ifc_dat, ifc_len);
return ifc_dat[3];
@@ -181,7 +184,7 @@ uint8_t const *tud_descriptor_device_cb(void) {
.bNumConfigurations = 0, /* Number of possible configurations */
};
- desc.bNumConfigurations = configc;
+ desc.bNumConfigurations = globals.configc;
return (uint8_t const *) &desc;
}
@@ -190,7 +193,7 @@ uint8_t const *tud_descriptor_device_cb(void) {
* USB 2.0 §9.6.4 "Configuration") for the given index.
*/
uint8_t const *tud_descriptor_configuration_cb(uint8_t index) {
- if (index >= configc)
+ if (index >= globals.configc)
return NULL;
- return configv[index];
+ return globals.configv[index];
}
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2025-04-11 17:16:11 +0000