Fix typo in the StillImageHost LowLevel demo, and the CDC Host Class Driver.

[pub/USBasp.git] / Projects / Incomplete / StandaloneProgrammer / StandaloneProgrammer.h

diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
index 196b7ca..744ad01 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
+++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
@@ -42,7 +42,8 @@
                #include <avr/power.h>\r
                #include <stdio.h>\r
 \r
                #include <avr/power.h>\r
                #include <stdio.h>\r
 \r

-               #include "Descriptors.h"\r
+               #include "DiskDevice.h"\r
+               #include "DiskHost.h"\r

 \r
                #include "Lib/SCSI.h"\r
                #include "Lib/DataflashManager.h"\r
 \r
                #include "Lib/SCSI.h"\r
                #include "Lib/DataflashManager.h"\r


@@ -50,11 +51,8 @@
                #include "Lib/PetiteFATFs/pff.h"\r
 \r
                #include <LUFA/Version.h>\r
                #include "Lib/PetiteFATFs/pff.h"\r
 \r
                #include <LUFA/Version.h>\r

-               #include <LUFA/Drivers/Board/LEDs.h>\r

                #include <LUFA/Drivers/Board/Buttons.h>\r
                #include <LUFA/Drivers/Board/Buttons.h>\r

-               #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/MassStorage.h>
-               #include <LUFA/Drivers/USB/Class/CDC.h>\r
+               #include <LUFA/Drivers/Peripheral/SerialStream.h>\r

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


@@ -73,22 +71,17 @@
                #define LEDMASK_USB_BUSY         (LEDS_LED2)\r
                \r
        /* External Variables: */\r
                #define LEDMASK_USB_BUSY         (LEDS_LED2)\r
                \r
        /* External Variables: */\r

-               extern FILE USBSerialStream;\r
-               extern FILE DataflashStream;\r
+               extern FILE DiskStream;\r
+               extern FATFS DiskFATState;\r

        \r
        /* Function Prototypes: */\r
                #if defined(INCLUDE_FROM_STANDALONEPROG_C)\r
        \r
        /* Function Prototypes: */\r
                #if defined(INCLUDE_FROM_STANDALONEPROG_C)\r

-                       static int Dataflash_getchar(FILE* Stream);\r
+                       static int Disk_getchar(FILE* Stream);\r

                #endif\r
                \r
                #endif\r
                \r

+               void EVENT_USB_UIDChange(void);\r
+               \r

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

-\r
-               void EVENT_USB_Device_Connect(void);\r
-               void EVENT_USB_Device_Disconnect(void);\r
-               void EVENT_USB_Device_ConfigurationChanged(void);\r
-               void EVENT_USB_Device_UnhandledControlRequest(void);\r
-\r
-               bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
-\r
+               \r

 #endif\r
 #endif\r