More minor renaming of library enums and events to try to create a consistent API.

diff --git a/Demos/OTG/TestApp/TestEvents.c b/Demos/OTG/TestApp/TestEvents.c
index 1751477..b153012 100644 (file)
--- a/Demos/OTG/TestApp/TestEvents.c
+++ b/Demos/OTG/TestApp/TestEvents.c
@@ -139,7 +139,7 @@ EVENT_HANDLER(USB_UIDChange)
  *  Event handler for the USB_PowerOnFail event. When fired, the event is logged to the USART and the program\r
  *  execution aborted.\r
  */\r
  *  Event handler for the USB_PowerOnFail event. When fired, the event is logged to the USART and the program\r
  *  execution aborted.\r
  */\r

-EVENT_HANDLER(USB_PowerOnFail)\r
+EVENT_HANDLER(USB_InitFailure)\r

 {\r
        char* ModeStrPtr;\r
        \r
 {\r
        char* ModeStrPtr;\r
        \r

diff --git a/Demos/OTG/TestApp/TestEvents.h b/Demos/OTG/TestApp/TestEvents.h
index b5a83ed..a1f149f 100644 (file)
--- a/Demos/OTG/TestApp/TestEvents.h
+++ b/Demos/OTG/TestApp/TestEvents.h
@@ -74,8 +74,8 @@
                /** Indicates that this module will catch the USB_UIDChange event when thrown by the library. */\r
                HANDLES_EVENT(USB_UIDChange);\r
 \r
                /** Indicates that this module will catch the USB_UIDChange event when thrown by the library. */\r
                HANDLES_EVENT(USB_UIDChange);\r
 \r

-               /** Indicates that this module will catch the USB_PowerOnFail event when thrown by the library. */\r
-               HANDLES_EVENT(USB_PowerOnFail);\r
+               /** Indicates that this module will catch the USB_InitFailure event when thrown by the library. */\r
+               HANDLES_EVENT(USB_InitFailure);\r

 \r
                /** Indicates that this module will catch the USB_HostError event when thrown by the library. */\r
                HANDLES_EVENT(USB_HostError);\r
 \r
                /** Indicates that this module will catch the USB_HostError event when thrown by the library. */\r
                HANDLES_EVENT(USB_HostError);\r

diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index ae9b22d..cfdda0a 100644 (file)
--- a/LUFA/ChangeLog.txt
+++ b/LUFA/ChangeLog.txt
@@ -54,6 +54,10 @@
   *  - Fixed incorrect HID interface class and subclass values in the Mouse and KeyboardMouse demos (thanks to Brian Dickman)\r
   *  - Capitalised the "Descriptor_Search" and "Descriptor_Search_Comp" prefixes of the values in the DSearch_Return_ErrorCodes_t and\r
   *    DSearch_Comp_Return_ErrorCodes_t enums\r
   *  - Fixed incorrect HID interface class and subclass values in the Mouse and KeyboardMouse demos (thanks to Brian Dickman)\r
   *  - Capitalised the "Descriptor_Search" and "Descriptor_Search_Comp" prefixes of the values in the DSearch_Return_ErrorCodes_t and\r
   *    DSearch_Comp_Return_ErrorCodes_t enums\r

+  *  - Removed "ERROR" from the enum names in the endpoint and pipe stream error code enums\r
+  *  - Renamed the USB_PowerOnErrorCodes_t enum to USB_InitErrorCodes_t, renamed the POWERON_ERROR_NoUSBModeSpecified enum value to\r
+  *    USB_INITERROR_NoUSBModeSpecified\r
+  *  - Renamed USB_PowerOnFail event to USB_InitFailure\r

   *  - Changed over all deprecated GCC structure tag initializers to the standardized C99 format (thanks to Mike Alexander)\r
   *  - USB_HostRequest renamed to USB_ControlRequest, entire control request header is now read into USB_ControlRequest in Device mode\r
   *    rather than having the library pass only partially read header data to the application\r
   *  - Changed over all deprecated GCC structure tag initializers to the standardized C99 format (thanks to Mike Alexander)\r
   *  - USB_HostRequest renamed to USB_ControlRequest, entire control request header is now read into USB_ControlRequest in Device mode\r
   *    rather than having the library pass only partially read header data to the application\r

diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h
index 7815534..4624e5b 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/Events.h
+++ b/LUFA/Drivers/USB/HighLevel/Events.h
@@ -202,13 +202,15 @@
                         */\r
                        void USB_Disconnect(void);\r
                        \r
                         */\r
                        void USB_Disconnect(void);\r
                        \r

-                       /** Event for USB device power on failure. This event fires when the USB interface fails to\r
+                       /** Event for USB initialization failure. This event fires when the USB interface fails to\r

                         *  initialize correctly due to a hardware or software fault.\r
                         *\r
                         *  initialize correctly due to a hardware or software fault.\r
                         *\r

-                        *  \param ErrorCode  Error code indicating the failure reason, a value in \ref USB_PowerOnErrorCodes_t\r
+                        *  \note This event only exists on USB AVR models which support dual role modes.\r
+                        *\r
+                        *  \param ErrorCode  Error code indicating the failure reason, a value in \ref USB_InitErrorCodes_t\r

                         *                    located in LowLevel.h.\r
                         */\r
                         *                    located in LowLevel.h.\r
                         */\r

-                       void USB_PowerOnFail(const uint8_t ErrorCode);\r
+                       void USB_InitFailure(const uint8_t ErrorCode);\r

 \r
                        /** Event for USB mode pin level change. This event fires when the USB interface is set to dual role\r
                         *  mode, and the UID pin level has changed to indicate a new mode (device or host). This event fires\r
 \r
                        /** Event for USB mode pin level change. This event fires when the USB interface is set to dual role\r
                         *  mode, and the UID pin level has changed to indicate a new mode (device or host). This event fires\r


@@ -374,7 +376,7 @@
                        #define USB_DeviceEnumerationComplete_P     (void)\r
                        \r
                        #if defined(USB_CAN_BE_BOTH)\r
                        #define USB_DeviceEnumerationComplete_P     (void)\r
                        \r
                        #if defined(USB_CAN_BE_BOTH)\r

-                               #define USB_PowerOnFail_P               (const uint8_t ErrorCode)\r
+                               #define USB_InitFailure_P               (const uint8_t ErrorCode)\r

                                #define USB_UIDChange_P                 (void)\r
                        #endif\r
 \r
                                #define USB_UIDChange_P                 (void)\r
                        #endif\r
 \r


@@ -409,7 +411,7 @@
                                ALIAS_STUB(USB_DeviceEnumerationComplete);\r
                                \r
                                #if defined(USB_CAN_BE_BOTH)\r
                                ALIAS_STUB(USB_DeviceEnumerationComplete);\r
                                \r
                                #if defined(USB_CAN_BE_BOTH)\r

-                                       ALIAS_STUB(USB_PowerOnFail);\r
+                                       ALIAS_STUB(USB_InitFailure);\r

                                        ALIAS_STUB(USB_UIDChange);\r
                                #endif\r
                                \r
                                        ALIAS_STUB(USB_UIDChange);\r
                                #endif\r
                                \r

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c
index f4f2bdc..bd264b1 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c
@@ -125,7 +125,7 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length
 \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
 \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r

-                         return ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r


@@ -138,7 +138,7 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length
                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return ENDPOINT_RWSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length\r
 }\r
 \r
 uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length\r


@@ -161,7 +161,7 @@ uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length
                        \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
                        \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r

-                         return ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r


@@ -174,7 +174,7 @@ uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length
                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return ENDPOINT_RWSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length\r
 }\r
 \r
 uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length\r


@@ -197,7 +197,7 @@ uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length
 \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
 \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r

-                         return ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r


@@ -210,7 +210,7 @@ uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length
                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return ENDPOINT_RWSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length\r
 }\r
 \r
 uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length\r


@@ -233,7 +233,7 @@ uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
 \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
 \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r

-                         return ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r


@@ -246,7 +246,7 @@ uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return ENDPOINT_RWSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length\r
 }\r
 \r
 uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length\r


@@ -269,7 +269,7 @@ uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
 \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
 \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r

-                         return ENDPOINT_RWSTREAM_ERROR_CallbackAborted;\r
+                         return ENDPOINT_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r


@@ -282,7 +282,7 @@ uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return ENDPOINT_RWSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWSTREAM_NoError;\r

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


@@ -309,7 +309,7 @@ uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
        }\r
        \r
        if (Endpoint_IsOUTReceived())\r
        }\r
        \r
        if (Endpoint_IsOUTReceived())\r

-         return ENDPOINT_RWCSTREAM_ERROR_HostAborted;\r
+         return ENDPOINT_RWCSTREAM_HostAborted;\r

        \r
        if (LastPacketFull)\r
        {\r
        \r
        if (LastPacketFull)\r
        {\r


@@ -319,7 +319,7 @@ uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
        \r
        while (!(Endpoint_IsOUTReceived()));\r
 \r
        \r
        while (!(Endpoint_IsOUTReceived()));\r
 \r

-       return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWCSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)\r
 }\r
 \r
 uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)\r


@@ -346,7 +346,7 @@ uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
        }\r
        \r
        if (Endpoint_IsOUTReceived())\r
        }\r
        \r
        if (Endpoint_IsOUTReceived())\r

-         return ENDPOINT_RWCSTREAM_ERROR_HostAborted;\r
+         return ENDPOINT_RWCSTREAM_HostAborted;\r

        \r
        if (LastPacketFull)\r
        {\r
        \r
        if (LastPacketFull)\r
        {\r


@@ -356,7 +356,7 @@ uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
        \r
        while (!(Endpoint_IsOUTReceived()));\r
 \r
        \r
        while (!(Endpoint_IsOUTReceived()));\r
 \r

-       return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWCSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)\r
 }\r
 \r
 uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)\r


@@ -379,7 +379,7 @@ uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)
        \r
        while (!(Endpoint_IsINReady()));\r
        \r
        \r
        while (!(Endpoint_IsINReady()));\r
        \r

-       return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWCSTREAM_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)\r
 }\r
 \r
 uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)\r


@@ -402,7 +402,7 @@ uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)
        \r
        while (!(Endpoint_IsINReady()));\r
 \r
        \r
        while (!(Endpoint_IsINReady()));\r
 \r

-       return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
+       return ENDPOINT_RWCSTREAM_NoError;\r

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

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index 4d5aa53..aa5005a 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -461,20 +461,20 @@
                         */\r
                        enum Endpoint_Stream_RW_ErrorCodes_t\r
                        {\r
                         */\r
                        enum Endpoint_Stream_RW_ErrorCodes_t\r
                        {\r

-                               ENDPOINT_RWSTREAM_ERROR_NoError            = 0, /**< Command completed successfully, no error. */\r
-                               ENDPOINT_RWSTREAM_ERROR_EndpointStalled    = 1, /**< The endpoint was stalled during the stream\r
-                                                                                *   transfer by the host or device.\r
-                                                                                */\r
-                               ENDPOINT_RWSTREAM_ERROR_DeviceDisconnected = 1, /**< Device was disconnected from the host during\r
-                                                                                *   the transfer.\r
-                                                                                */\r
-                               ENDPOINT_RWSTREAM_ERROR_Timeout            = 2, /**< The host failed to accept or send the next packet\r
-                                                                                *   within the software timeout period set by the\r
-                                                                                *   \ref USB_STREAM_TIMEOUT_MS macro.\r
-                                                                                */\r
-                               ENDPOINT_RWSTREAM_ERROR_CallbackAborted    = 3, /**< Indicates that the stream's callback function\r
-                                                                            *   aborted the transfer early.\r
-                                                                                */\r
+                               ENDPOINT_RWSTREAM_NoError            = 0, /**< Command completed successfully, no error. */\r
+                               ENDPOINT_RWSTREAM_EndpointStalled    = 1, /**< The endpoint was stalled during the stream\r
+                                                                          *   transfer by the host or device.\r
+                                                                          */\r
+                               ENDPOINT_RWSTREAM_DeviceDisconnected = 1, /**< Device was disconnected from the host during\r
+                                                                          *   the transfer.\r
+                                                                          */\r
+                               ENDPOINT_RWSTREAM_Timeout            = 2, /**< The host failed to accept or send the next packet\r
+                                                                          *   within the software timeout period set by the\r
+                                                                          *   \ref USB_STREAM_TIMEOUT_MS macro.\r
+                                                                          */\r
+                               ENDPOINT_RWSTREAM_CallbackAborted    = 3, /**< Indicates that the stream's callback function\r
+                                                                      *   aborted the transfer early.\r
+                                                                          */\r

                        };\r
                        \r
                        /** Enum for the possible error return codes of the Endpoint_*_Control_Stream_* functions..\r
                        };\r
                        \r
                        /** Enum for the possible error return codes of the Endpoint_*_Control_Stream_* functions..\r


@@ -483,8 +483,8 @@
                         */\r
                        enum Endpoint_ControlStream_RW_ErrorCodes_t\r
                        {\r
                         */\r
                        enum Endpoint_ControlStream_RW_ErrorCodes_t\r
                        {\r

-                               ENDPOINT_RWCSTREAM_ERROR_NoError            = 0, /**< Command completed successfully, no error. */\r
-                               ENDPOINT_RWCSTREAM_ERROR_HostAborted        = 1, /**< The aborted the transfer prematurely. */\r
+                               ENDPOINT_RWCSTREAM_NoError            = 0, /**< Command completed successfully, no error. */\r
+                               ENDPOINT_RWCSTREAM_HostAborted        = 1, /**< The aborted the transfer prematurely. */\r

                        };\r
 \r
                /* Inline Functions: */\r
                        };\r
 \r
                /* Inline Functions: */\r

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c
index 1616ae5..99b9cfb 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -92,7 +92,7 @@ void USB_Init(
        }\r
        else\r
        {\r
        }\r
        else\r
        {\r

-               RAISE_EVENT(USB_PowerOnFail, POWERON_ERROR_NoUSBModeSpecified);\r
+               RAISE_EVENT(USB_InitFailure, USB_INITERROR_NoUSBModeSpecified);\r

                return;\r
        }\r
        #endif\r
                return;\r
        }\r
        #endif\r

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h
index 3bf4137..6cc3b22 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.h
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h
@@ -285,9 +285,9 @@
                        /** Enum for error codes relating to the powering on of the USB interface. These error codes are\r
                         *  used in the ErrorCode parameter value of the \ref USB_PowerOnFail event.\r
                         */\r
                        /** Enum for error codes relating to the powering on of the USB interface. These error codes are\r
                         *  used in the ErrorCode parameter value of the \ref USB_PowerOnFail event.\r
                         */\r

-                       enum USB_PowerOnErrorCodes_t\r
+                       enum USB_InitErrorCodes_t\r

                        {\r
                        {\r

-                               POWERON_ERROR_NoUSBModeSpecified       = 0, /**< Indicates that \ref USB_Init() was called with an\r
+                               USB_INITERROR_NoUSBModeSpecified       = 0, /**< Indicates that \ref USB_Init() was called with an\r

                                                                         *   invalid or missing Mode parameter.\r
                                                                         */\r
                        };\r
                                                                         *   invalid or missing Mode parameter.\r
                                                                         */\r
                        };\r


@@ -328,7 +328,7 @@
                                 *\r
                                 *  \see Events.h for more information on this event.\r
                                 */\r
                                 *\r
                                 *  \see Events.h for more information on this event.\r
                                 */\r

-                               RAISES_EVENT(USB_PowerOnFail);\r
+                               RAISES_EVENT(USB_InitFailure);\r

                        #endif\r
                        \r
        /* Private Interface - For use in library only: */\r
                        #endif\r
                        \r
        /* Private Interface - For use in library only: */\r

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c
index 4bd89ec..c81ee64 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -122,7 +122,7 @@ uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r

-                         return PIPE_RWSTREAM_ERROR_CallbackAborted;\r
+                         return PIPE_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r


@@ -135,7 +135,7 @@ uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length
                }\r
        }\r
 \r
                }\r
        }\r
 \r

