Minor correction to MagStripe demo to fix build problems.

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

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
index 5e1772a..fdef727 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
@@ -28,14 +28,6 @@
   this software.\r
 */\r
 \r
-/** \file\r
- *\r
- *  Module for device mode request processing. This module allows for the processing of standard control\r
- *  requests to the default control endpoint while in device mode.\r
- *\r
- *  \see Chapter 9 of the USB 2.0 specification.\r
- */\r
-\r
 #ifndef __DEVCHAPTER9_H__\r
 #define __DEVCHAPTER9_H__\r
 \r
@@ -43,18 +35,20 @@
                #include <avr/io.h>\r
                #include <avr/pgmspace.h>\r
                #include <avr/eeprom.h>\r
+               #include <avr/boot.h>\r
                \r
                #include "../HighLevel/StdDescriptors.h"\r
                #include "../HighLevel/Events.h"\r
+               #include "../HighLevel/StdRequestType.h"\r
+               #include "../HighLevel/USBTask.h"\r
                #include "LowLevel.h"\r
-               #include "StdRequestType.h"\r
 \r
        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
                        extern "C" {\r
                #endif\r
 \r
-       /* Public Interface - May be used in end-application: */\r
+       /* Public Interface - May be used in end-application: */                        \r
                /* Global Variables: */\r
                        /** Indicates the currently set configuration number of the device. USB devices may have several\r
                         *  different configurations which the host can select between; this indicates the currently selected\r
@@ -66,6 +60,8 @@
                         *\r
                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r
+                        *\r
+                        *  \ingroup Group_Device\r
                         */\r
                        extern uint8_t USB_ConfigurationNumber;\r
                        \r
@@ -74,37 +70,18 @@
                         *\r
                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r
+                        *\r
+                        *  \ingroup Group_Device\r
                         */\r
                        extern bool USB_RemoteWakeupEnabled;\r
                        \r
                        /** Indicates if the device is currently being powered by its own power supply, rather than being\r
                         *  powered by the host's USB supply. This flag should remain cleared if the device does not\r
                         *  support self powered mode, as indicated in the device descriptors.\r
-                        */\r
-                       extern bool USB_CurrentlySelfPowered;\r
-\r
-               /* Throwable Events: */\r
-                       /** This module raises the USB_UnhandledControlPacket event when a request to the default control\r
-                        *  endpoint has been received, but the library does not implement an internal handler for it.\r
                         *\r
-                        *  \see Events.h for more information on this event.\r
+                        *  \ingroup Group_Device\r
                         */\r
-                       RAISES_EVENT(USB_UnhandledControlPacket);\r
-\r
-                       /** This module raises the USB_ConfigurationChanged event when the host issues a REQ_SetConfiguration\r
-                        *  device request, to change the currently selected configuration number.\r
-                        *\r
-                        *  \see Events.h for more information on this event.\r
-                        */\r
-                       RAISES_EVENT(USB_ConfigurationChanged);\r
-\r
-                       /** This module raises the USB_DeviceEnumerationComplete event when the host has completed its\r
-                        *  enumeration of the device (i.e. when a REQ_SetConfiguration request changes the current configuration\r
-                        *  number from 0 to a non-zero value).\r
-                        *\r
-                        *  \see Events.h for more information on this event.\r
-                        */\r
-                       RAISES_EVENT(USB_DeviceEnumerationComplete);\r
+                       extern bool USB_CurrentlySelfPowered;\r
        \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
@@ -120,10 +97,8 @@
                                static void USB_Device_SetConfiguration(void);\r
                                static void USB_Device_GetConfiguration(void);\r
                                static void USB_Device_GetDescriptor(void);\r
-                               static void USB_Device_GetStatus(const uint8_t bmRequestType);\r
-                               #if !defined(NO_CLEARSET_FEATURE_REQUEST)\r
-                               static void USB_Device_ClearSetFeature(const uint8_t bRequest, const uint8_t bmRequestType);\r
-                               #endif\r
+                               static void USB_Device_GetStatus(void);\r
+                               static void USB_Device_ClearSetFeature(void);\r
                        #endif\r
        #endif\r
 \r