Don't enforce silent output on submake - pass down the value set by the user implicit...

[pub/USBasp.git] / Demos / Host / LowLevel / MassStorageHost / ConfigDescriptor.h

diff --git a/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.h b/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.h
index d757891..eb0746b 100644 (file)
--- a/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.h
+++ b/Demos/Host/LowLevel/MassStorageHost/ConfigDescriptor.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2012.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -38,9 +38,9 @@
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>

-               
+

                #include "MassStorageHost.h"
                #include "MassStorageHost.h"

-               
+

        /* Macros: */
                /** Interface Class value for the Mass Storage Device class. */
                #define MASS_STORE_CLASS               0x08
        /* Macros: */
                /** Interface Class value for the Mass Storage Device class. */
                #define MASS_STORE_CLASS               0x08


@@ -51,11 +51,11 @@
                /** Interface Protocol value for the Bulk Only transport protocol. */
                #define MASS_STORE_PROTOCOL            0x50
 
                /** Interface Protocol value for the Bulk Only transport protocol. */
                #define MASS_STORE_PROTOCOL            0x50
 

-               /** Pipe number of the Mass Storage data IN pipe. */
-               #define MASS_STORE_DATA_IN_PIPE        1
+               /** Pipe address of the Mass Storage data IN pipe. */
+               #define MASS_STORE_DATA_IN_PIPE        (PIPE_DIR_IN  | 1)

 
 

-               /** Pipe number of the Mass Storage data OUT pipe. */
-               #define MASS_STORE_DATA_OUT_PIPE       2
+               /** Pipe address of the Mass Storage data OUT pipe. */
+               #define MASS_STORE_DATA_OUT_PIPE       (PIPE_DIR_OUT | 2)

 
        /* Enums: */
                /** Enum for the possible return codes of the \ref ProcessConfigurationDescriptor() function. */
 
        /* Enums: */
                /** Enum for the possible return codes of the \ref ProcessConfigurationDescriptor() function. */


@@ -67,11 +67,12 @@
                        InvalidConfigDataReturned       = 3, /**< The device returned an invalid Configuration Descriptor */
                        NoCompatibleInterfaceFound      = 4, /**< A compatible interface with the required endpoints was not found */
                };
                        InvalidConfigDataReturned       = 3, /**< The device returned an invalid Configuration Descriptor */
                        NoCompatibleInterfaceFound      = 4, /**< A compatible interface with the required endpoints was not found */
                };

-               
+

        /* Function Prototypes: */
        /* Function Prototypes: */

-               uint8_t ProcessConfigurationDescriptor(void);   
+               uint8_t ProcessConfigurationDescriptor(void);

 
                uint8_t DComp_NextMSInterface(void* CurrentDescriptor);
                uint8_t DComp_NextMSInterfaceBulkDataEndpoint(void* CurrentDescriptor);
 
                uint8_t DComp_NextMSInterface(void* CurrentDescriptor);
                uint8_t DComp_NextMSInterfaceBulkDataEndpoint(void* CurrentDescriptor);

-               
+

 #endif
 #endif

+