-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length\r
 }\r
 \r
 uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length\r


@@ -158,7 +158,7 @@ uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r

-                         return PIPE_RWSTREAM_ERROR_CallbackAborted;\r
+                         return PIPE_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r


@@ -171,7 +171,7 @@ uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length
                }\r
        }\r
 \r
                }\r
        }\r
 \r

-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Pipe_Discard_Stream(uint16_t Length\r
 }\r
 \r
 uint8_t Pipe_Discard_Stream(uint16_t Length\r


@@ -193,7 +193,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r

-                         return PIPE_RWSTREAM_ERROR_CallbackAborted;\r
+                         return PIPE_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r


@@ -206,7 +206,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
                }\r
        }\r
 \r
                }\r
        }\r
 \r

-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length\r
 }\r
 \r
 uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length\r


@@ -229,7 +229,7 @@ uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r

-                         return PIPE_RWSTREAM_ERROR_CallbackAborted;\r
+                         return PIPE_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r


@@ -242,7 +242,7 @@ uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length
                }\r
        }\r
 \r
                }\r
        }\r
 \r

-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_NoError;\r

 }\r
 \r
 uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length\r
 }\r
 \r
 uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length\r


@@ -265,7 +265,7 @@ uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
                                \r
                        #if !defined(NO_STREAM_CALLBACKS)\r
                        if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r

