add auto endpoint number

Author: hathach

cores/nRF5/usb/Adafruit_USBDevice.cpp

@@ -127,12 +127,15 @@ Adafruit_USBDevice::Adafruit_USBDevice(void)
 
   _desc_cfglen = sizeof(tusb_desc_configuration_t);
   _itf_count = 0;
+  _epin_count = _epout_count = 1;
 
   tud_desc_set.config = _desc_cfg;
   tud_desc_set.device = &_desc_device;
 }
 
-// Add interface descriptor, interface number will be updated to match current count
+// Add interface descriptor
+// - Interface number will be updated to match current count
+// - Endpoint number is updated to be unique
 bool Adafruit_USBDevice::addInterface(Adafruit_USBInterface& itf)
 {
   uint8_t* desc = _desc_cfg+_desc_cfglen;
@@ -155,6 +158,10 @@ bool Adafruit_USBDevice::addInterface(Adafruit_USBInterface& itf)
     {
       // No alternate interface support
       ((tusb_desc_interface_t*) desc)->bInterfaceNumber = _itf_count++;
+    }else if (desc[1] == TUSB_DESC_ENDPOINT)
+    {
+      tusb_desc_endpoint_t* desc_ep = (tusb_desc_endpoint_t*) desc;
+      desc_ep->bEndpointAddress |= (desc_ep->bEndpointAddress & 0x80) ? _epin_count++ : _epout_count++;
     }
 
     if (desc[0] == 0) return false;

cores/nRF5/usb/Adafruit_USBDevice.h

@@ -43,6 +43,9 @@ class Adafruit_USBDevice
 
     uint8_t  _itf_count;
 
+    uint8_t  _epin_count;
+    uint8_t  _epout_count;
+
   public:
     Adafruit_USBDevice(void);
 

cores/nRF5/usb/USBSerial.cpp

@@ -27,6 +27,9 @@
 #include "Arduino.h"
 #include "tusb.h"
 
+#define EPOUT   0x00
+#define EPIN    0x80
+
 USBSerial Serial;
 
 USBSerial::USBSerial(void)
@@ -37,8 +40,7 @@ USBSerial::USBSerial(void)
 uint16_t USBSerial::getDescriptor(uint8_t* buf, uint16_t bufsize)
 {
   // CDC is mostly always existed for DFU
-  // Let's pick EP 1 & 2 for it
-  uint8_t desc[] = { TUD_CDC_DESCRIPTOR(0, 0, 0x81, 8, 0x02, 0x82, 64) };
+  uint8_t desc[] = { TUD_CDC_DESCRIPTOR(0, 0, EPIN, 8, EPOUT, EPIN, 64) };
   uint16_t const len = sizeof(desc);
 
   if ( bufsize < len ) return 0;

cores/nRF5/usb/tusb_config.h

@@ -61,12 +61,7 @@
 #define CFG_TUD_CDC                 1
 
 // disable msc for feather nrf52840 for now until have a more stable QSPI driver
-#ifdef ARDUINO_NRF52840_FEATHER
-#define CFG_TUD_MSC                 0
-#else
 #define CFG_TUD_MSC                 1
-#endif
-
 
 #define CFG_TUD_HID                 0
 #define CFG_TUD_HID_KEYBOARD        0
@@ -97,11 +92,6 @@
 // Buffer size of Device Mass storage
 #define CFG_TUD_MSC_BUFSIZE         512
 
-// Number of Blocks
-#include <stdint.h>
-extern uint32_t flash_qspi_size (void);
-#define CFG_TUD_MSC_BLOCK_NUM       (flash_qspi_size() / CFG_TUD_MSC_BLOCK_SZ)
-
 // Block size
 #define CFG_TUD_MSC_BLOCK_SZ        512
 

cores/nRF5/usb/usb_msc_flash.c

@@ -96,7 +96,7 @@ int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buf
 
 // Callback invoked when received WRITE10 command.
 // Process data in buffer to disk's storage and return number of written bytes
-int32_t tud_msc_write10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize)
+int32_t tud_msc_write10_cb (uint8_t lun, uint32_t lba, uint32_t offset, uint8_t* buffer, uint32_t bufsize)
 {
   (void) lun;
 
@@ -119,5 +119,13 @@ void tud_msc_write10_complete_cb (uint8_t lun)
   flash_qspi_flush();
 }
 
+void tud_msc_capacity_cb(uint8_t lun, uint32_t* block_count, uint16_t* block_size)
+{
+  (void) lun;
+
+  *block_count = flash_qspi_size() / CFG_TUD_MSC_BLOCK_SZ;
+  *block_size  = CFG_TUD_MSC_BUFSIZE;
+}
+
 #endif // CFG_TUD_MSC
 #endif // nrf52840

libraries/Adafruit_USB_MSC/Adafruit_USBDev_MSC.cpp renamed to libraries/Adafruit_USBDev_MSC/Adafruit_USBDev_MSC.cpp

@@ -24,16 +24,17 @@
 
 #include "Adafruit_USBDev_MSC.h"
 
-Adafruit_USBDev_MSC::Adafruit_USBDev_MSC(uint8_t epout, uint8_t epin, uint16_t epsize)
+#define EPOUT   0x00
+#define EPIN    0x80
+#define EPSIZE  64  // TODO must be 512 for highspeed device
+
+Adafruit_USBDev_MSC::Adafruit_USBDev_MSC(void)
 {
-  _epout = epout;
-  _epin = epin;
-  _epsize = epsize;
 }
 
 uint16_t Adafruit_USBDev_MSC::getDescriptor(uint8_t* buf, uint16_t bufsize)
 {
-  uint8_t desc[] = { TUD_MSC_DESCRIPTOR(0, 0, _epout, _epin, _epsize) };
+  uint8_t desc[] = { TUD_MSC_DESCRIPTOR(0, 0, EPOUT, EPIN, EPSIZE) };
   uint16_t const len = sizeof(desc);
 
   if ( bufsize < len ) return 0;

libraries/Adafruit_USB_MSC/Adafruit_USBDev_MSC.h renamed to libraries/Adafruit_USBDev_MSC/Adafruit_USBDev_MSC.h

@@ -30,10 +30,9 @@
 class Adafruit_USBDev_MSC : Adafruit_USBInterface
 {
   private:
-    uint16_t _epsize;
-    uint8_t _epout, _epin;
+
   public:
-    Adafruit_USBDev_MSC(uint8_t epout, uint8_t epin, uint16_t epsize);
+    Adafruit_USBDev_MSC(void);
 
     void begin(void);