Change AVRISP project's timeout to be interrupt based again, but make the interrupt...

[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 27d20cf..13fb64c 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h
@@ -1,14 +1,14 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-  Copyright 2009  Matthias Hullin (lufa [at] matthias [dot] hullin [dot] net)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Matthias Hullin (lufa [at] matthias [dot] hullin [dot] net)\r

 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r


@@ -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            KeyboardInterface;\r
-                       USB_HID_Descriptor_t                  KeyboardHID;\r
-               USB_Descriptor_Endpoint_t             KeyboardEndpoint;\r
+                       USB_Descriptor_Interface_t            MS_Interface;\r
+                       USB_Descriptor_Endpoint_t             MS_DataInEndpoint;\r
+                       USB_Descriptor_Endpoint_t             MS_DataOutEndpoint;\r
+                       USB_Descriptor_Interface_t            HID_KeyboardInterface;\r
+                       USB_HID_Descriptor_t                  HID_KeyboardHID;\r
+               USB_Descriptor_Endpoint_t             HID_ReportINEndpoint;\r

                } USB_Descriptor_Configuration_t;\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