clean up

Author: hathach

cores/arduino/Adafruit_TinyUSB_Core/Adafruit_USBD_Device.cpp

@@ -88,24 +88,25 @@ Adafruit_USBD_Device::Adafruit_USBD_Device(void)
   };
 
   memcpy(_desc_cfg_buffer, &dev_cfg, sizeof(tusb_desc_configuration_t));
-  _desc_cfg = _desc_cfg_buffer;
-  _desc_cfg_size = sizeof(_desc_cfg_buffer);
-  _desc_cfglen = sizeof(tusb_desc_configuration_t);
-  _itf_count = 0;
-  _epin_count = _epout_count = 1;
+  _desc_cfg        = _desc_cfg_buffer;
+  _desc_cfg_maxlen = sizeof(_desc_cfg_buffer);
+  _desc_cfg_len    = sizeof(tusb_desc_configuration_t);
 
-  _language_id = USB_LANGUAGE;
+  _itf_count    = 0;
+  _epin_count   = _epout_count = 1;
+
+  _language_id  = USB_LANGUAGE;
   _manufacturer = USB_MANUFACTURER;
-  _product = USB_PRODUCT;
+  _product      = USB_PRODUCT;
 }
 
 // Add interface descriptor
 // - Interface number will be updated to match current count
 // - Endpoint number is updated to be unique
 bool Adafruit_USBD_Device::addInterface(Adafruit_USBD_Interface& itf)
 {
-  uint8_t* desc = _desc_cfg+_desc_cfglen;
-  uint16_t const len = itf.getDescriptor(_itf_count, desc, _desc_cfg_size-_desc_cfglen);
+  uint8_t* desc = _desc_cfg+_desc_cfg_len;
+  uint16_t const len = itf.getDescriptor(_itf_count, desc, _desc_cfg_maxlen-_desc_cfg_len);
   uint8_t* desc_end = desc+len;
 
   if ( !len ) return false;
@@ -126,29 +127,29 @@ bool Adafruit_USBD_Device::addInterface(Adafruit_USBD_Interface& itf)
     desc += desc[0]; // next
   }
 
-  _desc_cfglen += len;
+  _desc_cfg_len += len;
 
   // Update configuration descriptor
   tusb_desc_configuration_t* config = (tusb_desc_configuration_t*)_desc_cfg;
-  config->wTotalLength = _desc_cfglen;
+  config->wTotalLength = _desc_cfg_len;
   config->bNumInterfaces = _itf_count;
 
   return true;
 }
 
 void Adafruit_USBD_Device::setDescriptorBuffer(uint8_t* buf, uint32_t buflen)
 {
-  if (buflen < _desc_cfg_size)
+  if (buflen < _desc_cfg_maxlen)
     return;
 
-  memcpy(buf, _desc_cfg, _desc_cfglen);
-  _desc_cfg = buf;
-  _desc_cfg_size = buflen;
+  memcpy(buf, _desc_cfg, _desc_cfg_len);
+  _desc_cfg        = buf;
+  _desc_cfg_maxlen = buflen;
 }
 
 void Adafruit_USBD_Device::setID(uint16_t vid, uint16_t pid)
 {
-  _desc_device.idVendor = vid;
+  _desc_device.idVendor  = vid;
   _desc_device.idProduct = pid;
 }
 
@@ -196,7 +197,6 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
   return USBDevice._desc_cfg;
 }
 
-
 static int utf8_to_unichar(const char *str8, int *unicharp)
 {
   int unichar;

cores/arduino/Adafruit_TinyUSB_Core/Adafruit_USBD_Device.h

@@ -39,8 +39,8 @@ class Adafruit_USBD_Device
     tusb_desc_device_t _desc_device;
 
     uint8_t  *_desc_cfg;
-    uint16_t _desc_cfg_size;
-    uint16_t _desc_cfglen;
+    uint16_t _desc_cfg_maxlen;
+    uint16_t _desc_cfg_len;
     uint8_t  _desc_cfg_buffer[256];
 
     uint8_t  _itf_count;