Revert changes made for the partial port to the AVR32 architecture.

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / Device.h

diff --git a/LUFA/Drivers/USB/LowLevel/Device.h b/LUFA/Drivers/USB/LowLevel/Device.h
index c1a1d92..1f929bf 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Device.h
+++ b/LUFA/Drivers/USB/LowLevel/Device.h
@@ -41,11 +41,9 @@
 #define __USBDEVICE_H__\r
 \r
        /* Includes: */\r
 #define __USBDEVICE_H__\r
 \r
        /* Includes: */\r

-               #if defined(__AVR__)\r
-                       #include <avr/pgmspace.h>\r
-                       #include <avr/eeprom.h>\r
-               #endif\r
-               \r
+               #include <avr/pgmspace.h>\r
+               #include <avr/eeprom.h>\r
+\r

                #include "../../../Common/Common.h"     \r
                #include "../HighLevel/StdDescriptors.h"\r
                #include "Endpoint.h"\r
                #include "../../../Common/Common.h"     \r
                #include "../HighLevel/StdDescriptors.h"\r
                #include "Endpoint.h"\r


@@ -56,13 +54,12 @@
                #endif\r
 \r
                #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
                #endif\r
 \r
                #if !defined(__INCLUDE_FROM_USB_DRIVER)\r

-                       #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB.h instead.\r

                #endif\r
                        \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                #endif\r
                        \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r

-                       #if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) || \\r
-                            defined(USB_SERIES_UC3B_AVR) || defined(__DOXYGEN__))\r
+                       #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) || defined(__DOXYGEN__)\r

                                /** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the\r
                                 *  USB interface should be initialized in low speed (1.5Mb/s) mode.\r
                                 *\r
                                /** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the\r
                                 *  USB interface should be initialized in low speed (1.5Mb/s) mode.\r
                                 *\r


@@ -71,13 +68,13 @@
                                 *  \note Restrictions apply on the number, size and type of endpoints which can be used\r
                                 *        when running in low speed mode -- refer to the USB 2.0 standard.\r
                                 */\r
                                 *  \note Restrictions apply on the number, size and type of endpoints which can be used\r
                                 *        when running in low speed mode -- refer to the USB 2.0 standard.\r
                                 */\r

-                               #define USB_DEVICE_OPT_LOWSPEED       (1 << 0)\r
+                               #define USB_DEVICE_OPT_LOWSPEED            (1 << 0)\r

                        #endif\r
                        \r
                        /** Mask for the Options parameter of the USB_Init() function. This indicates that the\r
                         *  USB interface should be initialized in full speed (12Mb/s) mode.\r
                         */\r
                        #endif\r
                        \r
                        /** Mask for the Options parameter of the USB_Init() function. This indicates that the\r
                         *  USB interface should be initialized in full speed (12Mb/s) mode.\r
                         */\r

-                       #define USB_DEVICE_OPT_FULLSPEED          (0 << 0)\r
+                       #define USB_DEVICE_OPT_FULLSPEED               (0 << 0)\r

                        \r
                /* Pseudo-Function Macros: */\r
                        #if defined(__DOXYGEN__)\r
                        \r
                /* Pseudo-Function Macros: */\r
                        #if defined(__DOXYGEN__)\r


@@ -132,25 +129,16 @@
                                 */\r
                                static inline bool USB_Device_DisableSOFEvents(void);\r
                        #else\r
                                 */\r
                                static inline bool USB_Device_DisableSOFEvents(void);\r
                        #else\r

-                               #if defined(__AVR32__)\r
-                                       #if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
-                                               #define USB_Device_SendRemoteWakeup()   MACROS{ AVR32_USBB.UDCON.rmwkup = true; }MACROE\r
-\r
-                                               #define USB_Device_IsRemoteWakeupSent()         AVR32_USBB.UDCON.rmwkup\r
-                                       #endif\r
-                                       \r
-                                       #define USB_Device_IsUSBSuspended()                 AVR32_USBB.UDINT.susp                                       \r
-                               #elif defined(__AVR__)\r
-                                       #if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
-                                               #define USB_Device_SendRemoteWakeup()   MACROS{ UDCON |= (1 << RMWKUP); }MACROE\r
+                               #if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
+                                       #define USB_Device_SendRemoteWakeup()   MACROS{ UDCON |= (1 << RMWKUP); }MACROE\r

 \r
 \r

-                                               #define USB_Device_IsRemoteWakeupSent()       ((UDCON &  (1 << RMWKUP)) ? false : true)\r
-                                       #endif\r
-                                       \r
-                                       #define USB_Device_IsUSBSuspended()               ((UDINT & (1 << SUSPI)) ? true : false)\r
+                                       #define USB_Device_IsRemoteWakeupSent()       ((UDCON &  (1 << RMWKUP)) ? false : true)\r

                                #endif\r
                                #endif\r

-\r
+                               \r
+                               #define USB_Device_IsUSBSuspended()           ((UDINT &  (1 << SUSPI)) ? true : false)\r
+                               \r

                                #define USB_Device_EnableSOFEvents()    MACROS{ USB_INT_Enable(USB_INT_SOFI); }MACROE\r
                                #define USB_Device_EnableSOFEvents()    MACROS{ USB_INT_Enable(USB_INT_SOFI); }MACROE\r

+\r

                                #define USB_Device_DisableSOFEvents()   MACROS{ USB_INT_Disable(USB_INT_SOFI); }MACROE\r
                        #endif\r
                        \r
                                #define USB_Device_DisableSOFEvents()   MACROS{ USB_INT_Disable(USB_INT_SOFI); }MACROE\r
                        #endif\r
                        \r


@@ -219,17 +207,8 @@
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Macros: */           \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Macros: */           \r

-                       #if defined(__AVR32__)\r
-                               #define USB_Device_SetLowSpeed()          MACROS{ AVR32_USBB.UDCON.ls = true;  }MACROE\r
-                               #define USB_Device_SetFullSpeed()         MACROS{ AVR32_USBB.UDCON.ls = false; }MACROE\r
-                               \r
-                               #define USB_Device_SetDeviceAddress(addr) MACROS{ AVR32_USBB.UDCON.uadd = DeviceAddress; AVR32_USBB.UDCON.adden = true; }MACROE                 \r
-                       #elif defined(__AVR__)\r
-                               #define USB_Device_SetLowSpeed()          MACROS{ UDCON |=  (1 << LSM);   }MACROE\r
-                               #define USB_Device_SetFullSpeed()         MACROS{ UDCON &= ~(1 << LSM);   }MACROE\r
-                               \r
-                               #define USB_Device_SetDeviceAddress(addr) MACROS{ UDADDR =  ((1 << ADDEN) | DeviceAddress); }MACROE\r
-                       #endif\r
+                       #define USB_Device_SetLowSpeed()        MACROS{ UDCON |=  (1 << LSM);   }MACROE\r
+                       #define USB_Device_SetFullSpeed()       MACROS{ UDCON &= ~(1 << LSM);   }MACROE\r

        #endif\r
 \r
 #endif\r
        #endif\r
 \r
 #endif\r