support 2 hid instances

Author: yahiro07

src/arduino/hid/Adafruit_USBD_HID.cpp

@@ -34,7 +34,11 @@
 uint8_t const _ascii2keycode[128][2] = {HID_ASCII_TO_KEYCODE};
 
 // TODO multiple instances
-static Adafruit_USBD_HID *_hid_dev = NULL;
+// static Adafruit_USBD_HID *_hid_dev = NULL;
+
+// support 2 instances
+static uint8_t _instance_count = 0;
+static Adafruit_USBD_HID *_hid_devs[2] = {NULL, NULL};
 
 #ifdef ARDUINO_ARCH_ESP32
 static uint16_t hid_load_descriptor(uint8_t *dst, uint8_t *itf) {
@@ -162,27 +166,29 @@ bool Adafruit_USBD_HID::begin(void) {
     return false;
   }
 
-  _hid_dev = this;
+  _instance = _instance_count++;
+  _hid_devs[_instance] = this;
+
   return true;
 }
 
 bool Adafruit_USBD_HID::ready(void) { return tud_hid_ready(); }
 
 bool Adafruit_USBD_HID::sendReport(uint8_t report_id, void const *report,
                                    uint8_t len) {
-  return tud_hid_report(report_id, report, len);
+  return tud_hid_n_report(_instance, report_id, report, len);
 }
 
 bool Adafruit_USBD_HID::sendReport8(uint8_t report_id, uint8_t num) {
-  return tud_hid_report(report_id, &num, sizeof(num));
+  return tud_hid_n_report(_instance, report_id, &num, sizeof(num));
 }
 
 bool Adafruit_USBD_HID::sendReport16(uint8_t report_id, uint16_t num) {
-  return tud_hid_report(report_id, &num, sizeof(num));
+  return tud_hid_n_report(_instance, report_id, &num, sizeof(num));
 }
 
 bool Adafruit_USBD_HID::sendReport32(uint8_t report_id, uint32_t num) {
-  return tud_hid_report(report_id, &num, sizeof(num));
+  return tud_hid_n_report(_instance, report_id, &num, sizeof(num));
 }
 
 //------------- TinyUSB callbacks -------------//
