Fixing USB compliance issues

- Incorrectly set power attributes (conflicting settings for bus powered
and self powered)
- Set the correct power rating for firmware and bootloader
- Added udd_ack_setup_received to sam stalls
  * Was missing a packet, which caused SETUP packets which received a
  stall to hang and fail the next test

Fixes Issue #311

Author: haata

Diff for: Lib/ASF/config/conf_usb.h

@@ -49,10 +49,7 @@
 #define  USB_DEVICE_VENDOR_ID             VENDOR_ID
 #define  USB_DEVICE_PRODUCT_ID            PRODUCT_ID
 #define  USB_DEVICE_VERSION               BCD_VERSION
-#define  USB_DEVICE_POWER                 100 // Consumption on Vbus line (mA)
-#define  USB_DEVICE_ATTR                  (USB_CONFIG_ATTR_REMOTE_WAKEUP|USB_CONFIG_ATTR_SELF_POWERED)
-//	(USB_CONFIG_ATTR_REMOTE_WAKEUP|USB_CONFIG_ATTR_BUS_POWERED)
-//	(USB_CONFIG_ATTR_BUS_POWERED)
+#define  USB_DEVICE_ATTR                  (USB_CONFIG_ATTR_REMOTE_WAKEUP|USB_CONFIG_ATTR_BUS_POWERED)
 
 #ifdef USB_Priority_define
 #define UDD_USB_INT_LEVEL USB_Priority_define
@@ -149,6 +146,7 @@ extern bool main_extra_string();
 #define USB_DEVICE_SPECIFIC_REQUEST udi_dfu_atmel_setup
 #define UDC_GET_EXTRA_STRING() main_extra_string()
 #define USB_DEVICE_MAX_EP 1
+#define  USB_DEVICE_POWER                 100 // Consumption on Vbus line (mA)
 #include "udi_dfu_atmel_conf.h"
 
 // ===== Firmware =====
@@ -163,6 +161,7 @@ extern bool main_extra_string();
 #define  UDC_SOF_EVENT()                  usb_sof_event()
 #define USB_DEVICE_SPECIFIC_REQUEST my_udi_hid_setup
 #define USB_CONFIGURATION_CHANGED usb_set_configuration
+#define  USB_DEVICE_POWER                 500 // Consumption on Vbus line (mA)
 
 #endif
 

Diff for: Output/USB/arm/usb_dev.c

@@ -209,6 +209,9 @@ static void endpoint0_stall()
 #if defined(_kinetis_)
 	USB0_ENDPT0 = USB_ENDPT_EPSTALL | USB_ENDPT_EPRXEN | USB_ENDPT_EPTXEN | USB_ENDPT_EPHSHK;
 #elif defined(_sam_)
+	// XXX (HaaTa): Only for setup packets (must ack received packet before stalling)
+	udd_ack_setup_received( 0 );
+
 	udd_ctrl_stall_data();
 #endif
 }