The incomplete StandaloneProgrammer project now uses Host and Device Mass storage...

[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 55e3b82..e6baca2 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
@@ -51,7 +51,7 @@
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        #if defined(USE_SINGLE_DEVICE_CONFIGURATION)\r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        #if defined(USE_SINGLE_DEVICE_CONFIGURATION)\r

-                               #define TOTAL_NUM_CONFIGURATIONS           1\r
+                               #define FIXED_NUM_CONFIGURATIONS           1\r

                        #endif\r
        \r
                /* Enums: */\r
                        #endif\r
        \r
                /* Enums: */\r


@@ -113,7 +113,7 @@
                #endif\r
        \r
                /* Function Prototypes: */\r
                #endif\r
        \r
                /* Function Prototypes: */\r

-                       void USB_Device_ProcessControlPacket(void);\r
+                       void USB_Device_ProcessControlRequest(void);\r

                        \r
                        #if defined(INCLUDE_FROM_DEVCHAPTER9_C)\r
                                static void USB_Device_SetAddress(void);\r
                        \r
                        #if defined(INCLUDE_FROM_DEVCHAPTER9_C)\r
                                static void USB_Device_SetAddress(void);\r


@@ -124,6 +124,7 @@
                                static void USB_Device_ClearSetFeature(void);\r
                                \r
                                #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
                                static void USB_Device_ClearSetFeature(void);\r
                                \r
                                #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r

+                                       static char USB_Device_NibbleToASCII(uint8_t Nibble) ATTR_ALWAYS_INLINE;\r

                                        static void USB_Device_GetInternalSerialDescriptor(void);\r
                                #endif                          \r
                        #endif\r
                                        static void USB_Device_GetInternalSerialDescriptor(void);\r
                                #endif                          \r
                        #endif\r