-                         return PIPE_RWSTREAM_ERROR_CallbackAborted;\r
+                         return PIPE_RWSTREAM_CallbackAborted;\r

                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                        #endif\r
 \r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r


@@ -278,7 +278,7 @@ uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length
                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       return PIPE_RWSTREAM_ERROR_NoError;\r
+       return PIPE_RWSTREAM_NoError;\r

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

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 748dc59..beee0bd 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -568,18 +568,18 @@
                         */\r
                        enum Pipe_Stream_RW_ErrorCodes_t\r
                        {\r
                         */\r
                        enum Pipe_Stream_RW_ErrorCodes_t\r
                        {\r

-                               PIPE_RWSTREAM_ERROR_NoError            = 0, /**< Command completed successfully, no error. */\r
-                               PIPE_RWSTREAM_ERROR_PipeStalled        = 1, /**< The device stalled the pipe during the transfer. */            \r
-                               PIPE_RWSTREAM_ERROR_DeviceDisconnected = 2, /**< Device was disconnected from the host during\r
-                                                                        *   the transfer.\r
-                                                                        */             \r
-                               PIPE_RWSTREAM_ERROR_Timeout            = 3, /**< The device failed to accept or send the next packet\r
-                                                                            *   within the software timeout period set by the\r
-                                                                            *   \ref USB_STREAM_TIMEOUT_MS macro.\r
-                                                                            */\r
-                               PIPE_RWSTREAM_ERROR_CallbackAborted    = 4, /**< Indicates that the stream's callback function aborted\r
-                                                                        *   the transfer early.\r
-                                                                            */\r
+                               PIPE_RWSTREAM_NoError            = 0, /**< Command completed successfully, no error. */\r
+                               PIPE_RWSTREAM_PipeStalled        = 1, /**< The device stalled the pipe during the transfer. */          \r
+                               PIPE_RWSTREAM_DeviceDisconnected = 2, /**< Device was disconnected from the host during\r
+                                                                  *   the transfer.\r
+                                                                  */           \r
+                               PIPE_RWSTREAM_Timeout            = 3, /**< The device failed to accept or send the next packet\r
+                                                                      *   within the software timeout period set by the\r
+                                                                      *   \ref USB_STREAM_TIMEOUT_MS macro.\r
+                                                                      */\r
+                               PIPE_RWSTREAM_CallbackAborted    = 4, /**< Indicates that the stream's callback function aborted\r
+                                                                  *   the transfer early.\r
+                                                                      */\r

                        };\r
 \r
                /* Inline Functions: */\r
                        };\r
 \r
                /* Inline Functions: */\r

