Add vendor endpoint to the rp2040 firmware

Author: MartijnBraam

hardware/firmware/box_rp2040/src/usb/tusb_config.h

@@ -64,8 +64,11 @@
 #define CFG_TUD_MSC               0
 #define CFG_TUD_HID               0
 #define CFG_TUD_MIDI              0
-#define CFG_TUD_VENDOR            0
+#define CFG_TUD_VENDOR            1
 
 // CDC FIFO size of TX and RX
 #define CFG_TUD_CDC_RX_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
 #define CFG_TUD_CDC_TX_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)
+
+#define CFG_TUD_VENDOR_RX_BUFSIZE 1024
+#define CFG_TUD_VENDOR_TX_BUFSIZE 1024

hardware/firmware/box_rp2040/src/usb/usb.c

@@ -1,7 +1,6 @@
 #include "usb.h"
 #include "config.h"
 #include "pico/bootrom.h"
-
 // TODO: implement vendor-reset interface
 
 void usb_init(void) {
@@ -67,3 +66,58 @@ void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* p_line_coding)
         reset_usb_boot(0, 0);
     }
 }
+
+bool vendor_request_temperature_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const * request)
+{
+    if (request->bmRequestType_bit.direction != TUSB_DIR_IN)
+	    return false;
+
+    if (stage != CONTROL_STAGE_SETUP)
+	    return true;
+
+    uint8_t reg = 0;
+    uint8_t buffer[2] = {0};
+    i2c_write_blocking_until(PWR_BRD_I2C_INST, PWR_BRD_TEMP_SENS_ADDR, &reg, 1, true, make_timeout_time_ms(20));
+    i2c_read_blocking_until(PWR_BRD_I2C_INST, PWR_BRD_TEMP_SENS_ADDR, &buffer, 2, false, make_timeout_time_ms(20));
+    io_say_f("  TEMP: [%d, %d]\r\n", buffer[0], buffer[1]);
+
+    return tud_control_xfer(rhport, request, &buffer, sizeof(buffer));
+}
+
+bool vendor_request_fanspeed_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const * request)
+{
+    if (request->bmRequestType_bit.direction != TUSB_DIR_IN)
+	    return false;
+
+    if (stage != CONTROL_STAGE_SETUP)
+	    return true;
+
+    uint8_t buffer[2] = {0};
+    uint16_t fs = 0;
+    fan_ctl_get_fan_speed(request->wIndex, &fs);
+    buffer[0] = (fs>>8) & 0xFF;
+    buffer[1] = (fs>>0) & 0xFF;
+    io_say_f("  FANSPEED %d: %d\r\n", request->wIndex, fs);
+    return tud_control_xfer(rhport, request, &buffer, sizeof(buffer));
+}
+
+
+bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const* request) {
+    bool result = false;
+    switch (request->bmRequestType_bit.type) {
+        case TUSB_REQ_TYPE_VENDOR:
+            io_say_f("XFER: bRequest=%d, wValue=%d, wIndex=%d, wLength=%d\r\n", request->bRequest, request->wValue, request->wIndex, request->wLength);
+            switch (request->bRequest) {
+                case VENDOR_REQUEST_TEMPERATURE:
+                    result = vendor_request_temperature_cb(rhport, stage, request);
+                    break;
+                case VENDOR_REQUEST_FANSPEED:
+                    result = vendor_request_fanspeed_cb(rhport, stage, request);
+                    break;
+            }
+            break;
+        default:
+            break;
+    }
+    return result;
+}

hardware/firmware/box_rp2040/src/usb/usb.h

@@ -7,6 +7,9 @@
 
 #define USB_ENABLED (USB_INSTANCE >= 0)
 
+#define VENDOR_REQUEST_TEMPERATURE (0x10)
+#define VENDOR_REQUEST_FANSPEED (0x11)
+
 void usb_init(void);
 void usb_task(void);
 

hardware/firmware/box_rp2040/src/usb/usb_descriptors.c

@@ -49,21 +49,27 @@ uint8_t const * tud_descriptor_device_cb(void)
 enum {
     ITF_NUM_CDC = 0,
     ITF_NUM_CDC_DATA,
+    ITF_NUM_VENDOR,
     ITF_NUM_TOTAL
 };
 
-#define CONFIG_TOTAL_LEN  (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
+#define CONFIG_TOTAL_LEN  (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN + TUD_VENDOR_DESC_LEN)
 
 #define EPNUM_CDC_NOTIF   0x81
 #define EPNUM_CDC_OUT     0x02
 #define EPNUM_CDC_IN      0x82
+#define EPNUM_VENDOR_OUT  0x03
+#define EPNUM_VENDOR_IN   0x83
 
 uint8_t const desc_fs_configuration[] = {
     // Config number, interface count, string index, total length, attribute, power in mA
     TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL, 0, CONFIG_TOTAL_LEN, 0x00, 100),
 
     // Interface number, string index, EP Out & EP In address, EP size
     TUD_CDC_DESCRIPTOR(ITF_NUM_CDC, 4, EPNUM_CDC_NOTIF, 8, EPNUM_CDC_OUT, EPNUM_CDC_IN, 64),
+
+    // Interface number, string index, EP Out & EP In address, EP size
+    TUD_VENDOR_DESCRIPTOR(ITF_NUM_VENDOR, 5, EPNUM_VENDOR_OUT, EPNUM_VENDOR_IN, 64),
 };
 
 #if TUD_OPT_HIGH_SPEED
@@ -73,6 +79,9 @@ uint8_t const desc_hs_configuration[] = {
 
     // Interface number, string index, EP Out & EP In address, EP size
     TUD_CDC_DESCRIPTOR(ITF_NUM_CDC, 4, EPNUM_CDC_NOTIF, 8, EPNUM_CDC_OUT, EPNUM_CDC_IN, 512),
+
+    // Interface number, string index, EP Out & EP In address, EP size
+    TUD_VENDOR_DESCRIPTOR(ITF_NUM_VENDOR, 5, EPNUM_VENDOR_OUT, EPNUM_VENDOR_IN, 1024),
 };
 #endif
 
@@ -102,6 +111,8 @@ char const* string_desc_arr [] =
         "FOSDEM",               // 1: Manufacturer
         "Krab controller",      // 2: Product
         "123456",               // 3: Serials, should use chip ID
+	"Serial port",
+	"Vendor port",
     };
 
 static uint16_t _desc_str[32];