Combined page and word ISP programming mode code in the AVRISP-MKII clone project...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / MassStorage.h

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.h b/LUFA/Drivers/USB/Class/Host/MassStorage.h
index f375f32..5779a47 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.h
@@ -3,7 +3,7 @@
      Copyright (C) Dean Camera, 2010.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
@@ -131,6 +131,7 @@
                                MS_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully. */
                                MS_ENUMERROR_InvalidConfigDescriptor    = 1, /**< The device returned an invalid Configuration Descriptor. */
                                MS_ENUMERROR_NoCompatibleInterfaceFound = 2, /**< A compatible Mass Storage interface was not found in the device's Configuration Descriptor. */
+                               MS_ENUMERROR_PipeConfigurationFailed    = 3, /**< One or more pipes for the specified interface could not be configured correctly. */
                        };
 
                /* Function Prototypes: */
@@ -313,17 +314,7 @@
        /* Private Interface - For use in library only: */
        #if !defined(__DOXYGEN__)
                /* Macros: */
-                       #define MASS_STORE_CLASS               0x08
-                       #define MASS_STORE_SUBCLASS            0x06
-                       #define MASS_STORE_PROTOCOL            0x50
-
-                       #define CBW_SIGNATURE                  0x43425355UL
-                       #define CSW_SIGNATURE                  0x53425355UL
-
-                       #define COMMAND_DIRECTION_DATA_OUT     (0 << 7)
-                       #define COMMAND_DIRECTION_DATA_IN      (1 << 7)
-
-                       #define COMMAND_DATA_TIMEOUT_MS        10000
+                       #define MS_COMMAND_DATA_TIMEOUT_MS        10000
 
                /* Function Prototypes: */
                        #if defined(__INCLUDE_FROM_MASSSTORAGE_HOST_C)