diff --git a/LUFA/MigrationInformation.txt b/LUFA/MigrationInformation.txt
index f3c3a6f..c2c30d3 100644 (file)
--- a/LUFA/MigrationInformation.txt
+++ b/LUFA/MigrationInformation.txt
@@ -18,6 +18,9 @@
  *    - The Drivers/AT90USBXXX directory has been renamed to Drivers/Peripheral.\r
  *    - The Serial_Stream driver has been renamed to SerialStream to remain consistent with the rest of the library naming scheme.\r
  *\r
  *    - The Drivers/AT90USBXXX directory has been renamed to Drivers/Peripheral.\r
  *    - The Serial_Stream driver has been renamed to SerialStream to remain consistent with the rest of the library naming scheme.\r
  *\r

+ *  <b>Dual Role Mode</b>\r
+ *    - The USB_PowerOnFail even has been renamed to USB_InitFailure.\r
+ *\r

  *  <b>Library Demos</b>\r
  *    - Most demos, bootloaders and applications have had significant changes from previous versions. Applications built off of any\r
  *      library demos should update to the latest versions.\r
  *  <b>Library Demos</b>\r
  *    - Most demos, bootloaders and applications have had significant changes from previous versions. Applications built off of any\r
  *      library demos should update to the latest versions.\r


