Fixed GenericHIDHost demo report write routine incorrect for control type requests...

Removed Endpoint_ClearCurrentBank() and Pipe_ClearCurrentBank() in favour of new Endpoint_ClearIN(), Endpoint_ClearOUT(), Endpoint_ClearControlIN(), Endpoint_ClearControlOUT(), Pipe_ClearIN(), Pipe_ClearOUT(), Pipe_ClearControlIN() and Pipe_ClearControlOUT() macros (done to allow for the detection of packets of zero length).

Renamed *_ReadWriteAllowed() macros to *_IsReadWriteAllowed() to remain consistent with the rest of the LUFA API.

Endpoint_IsSetupReceived() macro has been renamed to Endpoint_IsSETUPReceived(), Endpoint_ClearSetupReceived() macro has been renamed to Endpoint_ClearControlSETUP(), the Pipe_IsSetupSent() macro has been renamed to Pipe_IsSETUPSent() and the Pipe_ClearSetupSent() macro is no longer applicable and should be removed - changes made to compliment the new endpoint and pipe bank management API.

Updated all demos, bootloaders and projects to use the new endpoint and pipe management APIs (thanks to Roman Thiel).

Updated library doxygen documentation, added groups, changed documentation macro functions to real functions for clarity.

Removed old endpoint and pipe aliased read/write/discard routines which did not have an explicit endian specifier for clarity.

Removed the ButtLoadTag.h header file, as no one used for its intended purpose anyway.

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index e87d471..cb2672c 100644 (file)
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -90,7 +90,7 @@ int main(void)
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r
        /* Wait until any pending transmissions have completed before shutting down */\r
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r
        /* Wait until any pending transmissions have completed before shutting down */\r

-       while (!(Endpoint_ReadWriteAllowed()));\r
+       while (!(Endpoint_IsINReady()));\r

        \r
        /* Shut down the USB subsystem */\r
        USB_ShutDown();\r
        \r
        /* Shut down the USB subsystem */\r
        USB_ShutDown();\r


@@ -160,45 +160,45 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                case REQ_GetLineEncoding:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                case REQ_GetLineEncoding:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
                                for (uint8_t i = 0; i < sizeof(LineCoding); i++)\r
                                  Endpoint_Write_Byte(*(LineCodingData++));     \r
                                \r
 \r
                                for (uint8_t i = 0; i < sizeof(LineCoding); i++)\r
                                  Endpoint_Write_Byte(*(LineCodingData++));     \r
                                \r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
-                               Endpoint_ClearSetupOUT();\r
+                               while (!(Endpoint_IsOUTReceived()));\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                        \r
                        break;\r
                case REQ_SetLineEncoding:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
                        \r
                        break;\r
                case REQ_SetLineEncoding:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
 \r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                               while (!(Endpoint_IsOUTReceived()));\r

 \r
                                for (uint8_t i = 0; i < sizeof(LineCoding); i++)\r
                                  *(LineCodingData++) = Endpoint_Read_Byte();\r
 \r
 \r
                                for (uint8_t i = 0; i < sizeof(LineCoding); i++)\r
                                  *(LineCodingData++) = Endpoint_Read_Byte();\r
 \r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
        \r
                        break;\r
                case REQ_SetControlLineState:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
        \r
                        break;\r
                case REQ_SetControlLineState:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
        \r
                        break;\r
                        }\r
        \r
                        break;\r


@@ -332,10 +332,10 @@ static uint8_t FetchNextCommandByte(void)
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
        \r
        /* If OUT endpoint empty, clear it and wait for the next packet from the host */\r
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
        \r
        /* If OUT endpoint empty, clear it and wait for the next packet from the host */\r

-       if (!(Endpoint_ReadWriteAllowed()))\r
+       while (!(Endpoint_IsReadWriteAllowed()))\r

        {\r
        {\r

-               Endpoint_ClearCurrentBank();\r
-               while (!(Endpoint_ReadWriteAllowed()));\r
+               Endpoint_ClearOUT();\r
+               while (!(Endpoint_IsOUTReceived()));\r

        }\r
        \r
        /* Fetch the next byte from the OUT endpoint */\r
        }\r
        \r
        /* Fetch the next byte from the OUT endpoint */\r


@@ -353,10 +353,10 @@ static void WriteNextResponseByte(const uint8_t Response)
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
        \r
        /* If OUT endpoint empty, clear it and wait for the next packet from the host */\r
        Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
        \r
        /* If OUT endpoint empty, clear it and wait for the next packet from the host */\r

-       if (!(Endpoint_ReadWriteAllowed()))\r
+       if (!(Endpoint_IsReadWriteAllowed()))\r

        {\r
        {\r

-               Endpoint_ClearCurrentBank();\r
-               while (!(Endpoint_ReadWriteAllowed()));\r
+               Endpoint_ClearIN();\r
+               while (!(Endpoint_IsINReady()));\r

        }\r
        \r
        /* Write the next byte to the OUT endpoint */\r
        }\r
        \r
        /* Write the next byte to the OUT endpoint */\r


@@ -372,7 +372,7 @@ TASK(CDC_Task)
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
        \r
        /* Check if endpoint has a command in it sent from the host */\r
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
        \r
        /* Check if endpoint has a command in it sent from the host */\r

-       if (Endpoint_ReadWriteAllowed())\r
+       if (Endpoint_IsOUTReceived())\r

        {\r
                /* Read in the bootloader command (first byte sent from host) */\r
                uint8_t Command = FetchNextCommandByte();\r
        {\r
                /* Read in the bootloader command (first byte sent from host) */\r
                uint8_t Command = FetchNextCommandByte();\r


@@ -557,22 +557,22 @@ TASK(CDC_Task)
                Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r
                /* Remember if the endpoint is completely full before clearing it */\r
                Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
 \r
                /* Remember if the endpoint is completely full before clearing it */\r

-               bool IsEndpointFull = !(Endpoint_ReadWriteAllowed());\r
+               bool IsEndpointFull = !(Endpoint_IsReadWriteAllowed());\r

 \r
                /* Send the endpoint data to the host */\r
 \r
                /* Send the endpoint data to the host */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearIN();\r

                \r
                /* If a full endpoint's worth of data was sent, we need to send an empty packet afterwards to signal end of transfer */\r
                if (IsEndpointFull)\r
                {\r
                \r
                /* If a full endpoint's worth of data was sent, we need to send an empty packet afterwards to signal end of transfer */\r
                if (IsEndpointFull)\r
                {\r

-                       while (!(Endpoint_ReadWriteAllowed()));\r
-                       Endpoint_ClearCurrentBank();\r
+                       while (!(Endpoint_IsINReady()));\r
+                       Endpoint_ClearIN();\r

                }\r
                \r
                /* Select the OUT endpoint */\r
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
 \r
                /* Acknowledge the command from the host */\r
                }\r
                \r
                /* Select the OUT endpoint */\r
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
 \r
                /* Acknowledge the command from the host */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearOUT();\r

        }\r
 }\r
        }\r
 }\r

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 5375b9c..f358016 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -163,7 +163,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
        switch (bRequest)\r
        {\r
                case DFU_DNLOAD:\r
        switch (bRequest)\r
        {\r
                case DFU_DNLOAD:\r

-                       Endpoint_ClearSetupReceived();\r
+                       Endpoint_ClearControlSETUP();\r

                        \r
                        /* Check if bootloader is waiting to terminate */\r
                        if (WaitForExit)\r
                        \r
                        /* Check if bootloader is waiting to terminate */\r
                        if (WaitForExit)\r


@@ -178,7 +178,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        /* If the request has a data stage, load it into the command struct */\r
                        if (SentCommand.DataSize)\r
                        {\r
                        /* If the request has a data stage, load it into the command struct */\r
                        if (SentCommand.DataSize)\r
                        {\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                               while (!(Endpoint_IsOUTReceived()));\r

 \r
                                /* First byte of the data stage is the DNLOAD request's command */\r
                                SentCommand.Command = Endpoint_Read_Byte();\r
 \r
                                /* First byte of the data stage is the DNLOAD request's command */\r
                                SentCommand.Command = Endpoint_Read_Byte();\r


@@ -235,8 +235,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r

-                                                               Endpoint_ClearSetupOUT();\r
-                                                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                                                               Endpoint_ClearControlOUT();\r
+                                                               while (!(Endpoint_IsOUTReceived()));\r

                                                        }\r
 \r
                                                        /* Write the next word into the current flash page */\r
                                                        }\r
 \r
                                                        /* Write the next word into the current flash page */\r


@@ -279,8 +279,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r
                                                        /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                        if (!(Endpoint_BytesInEndpoint()))\r
                                                        {\r

-                                                               Endpoint_ClearSetupOUT();\r
-                                                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                                                               Endpoint_ClearControlOUT();\r
+                                                               while (!(Endpoint_IsOUTReceived()));\r

                                                        }\r
 \r
                                                        /* Read the byte from the USB interface and write to to the EEPROM */\r
                                                        }\r
 \r
                                                        /* Read the byte from the USB interface and write to to the EEPROM */\r


@@ -296,17 +296,17 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                }\r
                        }\r
 \r
                                }\r
                        }\r
 \r

-                       Endpoint_ClearSetupOUT();\r
+                       Endpoint_ClearControlOUT();\r

 \r
                        /* Acknowledge status stage */\r
 \r
                        /* Acknowledge status stage */\r

-                       while (!(Endpoint_IsSetupINReady()));\r
-                       Endpoint_ClearSetupIN();\r
+                       while (!(Endpoint_IsINReady()));\r
+                       Endpoint_ClearControlIN();\r

                                \r
                        break;\r
                case DFU_UPLOAD:\r
                                \r
                        break;\r
                case DFU_UPLOAD:\r

-                       Endpoint_ClearSetupReceived();\r
+                       Endpoint_ClearControlSETUP();\r

 \r
 \r

-                       while (!(Endpoint_IsSetupINReady()));\r
+                       while (!(Endpoint_IsINReady()));\r

 \r
                        if (DFU_State != dfuUPLOAD_IDLE)\r
                        {\r
 \r
                        if (DFU_State != dfuUPLOAD_IDLE)\r
                        {\r


@@ -343,8 +343,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r

-                                                       Endpoint_ClearSetupIN();\r
-                                                       while (!(Endpoint_IsSetupINReady()));\r
+                                                       Endpoint_ClearControlIN();\r
+                                                       while (!(Endpoint_IsINReady()));\r

                                                }\r
 \r
                                                /* Read the flash word and send it via USB to the host */\r
                                                }\r
 \r
                                                /* Read the flash word and send it via USB to the host */\r


@@ -368,8 +368,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r
                                                /* Check if endpoint is full - if so clear it and wait until ready for next packet */\r
                                                if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)\r
                                                {\r

-                                                       Endpoint_ClearSetupIN();\r
-                                                       while (!(Endpoint_IsSetupINReady()));\r
+                                                       Endpoint_ClearControlIN();\r
+                                                       while (!(Endpoint_IsINReady()));\r

                                                }\r
 \r
                                                /* Read the EEPROM byte and send it via USB to the host */\r
                                                }\r
 \r
                                                /* Read the EEPROM byte and send it via USB to the host */\r


@@ -384,15 +384,15 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                DFU_State = dfuIDLE;\r
                        }\r
 \r
                                DFU_State = dfuIDLE;\r
                        }\r
 \r

-                       Endpoint_ClearSetupIN();\r
+                       Endpoint_ClearControlIN();\r

 \r
                        /* Acknowledge status stage */\r
 \r
                        /* Acknowledge status stage */\r

-                       while (!(Endpoint_IsSetupOUTReceived()));\r
-                       Endpoint_ClearSetupOUT();\r
+                       while (!(Endpoint_IsOUTReceived()));\r
+                       Endpoint_ClearControlOUT();\r

 \r
                        break;\r
                case DFU_GETSTATUS:\r
 \r
                        break;\r
                case DFU_GETSTATUS:\r

-                       Endpoint_ClearSetupReceived();\r
+                       Endpoint_ClearControlSETUP();\r

                        \r
                        /* Write 8-bit status value */\r
                        Endpoint_Write_Byte(DFU_Status);\r
                        \r
                        /* Write 8-bit status value */\r
                        Endpoint_Write_Byte(DFU_Status);\r


@@ -407,46 +407,46 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        /* Write 8-bit state string ID number */\r
                        Endpoint_Write_Byte(0);\r
 \r
                        /* Write 8-bit state string ID number */\r
                        Endpoint_Write_Byte(0);\r
 \r

-                       Endpoint_ClearSetupIN();\r
+                       Endpoint_ClearControlIN();\r

                        \r
                        /* Acknowledge status stage */\r
                        \r
                        /* Acknowledge status stage */\r

-                       while (!(Endpoint_IsSetupOUTReceived()));\r
-                       Endpoint_ClearSetupOUT();\r
+                       while (!(Endpoint_IsOUTReceived()));\r
+                       Endpoint_ClearControlOUT();\r

        \r
                        break;          \r
                case DFU_CLRSTATUS:\r
        \r
                        break;          \r
                case DFU_CLRSTATUS:\r

-                       Endpoint_ClearSetupReceived();\r
+                       Endpoint_ClearControlSETUP();\r

                        \r
                        /* Reset the status value variable to the default OK status */\r
                        DFU_Status = OK;\r
 \r
                        /* Acknowledge status stage */\r
                        \r
                        /* Reset the status value variable to the default OK status */\r
                        DFU_Status = OK;\r
 \r
                        /* Acknowledge status stage */\r

-                       while (!(Endpoint_IsSetupINReady()));\r
-                       Endpoint_ClearSetupIN();\r
+                       while (!(Endpoint_IsINReady()));\r
+                       Endpoint_ClearControlIN();\r

                        \r
                        break;\r
                case DFU_GETSTATE:\r
                        \r
                        break;\r
                case DFU_GETSTATE:\r

-                       Endpoint_ClearSetupReceived();\r
+                       Endpoint_ClearControlSETUP();\r

                        \r
                        /* Write the current device state to the endpoint */\r
                        Endpoint_Write_Byte(DFU_State);\r
                \r
                        \r
                        /* Write the current device state to the endpoint */\r
                        Endpoint_Write_Byte(DFU_State);\r
                \r

-                       Endpoint_ClearSetupIN();\r
+                       Endpoint_ClearControlIN();\r

                        \r
                        /* Acknowledge status stage */\r
                        \r
                        /* Acknowledge status stage */\r

-                       while (!(Endpoint_IsSetupOUTReceived()));\r
-                       Endpoint_ClearSetupOUT();\r
+                       while (!(Endpoint_IsOUTReceived()));\r
+                       Endpoint_ClearControlOUT();\r

 \r
                        break;\r
                case DFU_ABORT:\r
 \r
                        break;\r
                case DFU_ABORT:\r

-                       Endpoint_ClearSetupReceived();\r
+                       Endpoint_ClearControlSETUP();\r

                        \r
                        /* Reset the current state variable to the default idle state */\r
                        DFU_State = dfuIDLE;\r
                        \r
                        /* Acknowledge status stage */\r
                        \r
                        /* Reset the current state variable to the default idle state */\r
                        DFU_State = dfuIDLE;\r
                        \r
                        /* Acknowledge status stage */\r

-                       while (!(Endpoint_IsSetupINReady()));\r
-                       Endpoint_ClearSetupIN();\r
+                       while (!(Endpoint_IsINReady()));\r
+                       Endpoint_ClearControlIN();\r

 \r
                        break;\r
        }\r
 \r
                        break;\r
        }\r


@@ -463,10 +463,10 @@ static void DiscardFillerBytes(uint8_t NumberOfBytes)
        {\r
                if (!(Endpoint_BytesInEndpoint()))\r
                {\r
        {\r
                if (!(Endpoint_BytesInEndpoint()))\r
                {\r

-                       Endpoint_ClearSetupOUT();\r
+                       Endpoint_ClearControlOUT();\r

 \r
                        /* Wait until next data packet received */\r
 \r
                        /* Wait until next data packet received */\r

-                       while (!(Endpoint_IsSetupOUTReceived()));\r
+                       while (!(Endpoint_IsOUTReceived()));\r

                }\r
 \r
                Endpoint_Discard_Byte();                                                \r
                }\r
 \r
                Endpoint_Discard_Byte();                                                \r

diff --git a/Bootloaders/TeensyHID/TeensyHID.c b/Bootloaders/TeensyHID/TeensyHID.c
index 93f0621..f82e28e 100644 (file)
--- a/Bootloaders/TeensyHID/TeensyHID.c
+++ b/Bootloaders/TeensyHID/TeensyHID.c
@@ -101,10 +101,10 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                case REQ_SetReport:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                case REQ_SetReport:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Wait until the command (report) has been sent by the host */\r
                                \r
                                /* Wait until the command (report) has been sent by the host */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                               while (!(Endpoint_IsOUTReceived()));\r

 \r
                                /* Read in the write destination address */\r
                                uint16_t PageAddress = Endpoint_Read_Word_LE();\r
 \r
                                /* Read in the write destination address */\r
                                uint16_t PageAddress = Endpoint_Read_Word_LE();\r


@@ -126,8 +126,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                                /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                if (!(Endpoint_BytesInEndpoint()))\r
                                                {\r
                                                /* Check if endpoint is empty - if so clear it and wait until ready for next packet */\r
                                                if (!(Endpoint_BytesInEndpoint()))\r
                                                {\r

-                                                       Endpoint_ClearSetupOUT();\r
-                                                       while (!(Endpoint_IsSetupOUTReceived()));\r
+                                                       Endpoint_ClearControlOUT();\r
+                                                       while (!(Endpoint_IsOUTReceived()));\r

                                                }\r
 \r
                                                /* Write the next data word to the FLASH page */\r
                                                }\r
 \r
                                                /* Write the next data word to the FLASH page */\r


@@ -142,11 +142,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                        boot_rww_enable();\r
                                }\r
 \r
                                        boot_rww_enable();\r
                                }\r
 \r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r

diff --git a/Demos/Device/AudioInput/AudioInput.c b/Demos/Device/AudioInput/AudioInput.c
index fca24c3..c016694 100644 (file)
--- a/Demos/Device/AudioInput/AudioInput.c
+++ b/Demos/Device/AudioInput/AudioInput.c
@@ -36,12 +36,6 @@
 \r
 #include "AudioInput.h"\r
 \r
 \r
 #include "AudioInput.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA AudioIn App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -145,7 +139,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        {\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r
                        {\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */\r
                                if (wValue)\r
                                \r
                                /* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */\r
                                if (wValue)\r


@@ -160,8 +154,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                }\r
                                \r
                                /* Acknowledge status stage */\r
                                }\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
 \r
                        break;\r
                        }\r
 \r
                        break;\r


@@ -201,8 +195,8 @@ TASK(USB_Audio_Task)
        /* Select the audio stream endpoint */\r
        Endpoint_SelectEndpoint(AUDIO_STREAM_EPNUM);\r
        \r
        /* Select the audio stream endpoint */\r
        Endpoint_SelectEndpoint(AUDIO_STREAM_EPNUM);\r
        \r

-       /* Check if the current endpoint can be read from (contains a packet) and that the next sample should be stored */\r
-       if (Endpoint_ReadWriteAllowed() && (TIFR0 & (1 << OCF0A)))\r
+       /* Check if the current endpoint can be written to and that the next sample should be stored */\r
+       if (Endpoint_IsINReady() && (TIFR0 & (1 << OCF0A)))\r

        {\r
                /* Clear the sample reload timer */\r
                TIFR0 |= (1 << OCF0A);\r
        {\r
                /* Clear the sample reload timer */\r
                TIFR0 |= (1 << OCF0A);\r


@@ -219,10 +213,10 @@ TASK(USB_Audio_Task)
                Endpoint_Write_Word_LE(AudioSample);\r
 \r
                /* Check to see if the bank is now full */\r
                Endpoint_Write_Word_LE(AudioSample);\r
 \r
                /* Check to see if the bank is now full */\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                        /* Send the full packet to the host */\r
                {\r
                        /* Send the full packet to the host */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearIN();\r

                }\r
        }\r
 }\r
                }\r
        }\r
 }\r

diff --git a/Demos/Device/AudioInput/AudioInput.h b/Demos/Device/AudioInput/AudioInput.h
index 02c8380..c068baf 100644 (file)
--- a/Demos/Device/AudioInput/AudioInput.h
+++ b/Demos/Device/AudioInput/AudioInput.h
@@ -44,7 +44,6 @@
                #include "Descriptors.h"\r
                                \r
                #include <LUFA/Version.h>                      // Library Version Information\r
                #include "Descriptors.h"\r
                                \r
                #include <LUFA/Version.h>                      // Library Version Information\r

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

                #include <LUFA/Drivers/USB/USB.h>              // USB Functionality\r
                #include <LUFA/Drivers/Board/LEDs.h>           // LEDs driver\r
                #include <LUFA/Drivers/AT90USBXXX/ADC.h>       // ADC driver\r
                #include <LUFA/Drivers/USB/USB.h>              // USB Functionality\r
                #include <LUFA/Drivers/Board/LEDs.h>           // LEDs driver\r
                #include <LUFA/Drivers/AT90USBXXX/ADC.h>       // ADC driver\r

diff --git a/Demos/Device/AudioOutput/AudioOutput.c b/Demos/Device/AudioOutput/AudioOutput.c
index ffeee41..fcd8812 100644 (file)
--- a/Demos/Device/AudioOutput/AudioOutput.c
+++ b/Demos/Device/AudioOutput/AudioOutput.c
@@ -36,12 +36,6 @@
  \r
 #include "AudioOutput.h"\r
 \r
  \r
 #include "AudioOutput.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA AudioOut App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -172,7 +166,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        {\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r
                        {\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */\r
                                if (wValue)\r
                                \r
                                /* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */\r
                                if (wValue)\r


@@ -187,8 +181,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                }\r
                                \r
                                /* Acknowledge status stage */\r
                                }\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
 \r
                        break;\r
                        }\r
 \r
                        break;\r


@@ -231,7 +225,7 @@ TASK(USB_Audio_Task)
        Endpoint_SelectEndpoint(AUDIO_STREAM_EPNUM);\r
        \r
        /* Check if the current endpoint can be read from (contains a packet) and that the next sample should be read */\r
        Endpoint_SelectEndpoint(AUDIO_STREAM_EPNUM);\r
        \r
        /* Check if the current endpoint can be read from (contains a packet) and that the next sample should be read */\r

-       if (Endpoint_ReadWriteAllowed() && (TIFR0 & (1 << OCF0A)))\r
+       if (Endpoint_IsOUTReceived() && (TIFR0 & (1 << OCF0A)))\r

        {\r
                /* Clear the sample reload timer */\r
                TIFR0 |= (1 << OCF0A);\r
        {\r
                /* Clear the sample reload timer */\r
                TIFR0 |= (1 << OCF0A);\r


@@ -241,10 +235,10 @@ TASK(USB_Audio_Task)
                int16_t RightSample_16Bit = (int16_t)Endpoint_Read_Word_LE();\r
 \r
                /* Check to see if the bank is now empty */\r
                int16_t RightSample_16Bit = (int16_t)Endpoint_Read_Word_LE();\r
 \r
                /* Check to see if the bank is now empty */\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                        /* Acknowledge the packet, clear the bank ready for the next packet */\r
                {\r
                        /* Acknowledge the packet, clear the bank ready for the next packet */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\r

                }\r
 \r
                /* Massage signed 16-bit left and right audio samples into signed 8-bit */\r
                }\r
 \r
                /* Massage signed 16-bit left and right audio samples into signed 8-bit */\r

diff --git a/Demos/Device/AudioOutput/AudioOutput.h b/Demos/Device/AudioOutput/AudioOutput.h
index 0ad9e5b..05b24ad 100644 (file)
--- a/Demos/Device/AudioOutput/AudioOutput.h
+++ b/Demos/Device/AudioOutput/AudioOutput.h
@@ -44,7 +44,6 @@
                #include "Descriptors.h"\r
                \r
                #include <LUFA/Version.h>                    // Library Version Information\r
                #include "Descriptors.h"\r
                \r
                #include <LUFA/Version.h>                    // Library Version Information\r

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

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

diff --git a/Demos/Device/CDC/CDC.c b/Demos/Device/CDC/CDC.c
index 5e153f6..3dc6240 100644 (file)
--- a/Demos/Device/CDC/CDC.c
+++ b/Demos/Device/CDC/CDC.c
@@ -36,12 +36,6 @@
 \r
 #include "CDC.h"\r
 \r
 \r
 #include "CDC.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA CDC App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -172,13 +166,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {       \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {       \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
                                /* Write the line coding data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
 \r
                                /* Write the line coding data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -186,13 +180,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
                                /* Read the line coding data in from the host into the global struct */\r
                                Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r
 \r
                                /* Read the line coding data in from the host into the global struct */\r
                                Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

                        }\r
        \r
                        break;\r
                        }\r
        \r
                        break;\r


@@ -211,11 +205,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 #endif\r
                                \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
 #endif\r
                                \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
        \r
                        break;\r
                        }\r
        \r
                        break;\r


@@ -276,7 +270,7 @@ TASK(CDC_Task)
        Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
        Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
        Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));\r
        Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
        Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
        Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));\r

-       Endpoint_ClearCurrentBank();\r
+       Endpoint_ClearIN();\r

 #endif\r
 \r
        /* Determine if a joystick action has occurred */\r
 #endif\r
 \r
        /* Determine if a joystick action has occurred */\r


@@ -307,19 +301,19 @@ TASK(CDC_Task)
                Endpoint_Write_Stream_LE(ReportString, strlen(ReportString));\r
                \r
                /* Finalize the stream transfer to send the last packet */\r
                Endpoint_Write_Stream_LE(ReportString, strlen(ReportString));\r
                \r
                /* Finalize the stream transfer to send the last packet */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearIN();\r

 \r
                /* Wait until the endpoint is ready for another packet */\r
 \r
                /* Wait until the endpoint is ready for another packet */\r

-               while (!(Endpoint_ReadWriteAllowed()));\r
+               while (!(Endpoint_IsINReady()));\r

                \r
                /* Send an empty packet to ensure that the host does not buffer data sent to it */\r
                \r
                /* Send an empty packet to ensure that the host does not buffer data sent to it */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearIN();\r

        }\r
 \r
        /* Select the Serial Rx Endpoint */\r
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
        \r
        /* Throw away any received data from the host */\r
        }\r
 \r
        /* Select the Serial Rx Endpoint */\r
        Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
        \r
        /* Throw away any received data from the host */\r

-       if (Endpoint_ReadWriteAllowed())\r
-         Endpoint_ClearCurrentBank();\r
+       if (Endpoint_IsOUTReceived())\r
+         Endpoint_ClearOUT();\r

 }\r
 }\r

diff --git a/Demos/Device/CDC/CDC.h b/Demos/Device/CDC/CDC.h
index a36fdc9..1537f0b 100644 (file)
--- a/Demos/Device/CDC/CDC.h
+++ b/Demos/Device/CDC/CDC.h
@@ -45,7 +45,6 @@
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>                        // Library Version Information\r
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>                        // Library Version Information\r

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

                #include <LUFA/Drivers/USB/USB.h>                // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>         // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>             // LEDs driver\r
                #include <LUFA/Drivers/USB/USB.h>                // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>         // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>             // LEDs driver\r

diff --git a/Demos/Device/DualCDC/DualCDC.c b/Demos/Device/DualCDC/DualCDC.c
index fecbaff..56eebb3 100644 (file)
--- a/Demos/Device/DualCDC/DualCDC.c
+++ b/Demos/Device/DualCDC/DualCDC.c
@@ -36,12 +36,6 @@
  \r
 #include "DualCDC.h"\r
 \r
  \r
 #include "DualCDC.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA DualCDC App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -195,7 +189,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
        uint8_t* LineCodingData;\r
 \r
        /* Discard the unused wValue parameter */\r
        uint8_t* LineCodingData;\r
 \r
        /* Discard the unused wValue parameter */\r

-       Endpoint_Ignore_Word();\r
+       Endpoint_Discard_Word();\r

 \r
        /* wIndex indicates the interface being controlled */\r
        uint16_t wIndex = Endpoint_Read_Word_LE();\r
 \r
        /* wIndex indicates the interface being controlled */\r
        uint16_t wIndex = Endpoint_Read_Word_LE();\r


@@ -210,13 +204,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {       \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {       \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
                                /* Write the line coding data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
 \r
                                /* Write the line coding data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -224,13 +218,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
                                /* Read the line coding data in from the host into the global struct */\r
                                Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r
 \r
                                /* Read the line coding data in from the host into the global struct */\r
                                Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

                        }\r
        \r
                        break;\r
                        }\r
        \r
                        break;\r


@@ -238,11 +232,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
        \r
                        break;\r
                        }\r
        \r
                        break;\r


@@ -313,15 +307,21 @@ TASK(CDC1_Task)
                Endpoint_Write_Stream_LE(ReportString, strlen(ReportString));\r
                \r
                /* Finalize the stream transfer to send the last packet */\r
                Endpoint_Write_Stream_LE(ReportString, strlen(ReportString));\r
                \r
                /* Finalize the stream transfer to send the last packet */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearIN();\r
+\r
+               /* Wait until the endpoint is ready for another packet */\r
+               while (!(Endpoint_IsINReady()));\r
+               \r
+               /* Send an empty packet to ensure that the host does not buffer data sent to it */\r
+               Endpoint_ClearIN();\r

        }\r
 \r
        /* Select the Serial Rx Endpoint */\r
        Endpoint_SelectEndpoint(CDC1_RX_EPNUM);\r
        \r
        /* Throw away any received data from the host */\r
        }\r
 \r
        /* Select the Serial Rx Endpoint */\r
        Endpoint_SelectEndpoint(CDC1_RX_EPNUM);\r
        \r
        /* Throw away any received data from the host */\r

-       if (Endpoint_ReadWriteAllowed())\r
-         Endpoint_ClearCurrentBank();\r
+       if (Endpoint_IsOUTReceived())\r
+         Endpoint_ClearOUT();\r

 }\r
 \r
 /** Function to manage CDC data transmission and reception to and from the host for the second CDC interface, which echoes back\r
 }\r
 \r
 /** Function to manage CDC data transmission and reception to and from the host for the second CDC interface, which echoes back\r


@@ -333,7 +333,7 @@ TASK(CDC2_Task)
        Endpoint_SelectEndpoint(CDC2_RX_EPNUM);\r
        \r
        /* Check to see if any data has been received */\r
        Endpoint_SelectEndpoint(CDC2_RX_EPNUM);\r
        \r
        /* Check to see if any data has been received */\r

-       if (Endpoint_ReadWriteAllowed())\r
+       if (Endpoint_IsOUTReceived())\r

        {\r
                /* Create a temp buffer big enough to hold the incoming endpoint packet */\r
                uint8_t  Buffer[Endpoint_BytesInEndpoint()];\r
        {\r
                /* Create a temp buffer big enough to hold the incoming endpoint packet */\r
                uint8_t  Buffer[Endpoint_BytesInEndpoint()];\r


@@ -345,7 +345,7 @@ TASK(CDC2_Task)
                Endpoint_Read_Stream_LE(&Buffer, DataLength);\r
 \r
                /* Finalize the stream transfer to send the last packet */\r
                Endpoint_Read_Stream_LE(&Buffer, DataLength);\r
 \r
                /* Finalize the stream transfer to send the last packet */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearOUT();\r

 \r
                /* Select the Serial Tx Endpoint */\r
                Endpoint_SelectEndpoint(CDC2_TX_EPNUM);\r
 \r
                /* Select the Serial Tx Endpoint */\r
                Endpoint_SelectEndpoint(CDC2_TX_EPNUM);\r


@@ -354,6 +354,12 @@ TASK(CDC2_Task)
                Endpoint_Write_Stream_LE(&Buffer, DataLength);\r
 \r
                /* Finalize the stream transfer to send the last packet */\r
                Endpoint_Write_Stream_LE(&Buffer, DataLength);\r
 \r
                /* Finalize the stream transfer to send the last packet */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearIN();\r
+\r
+               /* Wait until the endpoint is ready for the next packet */\r
+               while (!(Endpoint_IsINReady()));\r
+\r
+               /* Send an empty packet to prevent host buffering */\r
+               Endpoint_ClearIN();\r

        }\r
 }\r
        }\r
 }\r

diff --git a/Demos/Device/DualCDC/DualCDC.h b/Demos/Device/DualCDC/DualCDC.h
index 84be114..65f661f 100644 (file)
--- a/Demos/Device/DualCDC/DualCDC.h
+++ b/Demos/Device/DualCDC/DualCDC.h
@@ -45,7 +45,6 @@
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>                        // Library Version Information\r
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>                        // Library Version Information\r

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

                #include <LUFA/Drivers/USB/USB.h>                // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>         // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>             // LEDs driver\r
                #include <LUFA/Drivers/USB/USB.h>                // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>         // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>             // LEDs driver\r

diff --git a/Demos/Device/GenericHID/GenericHID.c b/Demos/Device/GenericHID/GenericHID.c
index 3b5f972..a9ecfa7 100644 (file)
--- a/Demos/Device/GenericHID/GenericHID.c
+++ b/Demos/Device/GenericHID/GenericHID.c
@@ -36,12 +36,6 @@
 \r
 #include "GenericHID.h"\r
 \r
 \r
 #include "GenericHID.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA GenHID App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -171,7 +165,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                case REQ_GetReport:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                case REQ_GetReport:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

        \r
                                uint8_t GenericData[GENERIC_REPORT_SIZE];\r
                                \r
        \r
                                uint8_t GenericData[GENERIC_REPORT_SIZE];\r
                                \r


@@ -181,32 +175,32 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                Endpoint_Write_Control_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                Endpoint_Write_Control_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                \r
                        break;\r
                case REQ_SetReport:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
                \r
                        break;\r
                case REQ_SetReport:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Wait until the generic report has been sent by the host */\r
                                \r
                                /* Wait until the generic report has been sent by the host */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                               while (!(Endpoint_IsOUTReceived()));\r

 \r
                                uint8_t GenericData[GENERIC_REPORT_SIZE];\r
 \r
 \r
                                uint8_t GenericData[GENERIC_REPORT_SIZE];\r
 \r

-                               Endpoint_Read_Control_Stream(&GenericData, sizeof(GenericData));\r
+                               Endpoint_Read_Control_Stream_LE(&GenericData, sizeof(GenericData));\r

 \r
                                ProcessGenericHIDReport(GenericData);\r
                        \r
                                /* Clear the endpoint data */\r
 \r
                                ProcessGenericHIDReport(GenericData);\r
                        \r
                                /* Clear the endpoint data */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

 \r
                                /* Wait until the host is ready to receive the request confirmation */\r
 \r
                                /* Wait until the host is ready to receive the request confirmation */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
+                               while (!(Endpoint_IsINReady()));\r

                                \r
                                /* Handshake the request by sending an empty IN packet */\r
                                \r
                                /* Handshake the request by sending an empty IN packet */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -280,24 +274,30 @@ TASK(USB_HID_Report)
        {\r
                Endpoint_SelectEndpoint(GENERIC_OUT_EPNUM);\r
                \r
        {\r
                Endpoint_SelectEndpoint(GENERIC_OUT_EPNUM);\r
                \r

-               if (Endpoint_ReadWriteAllowed())\r
+               /* Check to see if a packet has been sent from the host */\r
+               if (Endpoint_IsOUTReceived())\r

                {\r
                {\r

-                       /* Create a temporary buffer to hold the read in report from the host */\r
-                       uint8_t GenericData[GENERIC_REPORT_SIZE];\r
-                       \r
-                       /* Read Generic Report Data */\r
-                       Endpoint_Read_Stream_LE(&GenericData, sizeof(GenericData));\r
-                       \r
-                       /* Process Generic Report Data */\r
-                       ProcessGenericHIDReport(GenericData);\r
+                       /* Check to see if the packet contains data */\r
+                       if (Endpoint_IsReadWriteAllowed())\r
+                       {\r
+                               /* Create a temporary buffer to hold the read in report from the host */\r
+                               uint8_t GenericData[GENERIC_REPORT_SIZE];\r
+                               \r
+                               /* Read Generic Report Data */\r
+                               Endpoint_Read_Stream_LE(&GenericData, sizeof(GenericData));\r
+                               \r
+                               /* Process Generic Report Data */\r
+                               ProcessGenericHIDReport(GenericData);\r
+                       }\r

 \r
                        /* Finalize the stream transfer to send the last packet */\r
 \r
                        /* Finalize the stream transfer to send the last packet */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\r

                }       \r
 \r
                Endpoint_SelectEndpoint(GENERIC_IN_EPNUM);\r
                \r
                }       \r
 \r
                Endpoint_SelectEndpoint(GENERIC_IN_EPNUM);\r
                \r

-               if (Endpoint_ReadWriteAllowed())\r
+               /* Check to see if the host is ready to accept another packet */\r
+               if (Endpoint_IsINReady())\r

                {\r
                        /* Create a temporary buffer to hold the report to send to the host */\r
                        uint8_t GenericData[GENERIC_REPORT_SIZE];\r
                {\r
                        /* Create a temporary buffer to hold the report to send to the host */\r
                        uint8_t GenericData[GENERIC_REPORT_SIZE];\r


@@ -309,7 +309,7 @@ TASK(USB_HID_Report)
                        Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                        /* Finalize the stream transfer to send the last packet */\r
                        Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                        /* Finalize the stream transfer to send the last packet */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearIN();\r

                }\r
        }\r
 }\r
                }\r
        }\r
 }\r


@@ -363,7 +363,7 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
                Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                /* Finalize the stream transfer to send the last packet */\r
                Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                /* Finalize the stream transfer to send the last packet */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearIN();\r

        }\r
 \r
        /* Check if Generic OUT endpoint has interrupted */\r
        }\r
 \r
        /* Check if Generic OUT endpoint has interrupted */\r


@@ -388,7 +388,7 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
                ProcessGenericHIDReport(GenericData);\r
 \r
                /* Finalize the stream transfer to send the last packet */\r
                ProcessGenericHIDReport(GenericData);\r
 \r
                /* Finalize the stream transfer to send the last packet */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearOUT();\r

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

diff --git a/Demos/Device/GenericHID/GenericHID.h b/Demos/Device/GenericHID/GenericHID.h
index d13e6de..817d377 100644 (file)
--- a/Demos/Device/GenericHID/GenericHID.h
+++ b/Demos/Device/GenericHID/GenericHID.h
@@ -48,7 +48,6 @@
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r
                #include <LUFA/Scheduler/Scheduler.h>        // Simple scheduler for task management\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r
                #include <LUFA/Scheduler/Scheduler.h>        // Simple scheduler for task management\r

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

                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
                        \r
                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
                        \r

diff --git a/Demos/Device/Joystick/Joystick.c b/Demos/Device/Joystick/Joystick.c
index cd88227..c5d90e7 100644 (file)
--- a/Demos/Device/Joystick/Joystick.c
+++ b/Demos/Device/Joystick/Joystick.c
@@ -36,12 +36,6 @@
 \r
 #include "Joystick.h"\r
 \r
 \r
 #include "Joystick.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA Joystick App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -151,13 +145,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                if (wLength > sizeof(JoystickReportData))\r
                                  wLength = sizeof(JoystickReportData);\r
 \r
                                if (wLength > sizeof(JoystickReportData))\r
                                  wLength = sizeof(JoystickReportData);\r
 \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&JoystickReportData, wLength);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&JoystickReportData, wLength);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                \r
                        break;\r
                        }\r
                \r
                        break;\r


@@ -241,8 +235,8 @@ TASK(USB_Joystick_Report)
                /* Select the Joystick Report Endpoint */\r
                Endpoint_SelectEndpoint(JOYSTICK_EPNUM);\r
 \r
                /* Select the Joystick Report Endpoint */\r
                Endpoint_SelectEndpoint(JOYSTICK_EPNUM);\r
 \r

-               /* Check if Joystick Endpoint Ready for Read/Write */\r
-               if (Endpoint_ReadWriteAllowed())\r
+               /* Check to see if the host is ready for another packet */\r
+               if (Endpoint_IsINReady())\r

                {\r
                        USB_JoystickReport_Data_t JoystickReportData;\r
                        \r
                {\r
                        USB_JoystickReport_Data_t JoystickReportData;\r
                        \r


@@ -253,12 +247,10 @@ TASK(USB_Joystick_Report)
                        Endpoint_Write_Stream_LE(&JoystickReportData, sizeof(JoystickReportData));\r
 \r
                        /* Finalize the stream transfer to send the last packet */\r
                        Endpoint_Write_Stream_LE(&JoystickReportData, sizeof(JoystickReportData));\r
 \r
                        /* Finalize the stream transfer to send the last packet */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearIN();\r

                        \r
                        /* Clear the report data afterwards */\r
                        \r
                        /* Clear the report data afterwards */\r

-                       JoystickReportData.X      = 0;\r
-                       JoystickReportData.Y      = 0;\r
-                       JoystickReportData.Button = 0;\r
+                       memset(&JoystickReportData, 0, sizeof(JoystickReportData));\r

                }\r
        }\r
 }\r
                }\r
        }\r
 }\r

diff --git a/Demos/Device/Joystick/Joystick.h b/Demos/Device/Joystick/Joystick.h
index 79c7e49..2a5cc25 100644 (file)
--- a/Demos/Device/Joystick/Joystick.h
+++ b/Demos/Device/Joystick/Joystick.h
@@ -45,7 +45,6 @@
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r

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

                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>     // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>     // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r

diff --git a/Demos/Device/Keyboard/Keyboard.c b/Demos/Device/Keyboard/Keyboard.c
index d118ede..8c4157a 100644 (file)
--- a/Demos/Device/Keyboard/Keyboard.c
+++ b/Demos/Device/Keyboard/Keyboard.c
@@ -37,12 +37,6 @@
  \r
 #include "Keyboard.h"\r
 \r
  \r
 #include "Keyboard.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA Keyboard App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -222,23 +216,23 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                if (wLength > sizeof(KeyboardReportData))\r
                                  wLength = sizeof(KeyboardReportData);\r
 \r
                                if (wLength > sizeof(KeyboardReportData))\r
                                  wLength = sizeof(KeyboardReportData);\r
 \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&KeyboardReportData, wLength);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&KeyboardReportData, wLength);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                \r
                        break;\r
                case REQ_SetReport:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
                \r
                        break;\r
                case REQ_SetReport:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Wait until the LED report has been sent by the host */\r
                                \r
                                /* Wait until the LED report has been sent by the host */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                               while (!(Endpoint_IsOUTReceived()));\r

 \r
                                /* Read in the LED report from the host */\r
                                uint8_t LEDStatus = Endpoint_Read_Byte();\r
 \r
                                /* Read in the LED report from the host */\r
                                uint8_t LEDStatus = Endpoint_Read_Byte();\r


@@ -247,28 +241,28 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                ProcessLEDReport(LEDStatus);\r
                        \r
                                /* Clear the endpoint data */\r
                                ProcessLEDReport(LEDStatus);\r
                        \r
                                /* Clear the endpoint data */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
                        \r
                        break;\r
                case REQ_GetProtocol:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
                        \r
                        break;\r
                case REQ_GetProtocol:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Write the current protocol flag to the host */\r
                                Endpoint_Write_Byte(UsingReportProtocol);\r
                                \r
                                /* Send the flag to the host */\r
                                \r
                                /* Write the current protocol flag to the host */\r
                                Endpoint_Write_Byte(UsingReportProtocol);\r
                                \r
                                /* Send the flag to the host */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
-                               Endpoint_ClearSetupOUT();\r
+                               while (!(Endpoint_IsOUTReceived()));\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -278,14 +272,14 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                /* Read in the wValue parameter containing the new protocol mode */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                                                \r
                                /* Read in the wValue parameter containing the new protocol mode */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                                                \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
                                /* Set or clear the flag depending on what the host indicates that the current Protocol should be */\r
                                UsingReportProtocol = (wValue != 0x0000);\r
 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Set or clear the flag depending on what the host indicates that the current Protocol should be */\r
                                UsingReportProtocol = (wValue != 0x0000);\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -295,31 +289,31 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                /* Read in the wValue parameter containing the idle period */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r
                                /* Read in the wValue parameter containing the idle period */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Get idle period in MSB */\r
                                IdleCount = (wValue >> 8);\r
                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Get idle period in MSB */\r
                                IdleCount = (wValue >> 8);\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
                        \r
                        break;\r
                case REQ_GetIdle:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {               \r
                        }\r
                        \r
                        break;\r
                case REQ_GetIdle:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {               \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Write the current idle duration to the host */\r
                                Endpoint_Write_Byte(IdleCount);\r
                                \r
                                /* Send the flag to the host */\r
                                \r
                                /* Write the current idle duration to the host */\r
                                Endpoint_Write_Byte(IdleCount);\r
                                \r
                                /* Send the flag to the host */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
-                               Endpoint_ClearSetupOUT();\r
+                               while (!(Endpoint_IsOUTReceived()));\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
 \r
                        break;\r
                        }\r
 \r
                        break;\r


@@ -415,13 +409,13 @@ static inline void SendNextReport(void)
        Endpoint_SelectEndpoint(KEYBOARD_EPNUM);\r
 \r
        /* Check if Keyboard Endpoint Ready for Read/Write, and if we should send a report */\r
        Endpoint_SelectEndpoint(KEYBOARD_EPNUM);\r
 \r
        /* Check if Keyboard Endpoint Ready for Read/Write, and if we should send a report */\r

-       if (Endpoint_ReadWriteAllowed() && SendReport)\r
+       if (Endpoint_IsReadWriteAllowed() && SendReport)\r

        {\r
                /* Write Keyboard Report Data */\r
                Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData));\r
 \r
                /* Finalize the stream transfer to send the last packet */\r
        {\r
                /* Write Keyboard Report Data */\r
                Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData));\r
 \r
                /* Finalize the stream transfer to send the last packet */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearIN();\r

        }\r
 }\r
 \r
        }\r
 }\r
 \r


@@ -431,18 +425,22 @@ static inline void ReceiveNextReport(void)
        /* Select the Keyboard LED Report Endpoint */\r
        Endpoint_SelectEndpoint(KEYBOARD_LEDS_EPNUM);\r
 \r
        /* Select the Keyboard LED Report Endpoint */\r
        Endpoint_SelectEndpoint(KEYBOARD_LEDS_EPNUM);\r
 \r

-       /* Check if Keyboard LED Endpoint Ready for Read/Write */\r
-       if (!(Endpoint_ReadWriteAllowed()))\r
-         return;\r
-\r
-       /* Read in the LED report from the host */\r
-       uint8_t LEDReport = Endpoint_Read_Byte();\r
+       /* Check if Keyboard LED Endpoint contains a packet */\r
+       if (Endpoint_IsOUTReceived())\r
+       {\r
+               /* Check to see if the packet contains data */\r
+               if (Endpoint_IsReadWriteAllowed())\r
+               {\r
+                       /* Read in the LED report from the host */\r
+                       uint8_t LEDReport = Endpoint_Read_Byte();\r

 \r
 \r

-       /* Handshake the OUT Endpoint - clear endpoint and ready for next report */\r
-       Endpoint_ClearCurrentBank();\r
+                       /* Process the read LED report from the host */\r
+                       ProcessLEDReport(LEDReport);\r
+               }\r

 \r
 \r

-       /* Process the read LED report from the host */\r
-       ProcessLEDReport(LEDReport);\r
+               /* Handshake the OUT Endpoint - clear endpoint and ready for next report */\r
+               Endpoint_ClearOUT();\r
+       }\r

 }\r
 \r
 /** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to\r
 }\r
 \r
 /** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to\r

diff --git a/Demos/Device/Keyboard/Keyboard.h b/Demos/Device/Keyboard/Keyboard.h
index 143ffc6..76b7705 100644 (file)
--- a/Demos/Device/Keyboard/Keyboard.h
+++ b/Demos/Device/Keyboard/Keyboard.h
@@ -49,7 +49,6 @@
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r
                #include <LUFA/Scheduler/Scheduler.h>        // Simple scheduler for task management\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r
                #include <LUFA/Scheduler/Scheduler.h>        // Simple scheduler for task management\r

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

                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>     // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>     // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r

diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.c b/Demos/Device/KeyboardMouse/KeyboardMouse.c
index 3ee101b..71e23ab 100644 (file)
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.c
@@ -37,12 +37,6 @@
  \r
 #include "KeyboardMouse.h"\r
 \r
  \r
 #include "KeyboardMouse.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA MouseKBD App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -150,7 +144,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                case REQ_GetReport:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                case REQ_GetReport:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_Ignore_Word();\r
+                               Endpoint_Discard_Word();\r

                        \r
                                uint16_t wIndex = Endpoint_Read_Word_LE();\r
                                \r
                        \r
                                uint16_t wIndex = Endpoint_Read_Word_LE();\r
                                \r


@@ -173,7 +167,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                if (wLength > ReportSize)\r
                                  wLength = ReportSize;\r
 \r
                                if (wLength > ReportSize)\r
                                  wLength = ReportSize;\r
 \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(ReportData, wLength);\r
        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(ReportData, wLength);\r


@@ -182,17 +176,17 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                memset(ReportData, 0, ReportSize);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                memset(ReportData, 0, ReportSize);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                \r
                        break;\r
                case REQ_SetReport:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
                \r
                        break;\r
                case REQ_SetReport:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Wait until the LED report has been sent by the host */\r
                                \r
                                /* Wait until the LED report has been sent by the host */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                               while (!(Endpoint_IsOUTReceived()));\r

 \r
                                /* Read in the LED report from the host */\r
                                uint8_t LEDStatus = Endpoint_Read_Byte();\r
 \r
                                /* Read in the LED report from the host */\r
                                uint8_t LEDStatus = Endpoint_Read_Byte();\r


@@ -211,11 +205,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                LEDs_SetAllLEDs(LEDMask);\r
 \r
                                /* Clear the endpoint data */\r
                                LEDs_SetAllLEDs(LEDMask);\r
 \r
                                /* Clear the endpoint data */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -281,13 +275,13 @@ TASK(USB_Keyboard)
                Endpoint_SelectEndpoint(KEYBOARD_IN_EPNUM);\r
 \r
                /* Check if Keyboard Endpoint Ready for Read/Write */\r
                Endpoint_SelectEndpoint(KEYBOARD_IN_EPNUM);\r
 \r
                /* Check if Keyboard Endpoint Ready for Read/Write */\r

-               if (Endpoint_ReadWriteAllowed())\r
+               if (Endpoint_IsReadWriteAllowed())\r

                {\r
                        /* Write Keyboard Report Data */\r
                        Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData));\r
 \r
                        /* Finalize the stream transfer to send the last packet */\r
                {\r
                        /* Write Keyboard Report Data */\r
                        Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData));\r
 \r
                        /* Finalize the stream transfer to send the last packet */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearIN();\r

 \r
                        /* Clear the report data afterwards */\r
                        memset(&KeyboardReportData, 0, sizeof(KeyboardReportData));\r
 \r
                        /* Clear the report data afterwards */\r
                        memset(&KeyboardReportData, 0, sizeof(KeyboardReportData));\r


@@ -297,7 +291,7 @@ TASK(USB_Keyboard)
                Endpoint_SelectEndpoint(KEYBOARD_OUT_EPNUM);\r
 \r
                /* Check if Keyboard LED Endpoint Ready for Read/Write */\r
                Endpoint_SelectEndpoint(KEYBOARD_OUT_EPNUM);\r
 \r
                /* Check if Keyboard LED Endpoint Ready for Read/Write */\r

-               if (Endpoint_ReadWriteAllowed())\r
+               if (Endpoint_IsReadWriteAllowed())\r

                {               \r
                        /* Read in the LED report from the host */\r
                        uint8_t LEDStatus = Endpoint_Read_Byte();\r
                {               \r
                        /* Read in the LED report from the host */\r
                        uint8_t LEDStatus = Endpoint_Read_Byte();\r


@@ -316,7 +310,7 @@ TASK(USB_Keyboard)
                        LEDs_SetAllLEDs(LEDMask);\r
 \r
                        /* Handshake the OUT Endpoint - clear endpoint and ready for next report */\r
                        LEDs_SetAllLEDs(LEDMask);\r
 \r
                        /* Handshake the OUT Endpoint - clear endpoint and ready for next report */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\r

                }\r
        }\r
 }\r
                }\r
        }\r
 }\r


@@ -352,13 +346,13 @@ TASK(USB_Mouse)
                Endpoint_SelectEndpoint(MOUSE_IN_EPNUM);\r
 \r
                /* Check if Mouse Endpoint Ready for Read/Write */\r
                Endpoint_SelectEndpoint(MOUSE_IN_EPNUM);\r
 \r
                /* Check if Mouse Endpoint Ready for Read/Write */\r

-               if (Endpoint_ReadWriteAllowed())\r
+               if (Endpoint_IsReadWriteAllowed())\r

                {\r
                        /* Write Mouse Report Data */\r
                        Endpoint_Write_Stream_LE(&MouseReportData, sizeof(MouseReportData));\r
 \r
                        /* Finalize the stream transfer to send the last packet */\r
                {\r
                        /* Write Mouse Report Data */\r
                        Endpoint_Write_Stream_LE(&MouseReportData, sizeof(MouseReportData));\r
 \r
                        /* Finalize the stream transfer to send the last packet */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearIN();\r

 \r
                        /* Clear the report data afterwards */\r
                        memset(&MouseReportData, 0, sizeof(MouseReportData));\r
 \r
                        /* Clear the report data afterwards */\r
                        memset(&MouseReportData, 0, sizeof(MouseReportData));\r

diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.h b/Demos/Device/KeyboardMouse/KeyboardMouse.h
index 9794159..a69293c 100644 (file)
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.h
@@ -42,7 +42,6 @@
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r

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

                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>     // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>     // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r

diff --git a/Demos/Device/MIDI/MIDI.c b/Demos/Device/MIDI/MIDI.c
index c0e4f9d..e286dcb 100644 (file)
--- a/Demos/Device/MIDI/MIDI.c
+++ b/Demos/Device/MIDI/MIDI.c
@@ -36,12 +36,6 @@
 \r
 #include "MIDI.h"\r
 \r
 \r
 #include "MIDI.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA MIDI App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -134,7 +128,7 @@ TASK(USB_MIDI_Task)
        Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);\r
 \r
        /* Check if endpoint is ready to be written to */\r
        Endpoint_SelectEndpoint(MIDI_STREAM_IN_EPNUM);\r
 \r
        /* Check if endpoint is ready to be written to */\r

-       if (Endpoint_ReadWriteAllowed())\r
+       if (Endpoint_IsINReady())\r

        {\r
                /* Get current joystick mask, XOR with previous to detect joystick changes */\r
                uint8_t JoystickStatus  = Joystick_GetStatus();\r
        {\r
                /* Get current joystick mask, XOR with previous to detect joystick changes */\r
                uint8_t JoystickStatus  = Joystick_GetStatus();\r


@@ -166,8 +160,8 @@ TASK(USB_MIDI_Task)
        Endpoint_SelectEndpoint(MIDI_STREAM_OUT_EPNUM);\r
 \r
        /* Check if endpoint is ready to be read from, if so discard its (unused) data */\r
        Endpoint_SelectEndpoint(MIDI_STREAM_OUT_EPNUM);\r
 \r
        /* Check if endpoint is ready to be read from, if so discard its (unused) data */\r

-       if (Endpoint_ReadWriteAllowed())\r
-         Endpoint_ClearCurrentBank();\r
+       if (Endpoint_IsOUTReceived())\r
+         Endpoint_ClearOUT();\r

 }\r
 \r
 /** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to\r
 }\r
 \r
 /** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to\r


@@ -207,7 +201,7 @@ void UpdateStatus(uint8_t CurrentStatus)
 void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff, const uint8_t CableID, const uint8_t Channel)\r
 {\r
        /* Wait until endpoint ready for more data */\r
 void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff, const uint8_t CableID, const uint8_t Channel)\r
 {\r
        /* Wait until endpoint ready for more data */\r

-       while (!(Endpoint_ReadWriteAllowed()));\r
+       while (!(Endpoint_IsReadWriteAllowed()));\r

 \r
        /* Check if the message should be a Note On or Note Off command */\r
        uint8_t Command = ((OnOff)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r
 \r
        /* Check if the message should be a Note On or Note Off command */\r
        uint8_t Command = ((OnOff)? MIDI_COMMAND_NOTE_ON : MIDI_COMMAND_NOTE_OFF);\r


@@ -221,5 +215,5 @@ void SendMIDINoteChange(const uint8_t Pitch, const bool OnOff, const uint8_t Cab
        Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);\r
        \r
        /* Send the data in the endpoint to the host */\r
        Endpoint_Write_Byte(MIDI_STANDARD_VELOCITY);\r
        \r
        /* Send the data in the endpoint to the host */\r

-       Endpoint_ClearCurrentBank();\r
+       Endpoint_ClearIN();\r

 }\r
 }\r

diff --git a/Demos/Device/MIDI/MIDI.h b/Demos/Device/MIDI/MIDI.h
index 733a7ba..4e81c8c 100644 (file)
--- a/Demos/Device/MIDI/MIDI.h
+++ b/Demos/Device/MIDI/MIDI.h
@@ -45,7 +45,6 @@
                #include "Descriptors.h"\r
                                \r
                #include <LUFA/Version.h>                            // Library Version Information\r
                #include "Descriptors.h"\r
                                \r
                #include <LUFA/Version.h>                            // Library Version Information\r

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

                #include <LUFA/Drivers/USB/USB.h>                    // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>             // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>                 // LEDs driver\r
                #include <LUFA/Drivers/USB/USB.h>                    // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>             // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>                 // LEDs driver\r

diff --git a/Demos/Device/MassStorage/DataflashManager.c b/Demos/Device/MassStorage/DataflashManager.c
index 7b02ed6..4b62419 100644 (file)
--- a/Demos/Device/MassStorage/DataflashManager.c
+++ b/Demos/Device/MassStorage/DataflashManager.c
@@ -64,7 +64,7 @@ void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlo
        Dataflash_SendAddressBytes(0, CurrDFPageByte);\r
 \r
        /* Wait until endpoint is ready before continuing */\r
        Dataflash_SendAddressBytes(0, CurrDFPageByte);\r
 \r
        /* Wait until endpoint is ready before continuing */\r

-       while (!(Endpoint_ReadWriteAllowed()));\r
+       while (!(Endpoint_IsReadWriteAllowed()));\r

 \r
        while (TotalBlocks)\r
        {\r
 \r
        while (TotalBlocks)\r
        {\r


@@ -74,13 +74,13 @@ void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlo
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))\r
                {\r
                        /* Check if the endpoint is currently empty */\r
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))\r
                {\r
                        /* Check if the endpoint is currently empty */\r

-                       if (!(Endpoint_ReadWriteAllowed()))\r
+                       if (!(Endpoint_IsReadWriteAllowed()))\r

                        {\r
                                /* Clear the current endpoint bank */\r
                        {\r
                                /* Clear the current endpoint bank */\r

-                               Endpoint_ClearCurrentBank();\r
+                               Endpoint_ClearOUT();\r

                                \r
                                /* Wait until the host has sent another packet */\r
                                \r
                                /* Wait until the host has sent another packet */\r

-                               while (!(Endpoint_ReadWriteAllowed()));\r
+                               while (!(Endpoint_IsReadWriteAllowed()));\r

                        }\r
 \r
                        /* Check if end of dataflash page reached */\r
                        }\r
 \r
                        /* Check if end of dataflash page reached */\r


@@ -157,8 +157,8 @@ void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlo
        Dataflash_WaitWhileBusy();\r
 \r
        /* If the endpoint is empty, clear it ready for the next packet from the host */\r
        Dataflash_WaitWhileBusy();\r
 \r
        /* If the endpoint is empty, clear it ready for the next packet from the host */\r

-       if (!(Endpoint_ReadWriteAllowed()))\r
-         Endpoint_ClearCurrentBank();\r
+       if (!(Endpoint_IsReadWriteAllowed()))\r
+         Endpoint_ClearOUT();\r

 \r
        /* Deselect all dataflash chips */\r
        Dataflash_DeselectChip();\r
 \r
        /* Deselect all dataflash chips */\r
        Dataflash_DeselectChip();\r


@@ -187,7 +187,7 @@ void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBloc
        Dataflash_SendByte(0x00);\r
        \r
        /* Wait until endpoint is ready before continuing */\r
        Dataflash_SendByte(0x00);\r
        \r
        /* Wait until endpoint is ready before continuing */\r

-       while (!(Endpoint_ReadWriteAllowed()));\r
+       while (!(Endpoint_IsReadWriteAllowed()));\r

        \r
        while (TotalBlocks)\r
        {\r
        \r
        while (TotalBlocks)\r
        {\r


@@ -197,13 +197,13 @@ void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBloc
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))\r
                {\r
                        /* Check if the endpoint is currently full */\r
                while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))\r
                {\r
                        /* Check if the endpoint is currently full */\r

-                       if (!(Endpoint_ReadWriteAllowed()))\r
+                       if (!(Endpoint_IsReadWriteAllowed()))\r

                        {\r
                                /* Clear the endpoint bank to send its contents to the host */\r
                        {\r
                                /* Clear the endpoint bank to send its contents to the host */\r

-                               Endpoint_ClearCurrentBank();\r
+                               Endpoint_ClearIN();\r

                                \r
                                /* Wait until the endpoint is ready for more data */\r
                                \r
                                /* Wait until the endpoint is ready for more data */\r

-                               while (!(Endpoint_ReadWriteAllowed()));\r
+                               while (!(Endpoint_IsReadWriteAllowed()));\r

                        }\r
                        \r
                        /* Check if end of dataflash page reached */\r
                        }\r
                        \r
                        /* Check if end of dataflash page reached */\r


@@ -259,8 +259,8 @@ void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBloc
        }\r
        \r
        /* If the endpoint is full, send its contents to the host */\r
        }\r
        \r
        /* If the endpoint is full, send its contents to the host */\r

-       if (!(Endpoint_ReadWriteAllowed()))\r
-         Endpoint_ClearCurrentBank();\r
+       if (!(Endpoint_IsReadWriteAllowed()))\r
+         Endpoint_ClearIN();\r

 \r
        /* Deselect all dataflash chips */\r
        Dataflash_DeselectChip();\r
 \r
        /* Deselect all dataflash chips */\r
        Dataflash_DeselectChip();\r

diff --git a/Demos/Device/MassStorage/MassStorage.c b/Demos/Device/MassStorage/MassStorage.c
index 56bc19a..48ce5f3 100644 (file)
--- a/Demos/Device/MassStorage/MassStorage.c
+++ b/Demos/Device/MassStorage/MassStorage.c
@@ -37,12 +37,6 @@
 #define  INCLUDE_FROM_MASSSTORAGE_C\r
 #include "MassStorage.h"\r
 \r
 #define  INCLUDE_FROM_MASSSTORAGE_C\r
 #include "MassStorage.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA MassStore App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -159,30 +153,30 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                case REQ_MassStorageReset:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                case REQ_MassStorageReset:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
                                /* Indicate that the current transfer should be aborted */\r
                                IsMassStoreReset = true;                        \r
 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Indicate that the current transfer should be aborted */\r
                                IsMassStoreReset = true;                        \r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
 \r
                        break;\r
                case REQ_GetMaxLUN:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
 \r
                        break;\r
                case REQ_GetMaxLUN:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               /* Indicate to the host the number of supported LUNs (virtual disks) on the device */\r
-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
 \r

+                               /* Indicate to the host the number of supported LUNs (virtual disks) on the device */\r

                                Endpoint_Write_Byte(TOTAL_LUNS - 1);\r
                                \r
                                Endpoint_Write_Byte(TOTAL_LUNS - 1);\r
                                \r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
-                               Endpoint_ClearSetupOUT();\r
+                               while (!(Endpoint_IsOUTReceived()));\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -234,7 +228,7 @@ TASK(USB_MassStorage)
                Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);\r
                \r
                /* Check to see if a command from the host has been issued */\r
                Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);\r
                \r
                /* Check to see if a command from the host has been issued */\r

-               if (Endpoint_ReadWriteAllowed())\r
+               if (Endpoint_IsReadWriteAllowed())\r

                {       \r
                        /* Indicate busy */\r
                        UpdateStatus(Status_ProcessingCommandBlock);\r
                {       \r
                        /* Indicate busy */\r
                        UpdateStatus(Status_ProcessingCommandBlock);\r


@@ -326,7 +320,7 @@ static bool ReadInCommandBlock(void)
          return false;\r
 \r
        /* Finalize the stream transfer to send the last packet */\r
          return false;\r
 \r
        /* Finalize the stream transfer to send the last packet */\r

-       Endpoint_ClearCurrentBank();\r
+       Endpoint_ClearOUT();\r

        \r
        return true;\r
 }\r
        \r
        return true;\r
 }\r


@@ -367,7 +361,7 @@ static void ReturnCommandStatus(void)
          return;\r
 \r
        /* Finalize the stream transfer to send the last packet */\r
          return;\r
 \r
        /* Finalize the stream transfer to send the last packet */\r

-       Endpoint_ClearCurrentBank();\r
+       Endpoint_ClearIN();\r

 }\r
 \r
 /** Stream callback function for the Endpoint stream read and write functions. This callback will abort the current stream transfer\r
 }\r
 \r
 /** Stream callback function for the Endpoint stream read and write functions. This callback will abort the current stream transfer\r

diff --git a/Demos/Device/MassStorage/MassStorage.h b/Demos/Device/MassStorage/MassStorage.h
index a30e7f7..17acca6 100644 (file)
--- a/Demos/Device/MassStorage/MassStorage.h
+++ b/Demos/Device/MassStorage/MassStorage.h
@@ -46,7 +46,6 @@
                #include "DataflashManager.h"\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r
                #include "DataflashManager.h"\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r

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

                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
                #include <LUFA/Drivers/Board/Dataflash.h>    // Dataflash chip driver\r
                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
                #include <LUFA/Drivers/Board/Dataflash.h>    // Dataflash chip driver\r

diff --git a/Demos/Device/MassStorage/SCSI.c b/Demos/Device/MassStorage/SCSI.c
index d50f63d..e92be7f 100644 (file)
--- a/Demos/Device/MassStorage/SCSI.c
+++ b/Demos/Device/MassStorage/SCSI.c
@@ -174,7 +174,7 @@ static bool SCSI_Command_Inquiry(void)
        Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), AbortOnMassStoreReset);\r
 \r
        /* Finalize the stream transfer to send the last packet */\r
        Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), AbortOnMassStoreReset);\r
 \r
        /* Finalize the stream transfer to send the last packet */\r

-       Endpoint_ClearCurrentBank();\r
+       Endpoint_ClearIN();\r

 \r
        /* Succeed the command and update the bytes transferred counter */\r
        CommandBlock.DataTransferLength -= BytesTransferred;\r
 \r
        /* Succeed the command and update the bytes transferred counter */\r
        CommandBlock.DataTransferLength -= BytesTransferred;\r


@@ -201,7 +201,7 @@ static bool SCSI_Command_Request_Sense(void)
        Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), AbortOnMassStoreReset);\r
 \r
        /* Finalize the stream transfer to send the last packet */\r
        Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), AbortOnMassStoreReset);\r
 \r
        /* Finalize the stream transfer to send the last packet */\r

-       Endpoint_ClearCurrentBank();\r
+       Endpoint_ClearIN();\r

 \r
        /* Succeed the command and update the bytes transferred counter */\r
        CommandBlock.DataTransferLength -= BytesTransferred;\r
 \r
        /* Succeed the command and update the bytes transferred counter */\r
        CommandBlock.DataTransferLength -= BytesTransferred;\r


@@ -227,7 +227,7 @@ static bool SCSI_Command_Read_Capacity_10(void)
          return false;\r
 \r
        /* Send the endpoint data packet to the host */\r
          return false;\r
 \r
        /* Send the endpoint data packet to the host */\r

-       Endpoint_ClearCurrentBank();\r
+       Endpoint_ClearIN();\r

 \r
        /* Succeed the command and update the bytes transferred counter */\r
        CommandBlock.DataTransferLength -= 8;\r
 \r
        /* Succeed the command and update the bytes transferred counter */\r
        CommandBlock.DataTransferLength -= 8;\r

diff --git a/Demos/Device/Mouse/Mouse.c b/Demos/Device/Mouse/Mouse.c
index 076ac5b..e74002b 100644 (file)
--- a/Demos/Device/Mouse/Mouse.c
+++ b/Demos/Device/Mouse/Mouse.c
@@ -36,12 +36,6 @@
  \r
 #include "Mouse.h"\r
 \r
  \r
 #include "Mouse.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA Mouse App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -212,7 +206,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                if (wLength > sizeof(MouseReportData))\r
                                  wLength = sizeof(MouseReportData);\r
 \r
                                if (wLength > sizeof(MouseReportData))\r
                                  wLength = sizeof(MouseReportData);\r
 \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&MouseReportData, wLength);\r
        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&MouseReportData, wLength);\r


@@ -221,24 +215,24 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                memset(&MouseReportData, 0, sizeof(MouseReportData));\r
 \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                memset(&MouseReportData, 0, sizeof(MouseReportData));\r
 \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                \r
                        break;\r
                case REQ_GetProtocol:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
                \r
                        break;\r
                case REQ_GetProtocol:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Write the current protocol flag to the host */\r
                                Endpoint_Write_Byte(UsingReportProtocol);\r
                                \r
                                /* Send the flag to the host */\r
                                \r
                                /* Write the current protocol flag to the host */\r
                                Endpoint_Write_Byte(UsingReportProtocol);\r
                                \r
                                /* Send the flag to the host */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
-                               Endpoint_ClearSetupOUT();\r
+                               while (!(Endpoint_IsOUTReceived()));\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -248,14 +242,14 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                /* Read in the wValue parameter containing the new protocol mode */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r
                                /* Read in the wValue parameter containing the new protocol mode */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Set or clear the flag depending on what the host indicates that the current Protocol should be */\r
                                UsingReportProtocol = (wValue != 0x0000);\r
                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Set or clear the flag depending on what the host indicates that the current Protocol should be */\r
                                UsingReportProtocol = (wValue != 0x0000);\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -265,31 +259,31 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                /* Read in the wValue parameter containing the idle period */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r
                                /* Read in the wValue parameter containing the idle period */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Get idle period in MSB */\r
                                IdleCount = (wValue >> 8);\r
                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Get idle period in MSB */\r
                                IdleCount = (wValue >> 8);\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
                        \r
                        break;\r
                case REQ_GetIdle:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {               \r
                        }\r
                        \r
                        break;\r
                case REQ_GetIdle:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {               \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Write the current idle duration to the host */\r
                                Endpoint_Write_Byte(IdleCount);\r
                                \r
                                /* Send the flag to the host */\r
                                \r
                                /* Write the current idle duration to the host */\r
                                Endpoint_Write_Byte(IdleCount);\r
                                \r
                                /* Send the flag to the host */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
-                               Endpoint_ClearSetupOUT();\r
+                               while (!(Endpoint_IsOUTReceived()));\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
 \r
                        break;\r
                        }\r
 \r
                        break;\r


@@ -367,13 +361,13 @@ static inline void SendNextReport(void)
        Endpoint_SelectEndpoint(MOUSE_EPNUM);\r
 \r
        /* Check if Mouse Endpoint Ready for Read/Write and if we should send a new report */\r
        Endpoint_SelectEndpoint(MOUSE_EPNUM);\r
 \r
        /* Check if Mouse Endpoint Ready for Read/Write and if we should send a new report */\r

-       if (Endpoint_ReadWriteAllowed() && SendReport)\r
+       if (Endpoint_IsReadWriteAllowed() && SendReport)\r

        {\r
                /* Write Mouse Report Data */\r
                Endpoint_Write_Stream_LE(&MouseReportData, sizeof(MouseReportData));\r
                \r
                /* Finalize the stream transfer to send the last packet */\r
        {\r
                /* Write Mouse Report Data */\r
                Endpoint_Write_Stream_LE(&MouseReportData, sizeof(MouseReportData));\r
                \r
                /* Finalize the stream transfer to send the last packet */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearIN();\r

        }\r
 }\r
 \r
        }\r
 }\r
 \r

diff --git a/Demos/Device/Mouse/Mouse.h b/Demos/Device/Mouse/Mouse.h
index c9854a8..714f8d6 100644 (file)
--- a/Demos/Device/Mouse/Mouse.h
+++ b/Demos/Device/Mouse/Mouse.h
@@ -47,7 +47,6 @@
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r

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

                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>     // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Drivers/Board/Joystick.h>     // Joystick driver\r
                #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r

diff --git a/Demos/Device/RNDISEthernet/RNDISEthernet.c b/Demos/Device/RNDISEthernet/RNDISEthernet.c
index d573a76..5e14bb7 100644 (file)
--- a/Demos/Device/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/Device/RNDISEthernet/RNDISEthernet.c
@@ -36,12 +36,6 @@
 \r
 #include "RNDISEthernet.h"\r
 \r
 \r
 #include "RNDISEthernet.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA RNDIS App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -162,13 +156,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Clear the SETUP packet, ready for data transfer */\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Clear the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Read in the RNDIS message into the message buffer */\r
                                Endpoint_Read_Control_Stream_LE(RNDISMessageBuffer, wLength);\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r
                                \r
                                /* Read in the RNDIS message into the message buffer */\r
                                Endpoint_Read_Control_Stream_LE(RNDISMessageBuffer, wLength);\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

 \r
                                /* Process the RNDIS message */\r
                                ProcessRNDISControlMessage();\r
 \r
                                /* Process the RNDIS message */\r
                                ProcessRNDISControlMessage();\r


@@ -191,13 +185,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                  wLength = MessageHeader->MessageLength;\r
 \r
                                /* Clear the SETUP packet, ready for data transfer */\r
                                  wLength = MessageHeader->MessageLength;\r
 \r
                                /* Clear the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Write the message response data to the endpoint */\r
                                Endpoint_Write_Control_Stream_LE(RNDISMessageBuffer, wLength);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                \r
                                /* Write the message response data to the endpoint */\r
                                Endpoint_Write_Control_Stream_LE(RNDISMessageBuffer, wLength);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

 \r
                                /* Reset the message header once again after transmission */\r
                                MessageHeader->MessageLength = 0;\r
 \r
                                /* Reset the message header once again after transmission */\r
                                MessageHeader->MessageLength = 0;\r


@@ -247,7 +241,7 @@ TASK(RNDIS_Task)
        Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
 \r
        /* Check if a message response is ready for the host */\r
        Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
 \r
        /* Check if a message response is ready for the host */\r

-       if (Endpoint_ReadWriteAllowed() && ResponseReady)\r
+       if (Endpoint_IsINReady() && ResponseReady)\r

        {\r
                USB_Notification_t Notification = (USB_Notification_t)\r
                        {\r
        {\r
                USB_Notification_t Notification = (USB_Notification_t)\r
                        {\r


@@ -262,7 +256,7 @@ TASK(RNDIS_Task)
                Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
 \r
                /* Finalize the stream transfer to send the last packet */\r
                Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
 \r
                /* Finalize the stream transfer to send the last packet */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearIN();\r

 \r
                /* Indicate a response is no longer ready */\r
                ResponseReady = false;\r
 \r
                /* Indicate a response is no longer ready */\r
                ResponseReady = false;\r


@@ -278,7 +272,7 @@ TASK(RNDIS_Task)
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
                \r
                /* Check if the data OUT endpoint contains data, and that the IN buffer is empty */\r
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
                \r
                /* Check if the data OUT endpoint contains data, and that the IN buffer is empty */\r

-               if (Endpoint_ReadWriteAllowed() && !(FrameIN.FrameInBuffer))\r
+               if (Endpoint_IsOUTReceived() && !(FrameIN.FrameInBuffer))\r

                {\r
                        /* Read in the packet message header */\r
                        Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_PACKET_MSG_t));\r
                {\r
                        /* Read in the packet message header */\r
                        Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_PACKET_MSG_t));\r


@@ -294,7 +288,7 @@ TASK(RNDIS_Task)
                        Endpoint_Read_Stream_LE(FrameIN.FrameData, RNDISPacketHeader.DataLength);\r
 \r
                        /* Finalize the stream transfer to send the last packet */\r
                        Endpoint_Read_Stream_LE(FrameIN.FrameData, RNDISPacketHeader.DataLength);\r
 \r
                        /* Finalize the stream transfer to send the last packet */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\r

                        \r
                        /* Store the size of the Ethernet frame */\r
                        FrameIN.FrameLength = RNDISPacketHeader.DataLength;\r
                        \r
                        /* Store the size of the Ethernet frame */\r
                        FrameIN.FrameLength = RNDISPacketHeader.DataLength;\r


@@ -307,7 +301,7 @@ TASK(RNDIS_Task)
                Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
                \r
                /* Check if the data IN endpoint is ready for more data, and that the IN buffer is full */\r
                Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
                \r
                /* Check if the data IN endpoint is ready for more data, and that the IN buffer is full */\r

-               if (Endpoint_ReadWriteAllowed() && FrameOUT.FrameInBuffer)\r
+               if (Endpoint_IsINReady() && FrameOUT.FrameInBuffer)\r

                {\r
                        /* Clear the packet header with all 0s so that the relevant fields can be filled */\r
                        memset(&RNDISPacketHeader, 0, sizeof(RNDIS_PACKET_MSG_t));\r
                {\r
                        /* Clear the packet header with all 0s so that the relevant fields can be filled */\r
                        memset(&RNDISPacketHeader, 0, sizeof(RNDIS_PACKET_MSG_t));\r


@@ -325,7 +319,7 @@ TASK(RNDIS_Task)
                        Endpoint_Write_Stream_LE(FrameOUT.FrameData, RNDISPacketHeader.DataLength);\r
                        \r
                        /* Finalize the stream transfer to send the last packet */\r
                        Endpoint_Write_Stream_LE(FrameOUT.FrameData, RNDISPacketHeader.DataLength);\r
                        \r
                        /* Finalize the stream transfer to send the last packet */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearIN();\r

                        \r
                        /* Indicate Ethernet OUT buffer no longer full */\r
                        FrameOUT.FrameInBuffer = false;\r
                        \r
                        /* Indicate Ethernet OUT buffer no longer full */\r
                        FrameOUT.FrameInBuffer = false;\r

diff --git a/Demos/Device/RNDISEthernet/RNDISEthernet.h b/Demos/Device/RNDISEthernet/RNDISEthernet.h
index 83e49ce..f21ace7 100644 (file)
--- a/Demos/Device/RNDISEthernet/RNDISEthernet.h
+++ b/Demos/Device/RNDISEthernet/RNDISEthernet.h
@@ -52,7 +52,6 @@
                #include "Webserver.h"\r
 \r
                #include <LUFA/Version.h>                        // Library Version Information\r
                #include "Webserver.h"\r
 \r
                #include <LUFA/Version.h>                        // Library Version Information\r

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

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

diff --git a/Demos/Device/USBtoSerial/USBtoSerial.c b/Demos/Device/USBtoSerial/USBtoSerial.c
index a9f0434..87d531c 100644 (file)
--- a/Demos/Device/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/USBtoSerial/USBtoSerial.c
@@ -30,12 +30,6 @@
 \r
 #include "USBtoSerial.h"\r
 \r
 \r
 #include "USBtoSerial.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA USB RS232 App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -165,13 +159,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {       \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {       \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
                                /* Write the line coding data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(LineCoding));\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
 \r
                                /* Write the line coding data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(LineCoding));\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -179,13 +173,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
                                /* Read the line coding data in from the host into the global struct */\r
                                Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(LineCoding));\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r
 \r
                                /* Read the line coding data in from the host into the global struct */\r
                                Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(LineCoding));\r
 \r
                                /* Finalize the stream transfer to clear the last packet from the host */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

                                \r
                                /* Reconfigure the USART with the new settings */\r
                                ReconfigureUSART();\r
                                \r
                                /* Reconfigure the USART with the new settings */\r
                                ReconfigureUSART();\r


@@ -207,11 +201,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 #endif\r
                                \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
 #endif\r
                                \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
        \r
                        break;\r
                        }\r
        \r
                        break;\r


@@ -244,13 +238,13 @@ TASK(CDC_Task)
                Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
                Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
                Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));\r
                Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
                Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
                Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearIN();\r

 #endif\r
 \r
                /* Select the Serial Rx Endpoint */\r
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
                \r
 #endif\r
 \r
                /* Select the Serial Rx Endpoint */\r
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
                \r

-               if (Endpoint_ReadWriteAllowed())\r
+               if (Endpoint_IsOUTReceived())\r

                {\r
                        /* Read the received data endpoint into the transmission buffer */\r
                        while (Endpoint_BytesInEndpoint())\r
                {\r
                        /* Read the received data endpoint into the transmission buffer */\r
                        while (Endpoint_BytesInEndpoint())\r


@@ -263,7 +257,7 @@ TASK(CDC_Task)
                        }\r
                        \r
                        /* Clear the endpoint buffer */\r
                        }\r
                        \r
                        /* Clear the endpoint buffer */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\r

                }\r
                \r
                /* Check if Rx buffer contains data */\r
                }\r
                \r
                /* Check if Rx buffer contains data */\r


@@ -284,27 +278,20 @@ TASK(CDC_Task)
                if (Tx_Buffer.Elements)\r
                {\r
                        /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
                if (Tx_Buffer.Elements)\r
                {\r
                        /* Wait until Serial Tx Endpoint Ready for Read/Write */\r

-                       while (!(Endpoint_ReadWriteAllowed()));\r
-                       \r
-                       /* Check before sending the data if the endpoint is completely full */\r
-                       bool IsFull = (Endpoint_BytesInEndpoint() == CDC_TXRX_EPSIZE);\r
+                       while (!(Endpoint_IsReadWriteAllowed()));\r

                        \r
                        /* Write the transmission buffer contents to the received data endpoint */\r
                        while (Tx_Buffer.Elements && (Endpoint_BytesInEndpoint() < CDC_TXRX_EPSIZE))\r
                          Endpoint_Write_Byte(Buffer_GetElement(&Tx_Buffer));\r
                        \r
                        /* Send the data */\r
                        \r
                        /* Write the transmission buffer contents to the received data endpoint */\r
                        while (Tx_Buffer.Elements && (Endpoint_BytesInEndpoint() < CDC_TXRX_EPSIZE))\r
                          Endpoint_Write_Byte(Buffer_GetElement(&Tx_Buffer));\r
                        \r
                        /* Send the data */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearIN();\r

 \r
 \r

-                       /* If a full endpoint was sent, we need to send an empty packet afterwards to terminate the transfer */\r
-                       if (IsFull)\r
-                       {\r
-                               /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
-                               while (!(Endpoint_ReadWriteAllowed()));\r
+                       /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
+                       while (!(Endpoint_IsReadWriteAllowed()));\r

 \r
 \r

-                               /* Send an empty packet to terminate the transfer */\r
-                               Endpoint_ClearCurrentBank();\r
-                       }\r
+                       /* Send an empty packet to terminate the transfer */\r
+                       Endpoint_ClearIN();\r

                }\r
        }\r
 }\r
                }\r
        }\r
 }\r

diff --git a/Demos/Device/USBtoSerial/USBtoSerial.h b/Demos/Device/USBtoSerial/USBtoSerial.h
index 0926600..8fb2c16 100644 (file)
--- a/Demos/Device/USBtoSerial/USBtoSerial.h
+++ b/Demos/Device/USBtoSerial/USBtoSerial.h
@@ -46,7 +46,6 @@
                #include "RingBuff.h"\r
 \r
                #include <LUFA/Version.h>                         // Library Version Information\r
                #include "RingBuff.h"\r
 \r
                #include <LUFA/Version.h>                         // Library Version Information\r

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

                #include <LUFA/Drivers/USB/USB.h>                 // USB Functionality\r
                #include <LUFA/Drivers/AT90USBXXX/Serial.h>       // USART driver\r
                #include <LUFA/Drivers/Board/LEDs.h>              // LEDs driver\r
                #include <LUFA/Drivers/USB/USB.h>                 // USB Functionality\r
                #include <LUFA/Drivers/AT90USBXXX/Serial.h>       // USART driver\r
                #include <LUFA/Drivers/Board/LEDs.h>              // LEDs driver\r

diff --git a/Demos/Host/CDCHost/CDCHost.c b/Demos/Host/CDCHost/CDCHost.c
index 9ecf060..80d9939 100644 (file)
--- a/Demos/Host/CDCHost/CDCHost.c
+++ b/Demos/Host/CDCHost/CDCHost.c
@@ -36,12 +36,6 @@
  \r
 #include "CDCHost.h"\r
 \r
  \r
 #include "CDCHost.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA CDC Host App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -244,33 +238,37 @@ TASK(USB_CDC_Host)
                        /* Select and the data IN pipe */\r
                        Pipe_SelectPipe(CDC_DATAPIPE_IN);\r
 \r
                        /* Select and the data IN pipe */\r
                        Pipe_SelectPipe(CDC_DATAPIPE_IN);\r
 \r

-                       /* Check if data is in the pipe */\r
-                       if (Pipe_ReadWriteAllowed())\r
+                       /* Check to see if a packet has been received */\r
+                       if (Pipe_IsINReceived())\r

                        {\r
                        {\r

-                               /* Get the length of the pipe data, and create a new buffer to hold it */\r
-                               uint16_t BufferLength = Pipe_BytesInPipe();\r
-                               uint8_t Buffer[BufferLength];\r
-                               \r
-                               /* Read in the pipe data to the temporary buffer */\r
-                               Pipe_Read_Stream_LE(Buffer, BufferLength);\r
-                               \r
+                               /* Check if data is in the pipe */\r
+                               if (Pipe_IsReadWriteAllowed())\r
+                               {\r
+                                       /* Get the length of the pipe data, and create a new buffer to hold it */\r
+                                       uint16_t BufferLength = Pipe_BytesInPipe();\r
+                                       uint8_t Buffer[BufferLength];\r
+                                       \r
+                                       /* Read in the pipe data to the temporary buffer */\r
+                                       Pipe_Read_Stream_LE(Buffer, BufferLength);\r
+                                                                       \r
+                                       /* Print out the buffer contents to the USART */\r
+                                       for (uint16_t BufferByte = 0; BufferByte < BufferLength; BufferByte++)\r
+                                         putchar(Buffer[BufferByte]);\r
+                               }\r
+\r

                                /* Clear the pipe after it is read, ready for the next packet */\r
                                /* Clear the pipe after it is read, ready for the next packet */\r

-                               Pipe_ClearCurrentBank();\r
-                               \r
-                               /* Print out the buffer contents to the USART */\r
-                               for (uint16_t BufferByte = 0; BufferByte < BufferLength; BufferByte++)\r
-                                 putchar(Buffer[BufferByte]);\r
+                               Pipe_ClearIN();\r

                        }\r
 \r
                        /* Select and unfreeze the notification pipe */\r
                        Pipe_SelectPipe(CDC_NOTIFICATIONPIPE);\r
                        Pipe_Unfreeze();\r
                        \r
                        }\r
 \r
                        /* Select and unfreeze the notification pipe */\r
                        Pipe_SelectPipe(CDC_NOTIFICATIONPIPE);\r
                        Pipe_Unfreeze();\r
                        \r

-                       /* Check if data is in the pipe */\r
-                       if (Pipe_ReadWriteAllowed())\r
+                       /* Check if a packet has been received */\r
+                       if (Pipe_IsINReceived())\r

                        {\r
                                /* Discard the event notification */\r
                        {\r
                                /* Discard the event notification */\r

-                               Pipe_ClearCurrentBank();\r
+                               Pipe_ClearIN();\r

                        }\r
                        \r
                        /* Freeze notification IN pipe after use */\r
                        }\r
                        \r
                        /* Freeze notification IN pipe after use */\r

diff --git a/Demos/Host/CDCHost/CDCHost.h b/Demos/Host/CDCHost/CDCHost.h
index 21b9d67..c348aca 100644 (file)
--- a/Demos/Host/CDCHost/CDCHost.h
+++ b/Demos/Host/CDCHost/CDCHost.h
@@ -44,7 +44,6 @@
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

-               #include <LUFA/Common/ButtLoadTag.h>                     // PROGMEM tags readable by the ButtLoad project\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/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

diff --git a/Demos/Host/CDCHost/ConfigDescriptor.h b/Demos/Host/CDCHost/ConfigDescriptor.h
index 9db4b65..ea00f61 100644 (file)
--- a/Demos/Host/CDCHost/ConfigDescriptor.h
+++ b/Demos/Host/CDCHost/ConfigDescriptor.h
@@ -38,7 +38,6 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r

-               #include <LUFA/Drivers/USB/Class/ConfigDescriptor.h>     // Configuration Descriptor Parser\r

                \r
                #include "CDCHost.h"\r
                \r
                \r
                #include "CDCHost.h"\r
                \r

diff --git a/Demos/Host/GenericHIDHost/ConfigDescriptor.h b/Demos/Host/GenericHIDHost/ConfigDescriptor.h
index e35801a..fac7729 100644 (file)
--- a/Demos/Host/GenericHIDHost/ConfigDescriptor.h
+++ b/Demos/Host/GenericHIDHost/ConfigDescriptor.h
@@ -38,7 +38,6 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r

-               #include <LUFA/Drivers/USB/Class/ConfigDescriptor.h>     // Configuration Descriptor Parser\r

                \r
                #include "GenericHIDHost.h"\r
                \r
                \r
                #include "GenericHIDHost.h"\r
                \r

diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.c b/Demos/Host/GenericHIDHost/GenericHIDHost.c
index 716f1c3..b047841 100644 (file)
--- a/Demos/Host/GenericHIDHost/GenericHIDHost.c
+++ b/Demos/Host/GenericHIDHost/GenericHIDHost.c
@@ -36,12 +36,6 @@
  \r
 #include "GenericHIDHost.h"\r
 \r
  \r
 #include "GenericHIDHost.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA GenHid Host App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -185,30 +179,34 @@ void ReadNextReport(void)
        Pipe_SelectPipe(HID_DATA_IN_PIPE);\r
        Pipe_Unfreeze();\r
 \r
        Pipe_SelectPipe(HID_DATA_IN_PIPE);\r
        Pipe_Unfreeze();\r
 \r

-       /* Ensure pipe contains data and is ready to be read before continuing */\r
-       if (!(Pipe_ReadWriteAllowed()))\r
+       /* Check to see if a packet has been received */\r
+       if (!(Pipe_IsINReceived()))\r

        {\r
                #if !defined(INTERRUPT_DATA_PIPE)\r
                /* Refreeze HID data IN pipe */\r
                Pipe_Freeze();\r
                #endif\r
        {\r
                #if !defined(INTERRUPT_DATA_PIPE)\r
                /* Refreeze HID data IN pipe */\r
                Pipe_Freeze();\r
                #endif\r

-               \r
+                       \r

                return;\r
        }\r
        \r
                return;\r
        }\r
        \r

-       uint8_t ReportINData[Pipe_BytesInPipe()];\r
+       /* Ensure pipe contains data before trying to read from it */\r
+       if (Pipe_IsReadWriteAllowed())\r
+       {\r
+               uint8_t ReportINData[Pipe_BytesInPipe()];\r

 \r
 \r

-       /* Read in HID report data */\r
-       Pipe_Read_Stream_LE(&ReportINData, sizeof(ReportINData));                               \r
+               /* Read in HID report data */\r
+               Pipe_Read_Stream_LE(&ReportINData, sizeof(ReportINData));\r
+       \r
+               /* Print report data through the serial port */\r
+               for (uint16_t CurrByte = 0; CurrByte < sizeof(ReportINData); CurrByte++)\r
+                 printf_P(PSTR("0x%02X "), ReportINData[CurrByte]);\r
+               \r
+               puts_P(PSTR("\r\n"));\r
+       }\r

                \r
        /* Clear the IN endpoint, ready for next data packet */\r
                \r
        /* Clear the IN endpoint, ready for next data packet */\r

-       Pipe_ClearCurrentBank();\r
-       \r
-       /* Print report data through the serial port */\r
-       for (uint16_t CurrByte = 0; CurrByte < sizeof(ReportINData); CurrByte++)\r
-         printf_P(PSTR("0x%02X "), ReportINData[CurrByte]);\r
-       \r
-       puts_P(PSTR("\r\n"));\r
+       Pipe_ClearIN();\r

        \r
        #if !defined(INTERRUPT_DATA_PIPE)\r
        /* Refreeze HID data IN pipe */\r
        \r
        #if !defined(INTERRUPT_DATA_PIPE)\r
        /* Refreeze HID data IN pipe */\r


@@ -235,7 +233,7 @@ void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t Report
                Pipe_Unfreeze();\r
 \r
                /* Ensure pipe is ready to be written to before continuing */\r
                Pipe_Unfreeze();\r
 \r
                /* Ensure pipe is ready to be written to before continuing */\r

-               if (!(Pipe_ReadWriteAllowed()))\r
+               if (!(Pipe_IsOUTReady()))\r

                {\r
                        /* Refreeze the data OUT pipe */\r
                        Pipe_Freeze();\r
                {\r
                        /* Refreeze the data OUT pipe */\r
                        Pipe_Freeze();\r


@@ -251,7 +249,7 @@ void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t Report
                Pipe_Write_Stream_LE(ReportOUTData, ReportLength);                              \r
                        \r
                /* Clear the OUT endpoint, send last data packet */\r
                Pipe_Write_Stream_LE(ReportOUTData, ReportLength);                              \r
                        \r
                /* Clear the OUT endpoint, send last data packet */\r

-               Pipe_ClearCurrentBank();\r
+               Pipe_ClearOUT();\r

 \r
                /* Refreeze the data OUT pipe */\r
                Pipe_Freeze();\r
 \r
                /* Refreeze the data OUT pipe */\r
                Pipe_Freeze();\r

diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.h b/Demos/Host/GenericHIDHost/GenericHIDHost.h
index 99b4599..8483fa6 100644 (file)
--- a/Demos/Host/GenericHIDHost/GenericHIDHost.h
+++ b/Demos/Host/GenericHIDHost/GenericHIDHost.h
@@ -45,7 +45,6 @@
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

-               #include <LUFA/Common/ButtLoadTag.h>                     // PROGMEM tags readable by the ButtLoad project\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/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


@@ -94,6 +93,6 @@
        /* Function Prototypes: */\r
                void UpdateStatus(uint8_t CurrentStatus);\r
                void ReadNextReport(void);\r
        /* Function Prototypes: */\r
                void UpdateStatus(uint8_t CurrentStatus);\r
                void ReadNextReport(void);\r

-               void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength);\r
+               void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength);\r

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

diff --git a/Demos/Host/KeyboardHost/ConfigDescriptor.h b/Demos/Host/KeyboardHost/ConfigDescriptor.h
index 1d168b4..416315b 100644 (file)
--- a/Demos/Host/KeyboardHost/ConfigDescriptor.h
+++ b/Demos/Host/KeyboardHost/ConfigDescriptor.h
@@ -38,7 +38,6 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r

-               #include <LUFA/Drivers/USB/Class/ConfigDescriptor.h>     // Configuration Descriptor Parser\r

                \r
                #include "KeyboardHost.h"\r
                \r
                \r
                #include "KeyboardHost.h"\r
                \r

diff --git a/Demos/Host/KeyboardHost/KeyboardHost.c b/Demos/Host/KeyboardHost/KeyboardHost.c
index 947f232..35055ca 100644 (file)
--- a/Demos/Host/KeyboardHost/KeyboardHost.c
+++ b/Demos/Host/KeyboardHost/KeyboardHost.c
@@ -36,12 +36,6 @@
  \r
 #include "KeyboardHost.h"\r
 \r
  \r
 #include "KeyboardHost.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA KBD Host App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -191,52 +185,57 @@ void ReadNextReport(void)
        Pipe_Unfreeze();\r
        #endif\r
 \r
        Pipe_Unfreeze();\r
        #endif\r
 \r

-       /* Ensure pipe contains data and is ready to be read before continuing */\r
-       if (!(Pipe_ReadWriteAllowed()))\r
+       /* Check to see if a packet has been received */\r
+       if (!(Pipe_IsINReceived()))\r

        {\r
                #if !defined(INTERRUPT_DATA_PIPE)\r
        {\r
                #if !defined(INTERRUPT_DATA_PIPE)\r

-               /* Refreeze keyboard data pipe */\r
+               /* Refreeze HID data IN pipe */\r

                Pipe_Freeze();\r
                #endif\r
                Pipe_Freeze();\r
                #endif\r

-\r
+                       \r

                return;\r
        }\r
        \r
                return;\r
        }\r
        \r

-       /* Read in keyboard report data */\r
-       Pipe_Read_Stream_LE(&KeyboardReport, sizeof(KeyboardReport));\r
-                                       \r
-       /* Clear the IN endpoint, ready for next data packet */\r
-       Pipe_ClearCurrentBank();\r
-\r
-       /* Indicate if the modifier byte is non-zero (special key such as shift is being pressed) */\r
-       LEDs_ChangeLEDs(LEDS_LED1, (KeyboardReport.Modifier) ? LEDS_LED1 : 0);\r
-       \r
-       /* Check if a key has been pressed */\r
-       if (KeyboardReport.KeyCode)\r
+       /* Ensure pipe contains data before trying to read from it */\r
+       if (Pipe_IsReadWriteAllowed())\r

        {\r
        {\r

-               /* Toggle status LED to indicate keypress */\r
-               if (LEDs_GetLEDs() & LEDS_LED2)\r
-                 LEDs_TurnOffLEDs(LEDS_LED2);\r
-               else\r
-                 LEDs_TurnOnLEDs(LEDS_LED2);\r
-                         \r
-               char PressedKey = 0;\r
-\r
-               /* Retrieve pressed key character if alphanumeric */\r
-               if ((KeyboardReport.KeyCode >= 0x04) && (KeyboardReport.KeyCode <= 0x1D))\r
-                 PressedKey = (KeyboardReport.KeyCode - 0x04) + 'A';\r
-               else if ((KeyboardReport.KeyCode >= 0x1E) && (KeyboardReport.KeyCode <= 0x27))\r
-                 PressedKey = (KeyboardReport.KeyCode - 0x1E) + '0';\r
-               else if (KeyboardReport.KeyCode == 0x2C)\r
-                 PressedKey = ' ';                                             \r
-               else if (KeyboardReport.KeyCode == 0x28)\r
-                 PressedKey = '\n';\r
-                        \r
-               /* Print the pressed key character out through the serial port if valid */\r
-               if (PressedKey)\r
-                 putchar(PressedKey);\r
+               /* Read in keyboard report data */\r
+               Pipe_Read_Stream_LE(&KeyboardReport, sizeof(KeyboardReport));\r
+\r
+               /* Indicate if the modifier byte is non-zero (special key such as shift is being pressed) */\r
+               LEDs_ChangeLEDs(LEDS_LED1, (KeyboardReport.Modifier) ? LEDS_LED1 : 0);\r
+               \r
+               /* Check if a key has been pressed */\r
+               if (KeyboardReport.KeyCode)\r
+               {\r
+                       /* Toggle status LED to indicate keypress */\r
+                       if (LEDs_GetLEDs() & LEDS_LED2)\r
+                         LEDs_TurnOffLEDs(LEDS_LED2);\r
+                       else\r
+                         LEDs_TurnOnLEDs(LEDS_LED2);\r
+                                 \r
+                       char PressedKey = 0;\r
+\r
+                       /* Retrieve pressed key character if alphanumeric */\r
+                       if ((KeyboardReport.KeyCode >= 0x04) && (KeyboardReport.KeyCode <= 0x1D))\r
+                         PressedKey = (KeyboardReport.KeyCode - 0x04) + 'A';\r
+                       else if ((KeyboardReport.KeyCode >= 0x1E) && (KeyboardReport.KeyCode <= 0x27))\r
+                         PressedKey = (KeyboardReport.KeyCode - 0x1E) + '0';\r
+                       else if (KeyboardReport.KeyCode == 0x2C)\r
+                         PressedKey = ' ';                                             \r
+                       else if (KeyboardReport.KeyCode == 0x28)\r
+                         PressedKey = '\n';\r
+                                \r
+                       /* Print the pressed key character out through the serial port if valid */\r
+                       if (PressedKey)\r
+                         putchar(PressedKey);\r
+               }\r

        }\r
        \r
        }\r
        \r

+                                               \r
+       /* Clear the IN endpoint, ready for next data packet */\r
+       Pipe_ClearIN();\r
+\r

        #if !defined(INTERRUPT_DATA_PIPE)\r
        /* Refreeze keyboard data pipe */\r
        Pipe_Freeze();\r
        #if !defined(INTERRUPT_DATA_PIPE)\r
        /* Refreeze keyboard data pipe */\r
        Pipe_Freeze();\r

diff --git a/Demos/Host/KeyboardHost/KeyboardHost.h b/Demos/Host/KeyboardHost/KeyboardHost.h
index 8c1a709..2c541f6 100644 (file)
--- a/Demos/Host/KeyboardHost/KeyboardHost.h
+++ b/Demos/Host/KeyboardHost/KeyboardHost.h
@@ -45,7 +45,6 @@
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

-               #include <LUFA/Common/ButtLoadTag.h>                     // PROGMEM tags readable by the ButtLoad project\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/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

diff --git a/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.h b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.h
index e007a94..1deff63 100644 (file)
--- a/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.h
+++ b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.h
@@ -38,7 +38,6 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r

-               #include <LUFA/Drivers/USB/Class/ConfigDescriptor.h>     // Configuration Descriptor Parser\r

                \r
                #include "HIDReport.h"\r
                \r
                \r
                #include "HIDReport.h"\r
                \r

diff --git a/Demos/Host/KeyboardHostWithParser/HIDReport.h b/Demos/Host/KeyboardHostWithParser/HIDReport.h
index 7c59138..a128b8e 100644 (file)
--- a/Demos/Host/KeyboardHostWithParser/HIDReport.h
+++ b/Demos/Host/KeyboardHostWithParser/HIDReport.h
@@ -37,7 +37,7 @@
 #define _HID_REPORT_H_\r
 \r
        /* Includes: */\r
 #define _HID_REPORT_H_\r
 \r
        /* Includes: */\r

-               #include <LUFA/Drivers/USB/Class/HIDParser.h>            // HID Class Report Parser\r
+               #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r

                \r
                #include "KeyboardHostWithParser.h"\r
 \r
                \r
                #include "KeyboardHostWithParser.h"\r
 \r

diff --git a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c
index d19929d..d7d5f94 100644 (file)
--- a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -36,12 +36,6 @@
  \r
 #include "KeyboardHostWithParser.h"\r
 \r
  \r
 #include "KeyboardHostWithParser.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA KBD Host App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -270,70 +264,24 @@ TASK(USB_Keyboard_Host)
                        Pipe_SelectPipe(KEYBOARD_DATAPIPE);     \r
                        Pipe_Unfreeze();\r
 \r
                        Pipe_SelectPipe(KEYBOARD_DATAPIPE);     \r
                        Pipe_Unfreeze();\r
 \r

-                       /* Check if data has been received from the attached keyboard */\r
-                       if (Pipe_ReadWriteAllowed())\r
+                       /* Check to see if a packet has been received */\r
+                       if (Pipe_IsINReceived())\r

                        {\r
                        {\r

-                               /* Create buffer big enough for the report */\r
-                               uint8_t KeyboardReport[Pipe_BytesInPipe()];\r
+                               /* Check if data has been received from the attached keyboard */\r
+                               if (Pipe_IsReadWriteAllowed())\r
+                               {\r
+                                       /* Create buffer big enough for the report */\r
+                                       uint8_t KeyboardReport[Pipe_BytesInPipe()];\r

 \r
 \r

-                               /* Load in the keyboard report */\r
-                               Pipe_Read_Stream_LE(KeyboardReport, Pipe_BytesInPipe());\r
+                                       /* Load in the keyboard report */\r
+                                       Pipe_Read_Stream_LE(KeyboardReport, Pipe_BytesInPipe());\r

                                \r
                                \r

-                               /* Clear the IN endpoint, ready for next data packet */\r
-                               Pipe_ClearCurrentBank();\r
-\r
-                               /* Check each HID report item in turn, looking for keyboard scan code reports */\r
-                               for (uint8_t ReportNumber = 0; ReportNumber < HIDReportInfo.TotalReportItems; ReportNumber++)\r
-                               {\r
-                                       /* Create a temporary item pointer to the next report item */\r
-                                       HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];\r
-\r
-                                       /* Check if the current report item is a keyboard scancode */\r
-                                       if ((ReportItem->Attributes.Usage.Page      == USAGE_PAGE_KEYBOARD) &&\r
-                                           (ReportItem->Attributes.BitSize         == 8)                   &&\r
-                                           (ReportItem->Attributes.Logical.Maximum > 1)                    &&\r
-                                           (ReportItem->ItemType                   == REPORT_ITEM_TYPE_In))\r
-                                       {\r
-                                               /* Retrieve the keyboard scancode from the report data retrieved from the device */\r
-                                               bool FoundData = GetReportItemInfo(KeyboardReport, ReportItem);\r
-                                               \r
-                                               /* For multi-report devices - if the requested data was not in the issued report, continue */\r
-                                               if (!(FoundData))\r
-                                                 continue;\r
-                                               \r
-                                               /* Key code is an unsigned char in length, cast to the appropriate type */\r
-                                               uint8_t KeyCode = (uint8_t)ReportItem->Value;\r
-\r
-                                               /* If scancode is non-zero, a key is being pressed */\r
-                                               if (KeyCode)\r
-                                               {\r
-                                                       /* Toggle status LED to indicate keypress */\r
-                                                       if (LEDs_GetLEDs() & LEDS_LED2)\r
-                                                         LEDs_TurnOffLEDs(LEDS_LED2);\r
-                                                       else\r
-                                                         LEDs_TurnOnLEDs(LEDS_LED2);\r
-\r
-                                                       char PressedKey = 0;\r
-\r
-                                                       /* Convert scancode to printable character if alphanumeric */\r
-                                                       if ((KeyCode >= 0x04) && (KeyCode <= 0x1D))\r
-                                                         PressedKey = (KeyCode - 0x04) + 'A';\r
-                                                       else if ((KeyCode >= 0x1E) && (KeyCode <= 0x27))\r
-                                                         PressedKey = (KeyCode - 0x1E) + '0';\r
-                                                       else if (KeyCode == 0x2C)\r
-                                                         PressedKey = ' ';                                             \r
-                                                       else if (KeyCode == 0x28)\r
-                                                         PressedKey = '\n';\r
-                                                                \r
-                                                       /* Print the pressed key character out through the serial port if valid */\r
-                                                       if (PressedKey)\r
-                                                         putchar(PressedKey);\r
-                                               }\r
-                                               \r
-                                               /* Once a scancode is found, stop scanning through the report items */\r
-                                               break;\r
-                                       }\r
+                                       /* Process the read in keyboard report from the device */\r
+                                       ProcessKeyboardReport(KeyboardReport);\r

                                }\r
                                }\r

+                               \r
+                               /* Clear the IN endpoint, ready for next data packet */\r
+                               Pipe_ClearIN();\r

                        }\r
 \r
                        /* Freeze keyboard data pipe */\r
                        }\r
 \r
                        /* Freeze keyboard data pipe */\r


@@ -341,3 +289,64 @@ TASK(USB_Keyboard_Host)
                        break;\r
        }\r
 }\r
                        break;\r
        }\r
 }\r

+\r
+/** Processes a read HID report from an attached keyboard, extracting out elements via the HID parser results\r
+ *  as required and prints pressed characters to the serial port. Each time a key is typed, a board LED is toggled.\r
+ *\r
+ *  \param KeyboardReport  Pointer to a HID report from an attached keyboard device\r
+ */\r
+void ProcessKeyboardReport(uint8_t* KeyboardReport)\r
+{\r
+       /* Check each HID report item in turn, looking for keyboard scan code reports */\r
+       for (uint8_t ReportNumber = 0; ReportNumber < HIDReportInfo.TotalReportItems; ReportNumber++)\r
+       {\r
+               /* Create a temporary item pointer to the next report item */\r
+               HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];\r
+\r
+               /* Check if the current report item is a keyboard scancode */\r
+               if ((ReportItem->Attributes.Usage.Page      == USAGE_PAGE_KEYBOARD) &&\r
+                       (ReportItem->Attributes.BitSize         == 8)                   &&\r
+                       (ReportItem->Attributes.Logical.Maximum > 1)                    &&\r
+                       (ReportItem->ItemType                   == REPORT_ITEM_TYPE_In))\r
+               {\r
+                       /* Retrieve the keyboard scancode from the report data retrieved from the device */\r
+                       bool FoundData = GetReportItemInfo(KeyboardReport, ReportItem);\r
+                       \r
+                       /* For multi-report devices - if the requested data was not in the issued report, continue */\r
+                       if (!(FoundData))\r
+                         continue;\r
+                       \r
+                       /* Key code is an unsigned char in length, cast to the appropriate type */\r
+                       uint8_t KeyCode = (uint8_t)ReportItem->Value;\r
+\r
+                       /* If scancode is non-zero, a key is being pressed */\r
+                       if (KeyCode)\r
+                       {\r
+                               /* Toggle status LED to indicate keypress */\r
+                               if (LEDs_GetLEDs() & LEDS_LED2)\r
+                                 LEDs_TurnOffLEDs(LEDS_LED2);\r
+                               else\r
+                                 LEDs_TurnOnLEDs(LEDS_LED2);\r
+\r
+                               char PressedKey = 0;\r
+\r
+                               /* Convert scancode to printable character if alphanumeric */\r
+                               if ((KeyCode >= 0x04) && (KeyCode <= 0x1D))\r
+                                 PressedKey = (KeyCode - 0x04) + 'A';\r
+                               else if ((KeyCode >= 0x1E) && (KeyCode <= 0x27))\r
+                                 PressedKey = (KeyCode - 0x1E) + '0';\r
+                               else if (KeyCode == 0x2C)\r
+                                 PressedKey = ' ';                                             \r
+                               else if (KeyCode == 0x28)\r
+                                 PressedKey = '\n';\r
+                                        \r
+                               /* Print the pressed key character out through the serial port if valid */\r
+                               if (PressedKey)\r
+                                 putchar(PressedKey);\r
+                       }\r
+                       \r
+                       /* Once a scancode is found, stop scanning through the report items */\r
+                       break;\r
+               }\r
+       }\r
+}\r

diff --git a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h
index fece679..112dbfd 100644 (file)
--- a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h
+++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h
@@ -39,7 +39,6 @@
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

-               #include <LUFA/Common/ButtLoadTag.h>                     // PROGMEM tags readable by the ButtLoad project\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/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


@@ -77,5 +76,6 @@
 \r
        /* Function Prototypes: */\r
                void UpdateStatus(uint8_t CurrentStatus);\r
 \r
        /* Function Prototypes: */\r
                void UpdateStatus(uint8_t CurrentStatus);\r

+               void ProcessKeyboardReport(uint8_t* KeyboardReport);\r

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

diff --git a/Demos/Host/MassStorageHost/ConfigDescriptor.h b/Demos/Host/MassStorageHost/ConfigDescriptor.h
index 908cc2b..b02e088 100644 (file)
--- a/Demos/Host/MassStorageHost/ConfigDescriptor.h
+++ b/Demos/Host/MassStorageHost/ConfigDescriptor.h
@@ -38,7 +38,6 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r

-               #include <LUFA/Drivers/USB/Class/ConfigDescriptor.h>     // Configuration Descriptor Parser\r

                \r
                #include "MassStorageHost.h"\r
                \r
                \r
                #include "MassStorageHost.h"\r
                \r

diff --git a/Demos/Host/MassStorageHost/MassStorageHost.c b/Demos/Host/MassStorageHost/MassStorageHost.c
index ec5bc61..1c56e6e 100644 (file)
--- a/Demos/Host/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/MassStorageHost/MassStorageHost.c
@@ -36,12 +36,6 @@
 \r
 #include "MassStorageHost.h"\r
 \r
 \r
 #include "MassStorageHost.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA MS Host App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r

diff --git a/Demos/Host/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h
index 33e2d25..73a69c0 100644 (file)
--- a/Demos/Host/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/MassStorageHost/MassStorageHost.h
@@ -48,7 +48,6 @@
                #include "MassStoreCommands.h"\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r
                #include "MassStoreCommands.h"\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

-               #include <LUFA/Common/ButtLoadTag.h>                     // PROGMEM tags readable by the ButtLoad project\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/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

diff --git a/Demos/Host/MassStorageHost/MassStoreCommands.c b/Demos/Host/MassStorageHost/MassStoreCommands.c
index bf736e7..41c59dc 100644 (file)
--- a/Demos/Host/MassStorageHost/MassStoreCommands.c
+++ b/Demos/Host/MassStorageHost/MassStoreCommands.c
@@ -88,7 +88,7 @@ static uint8_t MassStore_SendCommand(void)
          return ErrorCode;\r
 \r
        /* Send the data in the OUT pipe to the attached device */\r
          return ErrorCode;\r
 \r
        /* Send the data in the OUT pipe to the attached device */\r

-       Pipe_ClearCurrentBank();\r
+       Pipe_ClearOUT();\r

 \r
        /* Some buggy devices require a delay here before the pipe freezing or they will lock up */\r
        USB_Host_WaitMS(1);\r
 \r
        /* Some buggy devices require a delay here before the pipe freezing or they will lock up */\r
        USB_Host_WaitMS(1);\r


@@ -117,7 +117,7 @@ static uint8_t MassStore_WaitForDataReceived(void)
        Pipe_Unfreeze();\r
 \r
        /* Wait until data received in the IN pipe */\r
        Pipe_Unfreeze();\r
 \r
        /* Wait until data received in the IN pipe */\r

-       while (!(Pipe_ReadWriteAllowed()))\r
+       while (!(Pipe_IsINReceived()))\r

        {\r
                /* Check to see if a new frame has been issued (1ms elapsed) */\r
                if (USB_INT_HasOccurred(USB_INT_HSOFI))\r
        {\r
                /* Check to see if a new frame has been issued (1ms elapsed) */\r
                if (USB_INT_HasOccurred(USB_INT_HSOFI))\r


@@ -183,6 +183,9 @@ static uint8_t MassStore_SendReceiveData(void* BufferPtr)
                /* Read in the block data from the pipe */\r
                if ((ErrorCode = Pipe_Read_Stream_LE(BufferPtr, BytesRem)) != PIPE_RWSTREAM_ERROR_NoError)\r
                  return ErrorCode;\r
                /* Read in the block data from the pipe */\r
                if ((ErrorCode = Pipe_Read_Stream_LE(BufferPtr, BytesRem)) != PIPE_RWSTREAM_ERROR_NoError)\r
                  return ErrorCode;\r

+\r
+               /* Acknowledge the packet */\r
+               Pipe_ClearIN();\r

        }\r
        else\r
        {\r
        }\r
        else\r
        {\r


@@ -193,10 +196,10 @@ static uint8_t MassStore_SendReceiveData(void* BufferPtr)
                /* Write the block data to the pipe */\r
                if ((ErrorCode = Pipe_Write_Stream_LE(BufferPtr, BytesRem)) != PIPE_RWSTREAM_ERROR_NoError)\r
                  return ErrorCode;\r
                /* Write the block data to the pipe */\r
                if ((ErrorCode = Pipe_Write_Stream_LE(BufferPtr, BytesRem)) != PIPE_RWSTREAM_ERROR_NoError)\r
                  return ErrorCode;\r

+\r
+               /* Acknowledge the packet */\r
+               Pipe_ClearOUT();\r

        }\r
        }\r

-       \r
-       /* Acknowledge the packet */\r
-       Pipe_ClearCurrentBank();\r

 \r
        /* Some buggy devices require a delay here before the pipe freezing or they will lock up */\r
        USB_Host_WaitMS(1);\r
 \r
        /* Some buggy devices require a delay here before the pipe freezing or they will lock up */\r
        USB_Host_WaitMS(1);\r


@@ -216,8 +219,8 @@ static uint8_t MassStore_GetReturnedStatus(void)
        uint8_t ErrorCode = PIPE_RWSTREAM_ERROR_NoError;\r
 \r
        /* If an error in the command ocurred, abort */\r
        uint8_t ErrorCode = PIPE_RWSTREAM_ERROR_NoError;\r
 \r
        /* If an error in the command ocurred, abort */\r

-       if (MassStore_WaitForDataReceived() != NoError)\r
-         return;\r
+       if ((ErrorCode == MassStore_WaitForDataReceived()) != PIPE_RWSTREAM_ERROR_NoError)\r
+         return ErrorCode;\r

 \r
        /* Select the IN data pipe for data reception */\r
        Pipe_SelectPipe(MASS_STORE_DATA_IN_PIPE);\r
 \r
        /* Select the IN data pipe for data reception */\r
        Pipe_SelectPipe(MASS_STORE_DATA_IN_PIPE);\r


@@ -228,7 +231,7 @@ static uint8_t MassStore_GetReturnedStatus(void)
          return ErrorCode;\r
          \r
        /* Clear the data ready for next reception */\r
          return ErrorCode;\r
          \r
        /* Clear the data ready for next reception */\r

-       Pipe_ClearCurrentBank();\r
+       Pipe_ClearIN();\r

 \r
        /* Some buggy devices require a delay here before the pipe freezing or they will lock up */\r
        USB_Host_WaitMS(1);\r
 \r
        /* Some buggy devices require a delay here before the pipe freezing or they will lock up */\r
        USB_Host_WaitMS(1);\r

diff --git a/Demos/Host/MouseHost/ConfigDescriptor.h b/Demos/Host/MouseHost/ConfigDescriptor.h
index 22e7337..40286e5 100644 (file)
--- a/Demos/Host/MouseHost/ConfigDescriptor.h
+++ b/Demos/Host/MouseHost/ConfigDescriptor.h
@@ -38,7 +38,6 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r

-               #include <LUFA/Drivers/USB/Class/ConfigDescriptor.h>     // Configuration Descriptor Parser\r

                \r
                #include "MouseHost.h"\r
                \r
                \r
                #include "MouseHost.h"\r
                \r

diff --git a/Demos/Host/MouseHost/MouseHost.c b/Demos/Host/MouseHost/MouseHost.c
index ff25428..6a59b4d 100644 (file)
--- a/Demos/Host/MouseHost/MouseHost.c
+++ b/Demos/Host/MouseHost/MouseHost.c
@@ -36,12 +36,6 @@
  \r
 #include "MouseHost.h"\r
 \r
  \r
 #include "MouseHost.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA Mouse Host App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -188,49 +182,53 @@ void ReadNextReport(void)
        Pipe_SelectPipe(MOUSE_DATAPIPE);        \r
 \r
        #if !defined(INTERRUPT_DATA_PIPE)\r
        Pipe_SelectPipe(MOUSE_DATAPIPE);        \r
 \r
        #if !defined(INTERRUPT_DATA_PIPE)\r

-       /* Unfreeze mouse data pipe */\r
+       /* Unfreeze keyboard data pipe */\r

        Pipe_Unfreeze();\r
        #endif\r
 \r
        Pipe_Unfreeze();\r
        #endif\r
 \r

-       /* Ensure pipe contains data and is ready to be read before continuing */\r
-       if (!(Pipe_ReadWriteAllowed()))\r
+       /* Check to see if a packet has been received */\r
+       if (!(Pipe_IsINReceived()))\r

        {\r
                #if !defined(INTERRUPT_DATA_PIPE)\r
        {\r
                #if !defined(INTERRUPT_DATA_PIPE)\r

-               /* Refreeze mouse data pipe */\r
+               /* Refreeze HID data IN pipe */\r

                Pipe_Freeze();\r
                #endif\r
                Pipe_Freeze();\r
                #endif\r

-\r
+                       \r

                return;\r
        }\r
 \r
                return;\r
        }\r
 \r

-       /* Read in mouse report data */\r
-       Pipe_Read_Stream_LE(&MouseReport, sizeof(MouseReport));                         \r
-               \r
-       /* Clear the IN endpoint, ready for next data packet */\r
-       Pipe_ClearCurrentBank();\r
+       /* Ensure pipe contains data before trying to read from it */\r
+       if (Pipe_IsReadWriteAllowed())\r
+       {\r
+               /* Read in mouse report data */\r
+               Pipe_Read_Stream_LE(&MouseReport, sizeof(MouseReport));                         \r
+\r
+               /* Alter status LEDs according to mouse X movement */\r
+               if (MouseReport.X > 0)\r
+                 LEDMask |= LEDS_LED1;\r
+               else if (MouseReport.X < 0)\r
+                 LEDMask |= LEDS_LED2;\r
+                       \r
+               /* Alter status LEDs according to mouse Y movement */\r
+               if (MouseReport.Y > 0)\r
+                 LEDMask |= LEDS_LED3;\r
+               else if (MouseReport.Y < 0)\r
+                 LEDMask |= LEDS_LED4;\r
+\r
+               /* Alter status LEDs according to mouse button position */\r
+               if (MouseReport.Button)\r
+                 LEDMask  = LEDS_ALL_LEDS;\r

                \r
                \r

-       /* Alter status LEDs according to mouse X movement */\r
-       if (MouseReport.X > 0)\r
-         LEDMask |= LEDS_LED1;\r
-       else if (MouseReport.X < 0)\r
-         LEDMask |= LEDS_LED2;\r
+               LEDs_SetAllLEDs(LEDMask);\r

                \r
                \r

-       /* Alter status LEDs according to mouse Y movement */\r
-       if (MouseReport.Y > 0)\r
-         LEDMask |= LEDS_LED3;\r
-       else if (MouseReport.Y < 0)\r
-         LEDMask |= LEDS_LED4;\r
-\r
-       /* Alter status LEDs according to mouse button position */\r
-       if (MouseReport.Button)\r
-         LEDMask  = LEDS_ALL_LEDS;\r
-       \r
-       LEDs_SetAllLEDs(LEDMask);\r
-       \r
-       /* Print mouse report data through the serial port */\r
-       printf_P(PSTR("dX:%2d dY:%2d Button:%d\r\n"), MouseReport.X,\r
-                                                                                                 MouseReport.Y,\r
-                                                                                                 MouseReport.Button);\r
+               /* Print mouse report data through the serial port */\r
+               printf_P(PSTR("dX:%2d dY:%2d Button:%d\r\n"), MouseReport.X,\r
+                                                                                                         MouseReport.Y,\r
+                                                                                                         MouseReport.Button);\r
+       }\r
+\r
+       /* Clear the IN endpoint, ready for next data packet */\r
+       Pipe_ClearIN();\r

 \r
        #if !defined(INTERRUPT_DATA_PIPE)\r
        /* Refreeze mouse data pipe */\r
 \r
        #if !defined(INTERRUPT_DATA_PIPE)\r
        /* Refreeze mouse data pipe */\r

diff --git a/Demos/Host/MouseHost/MouseHost.h b/Demos/Host/MouseHost/MouseHost.h
index b72e09c..c7e5d2b 100644 (file)
--- a/Demos/Host/MouseHost/MouseHost.h
+++ b/Demos/Host/MouseHost/MouseHost.h
@@ -45,7 +45,6 @@
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

-               #include <LUFA/Common/ButtLoadTag.h>                     // PROGMEM tags readable by the ButtLoad project\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/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

diff --git a/Demos/Host/MouseHostWithParser/ConfigDescriptor.h b/Demos/Host/MouseHostWithParser/ConfigDescriptor.h
index 971bdfe..7cb12db 100644 (file)
--- a/Demos/Host/MouseHostWithParser/ConfigDescriptor.h
+++ b/Demos/Host/MouseHostWithParser/ConfigDescriptor.h
@@ -38,7 +38,6 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r

-               #include <LUFA/Drivers/USB/Class/ConfigDescriptor.h>     // Configuration Descriptor Parser\r

                \r
                #include "HIDReport.h"\r
                \r
                \r
                #include "HIDReport.h"\r
                \r

diff --git a/Demos/Host/MouseHostWithParser/HIDReport.h b/Demos/Host/MouseHostWithParser/HIDReport.h
index aa259a1..f5ad40b 100644 (file)
--- a/Demos/Host/MouseHostWithParser/HIDReport.h
+++ b/Demos/Host/MouseHostWithParser/HIDReport.h
@@ -37,7 +37,7 @@
 #define _HID_REPORT_H_\r
 \r
        /* Includes: */\r
 #define _HID_REPORT_H_\r
 \r
        /* Includes: */\r

-               #include <LUFA/Drivers/USB/Class/HIDParser.h>            // HID Class Report Parser\r
+               #include <LUFA/Drivers/USB/USB.h>            // HID Class Report Parser\r

                \r
                #include "MouseHostWithParser.h"\r
 \r
                \r
                #include "MouseHostWithParser.h"\r
 \r

diff --git a/Demos/Host/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/MouseHostWithParser/MouseHostWithParser.c
index 6aeca4b..259da2a 100644 (file)
--- a/Demos/Host/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.c
@@ -36,12 +36,6 @@
  \r
 #include "MouseHostWithParser.h"\r
 \r
  \r
 #include "MouseHostWithParser.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA Mouse Host App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -271,79 +265,24 @@ TASK(USB_Mouse_Host)
                        Pipe_SelectPipe(MOUSE_DATAPIPE);        \r
                        Pipe_Unfreeze();\r
 \r
                        Pipe_SelectPipe(MOUSE_DATAPIPE);        \r
                        Pipe_Unfreeze();\r
 \r

-                       /* Check if data has been received from the attached mouse */\r
-                       if (Pipe_ReadWriteAllowed())\r
+                       /* Check to see if a packet has been received */\r
+                       if (Pipe_IsINReceived())\r

                        {\r
                        {\r

-                               uint8_t LEDMask = LEDS_NO_LEDS;\r
-\r
-                               /* Create buffer big enough for the report */\r
-                               uint8_t MouseReport[Pipe_BytesInPipe()];\r
+                               /* Check if data has been received from the attached mouse */\r
+                               if (Pipe_IsReadWriteAllowed())\r
+                               {\r
+                                       /* Create buffer big enough for the report */\r
+                                       uint8_t MouseReport[Pipe_BytesInPipe()];\r

 \r
 \r

-                               /* Load in the mouse report */\r
-                               Pipe_Read_Stream_LE(MouseReport, Pipe_BytesInPipe());\r
+                                       /* Load in the mouse report */\r
+                                       Pipe_Read_Stream_LE(MouseReport, Pipe_BytesInPipe());\r

                                \r
                                \r

-                               /* Clear the IN endpoint, ready for next data packet */\r
-                               Pipe_ClearCurrentBank();\r
-\r
-                               /* Check each HID report item in turn, looking for mouse X/Y/button reports */\r
-                               for (uint8_t ReportNumber = 0; ReportNumber < HIDReportInfo.TotalReportItems; ReportNumber++)\r
-                               {\r
-                                       /* Create a temporary item pointer to the next report item */\r
-                                       HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];\r
-                                       \r
-                                       bool FoundData;\r
-\r
-                                       if ((ReportItem->Attributes.Usage.Page       == USAGE_PAGE_BUTTON) &&\r
-                                           (ReportItem->ItemType                    == REPORT_ITEM_TYPE_In))\r
-                                       {\r
-                                               /* Get the mouse button value */\r
-                                               FoundData = GetReportItemInfo(MouseReport, ReportItem);\r
-                                               \r
-                                               /* For multi-report devices - if the requested data was not in the issued report, continue */\r
-                                               if (!(FoundData))\r
-                                                 continue;\r
-\r
-                                               /* If button is pressed, all LEDs are turned on */\r
-                                               if (ReportItem->Value)\r
-                                                 LEDMask = LEDS_ALL_LEDS;\r
-                                       }\r
-                                       else if ((ReportItem->Attributes.Usage.Page   == USAGE_PAGE_GENERIC_DCTRL) &&\r
-                                                ((ReportItem->Attributes.Usage.Usage == USAGE_X)                  ||\r
-                                                 (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&\r
-                                                (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))\r
-                                       {\r
-                                               /* Get the mouse relative position value */\r
-                                               FoundData = GetReportItemInfo(MouseReport, ReportItem);\r
-                                               \r
-                                               /* For multi-report devices - if the requested data was not in the issued report, continue */\r
-                                               if (!(FoundData))\r
-                                                 continue;\r
-                                                 \r
-                                               int16_t DeltaMovement;\r
-                                               \r
-                                               if (ReportItem->Attributes.BitSize > 8)\r
-                                                 DeltaMovement = (int16_t)ReportItem->Value;\r
-                                               else\r
-                                                 DeltaMovement = (int8_t)ReportItem->Value;\r
-                                               \r
-                                               /* Determine if the report is for the X or Y delta movement */\r
-                                               if (ReportItem->Attributes.Usage.Usage == USAGE_X)\r
-                                               {\r
-                                                       /* Turn on the appropriate LED according to direction if the delta is non-zero */\r
-                                                       if (DeltaMovement)\r
-                                                         LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2);\r
-                                               }\r
-                                               else\r
-                                               {\r
-                                                       /* Turn on the appropriate LED according to direction if the delta is non-zero */\r
-                                                       if (DeltaMovement)\r
-                                                         LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4);\r
-                                               }\r
-                                       }\r
+                                       /* Process the read in mouse report from the device */\r
+                                       ProcessMouseReport(MouseReport);\r

                                }\r
                                \r
                                }\r
                                \r

-                               /* Display the button information on the board LEDs */\r
-                               LEDs_SetAllLEDs(LEDMask);\r
+                               /* Clear the IN endpoint, ready for next data packet */\r
+                               Pipe_ClearIN();\r

                        }\r
 \r
                        /* Freeze mouse data pipe */\r
                        }\r
 \r
                        /* Freeze mouse data pipe */\r


@@ -352,3 +291,72 @@ TASK(USB_Mouse_Host)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

+/** Processes a read HID report from an attached mouse, extracting out elements via the HID parser results\r
+ *  as required and displays movement and button presses on the board LEDs.\r
+ *\r
+ *  \param MouseReport  Pointer to a HID report from an attached mouse device\r
+ */\r
+void ProcessMouseReport(uint8_t* MouseReport)\r
+{\r
+       uint8_t LEDMask = LEDS_NO_LEDS;\r
+\r
+       /* Check each HID report item in turn, looking for mouse X/Y/button reports */\r
+       for (uint8_t ReportNumber = 0; ReportNumber < HIDReportInfo.TotalReportItems; ReportNumber++)\r
+       {\r
+               /* Create a temporary item pointer to the next report item */\r
+               HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];\r
+               \r
+               bool FoundData;\r
+\r
+               if ((ReportItem->Attributes.Usage.Page       == USAGE_PAGE_BUTTON) &&\r
+                       (ReportItem->ItemType                    == REPORT_ITEM_TYPE_In))\r
+               {\r
+                       /* Get the mouse button value */\r
+                       FoundData = GetReportItemInfo(MouseReport, ReportItem);\r
+                       \r
+                       /* For multi-report devices - if the requested data was not in the issued report, continue */\r
+                       if (!(FoundData))\r
+                         continue;\r
+\r
+                       /* If button is pressed, all LEDs are turned on */\r
+                       if (ReportItem->Value)\r
+                         LEDMask = LEDS_ALL_LEDS;\r
+               }\r
+               else if ((ReportItem->Attributes.Usage.Page   == USAGE_PAGE_GENERIC_DCTRL) &&\r
+                                ((ReportItem->Attributes.Usage.Usage == USAGE_X)                  ||\r
+                                 (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&\r
+                                (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))\r
+               {\r
+                       /* Get the mouse relative position value */\r
+                       FoundData = GetReportItemInfo(MouseReport, ReportItem);\r
+                       \r
+                       /* For multi-report devices - if the requested data was not in the issued report, continue */\r
+                       if (!(FoundData))\r
+                         continue;\r
+                         \r
+                       int16_t DeltaMovement;\r
+                       \r
+                       if (ReportItem->Attributes.BitSize > 8)\r
+                         DeltaMovement = (int16_t)ReportItem->Value;\r
+                       else\r
+                         DeltaMovement = (int8_t)ReportItem->Value;\r
+                       \r
+                       /* Determine if the report is for the X or Y delta movement */\r
+                       if (ReportItem->Attributes.Usage.Usage == USAGE_X)\r
+                       {\r
+                               /* Turn on the appropriate LED according to direction if the delta is non-zero */\r
+                               if (DeltaMovement)\r
+                                 LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2);\r
+                       }\r
+                       else\r
+                       {\r
+                               /* Turn on the appropriate LED according to direction if the delta is non-zero */\r
+                               if (DeltaMovement)\r
+                                 LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4);\r
+                       }\r
+               }\r
+       }\r
+       \r
+       /* Display the button information on the board LEDs */\r
+       LEDs_SetAllLEDs(LEDMask);\r
+}
\ No newline at end of file

diff --git a/Demos/Host/MouseHostWithParser/MouseHostWithParser.h b/Demos/Host/MouseHostWithParser/MouseHostWithParser.h
index b59ab9a..f808745 100644 (file)
--- a/Demos/Host/MouseHostWithParser/MouseHostWithParser.h
+++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.h
@@ -39,7 +39,6 @@
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r
                #include <stdio.h>\r
 \r
                #include <LUFA/Version.h>                                // Library Version Information\r

-               #include <LUFA/Common/ButtLoadTag.h>                     // PROGMEM tags readable by the ButtLoad project\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/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


@@ -77,5 +76,6 @@
 \r
        /* Function Prototypes: */\r
                void UpdateStatus(uint8_t CurrentStatus);\r
 \r
        /* Function Prototypes: */\r
                void UpdateStatus(uint8_t CurrentStatus);\r

-               \r
+               void ProcessMouseReport(uint8_t* MouseReport);\r
+\r

 #endif\r
 #endif\r

diff --git a/Demos/Host/StillImageHost/ConfigDescriptor.h b/Demos/Host/StillImageHost/ConfigDescriptor.h
index f791488..cb4de5f 100644 (file)
--- a/Demos/Host/StillImageHost/ConfigDescriptor.h
+++ b/Demos/Host/StillImageHost/ConfigDescriptor.h
@@ -38,7 +38,6 @@
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r
 \r
        /* Includes: */\r
                #include <LUFA/Drivers/USB/USB.h>                        // USB Functionality\r

-               #include <LUFA/Drivers/USB/Class/ConfigDescriptor.h>     // Configuration Descriptor Parser\r

                \r
                #include "StillImageHost.h"\r
                \r
                \r
                #include "StillImageHost.h"\r
                \r

diff --git a/Demos/Host/StillImageHost/StillImageCommands.c b/Demos/Host/StillImageHost/StillImageCommands.c
index 43e57e1..ebf20b0 100644 (file)
--- a/Demos/Host/StillImageHost/StillImageCommands.c
+++ b/Demos/Host/StillImageHost/StillImageCommands.c
@@ -72,7 +72,7 @@ void SImage_SendBlockHeader(void)
                }\r
                \r
                /* Send the PIMA command block to the attached device */\r
                }\r
                \r
                /* Send the PIMA command block to the attached device */\r

-               Pipe_ClearCurrentBank();\r
+               Pipe_ClearOUT();\r

        }\r
                                        \r
        /* Freeze pipe after use */\r
        }\r
                                        \r
        /* Freeze pipe after use */\r


@@ -90,7 +90,7 @@ void SImage_RecieveEventHeader(void)
        Pipe_Read_Stream_LE(&PIMA_EventBlock, sizeof(PIMA_EventBlock));\r
        \r
        /* Clear the pipe after read complete to prepare for next event */\r
        Pipe_Read_Stream_LE(&PIMA_EventBlock, sizeof(PIMA_EventBlock));\r
        \r
        /* Clear the pipe after read complete to prepare for next event */\r

-       Pipe_ClearCurrentBank();\r
+       Pipe_ClearIN();\r

        \r
        /* Freeze the event pipe again after use */\r
        Pipe_Freeze();\r
        \r
        /* Freeze the event pipe again after use */\r
        Pipe_Freeze();\r


@@ -106,7 +106,7 @@ uint8_t SImage_RecieveBlockHeader(void)
        Pipe_Unfreeze();\r
        \r
        /* Wait until data received on the IN pipe */\r
        Pipe_Unfreeze();\r
        \r
        /* Wait until data received on the IN pipe */\r

-       while (!(Pipe_ReadWriteAllowed()))\r
+       while (!(Pipe_IsReadWriteAllowed()))\r

        {\r
                /* Check to see if a new frame has been issued (1ms elapsed) */\r
                if (USB_INT_HasOccurred(USB_INT_HSOFI))\r
        {\r
                /* Check to see if a new frame has been issued (1ms elapsed) */\r
                if (USB_INT_HasOccurred(USB_INT_HSOFI))\r


@@ -179,7 +179,7 @@ uint8_t SImage_RecieveBlockHeader(void)
                }\r
                \r
                /* Clear pipe bank after use */\r
                }\r
                \r
                /* Clear pipe bank after use */\r

-               Pipe_ClearCurrentBank();\r
+               Pipe_ClearIN();\r

        }\r
        \r
        /* Freeze the IN pipe after use */\r
        }\r
        \r
        /* Freeze the IN pipe after use */\r


@@ -203,7 +203,7 @@ void SImage_SendData(void* Buffer, uint16_t Bytes)
        Pipe_Write_Stream_LE(Buffer, Bytes);\r
 \r
        /* Send the last packet to the attached device */\r
        Pipe_Write_Stream_LE(Buffer, Bytes);\r
 \r
        /* Send the last packet to the attached device */\r

-       Pipe_ClearCurrentBank();\r
+       Pipe_ClearOUT();\r

 \r
        /* Freeze the pipe again after use */\r
        Pipe_Freeze();\r
 \r
        /* Freeze the pipe again after use */\r
        Pipe_Freeze();\r

diff --git a/Demos/Host/StillImageHost/StillImageHost.c b/Demos/Host/StillImageHost/StillImageHost.c
index 1694322..d9dd7ce 100644 (file)
--- a/Demos/Host/StillImageHost/StillImageHost.c
+++ b/Demos/Host/StillImageHost/StillImageHost.c
@@ -36,11 +36,6 @@
 \r
 #include "StillImageHost.h"\r
 \r
 \r
 #include "StillImageHost.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA SIMG Host App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -243,7 +238,7 @@ TASK(USB_SImage_Host)
                        SImage_ReadData(DeviceInfo, DeviceInfoSize);\r
                        \r
                        /* Once all the data has been read, the pipe must be cleared before the response can be sent */\r
                        SImage_ReadData(DeviceInfo, DeviceInfoSize);\r
                        \r
                        /* Once all the data has been read, the pipe must be cleared before the response can be sent */\r

-                       Pipe_ClearCurrentBank();\r
+                       Pipe_ClearIN();\r

                        \r
                        /* Create a pointer for walking through the info dataset */\r
                        uint8_t* DeviceInfoPos = DeviceInfo;\r
                        \r
                        /* Create a pointer for walking through the info dataset */\r
                        uint8_t* DeviceInfoPos = DeviceInfo;\r

diff --git a/Demos/Host/StillImageHost/StillImageHost.h b/Demos/Host/StillImageHost/StillImageHost.h
index 7757b08..e4d2e85 100644 (file)
--- a/Demos/Host/StillImageHost/StillImageHost.h
+++ b/Demos/Host/StillImageHost/StillImageHost.h
@@ -46,7 +46,6 @@
                #include "PIMACodes.h"\r
                #include "StillImageCommands.h"\r
 \r
                #include "PIMACodes.h"\r
                #include "StillImageCommands.h"\r
 \r

-               #include <LUFA/Common/ButtLoadTag.h>                     // PROGMEM tags readable by the ButtLoad project\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/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

diff --git a/Demos/OTG/TestApp/TestApp.c b/Demos/OTG/TestApp/TestApp.c
index 49fdf67..e72c191 100644 (file)
--- a/Demos/OTG/TestApp/TestApp.c
+++ b/Demos/OTG/TestApp/TestApp.c
@@ -36,12 +36,6 @@
 \r
 #include "TestApp.h"\r
 \r
 \r
 #include "TestApp.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA Test App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r

diff --git a/Demos/OTG/TestApp/TestApp.h b/Demos/OTG/TestApp/TestApp.h
index cb26239..bf2d560 100644 (file)
--- a/Demos/OTG/TestApp/TestApp.h
+++ b/Demos/OTG/TestApp/TestApp.h
@@ -46,7 +46,6 @@
                #include <LUFA/Drivers/USB/USB.h>                       // USB Functionality\r
                #include <LUFA/Scheduler/Scheduler.h>                   // Simple scheduler for task management\r
                #include <LUFA/MemoryAllocator/DynAlloc.h>              // Auto-defragmenting Dynamic Memory allocation\r
                #include <LUFA/Drivers/USB/USB.h>                       // USB Functionality\r
                #include <LUFA/Scheduler/Scheduler.h>                   // Simple scheduler for task management\r
                #include <LUFA/MemoryAllocator/DynAlloc.h>              // Auto-defragmenting Dynamic Memory allocation\r

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

                #include <LUFA/Drivers/Misc/TerminalCodes.h>            // ANSI Terminal Escape Codes\r
                #include <LUFA/Drivers/AT90USBXXX/ADC.h>                // ADC driver\r
                #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h>      // USART Stream driver\r
                #include <LUFA/Drivers/Misc/TerminalCodes.h>            // ANSI Terminal Escape Codes\r
                #include <LUFA/Drivers/AT90USBXXX/ADC.h>                // ADC driver\r
                #include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h>      // USART Stream driver\r

diff --git a/LUFA.pnproj b/LUFA.pnproj
index d2007ea..d5bb11e 100644 (file)
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-<Project name="LUFA"><Folder name="Demos"><Folder name="Device"><Folder name="AudioInput"><File path="Demos\Device\AudioInput\AudioInput.c"></File><File path="Demos\Device\AudioInput\AudioInput.h"></File><File path="Demos\Device\AudioInput\AudioInput.txt"></File><File path="Demos\Device\AudioInput\Descriptors.c"></File><File path="Demos\Device\AudioInput\Descriptors.h"></File><File path="Demos\Device\AudioInput\Doxygen.conf"></File><File path="Demos\Device\AudioInput\makefile"></File></Folder><Folder name="AudioOutput"><File path="Demos\Device\AudioOutput\AudioOutput.c"></File><File path="Demos\Device\AudioOutput\AudioOutput.h"></File><File path="Demos\Device\AudioOutput\AudioOutput.txt"></File><File path="Demos\Device\AudioOutput\Descriptors.c"></File><File path="Demos\Device\AudioOutput\Descriptors.h"></File><File path="Demos\Device\AudioOutput\Doxygen.conf"></File><File path="Demos\Device\AudioOutput\makefile"></File></Folder><Folder name="CDC"><File path="Demos\Device\CDC\CDC.c"></File><File path="Demos\Device\CDC\CDC.h"></File><File path="Demos\Device\CDC\CDC.txt"></File><File path="Demos\Device\CDC\Descriptors.c"></File><File path="Demos\Device\CDC\Descriptors.h"></File><File path="Demos\Device\CDC\Doxygen.conf"></File><File path="Demos\Device\CDC\LUFA CDC.inf"></File><File path="Demos\Device\CDC\makefile"></File></Folder><Folder name="DualCDC"><File path="Demos\Device\DualCDC\Descriptors.c"></File><File path="Demos\Device\DualCDC\Descriptors.h"></File><File path="Demos\Device\DualCDC\Doxygen.conf"></File><File path="Demos\Device\DualCDC\DualCDC.c"></File><File path="Demos\Device\DualCDC\DualCDC.h"></File><File path="Demos\Device\DualCDC\DualCDC.txt"></File><File path="Demos\Device\DualCDC\LUFA DualCDC.inf"></File><File path="Demos\Device\DualCDC\makefile"></File></Folder><Folder name="GenericHID"><File path="Demos\Device\GenericHID\Descriptors.c"></File><File path="Demos\Device\GenericHID\Descriptors.h"></File><File path="Demos\Device\GenericHID\GenericHID.c"></File><File path="Demos\Device\GenericHID\GenericHID.h"></File><File path="Demos\Device\GenericHID\makefile"></File><File path="Demos\Device\GenericHID\GenericHID.txt"></File><File path="Demos\Device\GenericHID\Doxygen.conf"></File></Folder><Folder name="Joystick"><File path="Demos\Device\Joystick\Descriptors.c"></File><File path="Demos\Device\Joystick\Descriptors.h"></File><File path="Demos\Device\Joystick\Doxygen.conf"></File><File path="Demos\Device\Joystick\Joystick.c"></File><File path="Demos\Device\Joystick\Joystick.h"></File><File path="Demos\Device\Joystick\Joystick.txt"></File><File path="Demos\Device\Joystick\makefile"></File></Folder><Folder name="Keyboard"><File path="Demos\Device\Keyboard\Descriptors.c"></File><File path="Demos\Device\Keyboard\Descriptors.h"></File><File path="Demos\Device\Keyboard\Doxygen.conf"></File><File path="Demos\Device\Keyboard\Keyboard.c"></File><File path="Demos\Device\Keyboard\Keyboard.h"></File><File path="Demos\Device\Keyboard\Keyboard.txt"></File><File path="Demos\Device\Keyboard\makefile"></File></Folder><Folder name="KeyboardMouse"><File path="Demos\Device\KeyboardMouse\Descriptors.c"></File><File path="Demos\Device\KeyboardMouse\Descriptors.h"></File><File path="Demos\Device\KeyboardMouse\Doxygen.conf"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.c"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.h"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.txt"></File><File path="Demos\Device\KeyboardMouse\makefile"></File></Folder><Folder name="MassStorage"><File path="Demos\Device\MassStorage\DataflashManager.c"></File><File path="Demos\Device\MassStorage\DataflashManager.h"></File><File path="Demos\Device\MassStorage\Descriptors.c"></File><File path="Demos\Device\MassStorage\Descriptors.h"></File><File path="Demos\Device\MassStorage\Doxygen.conf"></File><File path="Demos\Device\MassStorage\makefile"></File><File path="Demos\Device\MassStorage\MassStorage.c"></File><File path="Demos\Device\MassStorage\MassStorage.h"></File><File path="Demos\Device\MassStorage\MassStorage.txt"></File><File path="Demos\Device\MassStorage\SCSI.c"></File><File path="Demos\Device\MassStorage\SCSI.h"></File><File path="Demos\Device\MassStorage\SCSI_Codes.h"></File></Folder><Folder name="MIDI"><File path="Demos\Device\MIDI\Descriptors.c"></File><File path="Demos\Device\MIDI\Descriptors.h"></File><File path="Demos\Device\MIDI\Doxygen.conf"></File><File path="Demos\Device\MIDI\makefile"></File><File path="Demos\Device\MIDI\MIDI.c"></File><File path="Demos\Device\MIDI\MIDI.h"></File><File path="Demos\Device\MIDI\MIDI.txt"></File></Folder><Folder name="Mouse"><File path="Demos\Device\Mouse\Descriptors.c"></File><File path="Demos\Device\Mouse\Descriptors.h"></File><File path="Demos\Device\Mouse\Doxygen.conf"></File><File path="Demos\Device\Mouse\makefile"></File><File path="Demos\Device\Mouse\Mouse.c"></File><File path="Demos\Device\Mouse\Mouse.h"></File><File path="Demos\Device\Mouse\Mouse.txt"></File></Folder><Folder name="RNDISEthernet"><File path="Demos\Device\RNDISEthernet\ARP.c"></File><File path="Demos\Device\RNDISEthernet\ARP.h"></File><File path="Demos\Device\RNDISEthernet\Descriptors.c"></File><File path="Demos\Device\RNDISEthernet\Descriptors.h"></File><File path="Demos\Device\RNDISEthernet\DHCP.c"></File><File path="Demos\Device\RNDISEthernet\DHCP.h"></File><File path="Demos\Device\RNDISEthernet\Doxygen.conf"></File><File path="Demos\Device\RNDISEthernet\Ethernet.c"></File><File path="Demos\Device\RNDISEthernet\Ethernet.h"></File><File path="Demos\Device\RNDISEthernet\EthernetProtocols.h"></File><File path="Demos\Device\RNDISEthernet\ICMP.c"></File><File path="Demos\Device\RNDISEthernet\ICMP.h"></File><File path="Demos\Device\RNDISEthernet\IP.c"></File><File path="Demos\Device\RNDISEthernet\IP.h"></File><File path="Demos\Device\RNDISEthernet\LUFA RNDIS.inf"></File><File path="Demos\Device\RNDISEthernet\makefile"></File><File path="Demos\Device\RNDISEthernet\ProtocolDecoders.c"></File><File path="Demos\Device\RNDISEthernet\ProtocolDecoders.h"></File><File path="Demos\Device\RNDISEthernet\RNDIS.c"></File><File path="Demos\Device\RNDISEthernet\RNDIS.h"></File><File path="Demos\Device\RNDISEthernet\RNDISConstants.h"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.c"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.h"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.txt"></File><File path="Demos\Device\RNDISEthernet\TCP.c"></File><File path="Demos\Device\RNDISEthernet\TCP.h"></File><File path="Demos\Device\RNDISEthernet\UDP.c"></File><File path="Demos\Device\RNDISEthernet\UDP.h"></File><File path="Demos\Device\RNDISEthernet\Webserver.c"></File><File path="Demos\Device\RNDISEthernet\Webserver.h"></File></Folder><Folder name="USBtoSerial"><File path="Demos\Device\USBtoSerial\Descriptors.c"></File><File path="Demos\Device\USBtoSerial\Descriptors.h"></File><File path="Demos\Device\USBtoSerial\Doxygen.conf"></File><File path="Demos\Device\USBtoSerial\LUFA USBtoSerial.inf"></File><File path="Demos\Device\USBtoSerial\makefile"></File><File path="Demos\Device\USBtoSerial\RingBuff.c"></File><File path="Demos\Device\USBtoSerial\RingBuff.h"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.c"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.h"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.txt"></File></Folder><File path="Demos\Device\makefile"></File></Folder><Folder name="Host"><Folder name="CDCHost"><File path="Demos\Host\CDCHost\CDCHost.c"></File><File path="Demos\Host\CDCHost\CDCHost.h"></File><File path="Demos\Host\CDCHost\CDCHost.txt"></File><File path="Demos\Host\CDCHost\ConfigDescriptor.c"></File><File path="Demos\Host\CDCHost\ConfigDescriptor.h"></File><File path="Demos\Host\CDCHost\Doxygen.conf"></File><File path="Demos\Host\CDCHost\makefile"></File></Folder><Folder name="GenericHIDHost"><File path="Demos\Host\GenericHIDHost\ConfigDescriptor.c"></File><File path="Demos\Host\GenericHIDHost\ConfigDescriptor.h"></File><File path="Demos\Host\GenericHIDHost\GenericHIDHost.c"></File><File path="Demos\Host\GenericHIDHost\GenericHIDHost.h"></File><File path="Demos\Host\GenericHIDHost\makefile"></File><File path="Demos\Host\GenericHIDHost\Doxygen.conf"></File></Folder><Folder name="KeyboardHost"><File path="Demos\Host\KeyboardHost\ConfigDescriptor.c"></File><File path="Demos\Host\KeyboardHost\ConfigDescriptor.h"></File><File path="Demos\Host\KeyboardHost\Doxygen.conf"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.c"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.h"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.txt"></File><File path="Demos\Host\KeyboardHost\makefile"></File></Folder><Folder name="KeyboardHostWithParser"><File path="Demos\Host\KeyboardHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\KeyboardHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\KeyboardHostWithParser\Doxygen.conf"></File><File path="Demos\Host\KeyboardHostWithParser\HIDReport.c"></File><File path="Demos\Host\KeyboardHostWithParser\HIDReport.h"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.c"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.h"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.txt"></File><File path="Demos\Host\KeyboardHostWithParser\makefile"></File></Folder><Folder name="MassStorageHost"><File path="Demos\Host\MassStorageHost\ConfigDescriptor.c"></File><File path="Demos\Host\MassStorageHost\ConfigDescriptor.h"></File><File path="Demos\Host\MassStorageHost\Doxygen.conf"></File><File path="Demos\Host\MassStorageHost\makefile"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.c"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.h"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.txt"></File><File path="Demos\Host\MassStorageHost\MassStoreCommands.c"></File><File path="Demos\Host\MassStorageHost\MassStoreCommands.h"></File><File path="Demos\Host\MassStorageHost\SCSI_Codes.h"></File></Folder><Folder name="MouseHost"><File path="Demos\Host\MouseHost\ConfigDescriptor.c"></File><File path="Demos\Host\MouseHost\ConfigDescriptor.h"></File><File path="Demos\Host\MouseHost\Doxygen.conf"></File><File path="Demos\Host\MouseHost\makefile"></File><File path="Demos\Host\MouseHost\MouseHost.c"></File><File path="Demos\Host\MouseHost\MouseHost.h"></File><File path="Demos\Host\MouseHost\MouseHost.txt"></File></Folder><Folder name="MouseHostWithParser"><File path="Demos\Host\MouseHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\MouseHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\MouseHostWithParser\Doxygen.conf"></File><File path="Demos\Host\MouseHostWithParser\HIDReport.c"></File><File path="Demos\Host\MouseHostWithParser\HIDReport.h"></File><File path="Demos\Host\MouseHostWithParser\makefile"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.c"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.h"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.txt"></File></Folder><Folder name="StillImageHost"><File path="Demos\Host\StillImageHost\ConfigDescriptor.c"></File><File path="Demos\Host\StillImageHost\ConfigDescriptor.h"></File><File path="Demos\Host\StillImageHost\Doxygen.conf"></File><File path="Demos\Host\StillImageHost\makefile"></File><File path="Demos\Host\StillImageHost\PIMACodes.h"></File><File path="Demos\Host\StillImageHost\StillImageCommands.c"></File><File path="Demos\Host\StillImageHost\StillImageCommands.h"></File><File path="Demos\Host\StillImageHost\StillImageHost.c"></File><File path="Demos\Host\StillImageHost\StillImageHost.h"></File><File path="Demos\Host\StillImageHost\StillImageHost.txt"></File></Folder><File path="Demos\Host\makefile"></File></Folder><Folder name="OTG"><Folder name="TestApp"><File path="Demos\OTG\TestApp\Descriptors.c"></File><File path="Demos\OTG\TestApp\Descriptors.h"></File><File path="Demos\OTG\TestApp\Doxygen.conf"></File><File path="Demos\OTG\TestApp\makefile"></File><File path="Demos\OTG\TestApp\TestApp.c"></File><File path="Demos\OTG\TestApp\TestApp.h"></File><File path="Demos\OTG\TestApp\TestApp.txt"></File><File path="Demos\OTG\TestApp\TestEvents.c"></File><File path="Demos\OTG\TestApp\TestEvents.h"></File></Folder><File path="Demos\OTG\makefile"></File></Folder><File path="Demos\makefile"></File></Folder><Folder name="LUFA"><Folder name="Common"><File path="LUFA\Common\Common.h"></File><File path="LUFA\Common\FunctionAttributes.h"></File><File path="LUFA\Common\ButtLoadTag.h"></File><File path="LUFA\Common\BoardTypes.h"></File></Folder><Folder name="Drivers"><Folder name="USB"><Folder name="LowLevel"><File path="LUFA\Drivers\USB\LowLevel\HostChapter9.h"></File><File path="LUFA\Drivers\USB\LowLevel\LowLevel.c"></File><File path="LUFA\Drivers\USB\LowLevel\LowLevel.h"></File><File path="LUFA\Drivers\USB\LowLevel\Pipe.c"></File><File path="LUFA\Drivers\USB\LowLevel\Pipe.h"></File><File path="LUFA\Drivers\USB\LowLevel\DevChapter9.c"></File><File path="LUFA\Drivers\USB\LowLevel\DevChapter9.h"></File><File path="LUFA\Drivers\USB\LowLevel\Device.h"></File><File path="LUFA\Drivers\USB\LowLevel\Endpoint.c"></File><File path="LUFA\Drivers\USB\LowLevel\Endpoint.h"></File><File path="LUFA\Drivers\USB\LowLevel\Host.c"></File><File path="LUFA\Drivers\USB\LowLevel\Host.h"></File><File path="LUFA\Drivers\USB\LowLevel\HostChapter9.c"></File><File path="LUFA\Drivers\USB\LowLevel\OTG.h"></File></Folder><Folder name="HighLevel"><File path="LUFA\Drivers\USB\HighLevel\USBTask.h"></File><File path="LUFA\Drivers\USB\HighLevel\Events.c"></File><File path="LUFA\Drivers\USB\HighLevel\Events.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBInterrupt.c"></File><File path="LUFA\Drivers\USB\HighLevel\USBInterrupt.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBTask.c"></File><File path="LUFA\Drivers\USB\HighLevel\StdDescriptors.c"></File><File path="LUFA\Drivers\USB\HighLevel\StdDescriptors.h"></File><File path="LUFA\Drivers\USB\HighLevel\StdRequestType.h"></File><File path="LUFA\Drivers\USB\HighLevel\StreamCallbacks.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBMode.h"></File></Folder><Folder name="Class"><File path="LUFA\Drivers\USB\Class\HIDParser.c"></File><File path="LUFA\Drivers\USB\Class\HIDParser.h"></File><File path="LUFA\Drivers\USB\Class\HIDReportData.h"></File><File path="LUFA\Drivers\USB\Class\ConfigDescriptor.c"></File><File path="LUFA\Drivers\USB\Class\ConfigDescriptor.h"></File></Folder><File path="LUFA\Drivers\USB\USB.h"></File></Folder><Folder name="Misc"><File path="LUFA\Drivers\Misc\TerminalCodes.h"></File></Folder><Folder name="AT90USBXXX"><Folder name="AT90USBXXX67"><File path="LUFA\Drivers\AT90USBXXX\AT90USBXXX67\ADC.h"></File></Folder><File path="LUFA\Drivers\AT90USBXXX\Serial_Stream.h"></File><File path="LUFA\Drivers\AT90USBXXX\ADC.h"></File><File path="LUFA\Drivers\AT90USBXXX\Serial.c"></File><File path="LUFA\Drivers\AT90USBXXX\Serial.h"></File><File path="LUFA\Drivers\AT90USBXXX\Serial_Stream.c"></File><File path="LUFA\Drivers\AT90USBXXX\SPI.h"></File></Folder><Folder name="Board"><Folder name="USBKEY"><File path="LUFA\Drivers\Board\USBKEY\Dataflash.h"></File><File path="LUFA\Drivers\Board\USBKEY\Joystick.h"></File><File path="LUFA\Drivers\Board\USBKEY\HWB.h"></File><File path="LUFA\Drivers\Board\USBKEY\AT45DB642D.h"></File><File path="LUFA\Drivers\Board\USBKEY\LEDs.h"></File></Folder><Folder name="STK526"><File path="LUFA\Drivers\Board\STK526\Dataflash.h"></File><File path="LUFA\Drivers\Board\STK526\Joystick.h"></File><File path="LUFA\Drivers\Board\STK526\HWB.h"></File><File path="LUFA\Drivers\Board\STK526\AT45DB642D.h"></File><File path="LUFA\Drivers\Board\STK526\LEDs.h"></File></Folder><Folder name="STK525"><File path="LUFA\Drivers\Board\STK525\Dataflash.h"></File><File path="LUFA\Drivers\Board\STK525\Joystick.h"></File><File path="LUFA\Drivers\Board\STK525\HWB.h"></File><File path="LUFA\Drivers\Board\STK525\AT45DB321C.h"></File><File path="LUFA\Drivers\Board\STK525\LEDs.h"></File></Folder><Folder name="RZUSBSTICK"><File path="LUFA\Drivers\Board\RZUSBSTICK\LEDs.h"></File></Folder><Folder name="ATAVRUSBRF01"><File path="LUFA\Drivers\Board\ATAVRUSBRF01\LEDs.h"></File><File path="LUFA\Drivers\Board\ATAVRUSBRF01\HWB.h"></File></Folder><File path="LUFA\Drivers\Board\Temperature.h"></File><File path="LUFA\Drivers\Board\Dataflash.h"></File><File path="LUFA\Drivers\Board\HWB.h"></File><File path="LUFA\Drivers\Board\Joystick.h"></File><File path="LUFA\Drivers\Board\Temperature.c"></File><File path="LUFA\Drivers\Board\LEDs.h"></File></Folder></Folder><Folder name="Scheduler"><File path="LUFA\Scheduler\Scheduler.h"></File><File path="LUFA\Scheduler\Scheduler.c"></File></Folder><Folder name="MemoryAllocator"><File path="LUFA\MemoryAllocator\DynAlloc.h"></File><File path="LUFA\MemoryAllocator\DynAlloc.c"></File></Folder><Folder name="DriverStubs"><File path="LUFA\DriverStubs\Dataflash.h"></File><File path="LUFA\DriverStubs\HWB.h"></File><File path="LUFA\DriverStubs\Joystick.h"></File><File path="LUFA\DriverStubs\LEDs.h"></File></Folder><File path="LUFA\makefile"></File><File path="LUFA\Version.h"></File><File path="LUFA\BuildingLinkableLibraries.txt"></File><File path="LUFA\GettingStarted.txt"></File><File path="LUFA\MainPage.txt"></File><File path="LUFA\SchedulerOverview.txt"></File><File path="LUFA\VIDAndPIDValues.txt"></File><File path="LUFA\ChangeLog.txt"></File><File path="LUFA\CompileTimeTokens.txt"></File><File path="LUFA\MigrationInformation.txt"></File><File path="LUFA\DirectorySummaries.txt"></File><File path="LUFA\Doxygen.conf"></File><File path="LUFA\WritingBoardDrivers.txt"></File><File path="LUFA\LUFAPoweredProjects.txt"></File></Folder><Folder name="Projects"><Folder name="MagStripe"><File path="Projects\Magstripe\Descriptors.c"></File><File path="Projects\Magstripe\Descriptors.h"></File><File path="Projects\Magstripe\Magstripe.c"></File><File path="Projects\Magstripe\Magstripe.h"></File><File path="Projects\Magstripe\MagstripeHW.h"></File><File path="Projects\Magstripe\makefile"></File><File path="Projects\Magstripe\Magstripe.txt"></File><File path="Projects\Magstripe\Doxygen.conf"></File><File path="Projects\Magstripe\CircularBitBuffer.c"></File><File path="Projects\Magstripe\CircularBitBuffer.h"></File></Folder><File path="Projects\makefile"></File></Folder><Folder name="Bootloaders"><Folder name="DFU"><File path="Bootloaders\DFU\BootloaderDFU.c"></File><File path="Bootloaders\DFU\BootloaderDFU.h"></File><File path="Bootloaders\DFU\Descriptors.c"></File><File path="Bootloaders\DFU\Descriptors.h"></File><File path="Bootloaders\DFU\makefile"></File><File path="Bootloaders\DFU\BootloaderDFU.txt"></File><File path="Bootloaders\DFU\Doxygen.conf"></File></Folder><Folder name="CDC"><File path="Bootloaders\CDC\BootloaderCDC.c"></File><File path="Bootloaders\CDC\BootloaderCDC.h"></File><File path="Bootloaders\CDC\Descriptors.c"></File><File path="Bootloaders\CDC\Descriptors.h"></File><File path="Bootloaders\CDC\makefile"></File><File path="Bootloaders\CDC\LUFA CDC Bootloader.inf"></File><File path="Bootloaders\CDC\Doxygen.conf"></File><File path="Bootloaders\CDC\BootloaderCDC.txt"></File></Folder><Folder name="TeensyHID"><File path="Bootloaders\TeensyHID\Descriptors.c"></File><File path="Bootloaders\TeensyHID\Descriptors.h"></File><File path="Bootloaders\TeensyHID\makefile"></File><File path="Bootloaders\TeensyHID\TeensyHID.c"></File><File path="Bootloaders\TeensyHID\TeensyHID.h"></File><File path="Bootloaders\TeensyHID\TeensyHID.txt"></File></Folder><File path="Bootloaders\makefile"></File></Folder><File path="makefile"></File></Project>
\ No newline at end of file
+<Project name="LUFA"><Folder name="Demos"><Folder name="Device"><Folder name="AudioInput"><File path="Demos\Device\AudioInput\AudioInput.c"></File><File path="Demos\Device\AudioInput\AudioInput.h"></File><File path="Demos\Device\AudioInput\AudioInput.txt"></File><File path="Demos\Device\AudioInput\Descriptors.c"></File><File path="Demos\Device\AudioInput\Descriptors.h"></File><File path="Demos\Device\AudioInput\Doxygen.conf"></File><File path="Demos\Device\AudioInput\makefile"></File></Folder><Folder name="AudioOutput"><File path="Demos\Device\AudioOutput\AudioOutput.c"></File><File path="Demos\Device\AudioOutput\AudioOutput.h"></File><File path="Demos\Device\AudioOutput\AudioOutput.txt"></File><File path="Demos\Device\AudioOutput\Descriptors.c"></File><File path="Demos\Device\AudioOutput\Descriptors.h"></File><File path="Demos\Device\AudioOutput\Doxygen.conf"></File><File path="Demos\Device\AudioOutput\makefile"></File></Folder><Folder name="CDC"><File path="Demos\Device\CDC\CDC.c"></File><File path="Demos\Device\CDC\CDC.h"></File><File path="Demos\Device\CDC\CDC.txt"></File><File path="Demos\Device\CDC\Descriptors.c"></File><File path="Demos\Device\CDC\Descriptors.h"></File><File path="Demos\Device\CDC\Doxygen.conf"></File><File path="Demos\Device\CDC\LUFA CDC.inf"></File><File path="Demos\Device\CDC\makefile"></File></Folder><Folder name="DualCDC"><File path="Demos\Device\DualCDC\Descriptors.c"></File><File path="Demos\Device\DualCDC\Descriptors.h"></File><File path="Demos\Device\DualCDC\Doxygen.conf"></File><File path="Demos\Device\DualCDC\DualCDC.c"></File><File path="Demos\Device\DualCDC\DualCDC.h"></File><File path="Demos\Device\DualCDC\DualCDC.txt"></File><File path="Demos\Device\DualCDC\LUFA DualCDC.inf"></File><File path="Demos\Device\DualCDC\makefile"></File></Folder><Folder name="GenericHID"><File path="Demos\Device\GenericHID\Descriptors.c"></File><File path="Demos\Device\GenericHID\Descriptors.h"></File><File path="Demos\Device\GenericHID\GenericHID.c"></File><File path="Demos\Device\GenericHID\GenericHID.h"></File><File path="Demos\Device\GenericHID\makefile"></File><File path="Demos\Device\GenericHID\GenericHID.txt"></File><File path="Demos\Device\GenericHID\Doxygen.conf"></File></Folder><Folder name="Joystick"><File path="Demos\Device\Joystick\Descriptors.c"></File><File path="Demos\Device\Joystick\Descriptors.h"></File><File path="Demos\Device\Joystick\Doxygen.conf"></File><File path="Demos\Device\Joystick\Joystick.c"></File><File path="Demos\Device\Joystick\Joystick.h"></File><File path="Demos\Device\Joystick\Joystick.txt"></File><File path="Demos\Device\Joystick\makefile"></File></Folder><Folder name="Keyboard"><File path="Demos\Device\Keyboard\Descriptors.c"></File><File path="Demos\Device\Keyboard\Descriptors.h"></File><File path="Demos\Device\Keyboard\Doxygen.conf"></File><File path="Demos\Device\Keyboard\Keyboard.c"></File><File path="Demos\Device\Keyboard\Keyboard.h"></File><File path="Demos\Device\Keyboard\Keyboard.txt"></File><File path="Demos\Device\Keyboard\makefile"></File></Folder><Folder name="KeyboardMouse"><File path="Demos\Device\KeyboardMouse\Descriptors.c"></File><File path="Demos\Device\KeyboardMouse\Descriptors.h"></File><File path="Demos\Device\KeyboardMouse\Doxygen.conf"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.c"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.h"></File><File path="Demos\Device\KeyboardMouse\KeyboardMouse.txt"></File><File path="Demos\Device\KeyboardMouse\makefile"></File></Folder><Folder name="MassStorage"><File path="Demos\Device\MassStorage\DataflashManager.c"></File><File path="Demos\Device\MassStorage\DataflashManager.h"></File><File path="Demos\Device\MassStorage\Descriptors.c"></File><File path="Demos\Device\MassStorage\Descriptors.h"></File><File path="Demos\Device\MassStorage\Doxygen.conf"></File><File path="Demos\Device\MassStorage\makefile"></File><File path="Demos\Device\MassStorage\MassStorage.c"></File><File path="Demos\Device\MassStorage\MassStorage.h"></File><File path="Demos\Device\MassStorage\MassStorage.txt"></File><File path="Demos\Device\MassStorage\SCSI.c"></File><File path="Demos\Device\MassStorage\SCSI.h"></File><File path="Demos\Device\MassStorage\SCSI_Codes.h"></File></Folder><Folder name="MIDI"><File path="Demos\Device\MIDI\Descriptors.c"></File><File path="Demos\Device\MIDI\Descriptors.h"></File><File path="Demos\Device\MIDI\Doxygen.conf"></File><File path="Demos\Device\MIDI\makefile"></File><File path="Demos\Device\MIDI\MIDI.c"></File><File path="Demos\Device\MIDI\MIDI.h"></File><File path="Demos\Device\MIDI\MIDI.txt"></File></Folder><Folder name="Mouse"><File path="Demos\Device\Mouse\Descriptors.c"></File><File path="Demos\Device\Mouse\Descriptors.h"></File><File path="Demos\Device\Mouse\Doxygen.conf"></File><File path="Demos\Device\Mouse\makefile"></File><File path="Demos\Device\Mouse\Mouse.c"></File><File path="Demos\Device\Mouse\Mouse.h"></File><File path="Demos\Device\Mouse\Mouse.txt"></File></Folder><Folder name="RNDISEthernet"><File path="Demos\Device\RNDISEthernet\ARP.c"></File><File path="Demos\Device\RNDISEthernet\ARP.h"></File><File path="Demos\Device\RNDISEthernet\Descriptors.c"></File><File path="Demos\Device\RNDISEthernet\Descriptors.h"></File><File path="Demos\Device\RNDISEthernet\DHCP.c"></File><File path="Demos\Device\RNDISEthernet\DHCP.h"></File><File path="Demos\Device\RNDISEthernet\Doxygen.conf"></File><File path="Demos\Device\RNDISEthernet\Ethernet.c"></File><File path="Demos\Device\RNDISEthernet\Ethernet.h"></File><File path="Demos\Device\RNDISEthernet\EthernetProtocols.h"></File><File path="Demos\Device\RNDISEthernet\ICMP.c"></File><File path="Demos\Device\RNDISEthernet\ICMP.h"></File><File path="Demos\Device\RNDISEthernet\IP.c"></File><File path="Demos\Device\RNDISEthernet\IP.h"></File><File path="Demos\Device\RNDISEthernet\LUFA RNDIS.inf"></File><File path="Demos\Device\RNDISEthernet\makefile"></File><File path="Demos\Device\RNDISEthernet\ProtocolDecoders.c"></File><File path="Demos\Device\RNDISEthernet\ProtocolDecoders.h"></File><File path="Demos\Device\RNDISEthernet\RNDIS.c"></File><File path="Demos\Device\RNDISEthernet\RNDIS.h"></File><File path="Demos\Device\RNDISEthernet\RNDISConstants.h"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.c"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.h"></File><File path="Demos\Device\RNDISEthernet\RNDISEthernet.txt"></File><File path="Demos\Device\RNDISEthernet\TCP.c"></File><File path="Demos\Device\RNDISEthernet\TCP.h"></File><File path="Demos\Device\RNDISEthernet\UDP.c"></File><File path="Demos\Device\RNDISEthernet\UDP.h"></File><File path="Demos\Device\RNDISEthernet\Webserver.c"></File><File path="Demos\Device\RNDISEthernet\Webserver.h"></File></Folder><Folder name="USBtoSerial"><File path="Demos\Device\USBtoSerial\Descriptors.c"></File><File path="Demos\Device\USBtoSerial\Descriptors.h"></File><File path="Demos\Device\USBtoSerial\Doxygen.conf"></File><File path="Demos\Device\USBtoSerial\LUFA USBtoSerial.inf"></File><File path="Demos\Device\USBtoSerial\makefile"></File><File path="Demos\Device\USBtoSerial\RingBuff.c"></File><File path="Demos\Device\USBtoSerial\RingBuff.h"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.c"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.h"></File><File path="Demos\Device\USBtoSerial\USBtoSerial.txt"></File></Folder><File path="Demos\Device\makefile"></File></Folder><Folder name="Host"><Folder name="CDCHost"><File path="Demos\Host\CDCHost\CDCHost.c"></File><File path="Demos\Host\CDCHost\CDCHost.h"></File><File path="Demos\Host\CDCHost\CDCHost.txt"></File><File path="Demos\Host\CDCHost\ConfigDescriptor.c"></File><File path="Demos\Host\CDCHost\ConfigDescriptor.h"></File><File path="Demos\Host\CDCHost\Doxygen.conf"></File><File path="Demos\Host\CDCHost\makefile"></File></Folder><Folder name="GenericHIDHost"><File path="Demos\Host\GenericHIDHost\ConfigDescriptor.c"></File><File path="Demos\Host\GenericHIDHost\ConfigDescriptor.h"></File><File path="Demos\Host\GenericHIDHost\GenericHIDHost.c"></File><File path="Demos\Host\GenericHIDHost\GenericHIDHost.h"></File><File path="Demos\Host\GenericHIDHost\makefile"></File><File path="Demos\Host\GenericHIDHost\Doxygen.conf"></File></Folder><Folder name="KeyboardHost"><File path="Demos\Host\KeyboardHost\ConfigDescriptor.c"></File><File path="Demos\Host\KeyboardHost\ConfigDescriptor.h"></File><File path="Demos\Host\KeyboardHost\Doxygen.conf"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.c"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.h"></File><File path="Demos\Host\KeyboardHost\KeyboardHost.txt"></File><File path="Demos\Host\KeyboardHost\makefile"></File></Folder><Folder name="KeyboardHostWithParser"><File path="Demos\Host\KeyboardHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\KeyboardHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\KeyboardHostWithParser\Doxygen.conf"></File><File path="Demos\Host\KeyboardHostWithParser\HIDReport.c"></File><File path="Demos\Host\KeyboardHostWithParser\HIDReport.h"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.c"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.h"></File><File path="Demos\Host\KeyboardHostWithParser\KeyboardHostWithParser.txt"></File><File path="Demos\Host\KeyboardHostWithParser\makefile"></File></Folder><Folder name="MassStorageHost"><File path="Demos\Host\MassStorageHost\ConfigDescriptor.c"></File><File path="Demos\Host\MassStorageHost\ConfigDescriptor.h"></File><File path="Demos\Host\MassStorageHost\Doxygen.conf"></File><File path="Demos\Host\MassStorageHost\makefile"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.c"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.h"></File><File path="Demos\Host\MassStorageHost\MassStorageHost.txt"></File><File path="Demos\Host\MassStorageHost\MassStoreCommands.c"></File><File path="Demos\Host\MassStorageHost\MassStoreCommands.h"></File><File path="Demos\Host\MassStorageHost\SCSI_Codes.h"></File></Folder><Folder name="MouseHost"><File path="Demos\Host\MouseHost\ConfigDescriptor.c"></File><File path="Demos\Host\MouseHost\ConfigDescriptor.h"></File><File path="Demos\Host\MouseHost\Doxygen.conf"></File><File path="Demos\Host\MouseHost\makefile"></File><File path="Demos\Host\MouseHost\MouseHost.c"></File><File path="Demos\Host\MouseHost\MouseHost.h"></File><File path="Demos\Host\MouseHost\MouseHost.txt"></File></Folder><Folder name="MouseHostWithParser"><File path="Demos\Host\MouseHostWithParser\ConfigDescriptor.c"></File><File path="Demos\Host\MouseHostWithParser\ConfigDescriptor.h"></File><File path="Demos\Host\MouseHostWithParser\Doxygen.conf"></File><File path="Demos\Host\MouseHostWithParser\HIDReport.c"></File><File path="Demos\Host\MouseHostWithParser\HIDReport.h"></File><File path="Demos\Host\MouseHostWithParser\makefile"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.c"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.h"></File><File path="Demos\Host\MouseHostWithParser\MouseHostWithParser.txt"></File></Folder><Folder name="StillImageHost"><File path="Demos\Host\StillImageHost\ConfigDescriptor.c"></File><File path="Demos\Host\StillImageHost\ConfigDescriptor.h"></File><File path="Demos\Host\StillImageHost\Doxygen.conf"></File><File path="Demos\Host\StillImageHost\makefile"></File><File path="Demos\Host\StillImageHost\PIMACodes.h"></File><File path="Demos\Host\StillImageHost\StillImageCommands.c"></File><File path="Demos\Host\StillImageHost\StillImageCommands.h"></File><File path="Demos\Host\StillImageHost\StillImageHost.c"></File><File path="Demos\Host\StillImageHost\StillImageHost.h"></File><File path="Demos\Host\StillImageHost\StillImageHost.txt"></File></Folder><File path="Demos\Host\makefile"></File></Folder><Folder name="OTG"><Folder name="TestApp"><File path="Demos\OTG\TestApp\Descriptors.c"></File><File path="Demos\OTG\TestApp\Descriptors.h"></File><File path="Demos\OTG\TestApp\Doxygen.conf"></File><File path="Demos\OTG\TestApp\makefile"></File><File path="Demos\OTG\TestApp\TestApp.c"></File><File path="Demos\OTG\TestApp\TestApp.h"></File><File path="Demos\OTG\TestApp\TestApp.txt"></File><File path="Demos\OTG\TestApp\TestEvents.c"></File><File path="Demos\OTG\TestApp\TestEvents.h"></File></Folder><File path="Demos\OTG\makefile"></File></Folder><File path="Demos\makefile"></File></Folder><Folder name="LUFA"><Folder name="Common"><File path="LUFA\Common\Common.h"></File><File path="LUFA\Common\FunctionAttributes.h"></File><File path="LUFA\Common\BoardTypes.h"></File></Folder><Folder name="Drivers"><Folder name="USB"><Folder name="LowLevel"><File path="LUFA\Drivers\USB\LowLevel\HostChapter9.h"></File><File path="LUFA\Drivers\USB\LowLevel\LowLevel.c"></File><File path="LUFA\Drivers\USB\LowLevel\LowLevel.h"></File><File path="LUFA\Drivers\USB\LowLevel\Pipe.c"></File><File path="LUFA\Drivers\USB\LowLevel\Pipe.h"></File><File path="LUFA\Drivers\USB\LowLevel\DevChapter9.c"></File><File path="LUFA\Drivers\USB\LowLevel\DevChapter9.h"></File><File path="LUFA\Drivers\USB\LowLevel\Device.h"></File><File path="LUFA\Drivers\USB\LowLevel\Endpoint.c"></File><File path="LUFA\Drivers\USB\LowLevel\Endpoint.h"></File><File path="LUFA\Drivers\USB\LowLevel\Host.c"></File><File path="LUFA\Drivers\USB\LowLevel\Host.h"></File><File path="LUFA\Drivers\USB\LowLevel\HostChapter9.c"></File><File path="LUFA\Drivers\USB\LowLevel\OTG.h"></File></Folder><Folder name="HighLevel"><File path="LUFA\Drivers\USB\HighLevel\USBTask.h"></File><File path="LUFA\Drivers\USB\HighLevel\Events.c"></File><File path="LUFA\Drivers\USB\HighLevel\Events.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBInterrupt.c"></File><File path="LUFA\Drivers\USB\HighLevel\USBInterrupt.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBTask.c"></File><File path="LUFA\Drivers\USB\HighLevel\StdDescriptors.c"></File><File path="LUFA\Drivers\USB\HighLevel\StdDescriptors.h"></File><File path="LUFA\Drivers\USB\HighLevel\StdRequestType.h"></File><File path="LUFA\Drivers\USB\HighLevel\StreamCallbacks.h"></File><File path="LUFA\Drivers\USB\HighLevel\USBMode.h"></File></Folder><Folder name="Class"><File path="LUFA\Drivers\USB\Class\HIDParser.c"></File><File path="LUFA\Drivers\USB\Class\HIDParser.h"></File><File path="LUFA\Drivers\USB\Class\HIDReportData.h"></File><File path="LUFA\Drivers\USB\Class\ConfigDescriptor.c"></File><File path="LUFA\Drivers\USB\Class\ConfigDescriptor.h"></File></Folder><File path="LUFA\Drivers\USB\USB.h"></File></Folder><Folder name="Misc"><File path="LUFA\Drivers\Misc\TerminalCodes.h"></File></Folder><Folder name="AT90USBXXX"><Folder name="AT90USBXXX67"><File path="LUFA\Drivers\AT90USBXXX\AT90USBXXX67\ADC.h"></File></Folder><File path="LUFA\Drivers\AT90USBXXX\Serial_Stream.h"></File><File path="LUFA\Drivers\AT90USBXXX\ADC.h"></File><File path="LUFA\Drivers\AT90USBXXX\Serial.c"></File><File path="LUFA\Drivers\AT90USBXXX\Serial.h"></File><File path="LUFA\Drivers\AT90USBXXX\Serial_Stream.c"></File><File path="LUFA\Drivers\AT90USBXXX\SPI.h"></File></Folder><Folder name="Board"><Folder name="USBKEY"><File path="LUFA\Drivers\Board\USBKEY\Dataflash.h"></File><File path="LUFA\Drivers\Board\USBKEY\Joystick.h"></File><File path="LUFA\Drivers\Board\USBKEY\HWB.h"></File><File path="LUFA\Drivers\Board\USBKEY\AT45DB642D.h"></File><File path="LUFA\Drivers\Board\USBKEY\LEDs.h"></File></Folder><Folder name="STK526"><File path="LUFA\Drivers\Board\STK526\Dataflash.h"></File><File path="LUFA\Drivers\Board\STK526\Joystick.h"></File><File path="LUFA\Drivers\Board\STK526\HWB.h"></File><File path="LUFA\Drivers\Board\STK526\AT45DB642D.h"></File><File path="LUFA\Drivers\Board\STK526\LEDs.h"></File></Folder><Folder name="STK525"><File path="LUFA\Drivers\Board\STK525\Dataflash.h"></File><File path="LUFA\Drivers\Board\STK525\Joystick.h"></File><File path="LUFA\Drivers\Board\STK525\HWB.h"></File><File path="LUFA\Drivers\Board\STK525\AT45DB321C.h"></File><File path="LUFA\Drivers\Board\STK525\LEDs.h"></File></Folder><Folder name="RZUSBSTICK"><File path="LUFA\Drivers\Board\RZUSBSTICK\LEDs.h"></File></Folder><Folder name="ATAVRUSBRF01"><File path="LUFA\Drivers\Board\ATAVRUSBRF01\LEDs.h"></File><File path="LUFA\Drivers\Board\ATAVRUSBRF01\HWB.h"></File></Folder><File path="LUFA\Drivers\Board\Temperature.h"></File><File path="LUFA\Drivers\Board\Dataflash.h"></File><File path="LUFA\Drivers\Board\HWB.h"></File><File path="LUFA\Drivers\Board\Joystick.h"></File><File path="LUFA\Drivers\Board\Temperature.c"></File><File path="LUFA\Drivers\Board\LEDs.h"></File></Folder></Folder><Folder name="Scheduler"><File path="LUFA\Scheduler\Scheduler.h"></File><File path="LUFA\Scheduler\Scheduler.c"></File></Folder><Folder name="MemoryAllocator"><File path="LUFA\MemoryAllocator\DynAlloc.h"></File><File path="LUFA\MemoryAllocator\DynAlloc.c"></File></Folder><Folder name="DriverStubs"><File path="LUFA\DriverStubs\Dataflash.h"></File><File path="LUFA\DriverStubs\HWB.h"></File><File path="LUFA\DriverStubs\Joystick.h"></File><File path="LUFA\DriverStubs\LEDs.h"></File></Folder><File path="LUFA\makefile"></File><File path="LUFA\Version.h"></File><File path="LUFA\BuildingLinkableLibraries.txt"></File><File path="LUFA\GettingStarted.txt"></File><File path="LUFA\MainPage.txt"></File><File path="LUFA\SchedulerOverview.txt"></File><File path="LUFA\VIDAndPIDValues.txt"></File><File path="LUFA\ChangeLog.txt"></File><File path="LUFA\CompileTimeTokens.txt"></File><File path="LUFA\MigrationInformation.txt"></File><File path="LUFA\DirectorySummaries.txt"></File><File path="LUFA\Doxygen.conf"></File><File path="LUFA\WritingBoardDrivers.txt"></File><File path="LUFA\LUFAPoweredProjects.txt"></File><File path="LUFA\Groups.txt"></File></Folder><Folder name="Projects"><Folder name="MagStripe"><File path="Projects\Magstripe\Descriptors.c"></File><File path="Projects\Magstripe\Descriptors.h"></File><File path="Projects\Magstripe\Magstripe.c"></File><File path="Projects\Magstripe\Magstripe.h"></File><File path="Projects\Magstripe\MagstripeHW.h"></File><File path="Projects\Magstripe\makefile"></File><File path="Projects\Magstripe\Magstripe.txt"></File><File path="Projects\Magstripe\Doxygen.conf"></File><File path="Projects\Magstripe\CircularBitBuffer.c"></File><File path="Projects\Magstripe\CircularBitBuffer.h"></File></Folder><File path="Projects\makefile"></File></Folder><Folder name="Bootloaders"><Folder name="DFU"><File path="Bootloaders\DFU\BootloaderDFU.c"></File><File path="Bootloaders\DFU\BootloaderDFU.h"></File><File path="Bootloaders\DFU\Descriptors.c"></File><File path="Bootloaders\DFU\Descriptors.h"></File><File path="Bootloaders\DFU\makefile"></File><File path="Bootloaders\DFU\BootloaderDFU.txt"></File><File path="Bootloaders\DFU\Doxygen.conf"></File></Folder><Folder name="CDC"><File path="Bootloaders\CDC\BootloaderCDC.c"></File><File path="Bootloaders\CDC\BootloaderCDC.h"></File><File path="Bootloaders\CDC\Descriptors.c"></File><File path="Bootloaders\CDC\Descriptors.h"></File><File path="Bootloaders\CDC\makefile"></File><File path="Bootloaders\CDC\LUFA CDC Bootloader.inf"></File><File path="Bootloaders\CDC\Doxygen.conf"></File><File path="Bootloaders\CDC\BootloaderCDC.txt"></File></Folder><Folder name="TeensyHID"><File path="Bootloaders\TeensyHID\Descriptors.c"></File><File path="Bootloaders\TeensyHID\Descriptors.h"></File><File path="Bootloaders\TeensyHID\makefile"></File><File path="Bootloaders\TeensyHID\TeensyHID.c"></File><File path="Bootloaders\TeensyHID\TeensyHID.h"></File><File path="Bootloaders\TeensyHID\TeensyHID.txt"></File></Folder><File path="Bootloaders\makefile"></File></Folder><File path="makefile"></File></Project>
\ No newline at end of file

diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index 0b4b6d6..4aa75cb 100644 (file)
--- a/LUFA/ChangeLog.txt
+++ b/LUFA/ChangeLog.txt
@@ -34,7 +34,20 @@
   *  - The USB_Host_SendControlRequest() function no longer automatically selects the Control pipe (pipe 0), so that other control type\r
   *    pipes can be used with the function\r
   *  - The USB Host management task now saves and restores the currently selected pipe before and after the task completes\r
   *  - The USB_Host_SendControlRequest() function no longer automatically selects the Control pipe (pipe 0), so that other control type\r
   *    pipes can be used with the function\r
   *  - The USB Host management task now saves and restores the currently selected pipe before and after the task completes\r

-  *  - Fixed GenericHIDHost demo report write routine incorrect for control type requests (thanks to Andrei)\r
+  *  - Fixed GenericHIDHost demo report write routine incorrect for control type requests (thanks to Andrei Krainev)\r
+  *  - Removed Endpoint_ClearCurrentBank() and Pipe_ClearCurrentBank() in favour of new Endpoint_ClearIN(), Endpoint_ClearOUT(),\r
+  *    Endpoint_ClearControlIN(), Endpoint_ClearControlOUT(), Pipe_ClearIN(), Pipe_ClearOUT(), Pipe_ClearControlIN() and\r
+  *    Pipe_ClearControlOUT() macros (done to allow for the detection of packets of zero length)\r
+  *  - Renamed *_ReadWriteAllowed() macros to *_IsReadWriteAllowed() to remain consistent with the rest of the LUFA API\r
+  *  - Endpoint_IsSetupReceived() macro has been renamed to Endpoint_IsSETUPReceived(), Endpoint_ClearSetupReceived() macro has been\r
+  *    renamed to Endpoint_ClearControlSETUP(), the Pipe_IsSetupSent() macro has been renamed to Pipe_IsSETUPSent() and the\r
+  *    Pipe_ClearSetupSent() macro is no longer applicable and should be removed - changes made to compliment the new endpoint and pipe\r
+  *    bank management API\r
+  *  - Updated all demos, bootloaders and projects to use the new endpoint and pipe management APIs (thanks to Roman Thiel)\r
+  *  - Updated library doxygen documentation, added groups, changed documentation macro functions to real functions for clarity\r
+  *  - Removed old endpoint and pipe aliased read/write/discard routines which did not have an explicit endian specifier for clarity\r
+  *  - Removed the ButtLoadTag.h header file, as no one used for its intended purpose anyway\r
+  *    \r

   *\r
   *  \section Sec_ChangeLog090401 Version 090401\r
   *\r
   *\r
   *  \section Sec_ChangeLog090401 Version 090401\r
   *\r

diff --git a/LUFA/Common/BoardTypes.h b/LUFA/Common/BoardTypes.h
index d4a3655..a4daa18 100644 (file)
--- a/LUFA/Common/BoardTypes.h
+++ b/LUFA/Common/BoardTypes.h
@@ -36,6 +36,15 @@
  *  \note Do not include this file directly, rather include the Common.h header file instead to gain this file's\r
  *        functionality.\r
  */\r
  *  \note Do not include this file directly, rather include the Common.h header file instead to gain this file's\r
  *        functionality.\r
  */\r

+\r
+/** \ingroup Group_Common\r
+ *  @defgroup Group_BoardTypes Board Types\r
+ *\r
+ *  Macros for indicating the chosen physical board hardware to the library. These macros should be used when\r
+ *  defining the BOARD token to the chosen hardware via the -D switch in the project makefile.\r
+ *\r
+ *  @{\r
+ */\r

        \r
 #ifndef __BOARDTYPES_H__\r
 #define __BOARDTYPES_H__\r
        \r
 #ifndef __BOARDTYPES_H__\r
 #define __BOARDTYPES_H__\r


@@ -70,3 +79,5 @@
                        #define BOARD_USER          5\r
 \r
 #endif\r
                        #define BOARD_USER          5\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Common/ButtLoadTag.h b/LUFA/Common/ButtLoadTag.h
deleted file mode 100644 (file)
index 54fab0f..0000000
--- a/LUFA/Common/ButtLoadTag.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\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
-  software without specific, written prior permission.\r
-\r
-  The author disclaim all warranties with regard to this\r
-  software, including all implied warranties of merchantability\r
-  and fitness.  In no event shall the author be liable for any\r
-  special, indirect or consequential damages or any damages\r
-  whatsoever resulting from loss of use, data or profits, whether\r
-  in an action of contract, negligence or other tortious action,\r
-  arising out of or in connection with the use or performance of\r
-  this software.\r
-*/\r
-\r
-/** \file\r
- *\r
- *  This file contains macros for the embedding of compile-time strings into the resultant project binary for\r
- *  identification purposes. It is designed to prefix "tags" with the magic string of "@(#)" so that the tags\r
- *  can easily be identified in the binary data.\r
- *\r
- *  These tags are compatible with the ButtLoad project at http://www.fourwalledcubicle.com/ButtLoad.php .\r
- */\r
-\r
-#ifndef __BUTTLOADTAG_H__\r
-#define __BUTTLOADTAG_H__\r
-\r
-       /* Includes: */\r
-               #include <avr/io.h>\r
-               #include <avr/pgmspace.h>\r
-\r
-       /* Public Interface - May be used in end-application: */\r
-               /* Macros: */\r
-                       /** Creates a new tag in the resultant binary, containing the specified data array. The macro id\r
-                        *  parameter is only for identification purposes (so that the tag data can be referenced in code)\r
-                        *  and is not visible in the compiled binary.\r
-                        */\r
-                       #define BUTTLOADTAG(id, data)  const struct ButtLoadTagData BUTTTAG_##id \\r
-                                                      PROGMEM __attribute__((used, externally_visible)) = \\r
-                                                      {MagicString: BT_TAGHEADER, TagData: data}\r
-                       \r
-                       /** Macro for retrieving a reference to the specified tag's contents. The tag data is located in\r
-                        *  the program memory (FLASH) space, and so must be read out with the macros in avr-libc which\r
-                        *  deal with embedded data.\r
-                        */\r
-                       #define BUTTLOADTAG_DATA(id)  BUTTTAG_##id.TagData\r
-\r
-               /* Structures: */\r
-                       /** Structure for ButtLoad compatible binary tags. */\r
-                       struct ButtLoadTagData\r
-                       {\r
-                               char MagicString[4]; /**< Magic tag header, containing the string "@(#)". */\r
-                               char TagData[];      /**< Tag contents as a char array. */\r
-                       };                                                                                \r
-\r
-       /* Private Interface - For use in library only: */      \r
-       #if !defined(__DOXYGEN__)\r
-               /* Macros: */\r
-                       #define BT_TAGHEADER          {'@','(','#',')'}\r
-       #endif\r
-       \r
-#endif\r

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 36d9e3f..0923d51 100644 (file)
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -33,6 +33,24 @@
  *  This file contains macros which are common to all library elements, and which may be useful in user code. It\r
  *  also includes other common headers, such as Atomic.h, FunctionAttributes.h and BoardTypes.h.\r
  */\r
  *  This file contains macros which are common to all library elements, and which may be useful in user code. It\r
  *  also includes other common headers, such as Atomic.h, FunctionAttributes.h and BoardTypes.h.\r
  */\r

+ \r
+/** @defgroup Group_Common Common Utility Headers - LUFA/Drivers/Common/Common.h\r
+ *\r
+ *  Common utility headers containing macros, functions, enums and types which are common to all\r
+ *  aspects of the library.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+/** @defgroup Group_Debugging Debugging Macros\r
+ *\r
+ *  Macros for debugging use.\r
+ */\r
+ \r
+/** @defgroup Group_BitManip Endian and Bit Macros\r
+ *\r
+ *  Functions for swapping endianness and reversing bit orders.\r
+ */\r

 \r
 #ifndef __COMMON_H__\r
 #define __COMMON_H__\r
 \r
 #ifndef __COMMON_H__\r
 #define __COMMON_H__\r


@@ -66,14 +84,22 @@
                        /** Defines a volatile NOP statement which cannot be optimized out by the compiler, and thus can always\r
                         *  be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimizer\r
                         *  removes/reorders code to the point where break points cannot reliably be set.\r
                        /** Defines a volatile NOP statement which cannot be optimized out by the compiler, and thus can always\r
                         *  be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimizer\r
                         *  removes/reorders code to the point where break points cannot reliably be set.\r

+                        *\r
+                        *  \ingroup Group_Debugging\r

                         */\r
                        #define JTAG_DEBUG_POINT()      asm volatile ("NOP" ::)\r
 \r
                        /** Defines an explicit JTAG break point in the resulting binary via the ASM BREAK statement. When\r
                         */\r
                        #define JTAG_DEBUG_POINT()      asm volatile ("NOP" ::)\r
 \r
                        /** Defines an explicit JTAG break point in the resulting binary via the ASM BREAK statement. When\r

-                        *  a JTAG is used, this causes the program execution to halt when reached until manually resumed. */\r
+                        *  a JTAG is used, this causes the program execution to halt when reached until manually resumed.\r
+                        *\r
+                        *  \ingroup Group_Debugging\r
+                        */\r

                        #define JTAG_DEBUG_BREAK()      asm volatile ("BREAK" ::)\r
                        \r
                        #define JTAG_DEBUG_BREAK()      asm volatile ("BREAK" ::)\r
                        \r

-                       /** Macro for testing condition "x" and breaking via JTAG_DEBUG_BREAK() if the condition is false. */\r
+                       /** Macro for testing condition "x" and breaking via JTAG_DEBUG_BREAK() if the condition is false.\r
+                        *\r
+                        *  \ingroup Group_Debugging\r
+                       */\r

                        #define JTAG_DEBUG_ASSERT(x)    MACROS{ if (!(x)) { JTAG_DEBUG_BREAK(); } }MACROE\r
 \r
                        /** Macro for testing condition "x" and writing debug data to the serial stream if false. As a\r
                        #define JTAG_DEBUG_ASSERT(x)    MACROS{ if (!(x)) { JTAG_DEBUG_BREAK(); } }MACROE\r
 \r
                        /** Macro for testing condition "x" and writing debug data to the serial stream if false. As a\r


@@ -81,6 +107,8 @@
                         *\r
                         *  The serial output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion\r
                         *  {x} failed."\r
                         *\r
                         *  The serial output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion\r
                         *  {x} failed."\r

+                        *\r
+                        *  \ingroup Group_Debugging\r

                         */\r
                        #define SERIAL_STREAM_ASSERT(x) MACROS{ if (!(x)) { printf_P(PSTR("%s: Function \"%s\", Line %d: "   \\r
                                                                                                                                "Assertion \"%s\" failed.\r\n"),   \\r
                         */\r
                        #define SERIAL_STREAM_ASSERT(x) MACROS{ if (!(x)) { printf_P(PSTR("%s: Function \"%s\", Line %d: "   \\r
                                                                                                                                "Assertion \"%s\" failed.\r\n"),   \\r


@@ -91,6 +119,8 @@
                        /** Function to reverse the individual bits in a byte - i.e. bit 7 is moved to bit 0, bit 6 to bit 1,\r
                         *  etc.\r
                         *\r
                        /** Function to reverse the individual bits in a byte - i.e. bit 7 is moved to bit 0, bit 6 to bit 1,\r
                         *  etc.\r
                         *\r

+                        *  \ingroup Group_BitManip\r
+                        *\r

                         *  \param Byte   Byte of data whose bits are to be reversed\r
                         */\r
                        static inline uint8_t BitReverse(uint8_t Byte) ATTR_WARN_UNUSED_RESULT ATTR_CONST;\r
                         *  \param Byte   Byte of data whose bits are to be reversed\r
                         */\r
                        static inline uint8_t BitReverse(uint8_t Byte) ATTR_WARN_UNUSED_RESULT ATTR_CONST;\r


@@ -105,6 +135,8 @@
                        \r
                        /** Function to reverse the byte ordering of the individual bytes in a 16 bit number.\r
                         *\r
                        \r
                        /** Function to reverse the byte ordering of the individual bytes in a 16 bit number.\r
                         *\r

+                        *  \ingroup Group_BitManip\r
+                        *\r

                         *  \param Word   Word of data whose bytes are to be swapped\r
                         */\r
                        static inline uint16_t SwapEndian_16(uint16_t Word) ATTR_WARN_UNUSED_RESULT ATTR_CONST;\r
                         *  \param Word   Word of data whose bytes are to be swapped\r
                         */\r
                        static inline uint16_t SwapEndian_16(uint16_t Word) ATTR_WARN_UNUSED_RESULT ATTR_CONST;\r


@@ -115,6 +147,8 @@
 \r
                        /** Function to reverse the byte ordering of the individual bytes in a 32 bit number.\r
                         *\r
 \r
                        /** Function to reverse the byte ordering of the individual bytes in a 32 bit number.\r
                         *\r

+                        *  \ingroup Group_BitManip\r
+                        *\r

                         *  \param DWord   Double word of data whose bytes are to be swapped\r
                         */\r
                        static inline uint32_t SwapEndian_32(uint32_t DWord) ATTR_WARN_UNUSED_RESULT ATTR_CONST;\r
                         *  \param DWord   Double word of data whose bytes are to be swapped\r
                         */\r
                        static inline uint32_t SwapEndian_32(uint32_t DWord) ATTR_WARN_UNUSED_RESULT ATTR_CONST;\r


@@ -128,6 +162,8 @@
 \r
                        /** Function to reverse the byte ordering of the individual bytes in a n byte number.\r
                         *\r
 \r
                        /** Function to reverse the byte ordering of the individual bytes in a n byte number.\r
                         *\r

+                        *  \ingroup Group_BitManip\r
+                        *\r

                         *  \param Data   Pointer to a number containing an even number of bytes to be reversed\r
                         *  \param Bytes  Length of the data in bytes\r
                         */\r
                         *  \param Data   Pointer to a number containing an even number of bytes to be reversed\r
                         *  \param Bytes  Length of the data in bytes\r
                         */\r


@@ -148,3 +184,5 @@
                        }\r
 \r
 #endif\r
                        }\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Common/FunctionAttributes.h b/LUFA/Common/FunctionAttributes.h
index cd40673..9efa440 100644 (file)
--- a/LUFA/Common/FunctionAttributes.h
+++ b/LUFA/Common/FunctionAttributes.h
@@ -37,6 +37,14 @@
  *  \note Do not include this file directly, rather include the Common.h header file instead to gain this file's\r
  *        functionality.\r
  */\r
  *  \note Do not include this file directly, rather include the Common.h header file instead to gain this file's\r
  *        functionality.\r
  */\r

+ \r
+/** \ingroup Group_Common\r
+ *  @defgroup Group_FuncAttr Function Attributes\r
+ *\r
+ *  Macros for easy access GCC function attributes, which can be applied to function prototypes.\r
+ *\r
+ *  @{\r
+ */\r

 \r
 #ifndef __FUNCATTR_H__\r
 #define __FUNCATTR_H__\r
 \r
 #ifndef __FUNCATTR_H__\r
 #define __FUNCATTR_H__\r


@@ -108,3 +116,5 @@
                        #define ATTR_ALIAS(x)               __attribute__ ((alias( #x )))\r
                \r
 #endif\r
                        #define ATTR_ALIAS(x)               __attribute__ ((alias( #x )))\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Doxygen.conf b/LUFA/Doxygen.conf
index 7cb1c71..136a723 100644 (file)
--- a/LUFA/Doxygen.conf
+++ b/LUFA/Doxygen.conf
@@ -408,7 +408,7 @@ SORT_BRIEF_DOCS        = NO
 # hierarchy of group names into alphabetical order. If set to NO (the default) \r
 # the group names will appear in their defined order.\r
 \r
 # hierarchy of group names into alphabetical order. If set to NO (the default) \r
 # the group names will appear in their defined order.\r
 \r

-SORT_GROUP_NAMES       = NO\r
+SORT_GROUP_NAMES       = YES\r

 \r
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be \r
 # sorted by fully-qualified names, including namespaces. If set to \r
 \r
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be \r
 # sorted by fully-qualified names, including namespaces. If set to \r


@@ -607,7 +607,7 @@ EXCLUDE_SYMLINKS       = NO
 # against the file with absolute path, so to exclude all test directories \r
 # for example use the pattern */test/*\r
 \r
 # against the file with absolute path, so to exclude all test directories \r
 # for example use the pattern */test/*\r
 \r

-EXCLUDE_PATTERNS       = */LowLevel/USBMode.h\r
+EXCLUDE_PATTERNS       = \r

 \r
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names \r
 # (namespaces, classes, functions, etc.) that should be excluded from the \r
 \r
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names \r
 # (namespaces, classes, functions, etc.) that should be excluded from the \r


@@ -936,7 +936,7 @@ GENERATE_TREEVIEW      = YES
 # used to set the initial width (in pixels) of the frame in which the tree \r
 # is shown.\r
 \r
 # used to set the initial width (in pixels) of the frame in which the tree \r
 # is shown.\r
 \r

-TREEVIEW_WIDTH         = 250\r
+TREEVIEW_WIDTH         = 300\r

 \r
 # Use this tag to change the font size of Latex formulas included \r
 # as images in the HTML documentation. The default is 10. Note that \r
 \r
 # Use this tag to change the font size of Latex formulas included \r
 # as images in the HTML documentation. The default is 10. Note that \r


@@ -1228,7 +1228,7 @@ PREDEFINED             = __DOXYGEN__
 # The macro definition that is found in the sources will be used. \r
 # Use the PREDEFINED tag if you want to use a different macro definition.\r
 \r
 # The macro definition that is found in the sources will be used. \r
 # Use the PREDEFINED tag if you want to use a different macro definition.\r
 \r

-EXPAND_AS_DEFINED      = BUTTLOADTAG\r
+EXPAND_AS_DEFINED      = \r

 \r
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then \r
 # doxygen's preprocessor will remove all function-like macros that are alone \r
 \r
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then \r
 # doxygen's preprocessor will remove all function-like macros that are alone \r


@@ -1356,7 +1356,7 @@ COLLABORATION_GRAPH    = NO
 # If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen \r
 # will generate a graph for groups, showing the direct groups dependencies\r
 \r
 # If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen \r
 # will generate a graph for groups, showing the direct groups dependencies\r
 \r

-GROUP_GRAPHS           = NO\r
+GROUP_GRAPHS           = YES\r

 \r
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and \r
 # collaboration diagrams in a style similar to the OMG's Unified Modeling \r
 \r
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and \r
 # collaboration diagrams in a style similar to the OMG's Unified Modeling \r


@@ -1374,14 +1374,14 @@ TEMPLATE_RELATIONS     = NO
 # file showing the direct and indirect include dependencies of the file with \r
 # other documented files.\r
 \r
 # file showing the direct and indirect include dependencies of the file with \r
 # other documented files.\r
 \r

-INCLUDE_GRAPH          = NO\r
+INCLUDE_GRAPH          = YES\r

 \r
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and \r
 # HAVE_DOT tags are set to YES then doxygen will generate a graph for each \r
 # documented header file showing the documented files that directly or \r
 # indirectly include this file.\r
 \r
 \r
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and \r
 # HAVE_DOT tags are set to YES then doxygen will generate a graph for each \r
 # documented header file showing the documented files that directly or \r
 # indirectly include this file.\r
 \r

-INCLUDED_BY_GRAPH      = NO\r
+INCLUDED_BY_GRAPH      = YES\r

 \r
 # If the CALL_GRAPH and HAVE_DOT options are set to YES then \r
 # doxygen will generate a call dependency graph for every global function \r
 \r
 # If the CALL_GRAPH and HAVE_DOT options are set to YES then \r
 # doxygen will generate a call dependency graph for every global function \r


@@ -1389,7 +1389,7 @@ INCLUDED_BY_GRAPH      = NO
 # the time of a run. So in most cases it will be better to enable call graphs \r
 # for selected functions only using the \callgraph command.\r
 \r
 # the time of a run. So in most cases it will be better to enable call graphs \r
 # for selected functions only using the \callgraph command.\r
 \r

-CALL_GRAPH             = NO\r
+CALL_GRAPH             = YES\r

 \r
 # If the CALLER_GRAPH and HAVE_DOT tags are set to YES then \r
 # doxygen will generate a caller dependency graph for every global function \r
 \r
 # If the CALLER_GRAPH and HAVE_DOT tags are set to YES then \r
 # doxygen will generate a caller dependency graph for every global function \r


@@ -1409,7 +1409,7 @@ GRAPHICAL_HIERARCHY    = NO
 # in a graphical way. The dependency relations are determined by the #include\r
 # relations between the files in the directories.\r
 \r
 # in a graphical way. The dependency relations are determined by the #include\r
 # relations between the files in the directories.\r
 \r

-DIRECTORY_GRAPH        = NO\r
+DIRECTORY_GRAPH        = YES\r

 \r
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images \r
 # generated by dot. Possible values are png, jpg, or gif\r
 \r
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images \r
 # generated by dot. Possible values are png, jpg, or gif\r

diff --git a/LUFA/Drivers/AT90USBXXX/ADC.h b/LUFA/Drivers/AT90USBXXX/ADC.h
index 341b4e1..12e1688 100644 (file)
--- a/LUFA/Drivers/AT90USBXXX/ADC.h
+++ b/LUFA/Drivers/AT90USBXXX/ADC.h
@@ -35,6 +35,10 @@
  *  User code should include this file, which will in turn include the correct ADC driver header file for the\r
  *  currently selected AVR model.\r
  */\r
  *  User code should include this file, which will in turn include the correct ADC driver header file for the\r
  *  currently selected AVR model.\r
  */\r

+\r
+/** \ingroup Group_SubsystemDrivers\r
+ *  @defgroup Group_ADC ADC Driver - LUFA/Drivers/AT90USBXXX/ADC.h\r
+ */\r

  \r
 #ifndef __ADC_H__\r
 #define __ADC_H__\r
  \r
 #ifndef __ADC_H__\r
 #define __ADC_H__\r


@@ -55,4 +59,29 @@
                        #error "ADC is not available for the currently selected AVR model."\r
                #endif\r
 \r
                        #error "ADC is not available for the currently selected AVR model."\r
                #endif\r
 \r

+       /* Public Interface - May be used in end-application: */\r
+               /* Inline Functions: */\r
+                       /** Starts the reading of the given channel, but does not wait until the conversion has completed.\r
+                        *  Once executed, the conversion status can be determined via the ADC_IsReadingComplete() macro and\r
+                        *  the result read via the ADC_GetResult() macro.\r
+                        *\r
+                        *  \param MUXMask  Mask comprising of an ADC channel number, reference mask and adjustment mask\r
+                        */\r
+                       static inline void ADC_StartReading(const uint8_t MUXMask);\r
+\r
+                       /** Performs a complete single reading from channel, including a polling spinloop to wait for the\r
+                        *  conversion to complete, and the returning of the converted value.\r
+                        *\r
+                        *  \param MUXMask  Mask comprising of an ADC channel number, reference mask and adjustment mask\r
+                        */\r
+                       static inline uint16_t ADC_GetChannelReading(const uint8_t MUXMask) ATTR_WARN_UNUSED_RESULT;\r
+\r
+                       /** Configures the given ADC channel, ready for ADC conversions. This function sets the\r
+                        *  associated port pin as an input and disables the digital portion of the I/O to reduce\r
+                        *  power consumption.\r
+                        *\r
+                        *  \param Channel  ADC channel number to set up for conversions\r
+                        */\r
+                       static inline void ADC_SetupChannel(const uint8_t Channel);\r
+                       \r

 #endif\r
 #endif\r

diff --git a/LUFA/Drivers/AT90USBXXX/AT90USBXXX67/ADC.h b/LUFA/Drivers/AT90USBXXX/AT90USBXXX67/ADC.h
index c86203f..c6169c1 100644 (file)
--- a/LUFA/Drivers/AT90USBXXX/AT90USBXXX67/ADC.h
+++ b/LUFA/Drivers/AT90USBXXX/AT90USBXXX67/ADC.h
@@ -36,15 +36,21 @@
  *        dispatch header located in LUFA/Drivers/AT90USBXXX/ADC.h.\r
  */\r
 \r
  *        dispatch header located in LUFA/Drivers/AT90USBXXX/ADC.h.\r
  */\r
 \r

+/** \ingroup Group_ADC\r
+ *  @defgroup Group_ADC_AT90USBXXX67 AT90USBXXX6 and AT90USBXXX7 Models\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __ADC_AT90USBXXX67_H__\r
 #define __ADC_AT90USBXXX67_H__\r
 \r
        /* Includes: */\r
 #ifndef __ADC_AT90USBXXX67_H__\r
 #define __ADC_AT90USBXXX67_H__\r
 \r
        /* Includes: */\r

+               #include "../../../Common/Common.h"\r
+               \r

                #include <avr/io.h>\r
                #include <stdbool.h>\r
                \r
                #include <avr/io.h>\r
                #include <stdbool.h>\r
                \r

-               #include "../../../Common/Common.h"\r
-               \r

        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
                        extern "C" {\r
        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
                        extern "C" {\r


@@ -175,3 +181,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/AT90USBXXX/SPI.h b/LUFA/Drivers/AT90USBXXX/SPI.h
index d1c9ced..f0b43e0 100644 (file)
--- a/LUFA/Drivers/AT90USBXXX/SPI.h
+++ b/LUFA/Drivers/AT90USBXXX/SPI.h
@@ -33,6 +33,14 @@
  *  Hardware SPI subsystem driver for the supported USB AVRs models.\r
  */\r
 \r
  *  Hardware SPI subsystem driver for the supported USB AVRs models.\r
  */\r
 \r

+/** \ingroup Group_SubsystemDrivers\r
+ *  @defgroup Group_SPI SPI Driver - LUFA/Drivers/AT90USBXXX/SPI.h\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the setup of a the SPI port.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __SPI_H__\r
 #define __SPI_H__\r
 \r
 #ifndef __SPI_H__\r
 #define __SPI_H__\r
 \r


@@ -137,3 +145,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/AT90USBXXX/Serial.h b/LUFA/Drivers/AT90USBXXX/Serial.h
index bbf3044..f08f9a0 100644 (file)
--- a/LUFA/Drivers/AT90USBXXX/Serial.h
+++ b/LUFA/Drivers/AT90USBXXX/Serial.h
@@ -33,6 +33,14 @@
  *  Driver for the USART subsystem on supported USB AVRs.\r
  */\r
  \r
  *  Driver for the USART subsystem on supported USB AVRs.\r
  */\r
  \r

+/** \ingroup Group_SubsystemDrivers\r
+ *  @defgroup Group_Serial Serial USART Driver - LUFA/Drivers/AT90USBXXX/Serial.h\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the setup of the USART for serial communications.\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __SERIAL_H__\r
 #define __SERIAL_H__\r
 \r
 #ifndef __SERIAL_H__\r
 #define __SERIAL_H__\r
 \r


@@ -113,3 +121,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/AT90USBXXX/Serial_Stream.h b/LUFA/Drivers/AT90USBXXX/Serial_Stream.h
index adde5b9..d5034bb 100644 (file)
--- a/LUFA/Drivers/AT90USBXXX/Serial_Stream.h
+++ b/LUFA/Drivers/AT90USBXXX/Serial_Stream.h
@@ -35,6 +35,15 @@
  *  USART.\r
  **/\r
 \r
  *  USART.\r
  **/\r
 \r

+/** \ingroup Group_SubsystemDrivers\r
+ *  @defgroup Group_SerialStream Serial Stream Driver - LUFA/Drivers/AT90USBXXX/Serial_Stream.h\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the setup of a serial stream, so that standard printf and other\r
+ *  C stream functions can be used on the serial port.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __SERIAL_STREAM_H__\r
 #define __SERIAL_STREAM_H__\r
 \r
 #ifndef __SERIAL_STREAM_H__\r
 #define __SERIAL_STREAM_H__\r
 \r


@@ -80,3 +89,5 @@
                #endif\r
 \r
 #endif\r
                #endif\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/HWB.h b/LUFA/Drivers/Board/ATAVRUSBRF01/HWB.h
index edf4f8c..9d9982b 100644 (file)
--- a/LUFA/Drivers/Board/ATAVRUSBRF01/HWB.h
+++ b/LUFA/Drivers/Board/ATAVRUSBRF01/HWB.h
@@ -35,6 +35,12 @@
  *  \note This file should not be included directly. It is automatically included as needed by the HWB driver\r
  *        dispatch header located in LUFA/Drivers/Board/HWB.h.\r
  */\r
  *  \note This file should not be included directly. It is automatically included as needed by the HWB driver\r
  *        dispatch header located in LUFA/Drivers/Board/HWB.h.\r
  */\r

+\r
+/** \ingroup Group_HWB\r
+ *  @defgroup Group_HWB_ATAVRUSBRF01 ATAVRUSBRF01\r
+ *\r
+ *  @{\r
+ */\r

  \r
 #ifndef __HWB_ATAVRUSBRF01_H__\r
 #define __HWB_ATAVRUSBRF01_H__\r
  \r
 #ifndef __HWB_ATAVRUSBRF01_H__\r
 #define __HWB_ATAVRUSBRF01_H__\r


@@ -77,3 +83,5 @@
                #endif\r
                        \r
 #endif\r
                #endif\r
                        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
index 626d8ce..a073d2e 100644 (file)
--- a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
+++ b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
@@ -36,6 +36,12 @@
  *        dispatch header located in LUFA/Drivers/Board/LEDs.h.\r
  */\r
  \r
  *        dispatch header located in LUFA/Drivers/Board/LEDs.h.\r
  */\r
  \r

+/** \ingroup Group_LEDs\r
+ *  @defgroup Group_LEDs_ATAVRUSBRF01 ATAVRUSBRF01\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __LEDS_ATAVRUSBRF01_H__\r
 #define __LEDS_ATAVRUSBRF01_H__\r
 \r
 #ifndef __LEDS_ATAVRUSBRF01_H__\r
 #define __LEDS_ATAVRUSBRF01_H__\r
 \r


@@ -118,3 +124,5 @@
                #endif\r
        \r
 #endif\r
                #endif\r
        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index aa0c089..4e61a6b 100644 (file)
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -40,6 +40,14 @@
  *  directory.\r
  */\r
  \r
  *  directory.\r
  */\r
  \r

+/** \ingroup Group_BoardDrivers\r
+ *  @defgroup Group_Dataflash Dataflash Driver - LUFA/Drivers/Board/Dataflash.h\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the control of board Dataflash ICs.\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __DATAFLASH_H__\r
 #define __DATAFLASH_H__\r
 \r
 #ifndef __DATAFLASH_H__\r
 #define __DATAFLASH_H__\r
 \r


@@ -59,21 +67,33 @@
                #endif\r
 \r
        /* Public Interface - May be used in end-application: */\r
                #endif\r
 \r
        /* Public Interface - May be used in end-application: */\r

-               /* Macros: */\r
-                       /** Returns the mask of the currently selected Dataflash chip, either DATAFLASH_NO_CHIP or a\r
-                        *  DATAFLASH_CHIPn mask (where n is the chip number).\r
-                        */\r
-                       #define Dataflash_GetSelectedChip()          (DATAFLASH_CHIPCS_PORT & DATAFLASH_CHIPCS_MASK)\r
+               /* Psuedo-Function Macros: */\r
+                       #if defined(__DOXYGEN__)\r
+                               /** Determines the currently selected dataflash chip.\r
+                                *\r
+                                *  \return Mask of the currently selected Dataflash chip, either DATAFLASH_NO_CHIP if no chip is selected\r
+                                *  or a DATAFLASH_CHIPn mask (where n is the chip number).\r
+                                */\r
+                               static inline uint8_t Dataflash_GetSelectedChip(void);\r
+\r
+                               /** Selects the given dataflash chip.\r
+                                *\r
+                                *  \param  ChipMask  Mask of the Dataflash IC to select, in the form of DATAFLASH_CHIPn mask (where n is\r
+                                *          the chip number).\r
+                                */\r
+                               static inline void Dataflash_SelectChip(uint8_t ChipMask);\r
+\r
+                               /** Deselects the current dataflash chip, so that no dataflash is selected. */\r
+                               static inline void Dataflash_DeselectChip(void);\r
+                       #else\r
+                               #define Dataflash_GetSelectedChip()          (DATAFLASH_CHIPCS_PORT & DATAFLASH_CHIPCS_MASK)\r

 \r
 \r

-                       /** Selects the dataflash chip given as a chip mask, in the form of DATAFLASH_CHIPn (where n\r
-                        *  is the chip number).\r
-                        */\r
-                       #define Dataflash_SelectChip(mask)   MACROS{ DATAFLASH_CHIPCS_PORT = ((DATAFLASH_CHIPCS_PORT \\r
-                                                                    & ~DATAFLASH_CHIPCS_MASK) | mask);              }MACROE\r
+                               #define Dataflash_SelectChip(mask)   MACROS{ DATAFLASH_CHIPCS_PORT = ((DATAFLASH_CHIPCS_PORT \\r
+                                                                                                                        & ~DATAFLASH_CHIPCS_MASK) | mask);              }MACROE\r
+                               \r
+                               #define Dataflash_DeselectChip()             Dataflash_SelectChip(DATAFLASH_NO_CHIP)\r
+                       #endif\r

                        \r
                        \r

-                       /** Deselects the current dataflash chip, so that no dataflash is selected. */\r
-                       #define Dataflash_DeselectChip()             Dataflash_SelectChip(DATAFLASH_NO_CHIP)\r
-\r

                /* Inline Functions: */\r
                        /** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.\r
                         *\r
                /* Inline Functions: */\r
                        /** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.\r
                         *\r


@@ -182,3 +202,5 @@
                #endif\r
        \r
 #endif\r
                #endif\r
        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/HWB.h b/LUFA/Drivers/Board/HWB.h
index 6ad2fa8..049fd23 100644 (file)
--- a/LUFA/Drivers/Board/HWB.h
+++ b/LUFA/Drivers/Board/HWB.h
@@ -39,7 +39,15 @@
  *  If the BOARD value is set to BOARD_USER, this will include the /Board/HWB.h file in the user project\r
  *  directory.\r
  */\r
  *  If the BOARD value is set to BOARD_USER, this will include the /Board/HWB.h file in the user project\r
  *  directory.\r
  */\r

- \r
+\r
+/** \ingroup Group_BoardDrivers\r
+ *  @defgroup Group_HWB HWB Driver - LUFA/Drivers/Board/HWB.h\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the control of board HWB.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __HWB_H__\r
 #define __HWB_H__\r
 \r
 #ifndef __HWB_H__\r
 #define __HWB_H__\r
 \r


@@ -85,3 +93,5 @@
        #endif\r
 \r
 #endif\r
        #endif\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/Joystick.h b/LUFA/Drivers/Board/Joystick.h
index a3f70b8..86a02cf 100644 (file)
--- a/LUFA/Drivers/Board/Joystick.h
+++ b/LUFA/Drivers/Board/Joystick.h
@@ -40,6 +40,14 @@
  *  directory.\r
  */\r
  \r
  *  directory.\r
  */\r
  \r

+/** \ingroup Group_BoardDrivers\r
+ *  @defgroup Group_Joystick Joystick Driver - LUFA/Drivers/Board/Joystick.h\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the control of board joystick.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __JOYSTICK_H__\r
 #define __JOYSTICK_H__\r
 \r
 #ifndef __JOYSTICK_H__\r
 #define __JOYSTICK_H__\r
 \r


@@ -83,3 +91,5 @@
        #endif\r
 \r
 #endif\r
        #endif\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 03e0db5..c40042d 100644 (file)
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -39,7 +39,15 @@
  *  If the BOARD value is set to BOARD_USER, this will include the /Board/LEDs.h file in the user project\r
  *  directory.\r
  */\r
  *  If the BOARD value is set to BOARD_USER, this will include the /Board/LEDs.h file in the user project\r
  *  directory.\r
  */\r

- \r
+\r
+/** \ingroup Group_BoardDrivers\r
+ *  @defgroup Group_LEDs LEDs Driver - LUFA/Drivers/Board/LEDs.h\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the control of board LEDs.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __LEDS_H__\r
 #define __LEDS_H__\r
 \r
 #ifndef __LEDS_H__\r
 #define __LEDS_H__\r
 \r


@@ -111,3 +119,5 @@
        #endif\r
 \r
 #endif\r
        #endif\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
index 38cbed0..24977ea 100644 (file)
--- a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
+++ b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
@@ -35,6 +35,12 @@
  *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver\r
  *        dispatch header located in LUFA/Drivers/Board/LEDs.h.\r
  */\r
  *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver\r
  *        dispatch header located in LUFA/Drivers/Board/LEDs.h.\r
  */\r

+\r
+/** \ingroup Group_LEDs\r
+ *  @defgroup Group_LEDs_RZUSBSTICK RZUSBSTICK\r
+ *\r
+ *  @{\r
+ */\r

  \r
 #ifndef __LEDS_RZUSBSTICK_H__\r
 #define __LEDS_RZUSBSTICK_H__\r
  \r
 #ifndef __LEDS_RZUSBSTICK_H__\r
 #define __LEDS_RZUSBSTICK_H__\r


@@ -139,3 +145,5 @@
                #endif\r
        \r
 #endif\r
                #endif\r
        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/STK525/AT45DB321C.h b/LUFA/Drivers/Board/STK525/AT45DB321C.h
index ac29967..6879c10 100644 (file)
--- a/LUFA/Drivers/Board/STK525/AT45DB321C.h
+++ b/LUFA/Drivers/Board/STK525/AT45DB321C.h
@@ -36,6 +36,12 @@
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r

+/** \ingroup Group_Dataflash_STK525\r
+ *  @defgroup Group_Dataflash_STK525_AT45DB321C AT45DB321C\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __DATAFLASH_CMDS_H__\r
 #define __DATAFLASH_CMDS_H__\r
 \r
 #ifndef __DATAFLASH_CMDS_H__\r
 #define __DATAFLASH_CMDS_H__\r
 \r


@@ -82,3 +88,5 @@
                        #define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F\r
 \r
 #endif\r
                        #define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/STK525/Dataflash.h b/LUFA/Drivers/Board/STK525/Dataflash.h
index e4e2f52..b2ea1b8 100644 (file)
--- a/LUFA/Drivers/Board/STK525/Dataflash.h
+++ b/LUFA/Drivers/Board/STK525/Dataflash.h
@@ -36,6 +36,12 @@
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r

+/** \ingroup Group_Dataflash\r
+ *  @defgroup Group_Dataflash_STK525 STK525\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __DATAFLASH_STK525_H__\r
 #define __DATAFLASH_STK525_H__\r
 \r
 #ifndef __DATAFLASH_STK525_H__\r
 #define __DATAFLASH_STK525_H__\r
 \r


@@ -106,3 +112,5 @@
                        }\r
                        \r
 #endif\r
                        }\r
                        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/STK525/HWB.h b/LUFA/Drivers/Board/STK525/HWB.h
index a0ff72d..a91890c 100644 (file)
--- a/LUFA/Drivers/Board/STK525/HWB.h
+++ b/LUFA/Drivers/Board/STK525/HWB.h
@@ -35,7 +35,13 @@
  *  \note This file should not be included directly. It is automatically included as needed by the HWB driver\r
  *        dispatch header located in LUFA/Drivers/Board/HWB.h.\r
  */\r
  *  \note This file should not be included directly. It is automatically included as needed by the HWB driver\r
  *        dispatch header located in LUFA/Drivers/Board/HWB.h.\r
  */\r

- \r
+\r
+/** \ingroup Group_HWB\r
+ *  @defgroup Group_HWB_STK525 STK525\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __HWB_STK525_H__\r
 #define __HWB_STK525_H__\r
 \r
 #ifndef __HWB_STK525_H__\r
 #define __HWB_STK525_H__\r
 \r


@@ -77,3 +83,5 @@
                #endif\r
                                \r
 #endif\r
                #endif\r
                                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/STK525/Joystick.h b/LUFA/Drivers/Board/STK525/Joystick.h
index 58aed4f..b74655e 100644 (file)
--- a/LUFA/Drivers/Board/STK525/Joystick.h
+++ b/LUFA/Drivers/Board/STK525/Joystick.h
@@ -36,6 +36,12 @@
  *        dispatch header located in LUFA/Drivers/Board/Joystick.h.\r
  */\r
  \r
  *        dispatch header located in LUFA/Drivers/Board/Joystick.h.\r
  */\r
  \r

+/** \ingroup Group_Joystick\r
+ *  @defgroup Group_Joystick_STK525 STK525\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __JOYSTICK_STK525_H__\r
 #define __JOYSTICK_STK525_H__\r
 \r
 #ifndef __JOYSTICK_STK525_H__\r
 #define __JOYSTICK_STK525_H__\r
 \r


@@ -102,3 +108,5 @@
                #endif\r
        \r
 #endif\r
                #endif\r
        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/STK525/LEDs.h b/LUFA/Drivers/Board/STK525/LEDs.h
index 13f626c..a769f16 100644 (file)
--- a/LUFA/Drivers/Board/STK525/LEDs.h
+++ b/LUFA/Drivers/Board/STK525/LEDs.h
@@ -35,6 +35,12 @@
  *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver\r
  *        dispatch header located in LUFA/Drivers/Board/LEDs.h.\r
  */\r
  *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver\r
  *        dispatch header located in LUFA/Drivers/Board/LEDs.h.\r
  */\r

+\r
+/** \ingroup Group_LEDs\r
+ *  @defgroup Group_LEDs_STK525 STK525\r
+ *\r
+ *  @{\r
+ */\r

  \r
 #ifndef __LEDS_STK525_H__\r
 #define __LEDS_STK525_H__\r
  \r
 #ifndef __LEDS_STK525_H__\r
 #define __LEDS_STK525_H__\r


@@ -115,3 +121,5 @@
                #endif\r
        \r
 #endif\r
                #endif\r
        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/STK526/AT45DB642D.h b/LUFA/Drivers/Board/STK526/AT45DB642D.h
index dd38ed1..d697465 100644 (file)
--- a/LUFA/Drivers/Board/STK526/AT45DB642D.h
+++ b/LUFA/Drivers/Board/STK526/AT45DB642D.h
@@ -36,6 +36,12 @@
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r

+/** \ingroup Group_Dataflash_STK526\r
+ *  @defgroup Group_Dataflash_STK526_AT45DB642D AT45DB642D\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __DATAFLASH_CMDS_H__\r
 #define __DATAFLASH_CMDS_H__\r
 \r
 #ifndef __DATAFLASH_CMDS_H__\r
 #define __DATAFLASH_CMDS_H__\r
 \r


@@ -92,3 +98,5 @@
                        #define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F\r
 \r
 #endif\r
                        #define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/STK526/Dataflash.h b/LUFA/Drivers/Board/STK526/Dataflash.h
index 443c1a7..65c5e20 100644 (file)
--- a/LUFA/Drivers/Board/STK526/Dataflash.h
+++ b/LUFA/Drivers/Board/STK526/Dataflash.h
@@ -36,6 +36,12 @@
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r

+/** \ingroup Group_Dataflash\r
+ *  @defgroup Group_Dataflash_STK526 STK526\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __DATAFLASH_STK526_H__\r
 #define __DATAFLASH_STK526_H__\r
 \r
 #ifndef __DATAFLASH_STK526_H__\r
 #define __DATAFLASH_STK526_H__\r
 \r


@@ -106,3 +112,5 @@
                        }\r
                        \r
 #endif\r
                        }\r
                        \r
 #endif\r

+
+/** @} */\r

diff --git a/LUFA/Drivers/Board/STK526/HWB.h b/LUFA/Drivers/Board/STK526/HWB.h
index 3bd2f99..0d4fd7e 100644 (file)
--- a/LUFA/Drivers/Board/STK526/HWB.h
+++ b/LUFA/Drivers/Board/STK526/HWB.h
@@ -35,7 +35,13 @@
  *  \note This file should not be included directly. It is automatically included as needed by the HWB driver\r
  *        dispatch header located in LUFA/Drivers/Board/HWB.h.\r
  */\r
  *  \note This file should not be included directly. It is automatically included as needed by the HWB driver\r
  *        dispatch header located in LUFA/Drivers/Board/HWB.h.\r
  */\r

- \r
+\r
+/** \ingroup Group_HWB\r
+ *  @defgroup Group_HWB_STK526 STK526\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __HWB_STK526_H__\r
 #define __HWB_STK526_H__\r
 \r
 #ifndef __HWB_STK526_H__\r
 #define __HWB_STK526_H__\r
 \r


@@ -77,3 +83,5 @@
                #endif\r
        \r
 #endif\r
                #endif\r
        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/STK526/Joystick.h b/LUFA/Drivers/Board/STK526/Joystick.h
index e5cd2e4..c15b212 100644 (file)
--- a/LUFA/Drivers/Board/STK526/Joystick.h
+++ b/LUFA/Drivers/Board/STK526/Joystick.h
@@ -35,6 +35,12 @@
  *  \note This file should not be included directly. It is automatically included as needed by the joystick driver\r
  *        dispatch header located in LUFA/Drivers/Board/Joystick.h.\r
  */\r
  *  \note This file should not be included directly. It is automatically included as needed by the joystick driver\r
  *        dispatch header located in LUFA/Drivers/Board/Joystick.h.\r
  */\r

+\r
+/** \ingroup Group_Joystick\r
+ *  @defgroup Group_Joystick_STK526 STK526\r
+ *\r
+ *  @{\r
+ */\r

  \r
 #ifndef __JOYSTICK_STK526_H__\r
 #define __JOYSTICK_STK526_H__\r
  \r
 #ifndef __JOYSTICK_STK526_H__\r
 #define __JOYSTICK_STK526_H__\r


@@ -99,3 +105,5 @@
                #endif\r
        \r
 #endif\r
                #endif\r
        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/STK526/LEDs.h b/LUFA/Drivers/Board/STK526/LEDs.h
index fc88a57..6b17ab1 100644 (file)
--- a/LUFA/Drivers/Board/STK526/LEDs.h
+++ b/LUFA/Drivers/Board/STK526/LEDs.h
@@ -35,6 +35,12 @@
  *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver\r
  *        dispatch header located in LUFA/Drivers/Board/LEDs.h.\r
  */\r
  *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver\r
  *        dispatch header located in LUFA/Drivers/Board/LEDs.h.\r
  */\r

+\r
+/** \ingroup Group_LEDs\r
+ *  @defgroup Group_LEDs_STK526 STK526\r
+ *\r
+ *  @{\r
+ */\r

  \r
 #ifndef __LEDS_STK526_H__\r
 #define __LEDS_STK526_H__\r
  \r
 #ifndef __LEDS_STK526_H__\r
 #define __LEDS_STK526_H__\r


@@ -115,3 +121,5 @@
                #endif\r
        \r
 #endif\r
                #endif\r
        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/Temperature.h b/LUFA/Drivers/Board/Temperature.h
index 17b8acf..6e1827e 100644 (file)
--- a/LUFA/Drivers/Board/Temperature.h
+++ b/LUFA/Drivers/Board/Temperature.h
@@ -33,6 +33,14 @@
  *  Temperature sensor board driver for the USB boards which contain a temperature sensor.\r
  */\r
 \r
  *  Temperature sensor board driver for the USB boards which contain a temperature sensor.\r
  */\r
 \r

+/** \ingroup Group_BoardDrivers\r
+ *  @defgroup Group_Temperature Temperature Driver - LUFA/Drivers/Board/Temperature.h\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the control of board temperature sensors.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __TEMPERATURE_H__\r
 #define __TEMPERATURE_H__\r
 \r
 #ifndef __TEMPERATURE_H__\r
 #define __TEMPERATURE_H__\r
 \r


@@ -68,14 +76,19 @@
 \r
                        /** Maximum returnable temperature from the Temperature_GetTemperature() function. */\r
                        #define TEMP_MAX_TEMP      ((TEMP_TABLE_SIZE - 1) + TEMP_TABLE_OFFSET)\r
 \r
                        /** Maximum returnable temperature from the Temperature_GetTemperature() function. */\r
                        #define TEMP_MAX_TEMP      ((TEMP_TABLE_SIZE - 1) + TEMP_TABLE_OFFSET)\r

-                       \r
-                       /** Initializes the temperature sensor driver, including setting up the appropriate ADC channel.\r
-                        *  This must be called before any other temperature sensor routines.\r
-                        *\r
-                        *  The ADC itself (not the ADC channel) must be configured separately before calling the temperature\r
-                        *  sensor functions.\r
-                        */\r
-                       #define Temperature_Init() ADC_SetupChannel(TEMP_ADC_CHANNEL);\r
+               \r
+               /* Psuedo-Functions: */\r
+                       #if defined(__DOXYGEN__)\r
+                               /** Initializes the temperature sensor driver, including setting up the appropriate ADC channel.\r
+                                *  This must be called before any other temperature sensor routines.\r
+                                *\r
+                                *  The ADC itself (not the ADC channel) must be configured separately before calling the temperature\r
+                                *  sensor functions.\r
+                                */\r
+                               static inline void Temperature_Init(void);\r
+                       #else\r
+                               #define Temperature_Init() ADC_SetupChannel(TEMP_ADC_CHANNEL);\r
+                       #endif\r

 \r
                /* Function Prototypes: */\r
                        /** Performs a complete ADC on the temperature sensor channel, and converts the result into a\r
 \r
                /* Function Prototypes: */\r
                        /** Performs a complete ADC on the temperature sensor channel, and converts the result into a\r


@@ -98,3 +111,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/USBKEY/AT45DB642D.h b/LUFA/Drivers/Board/USBKEY/AT45DB642D.h
index 197be1c..672dd7c 100644 (file)
--- a/LUFA/Drivers/Board/USBKEY/AT45DB642D.h
+++ b/LUFA/Drivers/Board/USBKEY/AT45DB642D.h
@@ -36,6 +36,12 @@
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r

+/** \ingroup Group_Dataflash_USBKEY\r
+ *  @defgroup Group_Dataflash_USBKEY_AT45DB642D AT45DB642D\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __DATAFLASH_CMDS_H__\r
 #define __DATAFLASH_CMDS_H__\r
 \r
 #ifndef __DATAFLASH_CMDS_H__\r
 #define __DATAFLASH_CMDS_H__\r
 \r


@@ -92,3 +98,5 @@
                        #define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F\r
 \r
 #endif\r
                        #define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/USBKEY/Dataflash.h b/LUFA/Drivers/Board/USBKEY/Dataflash.h
index 2b3956f..cae62fd 100644 (file)
--- a/LUFA/Drivers/Board/USBKEY/Dataflash.h
+++ b/LUFA/Drivers/Board/USBKEY/Dataflash.h
@@ -36,6 +36,12 @@
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r
  *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.\r
  */\r
 \r

+/** \ingroup Group_Dataflash\r
+ *  @defgroup Group_Dataflash_USBKEY USBKEY\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __DATAFLASH_USBKEY_H__\r
 #define __DATAFLASH_USBKEY_H__\r
 \r
 #ifndef __DATAFLASH_USBKEY_H__\r
 #define __DATAFLASH_USBKEY_H__\r
 \r


@@ -114,3 +120,5 @@
                        }               \r
 \r
 #endif\r
                        }               \r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/USBKEY/HWB.h b/LUFA/Drivers/Board/USBKEY/HWB.h
index 750368b..bfbaa49 100644 (file)
--- a/LUFA/Drivers/Board/USBKEY/HWB.h
+++ b/LUFA/Drivers/Board/USBKEY/HWB.h
@@ -35,7 +35,13 @@
  *  \note This file should not be included directly. It is automatically included as needed by the HWB driver\r
  *        dispatch header located in LUFA/Drivers/Board/HWB.h.\r
  */\r
  *  \note This file should not be included directly. It is automatically included as needed by the HWB driver\r
  *        dispatch header located in LUFA/Drivers/Board/HWB.h.\r
  */\r

- \r
+\r
+/** \ingroup Group_HWB\r
+ *  @defgroup Group_HWB_USBKEY USBKEY\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __HWB_USBKEY_H__\r
 #define __HWB_USBKEY_H__\r
 \r
 #ifndef __HWB_USBKEY_H__\r
 #define __HWB_USBKEY_H__\r
 \r


@@ -77,3 +83,5 @@
                #endif\r
                        \r
 #endif\r
                #endif\r
                        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/USBKEY/Joystick.h
index 6c2d72a..332dd56 100644 (file)
--- a/LUFA/Drivers/Board/USBKEY/Joystick.h
+++ b/LUFA/Drivers/Board/USBKEY/Joystick.h
@@ -35,7 +35,13 @@
  *  \note This file should not be included directly. It is automatically included as needed by the joystick driver\r
  *        dispatch header located in LUFA/Drivers/Board/Joystick.h.\r
  */\r
  *  \note This file should not be included directly. It is automatically included as needed by the joystick driver\r
  *        dispatch header located in LUFA/Drivers/Board/Joystick.h.\r
  */\r

- \r
+\r
+/** \ingroup Group_Joystick\r
+ *  @defgroup Group_Joystick_USBKEY USBKEY\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __JOYSTICK_USBKEY_H__\r
 #define __JOYSTICK_USBKEY_H__\r
 \r
 #ifndef __JOYSTICK_USBKEY_H__\r
 #define __JOYSTICK_USBKEY_H__\r
 \r


@@ -102,3 +108,5 @@
                #endif\r
 \r
 #endif\r
                #endif\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Board/USBKEY/LEDs.h b/LUFA/Drivers/Board/USBKEY/LEDs.h
index 07a2b75..68df317 100644 (file)
--- a/LUFA/Drivers/Board/USBKEY/LEDs.h
+++ b/LUFA/Drivers/Board/USBKEY/LEDs.h
@@ -36,6 +36,12 @@
  *        dispatch header located in LUFA/Drivers/Board/LEDs.h.\r
  */\r
 \r
  *        dispatch header located in LUFA/Drivers/Board/LEDs.h.\r
  */\r
 \r

+/** \ingroup Group_LEDs\r
+ *  @defgroup Group_LEDs_USBKEY USBKEY\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __LEDS_USBKEY_H__\r
 #define __LEDS_USBKEY_H__\r
 \r
 #ifndef __LEDS_USBKEY_H__\r
 #define __LEDS_USBKEY_H__\r
 \r


@@ -115,3 +121,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/Misc/TerminalCodes.h b/LUFA/Drivers/Misc/TerminalCodes.h
index d6e5870..1206ade 100644 (file)
--- a/LUFA/Drivers/Misc/TerminalCodes.h
+++ b/LUFA/Drivers/Misc/TerminalCodes.h
@@ -43,6 +43,14 @@
  *  \endcode\r
  */\r
  \r
  *  \endcode\r
  */\r
  \r

+/** \ingroup Group_MiscDrivers\r
+ *  @defgroup Group_Terminal ANSI Terminal Escape Codes - LUFA/Drivers/Misc/TerminalCodes.h\r
+ *\r
+ *  Escape code macros for ANSI compliant text terminals.\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __TERMINALCODES_H__\r
 #define __TERMINALCODES_H__\r
 \r
 #ifndef __TERMINALCODES_H__\r
 #define __TERMINALCODES_H__\r
 \r


@@ -174,3 +182,5 @@
                        #define ESC_ERASE_LINE           ANSI_ESCAPE_SEQUENCE("K")\r
 \r
 #endif\r
                        #define ESC_ERASE_LINE           ANSI_ESCAPE_SEQUENCE("K")\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/ConfigDescriptor.h b/LUFA/Drivers/USB/Class/ConfigDescriptor.h
index bd92b51..d5fcbb0 100644 (file)
--- a/LUFA/Drivers/USB/Class/ConfigDescriptor.h
+++ b/LUFA/Drivers/USB/Class/ConfigDescriptor.h
@@ -35,6 +35,14 @@
  *  and other descriptor data can be extracted and used as needed.\r
  */\r
 \r
  *  and other descriptor data can be extracted and used as needed.\r
  */\r
 \r

+/** \ingroup Group_Descriptors\r
+ *  @defgroup Group_ConfigDescriptorParser Configuration Descriptor Parser\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the parsing of Configuration Descriptors.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __CONFIGDESCRIPTOR_H__\r
 #define __CONFIGDESCRIPTOR_H__\r
 \r
 #ifndef __CONFIGDESCRIPTOR_H__\r
 #define __CONFIGDESCRIPTOR_H__\r
 \r


@@ -109,7 +117,7 @@
                         *  for certain descriptors matching unique criteria.\r
                         *\r
                         *  Comparator routines are passed in a single pointer named CurrentDescriptor, and should return a value\r
                         *  for certain descriptors matching unique criteria.\r
                         *\r
                         *  Comparator routines are passed in a single pointer named CurrentDescriptor, and should return a value\r

-                        *  of a member of the DSEARCH_Return_ErrorCodes_t enum.\r
+                        *  of a member of the DSearch_Return_ErrorCodes_t enum.\r

                         */\r
                        #define DESCRIPTOR_COMPARATOR(name)           uint8_t DCOMP_##name (void* const CurrentDescriptor)\r
 \r
                         */\r
                        #define DESCRIPTOR_COMPARATOR(name)           uint8_t DCOMP_##name (void* const CurrentDescriptor)\r
 \r


@@ -124,7 +132,7 @@
                         *  \param DPos     Pointer to the current position in the configuration descriptor\r
                         *  \param DSearch  Name of the comparator search function to use on the configuration descriptor\r
                         *\r
                         *  \param DPos     Pointer to the current position in the configuration descriptor\r
                         *  \param DSearch  Name of the comparator search function to use on the configuration descriptor\r
                         *\r

-                        *  \return Value of one of the members of the DSEARCH_Comp_Return_ErrorCodes_t enum\r
+                        *  \return Value of one of the members of the DSearch_Comp_Return_ErrorCodes_t enum\r

                         *\r
                         *  Usage Example:\r
                         *  \code\r
                         *\r
                         *  Usage Example:\r
                         *  \code\r


@@ -151,7 +159,7 @@
                                                                      USB_Host_GetNextDescriptorComp_P(DSize, DPos, DCOMP_##DSearch)\r
                /* Enums: */\r
                        /** Enum for return values of a descriptor comparator made with DESCRIPTOR_COMPARATOR. */\r
                                                                      USB_Host_GetNextDescriptorComp_P(DSize, DPos, DCOMP_##DSearch)\r
                /* Enums: */\r
                        /** Enum for return values of a descriptor comparator made with DESCRIPTOR_COMPARATOR. */\r

-                       enum DSEARCH_Return_ErrorCodes_t\r
+                       enum DSearch_Return_ErrorCodes_t\r

                        {\r
                                Descriptor_Search_Found                = 0, /**< Current descriptor matches comparator criteria. */\r
                                Descriptor_Search_Fail                 = 1, /**< No further descriptor could possibly match criteria, fail the search. */\r
                        {\r
                                Descriptor_Search_Found                = 0, /**< Current descriptor matches comparator criteria. */\r
                                Descriptor_Search_Fail                 = 1, /**< No further descriptor could possibly match criteria, fail the search. */\r


@@ -159,7 +167,7 @@
                        };\r
 \r
                        /** Enum for return values of USB_Host_GetNextDescriptorComp() */\r
                        };\r
 \r
                        /** Enum for return values of USB_Host_GetNextDescriptorComp() */\r

-                       enum DSEARCH_Comp_Return_ErrorCodes_t\r
+                       enum DSearch_Comp_Return_ErrorCodes_t\r

                        {\r
                                Descriptor_Search_Comp_Found           = 0, /**< Configuration descriptor now points to descriptor which matches\r
                                                                             *   search criteria of the given comparator function. */\r
                        {\r
                                Descriptor_Search_Comp_Found           = 0, /**< Configuration descriptor now points to descriptor which matches\r
                                                                             *   search criteria of the given comparator function. */\r


@@ -259,5 +267,7 @@
                #if defined(__cplusplus)\r
                        }\r
                #endif\r
                #if defined(__cplusplus)\r
                        }\r
                #endif\r

-               \r
+\r

 #endif\r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/HIDParser.h b/LUFA/Drivers/USB/Class/HIDParser.h
index 47a678b..ad242fe 100644 (file)
--- a/LUFA/Drivers/USB/Class/HIDParser.h
+++ b/LUFA/Drivers/USB/Class/HIDParser.h
@@ -44,6 +44,14 @@
  *  HID_INCLUDE_CONSTANT_DATA_ITEMS tokens in the user project makefile, passing them to the compiler via the -D\r
  *  switch.\r
  */\r
  *  HID_INCLUDE_CONSTANT_DATA_ITEMS tokens in the user project makefile, passing them to the compiler via the -D\r
  *  switch.\r
  */\r

+ \r
+/** \ingroup Group_USB\r
+ *  @defgroup Group_HIDParser HID Report Parser\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the parsing of HID class device report descriptors.\r
+ *\r
+ *  @{\r
+ */\r

 \r
 #ifndef __HIDPARSER_H__\r
 #define __HIDPARSER_H__\r
 \r
 #ifndef __HIDPARSER_H__\r
 #define __HIDPARSER_H__\r


@@ -250,3 +258,5 @@
                #endif\r
 \r
 #endif\r
                #endif\r
 \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/Class/HIDReportData.h b/LUFA/Drivers/USB/Class/HIDReportData.h
index b1468a3..eee38be 100644 (file)
--- a/LUFA/Drivers/USB/Class/HIDReportData.h
+++ b/LUFA/Drivers/USB/Class/HIDReportData.h
@@ -34,6 +34,14 @@
  *  flag's meaning when applied to an IN, OUT or FEATURE item.\r
  */\r
 \r
  *  flag's meaning when applied to an IN, OUT or FEATURE item.\r
  */\r
 \r

+/** \ingroup Group_HIDParser\r
+ *  @defgroup Group_HIDIOFConst Input/Output/Feature Masks\r
+ *\r
+ *  Masks indicating the type of Input, Output of Feature HID report item.\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __HIDREPORTDATA_H__\r
 #define __HIDREPORTDATA_H__\r
 \r
 #ifndef __HIDREPORTDATA_H__\r
 #define __HIDREPORTDATA_H__\r
 \r


@@ -126,5 +134,7 @@
                        #define TAG_LOCAL_USAGEMIN       0x10\r
                        #define TAG_LOCAL_USAGEMAX       0x20\r
        #endif\r
                        #define TAG_LOCAL_USAGEMIN       0x10\r
                        #define TAG_LOCAL_USAGEMAX       0x20\r
        #endif\r

+\r
+/** @} */\r

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

diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h
index c9882cf..480e824 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/Events.h
+++ b/LUFA/Drivers/USB/HighLevel/Events.h
@@ -39,6 +39,14 @@
  *\r
  *  Each event must only have one associated event handler, but can be raised by multiple sources.\r
  */\r
  *\r
  *  Each event must only have one associated event handler, but can be raised by multiple sources.\r
  */\r

+\r
+/** \ingroup Group_USB\r
+ *  @defgroup Group_Events USB Events\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the management of events from the USB kernel.\r
+ *\r
+ *  @{\r
+ */\r

  \r
 #ifndef __USBEVENTS_H__\r
 #define __USBEVENTS_H__\r
  \r
 #ifndef __USBEVENTS_H__\r
 #define __USBEVENTS_H__\r


@@ -436,5 +444,7 @@
                #if defined(__cplusplus)\r
                        }\r
                #endif\r
                #if defined(__cplusplus)\r
                        }\r
                #endif\r

-               \r
+       \r

 #endif\r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
index d628363..a1a0518 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
+++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
@@ -44,6 +44,14 @@
  *  named counterparts, thus they can be correlated easily with the official USB specification.\r
  */\r
 \r
  *  named counterparts, thus they can be correlated easily with the official USB specification.\r
  */\r
 \r

+/** \ingroup Group_USB\r
+ *  @defgroup Group_Descriptors USB Descriptors\r
+ *\r
+ *  Functions, macros, variables, enums and types related to standard USB descriptors.\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __USBDESCRIPTORS_H__\r
 #define __USBDESCRIPTORS_H__\r
 \r
 #ifndef __USBDESCRIPTORS_H__\r
 #define __USBDESCRIPTORS_H__\r
 \r


@@ -472,12 +480,6 @@
                                int16_t                 bString[];\r
                                #endif\r
                        } USB_Descriptor_String_t;\r
                                int16_t                 bString[];\r
                                #endif\r
                        } USB_Descriptor_String_t;\r

-                       \r
-                       typedef struct\r
-                       {\r
-                               uint16_t Size;\r
-                               void*    Address;\r
-                       } USB_Descriptor_Details_t;\r

 \r
                /* Function Prototypes: */\r
                        /** Function to retrieve a given descriptor's size and memory location from the given descriptor type value,\r
 \r
                /* Function Prototypes: */\r
                        /** Function to retrieve a given descriptor's size and memory location from the given descriptor type value,\r


@@ -519,5 +521,7 @@
                #if defined(__cplusplus)\r
                        }\r
                #endif\r
                #if defined(__cplusplus)\r
                        }\r
                #endif\r

-               \r
+       \r

 #endif\r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/HighLevel/StdRequestType.h b/LUFA/Drivers/USB/HighLevel/StdRequestType.h
index 423de6d..bf9ef8a 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/StdRequestType.h
+++ b/LUFA/Drivers/USB/HighLevel/StdRequestType.h
@@ -34,6 +34,14 @@
  *  direction, request recipient, etc.) can be extracted via masking.\r
  */\r
  \r
  *  direction, request recipient, etc.) can be extracted via masking.\r
  */\r
  \r

+/** \ingroup Group_USB\r
+ *  @defgroup Group_StdRequest Standard USB Requests\r
+ *\r
+ *  Functions, macros, variables, enums and types related to standard USB requests to USB devices.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __STDREQTYPE_H__\r
 #define __STDREQTYPE_H__\r
 \r
 #ifndef __STDREQTYPE_H__\r
 #define __STDREQTYPE_H__\r
 \r


@@ -181,11 +189,13 @@
                                                              *   device mode. */\r
                        };\r
 \r
                                                              *   device mode. */\r
                        };\r
 \r

-/* Private Interface - For use in library only: */\r
-       #if !defined(__DOXYGEN__)\r
-               /* Macros: */\r
-                       #define FEATURE_SELFPOWERED_ENABLED     (1 << 0)\r
-                       #define FEATURE_REMOTE_WAKEUP_ENABLED   (1 << 1)\r
-       #endif\r
-       \r
+       /* Private Interface - For use in library only: */\r
+               #if !defined(__DOXYGEN__)\r
+                       /* Macros: */\r
+                               #define FEATURE_SELFPOWERED_ENABLED     (1 << 0)\r
+                               #define FEATURE_REMOTE_WAKEUP_ENABLED   (1 << 1)\r
+               #endif\r
+\r

 #endif\r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h b/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h
index 5c2dad6..300a3f2 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h
+++ b/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h
@@ -35,6 +35,14 @@
  *  stream read/write process.\r
  */\r
  \r
  *  stream read/write process.\r
  */\r
  \r

+/** \ingroup Group_USB\r
+ *  @defgroup Group_StreamCallbacks Endpoint and Pipe Stream Callbacks\r
+ *\r
+ *  Functions, macros, variables, enums and types related to endpoint and pipe stream callback functions.\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __STREAMCALLBACK_H__\r
 #define __STREAMCALLBACK_H__\r
 \r
 #ifndef __STREAMCALLBACK_H__\r
 #define __STREAMCALLBACK_H__\r
 \r


@@ -85,3 +93,5 @@
                        };\r
                        \r
 #endif\r
                        };\r
                        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h b/LUFA/Drivers/USB/HighLevel/USBInterrupt.h
index d54de39..65e0b5f 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.h
@@ -34,6 +34,14 @@
  *  events as VBUS interrupts (on supported USB AVR models), device connections and disconnections, etc.\r
  */\r
 \r
  *  events as VBUS interrupts (on supported USB AVR models), device connections and disconnections, etc.\r
  */\r
 \r

+/** \ingroup Group_USB\r
+ *  @defgroup Group_USBInterrupt Endpoint and Pipe Interrupts\r
+ *\r
+ *  Functions, macros, variables, enums and types related to endpoint and pipe interrupts.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __USBINTERRUPT_H__\r
 #define __USBINTERRUPT_H__\r
 \r
 #ifndef __USBINTERRUPT_H__\r
 #define __USBINTERRUPT_H__\r
 \r


@@ -220,5 +228,7 @@
                #if defined(__cplusplus)\r
                        }\r
                #endif\r
                #if defined(__cplusplus)\r
                        }\r
                #endif\r

-               \r
+\r

 #endif\r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index e62ac68..80731ac 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -64,7 +64,7 @@ static void USB_DeviceTask(void)
        \r
                Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
 \r
        \r
                Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
 \r

-               if (Endpoint_IsSetupReceived())\r
+               if (Endpoint_IsSETUPReceived())\r

                {\r
                        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)\r
                        {\r
                {\r
                        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)\r
                        {\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h
index e0ca8ed..bcf117d 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.h
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.h
@@ -73,6 +73,8 @@
                         *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by\r
                         *        passing the NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection\r
                         *        and disconnection events may be manually fired by RAISE_EVENT(), and the USB_IsConnected global changed manually.\r
                         *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behaviour turned off by\r
                         *        passing the NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection\r
                         *        and disconnection events may be manually fired by RAISE_EVENT(), and the USB_IsConnected global changed manually.\r

+                        *\r
+                        *  \ingroup Group_USBManagement\r

                         */\r
                        extern volatile bool USB_IsConnected;\r
 \r
                         */\r
                        extern volatile bool USB_IsConnected;\r
 \r


@@ -81,6 +83,8 @@
                         *\r
                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r
                         *\r
                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r

+                        *\r
+                        *  \ingroup Group_USBManagement\r

                         */\r
                        extern volatile bool USB_IsInitialized;\r
 \r
                         */\r
                        extern volatile bool USB_IsInitialized;\r
 \r


@@ -94,6 +98,8 @@
                         *\r
                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r
                         *\r
                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r

+                        *\r
+                        *  \ingroup Group_Device\r

                         */\r
                        extern volatile bool USB_IsSuspended;\r
                        #endif\r
                         */\r
                        extern volatile bool USB_IsSuspended;\r
                        #endif\r


@@ -107,6 +113,8 @@
                         *  by the library.\r
                         *\r
                         *  \note This global is only present if the user application can be a USB host.\r
                         *  by the library.\r
                         *\r
                         *  \note This global is only present if the user application can be a USB host.\r

+                        *\r
+                        *  \ingroup Group_Host\r

                         */\r
                        extern volatile uint8_t USB_HostState;\r
                        #endif\r
                         */\r
                        extern volatile uint8_t USB_HostState;\r
                        #endif\r


@@ -173,6 +181,8 @@
                         *    event and disabled again on the firing of the USB_DeviceUnattached event.\r
                         *\r
                         *  \see Events.h for more information on the USB events.\r
                         *    event and disabled again on the firing of the USB_DeviceUnattached event.\r
                         *\r
                         *  \see Events.h for more information on the USB events.\r

+                        *\r
+                        *  \ingroup Group_USBManagement\r

                         */\r
                        TASK(USB_USBTask);\r
 \r
                         */\r
                        TASK(USB_USBTask);\r
 \r

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index 765627b..19d7298 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -105,10 +105,10 @@ void USB_Device_ProcessControlPacket(void)
        if (!(RequestHandled))\r
          RAISE_EVENT(USB_UnhandledControlPacket, bRequest, bmRequestType);\r
          \r
        if (!(RequestHandled))\r
          RAISE_EVENT(USB_UnhandledControlPacket, bRequest, bmRequestType);\r
          \r

-       if (Endpoint_IsSetupReceived())\r
+       if (Endpoint_IsSETUPReceived())\r

        {\r
                Endpoint_StallTransaction();\r
        {\r
                Endpoint_StallTransaction();\r

-               Endpoint_ClearSetupReceived();          \r
+               Endpoint_ClearControlSETUP();           \r

        }\r
 }\r
 \r
        }\r
 }\r
 \r


@@ -116,13 +116,13 @@ static void USB_Device_SetAddress(void)
 {\r
        uint8_t wValue_LSB = Endpoint_Read_Byte();\r
 \r
 {\r
        uint8_t wValue_LSB = Endpoint_Read_Byte();\r
 \r

-       Endpoint_ClearSetupReceived();\r
+       Endpoint_ClearControlSETUP();\r

        \r
        \r

-       while (!(Endpoint_IsSetupINReady()));\r
+       while (!(Endpoint_IsINReady()));\r

        \r
        \r

-       Endpoint_ClearSetupIN();\r
+       Endpoint_ClearControlIN();\r

        \r
        \r

-       while (!(Endpoint_IsSetupINReady()));\r
+       while (!(Endpoint_IsINReady()));\r

 \r
        UDADDR = ((1 << ADDEN) | (wValue_LSB & 0x7F));\r
 \r
 \r
        UDADDR = ((1 << ADDEN) | (wValue_LSB & 0x7F));\r
 \r


@@ -152,11 +152,11 @@ static void USB_Device_SetConfiguration(void)
                return;\r
        }\r
        \r
                return;\r
        }\r
        \r

-       Endpoint_ClearSetupReceived();\r
+       Endpoint_ClearControlSETUP();\r

 \r
        USB_ConfigurationNumber = wValue_LSB;\r
 \r
 \r
        USB_ConfigurationNumber = wValue_LSB;\r
 \r

-       Endpoint_ClearSetupIN();\r
+       Endpoint_ClearControlIN();\r

 \r
        if (!(AlreadyConfigured) && USB_ConfigurationNumber)\r
          RAISE_EVENT(USB_DeviceEnumerationComplete);\r
 \r
        if (!(AlreadyConfigured) && USB_ConfigurationNumber)\r
          RAISE_EVENT(USB_DeviceEnumerationComplete);\r


@@ -166,14 +166,14 @@ static void USB_Device_SetConfiguration(void)
 \r
 void USB_Device_GetConfiguration(void)\r
 {\r
 \r
 void USB_Device_GetConfiguration(void)\r
 {\r

-       Endpoint_ClearSetupReceived();  \r
+       Endpoint_ClearControlSETUP();   \r

 \r
        Endpoint_Write_Byte(USB_ConfigurationNumber);\r
        \r
 \r
        Endpoint_Write_Byte(USB_ConfigurationNumber);\r
        \r

-       Endpoint_ClearSetupIN();\r
+       Endpoint_ClearControlIN();\r

 \r
 \r

-       while (!(Endpoint_IsSetupOUTReceived()));\r
-       Endpoint_ClearSetupOUT();\r
+       while (!(Endpoint_IsOUTReceived()));\r
+       Endpoint_ClearControlOUT();\r

 }\r
 \r
 static void USB_Device_GetDescriptor(void)\r
 }\r
 \r
 static void USB_Device_GetDescriptor(void)\r


@@ -190,18 +190,18 @@ static void USB_Device_GetDescriptor(void)
        if ((DescriptorSize = USB_GetDescriptor(wValue, wIndex, &DescriptorPointer)) == NO_DESCRIPTOR)\r
          return;\r
        \r
        if ((DescriptorSize = USB_GetDescriptor(wValue, wIndex, &DescriptorPointer)) == NO_DESCRIPTOR)\r
          return;\r
        \r

-       Endpoint_ClearSetupReceived();\r
+       Endpoint_ClearControlSETUP();   \r

        \r
        if (wLength > DescriptorSize)\r
          wLength = DescriptorSize;\r
        \r
        while (wLength)\r
        {\r
        \r
        if (wLength > DescriptorSize)\r
          wLength = DescriptorSize;\r
        \r
        while (wLength)\r
        {\r

-               while (!(Endpoint_IsSetupINReady()))\r
+               while (!(Endpoint_IsINReady()))\r

                {\r
                {\r

-                       if (Endpoint_IsSetupOUTReceived())\r
+                       if (Endpoint_IsOUTReceived())\r

                        {\r
                        {\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

                                return;\r
                        }               \r
                }\r
                                return;\r
                        }               \r
                }\r


@@ -220,17 +220,17 @@ static void USB_Device_GetDescriptor(void)
                }\r
                \r
                SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
                }\r
                \r
                SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r

-               Endpoint_ClearSetupIN();\r
+               Endpoint_ClearControlIN();\r

        }\r
        \r
        if (SendZLP)\r
        {\r
        }\r
        \r
        if (SendZLP)\r
        {\r

-               while (!(Endpoint_IsSetupINReady()));\r
-               Endpoint_ClearSetupIN();\r
+               while (!(Endpoint_IsINReady()));\r
+               Endpoint_ClearControlIN();\r

        }\r
 \r
        }\r
 \r

-       while (!(Endpoint_IsSetupOUTReceived()));\r
-       Endpoint_ClearSetupOUT();\r
+       while (!(Endpoint_IsOUTReceived()));\r
+       Endpoint_ClearControlOUT();\r

 }\r
 \r
 static void USB_Device_GetStatus(const uint8_t bmRequestType)\r
 }\r
 \r
 static void USB_Device_GetStatus(const uint8_t bmRequestType)\r


@@ -264,13 +264,14 @@ static void USB_Device_GetStatus(const uint8_t bmRequestType)
        }\r
        \r
        Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);                      \r
        }\r
        \r
        Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);                      \r

-       Endpoint_ClearSetupReceived();\r
+       Endpoint_ClearControlSETUP();\r
+\r

        Endpoint_Write_Word_LE(CurrentStatus);\r
 \r
        Endpoint_Write_Word_LE(CurrentStatus);\r
 \r

-       Endpoint_ClearSetupIN();\r
+       Endpoint_ClearControlIN();\r

        \r
        \r

-       while (!(Endpoint_IsSetupOUTReceived()));\r
-       Endpoint_ClearSetupOUT();\r
+       while (!(Endpoint_IsOUTReceived()));\r
+       Endpoint_ClearControlOUT();\r

 }\r
 \r
 #if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)\r
 }\r
 \r
 #if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)\r


@@ -305,8 +306,8 @@ static void USB_Device_ClearSetFeature(const uint8_t bRequest, const uint8_t bmR
                                        }\r
 \r
                                        Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
                                        }\r
 \r
                                        Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r

-                                       Endpoint_ClearSetupReceived();\r
-                                       Endpoint_ClearSetupIN();\r
+                                       Endpoint_ClearControlSETUP();\r
+                                       Endpoint_ClearControlIN();\r

                                }\r
                        }\r
                        \r
                                }\r
                        }\r
                        \r

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
index 2b425e7..6571659 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
@@ -66,6 +66,8 @@
                         *\r
                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r
                         *\r
                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r

+                        *\r
+                        *  \ingroup Group_Device\r

                         */\r
                        extern uint8_t USB_ConfigurationNumber;\r
                        \r
                         */\r
                        extern uint8_t USB_ConfigurationNumber;\r
                        \r


@@ -74,12 +76,16 @@
                         *\r
                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r
                         *\r
                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r

+                        *\r
+                        *  \ingroup Group_Device\r

                         */\r
                        extern bool USB_RemoteWakeupEnabled;\r
                        \r
                        /** Indicates if the device is currently being powered by its own power supply, rather than being\r
                         *  powered by the host's USB supply. This flag should remain cleared if the device does not\r
                         *  support self powered mode, as indicated in the device descriptors.\r
                         */\r
                        extern bool USB_RemoteWakeupEnabled;\r
                        \r
                        /** Indicates if the device is currently being powered by its own power supply, rather than being\r
                         *  powered by the host's USB supply. This flag should remain cleared if the device does not\r
                         *  support self powered mode, as indicated in the device descriptors.\r

+                        *\r
+                        *  \ingroup Group_Device\r

                         */\r
                        extern bool USB_CurrentlySelfPowered;\r
 \r
                         */\r
                        extern bool USB_CurrentlySelfPowered;\r
 \r

diff --git a/LUFA/Drivers/USB/LowLevel/Device.h b/LUFA/Drivers/USB/LowLevel/Device.h
index c6e5f7f..8a2ee00 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Device.h
+++ b/LUFA/Drivers/USB/LowLevel/Device.h
@@ -33,6 +33,14 @@
  *  USB Device mode related macros and enums. This module contains macros and enums which are used when\r
  *  the USB controller is initialized in device mode.\r
  */\r
  *  USB Device mode related macros and enums. This module contains macros and enums which are used when\r
  *  the USB controller is initialized in device mode.\r
  */\r

+ \r
+/** \ingroup Group_USB\r
+ *  @defgroup Group_Device Device Management\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the management of a USB device when in Device mode.\r
+ *\r
+ *  @{\r
+ */\r

 \r
 #ifndef __USBDEVICE_H__\r
 #define __USBDEVICE_H__\r
 \r
 #ifndef __USBDEVICE_H__\r
 #define __USBDEVICE_H__\r


@@ -64,42 +72,52 @@
                         */\r
                        #define USB_DEVICE_OPT_FULLSPEED               (0 << 0)\r
                        \r
                         */\r
                        #define USB_DEVICE_OPT_FULLSPEED               (0 << 0)\r
                        \r

-                       /** Sends a Remote Wakeup request to the host. This signals to the host that the device should\r
-                        *  be taken out of suspended mode, and communications should resume.\r
-                        *\r
-                        *  Typically, this is implemented so that HID devices (mice, keyboards, etc.) can wake up the\r
-                        *  host computer when the host has suspended all USB devices to enter a low power state.\r
-                        *\r
-                        *  \note This macro should only be used if the device has indicated to the host that it\r
-                        *        supports the Remote Wakeup feature in the device descriptors, and should only be\r
-                        *        issued if the host is currently allowing remote wakeup events from the device (i.e.,\r
-                        *        the USB_RemoteWakeupEnabled flag is set, see DevChapter9.h documentation).\r
-                        *\r
-                        *  \see StdDescriptors.h for more information on the RMWAKEUP feature and device descriptors.\r
-                        */\r
-                       #define USB_Device_SendRemoteWakeup()   MACROS{ UDCON |= (1 << RMWKUP); }MACROE\r
+               /* Psuedo-Function Macros: */\r
+                       #if defined(__DOXYGEN__)\r
+                               /** Sends a Remote Wakeup request to the host. This signals to the host that the device should\r
+                                *  be taken out of suspended mode, and communications should resume.\r
+                                *\r
+                                *  Typically, this is implemented so that HID devices (mice, keyboards, etc.) can wake up the\r
+                                *  host computer when the host has suspended all USB devices to enter a low power state.\r
+                                *\r
+                                *  \note This macro should only be used if the device has indicated to the host that it\r
+                                *        supports the Remote Wakeup feature in the device descriptors, and should only be\r
+                                *        issued if the host is currently allowing remote wakeup events from the device (i.e.,\r
+                                *        the USB_RemoteWakeupEnabled flag is set, see DevChapter9.h documentation).\r
+                                *\r
+                                *  \see StdDescriptors.h for more information on the RMWAKEUP feature and device descriptors.\r
+                                */\r
+                               static inline void USB_Device_SendRemoteWakeup(void);\r
+                               \r
+                               /** Indicates if a Remote Wakeup request is being sent to the host. This returns true if a\r
+                                *  remote wakeup is currently being sent, false otherwise.\r
+                                *\r
+                                *  This can be used in conjunction with the USB_Device_IsUSBSuspended() macro to determine if\r
+                                *  a sent RMWAKEUP request was accepted or rejected by the host.\r
+                                *\r
+                                *  \note This macro should only be used if the device has indicated to the host that it\r
+                                *        supports the Remote Wakeup feature in the device descriptors.\r
+                                *\r
+                                *  \see StdDescriptors.h for more information on the RMWAKEUP feature and device descriptors.\r
+                                *\r
+                                *  \return Boolean true if no Remote Wakeup request is currently being sent, false otherwise\r
+                                */\r
+                               static inline bool USB_Device_IsRemoteWakeupSent(void);\r
+                               \r
+                               /** Indicates if the device is currently suspended by the host. While suspended, the device is\r
+                                *  to enter a low power state until resumed by the host. While suspended no USB traffic to or\r
+                                *  from the device can occur (except for Remote Wakeup requests).\r
+                                *\r
+                                *  \return Boolean true if the USB communications have been suspended by the host, false otherwise.\r
+                                */\r
+                               static inline bool USB_Device_IsUSBSuspended(void);\r
+                       #else\r
+                               #define USB_Device_SendRemoteWakeup()   MACROS{ UDCON |= (1 << RMWKUP); }MACROE\r

 \r
 \r

-                       /** Indicates if a Remote Wakeup request is being sent to the host. This returns true if a\r
-                        *  remote wakeup is currently being sent, false otherwise.\r
-                        *\r
-                        *  This can be used in conjunction with the USB_Device_IsUSBSuspended() macro to determine if\r
-                        *  a sent RMWAKEUP request was accepted or rejected by the host.\r
-                        *\r
-                        *  \note This macro should only be used if the device has indicated to the host that it\r
-                        *        supports the Remote Wakeup feature in the device descriptors.\r
-                        *\r
-                        *  \see StdDescriptors.h for more information on the RMWAKEUP feature and device descriptors.\r
-                        */\r
-                       #define USB_Device_IsRemoteWakeupSent()       ((UDCON &  (1 << RMWKUP)) ? false : true)\r
+                               #define USB_Device_IsRemoteWakeupSent()       ((UDCON &  (1 << RMWKUP)) ? false : true)\r

 \r
 \r

-                       /** Indicates if the device is currently suspended by the host. While suspended, the device is\r
-                        *  to enter a low power state until resumed by the host. While suspended no USB traffic to or\r
-                        *  from the device can occur (except for Remote Wakeup requests).\r
-                        *\r
-                        *  This macro returns true if the USB communications have been suspended by the host, false\r
-                        *  otherwise.\r
-                        */\r
-                       #define USB_Device_IsUSBSuspended()           ((UDINT &  (1 << SUSPI)) ? true : false)\r
+                               #define USB_Device_IsUSBSuspended()           ((UDINT &  (1 << SUSPI)) ? true : false)\r
+                       #endif\r

 \r
                /* Enums: */\r
                        /** Enum for the ErrorCode parameter of the USB_DeviceError event.\r
 \r
                /* Enums: */\r
                        /** Enum for the ErrorCode parameter of the USB_DeviceError event.\r


@@ -122,5 +140,7 @@
                        #define USB_Device_SetLowSpeed()        MACROS{ UDCON |=  (1 << LSM);   }MACROE\r
                        #define USB_Device_SetHighSpeed()       MACROS{ UDCON &= ~(1 << LSM);   }MACROE\r
        #endif\r
                        #define USB_Device_SetLowSpeed()        MACROS{ UDCON |=  (1 << LSM);   }MACROE\r
                        #define USB_Device_SetHighSpeed()       MACROS{ UDCON &= ~(1 << LSM);   }MACROE\r
        #endif\r

-       \r
+\r

 #endif\r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c
index aa18358..b885471 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c
@@ -88,8 +88,19 @@ uint8_t Endpoint_WaitUntilReady(void)
 \r
        USB_INT_Clear(USB_INT_SOFI);\r
 \r
 \r
        USB_INT_Clear(USB_INT_SOFI);\r
 \r

-       while (!(Endpoint_ReadWriteAllowed()))\r
+       for (;;)\r

        {\r
        {\r

+               if (Endpoint_GetEndpointDirection() == ENDPOINT_DIR_IN)\r
+               {\r
+                       if (Endpoint_IsINReady())\r
+                         return ENDPOINT_READYWAIT_NoError;\r
+               }\r
+               else\r
+               {\r
+                       if (Endpoint_IsOUTReceived())\r
+                         return ENDPOINT_READYWAIT_NoError;            \r
+               }\r
+               \r

                if (!(USB_IsConnected))\r
                  return ENDPOINT_READYWAIT_DeviceDisconnected;\r
                else if (Endpoint_IsStalled())\r
                if (!(USB_IsConnected))\r
                  return ENDPOINT_READYWAIT_DeviceDisconnected;\r
                else if (Endpoint_IsStalled())\r


@@ -103,8 +114,6 @@ uint8_t Endpoint_WaitUntilReady(void)
                          return ENDPOINT_READYWAIT_Timeout;\r
                }\r
        }\r
                          return ENDPOINT_READYWAIT_Timeout;\r
                }\r
        }\r

-       \r
-       return ENDPOINT_READYWAIT_NoError;\r

 }\r
 \r
 uint8_t Endpoint_Discard_Stream(uint16_t Length\r
 }\r
 \r
 uint8_t Endpoint_Discard_Stream(uint16_t Length\r


@@ -120,9 +129,9 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length
 \r
        while (Length--)\r
        {\r
 \r
        while (Length--)\r
        {\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\r

 \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


@@ -132,8 +141,10 @@ uint8_t Endpoint_Discard_Stream(uint16_t Length
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-\r
-               Endpoint_Discard_Byte();\r
+               else\r
+               {\r
+                       Endpoint_Discard_Byte();\r
+               }\r

        }\r
        \r
        return ENDPOINT_RWSTREAM_ERROR_NoError;\r
        }\r
        \r
        return ENDPOINT_RWSTREAM_ERROR_NoError;\r


@@ -153,9 +164,9 @@ uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length
 \r
        while (Length--)\r
        {\r
 \r
        while (Length--)\r
        {\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearIN();\r

                        \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


@@ -165,8 +176,10 @@ uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-\r
-               Endpoint_Write_Byte(*(DataStream++));\r
+               else\r
+               {\r
+                       Endpoint_Write_Byte(*(DataStream++));\r
+               }\r

        }\r
        \r
        return ENDPOINT_RWSTREAM_ERROR_NoError;\r
        }\r
        \r
        return ENDPOINT_RWSTREAM_ERROR_NoError;\r


@@ -186,9 +199,9 @@ uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length
 \r
        while (Length--)\r
        {\r
 \r
        while (Length--)\r
        {\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearIN();\r

 \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


@@ -198,8 +211,10 @@ uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-\r
-               Endpoint_Write_Byte(*(DataStream--));\r
+               else\r
+               {\r
+                       Endpoint_Write_Byte(*(DataStream--));\r
+               }\r

        }\r
        \r
        return ENDPOINT_RWSTREAM_ERROR_NoError;\r
        }\r
        \r
        return ENDPOINT_RWSTREAM_ERROR_NoError;\r


@@ -219,9 +234,9 @@ uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
 \r
        while (Length--)\r
        {\r
 \r
        while (Length--)\r
        {\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\r

 \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


@@ -231,8 +246,10 @@ uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-               \r
-               *(DataStream++) = Endpoint_Read_Byte();\r
+               else\r
+               {\r
+                       *(DataStream++) = Endpoint_Read_Byte();\r
+               }\r

        }\r
        \r
        return ENDPOINT_RWSTREAM_ERROR_NoError;\r
        }\r
        \r
        return ENDPOINT_RWSTREAM_ERROR_NoError;\r


@@ -252,9 +269,9 @@ uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
 \r
        while (Length--)\r
        {\r
 \r
        while (Length--)\r
        {\r

-               if (!(Endpoint_ReadWriteAllowed()))\r
+               if (!(Endpoint_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\r

 \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


@@ -264,8 +281,10 @@ uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        if ((ErrorCode = Endpoint_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-               \r
-               *(DataStream--) = Endpoint_Read_Byte();\r
+               else\r
+               {\r
+                       *(DataStream--) = Endpoint_Read_Byte();\r
+               }\r

        }\r
        \r
        return ENDPOINT_RWSTREAM_ERROR_NoError;\r
        }\r
        \r
        return ENDPOINT_RWSTREAM_ERROR_NoError;\r


@@ -276,9 +295,9 @@ uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
        uint8_t* DataStream = (uint8_t*)Buffer;\r
        bool     SendZLP    = true;\r
        \r
        uint8_t* DataStream = (uint8_t*)Buffer;\r
        bool     SendZLP    = true;\r
        \r

-       while (Length && !(Endpoint_IsSetupOUTReceived()))\r
+       while (Length && !(Endpoint_IsOUTReceived()))\r

        {\r
        {\r

-               while (!(Endpoint_IsSetupINReady()));\r
+               while (!(Endpoint_IsINReady()));\r

                \r
                while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
                {\r
                \r
                while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
                {\r


@@ -288,19 +307,19 @@ uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
                }\r
                \r
                SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
                }\r
                \r
                SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r

-               Endpoint_ClearSetupIN();\r
+               Endpoint_ClearControlIN();\r

        }\r
        \r
        }\r
        \r

-       if (Endpoint_IsSetupOUTReceived())\r
+       if (Endpoint_IsOUTReceived())\r

          return ENDPOINT_RWCSTREAM_ERROR_HostAborted;\r
        \r
        if (SendZLP)\r
        {\r
          return ENDPOINT_RWCSTREAM_ERROR_HostAborted;\r
        \r
        if (SendZLP)\r
        {\r

-               while (!(Endpoint_IsSetupINReady()));\r
-               Endpoint_ClearSetupIN();\r
+               while (!(Endpoint_IsINReady()));\r
+               Endpoint_ClearControlIN();\r

        }\r
        \r
        }\r
        \r

-       while (!(Endpoint_IsSetupOUTReceived()));\r
+       while (!(Endpoint_IsOUTReceived()));\r

 \r
        return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
 }\r
 \r
        return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
 }\r


@@ -310,9 +329,9 @@ uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
        uint8_t* DataStream = (uint8_t*)(Buffer + Length - 1);\r
        bool     SendZLP    = true;\r
        \r
        uint8_t* DataStream = (uint8_t*)(Buffer + Length - 1);\r
        bool     SendZLP    = true;\r
        \r

-       while (Length && !(Endpoint_IsSetupOUTReceived()))\r
+       while (Length && !(Endpoint_IsOUTReceived()))\r

        {\r
        {\r

-               while (!(Endpoint_IsSetupINReady()));\r
+               while (!(Endpoint_IsINReady()));\r

                \r
                while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
                {\r
                \r
                while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
                {\r


@@ -322,19 +341,19 @@ uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
                }\r
                \r
                SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
                }\r
                \r
                SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r

-               Endpoint_ClearSetupIN();\r
+               Endpoint_ClearControlIN();\r

        }\r
        \r
        }\r
        \r

-       if (Endpoint_IsSetupOUTReceived())\r
+       if (Endpoint_IsOUTReceived())\r

          return ENDPOINT_RWCSTREAM_ERROR_HostAborted;\r
        \r
        if (SendZLP)\r
        {\r
          return ENDPOINT_RWCSTREAM_ERROR_HostAborted;\r
        \r
        if (SendZLP)\r
        {\r

-               while (!(Endpoint_IsSetupINReady()));\r
-               Endpoint_ClearSetupIN();\r
+               while (!(Endpoint_IsINReady()));\r
+               Endpoint_ClearControlIN();\r

        }\r
        \r
        }\r
        \r

-       while (!(Endpoint_IsSetupOUTReceived()));\r
+       while (!(Endpoint_IsOUTReceived()));\r

 \r
        return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
 }\r
 \r
        return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
 }\r


@@ -345,7 +364,7 @@ uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)
        \r
        while (Length)\r
        {\r
        \r
        while (Length)\r
        {\r

-               while (!(Endpoint_IsSetupOUTReceived()));\r
+               while (!(Endpoint_IsOUTReceived()));\r

                \r
                while (Length && Endpoint_BytesInEndpoint())\r
                {\r
                \r
                while (Length && Endpoint_BytesInEndpoint())\r
                {\r


@@ -354,10 +373,10 @@ uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)
                        Length--;\r
                }\r
                \r
                        Length--;\r
                }\r
                \r

-               Endpoint_ClearSetupOUT();\r
+               Endpoint_ClearControlOUT();\r

        }\r
        \r
        }\r
        \r

-       while (!(Endpoint_IsSetupINReady()));\r
+       while (!(Endpoint_IsINReady()));\r

        \r
        return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
 }\r
        \r
        return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
 }\r


@@ -368,7 +387,7 @@ uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)
        \r
        while (Length)\r
        {\r
        \r
        while (Length)\r
        {\r

-               while (!(Endpoint_IsSetupOUTReceived()));\r
+               while (!(Endpoint_IsOUTReceived()));\r

                \r
                while (Length && Endpoint_BytesInEndpoint())\r
                {\r
                \r
                while (Length && Endpoint_BytesInEndpoint())\r
                {\r


@@ -377,10 +396,10 @@ uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)
                        Length--;\r
                }\r
                \r
                        Length--;\r
                }\r
                \r

-               Endpoint_ClearSetupOUT();\r
+               Endpoint_ClearControlOUT();\r

        }\r
        \r
        }\r
        \r

-       while (!(Endpoint_IsSetupINReady()));\r
+       while (!(Endpoint_IsINReady()));\r

 \r
        return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
 }\r
 \r
        return ENDPOINT_RWCSTREAM_ERROR_NoError;\r
 }\r

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index c0eab35..2223f0c 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -34,7 +34,25 @@
  *  module contains the endpoint management macros, as well as endpoint interrupt and data\r
  *  send/recieve functions for various data types.\r
  */\r
  *  module contains the endpoint management macros, as well as endpoint interrupt and data\r
  *  send/recieve functions for various data types.\r
  */\r

+\r
+/** \ingroup Group_USB\r
+ *  @defgroup Group_EndpointManagement Endpoint Management\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the setup and management of endpoints while in USB Device mode.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+/** @defgroup Group_EndpointRW Endpoint Data Reading and Writing\r
+ *\r
+ *  Functions, macros, variables, enums and types related to data reading and writing from and to endpoints.\r
+ */\r

  \r
  \r

+/** @defgroup Group_EndpointPacketManagement Endpoint Packet Management\r
+ *\r
+ *  Functions, macros, variables, enums and types related to packet management of endpoints.\r
+ */\r
+\r

 #ifndef __ENDPOINT_H__\r
 #define __ENDPOINT_H__\r
 \r
 #ifndef __ENDPOINT_H__\r
 #define __ENDPOINT_H__\r
 \r


@@ -85,10 +103,10 @@
                         */\r
                        #define ENDPOINT_CONTROLEP                    0\r
 \r
                         */\r
                        #define ENDPOINT_CONTROLEP                    0\r
 \r

-                       /** Default size of the default control endpoint's bank, until altered by the Endpoint0Size value \r
-                        *  in the device descriptor. Not available if the FIXED_CONTROL_ENDPOINT_SIZE token is defined.\r
-                        */\r

                        #if (!defined(FIXED_CONTROL_ENDPOINT_SIZE) || defined(__DOXYGEN__))\r
                        #if (!defined(FIXED_CONTROL_ENDPOINT_SIZE) || defined(__DOXYGEN__))\r

+                               /** Default size of the default control endpoint's bank, until altered by the Endpoint0Size value \r
+                                *  in the device descriptor. Not available if the FIXED_CONTROL_ENDPOINT_SIZE token is defined.\r
+                                */\r

                                #define ENDPOINT_CONTROLEP_DEFAULT_SIZE   8\r
                        #endif\r
                        \r
                                #define ENDPOINT_CONTROLEP_DEFAULT_SIZE   8\r
                        #endif\r
                        \r


@@ -165,125 +183,271 @@
                         */\r
                        #define ENDPOINT_INT_OUT                      UEIENX, (1 << RXOUTE), UEINTX, (1 << RXOUTI)\r
                        \r
                         */\r
                        #define ENDPOINT_INT_OUT                      UEIENX, (1 << RXOUTE), UEINTX, (1 << RXOUTI)\r
                        \r

-                       #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER) || defined(__DOXYGEN__)\r
-                               /** Indicates the number of bytes currently stored in the current endpoint's selected bank. */\r
-                               #define Endpoint_BytesInEndpoint()        UEBCX\r
-                       #else\r
-                               #define Endpoint_BytesInEndpoint()        UEBCLX\r
-                       #endif\r
-                       \r
-                       /** Returns the endpoint address of the currently selected endpoint. This is typically used to save\r
-                        *  the currently selected endpoint number so that it can be restored after another endpoint has\r
-                        *  been manipulated.\r
-                        */\r
-                       #define Endpoint_GetCurrentEndpoint()         (UENUM & ENDPOINT_EPNUM_MASK)\r
+               /* Psuedo-Function Macros: */\r
+                       #if defined(__DOXYGEN__)\r
+                               /** Indicates the number of bytes currently stored in the current endpoint's selected bank.\r
+                                *\r
+                                *  \note The return width of this function may differ, depending on the maximum endpoint bank size\r
+                                *        of the selected AVR model.\r
+                                *\r
+                                *  \ingroup Group_EndpointRW\r
+                                *\r
+                                *  \return Total number of bytes in the currently selected Endpoint's FIFO buffer\r
+                                */\r
+                               static inline uint16_t Endpoint_BytesInEndpoint(void);\r

                        \r
                        \r

-                       /** Selects the given endpoint number. If the address from the device descriptors is used, the\r
-                        *  value should be masked with the ENDPOINT_EPNUM_MASK constant to extract only the endpoint\r
-                        *  number (and discarding the endpoint direction bit).\r
-                        *\r
-                        *  Any endpoint operations which do not require the endpoint number to be indicated will operate on\r
-                        *  the currently selected endpoint.\r
-                        */\r
-                       #define Endpoint_SelectEndpoint(epnum)        MACROS{ UENUM = epnum; }MACROE\r
+                               /** Get the endpoint address of the currently selected endpoint. This is typically used to save\r
+                                *  the currently selected endpoint number so that it can be restored after another endpoint has\r
+                                *  been manipulated.\r
+                                *\r
+                                *  \return Index of the currently selected endpoint\r
+                                */\r
+                               static inline uint8_t Endpoint_GetCurrentEndpoint(void);\r
+                               \r
+                               /** Selects the given endpoint number. If the address from the device descriptors is used, the\r
+                                *  value should be masked with the ENDPOINT_EPNUM_MASK constant to extract only the endpoint\r
+                                *  number (and discarding the endpoint direction bit).\r
+                                *\r
+                                *  Any endpoint operations which do not require the endpoint number to be indicated will operate on\r
+                                *  the currently selected endpoint.\r
+                                *\r
+                                *  \param EndpointNumber Endpoint number to select\r
+                                */\r
+                               static inline void Endpoint_SelectEndpoint(uint8_t EndpointNumber);\r
+                               \r
+                               /** Resets the endpoint bank FIFO. This clears all the endpoint banks and resets the USB controller's\r
+                                *  In and Out pointers to the bank's contents.\r
+                                *\r
+                                *  \param EndpointNumber Endpoint number whose FIFO buffers are to be reset\r
+                                */\r
+                               static inline void Endpoint_ResetFIFO(uint8_t EndpointNumber);\r
+                               \r
+                               /** Enables the currently selected endpoint so that data can be sent and received through it to\r
+                                *  and from a host.\r
+                                *\r
+                                *  \note Endpoints must first be configured properly rather than just being enabled via the\r
+                                *        Endpoint_ConfigureEndpoint() macro, which calls Endpoint_EnableEndpoint() automatically.\r
+                                */\r
+                               static inline void Endpoint_EnableEndpoint(void);\r

 \r
 \r

-                       /** Resets the endpoint bank FIFO. This clears all the endpoint banks and resets the USB controller's\r
-                        *  In and Out pointers to the bank's contents.\r
-                        */\r
-                       #define Endpoint_ResetFIFO(epnum)             MACROS{ UERST = (1 << epnum); UERST = 0; }MACROE\r
+                               /** Disables the currently selected endpoint so that data cannot be sent and received through it\r
+                                *  to and from a host.\r
+                                */\r
+                               static inline void Endpoint_DisableEndpoint(void);\r
+                               \r
+                               /** Determines if the currently selected endpoint is enabled, but not necessarily configured.\r
+                                *\r
+                                * \return Boolean True if the currently selected endpoint is enabled, false otherwise\r
+                                */\r
+                               static inline bool Endpoint_IsEnabled(void);\r
+                               \r
+                               /** Determines if the currently selected endpoint may be read from (if data is waiting in the endpoint\r
+                                *  bank and the endpoint is an OUT direction, or if the bank is not yet full if the endpoint is an IN\r
+                                *  direction). This function will return false if an error has occurred in the endpoint, if the endpoint\r
+                                *  is an OUT direction and no packet (or an empty packet) has been received, or if the endpoint is an IN\r
+                                *  direction and the endpoint bank is full.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                *\r
+                                *  \return Boolean true if the currently selected endpoint may be read from or written to, depending on its direction\r
+                                */\r
+                               static inline bool Endpoint_IsReadWriteAllowed(void);\r
+                               \r
+                               /** Determines if the currently selected endpoint is configured.\r
+                                *\r
+                                *  \return Boolean true if the currently selected endpoint has been configured, false otherwise\r
+                                */\r
+                               static inline bool Endpoint_IsConfigured(void);\r
+                               \r
+                               /** Returns a mask indicating which INTERRUPT type endpoints have interrupted - i.e. their\r
+                                *  interrupt duration has elapsed. Which endpoints have interrupted can be determined by\r
+                                *  masking the return value against (1 << {Endpoint Number}).\r
+                                *\r
+                                *  \return Mask whose bits indicate which endpoints have interrupted\r
+                                */\r
+                               static inline uint8_t Endpoint_GetEndpointInterrupts(void);\r
+                               \r
+                               /** Clears the endpoint interrupt flag. This clears the specified endpoint number's interrupt\r
+                                *  mask in the endpoint interrupt flag register.\r
+                                *\r
+                                *  \param EndpointNumber  Index of the endpoint whose interrupt flag should be cleared\r
+                                */\r
+                               static inline void Endpoint_ClearEndpointInterrupt(uint8_t EndpointNumber);\r
+                               \r
+                               /** Determines if the specified endpoint number has interrupted (valid only for INTERRUPT type\r
+                                *  endpoints).\r
+                                *\r
+                                *  \param EndpointNumber  Index of the endpoint whose interrupt flag should be tested\r
+                                *\r
+                                *  \return Boolean true if the specified endpoint has interrupted, false otherwise\r
+                                */\r
+                               static inline bool Endpoint_HasEndpointInterrupted(uint8_t EndpointNumber);\r
+                               \r
+                               /** Determines if the selected IN endpoint is ready for a new packet.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                *\r
+                                *  \return Boolean true if the current endpoint is ready for an IN packet, false otherwise.\r
+                                */\r
+                               static inline bool Endpoint_IsINReady(void);\r
+                               \r
+                               /** Determines if the selected OUT endpoint has received new packet.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                *\r
+                                *  \return Boolean true if current endpoint is has received an OUT packet, false otherwise.\r
+                                */\r
+                               static inline bool Endpoint_IsOUTReceived(void);\r
+                               \r
+                               /** Determines if the current CONTROL type endpoint has received a SETUP packet.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                *\r
+                                *  \return Boolean true if the selected endpoint has received a SETUP packet, false otherwise.\r
+                                */\r
+                               static inline bool Endpoint_IsSETUPReceived(void);\r
+                               \r
+                               /** Clears a received SETUP packet on the currently selected CONTROL type endpoint, freeing up the\r
+                                *  endpoint for the next packet.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                *\r
+                                *  \note This is not applicable for non CONTROL type endpoints.                         \r
+                                */\r
+                               static inline void Endpoint_ClearControlSETUP(void);\r
+                               \r
+                               /** Sends an IN packet to the host on the currently selected CONTROL type endpoint, freeing up the\r
+                                *  endpoint for the next packet.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                *\r
+                                *  \note For non CONTROL type endpoints, use Endpoint_ClearIN() instead.                        \r
+                                */\r
+                               static inline void Endpoint_ClearControlIN(void);\r
+                               \r
+                               /** Acknowledges an OUT packet to the host on the currently selected CONTROL type endpoint, freeing\r
+                                *  up the endpoint for the next packet.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                *\r
+                                *  \note For non CONTROL type endpoints, use Endpoint_ClearOUT() instead.\r
+                                */\r
+                               static inline void Endpoint_ClearControlOUT(void);\r
+                               \r
+                               /** Sends an IN packet to the host on the currently selected non CONTROL type endpoint, freeing\r
+                                *  up the endpoint for the next packet and switching to the alternative endpoint bank if double banked.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                *\r
+                                *  \note For CONTROL type endpoints, use Endpoint_ClearControlIN() instead.\r
+                                */\r
+                               static inline void Endpoint_ClearIN(void);\r
+                               \r
+                               /** Acknowledges an OUT packet to the host on the currently selected non CONTROL type endpoint, freeing\r
+                                *  up the endpoint for the next packet and switching to the alternative endpoint bank if double banked.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                *\r
+                                *  \note For CONTROL type endpoints, use Endpoint_ClearControlOUT() instead.\r
+                                */\r
+                               static inline void Endpoint_ClearOUT(void);\r
+                               \r
+                               /** Stalls the current endpoint, indicating to the host that a logical problem occurred with the\r
+                                *  indicated endpoint and that the current transfer sequence should be aborted. This provides a\r
+                                *  way for devices to indicate invalid commands to the host so that the current transfer can be\r
+                                *  aborted and the host can begin its own recovery sequence.\r
+                                *\r
+                                *  The currently selected endpoint remains stalled until either the Endpoint_ClearStall() macro\r
+                                *  is called, or the host issues a CLEAR FEATURE request to the device for the currently selected\r
+                                *  endpoint.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                */\r
+                               static inline void Endpoint_StallTransaction(void);\r
+                               \r
+                               /** Clears the STALL condition on the currently selected endpoint.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                */\r
+                               static inline void Endpoint_ClearStall(void);\r
+                               \r
+                               /** Determines if the currently selected endpoint is stalled, false otherwise.\r
+                                *\r
+                                *  \ingroup Group_EndpointPacketManagement\r
+                                *\r
+                                *  \return Boolean true if the currently selected endpoint is stalled, false otherwise\r
+                                */\r
+                               static inline bool Endpoint_IsStalled(void);\r
+                               \r
+                               /** Resets the data toggle of the currently selected endpoint. */\r
+                               static inline void Endpoint_ResetDataToggle(void);\r
+                               \r
+                               /** Determines the currently selected endpoint's direction.\r
+                                *\r
+                                *  \return The currently selected endpoint's direction, as a ENDPOINT_DIR_* mask.\r
+                                */\r
+                               static inline uint8_t Endpoint_GetEndpointDirection(void);\r
+                       #else\r
+                               #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER) || defined(__DOXYGEN__)\r
+                                       #define Endpoint_BytesInEndpoint()        UEBCX\r
+                               #else\r
+                                       #define Endpoint_BytesInEndpoint()        UEBCLX\r
+                               #endif\r
+                               \r
+                               #define Endpoint_GetCurrentEndpoint()         (UENUM & ENDPOINT_EPNUM_MASK)\r
+                               \r
+                               #define Endpoint_SelectEndpoint(epnum)        MACROS{ UENUM = epnum; }MACROE\r

 \r
 \r

-                       /** Enables the currently selected endpoint so that data can be sent and received through it to\r
-                        *  and from a host.\r
-                        *\r
-                        *  \note Endpoints must first be configured properly rather than just being enabled via the\r
-                        *        Endpoint_ConfigureEndpoint() macro, which calls Endpoint_EnableEndpoint() automatically.\r
-                        */\r
-                       #define Endpoint_EnableEndpoint()             MACROS{ UECONX |= (1 << EPEN); }MACROE\r
+                               #define Endpoint_ResetFIFO(epnum)             MACROS{ UERST = (1 << epnum); UERST = 0; }MACROE\r

 \r
 \r

-                       /** Disables the currently selected endpoint so that data cannot be sent and received through it\r
-                        *  to and from a host.\r
-                        */\r
-                       #define Endpoint_DisableEndpoint()            MACROS{ UECONX &= ~(1 << EPEN); }MACROE\r
+                               #define Endpoint_EnableEndpoint()             MACROS{ UECONX |= (1 << EPEN); }MACROE\r

 \r
 \r

-                       /** Returns true if the currently selected endpoint is enabled, false otherwise. */\r
-                       #define Endpoint_IsEnabled()                  ((UECONX & (1 << EPEN)) ? true : false)\r
+                               #define Endpoint_DisableEndpoint()            MACROS{ UECONX &= ~(1 << EPEN); }MACROE\r

 \r
 \r

-                       /** Returns true if the currently selected endpoint may be read from (if data is waiting in the endpoint\r
-                        *  bank and the endpoint is an OUT direction, or if the bank is not yet full if the endpoint is an\r
-                        *  IN direction). This function will return false if an error has occurred in the endpoint, or if\r
-                        *  the endpoint is an OUT direction and no packet has been received, or if the endpoint is an IN\r
-                        *  direction and the endpoint bank is full.\r
-                        */\r
-                       #define Endpoint_ReadWriteAllowed()           ((UEINTX & (1 << RWAL)) ? true : false)\r
+                               #define Endpoint_IsEnabled()                  ((UECONX & (1 << EPEN)) ? true : false)\r

 \r
 \r

-                       /** Returns true if the currently selected endpoint is configured, false otherwise. */\r
-                       #define Endpoint_IsConfigured()               ((UESTA0X & (1 << CFGOK)) ? true : false)\r
+                               #define Endpoint_IsReadWriteAllowed()         ((UEINTX & (1 << RWAL)) ? true : false)\r

 \r
 \r

-                       /** Returns a mask indicating which INTERRUPT type endpoints have interrupted - i.e. their\r
-                        *  interrupt duration has elapsed. Which endpoints have interrupted can be determined by\r
-                        *  masking the return value against (1 << {Endpoint Number}).\r
-                        */\r
-                       #define Endpoint_GetEndpointInterrupts()      UEINT\r
+                               #define Endpoint_IsConfigured()               ((UESTA0X & (1 << CFGOK)) ? true : false)\r

 \r
 \r

-                       /** Clears the endpoint interrupt flag. This clears the specified endpoint number's interrupt\r
-                        *  mask in the endpoint interrupt flag register.\r
-                        */\r
-                       #define Endpoint_ClearEndpointInterrupt(n)    MACROS{ UEINT &= ~(1 << n); }MACROE\r
+                               #define Endpoint_GetEndpointInterrupts()      UEINT\r

 \r
 \r

-                       /** Returns true if the specified endpoint number has interrupted (valid only for INTERRUPT type\r
-                        *  endpoints), false otherwise.\r
-                        */\r
-                       #define Endpoint_HasEndpointInterrupted(n)    ((UEINT & (1 << n)) ? true : false)\r
+                               #define Endpoint_ClearEndpointInterrupt(n)    MACROS{ UEINT &= ~(1 << n); }MACROE\r

 \r
 \r

-                       /** Clears the currently selected endpoint bank, and switches to the alternate bank if the currently\r
-                        *  selected endpoint is dual-banked. When cleared, this either frees the bank up for the next packet\r
-                        *  from the host (if the endpoint is of the OUT direction) or sends the packet contents to the host\r
-                        *  (if the endpoint is of the IN direction).\r
-                        */\r
-                       #define Endpoint_ClearCurrentBank()           MACROS{ UEINTX &= ~(1 << FIFOCON); }MACROE\r
-                       \r
-                       /** Returns true if the current CONTROL type endpoint is ready for an IN packet, false otherwise. */\r
-                       #define Endpoint_IsSetupINReady()             ((UEINTX & (1 << TXINI))  ? true : false)\r
+                               #define Endpoint_HasEndpointInterrupted(n)    ((UEINT & (1 << n)) ? true : false)\r
+                               \r
+                               #define Endpoint_IsINReady()                 ((UEINTX & (1 << TXINI))  ? true : false)\r
+                               \r
+                               #define Endpoint_IsOUTReceived()             ((UEINTX & (1 << RXOUTI)) ? true : false)\r

 \r
 \r

-                       /** Returns true if the current CONTROL type endpoint is ready for an OUT packet, false otherwise. */\r
-                       #define Endpoint_IsSetupOUTReceived()         ((UEINTX & (1 << RXOUTI)) ? true : false)\r
+                               #define Endpoint_IsSETUPReceived()            ((UEINTX & (1 << RXSTPI)) ? true : false)\r

 \r
 \r

-                       /** Returns true if the current CONTROL type endpoint is ready for a SETUP packet, false otherwise. */\r
-                       #define Endpoint_IsSetupReceived()            ((UEINTX & (1 << RXSTPI)) ? true : false)\r
+                               #define Endpoint_ClearControlSETUP()          MACROS{ UEINTX &= ~(1 << RXSTPI); }MACROE\r

 \r
 \r

-                       /** Clears a received SETUP packet on the currently selected CONTROL type endpoint. */\r
-                       #define Endpoint_ClearSetupReceived()         MACROS{ UEINTX &= ~(1 << RXSTPI); }MACROE\r
+                               #define Endpoint_ClearControlIN()             MACROS{ UEINTX &= ~(1 << TXINI); }MACROE\r

 \r
 \r

-                       /** Sends an IN packet to the host on the currently selected CONTROL type endpoint. */\r
-                       #define Endpoint_ClearSetupIN()               MACROS{ UEINTX &= ~(1 << TXINI); }MACROE\r
+                               #define Endpoint_ClearControlOUT()            MACROS{ UEINTX &= ~(1 << RXOUTI); }MACROE\r

 \r
 \r

-                       /** Acknowledges an OUT packet to the host on the currently selected CONTROL type endpoint, freeing\r
-                        *  up the endpoint for the next packet.\r
-                        */\r
-                       #define Endpoint_ClearSetupOUT()              MACROS{ UEINTX &= ~(1 << RXOUTI); }MACROE\r
+                               #define Endpoint_ClearIN()                    MACROS{ UEINTX &= ~(1 << TXINI); UEINTX &= ~(1 << FIFOCON); }MACROE\r

 \r
 \r

-                       /** Stalls the current endpoint, indicating to the host that a logical problem occurred with the\r
-                        *  indicated endpoint and that the current transfer sequence should be aborted. This provides a\r
-                        *  way for devices to indicate invalid commands to the host so that the current transfer can be\r
-                        *  aborted and the host can begin its own recovery sequence.\r
-                        *\r
-                        *  The currently selected endpoint remains stalled until either the Endpoint_ClearStall() macro\r
-                        *  is called, or the host issues a CLEAR FEATURE request to the device for the currently selected\r
-                        *  endpoint.\r
-                        */\r
-                       #define Endpoint_StallTransaction()           MACROS{ UECONX |= (1 << STALLRQ); }MACROE\r
+                               #define Endpoint_ClearOUT()                   MACROS{ UEINTX &= ~(1 << RXOUTI); UEINTX &= ~(1 << FIFOCON); }MACROE\r

 \r
 \r

-                       /** Clears the stall on the currently selected endpoint. */\r
-                       #define Endpoint_ClearStall()                 MACROS{ UECONX |= (1 << STALLRQC); }MACROE\r
+                               #define Endpoint_StallTransaction()           MACROS{ UECONX |= (1 << STALLRQ); }MACROE\r

 \r
 \r

-                       /** Returns true if the currently selected endpoint is stalled, false otherwise. */\r
-                       #define Endpoint_IsStalled()                  ((UECONX & (1 << STALLRQ)) ? true : false)\r
+                               #define Endpoint_ClearStall()                 MACROS{ UECONX |= (1 << STALLRQC); }MACROE\r

 \r
 \r

-                       /** Resets the data toggle of the currently selected endpoint. */\r
-                       #define Endpoint_ResetDataToggle()            MACROS{ UECONX |= (1 << RSTDT); }MACROE\r
+                               #define Endpoint_IsStalled()                  ((UECONX & (1 << STALLRQ)) ? true : false)\r
+\r
+                               #define Endpoint_ResetDataToggle()            MACROS{ UECONX |= (1 << RSTDT); }MACROE\r
+                               \r
+                               #define Endpoint_GetEndpointDirection()       (UECFG0X & ENDPOINT_DIR_IN)\r
+                       #endif\r

 \r
                /* Enums: */\r
 \r
                /* Enums: */\r

-                       /** Enum for the possible error return codes of the Endpoint_WaitUntilReady function */\r
+                       /** Enum for the possible error return codes of the Endpoint_WaitUntilReady function.\r
+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        */\r

                        enum Endpoint_WaitUntilReady_ErrorCodes_t\r
                        {\r
                                ENDPOINT_READYWAIT_NoError                 = 0, /**< Endpoint is ready for next packet, no error. */\r
                        enum Endpoint_WaitUntilReady_ErrorCodes_t\r
                        {\r
                                ENDPOINT_READYWAIT_NoError                 = 0, /**< Endpoint is ready for next packet, no error. */\r


@@ -299,7 +463,10 @@
                                                                                 */\r
                        };\r
                \r
                                                                                 */\r
                        };\r
                \r

-                       /** Enum for the possible error return codes of the Endpoint_*_Stream_* functions. */\r
+                       /** Enum for the possible error return codes of the Endpoint_*_Stream_* functions.\r
+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        */\r

                        enum Endpoint_Stream_RW_ErrorCodes_t\r
                        {\r
                                ENDPOINT_RWSTREAM_ERROR_NoError            = 0, /**< Command completed successfully, no error. */\r
                        enum Endpoint_Stream_RW_ErrorCodes_t\r
                        {\r
                                ENDPOINT_RWSTREAM_ERROR_NoError            = 0, /**< Command completed successfully, no error. */\r


@@ -318,7 +485,10 @@
                                                                                 */\r
                        };\r
                        \r
                                                                                 */\r
                        };\r
                        \r

-                       /** Enum for the possible error return codes of the Endpoint_*_Control_Stream_* functions. */\r
+                       /** Enum for the possible error return codes of the Endpoint_*_Control_Stream_* functions..\r
+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        */\r

                        enum Endpoint_ControlStream_RW_ErrorCodes_t\r
                        {\r
                                ENDPOINT_RWCSTREAM_ERROR_NoError            = 0, /**< Command completed successfully, no error. */\r
                        enum Endpoint_ControlStream_RW_ErrorCodes_t\r
                        {\r
                                ENDPOINT_RWCSTREAM_ERROR_NoError            = 0, /**< Command completed successfully, no error. */\r


@@ -326,21 +496,34 @@
                        };\r
 \r
                /* Inline Functions: */\r
                        };\r
 \r
                /* Inline Functions: */\r

-                       /** Reads one byte from the currently selected endpoint's bank, for OUT direction endpoints. */\r
+                       /** Reads one byte from the currently selected endpoint's bank, for OUT direction endpoints.\r
+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        *\r
+                        *  \return Next byte in the currently selected endpoint's FIFO buffer\r
+                        */\r

                        static inline uint8_t Endpoint_Read_Byte(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint8_t Endpoint_Read_Byte(void)\r
                        {\r
                                return UEDATX;\r
                        }\r
 \r
                        static inline uint8_t Endpoint_Read_Byte(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint8_t Endpoint_Read_Byte(void)\r
                        {\r
                                return UEDATX;\r
                        }\r
 \r

-                       /** Writes one byte from the currently selected endpoint's bank, for IN direction endpoints. */\r
+                       /** Writes one byte from the currently selected endpoint's bank, for IN direction endpoints.\r
+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        *\r
+                        *  \param Byte  Next byte to write into the the currently selected endpoint's FIFO buffer\r
+                        */\r

                        static inline void Endpoint_Write_Byte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Write_Byte(const uint8_t Byte)\r
                        {\r
                                UEDATX = Byte;\r
                        }\r
 \r
                        static inline void Endpoint_Write_Byte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Write_Byte(const uint8_t Byte)\r
                        {\r
                                UEDATX = Byte;\r
                        }\r
 \r

-                       /** Discards one byte from the currently selected endpoint's bank, for OUT direction endpoints. */\r
+                       /** Discards one byte from the currently selected endpoint's bank, for OUT direction endpoints.\r
+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        */\r

                        static inline void Endpoint_Discard_Byte(void) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Discard_Byte(void)\r
                        {\r
                        static inline void Endpoint_Discard_Byte(void) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Discard_Byte(void)\r
                        {\r


@@ -351,6 +534,10 @@
                        \r
                        /** Reads two bytes from the currently selected endpoint's bank in little endian format, for OUT\r
                         *  direction endpoints.\r
                        \r
                        /** Reads two bytes from the currently selected endpoint's bank in little endian format, for OUT\r
                         *  direction endpoints.\r

+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        *\r
+                        *  \return Next word in the currently selected endpoint's FIFO buffer\r

                         */\r
                        static inline uint16_t Endpoint_Read_Word_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint16_t Endpoint_Read_Word_LE(void)\r
                         */\r
                        static inline uint16_t Endpoint_Read_Word_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint16_t Endpoint_Read_Word_LE(void)\r


@@ -365,6 +552,10 @@
 \r
                        /** Reads two bytes from the currently selected endpoint's bank in big endian format, for OUT\r
                         *  direction endpoints.\r
 \r
                        /** Reads two bytes from the currently selected endpoint's bank in big endian format, for OUT\r
                         *  direction endpoints.\r

+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        *\r
+                        *  \return Next word in the currently selected endpoint's FIFO buffer\r

                         */\r
                        static inline uint16_t Endpoint_Read_Word_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint16_t Endpoint_Read_Word_BE(void)\r
                         */\r
                        static inline uint16_t Endpoint_Read_Word_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint16_t Endpoint_Read_Word_BE(void)\r


@@ -379,6 +570,10 @@
 \r
                        /** Writes two bytes to the currently selected endpoint's bank in little endian format, for IN\r
                         *  direction endpoints.\r
 \r
                        /** Writes two bytes to the currently selected endpoint's bank in little endian format, for IN\r
                         *  direction endpoints.\r

+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        *\r
+                        *  \param Word  Next word to write to the currently selected endpoint's FIFO buffer\r

                         */\r
                        static inline void Endpoint_Write_Word_LE(const uint16_t Word) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Write_Word_LE(const uint16_t Word)\r
                         */\r
                        static inline void Endpoint_Write_Word_LE(const uint16_t Word) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Write_Word_LE(const uint16_t Word)\r


@@ -389,6 +584,10 @@
                        \r
                        /** Writes two bytes to the currently selected endpoint's bank in big endian format, for IN\r
                         *  direction endpoints.\r
                        \r
                        /** Writes two bytes to the currently selected endpoint's bank in big endian format, for IN\r
                         *  direction endpoints.\r

+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        *\r
+                        *  \param Word  Next word to write to the currently selected endpoint's FIFO buffer\r

                         */\r
                        static inline void Endpoint_Write_Word_BE(const uint16_t Word) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Write_Word_BE(const uint16_t Word)\r
                         */\r
                        static inline void Endpoint_Write_Word_BE(const uint16_t Word) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Write_Word_BE(const uint16_t Word)\r


@@ -397,7 +596,10 @@
                                UEDATX = (Word & 0xFF);\r
                        }\r
 \r
                                UEDATX = (Word & 0xFF);\r
                        }\r
 \r

-                       /** Discards two bytes from the currently selected endpoint's bank, for OUT direction endpoints. */\r
+                       /** Discards two bytes from the currently selected endpoint's bank, for OUT direction endpoints.\r
+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        */\r

                        static inline void Endpoint_Discard_Word(void) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Discard_Word(void)\r
                        {\r
                        static inline void Endpoint_Discard_Word(void) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Discard_Word(void)\r
                        {\r


@@ -409,6 +611,10 @@
 \r
                        /** Reads four bytes from the currently selected endpoint's bank in little endian format, for OUT\r
                         *  direction endpoints.\r
 \r
                        /** Reads four bytes from the currently selected endpoint's bank in little endian format, for OUT\r
                         *  direction endpoints.\r

+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        *\r
+                        *  \return Next double word in the currently selected endpoint's FIFO buffer\r

                         */\r
                        static inline uint32_t Endpoint_Read_DWord_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint32_t Endpoint_Read_DWord_LE(void)\r
                         */\r
                        static inline uint32_t Endpoint_Read_DWord_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint32_t Endpoint_Read_DWord_LE(void)\r


@@ -429,6 +635,10 @@
 \r
                        /** Reads four bytes from the currently selected endpoint's bank in big endian format, for OUT\r
                         *  direction endpoints.\r
 \r
                        /** Reads four bytes from the currently selected endpoint's bank in big endian format, for OUT\r
                         *  direction endpoints.\r

+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        *\r
+                        *  \return Next double word in the currently selected endpoint's FIFO buffer\r

                         */\r
                        static inline uint32_t Endpoint_Read_DWord_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint32_t Endpoint_Read_DWord_BE(void)\r
                         */\r
                        static inline uint32_t Endpoint_Read_DWord_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint32_t Endpoint_Read_DWord_BE(void)\r


@@ -449,6 +659,10 @@
 \r
                        /** Writes four bytes to the currently selected endpoint's bank in little endian format, for IN\r
                         *  direction endpoints.\r
 \r
                        /** Writes four bytes to the currently selected endpoint's bank in little endian format, for IN\r
                         *  direction endpoints.\r

+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        *\r
+                        *  \param DWord  Next double word to write to the currently selected endpoint's FIFO buffer\r

                         */\r
                        static inline void Endpoint_Write_DWord_LE(const uint32_t DWord) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Write_DWord_LE(const uint32_t DWord)\r
                         */\r
                        static inline void Endpoint_Write_DWord_LE(const uint32_t DWord) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Write_DWord_LE(const uint32_t DWord)\r


@@ -461,6 +675,10 @@
                        \r
                        /** Writes four bytes to the currently selected endpoint's bank in big endian format, for IN\r
                         *  direction endpoints.\r
                        \r
                        /** Writes four bytes to the currently selected endpoint's bank in big endian format, for IN\r
                         *  direction endpoints.\r

+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        *\r
+                        *  \param DWord  Next double word to write to the currently selected endpoint's FIFO buffer\r

                         */\r
                        static inline void Endpoint_Write_DWord_BE(const uint32_t DWord) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Write_DWord_BE(const uint32_t DWord)\r
                         */\r
                        static inline void Endpoint_Write_DWord_BE(const uint32_t DWord) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Write_DWord_BE(const uint32_t DWord)\r


@@ -471,7 +689,10 @@
                                UEDATX = (DWord &  0xFF);\r
                        }\r
 \r
                                UEDATX = (DWord &  0xFF);\r
                        }\r
 \r

-                       /** Discards four bytes from the currently selected endpoint's bank, for OUT direction endpoints. */\r
+                       /** Discards four bytes from the currently selected endpoint's bank, for OUT direction endpoints.       \r
+                        *\r
+                        *  \ingroup Group_EndpointRW\r
+                        */\r

                        static inline void Endpoint_Discard_DWord(void) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Discard_DWord(void)\r
                        {\r
                        static inline void Endpoint_Discard_DWord(void) ATTR_ALWAYS_INLINE;\r
                        static inline void Endpoint_Discard_DWord(void)\r
                        {\r


@@ -539,6 +760,8 @@
                         *\r
                         *  \note This routine should not be called on CONTROL type endpoints.\r
                         *\r
                         *\r
                         *  \note This routine should not be called on CONTROL type endpoints.\r
                         *\r

+                        *  \ingroup Group_EndpointRW\r
+                        *\r

                         *  \return A value from the Endpoint_WaitUntilReady_ErrorCodes_t enum.\r
                         */\r
                        uint8_t Endpoint_WaitUntilReady(void);\r
                         *  \return A value from the Endpoint_WaitUntilReady_ErrorCodes_t enum.\r
                         */\r
                        uint8_t Endpoint_WaitUntilReady(void);\r


@@ -546,7 +769,7 @@
                        /** Reads and discards the given number of bytes from the endpoint from the given buffer,\r
                         *  discarding fully read packets from the host as needed. The last packet is not automatically\r
                         *  discarded once the remaining bytes has been read; the user is responsible for manually\r
                        /** Reads and discards the given number of bytes from the endpoint from the given buffer,\r
                         *  discarding fully read packets from the host as needed. The last packet is not automatically\r
                         *  discarded once the remaining bytes has been read; the user is responsible for manually\r

-                        *  discarding the last packet from the host via the Endpoint_ClearCurrentBank() macro. Between\r
+                        *  discarding the last packet from the host via the Endpoint_ClearOUT() macro. Between\r

                         *  each USB packet, the given stream callback function is executed repeatedly until the next\r
                         *  packet is ready, allowing for early aborts of stream transfers.\r
                         *\r
                         *  each USB packet, the given stream callback function is executed repeatedly until the next\r
                         *  packet is ready, allowing for early aborts of stream transfers.\r
                         *\r


@@ -556,6 +779,8 @@
                         *\r
                         *  \note This routine should not be used on CONTROL type endpoints.\r
                         *\r
                         *\r
                         *  \note This routine should not be used on CONTROL type endpoints.\r
                         *\r

+                        *  \ingroup Group_EndpointRW\r
+                        *\r

                         *  \param Length    Number of bytes to send via the currently selected endpoint.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *\r
                         *  \param Length    Number of bytes to send via the currently selected endpoint.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *\r


@@ -570,7 +795,7 @@
                        /** Writes the given number of bytes to the endpoint from the given buffer in little endian,\r
                         *  sending full packets to the host as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r
                        /** Writes the given number of bytes to the endpoint from the given buffer in little endian,\r
                         *  sending full packets to the host as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r

-                        *  Endpoint_ClearCurrentBank() macro. Between each USB packet, the given stream callback function\r
+                        *  Endpoint_ClearIN() macro. Between each USB packet, the given stream callback function\r

                         *  is executed repeatedly until the endpoint is ready to accept the next packet, allowing for early\r
                         *  aborts of stream transfers.\r
                         *\r
                         *  is executed repeatedly until the endpoint is ready to accept the next packet, allowing for early\r
                         *  aborts of stream transfers.\r
                         *\r


@@ -580,6 +805,8 @@
                         *\r
                         *  \note This routine should not be used on CONTROL type endpoints.\r
                         *\r
                         *\r
                         *  \note This routine should not be used on CONTROL type endpoints.\r
                         *\r

+                        *  \ingroup Group_EndpointRW\r
+                        *\r

                         *  \param Buffer    Pointer to the source data buffer to read from.\r
                         *  \param Length    Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *  \param Buffer    Pointer to the source data buffer to read from.\r
                         *  \param Length    Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r


@@ -595,7 +822,7 @@
                        /** Writes the given number of bytes to the endpoint from the given buffer in big endian,\r
                         *  sending full packets to the host as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r
                        /** Writes the given number of bytes to the endpoint from the given buffer in big endian,\r
                         *  sending full packets to the host as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r

-                        *  Endpoint_ClearCurrentBank() macro. Between each USB packet, the given stream callback function\r
+                        *  Endpoint_ClearIN() macro. Between each USB packet, the given stream callback function\r

                         *  is executed repeatedly until the endpoint is ready to accept the next packet, allowing for early\r
                         *  aborts of stream transfers.\r
                         *\r
                         *  is executed repeatedly until the endpoint is ready to accept the next packet, allowing for early\r
                         *  aborts of stream transfers.\r
                         *\r


@@ -605,6 +832,8 @@
                         *\r
                         *  \note This routine should not be used on CONTROL type endpoints.\r
                         *\r
                         *\r
                         *  \note This routine should not be used on CONTROL type endpoints.\r
                         *\r

+                        *  \ingroup Group_EndpointRW\r
+                        *\r

                         *  \param Buffer    Pointer to the source data buffer to read from.\r
                         *  \param Length    Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *  \param Buffer    Pointer to the source data buffer to read from.\r
                         *  \param Length    Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r


@@ -620,7 +849,7 @@
                        /** Reads the given number of bytes from the endpoint from the given buffer in little endian,\r
                         *  discarding fully read packets from the host as needed. The last packet is not automatically\r
                         *  discarded once the remaining bytes has been read; the user is responsible for manually\r
                        /** Reads the given number of bytes from the endpoint from the given buffer in little endian,\r
                         *  discarding fully read packets from the host as needed. The last packet is not automatically\r
                         *  discarded once the remaining bytes has been read; the user is responsible for manually\r

-                        *  discarding the last packet from the host via the Endpoint_ClearCurrentBank() macro. Between\r
+                        *  discarding the last packet from the host via the Endpoint_ClearOUT() macro. Between\r

                         *  each USB packet, the given stream callback function is executed repeatedly until the endpoint\r
                         *  is ready to accept the next packet, allowing for early aborts of stream transfers.\r
                         *\r
                         *  each USB packet, the given stream callback function is executed repeatedly until the endpoint\r
                         *  is ready to accept the next packet, allowing for early aborts of stream transfers.\r
                         *\r


@@ -630,6 +859,8 @@
                         *\r
                         *  \note This routine should not be used on CONTROL type endpoints.\r
                         *\r
                         *\r
                         *  \note This routine should not be used on CONTROL type endpoints.\r
                         *\r

+                        *  \ingroup Group_EndpointRW\r
+                        *\r

                         *  \param Buffer    Pointer to the destination data buffer to write to.\r
                         *  \param Length    Number of bytes to send via the currently selected endpoint.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *  \param Buffer    Pointer to the destination data buffer to write to.\r
                         *  \param Length    Number of bytes to send via the currently selected endpoint.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r


@@ -645,7 +876,7 @@
                        /** Reads the given number of bytes from the endpoint from the given buffer in big endian,\r
                         *  discarding fully read packets from the host as needed. The last packet is not automatically\r
                         *  discarded once the remaining bytes has been read; the user is responsible for manually\r
                        /** Reads the given number of bytes from the endpoint from the given buffer in big endian,\r
                         *  discarding fully read packets from the host as needed. The last packet is not automatically\r
                         *  discarded once the remaining bytes has been read; the user is responsible for manually\r

-                        *  discarding the last packet from the host via the Endpoint_ClearCurrentBank() macro. Between\r
+                        *  discarding the last packet from the host via the Endpoint_ClearOUT() macro. Between\r

                         *  each USB packet, the given stream callback function is executed repeatedly until the endpoint\r
                         *  is ready to accept the next packet, allowing for early aborts of stream transfers.\r
                         *\r
                         *  each USB packet, the given stream callback function is executed repeatedly until the endpoint\r
                         *  is ready to accept the next packet, allowing for early aborts of stream transfers.\r
                         *\r


@@ -655,6 +886,8 @@
                         *\r
                         *  \note This routine should not be used on CONTROL type endpoints.\r
                         *\r
                         *\r
                         *  \note This routine should not be used on CONTROL type endpoints.\r
                         *\r

+                        *  \ingroup Group_EndpointRW\r
+                        *\r

                         *  \param Buffer    Pointer to the destination data buffer to write to.\r
                         *  \param Length    Number of bytes to send via the currently selected endpoint.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *  \param Buffer    Pointer to the destination data buffer to write to.\r
                         *  \param Length    Number of bytes to send via the currently selected endpoint.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r


@@ -670,13 +903,15 @@
                        /** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in little endian,\r
                         *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared\r
                         *  in both failure and success states; the user is responsible for manually clearing the setup OUT to\r
                        /** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in little endian,\r
                         *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared\r
                         *  in both failure and success states; the user is responsible for manually clearing the setup OUT to\r

-                        *  finalize the transfer via the Endpoint_ClearSetupOUT() macro.\r
+                        *  finalize the transfer via the Endpoint_ClearControlOUT() macro.\r

                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r

+                        *  \ingroup Group_EndpointRW\r
+                        *\r

                         *  \param Buffer  Pointer to the source data buffer to read from.\r
                         *  \param Length  Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *\r
                         *  \param Buffer  Pointer to the source data buffer to read from.\r
                         *  \param Length  Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *\r


@@ -687,13 +922,15 @@
                        /** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in big endian,\r
                         *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared\r
                         *  in both failure and success states; the user is responsible for manually clearing the setup OUT to\r
                        /** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in big endian,\r
                         *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared\r
                         *  in both failure and success states; the user is responsible for manually clearing the setup OUT to\r

-                        *  finalize the transfer via the Endpoint_ClearSetupOUT() macro.\r
+                        *  finalize the transfer via the Endpoint_ClearControlOUT() macro.\r

                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r

+                        *  \ingroup Group_EndpointRW\r
+                        *\r

                         *  \param Buffer  Pointer to the source data buffer to read from.\r
                         *  \param Length  Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *\r
                         *  \param Buffer  Pointer to the source data buffer to read from.\r
                         *  \param Length  Number of bytes to read for the currently selected endpoint into the buffer.\r
                         *\r


@@ -704,13 +941,15 @@
                        /** Reads the given number of bytes from the CONTROL endpoint from the given buffer in little endian,\r
                         *  discarding fully read packets from the host as needed. The device IN acknowledgement is not\r
                         *  automatically sent after success or failure states; the user is responsible for manually sending the\r
                        /** Reads the given number of bytes from the CONTROL endpoint from the given buffer in little endian,\r
                         *  discarding fully read packets from the host as needed. The device IN acknowledgement is not\r
                         *  automatically sent after success or failure states; the user is responsible for manually sending the\r

-                        *  setup IN to finalize the transfer via the Endpoint_ClearSetupIN() macro.\r
+                        *  setup IN to finalize the transfer via the Endpoint_ClearControlIN() macro.\r

                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r

+                        *  \ingroup Group_EndpointRW\r
+                        *\r

                         *  \param Buffer  Pointer to the destination data buffer to write to.\r
                         *  \param Length  Number of bytes to send via the currently selected endpoint.\r
                         *\r
                         *  \param Buffer  Pointer to the destination data buffer to write to.\r
                         *  \param Length  Number of bytes to send via the currently selected endpoint.\r
                         *\r


@@ -721,80 +960,21 @@
                        /** Reads the given number of bytes from the CONTROL endpoint from the given buffer in big endian,\r
                         *  discarding fully read packets from the host as needed. The device IN acknowledgement is not\r
                         *  automatically sent after success or failure states; the user is responsible for manually sending the\r
                        /** Reads the given number of bytes from the CONTROL endpoint from the given buffer in big endian,\r
                         *  discarding fully read packets from the host as needed. The device IN acknowledgement is not\r
                         *  automatically sent after success or failure states; the user is responsible for manually sending the\r

-                        *  setup IN to finalize the transfer via the Endpoint_ClearSetupIN() macro.\r
+                        *  setup IN to finalize the transfer via the Endpoint_ClearControlIN() macro.\r

                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained\r
                         *           together; i.e. the entire stream data must be read or written at the one time.\r
                         *\r

+                        *  \ingroup Group_EndpointRW\r
+                        *\r

                         *  \param Buffer  Pointer to the destination data buffer to write to.\r
                         *  \param Length  Number of bytes to send via the currently selected endpoint.\r
                         *\r
                         *  \return A value from the Endpoint_ControlStream_RW_ErrorCodes_t enum.\r
                         */\r
                         *  \param Buffer  Pointer to the destination data buffer to write to.\r
                         *  \param Length  Number of bytes to send via the currently selected endpoint.\r
                         *\r
                         *  \return A value from the Endpoint_ControlStream_RW_ErrorCodes_t enum.\r
                         */\r

-                       uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)  ATTR_NON_NULL_PTR_ARG(1);\r
-\r
-               /* Function Aliases: */\r
-                       /** Alias for Endpoint_Discard_Byte().\r
-                        */\r
-                       #define Endpoint_Ignore_Byte()                      Endpoint_Discard_Byte()\r
-\r
-                       /** Alias for Endpoint_Discard_Word().\r
-                        */\r
-                       #define Endpoint_Ignore_Word()                      Endpoint_Discard_Word()             \r
-\r
-                       /** Alias for Endpoint_Discard_DWord().\r
-                        */\r
-                       #define Endpoint_Ignore_DWord()                     Endpoint_Discard_DWord()\r
-               \r
-                       /** Alias for Endpoint_Read_Word_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #define Endpoint_Read_Word()                        Endpoint_Read_Word_LE()   \r
-\r
-                       /** Alias for Endpoint_Write_Word_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #define Endpoint_Write_Word(Word)                   Endpoint_Write_Word_LE(Word)\r
-\r
-                       /** Alias for Endpoint_Read_DWord_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #define Endpoint_Read_DWord()                       Endpoint_Read_DWord_LE()\r
-\r
-                       /** Alias for Endpoint_Write_DWord_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #define Endpoint_Write_DWord(DWord)                 Endpoint_Write_DWord_LE(DWord)\r
-\r
-                       /** Alias for Endpoint_Read_Stream_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                               #define Endpoint_Read_Stream(Buffer, Length, Callback) Endpoint_Read_Stream_LE(Buffer, Length, Callback)\r
-                       #else\r
-                               #define Endpoint_Read_Stream(Buffer, Length)           Endpoint_Read_Stream_LE(Buffer, Length)\r
-                       #endif\r
-\r
-                       /** Alias for Endpoint_Write_Stream_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                               #define Endpoint_Write_Stream(Buffer, Length, Callback) Endpoint_Write_Stream_LE(Buffer, Length, Callback)\r
-                       #else\r
-                               #define Endpoint_Write_Stream(Buffer, Length)           Endpoint_Write_Stream_LE(Buffer, Length)\r
-                       #endif\r
-\r
-                       /** Alias for Endpoint_Read_Control_Stream_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #define Endpoint_Read_Control_Stream(Data, Length)  Endpoint_Read_Control_Stream_LE(Data, Length)\r
-\r
-                       /** Alias for Endpoint_Write_Control_Stream_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #define Endpoint_Write_Control_Stream(Data, Length) Endpoint_Write_Control_Stream_LE(Data, Length)                      \r
+                       uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)  ATTR_NON_NULL_PTR_ARG(1);               \r

                        \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                        \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r


@@ -868,3 +1048,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index 52f19a5..fe02f7c 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -87,7 +87,7 @@ void USB_Host_ResetDevice(void)
        USB_INT_Disable(USB_INT_DDISCI);\r
        \r
        USB_Host_ResetBus();\r
        USB_INT_Disable(USB_INT_DDISCI);\r
        \r
        USB_Host_ResetBus();\r

-       while (!(USB_Host_IsResetBusDone()));\r
+       while (!(USB_Host_IsBusResetComplete()));\r

 \r
        USB_INT_Clear(USB_INT_HSOFI);\r
        USB_Host_ResumeBus();   \r
 \r
        USB_INT_Clear(USB_INT_HSOFI);\r
        USB_Host_ResumeBus();   \r

diff --git a/LUFA/Drivers/USB/LowLevel/Host.h b/LUFA/Drivers/USB/LowLevel/Host.h
index 18eebfe..1ff2d7a 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.h
+++ b/LUFA/Drivers/USB/LowLevel/Host.h
@@ -34,6 +34,14 @@
  *  the USB controller is initialized in host mode.\r
  */\r
 \r
  *  the USB controller is initialized in host mode.\r
  */\r
 \r

+/** \ingroup Group_USB\r
+ *  @defgroup Group_Host Host Management\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the management of a USB host when in Host mode.\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __USBHOST_H__\r
 #define __USBHOST_H__\r
 \r
 #ifndef __USBHOST_H__\r
 #define __USBHOST_H__\r
 \r


@@ -81,64 +89,94 @@
                                 */\r
                                #define HOST_DEVICE_SETTLE_DELAY_MS        1500\r
                        #endif\r
                                 */\r
                                #define HOST_DEVICE_SETTLE_DELAY_MS        1500\r
                        #endif\r

-                       \r
-                       /** Resets the USB bus, including the endpoints in any attached device and pipes on the AVR host.\r
-                        *  USB bus resets leave the default control pipe configured (if already configured).\r
-                        *\r
-                        *  If the USB bus has been suspended prior to issuing a bus reset, the attached device will be\r
-                        *  woken up automatically and the bus resumed after the reset has been correctly issued.\r
-                        */\r
-                       #define USB_Host_ResetBus()                MACROS{ UHCON |=  (1 << RESET);          }MACROE\r
+               \r
+               /* Psuedo-Function Macros: */\r
+                       #if defined(__DOXYGEN__)\r
+                               /** Resets the USB bus, including the endpoints in any attached device and pipes on the AVR host.\r
+                                *  USB bus resets leave the default control pipe configured (if already configured).\r
+                                *\r
+                                *  If the USB bus has been suspended prior to issuing a bus reset, the attached device will be\r
+                                *  woken up automatically and the bus resumed after the reset has been correctly issued.\r
+                                */\r
+                               static inline void USB_Host_ResetBus(void);\r

 \r
 \r

-                       /** Determines if a previously issued bus reset (via the USB_Host_ResetBus() macro) has\r
-                        *  completed. This macro returns true if no bus reset is currently being sent, false\r
-                        *  otherwise.\r
-                        */\r
-                       #define USB_Host_IsResetBusDone()                ((UHCON &   (1 << RESET)) ? false : true)\r
-                       \r
-                       /** Resumes USB communications with an attached and enumerated device, by resuming the transmission\r
-                        *  of the 1MS Start Of Frame messages to the device. When resumed, USB communications between the\r
-                        *  host and attached device may occur.\r
-                        */\r
-                       #define USB_Host_ResumeBus()               MACROS{ UHCON |=  (1 << SOFEN);          }MACROE \r
+                               /** Determines if a previously issued bus reset (via the USB_Host_ResetBus() macro) has\r
+                                *  completed.\r
+                                *\r
+                                *  \return Boolean true if no bus reset is currently being sent, false otherwise.\r
+                                */\r
+                               static inline void USB_Host_IsBusResetComplete(void);\r

 \r
 \r

-                       /** Suspends the USB bus, preventing any communications from occurring between the host and attached\r
-                        *  device until the bus has been resumed. This stops the transmission of the 1MS Start Of Frame\r
-                        *  messages to the device.\r
-                        */\r
-                       #define USB_Host_SuspendBus()              MACROS{ UHCON &= ~(1 << SOFEN);          }MACROE \r
-                       \r
-                       /** Returns true if the USB bus has been suspended via the use of the USB_Host_SuspendBus() macro,\r
-                        *  false otherwise. While suspended, no USB communications can occur until the bus is resumed,\r
-                        *  except for the Remote Wakeup event from the device if supported.\r
-                        */\r
-                       #define USB_Host_IsBusSuspended()                ((UHCON &   (1 << SOFEN)) ? false : true)\r
-               \r
-                       /** Returns true if the attached device is currently enumerated in Full Speed mode (12Mb/s), or\r
-                        *  false if the attached device is enumerated in Low Speed mode (1.5Mb/s).\r
-                        */\r
-                       #define USB_Host_IsDeviceFullSpeed()             ((USBSTA &  (1 << SPEED)) ? true : false)\r
+                               /** Resumes USB communications with an attached and enumerated device, by resuming the transmission\r
+                                *  of the 1MS Start Of Frame messages to the device. When resumed, USB communications between the\r
+                                *  host and attached device may occur.\r
+                                */\r
+                               static inline void USB_Host_ResumeBus(void);\r

 \r
 \r

-                       /** Returns true if the attached device is currently issuing a Remote Wakeup request, requesting\r
-                        *  that the host resume the USB bus and wake up the device, false otherwise.\r
-                        */\r
-                       #define USB_Host_IsRemoteWakeupSent()            ((UHINT &   (1 << RXRSMI)) ? true : false)\r
+                               /** Suspends the USB bus, preventing any communications from occurring between the host and attached\r
+                                *  device until the bus has been resumed. This stops the transmission of the 1MS Start Of Frame\r
+                                *  messages to the device.\r
+                                */\r
+                               static inline void USB_Host_SuspendBus(void);\r
+                               \r
+                               /** Determines if the USB bus has been suspended via the use of the USB_Host_SuspendBus() macro,\r
+                                *  false otherwise. While suspended, no USB communications can occur until the bus is resumed,\r
+                                *  except for the Remote Wakeup event from the device if supported.\r
+                                *\r
+                                *  \return Boolean true if the bus is currently suspended, false otherwise\r
+                                */\r
+                                static inline bool USB_Host_IsBusSuspended(void);\r
+                                \r
+                               /** Determines if the attached device is currently enumerated in Full Speed mode (12Mb/s), or\r
+                                *  false if the attached device is enumerated in Low Speed mode (1.5Mb/s).\r
+                                *\r
+                                *  \return Boolean true if the attached device is enumerated in Full Speed mode, false otherwise\r
+                                */\r
+                               static inline bool USB_Host_IsDeviceFullSpeed(void);\r

 \r
 \r

-                       /** Clears the flag indicating that a Remote Wakeup request has been issued by an attached\r
-                        *  device.\r
-                        */\r
-                       #define USB_Host_ClearRemoteWakeupSent()   MACROS{ UHINT &= ~(1 << RXRSMI);         }MACROE\r
+                               /** Determines if the attached device is currently issuing a Remote Wakeup request, requesting\r
+                                *  that the host resume the USB bus and wake up the device, false otherwise.\r
+                                *\r
+                                *  \return Boolean true if the attached device has sent a Remote Wakeup request, false otherwise\r
+                                */\r
+                               static inline bool USB_Host_IsRemoteWakeupSent(void);\r

 \r
 \r

-                       /** Accepts a Remote Wakeup request from an attached device. This must be issued in response to\r
-                        *  a device's Remote Wakeup request within 2ms for the request to be accepted and the bus to\r
-                        *  be resumed.\r
-                        */\r
-                       #define USB_Host_ResumeFromWakeupRequest() MACROS{ UHCON |=  (1 << RESUME);         }MACROE\r
+                               /** Clears the flag indicating that a Remote Wakeup request has been issued by an attached device. */\r
+                               static inline void USB_Host_ClearRemoteWakeupSent(void);\r
+\r
+                               /** Accepts a Remote Wakeup request from an attached device. This must be issued in response to\r
+                                *  a device's Remote Wakeup request within 2ms for the request to be accepted and the bus to\r
+                                *  be resumed.\r
+                                */\r
+                               static inline void USB_Host_ResumeFromWakeupRequest(void);\r
+                               \r
+                               /** Determines if a resume from Remote Wakeup request is currently being sent to an attached\r
+                                *  device.\r
+                                *\r
+                                *  \return Boolean true if no resume request is currently being sent, false otherwise\r
+                                */\r
+                               static inline bool USB_Host_IsResumeFromWakeupRequestSent(void);\r
+                       #else\r
+                               #define USB_Host_ResetBus()                MACROS{ UHCON |=  (1 << RESET);          }MACROE\r
+\r
+                               #define USB_Host_IsBusResetComplete()      ((UHCON &   (1 << RESET)) ? false : true)\r
+\r
+                               #define USB_Host_ResumeBus()               MACROS{ UHCON |=  (1 << SOFEN);          }MACROE \r
+\r
+                               #define USB_Host_SuspendBus()              MACROS{ UHCON &= ~(1 << SOFEN);          }MACROE \r
+                               \r
+                               #define USB_Host_IsBusSuspended()                ((UHCON &   (1 << SOFEN)) ? false : true)\r

                        \r
                        \r

-                       /** Returns true if no resume from Remote Wakeup request is currently being sent to an attached\r
-                        *  device, false otherwise.\r
-                        */\r
-                       #define USB_Host_IsResumeFromWakeupRequestSent() ((UHCON &   (1 << RESUME)) ? false : true)\r
+                               #define USB_Host_IsDeviceFullSpeed()             ((USBSTA &  (1 << SPEED)) ? true : false)\r
+\r
+                               #define USB_Host_IsRemoteWakeupSent()            ((UHINT &   (1 << RXRSMI)) ? true : false)\r
+\r
+                               #define USB_Host_ClearRemoteWakeupSent()   MACROS{ UHINT &= ~(1 << RXRSMI);         }MACROE\r
+\r
+                               #define USB_Host_ResumeFromWakeupRequest() MACROS{ UHCON |=  (1 << RESUME);         }MACROE\r
+                               \r
+                               #define USB_Host_IsResumeFromWakeupRequestSent() ((UHCON &   (1 << RESUME)) ? false : true)\r
+                       #endif\r

 \r
                /* Enums: */\r
                        /** Enum for the various states of the USB Host state machine. Only some states are\r
 \r
                /* Enums: */\r
                        /** Enum for the various states of the USB Host state machine. Only some states are\r


@@ -241,5 +279,7 @@
                #if defined(__cplusplus)\r
                        }\r
                #endif\r
                #if defined(__cplusplus)\r
                        }\r
                #endif\r

-\r
+       \r

 #endif\r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.c b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
index 5367c98..c89910e 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
@@ -52,19 +52,17 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
 \r
        Pipe_SetToken(PIPE_TOKEN_SETUP);\r
        Pipe_ClearErrorFlags();\r
 \r
        Pipe_SetToken(PIPE_TOKEN_SETUP);\r
        Pipe_ClearErrorFlags();\r

-       Pipe_ClearSetupSent();\r

 \r
        Pipe_Unfreeze();\r
 \r
        for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Host_Request_Header_t); HeaderByte++)\r
          Pipe_Write_Byte(*(HeaderStream++));\r
 \r
 \r
        Pipe_Unfreeze();\r
 \r
        for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Host_Request_Header_t); HeaderByte++)\r
          Pipe_Write_Byte(*(HeaderStream++));\r
 \r

-       Pipe_ClearSetupOUT();\r
+       Pipe_ClearControlSETUP();\r

        \r
        if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_SetupSent)))\r
          goto End_Of_Control_Send;\r
 \r
        \r
        if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_SetupSent)))\r
          goto End_Of_Control_Send;\r
 \r

-       Pipe_ClearSetupSent();\r

        Pipe_Freeze();\r
 \r
        if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)\r
        Pipe_Freeze();\r
 \r
        if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)\r


@@ -93,7 +91,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                                }\r
 \r
                                Pipe_Freeze();\r
                                }\r
 \r
                                Pipe_Freeze();\r

-                               Pipe_ClearSetupIN();\r
+                               Pipe_ClearControlIN();\r

                        }\r
                }\r
 \r
                        }\r
                }\r
 \r


@@ -103,7 +101,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
                  goto End_Of_Control_Send;\r
 \r
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
                  goto End_Of_Control_Send;\r
 \r

-               Pipe_ClearSetupOUT();\r
+               Pipe_ClearControlOUT();\r

 \r
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
                  goto End_Of_Control_Send;\r
 \r
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
                  goto End_Of_Control_Send;\r


@@ -126,7 +124,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                                        DataLen--;\r
                                }\r
                                \r
                                        DataLen--;\r
                                }\r
                                \r

-                               Pipe_ClearSetupOUT();\r
+                               Pipe_ClearControlOUT();\r

                        }\r
 \r
                        if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r
                        }\r
 \r
                        if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_OutReady)))\r


@@ -141,7 +139,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr)
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_InReceived)))\r
                  goto End_Of_Control_Send;\r
 \r
                if ((ReturnStatus = USB_Host_Wait_For_Setup_IOS(USB_HOST_WAITFOR_InReceived)))\r
                  goto End_Of_Control_Send;\r
 \r

-               Pipe_ClearSetupIN();\r
+               Pipe_ClearControlIN();\r

        }\r
 \r
 End_Of_Control_Send:\r
        }\r
 \r
 End_Of_Control_Send:\r


@@ -159,9 +157,9 @@ static uint8_t USB_Host_Wait_For_Setup_IOS(const uint8_t WaitType)
 {\r
        uint16_t TimeoutCounter = USB_HOST_TIMEOUT_MS;\r
        \r
 {\r
        uint16_t TimeoutCounter = USB_HOST_TIMEOUT_MS;\r
        \r

-       while (!(((WaitType == USB_HOST_WAITFOR_SetupSent)  && Pipe_IsSetupSent())       ||\r
-                ((WaitType == USB_HOST_WAITFOR_InReceived) && Pipe_IsSetupINReceived()) ||\r
-                ((WaitType == USB_HOST_WAITFOR_OutReady)   && Pipe_IsSetupOUTReady())))\r
+       while (!(((WaitType == USB_HOST_WAITFOR_SetupSent)  && Pipe_IsSETUPSent())       ||\r
+                ((WaitType == USB_HOST_WAITFOR_InReceived) && Pipe_IsINReceived()) ||\r
+                ((WaitType == USB_HOST_WAITFOR_OutReady)   && Pipe_IsOUTReady())))\r

        {\r
                uint8_t ErrorCode;\r
 \r
        {\r
                uint8_t ErrorCode;\r
 \r

diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.h b/LUFA/Drivers/USB/LowLevel/HostChapter9.h
index 7ced889..8e7695b 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/HostChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.h
@@ -58,6 +58,8 @@
                         *\r
                         *  \see StdRequestType.h for information on the request type and data.\r
                         *  \see The USB 2.0 specification for more information on standard control requests.\r
                         *\r
                         *  \see StdRequestType.h for information on the request type and data.\r
                         *  \see The USB 2.0 specification for more information on standard control requests.\r

+                        *\r
+                        *  \ingroup Group_PipeControlReq\r

                         */\r
                        typedef struct\r
                        {\r
                         */\r
                        typedef struct\r
                        {\r


@@ -71,6 +73,8 @@
                /* Enums: */\r
                        /** Enum for the USB_Host_SendControlRequest() return code, indicating the reason for the error\r
                         *  if the transfer of the request is unsuccessful.\r
                /* Enums: */\r
                        /** Enum for the USB_Host_SendControlRequest() return code, indicating the reason for the error\r
                         *  if the transfer of the request is unsuccessful.\r

+                        *\r
+                        *  \ingroup Group_PipeControlReq\r

                         */\r
                        enum USB_Host_SendControlErrorCodes_t\r
                        {\r
                         */\r
                        enum USB_Host_SendControlErrorCodes_t\r
                        {\r


@@ -89,6 +93,8 @@
                        /** Global for the request to send via the USB_Host_SendControlRequest() function. This\r
                         *  global should be filled with the correct control request data before sending the request to\r
                         *  the attached device while in host mode.\r
                        /** Global for the request to send via the USB_Host_SendControlRequest() function. This\r
                         *  global should be filled with the correct control request data before sending the request to\r
                         *  the attached device while in host mode.\r

+                        *\r
+                        *  \ingroup Group_PipeControlReq\r

                         */\r
                        extern USB_Host_Request_Header_t USB_HostRequest;\r
                        \r
                         */\r
                        extern USB_Host_Request_Header_t USB_HostRequest;\r
                        \r


@@ -97,6 +103,8 @@
                         *  and transfers the data stored in the buffer to the device, or from the device to the buffer\r
                         *  as requested. The transfer is made on the currently selected pipe.\r
                         *\r
                         *  and transfers the data stored in the buffer to the device, or from the device to the buffer\r
                         *  as requested. The transfer is made on the currently selected pipe.\r
                         *\r

+                        *  \ingroup Group_PipeControlReq\r
+                        *\r

                         *  \param BufferPtr  Pointer to the start of the data buffer if the request has a data stage, or\r
                         *                    NULL if the request transfers no data to or from the device.\r
                         *\r
                         *  \param BufferPtr  Pointer to the start of the data buffer if the request has a data stage, or\r
                         *                    NULL if the request transfers no data to or from the device.\r
                         *\r

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h
index 07be439..a6f506f 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.h
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h
@@ -34,6 +34,14 @@
  *  USB interface in either device or (if supported) host mode.\r
  */\r
 \r
  *  USB interface in either device or (if supported) host mode.\r
  */\r
 \r

+/** \ingroup Group_USB\r
+ *  @defgroup Group_USBManagement USB Interface Management\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the setup and management of the USB interface.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __USBLOWLEVEL_H__\r
 #define __USBLOWLEVEL_H__\r
 \r
 #ifndef __USBLOWLEVEL_H__\r
 #define __USBLOWLEVEL_H__\r
 \r


@@ -70,7 +78,6 @@
        /* Preprocessor Checks and Defines: */\r
                #if !defined(F_CLOCK)\r
                        #error F_CLOCK is not defined. You must device F_CLOCK to the frequency of the unprescaled input clock in your project makefile.\r
        /* Preprocessor Checks and Defines: */\r
                #if !defined(F_CLOCK)\r
                        #error F_CLOCK is not defined. You must device F_CLOCK to the frequency of the unprescaled input clock in your project makefile.\r

-                       #define F_CLOCK 0\r

                #endif\r
        \r
                #if (F_CLOCK == 8000000)\r
                #endif\r
        \r
                #if (F_CLOCK == 8000000)\r


@@ -376,3 +383,5 @@
                #endif\r
                        \r
 #endif\r
                #endif\r
                        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/LowLevel/OTG.h b/LUFA/Drivers/USB/LowLevel/OTG.h
index 88a9554..caef82c 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/OTG.h
+++ b/LUFA/Drivers/USB/LowLevel/OTG.h
@@ -35,6 +35,14 @@
  *\r
  *  \note These macros are only for AVRs which support the OTG protocol, and do not exist for device-only AVRs.\r
  */\r
  *\r
  *  \note These macros are only for AVRs which support the OTG protocol, and do not exist for device-only AVRs.\r
  */\r

+ \r
+/** \ingroup Group_USB\r
+ *  @defgroup Group_OTGManagement USB On The Go (OTG) Management\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the setup and management of dual role devices.\r
+ *\r
+ *  @{\r
+ */\r

 \r
 #ifndef __USBOTG_H__\r
 #define __USBOTG_H__\r
 \r
 #ifndef __USBOTG_H__\r
 #define __USBOTG_H__\r


@@ -47,46 +55,6 @@
 \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
 \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r

-                       /** Initiate a Host Negotiation Protocol request. This indicates to the other connected device\r
-                        *  that the device wishes to change device/host roles.\r
-                        */\r
-                       #define USB_OTG_DEV_Request_HNP()          MACROS{ OTGCON |=  (1 << HNPREQ); }MACROE\r
-\r
-                       /** Cancel a Host Negotiation Protocol request. This stops a pending HNP request to the other\r
-                        *  connected device.\r
-                        */\r
-                       #define USB_OTG_DEV_Cancel_HNP_Request()   MACROS{ OTGCON &= ~(1 << HNPREQ); }MACROE\r
-\r
-                       /** Returns boolean false if not currently sending a HNP to the other connected device, or true\r
-                        *  if a HNP is currently being issued.\r
-                        */\r
-                       #define USB_OTG_DEV_IsSendingHNP()               ((OTGCON &   (1 << HNPREQ)) ? true : false)\r
-                       \r
-                       /** Accepts a HNP from a connected device, indicating that both devices should exchange\r
-                        *  device/host roles.\r
-                        */\r
-                       #define USB_OTG_HOST_Accept_HNP()          USB_OTG_DEV_Request_HNP()\r
-\r
-                       /** Rejects a HNP from a connected device, indicating that both devices should remain in their\r
-                        *  current device/host roles.\r
-                        */\r
-                       #define USB_OTG_HOST_Reject_HNP()          USB_OTG_DEV_Cancel_HNP_Request()\r
-                       \r
-                       /** Returns boolean false if the connected device is not currently sending a HNP request, or true\r
-                        *  if a HNP is currently being issued by the connected device.\r
-                        */\r
-                       #define USB_OTG_HOST_IsHNPReceived()             ((OTGCON &   (1 << HNPREQ)) ? true : false)\r
-                       \r
-                       /** Initiates a Session Request Protocol request. Most OTG devices turn off VBUS when the USB\r
-                        *  interface is not in use, to conserve power. Sending a SRP to a USB OTG device running in\r
-                        *  host mode indicates that VBUS should be applied and a session started.\r
-                        *\r
-                        *  There are two different methods of sending a SRP - either pulses on the VBUS line, or by\r
-                        *  pulsing the Data + line via the internal pull-up resistor. The SRP mode is given as the\r
-                        *  "type" parameter, and can be either USB_OTG_SRP_VBUS or USB_OTG_STP_DATA.\r
-                        */\r
-                       #define USB_OTG_DEV_Initiate_SRP(type)     MACROS{ OTGCON = ((OTGCON & ~(1 << SRPSEL)) | (type | (1 << SRPREQ))); }MACROE\r
-\r

                        /** Mask for the VBUS pulsing method of SRP, supported by some OTG devices.\r
                         *\r
                         *  \see USB_OTG_DEV_Initiate_SRP()\r
                        /** Mask for the VBUS pulsing method of SRP, supported by some OTG devices.\r
                         *\r
                         *  \see USB_OTG_DEV_Initiate_SRP()\r


@@ -99,4 +67,67 @@
                         */                      \r
                        #define USB_OTG_STP_DATA                   0\r
 \r
                         */                      \r
                        #define USB_OTG_STP_DATA                   0\r
 \r

+               /* Psuedo-Function Macros: */\r
+                       #if defined(__DOXYGEN__)\r
+                               /** Initiate a Host Negotiation Protocol request. This indicates to the other connected device\r
+                                *  that the device wishes to change device/host roles.\r
+                                */\r
+                               static inline void USB_OTG_DEV_Request_HNP(void);\r
+                               \r
+                               /** Cancel a Host Negotiation Protocol request. This stops a pending HNP request to the other\r
+                                *  connected device.\r
+                                */\r
+                               static inline void USB_OTG_DEV_Cancel_HNP_Request(void);\r
+                               \r
+                               /** Determines if the device is currently sending a HNP to an attached host.\r
+                                *\r
+                                *  \return Boolean true if currently sending a HNP to the other connected device, false otherwise\r
+                                */\r
+                               static inline bool USB_OTG_DEV_IsSendingHNP(void);\r
+                               \r
+                               /** Accepts a HNP from a connected device, indicating that both devices should exchange\r
+                                *  device/host roles.\r
+                                */\r
+                               static inline void USB_OTG_HOST_Accept_HNP(void);\r
+                               \r
+                               /** Rejects a HNP from a connected device, indicating that both devices should remain in their\r
+                                *  current device/host roles.\r
+                                */\r
+                               static inline void USB_OTG_HOST_Reject_HNP(void);\r
+                               \r
+                               /** Indicates if the connected device is not currently sending a HNP request.\r
+                                *\r
+                                *  \return Boolean true if a HNP is currently being issued by the connected device, false otherwise.\r
+                                */\r
+                               static inline bool USB_OTG_HOST_IsHNPReceived(void);\r
+                               \r
+                               /** Initiates a Session Request Protocol request. Most OTG devices turn off VBUS when the USB\r
+                                *  interface is not in use, to conserve power. Sending a SRP to a USB OTG device running in\r
+                                *  host mode indicates that VBUS should be applied and a session started.\r
+                                *\r
+                                *  There are two different methods of sending a SRP - either pulses on the VBUS line, or by\r
+                                *  pulsing the Data + line via the internal pull-up resistor.\r
+                                *\r
+                                *  \param SRPTypeMask  Mask indicating the type of SRP to use, either USB_OTG_SRP_VBUS or USB_OTG_STP_DATA.\r
+                                */\r
+                               static inline void USB_OTG_DEV_Initiate_SRP(uint8_t SRPTypeMask);\r
+                       #else\r
+\r
+                               #define USB_OTG_DEV_Request_HNP()          MACROS{ OTGCON |=  (1 << HNPREQ); }MACROE\r
+\r
+                               #define USB_OTG_DEV_Cancel_HNP_Request()   MACROS{ OTGCON &= ~(1 << HNPREQ); }MACROE\r
+\r
+                               #define USB_OTG_DEV_IsSendingHNP()               ((OTGCON &   (1 << HNPREQ)) ? true : false)\r
+                               \r
+                               #define USB_OTG_HOST_Accept_HNP()          MACROS{ OTGCON |=  (1 << HNPREQ); }MACROE\r
+\r
+                               #define USB_OTG_HOST_Reject_HNP()         MACROS{ OTGCON &= ~(1 << HNPREQ); }MACROE\r
+                               \r
+                               #define USB_OTG_HOST_IsHNPReceived()             ((OTGCON &   (1 << HNPREQ)) ? true : false)\r
+                               \r
+                               #define USB_OTG_DEV_Initiate_SRP(type)     MACROS{ OTGCON = ((OTGCON & ~(1 << SRPSEL)) | (type | (1 << SRPREQ))); }MACROE\r
+                       #endif\r
+       \r

 #endif\r
 #endif\r

+                       \r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c
index 1218d2f..5850fcf 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -74,8 +74,19 @@ uint8_t Pipe_WaitUntilReady(void)
 \r
        USB_INT_Clear(USB_INT_HSOFI);\r
 \r
 \r
        USB_INT_Clear(USB_INT_HSOFI);\r
 \r

-       while (!(Pipe_ReadWriteAllowed()))\r
+       for (;;)\r

        {\r
        {\r

+               if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)\r
+               {\r
+                       if (Pipe_IsINReceived())\r
+                         return PIPE_READYWAIT_NoError;\r
+               }\r
+               else\r
+               {\r
+                       if (Pipe_IsOUTReady())\r
+                         return PIPE_READYWAIT_NoError;                \r
+               }\r
+\r

                if (Pipe_IsStalled())\r
                  return PIPE_READYWAIT_PipeStalled;\r
                else if (!(USB_IsConnected))\r
                if (Pipe_IsStalled())\r
                  return PIPE_READYWAIT_PipeStalled;\r
                else if (!(USB_IsConnected))\r


@@ -89,8 +100,6 @@ uint8_t Pipe_WaitUntilReady(void)
                          return PIPE_READYWAIT_Timeout;\r
                }\r
        }\r
                          return PIPE_READYWAIT_Timeout;\r
                }\r
        }\r

-       \r
-       return PIPE_READYWAIT_NoError;\r

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


@@ -107,9 +116,9 @@ uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length
 \r
        while (Length--)\r
        {\r
 \r
        while (Length--)\r
        {\r

-               if (!(Pipe_ReadWriteAllowed()))\r
+               if (!(Pipe_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Pipe_ClearCurrentBank();\r
+                       Pipe_ClearOUT();\r

                                \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


@@ -119,8 +128,10 @@ uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-\r
-               Pipe_Write_Byte(*(DataStream++));\r
+               else\r
+               {\r
+                       Pipe_Write_Byte(*(DataStream++));\r
+               }\r

        }\r
 \r
        return PIPE_RWSTREAM_ERROR_NoError;\r
        }\r
 \r
        return PIPE_RWSTREAM_ERROR_NoError;\r


@@ -140,9 +151,9 @@ uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length
 \r
        while (Length--)\r
        {\r
 \r
        while (Length--)\r
        {\r

-               if (!(Pipe_ReadWriteAllowed()))\r
+               if (!(Pipe_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Pipe_ClearCurrentBank();\r
+                       Pipe_ClearOUT();\r

                                \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


@@ -152,8 +163,10 @@ uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-\r
-               Pipe_Write_Byte(*(DataStream--));\r
+               else\r
+               {\r
+                       Pipe_Write_Byte(*(DataStream--));\r
+               }\r

        }\r
 \r
        return PIPE_RWSTREAM_ERROR_NoError;\r
        }\r
 \r
        return PIPE_RWSTREAM_ERROR_NoError;\r


@@ -172,9 +185,9 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
 \r
        while (Length--)\r
        {\r
 \r
        while (Length--)\r
        {\r

-               if (!(Pipe_ReadWriteAllowed()))\r
+               if (!(Pipe_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Pipe_ClearCurrentBank();\r
+                       Pipe_ClearIN();\r

                                \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


@@ -184,8 +197,10 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-\r
-               Pipe_Discard_Byte();\r
+               else\r
+               {\r
+                       Pipe_Discard_Byte();\r
+               }\r

        }\r
 \r
        return PIPE_RWSTREAM_ERROR_NoError;\r
        }\r
 \r
        return PIPE_RWSTREAM_ERROR_NoError;\r


@@ -205,9 +220,9 @@ uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length
 \r
        while (Length--)\r
        {\r
 \r
        while (Length--)\r
        {\r

-               if (!(Pipe_ReadWriteAllowed()))\r
+               if (!(Pipe_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Pipe_ClearCurrentBank();\r
+                       Pipe_ClearIN();\r

                                \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


@@ -217,8 +232,10 @@ uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-               \r
-               *(DataStream++) = Pipe_Read_Byte();\r
+               else\r
+               {\r
+                       *(DataStream++) = Pipe_Read_Byte();\r
+               }\r

        }\r
 \r
        return PIPE_RWSTREAM_ERROR_NoError;\r
        }\r
 \r
        return PIPE_RWSTREAM_ERROR_NoError;\r


@@ -238,9 +255,9 @@ uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length
 \r
        while (Length--)\r
        {\r
 \r
        while (Length--)\r
        {\r

-               if (!(Pipe_ReadWriteAllowed()))\r
+               if (!(Pipe_IsReadWriteAllowed()))\r

                {\r
                {\r

-                       Pipe_ClearCurrentBank();\r
+                       Pipe_ClearIN();\r

                                \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


@@ -250,8 +267,10 @@ uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r
                        if ((ErrorCode = Pipe_WaitUntilReady()))\r
                          return ErrorCode;\r
                }\r

-\r
-               *(DataStream--) = Pipe_Read_Byte();\r
+               else\r
+               {\r
+                       *(DataStream--) = Pipe_Read_Byte();\r
+               }\r

        }\r
        \r
        return PIPE_RWSTREAM_ERROR_NoError;\r
        }\r
        \r
        return PIPE_RWSTREAM_ERROR_NoError;\r

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 46a10e4..253ce2a 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -35,6 +35,29 @@
  *  send/recieve functions for various data types.\r
  */\r
  \r
  *  send/recieve functions for various data types.\r
  */\r
  \r

+/** \ingroup Group_USB\r
+ *  @defgroup Group_PipeManagement Pipe Management\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the setup and management of pipes while in USB Device mode.\r
+ *\r
+ *  @{\r
+ */\r
+\r
+/** @defgroup Group_PipeRW Pipe Data Reading and Writing\r
+ *\r
+ *  Functions, macros, variables, enums and types related to data reading and writing from and to pipes.\r
+ */\r
+ \r
+/** @defgroup Group_PipePacketManagement Pipe Packet Management\r
+ *\r
+ *  Functions, macros, variables, enums and types related to packet management of pipes.\r
+ */\r
+ \r
+/** @defgroup Group_PipeControlReq Pipe Control Request Management\r
+ *\r
+ *  Functions, macros, variables, enums and types related to control request management of pipes.\r
+ */\r
+\r

 #ifndef __PIPE_H__\r
 #define __PIPE_H__\r
 \r
 #ifndef __PIPE_H__\r
 #define __PIPE_H__\r
 \r


@@ -221,158 +244,339 @@
                         */\r
                        #define PIPE_INT_STALL                 UPIENX, (1 << RXSTALLE), UPINTX, (1 << RXSTALLI)\r
 \r
                         */\r
                        #define PIPE_INT_STALL                 UPIENX, (1 << RXSTALLE), UPINTX, (1 << RXSTALLI)\r
 \r

-                       /** Indicates the number of bytes currently stored in the current pipe's selected bank. */\r
-                       #define Pipe_BytesInPipe()             UPBCX\r
+               /* Psuedo-Function Macros: */\r
+                       #if defined(__DOXYGEN__)\r
+                               /** Indicates the number of bytes currently stored in the current pipes's selected bank.\r
+                                *\r
+                                *  \note The return width of this function may differ, depending on the maximum pipe bank size\r
+                                *        of the selected AVR model.\r
+                                *\r
+                                *  \ingroup Group_PipeRW\r
+                                *\r
+                                *  \return Total number of bytes in the currently selected Pipe's FIFO buffer\r
+                                */\r
+                               static inline uint16_t Pipe_BytesInPipe(void);\r
+                               \r
+                               /** Returns the pipe address of the currently selected pipe. This is typically used to save the\r
+                                *  currently selected pipe number so that it can be restored after another pipe has been manipulated.\r
+                                *\r
+                                *  \return Index of the currently selected pipe\r
+                                */\r
+                               static inline uint8_t Pipe_GetCurrentPipe(void);\r
+\r
+                               /** Selects the given pipe number. Any pipe operations which do not require the pipe number to be\r
+                                *  indicated will operate on the currently selected pipe.\r
+                                *\r
+                                *  \param PipeNumber  Index of the pipe to select\r
+                                */\r
+                               static inline void Pipe_SelectPipe(uint8_t PipeNumber);\r
+                               \r
+                               /** Resets the desired pipe, including the pipe banks and flags.\r
+                                *\r
+                                *  \param PipeNumber  Index of the pipe to reset\r
+                                */\r
+                               static inline void Pipe_ResetPipe(uint8_t PipeNumber);\r
+                               \r
+                               /** Enables the currently selected pipe so that data can be sent and received through it to and from\r
+                                *  an attached device.\r
+                                *\r
+                                *  \note Pipes must first be configured properly rather than just being enabled via the\r
+                                *        Pipe_ConfigurePipe() macro, which calls Pipe_EnablePipe() automatically.\r
+                                */\r
+                               static inline void Pipe_EnablePipe(void);\r
+\r
+                               /** Disables the currently selected pipe so that data cannot be sent and received through it to and\r
+                                *  from an attached device.\r
+                                */\r
+                               static inline void Pipe_DisablePipe(void);\r
+\r
+                               /** Determines if the currently selected pipe is enabled, but not necessarily configured.\r
+                                *\r
+                                * \return Boolean True if the currently selected pipe is enabled, false otherwise\r
+                                */\r
+                               static inline bool Pipe_IsEnabled(void);\r
+                               \r
+                               /** Gets the current pipe token, indicating the pipe's data direction and type.\r
+                                *\r
+                                *  \return The current pipe token, as a PIPE_TOKEN_* mask\r
+                                */\r
+                               static inline uint8_t Pipe_GetCurrentToken(void);\r
+                               \r
+                               /** Sets the token for the currently selected pipe to one of the tokens specified by the PIPE_TOKEN_*\r
+                                *  masks. This can be used on CONTROL type pipes, to allow for bidirectional transfer of data during\r
+                                *  control requests, or on regular pipes to allow for half-duplex bidirectional data transfer to devices\r
+                                *  which have two endpoints of opposite direction sharing the same endpoint address within the device.\r
+                                *\r
+                                *  \param Token  New pipe token to set the selected pipe to, as a PIPE_TOKEN_* mask\r
+                                */\r
+                               static inline void Pipe_SetPipeToken(uint8_t Token);\r
+                               \r
+                               /** Configures the currently selected pipe to allow for an unlimited number of IN requests. */\r
+                               static inline void Pipe_SetInfiniteINRequests(void);\r
+                               \r
+                               /** Configures the currently selected pipe to only allow the specified number of IN requests to be\r
+                                *  accepted by the pipe before it is automatically frozen.\r
+                                *\r
+                                *  \param TotalINRequests  Total number of IN requests that the pipe may receive before freezing\r
+                                */\r
+                               static inline void Pipe_SetFiniteINRequests(uint8_t TotalINRequests);\r
+\r
+                               /** Determines if the currently selected pipe is configured.\r
+                                *\r
+                                *  \return Boolean true if the selected pipe is configured, false otherwise\r
+                                */\r
+                               static inline bool Pipe_IsConfigured(void);\r
+                               \r
+                               /** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds.\r
+                                *\r
+                                *  \param Milliseconds  Number of milliseconds between each pipe poll\r
+                                */\r
+                               static inline void Pipe_SetInterruptPeriod(uint8_t Milliseconds);\r
+                               \r
+                               /** Returns a mask indicating which pipe's interrupt periods have elapsed, indicating that the pipe should\r
+                                *  be serviced.\r
+                                *\r
+                                *  \return Mask whose bits indicate which pipes have interrupted\r
+                                */\r
+                               static inline uint8_t Pipe_GetPipeInterrupts(void);\r
+                               \r
+                               /** Clears the interrupt flag for the specified pipe number.\r
+                                *\r
+                                *  \param PipeNumber  Index of the pipe whose interrupt flag is to be cleared\r
+                                */\r
+                               static inline void Pipe_ClearPipeInterrupt(uint8_t PipeNumber);\r
+                               \r
+                               /** Determines if the specified pipe number has interrupted (valid only for INTERRUPT type\r
+                                *  pipes).\r
+                                *\r
+                                *  \param PipeNumber  Index of the pipe whose interrupt flag should be tested\r
+                                *\r
+                                *  \return Boolean true if the specified pipe has interrupted, false otherwise\r
+                                */\r
+                               static inline bool Pipe_HasPipeInterrupted(uint8_t PipeNumber);\r
+                               \r
+                               /** Unfreezes the selected pipe, allowing it to communicate with an attached device. */\r
+                               static inline void Pipe_Unfreeze(void);\r
+                               \r
+                               /** Freezes the selected pipe, preventing it from communicating with an attached device. */\r
+                               static inline void Pipe_Freeze(void);\r

 \r
 \r

-                       /** Resets the desired pipe, including the pipe banks and flags. */\r
-                       #define Pipe_ResetPipe(pipenum)        MACROS{ UPRST = (1 << pipenum); UPRST = 0; }MACROE\r
+                               /** Clears the master pipe error flag. */\r
+                               static inline void Pipe_ClearError(void);\r
+                               \r
+                               /** Determines if the master pipe error flag is set for the currently selected pipe, indicating that\r
+                                *  some sort of hardware error has occurred on the pipe.\r
+                                *\r
+                                *  \see Pipe_GetErrorFlags() macro for information on retrieving the exact error flag.\r
+                                *\r
+                                *  \return Boolean true if an error has ocurred on the selected pipe, false otherwise\r
+                                */\r
+                               static inline bool Pipe_IsError(void);\r
+                               \r
+                               /** Clears all the currently selected pipe's hardware error flags, but does not clear the master error\r
+                                *  flag for the pipe.\r
+                                */\r
+                               static inline void Pipe_ClearErrorFlags(void);\r
+                               \r
+                               /** Gets a mask of the hardware error flags which have occurred on the currently selected pipe. This\r
+                                *  value can then be masked against the PIPE_ERRORFLAG_* masks to determine what error has occurred.\r
+                                *\r
+                                *  \return  Mask comprising of PIPE_ERRORFLAG_* bits indicating what error has ocurred on the selected pipe\r
+                                */\r
+                               static inline uint8_t Pipe_GetErrorFlags(void);\r
+                               \r
+                               /** Determines if the currently selected pipe may be read from (if data is waiting in the pipe\r
+                                *  bank and the pipe is an IN direction, or if the bank is not yet full if the pipe is an OUT\r
+                                *  direction). This function will return false if an error has occurred in the pipe, or if the pipe\r
+                                *  is an IN direction and no packet (or an empty packet) has been received, or if the pipe is an OUT\r
+                                *  direction and the pipe bank is full.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *  \r
+                                *  \return Boolean true if the currently selected pipe may be read from or written to, depending on its direction\r
+                                */\r
+                               static inline bool Pipe_IsReadWriteAllowed(void);\r
+                               \r
+                               /** Determines if an IN request has been received on the currently selected pipe.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *\r
+                                *  \return Boolean true if the current pipe has received an IN packet, false otherwise.\r
+                                */\r
+                               static inline bool Pipe_IsINReceived(void);\r
+                               \r
+                               /** Determines if the currently selected pipe is ready to send an OUT request.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *\r
+                                *  \return Boolean true if the current pipe is ready for an OUT packet, false otherwise.\r
+                                */\r
+                               static inline bool Pipe_IsOUTReady(void);\r
+\r
+                               /** Determines if no SETUP request is currently being sent to the attached device on the selected\r
+                                *  CONTROL type pipe.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *\r
+                                *  \return Boolean true if the current pipe is ready for a SETUP packet, false otherwise.\r
+                                */\r
+                               static inline bool Pipe_IsSETUPSent(void);\r
+                               \r
+                               /** Acknowledges the reception of a setup IN request from the attached device on the currently selected\r
+                                *  CONTROL type pipe, freeing the bank ready for the next packet.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *\r
+                                *  \note For non CONTROL type pipes, use Pipe_ClearIN() instead.                        \r
+                                */\r
+                               static inline void Pipe_ClearControlIN(void);\r
+\r
+                               /** Sends the currently selected pipe's contents to the device as an OUT packet on the selected pipe, freeing\r
+                                *  the bank ready for the next packet.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *\r
+                                *  \note For non CONTROL type pipes, use Pipe_ClearOUT() instead.      \r
+                                */\r
+                               static inline void Pipe_ClearControlOUT(void);\r
+\r
+                               /** Sends the currently selected CONTROL type pipe's contents to the device as a SETUP packet.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *\r
+                                *  \note This is not applicable for non CONTROL type pipes.                    \r
+                                */\r
+                               static inline void Pipe_ClearControlSETUP(void);\r
+\r
+                               /** Acknowledges the reception of a setup IN request from the attached device on the currently selected\r
+                                *  pipe, freeing the bank ready for the next packet.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *\r
+                                *  \note For CONTROL type pipes, use Pipe_ClearControlIN() instead.    \r
+                                */\r
+                               static inline void Pipe_ClearIN(void);\r
+\r
+                               /** Sends the currently selected pipe's contents to the device as an OUT packet on the selected pipe, freeing\r
+                                *  the bank ready for the next packet.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *\r
+                                *  \note For CONTROL type pipes, use Pipe_ClearControlOUT() instead.   \r
+                                */\r
+                               static inline void Pipe_ClearOUT(void);\r
+\r
+                               /** Determines if the device sent a NAK (Negative Acknowledge) in response to the last sent packet on\r
+                                *  the currently selected pipe. This occurs when the host sends a packet to the device, but the device\r
+                                *  is not currently ready to handle the packet (i.e. its endpoint banks are full). Once a NAK has been\r
+                                *  received, it must be cleared using Pipe_ClearNAKReceived() before the previous (or any other) packet\r
+                                *  can be re-sent.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *\r
+                                *  \return Boolean true if an NAK has been received on the current pipe, false otherwise\r
+                                */\r
+                               static inline bool Pipe_IsNAKReceived(void);\r
+\r
+                               /** Clears the NAK condition on the currently selected pipe.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *\r
+                                *  \see Pipe_IsNAKReceived() for more details.\r
+                                */\r
+                               static inline void Pipe_ClearNAKReceived(void);\r
+                                \r
+                               /** Determines if the currently selected pipe has had the STALL condition set by the attached device.\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                *\r
+                                *  \return Boolean true if the current pipe has been stalled by the attached device, false otherwise\r
+                               */\r
+                               static inline bool Pipe_IsStalled(void);\r
+                               \r
+                               /** Clears the STALL condition detection flag on the currently selected pipe, but does not clear the\r
+                                *  STALL condition itself (this must be done via a ClearFeature control request to the device).\r
+                                *\r
+                                *  \ingroup Group_PipePacketManagement\r
+                                */\r
+                               static inline void Pipe_ClearStall(void);\r
+                       #else\r
+                               #define Pipe_BytesInPipe()             UPBCX\r

 \r
 \r

-                       /** Selects the given pipe number. Any pipe operations which do not require the pipe number to be\r
-                        *  indicated will operate on the currently selected pipe.\r
-                        */\r
-                       #define Pipe_SelectPipe(pipenum)       MACROS{ UPNUM = pipenum; }MACROE\r
+                               #define Pipe_GetCurrentPipe()          (UPNUM & PIPE_PIPENUM_MASK)\r

 \r
 \r

-                       /** Returns the pipe address of the currently selected pipe. This is typically used to save the\r
-                        *  currently selected pipe number so that it can be restored after another pipe has been manipulated.\r
-                        */\r
-                       #define Pipe_GetCurrentPipe()          (UPNUM & PIPE_PIPENUM_MASK)\r
+                               #define Pipe_SelectPipe(pipenum)       MACROS{ UPNUM = pipenum; }MACROE\r
+                               \r
+                               #define Pipe_ResetPipe(pipenum)        MACROS{ UPRST = (1 << pipenum); UPRST = 0; }MACROE\r

 \r
 \r

-                       /** Enables the currently selected pipe so that data can be sent and received through it to and from\r
-                        *  an attached device.\r
-                        *\r
-                        *  \note Pipes must first be configured properly rather than just being enabled via the\r
-                        *        Pipe_ConfigurePipe() macro, which calls Pipe_EnablePipe() automatically.\r
-                        */\r
-                       #define Pipe_EnablePipe()              MACROS{ UPCONX |= (1 << PEN); }MACROE\r
+                               #define Pipe_EnablePipe()              MACROS{ UPCONX |= (1 << PEN); }MACROE\r

 \r
 \r

-                       /** Disables the currently selected pipe so that data cannot be sent and received through it to and\r
-                        *  from an attached device.\r
-                        */\r
-                       #define Pipe_DisablePipe()             MACROS{ UPCONX &= ~(1 << PEN); }MACROE\r
+                               #define Pipe_DisablePipe()             MACROS{ UPCONX &= ~(1 << PEN); }MACROE\r

 \r
 \r

-                       /** Returns true if the currently selected pipe is enabled, false otherwise. */\r
-                       #define Pipe_IsEnabled()               ((UPCONX & (1 << PEN)) ? true : false)\r
+                               #define Pipe_IsEnabled()               ((UPCONX & (1 << PEN)) ? true : false)\r

 \r
 \r

-                       /** Sets the token for the currently selected endpoint to one of the tokens specified by the PIPE_TOKEN_*\r
-                        *  masks. This should only be used on CONTROL type endpoints, to allow for bidirectional transfer of\r
-                        *  data during control requests.\r
-                        */\r
-                       #define Pipe_SetToken(token)           MACROS{ UPCFG0X = ((UPCFG0X & ~PIPE_TOKEN_MASK) | token); }MACROE\r
-                       \r
-                       /** Configures the currently selected pipe to allow for an unlimited number of IN requests. */\r
-                       #define Pipe_SetInfiniteINRequests()   MACROS{ UPCONX |= (1 << INMODE); }MACROE\r
+                               #define Pipe_GetPipeToken()            (UPCFG0X & PIPE_TOKEN_MASK)\r

 \r
 \r

-                       /** Configures the currently selected pipe to only allow the specified number of IN requests to be\r
-                        *  accepted by the pipe before it is automatically frozen.\r
-                        */\r
-                       #define Pipe_SetFiniteINRequests(n)    MACROS{ UPCONX &= ~(1 << INMODE); UPINRQX = n; }MACROE\r
+                               #define Pipe_SetToken(token)           MACROS{ UPCFG0X = ((UPCFG0X & ~PIPE_TOKEN_MASK) | token); }MACROE\r
+                               \r
+                               #define Pipe_SetInfiniteINRequests()   MACROS{ UPCONX |= (1 << INMODE); }MACROE\r

 \r
 \r

-                       /** Returns true if the currently selected pipe is configured, false otherwise. */\r
-                       #define Pipe_IsConfigured()            ((UPSTAX  & (1 << CFGOK)) ? true : false)\r
+                               #define Pipe_SetFiniteINRequests(n)    MACROS{ UPCONX &= ~(1 << INMODE); UPINRQX = n; }MACROE\r

 \r
 \r

-                       /** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds. */\r
-                       #define Pipe_SetInterruptPeriod(ms)    MACROS{ UPCFG2X = ms; }MACROE\r
+                               #define Pipe_IsConfigured()            ((UPSTAX  & (1 << CFGOK)) ? true : false)\r

 \r
 \r

-                       /** Returns a mask indicating which pipe's interrupt periods have elapsed, indicating that the pipe should\r
-                        *  be serviced.\r
-                        */\r
-                       #define Pipe_GetPipeInterrupts()       UPINT\r
+                               #define Pipe_SetInterruptPeriod(ms)    MACROS{ UPCFG2X = ms; }MACROE\r

 \r
 \r

-                       /** Clears the interrupt flag for the specified pipe number. */\r
-                       #define Pipe_ClearPipeInterrupt(n)     MACROS{ UPINT &= ~(1 << n); }MACROE\r
+                               #define Pipe_GetPipeInterrupts()       UPINT\r

 \r
 \r

-                       /** Returns true if the specified pipe's interrupt period has elapsed, false otherwise. */\r
-                       #define Pipe_HasPipeInterrupted(n)     ((UPINT & (1 << n)) ? true : false)\r
-                       \r
-                       /** Clears the pipe bank, and switches to the alternate bank if the currently selected pipe is\r
-                        *  dual-banked. When cleared, this either frees the bank up for the next packet from the host\r
-                        *  (if the endpoint is of the OUT direction) or sends the packet contents to the host (if the\r
-                        *  pipe is of the IN direction).\r
-                        */\r
-                       #define Pipe_ClearCurrentBank()        MACROS{ UPINTX &= ~(1 << FIFOCON); }MACROE\r
+                               #define Pipe_ClearPipeInterrupt(n)     MACROS{ UPINT &= ~(1 << n); }MACROE\r

 \r
 \r

-                       /** Unfreezes the pipe, allowing it to communicate with an attached device. */\r
-                       #define Pipe_Unfreeze()                MACROS{ UPCONX &= ~(1 << PFREEZE); }MACROE\r
+                               #define Pipe_HasPipeInterrupted(n)     ((UPINT & (1 << n)) ? true : false)\r

 \r
 \r

-                       /** Freezes the pipe, preventing it from communicating with an attached device. */\r
-                       #define Pipe_Freeze()                  MACROS{ UPCONX |= (1 << PFREEZE); }MACROE\r
+                               #define Pipe_Unfreeze()                MACROS{ UPCONX &= ~(1 << PFREEZE); }MACROE\r

 \r
 \r

-                       /** Clears the master pipe error flag. */\r
-                       #define Pipe_ClearError()              MACROS{ UPINTX &= ~(1 << PERRI); }MACROE\r
+                               #define Pipe_Freeze()                  MACROS{ UPCONX |= (1 << PFREEZE); }MACROE\r

 \r
 \r

-                       /** Returns true if the master pipe error flag is set for the currently selected pipe, indicating that\r
-                        *  some sort of hardware error has occurred on the pipe.\r
-                        *\r
-                        *  \see Pipe_GetErrorFlags() macro for information on retrieving the exact error flag.\r
-                        */\r
-                       #define Pipe_IsError()                 ((UPINTX & (1 << PERRI)) ? true : false)\r
-                       \r
-                       /** Clears all the currently selected pipe's hardware error flags, but does not clear the master error\r
-                        *  flag for the pipe. */\r
-                       #define Pipe_ClearErrorFlags()         MACROS{ UPERRX = 0; }MACROE\r
+                               #define Pipe_ClearError()              MACROS{ UPINTX &= ~(1 << PERRI); }MACROE\r

 \r
 \r

-                       /** Returns a mask of the hardware error flags which have occurred on the currently selected pipe. This\r
-                        *  value can then be masked against the PIPE_ERRORFLAG_* masks to determine what error has occurred.\r
-                        */\r
-                       #define Pipe_GetErrorFlags()           UPERRX\r
+                               #define Pipe_IsError()                 ((UPINTX & (1 << PERRI)) ? true : false)\r
+                               \r
+                               #define Pipe_ClearErrorFlags()         MACROS{ UPERRX = 0; }MACROE\r

 \r
 \r

-                       /** Returns true if the currently selected pipe may be read from (if data is waiting in the pipe\r
-                        *  bank and the pipe is an IN direction, or if the bank is not yet full if the pipe is an OUT\r
-                        *  direction). This function will return false if an error has occurred in the pipe, or if the pipe\r
-                        *  is an IN direction and no packet has been received, or if the pipe is an OUT direction and the\r
-                        *  pipe bank is full.\r
-                        */\r
-                       #define Pipe_ReadWriteAllowed()        ((UPINTX & (1 << RWAL)) ? true : false)\r
+                               #define Pipe_GetErrorFlags()           UPERRX\r

 \r
 \r

-                       /** Clears the flag indicating that a SETUP request has been sent to the attached device from the\r
-                        *  currently selected CONTROL type pipe.\r
-                        */\r
-                       #define Pipe_ClearSetupSent()          MACROS{ UPINTX &= ~(1 << TXSTPI); }MACROE\r
+                               #define Pipe_IsReadWriteAllowed()      ((UPINTX & (1 << RWAL)) ? true : false)\r

 \r
 \r

-                       /** Returns true if no SETUP request is currently being sent to the attached device, false otherwise. */\r
-                       #define Pipe_IsSetupSent()             ((UPINTX & (1 << TXSTPI)) ? true : false)\r
+                               #define Pipe_IsINReceived()            ((UPINTX & (1 << RXINI)) ? true : false)\r

 \r
 \r

-                       /** Returns true if the currently selected pipe has been stalled by the attached device, false otherwise. */\r
-                       #define Pipe_IsStalled()               ((UPINTX & (1 << RXSTALLI)) ? true : false)\r
+                               #define Pipe_IsOUTReady()              ((UPINTX & (1 << TXOUTI)) ? true : false)\r

 \r
 \r

-                       /** Clears the stall condition on the currently selected pipe. */\r
-                       #define Pipe_ClearStall()              MACROS{ UPINTX &= ~(1 << RXSTALLI); }MACROE             \r
+                               #define Pipe_IsSETUPSent()             ((UPINTX & (1 << TXSTPI)) ? true : false)\r

 \r
 \r

-                       /** Returns true if an IN request has been received on the currently selected CONTROL type pipe, false\r
-                        *  otherwise.\r
-                        */\r
-                       #define Pipe_IsSetupINReceived()       ((UPINTX & (1 << RXINI)) ? true : false)\r
+                               #define Pipe_ClearIN()                 MACROS{ UPINTX &= ~(1 << RXINI); UPINTX &= ~(1 << FIFOCON); }MACROE\r

 \r
 \r

-                       /** Returns true if the currently selected CONTROL type pipe is ready to send an OUT request, false\r
-                        *  otherwise.\r
-                        */\r
-                       #define Pipe_IsSetupOUTReady()         ((UPINTX & (1 << TXOUTI)) ? true : false)\r
+                               #define Pipe_ClearControlIN()          MACROS{ UPINTX &= ~(1 << RXINI); UPINTX &= ~(1 << FIFOCON); }MACROE\r

 \r
 \r

-                       /** Acknowledges the reception of a setup IN request from the attached device on the currently selected\r
-                        *  CONTROL type endpoint, allowing for the transmission of a setup OUT packet, or the reception of\r
-                        *  another setup IN packet.\r
-                        */\r
-                       #define Pipe_ClearSetupIN()            MACROS{ UPINTX &= ~(1 << RXINI); UPINTX &= ~(1 << FIFOCON); }MACROE\r
+                               #define Pipe_ClearOUT()                MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE\r
+                               \r
+                               #define Pipe_ClearControlOUT()         MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE\r

 \r
 \r

-                       /** Sends the currently selected CONTROL type pipe's contents to the device as a setup OUT packet. */\r
-                       #define Pipe_ClearSetupOUT()           MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE\r
-                       \r
-                       /** Returns true if the device sent a NAK (Negative Acknowledge) in response to the last sent packet on\r
-                        *  the currently selected pipe. This occurs when the host sends a packet to the device, but the device\r
-                        *  is not currently ready to handle the packet (i.e. its endpoint banks are full). Once a NAK has been\r
-                        *  received, it must be cleared using Pipe_ClearNAKReceived() before the previous (or any other) packet\r
-                        *  can be re-sent.\r
-                        */\r
-                       #define Pipe_IsNAKReceived()           ((UPINTX & (1 << NAKEDI)) ? true : false)\r
+                               #define Pipe_ClearControlSETUP()       MACROS{ UPINTX &= ~(1 << TXSTPI); UPINTX &= ~(1 << FIFOCON); }MACROE        \r

 \r
 \r

-                       /** Clears the NAK condition on the currently selected pipe.\r
-                        *\r
-                        *  \see Pipe_IsNAKReceived() for more details.\r
-                        */\r
-                       #define Pipe_ClearNAKReceived()        MACROS{ UPINTX &= ~(1 << NAKEDI); }MACROE\r
+                               #define Pipe_IsNAKReceived()           ((UPINTX & (1 << NAKEDI)) ? true : false)\r
+\r
+                               #define Pipe_ClearNAKReceived()        MACROS{ UPINTX &= ~(1 << NAKEDI); }MACROE\r
+\r
+                               #define Pipe_IsStalled()               ((UPINTX & (1 << RXSTALLI)) ? true : false)\r
+\r
+                               #define Pipe_ClearStall()              MACROS{ UPINTX &= ~(1 << RXSTALLI); }MACROE\r
+                       #endif\r

 \r
                /* Enums: */\r
 \r
                /* Enums: */\r

-                       /** Enum for the possible error return codes of the Pipe_WaitUntilReady function */\r
+                       /** Enum for the possible error return codes of the Pipe_WaitUntilReady function\r
+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        */\r

                        enum Pipe_WaitUntilReady_ErrorCodes_t\r
                        {\r
                                PIPE_READYWAIT_NoError                 = 0, /**< Pipe ready for next packet, no error */\r
                        enum Pipe_WaitUntilReady_ErrorCodes_t\r
                        {\r
                                PIPE_READYWAIT_NoError                 = 0, /**< Pipe ready for next packet, no error */\r


@@ -384,7 +588,10 @@
                                                                             */\r
                        };\r
 \r
                                                                             */\r
                        };\r
 \r

-                       /** Enum for the possible error return codes of the Pipe_*_Stream_* functions. */\r
+                       /** Enum for the possible error return codes of the Pipe_*_Stream_* functions.\r
+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        */\r

                        enum Pipe_Stream_RW_ErrorCodes_t\r
                        {\r
                                PIPE_RWSTREAM_ERROR_NoError            = 0, /**< Command completed successfully, no error. */\r
                        enum Pipe_Stream_RW_ErrorCodes_t\r
                        {\r
                                PIPE_RWSTREAM_ERROR_NoError            = 0, /**< Command completed successfully, no error. */\r


@@ -402,21 +609,34 @@
                        };\r
 \r
                /* Inline Functions: */\r
                        };\r
 \r
                /* Inline Functions: */\r

-                       /** Reads one byte from the currently selected pipe's bank, for OUT direction pipes. */\r
+                       /** Reads one byte from the currently selected pipe's bank, for OUT direction pipes.\r
+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        *\r
+                        *  \return Next byte in the currently selected pipe's FIFO buffer\r
+                        */\r

                        static inline uint8_t Pipe_Read_Byte(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint8_t Pipe_Read_Byte(void)\r
                        {\r
                                return UPDATX;\r
                        }\r
 \r
                        static inline uint8_t Pipe_Read_Byte(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint8_t Pipe_Read_Byte(void)\r
                        {\r
                                return UPDATX;\r
                        }\r
 \r

-                       /** Writes one byte from the currently selected pipe's bank, for IN direction pipes. */\r
+                       /** Writes one byte from the currently selected pipe's bank, for IN direction pipes.\r
+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        *\r
+                        *  \param Byte  Next byte to write into the the currently selected pipe's FIFO buffer\r
+                        */\r

                        static inline void Pipe_Write_Byte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Write_Byte(const uint8_t Byte)\r
                        {\r
                                UPDATX = Byte;\r
                        }\r
 \r
                        static inline void Pipe_Write_Byte(const uint8_t Byte) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Write_Byte(const uint8_t Byte)\r
                        {\r
                                UPDATX = Byte;\r
                        }\r
 \r

-                       /** Discards one byte from the currently selected pipe's bank, for OUT direction pipes. */\r
+                       /** Discards one byte from the currently selected pipe's bank, for OUT direction pipes.\r
+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        */\r

                        static inline void Pipe_Discard_Byte(void) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Discard_Byte(void)\r
                        {\r
                        static inline void Pipe_Discard_Byte(void) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Discard_Byte(void)\r
                        {\r


@@ -427,6 +647,10 @@
                        \r
                        /** Reads two bytes from the currently selected pipe's bank in little endian format, for OUT\r
                         *  direction pipes.\r
                        \r
                        /** Reads two bytes from the currently selected pipe's bank in little endian format, for OUT\r
                         *  direction pipes.\r

+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        *\r
+                        *  \return Next word in the currently selected pipe's FIFO buffer\r

                         */\r
                        static inline uint16_t Pipe_Read_Word_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint16_t Pipe_Read_Word_LE(void)\r
                         */\r
                        static inline uint16_t Pipe_Read_Word_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint16_t Pipe_Read_Word_LE(void)\r


@@ -441,6 +665,10 @@
 \r
                        /** Reads two bytes from the currently selected pipe's bank in big endian format, for OUT\r
                         *  direction pipes.\r
 \r
                        /** Reads two bytes from the currently selected pipe's bank in big endian format, for OUT\r
                         *  direction pipes.\r

+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        *\r
+                        *  \return Next word in the currently selected pipe's FIFO buffer\r

                         */\r
                        static inline uint16_t Pipe_Read_Word_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint16_t Pipe_Read_Word_BE(void)\r
                         */\r
                        static inline uint16_t Pipe_Read_Word_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint16_t Pipe_Read_Word_BE(void)\r


@@ -455,6 +683,10 @@
                        \r
                        /** Writes two bytes to the currently selected pipe's bank in little endian format, for IN\r
                         *  direction pipes.\r
                        \r
                        /** Writes two bytes to the currently selected pipe's bank in little endian format, for IN\r
                         *  direction pipes.\r

+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        *\r
+                        *  \param Word  Next word to write to the currently selected pipe's FIFO buffer\r

                         */\r
                        static inline void Pipe_Write_Word_LE(const uint16_t Word) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Write_Word_LE(const uint16_t Word)\r
                         */\r
                        static inline void Pipe_Write_Word_LE(const uint16_t Word) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Write_Word_LE(const uint16_t Word)\r


@@ -465,6 +697,10 @@
                        \r
                        /** Writes two bytes to the currently selected pipe's bank in big endian format, for IN\r
                         *  direction pipes.\r
                        \r
                        /** Writes two bytes to the currently selected pipe's bank in big endian format, for IN\r
                         *  direction pipes.\r

+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        *\r
+                        *  \param Word  Next word to write to the currently selected pipe's FIFO buffer\r

                         */\r
                        static inline void Pipe_Write_Word_BE(const uint16_t Word) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Write_Word_BE(const uint16_t Word)\r
                         */\r
                        static inline void Pipe_Write_Word_BE(const uint16_t Word) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Write_Word_BE(const uint16_t Word)\r


@@ -473,9 +709,12 @@
                                UPDATX = (Word & 0xFF);\r
                        }\r
 \r
                                UPDATX = (Word & 0xFF);\r
                        }\r
 \r

-                       /** Discards two bytes from the currently selected pipe's bank, for OUT direction pipes. */\r
-                       static inline void Pipe_Ignore_Word(void) ATTR_ALWAYS_INLINE;\r
-                       static inline void Pipe_Ignore_Word(void)\r
+                       /** Discards two bytes from the currently selected pipe's bank, for OUT direction pipes.\r
+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        */\r
+                       static inline void Pipe_Discard_Word(void) ATTR_ALWAYS_INLINE;\r
+                       static inline void Pipe_Discard_Word(void)\r

                        {\r
                                uint8_t Dummy;\r
                                \r
                        {\r
                                uint8_t Dummy;\r
                                \r


@@ -485,6 +724,10 @@
 \r
                        /** Reads four bytes from the currently selected pipe's bank in little endian format, for OUT\r
                         *  direction pipes.\r
 \r
                        /** Reads four bytes from the currently selected pipe's bank in little endian format, for OUT\r
                         *  direction pipes.\r

+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        *\r
+                        *  \return Next double word in the currently selected pipe's FIFO buffer\r

                         */\r
                        static inline uint32_t Pipe_Read_DWord_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint32_t Pipe_Read_DWord_LE(void)\r
                         */\r
                        static inline uint32_t Pipe_Read_DWord_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint32_t Pipe_Read_DWord_LE(void)\r


@@ -505,6 +748,10 @@
 \r
                        /** Reads four bytes from the currently selected pipe's bank in big endian format, for OUT\r
                         *  direction pipes.\r
 \r
                        /** Reads four bytes from the currently selected pipe's bank in big endian format, for OUT\r
                         *  direction pipes.\r

+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        *\r
+                        *  \return Next double word in the currently selected pipe's FIFO buffer\r

                         */\r
                        static inline uint32_t Pipe_Read_DWord_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint32_t Pipe_Read_DWord_BE(void)\r
                         */\r
                        static inline uint32_t Pipe_Read_DWord_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;\r
                        static inline uint32_t Pipe_Read_DWord_BE(void)\r


@@ -525,6 +772,10 @@
 \r
                        /** Writes four bytes to the currently selected pipe's bank in little endian format, for IN\r
                         *  direction pipes.\r
 \r
                        /** Writes four bytes to the currently selected pipe's bank in little endian format, for IN\r
                         *  direction pipes.\r

+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        *\r
+                        *  \param DWord  Next double word to write to the currently selected pipe's FIFO buffer\r

                         */\r
                        static inline void Pipe_Write_DWord_LE(const uint32_t DWord) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Write_DWord_LE(const uint32_t DWord)\r
                         */\r
                        static inline void Pipe_Write_DWord_LE(const uint32_t DWord) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Write_DWord_LE(const uint32_t DWord)\r


@@ -535,6 +786,10 @@
                        \r
                        /** Writes four bytes to the currently selected pipe's bank in big endian format, for IN\r
                         *  direction pipes.\r
                        \r
                        /** Writes four bytes to the currently selected pipe's bank in big endian format, for IN\r
                         *  direction pipes.\r

+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        *\r
+                        *  \param DWord  Next double word to write to the currently selected pipe's FIFO buffer\r

                         */\r
                        static inline void Pipe_Write_DWord_BE(const uint32_t DWord) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Write_DWord_BE(const uint32_t DWord)\r
                         */\r
                        static inline void Pipe_Write_DWord_BE(const uint32_t DWord) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Write_DWord_BE(const uint32_t DWord)\r


@@ -543,7 +798,10 @@
                                Pipe_Write_Word_BE(DWord);\r
                        }                       \r
                        \r
                                Pipe_Write_Word_BE(DWord);\r
                        }                       \r
                        \r

-                       /** Discards four bytes from the currently selected pipe's bank, for OUT direction pipes. */\r
+                       /** Discards four bytes from the currently selected pipe's bank, for OUT direction pipes.       \r
+                        *\r
+                        *  \ingroup Group_PipeRW\r
+                        */\r

                        static inline void Pipe_Ignore_DWord(void) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Ignore_DWord(void)\r
                        {\r
                        static inline void Pipe_Ignore_DWord(void) ATTR_ALWAYS_INLINE;\r
                        static inline void Pipe_Ignore_DWord(void)\r
                        {\r


@@ -595,6 +853,8 @@
                         *\r
                         *  \note This routine should not be called on CONTROL type pipes.\r
                         *\r
                         *\r
                         *  \note This routine should not be called on CONTROL type pipes.\r
                         *\r

+                        *  \ingroup Group_PipeRW\r
+                        *\r

                         *  \return A value from the Pipe_WaitUntilReady_ErrorCodes_t enum.\r
                         */\r
                        uint8_t Pipe_WaitUntilReady(void);              \r
                         *  \return A value from the Pipe_WaitUntilReady_ErrorCodes_t enum.\r
                         */\r
                        uint8_t Pipe_WaitUntilReady(void);              \r


@@ -602,13 +862,15 @@
                        /** Writes the given number of bytes to the pipe from the given buffer in little endian,\r
                         *  sending full packets to the device as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r
                        /** Writes the given number of bytes to the pipe from the given buffer in little endian,\r
                         *  sending full packets to the device as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r

-                        *  Pipe_ClearCurrentBank() macro. Between each USB packet, the given stream callback function is\r
+                        *  Pipe_ClearOUT() macro. Between each USB packet, the given stream callback function is\r

                         *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.\r
                         *\r
                         *      The callback routine should be created using the STREAM_CALLBACK() macro. If the token\r
                         *  NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled\r
                         *  and this function has the Callback parameter omitted.\r
                         *\r
                         *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.\r
                         *\r
                         *      The callback routine should be created using the STREAM_CALLBACK() macro. If the token\r
                         *  NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled\r
                         *  and this function has the Callback parameter omitted.\r
                         *\r

+                        *  \ingroup Group_PipeRW\r
+                        *\r

                         *  \param Buffer    Pointer to the source data buffer to read from.\r
                         *  \param Length    Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *  \param Buffer    Pointer to the source data buffer to read from.\r
                         *  \param Length    Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r


@@ -624,13 +886,15 @@
                        /** Writes the given number of bytes to the pipe from the given buffer in big endian,\r
                         *  sending full packets to the device as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r
                        /** Writes the given number of bytes to the pipe from the given buffer in big endian,\r
                         *  sending full packets to the device as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r

-                        *  Pipe_ClearCurrentBank() macro. Between each USB packet, the given stream callback function is\r
+                        *  Pipe_ClearOUT() macro. Between each USB packet, the given stream callback function is\r

                         *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.\r
                         *\r
                         *      The callback routine should be created using the STREAM_CALLBACK() macro. If the token\r
                         *  NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled\r
                         *  and this function has the Callback parameter omitted.\r
                         *\r
                         *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.\r
                         *\r
                         *      The callback routine should be created using the STREAM_CALLBACK() macro. If the token\r
                         *  NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled\r
                         *  and this function has the Callback parameter omitted.\r
                         *\r

+                        *  \ingroup Group_PipeRW\r
+                        *\r

                         *  \param Buffer    Pointer to the source data buffer to read from.\r
                         *  \param Length    Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *  \param Buffer    Pointer to the source data buffer to read from.\r
                         *  \param Length    Number of bytes to read for the currently selected pipe into the buffer.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r


@@ -645,7 +909,7 @@
 \r
                        /** Reads and discards the given number of bytes from the pipe, discarding fully read packets from the host\r
                         *  as needed. The last packet is not automatically discarded once the remaining bytes has been read; the\r
 \r
                        /** Reads and discards the given number of bytes from the pipe, discarding fully read packets from the host\r
                         *  as needed. The last packet is not automatically discarded once the remaining bytes has been read; the\r

-                        *  user is responsible for manually discarding the last packet from the host via the Pipe_ClearCurrentBank() macro.\r
+                        *  user is responsible for manually discarding the last packet from the device via the Pipe_ClearIN() macro.\r

                         *  Between each USB packet, the given stream callback function is executed repeatedly until the next packet is ready,\r
                         *  allowing for early aborts of stream transfers.\r
                         *\r
                         *  Between each USB packet, the given stream callback function is executed repeatedly until the next packet is ready,\r
                         *  allowing for early aborts of stream transfers.\r
                         *\r


@@ -653,6 +917,8 @@
                         *  NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled\r
                         *  and this function has the Callback parameter omitted.\r
                         *\r
                         *  NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled\r
                         *  and this function has the Callback parameter omitted.\r
                         *\r

+                        *  \ingroup Group_PipeRW\r
+                        *\r

                         *  \param Length  Number of bytes to send via the currently selected pipe.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *\r
                         *  \param Length  Number of bytes to send via the currently selected pipe.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *\r


@@ -667,13 +933,15 @@
                        /** Reads the given number of bytes from the pipe into the given buffer in little endian,\r
                         *  sending full packets to the device as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r
                        /** Reads the given number of bytes from the pipe into the given buffer in little endian,\r
                         *  sending full packets to the device as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r

-                        *  Pipe_ClearCurrentBank() macro. Between each USB packet, the given stream callback function is\r
+                        *  Pipe_ClearIN() macro. Between each USB packet, the given stream callback function is\r

                         *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.\r
                         *\r
                         *      The callback routine should be created using the STREAM_CALLBACK() macro. If the token\r
                         *  NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled\r
                         *  and this function has the Callback parameter omitted.\r
                         *\r
                         *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.\r
                         *\r
                         *      The callback routine should be created using the STREAM_CALLBACK() macro. If the token\r
                         *  NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled\r
                         *  and this function has the Callback parameter omitted.\r
                         *\r

+                        *  \ingroup Group_PipeRW\r
+                        *\r

                         *  \param Buffer    Pointer to the source data buffer to write to.\r
                         *  \param Length    Number of bytes to read for the currently selected pipe to read from.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *  \param Buffer    Pointer to the source data buffer to write to.\r
                         *  \param Length    Number of bytes to read for the currently selected pipe to read from.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r


@@ -689,13 +957,15 @@
                        /** Reads the given number of bytes from the pipe into the given buffer in big endian,\r
                         *  sending full packets to the device as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r
                        /** Reads the given number of bytes from the pipe into the given buffer in big endian,\r
                         *  sending full packets to the device as needed. The last packet filled is not automatically sent;\r
                         *  the user is responsible for manually sending the last written packet to the host via the\r

-                        *  Pipe_ClearCurrentBank() macro. Between each USB packet, the given stream callback function is\r
+                        *  Pipe_ClearIN() macro. Between each USB packet, the given stream callback function is\r

                         *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.\r
                         *\r
                         *      The callback routine should be created using the STREAM_CALLBACK() macro. If the token\r
                         *  NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled\r
                         *  and this function has the Callback parameter omitted.\r
                         *\r
                         *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.\r
                         *\r
                         *      The callback routine should be created using the STREAM_CALLBACK() macro. If the token\r
                         *  NO_STREAM_CALLBACKS is passed via the -D option to the compiler, stream callbacks are disabled\r
                         *  and this function has the Callback parameter omitted.\r
                         *\r

+                        *  \ingroup Group_PipeRW\r
+                        *\r

                         *  \param Buffer    Pointer to the source data buffer to write to.\r
                         *  \param Length    Number of bytes to read for the currently selected pipe to read from.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r
                         *  \param Buffer    Pointer to the source data buffer to write to.\r
                         *  \param Length    Number of bytes to read for the currently selected pipe to read from.\r
                         *  \param Callback  Name of a callback routine to call between successive USB packet transfers, NULL if no callback\r


@@ -706,58 +976,7 @@
                        #if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)\r
                                                    , uint8_t (* const Callback)(void)\r
                        #endif\r
                        #if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)\r
                                                    , uint8_t (* const Callback)(void)\r
                        #endif\r

-                                                   ) ATTR_NON_NULL_PTR_ARG(1);                         \r
-\r
-               /* Function Aliases: */\r
-                       /** Alias for Pipe_Discard_Byte().\r
-                        */\r
-                       #define Pipe_Ignore_Byte()                 Pipe_Discard_Byte()\r
-\r
-                       /** Alias for Pipe_Discard_Word().\r
-                        */\r
-                       #define Pipe_Ignore_Word()                 Pipe_Discard_Word()          \r
-\r
-                       /** Alias for Pipe_Discard_DWord().\r
-                        */\r
-                       #define Pipe_Ignore_DWord()                Pipe_Discard_DWord()\r
-\r
-                       /** Alias for Pipe_Read_Word_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #define Pipe_Read_Word()                   Pipe_Read_Word_LE()\r
-\r
-                       /** Alias for Pipe_Write_Word_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #define Pipe_Write_Word(Word)              Pipe_Write_Word_LE(Word)\r
-\r
-                       /** Alias for Pipe_Read_DWord_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #define Pipe_Read_DWord()                  Pipe_Read_DWord_LE()\r
-\r
-                       /** Alias for Pipe_Write_DWord_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #define Pipe_Write_DWord(DWord)            Pipe_Write_DWord_LE(DWord)\r
-\r
-                       /** Alias for Pipe_Read_Stream_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                               #define Pipe_Read_Stream(Buffer, Length, Callback) Pipe_Read_Stream_LE(Buffer, Length, Callback)\r
-                       #else\r
-                               #define Pipe_Read_Stream(Buffer, Length)           Pipe_Read_Stream_LE(Buffer, Length)\r
-                       #endif\r
-\r
-                       /** Alias for Pipe_Write_Stream_LE(). By default USB transfers use little endian format, thus\r
-                        *  the command with no endianness specified indicates little endian mode.\r
-                        */\r
-                       #if !defined(NO_STREAM_CALLBACKS)\r
-                               #define Pipe_Write_Stream(Buffer, Length, Callback) Pipe_Read_Stream_LE(Buffer, Length, Callback)\r
-                       #else\r
-                               #define Pipe_Write_Stream(Buffer, Length)           Pipe_Read_Stream_LE(Buffer, Length)\r
-                       #endif\r
+                                                   ) ATTR_NON_NULL_PTR_ARG(1);\r

                        \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                        \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r


@@ -794,5 +1013,7 @@
                #if defined(__cplusplus)\r
                        }\r
                #endif\r
                #if defined(__cplusplus)\r
                        }\r
                #endif\r

-               \r
+       \r

 #endif\r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index 499c59b..75fff2f 100644 (file)
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -38,6 +38,11 @@
  *  the USB library unless desired by the library user.\r
  */\r
 \r
  *  the USB library unless desired by the library user.\r
  */\r
 \r

+/** @defgroup Group_USB USB - LUFA/Drivers/USB/USB.h\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the management of USB communications.\r
+ */\r
+\r

 #ifndef __USB_H__\r
 #define __USB_H__\r
 \r
 #ifndef __USB_H__\r
 #define __USB_H__\r
 \r


@@ -79,5 +84,8 @@
                        #include "LowLevel/OTG.h"\r
                #endif\r
                \r
                        #include "LowLevel/OTG.h"\r
                #endif\r
                \r

+               #include "Class/ConfigDescriptor.h"\r
+               #include "Class/HIDParser.h"\r
+               \r

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

diff --git a/LUFA/Groups.txt b/LUFA/Groups.txt
new file mode 100644 (file)
index 0000000..352d92e
--- /dev/null
+++ b/LUFA/Groups.txt
@@ -0,0 +1,20 @@
+/** \file\r
+ *\r
+ *  This file contains special DoxyGen information for the generation of the main page and other special\r
+ *  documentation pages. It is not a project source file.\r
+ */\r
+\r
+/** @defgroup Group_BoardDrivers Board Drivers\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the control of physical board hardware.\r
+ */\r
+\r
+/** @defgroup Group_SubsystemDrivers Subsystem Drivers\r
+ *\r
+ *  Functions, macros, variables, enums and types related to the control of AVR subsystems.\r
+ */\r
+ \r
+/** @defgroup Group_MiscDrivers Miscellaneous Drivers\r
+ *\r
+ *  Miscellaneous driver Functions, macros, variables, enums and types.\r
+ */
\ No newline at end of file

diff --git a/LUFA/MemoryAllocator/DynAlloc.h b/LUFA/MemoryAllocator/DynAlloc.h
index dba1864..d53b8bb 100644 (file)
--- a/LUFA/MemoryAllocator/DynAlloc.h
+++ b/LUFA/MemoryAllocator/DynAlloc.h
@@ -51,6 +51,13 @@
  *  memory) to be freed. BLOCK_SIZE gives the number of bytes in each memory block.\r
  */\r
 \r
  *  memory) to be freed. BLOCK_SIZE gives the number of bytes in each memory block.\r
  */\r
 \r

+/** @defgroup Group_MemoryAllocator Dynamic Block Memory Allocator - LUFA/MemoryAllocator/DynAlloc.h\r
+ *\r
+ *  Dynamic auto-degragmenting memory block allocator functions. See DynAlloc.h description for more details.\r
+ *\r
+ *  @{\r
+ */\r
+\r

 #ifndef __DYN_ALLOC__\r
 #define __DYN_ALLOC__\r
 \r
 #ifndef __DYN_ALLOC__\r
 #define __DYN_ALLOC__\r
 \r


@@ -180,3 +187,5 @@
        #endif\r
        \r
 #endif\r
        #endif\r
        \r
 #endif\r

+\r
+/** @} */\r

diff --git a/LUFA/MigrationInformation.txt b/LUFA/MigrationInformation.txt
index 49fa25d..e8e3065 100644 (file)
--- a/LUFA/MigrationInformation.txt
+++ b/LUFA/MigrationInformation.txt
@@ -12,12 +12,48 @@
  *\r
  * \section Sec_MigrationXXXXXX Migrating from 090401 to XXXXXX\r
  *\r
  *\r
  * \section Sec_MigrationXXXXXX Migrating from 090401 to XXXXXX\r
  *\r

+ *  <b>All</b>\r
+ *    - The ButtLoadTag.h header has been removed, as it was never used for its intended purpose. Projects should either remove all\r
+ *      BUTTLOADTAG elements, or download and extract ButtLoadTag.h header from the ButtLoad project.\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
+ *\r
+ *  <b>Device Mode</b>\r
+ *    - The Endpoint_ClearCurrentBank() macro has been removed, and is now replaced with the Endpoint_ClearIN(), Endpoint_ClearOUT(),\r
+ *      Endpoint_ClearControlIN(), Endpoint_ClearControlOUT() and other related macros. See Endpoint.h documentation for more details\r
+ *      on the new endpoint management macros.\r
+ *    - The Endpoint_ReadWriteAllowed() macro has been renamed to Endpoint_IsReadWriteAllowed() to be more consistent with the rest of\r
+ *      the API naming scheme.\r
+ *    - The Endpoint_IsSetupINReady() and Endpoint_IsOutReceived() macros have been renamed to Endpoint_IsINReady() and\r
+ *      Endpoint_IsOUTReceived() respectively.\r
+ *    - The Endpoint_IsSetupReceived() macro has been renamed to Endpoint_IsSETUPReceived().\r
+ *    - The Endpoint_ClearSetupReceived() macro has been renamed to Endpoint_ClearControlSETUP().\r
+ *    - All endpoint read/write/discard aliases which did not have an explicity endianness specifier (such as Endpoint_Read_Word()) have\r
+ *      been removed for clarity. Existing projects should use the "_LE" suffix on such calls to use the explicit Little Endian versions.\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
  *      other control type pipes. Care should be taken to ensure that the Control pipe is always selected before the function is called\r
  *      in existing projects where the Control pipe is to be operated on.\r
  *    - The USB Host management task now saves and restores the currently selected pipe before and after the task runs. Projects no longer\r
  *      need to manage this manually when calling the USB management task.\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
  *      other control type pipes. Care should be taken to ensure that the Control pipe is always selected before the function is called\r
  *      in existing projects where the Control pipe is to be operated on.\r
  *    - The USB Host management task now saves and restores the currently selected pipe before and after the task runs. Projects no longer\r
  *      need to manage this manually when calling the USB management task.\r

+ *    - The Pipe_ClearCurrentBank() macro has been removed, and is now replaced with the Pipe_ClearIN(), Pipe_ClearOUT(),\r
+ *      Pipe_ClearControlIN(), Pipe_ClearControlOUT() and other related macros. See Pipe.h documentation for more details on the new pipe\r
+ *      management macros.\r
+ *    - The Pipe_ReadWriteAllowed() macro has been renamed to Pipe_IsReadWriteAllowed() to be more consistent with the rest of the API\r
+ *      naming scheme.\r
+ *    - The Pipe_IsSetupINReceived() and Pipe_IsOutReady() macros have been renamed to Pipe_IsINReceived() and Pipe_IsOUTReady()\r
+ *      respectively.\r
+ *    - The new Pipe_ClearControlSETUP() macro should be used to send CONTROL transactions, rather than the previous Pipe_ClearSetupOUT() macro.\r
+ *    - The Pipe_IsSetupSent() macro has been renamed to Pipe_IsSETUPSent().\r
+ *    - The Pipe_ClearSetupSent() macro is no longer applicable and should be removed.\r
+ *    - All pipe read/write/discard aliases which did not have an explicity endianness specifier (such as Pipe_Read_Word()) have\r
+ *      been removed for clarity. Existing projects should use the "_LE" suffix on such calls to use the explicit Little Endian versions.\r
+ *    - The Host_IsResetBusDone() macro has been renamed to Host_IsBusResetComplete().\r
+ *    - The Pipe_Ignore_Word() function has been renamed to Pipe_Discard_Word() to remain consistent with the rest of the pipe API.\r
+ *\r

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

diff --git a/LUFA/Scheduler/Scheduler.h b/LUFA/Scheduler/Scheduler.h
index 414b0b2..979156e 100644 (file)
--- a/LUFA/Scheduler/Scheduler.h
+++ b/LUFA/Scheduler/Scheduler.h
@@ -65,6 +65,13 @@
  *  \endcode\r
  */\r
  \r
  *  \endcode\r
  */\r
  \r

+/** @defgroup Group_Scheduler Simple Task Scheduler - LUFA/Scheduler/Scheduler.h\r
+ *\r
+ *  Simple round-robbin task scheduler. See Scheduler.h description for more details.\r
+ *\r
+ *  @{\r
+ */\r
+ \r

 #ifndef __SCHEDULER_H__\r
 #define __SCHEDULER_H__\r
 \r
 #ifndef __SCHEDULER_H__\r
 #define __SCHEDULER_H__\r
 \r


@@ -261,3 +268,5 @@
                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r

+\r
+/** @} */\r

diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c
index 9368117..9132a80 100644 (file)
--- a/Projects/Magstripe/Magstripe.c
+++ b/Projects/Magstripe/Magstripe.c
@@ -37,12 +37,6 @@
  \r
 #include "Magstripe.h"\r
 \r
  \r
 #include "Magstripe.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "Magstripe Reader");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -184,30 +178,30 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                if (wLength > sizeof(KeyboardReportData))\r
                                  wLength = sizeof(KeyboardReportData);\r
 \r
                                if (wLength > sizeof(KeyboardReportData))\r
                                  wLength = sizeof(KeyboardReportData);\r
 \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&KeyboardReportData, wLength);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
        \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&KeyboardReportData, wLength);\r
                                \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                \r
                        break;\r
                case REQ_GetProtocol:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                        }\r
                \r
                        break;\r
                case REQ_GetProtocol:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Write the current protocol flag to the host */\r
                                Endpoint_Write_Byte(UsingReportProtocol);\r
                                \r
                                /* Send the flag to the host */\r
                                \r
                                /* Write the current protocol flag to the host */\r
                                Endpoint_Write_Byte(UsingReportProtocol);\r
                                \r
                                /* Send the flag to the host */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
-                               Endpoint_ClearSetupOUT();\r
+                               while (!(Endpoint_IsOUTReceived()));\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -217,14 +211,14 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                /* Read in the wValue parameter containing the new protocol mode */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r
                                /* Read in the wValue parameter containing the new protocol mode */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

 \r
                                /* Set or clear the flag depending on what the host indicates that the current Protocol should be */\r
                                UsingReportProtocol = (wValue != 0x0000);\r
                                \r
                                /* Acknowledge status stage */\r
 \r
                                /* Set or clear the flag depending on what the host indicates that the current Protocol should be */\r
                                UsingReportProtocol = (wValue != 0x0000);\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -234,31 +228,31 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                /* Read in the wValue parameter containing the idle period */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r
                                /* Read in the wValue parameter containing the idle period */\r
                                uint16_t wValue = Endpoint_Read_Word_LE();\r
                                \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Get idle period in MSB */\r
                                IdleCount = (wValue >> 8);\r
                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Get idle period in MSB */\r
                                IdleCount = (wValue >> 8);\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
                        \r
                        break;\r
                case REQ_GetIdle:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {               \r
                        }\r
                        \r
                        break;\r
                case REQ_GetIdle:\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {               \r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Write the current idle duration to the host */\r
                                Endpoint_Write_Byte(IdleCount);\r
                                \r
                                /* Send the flag to the host */\r
                                \r
                                /* Write the current idle duration to the host */\r
                                Endpoint_Write_Byte(IdleCount);\r
                                \r
                                /* Send the flag to the host */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearControlIN();\r

 \r
                                /* Acknowledge status stage */\r
 \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
-                               Endpoint_ClearSetupOUT();\r
+                               while (!(Endpoint_IsOUTReceived()));\r
+                               Endpoint_ClearControlOUT();\r

                        }\r
 \r
                        break;\r
                        }\r
 \r
                        break;\r


@@ -410,7 +404,7 @@ TASK(USB_Keyboard_Report)
                Endpoint_SelectEndpoint(KEYBOARD_EPNUM);\r
 \r
                /* Check if Keyboard Endpoint Ready for Read/Write */\r
                Endpoint_SelectEndpoint(KEYBOARD_EPNUM);\r
 \r
                /* Check if Keyboard Endpoint Ready for Read/Write */\r

-               if (Endpoint_ReadWriteAllowed())\r
+               if (Endpoint_IsReadWriteAllowed())\r

                {\r
                        /* Only fetch the next key to send once the period between key presses has elapsed */\r
                        if (!(KeyDelayRemaining))\r
                {\r
                        /* Only fetch the next key to send once the period between key presses has elapsed */\r
                        if (!(KeyDelayRemaining))\r


@@ -436,7 +430,7 @@ TASK(USB_Keyboard_Report)
                                Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(USB_KeyboardReport_Data_t));\r
 \r
                                /* Finalize the stream transfer to send the last packet */\r
                                Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(USB_KeyboardReport_Data_t));\r
 \r
                                /* Finalize the stream transfer to send the last packet */\r

-                               Endpoint_ClearCurrentBank();\r
+                               Endpoint_ClearIN();\r

 \r
                                /* Reset the key delay period counter */\r
                                KeyDelayRemaining = 2;\r
 \r
                                /* Reset the key delay period counter */\r
                                KeyDelayRemaining = 2;\r

diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h
index fbf68e5..0393c36 100644 (file)
--- a/Projects/Magstripe/Magstripe.h
+++ b/Projects/Magstripe/Magstripe.h
@@ -50,7 +50,6 @@
                #include "CircularBitBuffer.h"\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r
                #include "CircularBitBuffer.h"\r
 \r
                #include <LUFA/Version.h>                    // Library Version Information\r

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

                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Scheduler/Scheduler.h>        // Simple scheduler for task management\r
 \r
                #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
                #include <LUFA/Scheduler/Scheduler.h>        // Simple scheduler for task management\r
 \r