Fixed broken USB_GetNextDescriptor() function causing the descriptor to jump ahead...

[pub/USBasp.git] / Demos / Host / ClassDriver / MassStorageHost / MassStorageHost.h

diff --git a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h
index a299b70..4c3539f 100644 (file)
--- a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h
@@ -30,31 +30,27 @@
 \r
 /** \file\r
  *\r
 \r
 /** \file\r
  *\r

- *  Header file for MassStoreHost.c.\r
+ *  Header file for MassStorage.c.\r

  */\r
  */\r

- \r
-#ifndef _MASS_STORE_HOST_H_\r
-#define _MASS_STORE_HOST_H_\r
+\r
+#ifndef _MASS_STORAGE_HOST_H_\r
+#define _MASS_STORAGE_HOST_H_\r

 \r
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
                #include <avr/power.h>\r
 \r
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
                #include <avr/power.h>\r

-               #include <stdio.h>\r

                #include <ctype.h>\r
                #include <ctype.h>\r

+               #include <stdio.h>\r

 \r
 \r

-               #include "ConfigDescriptor.h"\r
-\r
-               #include "Lib/MassStoreCommands.h"\r
-\r
-               #include <LUFA/Version.h>                                // Library Version Information\r
-               #include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes\r
-               #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
-               #include <LUFA/Drivers/Peripheral/SerialStream.h>        // Serial stream driver\r
-               #include <LUFA/Drivers/Board/LEDs.h>                     // LEDs driver\r
-               #include <LUFA/Drivers/Board/Buttons.h>                  // Board Buttons driver\r
-\r
+               #include <LUFA/Version.h>\r
+               #include <LUFA/Drivers/Misc/TerminalCodes.h>\r
+               #include <LUFA/Drivers/Peripheral/SerialStream.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/USB/Class/MassStorage.h>\r
+               \r

        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
                #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
                #define LEDMASK_USB_NOTREADY      LEDS_LED1\r


@@ -67,20 +63,17 @@
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r

-\r
+               \r

                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r
                #define LEDMASK_USB_BUSY         (LEDS_LED2)\r
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r
                #define LEDMASK_USB_BUSY         (LEDS_LED2)\r

-               \r
+\r

        /* Function Prototypes: */\r
        /* Function Prototypes: */\r

-               void MassStorage_Task(void);\r

                void SetupHardware(void);\r
        \r
                void SetupHardware(void);\r
        \r

-               void EVENT_USB_HostError(const uint8_t ErrorCode);\r
-               void EVENT_USB_DeviceAttached(void);\r
-               void EVENT_USB_DeviceUnattached(void);\r
-               void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);\r
-               void EVENT_USB_DeviceEnumerationComplete(void);\r
-\r
-               void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode);\r
-\r
+               void EVENT_USB_Host_HostError(const uint8_t ErrorCode);\r
+               void EVENT_USB_Host_DeviceAttached(void);\r
+               void EVENT_USB_Host_DeviceUnattached(void);\r
+               void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode);\r
+               void EVENT_USB_Host_DeviceEnumerationComplete(void);\r
+               \r

 #endif\r
 #endif\r