Tweak the LUFA config for the Mass Storage class bootloader to reduce the compiled...

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

diff --git a/Demos/Device/ClassDriver/Mouse/Descriptors.h b/Demos/Device/ClassDriver/Mouse/Descriptors.h
index e875462..a0a5ea9 100644 (file)
--- a/Demos/Device/ClassDriver/Mouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/Mouse/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -37,13 +37,17 @@
 #define _DESCRIPTORS_H_
 
        /* Includes: */
-               #include <LUFA/Common/Common.h>
                #include <LUFA/Drivers/USB/USB.h>
 
-               #if (ARCH == ARCH_AVR8)
-                       #include <avr/pgmspace.h>
-               #endif
-               
+               #include <avr/pgmspace.h>
+
+       /* Macros: */
+               /** Endpoint address of the Mouse HID reporting IN endpoint. */
+               #define MOUSE_EPADDR              (ENDPOINT_DIR_IN | 1)
+
+               /** Size in bytes of the Mouse HID reporting IN endpoint. */
+               #define MOUSE_EPSIZE              8
+
        /* Type Defines: */
                /** Type define for the device configuration descriptor structure. This must be defined in the
                 *  application code, as the configuration descriptor contains several sub-descriptors which
@@ -52,17 +56,12 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t Config;
+
+                       // Mouse HID Interface
                        USB_Descriptor_Interface_t            HID_Interface;
                        USB_HID_Descriptor_HID_t              HID_MouseHID;
                USB_Descriptor_Endpoint_t             HID_ReportINEndpoint;
-               } ATTR_PACKED USB_Descriptor_Configuration_t;
-
-       /* Macros: */
-               /** Endpoint number of the Mouse HID reporting IN endpoint. */
-               #define MOUSE_EPNUM               1
-
-               /** Size in bytes of the Mouse HID reporting IN endpoint. */
-               #define MOUSE_EPSIZE              8
+               } USB_Descriptor_Configuration_t;
 
        /* Function Prototypes: */
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,