@@ -191,8 +197,8 @@ extern "C" {
 // Invoked when received GET HID REPORT DESCRIPTOR
 // Application return pointer to descriptor, whose contents must exist long
 // enough for transfer to complete
-uint8_t const *tud_hid_descriptor_report_cb(uint8_t itf) {
-  (void)itf;
+uint8_t const *tud_hid_descriptor_report_cb(uint8_t instance) {
+  Adafruit_USBD_HID *_hid_dev = _hid_devs[instance];
 
   if (!_hid_dev) {
     return NULL;
@@ -204,10 +210,10 @@ uint8_t const *tud_hid_descriptor_report_cb(uint8_t itf) {
 // Invoked when received GET_REPORT control request
 // Application must fill buffer report's content and return its length.
 // Return zero will cause the stack to STALL request
-uint16_t tud_hid_get_report_cb(uint8_t itf, uint8_t report_id,
+uint16_t tud_hid_get_report_cb(uint8_t instance, uint8_t report_id,
                                hid_report_type_t report_type, uint8_t *buffer,
                                uint16_t reqlen) {
-  (void)itf;
+  Adafruit_USBD_HID *_hid_dev = _hid_devs[instance];
 
   if (!(_hid_dev && _hid_dev->_get_report_cb)) {
     return 0;
@@ -218,10 +224,10 @@ uint16_t tud_hid_get_report_cb(uint8_t itf, uint8_t report_id,
 
 // Invoked when received SET_REPORT control request or
 // received data on OUT endpoint ( Report ID = 0, Type = 0 )
-void tud_hid_set_report_cb(uint8_t itf, uint8_t report_id,
+void tud_hid_set_report_cb(uint8_t instance, uint8_t report_id,
                            hid_report_type_t report_type, uint8_t const *buffer,
                            uint16_t bufsize) {
-  (void)itf;
+  Adafruit_USBD_HID *_hid_dev = _hid_devs[instance];
 
   if (!(_hid_dev && _hid_dev->_set_report_cb)) {
     return;
@@ -238,7 +244,7 @@ void tud_hid_set_report_cb(uint8_t itf, uint8_t report_id,
 
 bool Adafruit_USBD_HID::keyboardReport(uint8_t report_id, uint8_t modifier,
                                        uint8_t keycode[6]) {
-  return tud_hid_keyboard_report(report_id, modifier, keycode);
+  return tud_hid_n_keyboard_report(_instance, report_id, modifier, keycode);
 }
 
 bool Adafruit_USBD_HID::keyboardPress(uint8_t report_id, char ch) {
@@ -251,11 +257,11 @@ bool Adafruit_USBD_HID::keyboardPress(uint8_t report_id, char ch) {
   }
   keycode[0] = _ascii2keycode[uch][1];
 
-  return tud_hid_keyboard_report(report_id, modifier, keycode);
+  return tud_hid_n_keyboard_report(_instance, report_id, modifier, keycode);
 }
 
 bool Adafruit_USBD_HID::keyboardRelease(uint8_t report_id) {
-  return tud_hid_keyboard_report(report_id, 0, NULL);
+  return tud_hid_n_keyboard_report(_instance, report_id, 0, NULL);
 }
 
 //--------------------------------------------------------------------+
@@ -268,24 +274,27 @@ bool Adafruit_USBD_HID::mouseReport(uint8_t report_id, uint8_t buttons,
   // cache mouse button for other API such as move, scroll
   _mouse_button = buttons;
 
-  return tud_hid_mouse_report(report_id, buttons, x, y, vertical, horizontal);
+  return tud_hid_n_mouse_report(_instance, report_id, buttons, x, y, vertical,
+                                horizontal);
 }
 
 bool Adafruit_USBD_HID::mouseMove(uint8_t report_id, int8_t x, int8_t y) {
-  return tud_hid_mouse_report(report_id, _mouse_button, x, y, 0, 0);
+  return tud_hid_n_mouse_report(_instance, report_id, _mouse_button, x, y, 0,
+                                0);
 }
 
 bool Adafruit_USBD_HID::mouseScroll(uint8_t report_id, int8_t scroll,
                                     int8_t pan) {
-  return tud_hid_mouse_report(report_id, _mouse_button, 0, 0, scroll, pan);
+  return tud_hid_n_mouse_report(_instance, report_id, _mouse_button, 0, 0,
+                                scroll, pan);
 }
 
 bool Adafruit_USBD_HID::mouseButtonPress(uint8_t report_id, uint8_t buttons) {
-  return tud_hid_mouse_report(report_id, buttons, 0, 0, 0, 0);
+  return tud_hid_n_mouse_report(_instance, report_id, buttons, 0, 0, 0, 0);
 }
 
 bool Adafruit_USBD_HID::mouseButtonRelease(uint8_t report_id) {
-  return tud_hid_mouse_report(report_id, 0, 0, 0, 0, 0);
+  return tud_hid_n_mouse_report(_instance, report_id, 0, 0, 0, 0, 0);
 }
 
 #endif // TUSB_OPT_DEVICE_ENABLED

src/arduino/hid/Adafruit_USBD_HID.h

@@ -95,6 +95,8 @@ class Adafruit_USBD_HID : public Adafruit_USBD_Interface {
   get_report_callback_t _get_report_cb;
   set_report_callback_t _set_report_cb;
 
+  uint8_t _instance;
+
   friend uint16_t tud_hid_get_report_cb(uint8_t itf, uint8_t report_id,
                                         hid_report_type_t report_type,
                                         uint8_t *buffer, uint16_t reqlen);

src/arduino/ports/rp2040/tusb_config_rp2040.h

@@ -68,7 +68,7 @@ extern int serial1_printf(const char *__restrict __format, ...);
 
 #define CFG_TUD_CDC 1
 #define CFG_TUD_MSC 1
-#define CFG_TUD_HID 1
+#define CFG_TUD_HID 2
 #define CFG_TUD_MIDI 1
 #define CFG_TUD_VENDOR 1
 
@@ -104,7 +104,7 @@ extern int serial1_printf(const char *__restrict __format, ...);
 #define CFG_TUH_DEVICE_MAX (CFG_TUH_HUB ? 4 : 1) // hub typically has 4 ports
 
 // Enable tuh_edpt_xfer() API
-//#define CFG_TUH_API_EDPT_XFER       1
+// #define CFG_TUH_API_EDPT_XFER       1
 
 // Number of mass storage
 #define CFG_TUH_MSC 1