@@ -38,6 +41,8 @@
  *      USB_ControlRequest structure.\r
  *    - The FEATURELESS_CONTROL_ONLY_DEVICE token has been renamed to CONTROL_ONLY_DEVICE.\r
  *    - The STATIC_ENDPOINT_CONFIGURATION is no longer applicable as the library will apply this optimization when appropriate automatically.\r
  *      USB_ControlRequest structure.\r
  *    - The FEATURELESS_CONTROL_ONLY_DEVICE token has been renamed to CONTROL_ONLY_DEVICE.\r
  *    - The STATIC_ENDPOINT_CONFIGURATION is no longer applicable as the library will apply this optimization when appropriate automatically.\r

+ *    - The values of the Endpoint_Stream_RW_ErrorCodes_t and Endpoint_ControlStream_RW_ErrorCodes_t enums have had the "ERROR_" portion\r
+ *      of their names removed.\r

  *\r
  *  <b>Host Mode</b>\r
  *    - The USB_Host_SendControlRequest() function no longer automatically selects the Control pipe (pipe 0) to allow it to be used on\r
  *\r
  *  <b>Host Mode</b>\r
  *    - The USB_Host_SendControlRequest() function no longer automatically selects the Control pipe (pipe 0) to allow it to be used on\r


@@ -68,6 +73,8 @@
  *      and "Descriptor_Search_Comp" prefixes changed to all caps.\r
  *    - The USB_HostRequest global has been renamed to USB_ControlRequest, and is used in Device mode also. The USB_Host_Request_Header_t\r
  *      structure type has been renamed to USB_Request_Header_t.\r
  *      and "Descriptor_Search_Comp" prefixes changed to all caps.\r
  *    - The USB_HostRequest global has been renamed to USB_ControlRequest, and is used in Device mode also. The USB_Host_Request_Header_t\r
  *      structure type has been renamed to USB_Request_Header_t.\r

+ *    - The values of the Pipe_Stream_RW_ErrorCodes_t enum have had the "ERROR_" portion of their names removed.\r
+ *\r

  *\r
  * \section Sec_Migration090401 Migrating from 090209 to 090401\r
  *\r
  *\r
  * \section Sec_Migration090401 Migrating from 090209 to 090401\r
  *\r