Commit of new class abstraction APIs for all device demos other than the MIDI demo...

[pub/USBasp.git] / Demos / Host / StillImageHost / StillImageHost.h

diff --git a/Demos/Host/StillImageHost/StillImageHost.h b/Demos/Host/StillImageHost/StillImageHost.h
index 7757b08..b563767 100644 (file)
--- a/Demos/Host/StillImageHost/StillImageHost.h
+++ b/Demos/Host/StillImageHost/StillImageHost.h
@@ -43,13 +43,13 @@
                #include <stdio.h>\r
                \r
                #include "ConfigDescriptor.h"\r
                #include <stdio.h>\r
                \r
                #include "ConfigDescriptor.h"\r

-               #include "PIMACodes.h"\r
-               #include "StillImageCommands.h"\r

 \r
 \r

-               #include <LUFA/Common/ButtLoadTag.h>                     // PROGMEM tags readable by the ButtLoad project\r
+               #include "Lib/PIMACodes.h"\r
+               #include "Lib/StillImageCommands.h"\r
+\r

                #include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
                #include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r

-               #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h>       // Serial stream driver\r
+               #include <LUFA/Drivers/Peripheral/SerialStream.h>        // Serial stream driver\r

                #include <LUFA/Drivers/Board/LEDs.h>                     // LED driver\r
                #include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management\r
 \r
                #include <LUFA/Drivers/Board/LEDs.h>                     // LED driver\r
                #include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management\r
 \r


@@ -69,14 +69,13 @@
        /* Task Definitions: */\r
                TASK(USB_SImage_Host);\r
 \r
        /* Task Definitions: */\r
                TASK(USB_SImage_Host);\r
 \r

-       /* Event Handlers: */\r
-               HANDLES_EVENT(USB_DeviceAttached);\r
-               HANDLES_EVENT(USB_DeviceUnattached);\r
-               HANDLES_EVENT(USB_DeviceEnumerationComplete);\r
-               HANDLES_EVENT(USB_HostError);\r
-               HANDLES_EVENT(USB_DeviceEnumerationFailed);\r
-               \r

        /* Function Prototypes: */\r
        /* Function Prototypes: */\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 UnicodeToASCII(uint8_t* restrict UnicodeString, char* restrict Buffer);\r
                void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError);\r
                void UpdateStatus(uint8_t CurrentStatus);\r
                void UnicodeToASCII(uint8_t* restrict UnicodeString, char* restrict Buffer);\r
                void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError);\r
                void UpdateStatus(uint8_t CurrentStatus);\r