Clean up MassStorageKeyboard demo.

[pub/USBasp.git] / Demos / Device / ClassDriver / MassStorageKeyboard / Descriptors.h

diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h
index 6904b89..c29d908 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h
@@ -44,10 +44,6 @@
                #include <LUFA/Drivers/USB/Class/MassStorage.h>\r
                #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r
                #include <LUFA/Drivers/USB/Class/MassStorage.h>\r
                #include <LUFA/Drivers/USB/Class/HID.h>\r
 \r

-               #if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)\r
-                       #warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.\r
-               #endif\r
-\r

        /* Macros: */\r
                /** Endpoint number of the Keyboard HID reporting IN endpoint. */\r
                #define KEYBOARD_EPNUM               1\r
        /* Macros: */\r
                /** Endpoint number of the Keyboard HID reporting IN endpoint. */\r
                #define KEYBOARD_EPNUM               1\r


@@ -72,22 +68,13 @@
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r

-                       USB_Descriptor_Interface_t            Interface;\r
-                       USB_Descriptor_Endpoint_t             DataInEndpoint;\r
-                       USB_Descriptor_Endpoint_t             DataOutEndpoint;\r
+                       USB_Descriptor_Interface_t            MassStorageInterface;\r
+                       USB_Descriptor_Endpoint_t             MassStorageDataInEndpoint;\r
+                       USB_Descriptor_Endpoint_t             MassStorageDataOutEndpoint;\r

                        USB_Descriptor_Interface_t            KeyboardInterface;\r
                        USB_HID_Descriptor_t                  KeyboardHID;\r
                USB_Descriptor_Endpoint_t             KeyboardEndpoint;\r
                } USB_Descriptor_Configuration_t;\r
                        USB_Descriptor_Interface_t            KeyboardInterface;\r
                        USB_HID_Descriptor_t                  KeyboardHID;\r
                USB_Descriptor_Endpoint_t             KeyboardEndpoint;\r
                } USB_Descriptor_Configuration_t;\r

-\r
-/*             typedef struct\r
-               {\r
-                       USB_Descriptor_Configuration_Header_t Config;\r
-                       USB_Descriptor_Interface_t            Interface;\r
-                       USB_HID_Descriptor_t                  KeyboardHID;\r
-               USB_Descriptor_Endpoint_t             KeyboardEndpoint;\r
-               } USB_Descriptor_Configuration_keyboard_t;\r
-// */\r

                \r
        /* Function Prototypes: */\r
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
                \r
        /* Function Prototypes: */\r
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r