Fixed auto-reset not working with some versions of Windows, other fixups

Author: mattairtech

cores/arduino/USB/USBCore.cpp

@@ -635,10 +635,6 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 	uint32_t written = 0;
 	uint32_t length = 0;
 
-	// if len is a multiple of EPX_SIZE an ZLP needs to be sent
-	// to indicate end of transfer
-	bool sendZlp = (len % EPX_SIZE) == 0;
-
 	if (!_usbConfiguration)
 		return -1;
 	if (len > 16384)
@@ -652,7 +648,7 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 #endif
 
 	// Flash area
-	while (len != 0 || sendZlp)
+	while (len != 0)
 	{
 		if (usbd.epBank1IsReady(ep)) {
 			// previous transfer is still not complete
@@ -697,12 +693,6 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 
 		written += length;
 		len -= length;
-		
-		if (len == 0 && sendZlp) {
-			// empty transfer sent
-			sendZlp = false;
-		}
-
 		data = (char *)data + length;
 	}
 	return written;

cores/arduino/USB/USBCore.h

@@ -262,7 +262,7 @@ typedef struct
 _Pragma("pack()")
 
 #define D_DEVICE(_class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs) \
-	{ 18, 1, 0x200, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
+	{ 18, 1, 0x110, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
 /* Table 9-8. Standard Device Descriptor
  * bLength, bDescriptorType, bcdUSB, bDeviceClass, bDeviceSubClass, bDeviceProtocol, bMaxPacketSize0,
  *    idVendor, idProduct, bcdDevice, iManufacturer, iProduct, iSerialNumber, bNumConfigurations */

cores/arduino/USB/samd21_host.h

@@ -25,9 +25,11 @@ extern "C" {
 
 extern __attribute__((__aligned__(4))) volatile UsbHostDescriptor usb_pipe_table[USB_EPT_NUM];
 
+#ifndef USB_HOST_PINTFLAG_TRCPT_Pos
 #define USB_HOST_PINTFLAG_TRCPT_Pos 0            /**< \brief (USB_HOST_PINTFLAG) Transfer Complete 0/1 Interrupt Flag */
 #define USB_HOST_PINTFLAG_TRCPT_Msk (0x3u << USB_HOST_PINTFLAG_TRCPT_Pos)
 #define USB_HOST_PINTFLAG_TRCPT(value) ((USB_HOST_PINTFLAG_TRCPT_Msk & ((value) << USB_HOST_PINTFLAG_TRCPT_Pos)))
+#endif
 
 #define  USB_EP_DIR_IN        0x80  // USB_SETUP_DEVICE_TO_HOST
 #define  USB_EP_DIR_OUT       0x00  // USB_SETUP_HOST_TO_DEVICE

cores/arduino/startup.c

@@ -172,7 +172,7 @@ void SystemInit( void )
    */
 
 #if ((HS_CRYSTAL_FREQUENCY_HERTZ < 400000UL) || (HS_CRYSTAL_FREQUENCY_HERTZ > 32000000UL))
-  #error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be between 4000000UL and 32000000UL"
+  #error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be between 400000UL and 32000000UL"
 #endif
 
 #if defined(PLL_FAST_STARTUP)