diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-24 06:58:23 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-24 06:58:23 +0000 |
commit | 071fd8ce536522ca6365580d64cd465e4c18a031 (patch) | |
tree | 604c4881c36b11f37d0203f9466d6078080847b7 /LUFA/Drivers/USB/HighLevel/USBTask.h | |
parent | a7aaa45ec4c3f415bf6073a5cc016635d5ecf77d (diff) | |
download | lufa-071fd8ce536522ca6365580d64cd465e4c18a031.tar.gz lufa-071fd8ce536522ca6365580d64cd465e4c18a031.tar.bz2 lufa-071fd8ce536522ca6365580d64cd465e4c18a031.zip |
Revert changes made for the partial port to the AVR32 architecture.
Diffstat (limited to 'LUFA/Drivers/USB/HighLevel/USBTask.h')
-rw-r--r-- | LUFA/Drivers/USB/HighLevel/USBTask.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h index f2aa03bdb..c01b84c37 100644 --- a/LUFA/Drivers/USB/HighLevel/USBTask.h +++ b/LUFA/Drivers/USB/HighLevel/USBTask.h @@ -32,15 +32,9 @@ #define __USBTASK_H__
/* Includes: */
- #if defined(__AVR32__)
- #include <avr32/io.h>
- #include <stdint.h>
- #include <stdbool.h>
- #elif defined(__AVR__)
- #include <avr/io.h>
- #include <avr/interrupt.h>
- #include <stdbool.h>
- #endif
+ #include <avr/io.h>
+ #include <avr/interrupt.h>
+ #include <stdbool.h>
#include "../LowLevel/LowLevel.h"
#include "Events.h"
@@ -63,7 +57,7 @@ /* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_USB_DRIVER)
- #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
+ #error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
#endif
/* Public Interface - May be used in end-application: */
@@ -87,7 +81,7 @@ extern USB_Request_Header_t USB_ControlRequest;
#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
- #if (!defined(__AVR32__) || !defined(HOST_STATE_AS_GPIOR)) || defined(__DOXYGEN__)
+ #if !defined(HOST_STATE_AS_GPIOR) || defined(__DOXYGEN__)
/** Indicates the current host state machine state. When in host mode, this indicates the state
* via one of the values of the \ref USB_Host_States_t enum values.
*
@@ -116,7 +110,7 @@ #endif
#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
- #if (defined(__AVR32__) || !defined(DEVICE_STATE_AS_GPIOR)) || defined(__DOXYGEN__)
+ #if !defined(DEVICE_STATE_AS_GPIOR) || defined(__DOXYGEN__)
/** Indicates the current device state machine state. When in device mode, this indicates the state
* via one of the values of the \ref USB_Device_States_t enum values.
*
|