Minor documentation enhancements.

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

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
index e664996..b0d8f5a 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
@@ -8,7 +8,6 @@
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)

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


@@ -52,10 +51,10 @@
                {
                        USB_Descriptor_Configuration_Header_t Config;
                        USB_Descriptor_Interface_t            HID1_KeyboardInterface;
                {
                        USB_Descriptor_Configuration_Header_t Config;
                        USB_Descriptor_Interface_t            HID1_KeyboardInterface;

-                       USB_HID_Descriptor_t                  HID1_KeyboardHID;
+                       USB_HID_Descriptor_HID_t              HID1_KeyboardHID;

                USB_Descriptor_Endpoint_t             HID1_ReportINEndpoint;
                        USB_Descriptor_Interface_t            HID2_MouseInterface;
                USB_Descriptor_Endpoint_t             HID1_ReportINEndpoint;
                        USB_Descriptor_Interface_t            HID2_MouseInterface;

-                       USB_HID_Descriptor_t                  HID2_MouseHID;
+                       USB_HID_Descriptor_HID_t              HID2_MouseHID;

                USB_Descriptor_Endpoint_t             HID2_ReportINEndpoint;
                } USB_Descriptor_Configuration_t;
                                        
                USB_Descriptor_Endpoint_t             HID2_ReportINEndpoint;
                } USB_Descriptor_Configuration_t;
                                        


@@ -70,7 +69,9 @@
                #define HID_EPSIZE                8
 
        /* Function Prototypes: */
                #define HID_EPSIZE                8
 
        /* Function Prototypes: */

-               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,
+                                                   const void** const DescriptorAddress)

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