Fixed native USB serial port not appearing on Mac OS X 10.6.8.

bitron · bitron · commit 3e9ef444018f · 2012-10-18T21:42:16.000+02:00
diff --git a/hardware/arduino/sam/cores/arduino/USB/USBCore.cpp b/hardware/arduino/sam/cores/arduino/USB/USBCore.cpp
@@ -385,11 +385,14 @@ static bool USBD_SendDescriptor(Setup& setup)
 	if (USB_DEVICE_DESCRIPTOR_TYPE == t)
 	{
 		TRACE_CORE(puts("=> USBD_SendDescriptor : USB_DEVICE_DESCRIPTOR_TYPE\r\n");)
-		if (setup.wLength == 8)
+		if (setup.wLength >= 8)
 		{
 			_cdcComposite = 1;
 		}
 		desc_addr = _cdcComposite ?  (const uint8_t*)&USB_DeviceDescriptorA : (const uint8_t*)&USB_DeviceDescriptor;
+        if( *desc_addr > setup.wLength ) {
+            desc_length = setup.wLength;
+        }
 	}
 	else if (USB_STRING_DESCRIPTOR_TYPE == t)
 	{

Original file line number	Diff line number	Diff line change
`@@ -385,11 +385,14 @@ static bool USBD_SendDescriptor(Setup& setup)`
`385`	`385`	`if (USB_DEVICE_DESCRIPTOR_TYPE == t)`
`386`	`386`	`{`
`387`	`387`	`TRACE_CORE(puts("=> USBD_SendDescriptor : USB_DEVICE_DESCRIPTOR_TYPE\r\n");)`
`388`		`- if (setup.wLength == 8)`
	`388`	`+ if (setup.wLength >= 8)`
`389`	`389`	`{`
`390`	`390`	`_cdcComposite = 1;`
`391`	`391`	`}`
`392`	`392`	`desc_addr = _cdcComposite ? (const uint8_t)&USB_DeviceDescriptorA : (const uint8_t)&USB_DeviceDescriptor;`
	`393`	`+ if( *desc_addr > setup.wLength ) {`
	`394`	`+ desc_length = setup.wLength;`
	`395`	`+ }`
`393`	`396`	`}`
`394`	`397`	`else if (USB_STRING_DESCRIPTOR_TYPE == t)`
`395`	`398`	`{`