diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-09-28 13:24:08 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-09-28 13:24:08 +0000 |
| commit | 3223786c49335e732ed5719510c24b4c50ff8b46 (patch) | |
| tree | f838dbe60040a442783151f5a708c59545bcd0f6 /LUFA | |
| parent | 77dbfd3cc44b91ea04990c65f3de70267ceb2460 (diff) | |
| download | lufa-3223786c49335e732ed5719510c24b4c50ff8b46.tar.gz lufa-3223786c49335e732ed5719510c24b4c50ff8b46.tar.bz2 lufa-3223786c49335e732ed5719510c24b4c50ff8b46.zip | |
Fix compile error on the UC3 targets when INTERRUPT_CONTROL_ENDPOINT compile time option is used (thanks to Ian Woloschin).
Small size improvement for Little Endian devices when USB host mode is used.
Minor documentation fixes.
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/Drivers/USB/Core/HostStandardReq.c | 7 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c | 2 | ||||
| -rw-r--r-- | LUFA/ManPages/DeviceSupport.txt | 2 | ||||
| -rw-r--r-- | LUFA/ManPages/FutureChanges.txt | 1 | ||||
| -rw-r--r-- | LUFA/ManPages/LUFAPoweredProjects.txt | 1 |
5 files changed, 11 insertions, 2 deletions
diff --git a/LUFA/Drivers/USB/Core/HostStandardReq.c b/LUFA/Drivers/USB/Core/HostStandardReq.c index 5bbe5d3fd..55fee404b 100644 --- a/LUFA/Drivers/USB/Core/HostStandardReq.c +++ b/LUFA/Drivers/USB/Core/HostStandardReq.c @@ -55,12 +55,19 @@ uint8_t USB_Host_SendControlRequest(void* const BufferPtr) Pipe_Unfreeze(); + #if defined(ARCH_BIG_ENDIAN) Pipe_Write_8(USB_ControlRequest.bmRequestType); Pipe_Write_8(USB_ControlRequest.bRequest); Pipe_Write_16_LE(USB_ControlRequest.wValue); Pipe_Write_16_LE(USB_ControlRequest.wIndex); Pipe_Write_16_LE(USB_ControlRequest.wLength); + #else + uint8_t* HeaderStream = (uint8_t*)&USB_ControlRequest; + for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Request_Header_t); HeaderByte++) + Pipe_Write_Byte(*(HeaderStream++)); + #endif + Pipe_ClearSETUP(); if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_SetupSent)) != HOST_SENDCONTROL_Successful) diff --git a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c index fec007cdc..3487087a8 100644 --- a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c +++ b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c @@ -206,7 +206,7 @@ ISR(USB_GEN_vect) } #if defined(INTERRUPT_CONTROL_ENDPOINT) && defined(USB_CAN_BE_DEVICE) -ISR(USB_COM_vect, ISR_BLOCK) +ISR(USB_COM_vect) { uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint(); diff --git a/LUFA/ManPages/DeviceSupport.txt b/LUFA/ManPages/DeviceSupport.txt index 061c6aca5..b3af29b22 100644 --- a/LUFA/ManPages/DeviceSupport.txt +++ b/LUFA/ManPages/DeviceSupport.txt @@ -291,7 +291,7 @@ /** * \page Page_XMEGASupport Atmel USB XMEGA AVR (XMEGA) - * Note: <i>The XMEGA device support is currently <b>experimental</b>, and is included for preview purposes only.</i> + * Note: <i>The XMEGA device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only.</i> * * \section Sec_XMEGASupport_Devices Supported Microcontroller Models * diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt index b3527b071..83c48805b 100644 --- a/LUFA/ManPages/FutureChanges.txt +++ b/LUFA/ManPages/FutureChanges.txt @@ -29,6 +29,7 @@ * -# Make HOST_DEVICE_SETTLE_DELAY_MS a global variable that can be changed * -# Add MANDATORY_EVENT_FUNCTIONS compile time option * -# Add watchdog support to the library and apps/bootloaders + * -# Re-run USBIF test suite on all classes to formally verify operation * - Documentation/Support * -# Add detailed overviews of how each demo works * -# Add board overviews diff --git a/LUFA/ManPages/LUFAPoweredProjects.txt b/LUFA/ManPages/LUFAPoweredProjects.txt index 2a5ff2a21..ce8e8cfc7 100644 --- a/LUFA/ManPages/LUFAPoweredProjects.txt +++ b/LUFA/ManPages/LUFAPoweredProjects.txt @@ -123,6 +123,7 @@ * - Retrode, a USB Games Console Cartridge Reader: http://www.retrode.org * - SmartCardDetective, a Smart Card analysis tool: http://www.smartcarddetective.com/ * - USBTINY-MKII, an AVRISP-MKII Clone AVR Programmer: http://tom-itx.dyndns.org:81/~webpage/boards/USBTiny_Mkii/USBTiny_Mkii_index.php + * - VMeter, a USB MIDI touch strip controller: http://www.vmeter.net/ * - XMEGA Development Board, using LUFA as an On-Board Programmer: http://xmega.mattair.net/ * - Zeptoprog, a multifunction AVR programmer: http://www.mattairtech.com/index.php/featured/zeptoprog.html * |