Remove obsolete macros and preprocessor checks from the AVRISP-MKII project's V2Proto...

[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 b595564..ef093d6 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Device.h
+++ b/LUFA/Drivers/USB/LowLevel/Device.h
@@ -50,11 +50,13 @@
 #define __USBDEVICE_H__
 
        /* Includes: */
 #define __USBDEVICE_H__
 
        /* Includes: */

+               #include <avr/io.h>

                #include <avr/pgmspace.h>
                #include <avr/eeprom.h>
 
                #include "../../../Common/Common.h"     
                #include "../HighLevel/StdDescriptors.h"
                #include <avr/pgmspace.h>
                #include <avr/eeprom.h>
 
                #include "../../../Common/Common.h"     
                #include "../HighLevel/StdDescriptors.h"

+               #include "USBInterrupt.h"

                #include "Endpoint.h"
 
        /* Preprocessor Checks: */
                #include "Endpoint.h"
 
        /* Preprocessor Checks: */


@@ -98,28 +100,15 @@
                         *        issued if the host is currently allowing remote wakeup events from the device (i.e.,
                         *        the \ref USB_RemoteWakeupEnabled flag is set). When the NO_DEVICE_REMOTE_WAKEUP compile
                         *        time option is used, this macro is unavailable.
                         *        issued if the host is currently allowing remote wakeup events from the device (i.e.,
                         *        the \ref USB_RemoteWakeupEnabled flag is set). When the NO_DEVICE_REMOTE_WAKEUP compile
                         *        time option is used, this macro is unavailable.

+                        *        \n
+                        *
+                        *  \note The USB clock must be running for this function to operate. If the stack is initialized with
+                        *        the \ref USB_OPT_MANUAL_PLL option enabled, the user must ensure that the PLL is running
+                        *        before attempting to call this function.

                         *
                         *  \see \ref Group_Descriptors for more information on the RMWAKEUP feature and device descriptors.
                         */
                        void USB_Device_SendRemoteWakeup(void);
                         *
                         *  \see \ref Group_Descriptors for more information on the RMWAKEUP feature and device descriptors.
                         */
                        void USB_Device_SendRemoteWakeup(void);

-                                                       
-               /* Pseudo-Function Macros: */
-                       #if defined(__DOXYGEN__)                                
-                               /** Enables the device mode Start Of Frame events. When enabled, this causes the
-                                *  \ref EVENT_USB_Device_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus,
-                                *  at the start of each USB frame when enumerated in device mode.
-                                */
-                               static inline bool USB_Device_EnableSOFEvents(void);
-                               
-                               /** Disables the device mode Start Of Frame events. When disabled, this stop the firing of the
-                                *  \ref EVENT_USB_Device_StartOfFrame() event when enumerated in device mode.
-                                */
-                               static inline bool USB_Device_DisableSOFEvents(void);
-                       #else
-                               #define USB_Device_EnableSOFEvents()    MACROS{ USB_INT_Enable(USB_INT_SOFI); }MACROE
-
-                               #define USB_Device_DisableSOFEvents()   MACROS{ USB_INT_Disable(USB_INT_SOFI); }MACROE
-                       #endif

                        
                /* Type Defines: */
                        enum USB_Device_States_t
                        
                /* Type Defines: */
                        enum USB_Device_States_t


@@ -150,6 +139,26 @@
                                                                                */
                        };
                        
                                                                                */
                        };
                        

+               /* Inline Functions: */
+                       /** Enables the device mode Start Of Frame events. When enabled, this causes the
+                        *  \ref EVENT_USB_Device_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus,
+                        *  at the start of each USB frame when enumerated in device mode.
+                        */
+                       static inline void USB_Device_EnableSOFEvents(void) ATTR_ALWAYS_INLINE;
+                       static inline void USB_Device_EnableSOFEvents(void)
+                       {
+                               USB_INT_Enable(USB_INT_SOFI);
+                       }
+                               
+                       /** Disables the device mode Start Of Frame events. When disabled, this stop the firing of the
+                        *  \ref EVENT_USB_Device_StartOfFrame() event when enumerated in device mode.
+                        */
+                       static inline void USB_Device_DisableSOFEvents(void) ATTR_ALWAYS_INLINE;
+                       static inline void USB_Device_DisableSOFEvents(void)
+                       {
+                               USB_INT_Disable(USB_INT_SOFI);
+                       }
+                       

                /* Function Prototypes: */
                        /** Function to retrieve a given descriptor's size and memory location from the given descriptor type value,
                         *  index and language ID. This function MUST be overridden in the user application (added with full, identical  
                /* Function Prototypes: */
                        /** Function to retrieve a given descriptor's size and memory location from the given descriptor type value,
                         *  index and language ID. This function MUST be overridden in the user application (added with full, identical  


@@ -176,18 +185,36 @@
                         *
                         *  \return Size in bytes of the descriptor if it exists, zero or \ref NO_DESCRIPTOR otherwise.
                         */
                         *
                         *  \return Size in bytes of the descriptor if it exists, zero or \ref NO_DESCRIPTOR otherwise.
                         */

-                       uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress
+                       uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                                           const uint8_t wIndex,
+                                                           void** const DescriptorAddress

                        #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
                                                            , uint8_t* MemoryAddressSpace
                        #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
                                                            , uint8_t* MemoryAddressSpace

-                       #endif                  
-                                                           )
-                                                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+                       #endif
+                                                           ) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

 
        /* Private Interface - For use in library only: */
        #if !defined(__DOXYGEN__)
 
        /* Private Interface - For use in library only: */
        #if !defined(__DOXYGEN__)

-               /* Macros: */           
-                       #define USB_Device_SetLowSpeed()        MACROS{ UDCON |=  (1 << LSM);   }MACROE
-                       #define USB_Device_SetFullSpeed()       MACROS{ UDCON &= ~(1 << LSM);   }MACROE
+               /* Inline Functions: */
+                       #if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
+                       static inline void USB_Device_SetLowSpeed(void) ATTR_ALWAYS_INLINE;
+                       static inline void USB_Device_SetLowSpeed(void)
+                       {
+                               UDCON |=  (1 << LSM);
+                       }
+                       
+                       static inline void USB_Device_SetFullSpeed(void) ATTR_ALWAYS_INLINE;
+                       static inline void USB_Device_SetFullSpeed(void)
+                       {
+                               UDCON &= ~(1 << LSM);
+                       }
+                       #endif
+                       
+                       static inline void USB_Device_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
+                       static inline void USB_Device_SetDeviceAddress(const uint8_t Address)
+                       {
+                               UDADDR = ((1 << ADDEN) | (Address & 0x7F));
+                       }                       

        #endif
 
 #endif
        #endif
 
 #endif