Update manual pages to reference unfinished AVR32 port, add port status to the Future...

[pub/USBasp.git] / Bootloaders / CDC / BootloaderCDC.h

diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h
index 0d8f1e3..8367002 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.h
+++ b/Bootloaders/CDC/BootloaderCDC.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

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


@@ -41,11 +41,12 @@
                #include <avr/wdt.h>\r
                #include <avr/boot.h>\r
                #include <avr/eeprom.h>\r
                #include <avr/wdt.h>\r
                #include <avr/boot.h>\r
                #include <avr/eeprom.h>\r

+               #include <avr/power.h>\r

                #include <stdbool.h>\r
 \r
                #include "Descriptors.h"\r
 \r
                #include <stdbool.h>\r
 \r
                #include "Descriptors.h"\r
 \r

-               #include <LUFA/Drivers/USB/USB.h>                // USB Functionality\r
+               #include <LUFA/Drivers/USB/USB.h>\r

 \r
        /* Macros: */\r
                /** CDC Class Specific request to get the line encoding on a CDC-ACM virtual serial port, including the\r
 \r
        /* Macros: */\r
                /** CDC Class Specific request to get the line encoding on a CDC-ACM virtual serial port, including the\r


@@ -76,17 +77,7 @@
                #define BOOTLOADER_HWVERSION_MINOR   0x00\r
 \r
                /** Eight character bootloader firmware identifier reported to the host when requested */\r
                #define BOOTLOADER_HWVERSION_MINOR   0x00\r
 \r
                /** Eight character bootloader firmware identifier reported to the host when requested */\r

-               #define SOFTWARE_IDENTIFIER          "LUFA-CDC"\r
-\r
-       /* Event Handlers: */\r
-               /** Indicates that this module will catch the USB_Disconnect event when thrown by the library. */\r
-               HANDLES_EVENT(USB_Disconnect);\r
-\r
-               /** Indicates that this module will catch the USB_ConfigurationChanged event when thrown by the library. */\r
-               HANDLES_EVENT(USB_ConfigurationChanged);\r
-\r
-               /** Indicates that this module will catch the USB_UnhandledControlPacket event when thrown by the library. */\r
-               HANDLES_EVENT(USB_UnhandledControlPacket);\r
+               #define SOFTWARE_IDENTIFIER          "LUFACDC"\r

                \r
        /* Type Defines: */\r
                /** Type define for a non-returning pointer to the start of the loaded application in flash memory. */\r
                \r
        /* Type Defines: */\r
                /** Type define for a non-returning pointer to the start of the loaded application in flash memory. */\r


@@ -113,7 +104,7 @@
                };\r
                \r
                /** Enum for the possible parity modes on a CDC-ACM virtual serial port */\r
                };\r
                \r
                /** Enum for the possible parity modes on a CDC-ACM virtual serial port */\r

-               enum BootloaderCDC_CDC_LineCodeingParity_t\r
+               enum BootloaderCDC_CDC_LineCodingParity_t\r

                {\r
                        Parity_None         = 0, /**< No data parity checking */\r
                        Parity_Odd          = 1, /**< Odd data parity checking */\r
                {\r
                        Parity_None         = 0, /**< No data parity checking */\r
                        Parity_Odd          = 1, /**< Odd data parity checking */\r


@@ -122,14 +113,18 @@
                        Parity_Space        = 4, /**< Space data parity checking */\r
                };\r
                \r
                        Parity_Space        = 4, /**< Space data parity checking */\r
                };\r
                \r

-       /* Tasks: */\r
-               TASK(CDC_Task);\r
-\r

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

+               void CDC_Task(void);\r
+               void SetupHardware(void);\r
+               void ResetHardware(void);\r
+\r
+               void EVENT_USB_Device_ConfigurationChanged(void);\r
+               void EVENT_USB_Device_UnhandledControlRequest(void);\r
+\r

                #if defined(INCLUDE_FROM_BOOTLOADERCDC_C) || defined(__DOXYGEN__)\r
                #if defined(INCLUDE_FROM_BOOTLOADERCDC_C) || defined(__DOXYGEN__)\r

-                       static void ProgramReadWriteMemoryBlock(const uint8_t Command);\r
+                       static void    ReadWriteMemoryBlock(const uint8_t Command);\r

                        static uint8_t FetchNextCommandByte(void);\r
                        static uint8_t FetchNextCommandByte(void);\r

-                       static void WriteNextResponseByte(const uint8_t Response);\r
+                       static void    WriteNextResponseByte(const uint8_t Response);\r

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