Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / StillImage.c

diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c
index c176310..0d663be 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/StillImage.c
+++ b/LUFA/Drivers/USB/Class/Host/StillImage.c
@@ -34,8 +34,8 @@
 #define INCLUDE_FROM_SI_CLASS_HOST_C\r
 #include "StillImage.h"\r
 \r
 #define INCLUDE_FROM_SI_CLASS_HOST_C\r
 #include "StillImage.h"\r
 \r

-uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize,\r
-                              uint8_t* DeviceConfigDescriptor)\r
+uint8_t SImage_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize,\r
+                                   void* DeviceConfigDescriptor)\r

 {\r
        uint8_t  FoundEndpoints = 0;\r
        \r
 {\r
        uint8_t  FoundEndpoints = 0;\r
        \r


@@ -66,7 +66,7 @@ uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, u
                        {\r
                                Pipe_ConfigurePipe(SIInterfaceInfo->Config.EventsPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,\r
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
                        {\r
                                Pipe_ConfigurePipe(SIInterfaceInfo->Config.EventsPipeNumber, EP_TYPE_INTERRUPT, PIPE_TOKEN_IN,\r
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r

-                                                                  PIPE_BANK_DOUBLE);                   \r
+                                                                  SIInterfaceInfo->Config.EventsPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);                 \r

                                SIInterfaceInfo->State.EventsPipeSize = EndpointData->EndpointSize;\r
 \r
                                Pipe_SetInterruptPeriod(EndpointData->PollingIntervalMS);\r
                                SIInterfaceInfo->State.EventsPipeSize = EndpointData->EndpointSize;\r
 \r
                                Pipe_SetInterruptPeriod(EndpointData->PollingIntervalMS);\r


@@ -80,7 +80,7 @@ uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, u
                        {\r
                                Pipe_ConfigurePipe(SIInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_IN,\r
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
                        {\r
                                Pipe_ConfigurePipe(SIInterfaceInfo->Config.DataINPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_IN,\r
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r

-                                                                  PIPE_BANK_DOUBLE);\r
+                                                                  SIInterfaceInfo->Config.DataINPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r

                                SIInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
 \r
                                FoundEndpoints |= SI_FOUND_DATAPIPE_IN;\r
                                SIInterfaceInfo->State.DataINPipeSize = EndpointData->EndpointSize;\r
 \r
                                FoundEndpoints |= SI_FOUND_DATAPIPE_IN;\r


@@ -89,7 +89,7 @@ uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, u
                        {\r
                                Pipe_ConfigurePipe(SIInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r
                        {\r
                                Pipe_ConfigurePipe(SIInterfaceInfo->Config.DataOUTPipeNumber, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize,\r

-                                                                  PIPE_BANK_DOUBLE);\r
+                                                                  SIInterfaceInfo->Config.DataOUTPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);\r

                                SIInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
 \r
                                FoundEndpoints |= SI_FOUND_DATAPIPE_OUT;\r
                                SIInterfaceInfo->State.DataOUTPipeSize = EndpointData->EndpointSize;\r
 \r
                                FoundEndpoints |= SI_FOUND_DATAPIPE_OUT;\r


@@ -101,7 +101,7 @@ uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, u
        return SI_ENUMERROR_NoError;\r
 }\r
 \r
        return SI_ENUMERROR_NoError;\r
 }\r
 \r

-uint8_t DComp_SI_Host_NextSIInterface(void* CurrentDescriptor)\r
+uint8_t DComp_SI_Host_NextSIInterface(void* const CurrentDescriptor)\r

 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r


@@ -119,7 +119,7 @@ uint8_t DComp_SI_Host_NextSIInterface(void* CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r

-uint8_t DComp_SI_Host_NextSIInterfaceEndpoint(void* CurrentDescriptor)\r
+uint8_t DComp_SI_Host_NextSIInterfaceEndpoint(void* const CurrentDescriptor)\r

 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
        {\r
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)\r
        {\r


@@ -142,15 +142,18 @@ uint8_t DComp_SI_Host_NextSIInterfaceEndpoint(void* CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r
        return DESCRIPTOR_SEARCH_NotFound;\r
 }\r
 \r

-void SI_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)\r
+void SImage_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)\r

 {\r
 {\r

-\r
+       (void)SIInterfaceInfo;\r

 }\r
 \r
 }\r
 \r

-static uint8_t SImage_Host_SendBlockHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, SI_PIMA_Container_t* const PIMAHeader)\r
+uint8_t SImage_Host_SendBlockHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, SI_PIMA_Container_t* const PIMAHeader)\r

 {\r
        uint8_t ErrorCode;\r
        \r
 {\r
        uint8_t ErrorCode;\r
        \r

+       if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r
+         return PIPE_RWSTREAM_DeviceDisconnected;\r
+\r

        PIMAHeader->TransactionID = SIInterfaceInfo->State.TransactionID++;\r
 \r
        Pipe_SelectPipe(SIInterfaceInfo->Config.DataOUTPipeNumber);\r
        PIMAHeader->TransactionID = SIInterfaceInfo->State.TransactionID++;\r
 \r
        Pipe_SelectPipe(SIInterfaceInfo->Config.DataOUTPipeNumber);\r


@@ -173,10 +176,13 @@ static uint8_t SImage_Host_SendBlockHeader(USB_ClassInfo_SI_Host_t* const SIInte
        return PIPE_RWSTREAM_NoError;\r
 }\r
 \r
        return PIPE_RWSTREAM_NoError;\r
 }\r
 \r

-static uint8_t SImage_Host_ReceiveBlockHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, SI_PIMA_Container_t* const PIMAHeader)\r
+uint8_t SImage_Host_ReceiveBlockHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, SI_PIMA_Container_t* const PIMAHeader)\r

 {\r
        uint16_t TimeoutMSRem = COMMAND_DATA_TIMEOUT_MS;\r
 \r
 {\r
        uint16_t TimeoutMSRem = COMMAND_DATA_TIMEOUT_MS;\r
 \r

+       if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r
+         return PIPE_RWSTREAM_DeviceDisconnected;\r
+\r

        Pipe_SelectPipe(SIInterfaceInfo->Config.DataINPipeNumber);\r
        Pipe_Unfreeze();\r
        \r
        Pipe_SelectPipe(SIInterfaceInfo->Config.DataINPipeNumber);\r
        Pipe_Unfreeze();\r
        \r


@@ -227,8 +233,6 @@ static uint8_t SImage_Host_ReceiveBlockHeader(USB_ClassInfo_SI_Host_t* const SII
                  Pipe_Read_Stream_LE(&PIMAHeader->Params, ParamBytes, NO_STREAM_CALLBACK);\r
                \r
                Pipe_ClearIN();\r
                  Pipe_Read_Stream_LE(&PIMAHeader->Params, ParamBytes, NO_STREAM_CALLBACK);\r
                \r
                Pipe_ClearIN();\r

-               \r
-               PIMAHeader->Code &= 0x0000000F;\r

        }\r
        \r
        Pipe_Freeze();\r
        }\r
        \r
        Pipe_Freeze();\r


@@ -240,6 +244,9 @@ uint8_t SImage_Host_SendData(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, voi
 {\r
        uint8_t ErrorCode;\r
 \r
 {\r
        uint8_t ErrorCode;\r
 \r

+       if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r
+         return PIPE_RWSTREAM_DeviceDisconnected;\r
+\r

        Pipe_SelectPipe(SIInterfaceInfo->Config.DataOUTPipeNumber);\r
        Pipe_Unfreeze();\r
        \r
        Pipe_SelectPipe(SIInterfaceInfo->Config.DataOUTPipeNumber);\r
        Pipe_Unfreeze();\r
        \r


@@ -255,6 +262,9 @@ uint8_t SImage_Host_ReadData(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, voi
 {\r
        uint8_t ErrorCode;\r
 \r
 {\r
        uint8_t ErrorCode;\r
 \r

+       if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r
+         return PIPE_RWSTREAM_DeviceDisconnected;\r
+\r

        Pipe_SelectPipe(SIInterfaceInfo->Config.DataINPipeNumber);\r
        Pipe_Unfreeze();\r
 \r
        Pipe_SelectPipe(SIInterfaceInfo->Config.DataINPipeNumber);\r
        Pipe_Unfreeze();\r
 \r


@@ -269,6 +279,9 @@ bool SImage_Host_IsEventReceived(USB_ClassInfo_SI_Host_t* SIInterfaceInfo)
 {\r
        bool IsEventReceived = false;\r
 \r
 {\r
        bool IsEventReceived = false;\r
 \r

+       if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r
+         return false;\r
+\r

        Pipe_SelectPipe(SIInterfaceInfo->Config.EventsPipeNumber);\r
        Pipe_Unfreeze();\r
        \r
        Pipe_SelectPipe(SIInterfaceInfo->Config.EventsPipeNumber);\r
        Pipe_Unfreeze();\r
        \r


@@ -284,6 +297,9 @@ uint8_t SImage_Host_ReceiveEventHeader(USB_ClassInfo_SI_Host_t* const SIInterfac
 {\r
        uint8_t ErrorCode;\r
 \r
 {\r
        uint8_t ErrorCode;\r
 \r

+       if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r
+         return PIPE_RWSTREAM_DeviceDisconnected;\r
+\r

        Pipe_SelectPipe(SIInterfaceInfo->Config.EventsPipeNumber);\r
        Pipe_Unfreeze();\r
        \r
        Pipe_SelectPipe(SIInterfaceInfo->Config.EventsPipeNumber);\r
        Pipe_Unfreeze();\r
        \r


@@ -298,7 +314,7 @@ uint8_t SImage_Host_ReceiveEventHeader(USB_ClassInfo_SI_Host_t* const SIInterfac
 uint8_t SImage_Host_OpenSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r
 uint8_t SImage_Host_OpenSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r

-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r

 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r


@@ -328,7 +344,7 @@ uint8_t SImage_Host_OpenSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)
 uint8_t SImage_Host_CloseSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r
 uint8_t SImage_Host_CloseSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r

-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r

 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r


@@ -358,7 +374,7 @@ uint8_t SImage_Host_SendCommand(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
                                 const uint8_t TotalParams, uint32_t* Params)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r
                                 const uint8_t TotalParams, uint32_t* Params)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r

-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r

 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r


@@ -382,6 +398,9 @@ uint8_t SImage_Host_ReceiveResponse(USB_ClassInfo_SI_Host_t* const SIInterfaceIn
        uint8_t ErrorCode;\r
        SI_PIMA_Container_t PIMABlock;\r
 \r
        uint8_t ErrorCode;\r
        SI_PIMA_Container_t PIMABlock;\r
 \r

+       if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r
+\r

        if ((ErrorCode = SImage_Host_ReceiveBlockHeader(SIInterfaceInfo, &PIMABlock)) != PIPE_RWSTREAM_NoError)\r
          return ErrorCode;\r
 \r
        if ((ErrorCode = SImage_Host_ReceiveBlockHeader(SIInterfaceInfo, &PIMABlock)) != PIPE_RWSTREAM_NoError)\r
          return ErrorCode;\r
 \r