Fixed StillImageHost not correctly freezing and unfreezing data pipes while waiting...

[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 ed38eae..10759f6 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/StillImage.c
+++ b/LUFA/Drivers/USB/Class/Host/StillImage.c
@@ -106,9 +106,12 @@ uint8_t DComp_SI_Host_NextSIInterface(void* CurrentDescriptor)
 {\r
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)\r
        {\r
-               if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class    == STILL_IMAGE_CLASS)    &&\r
-                   (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).SubClass == STILL_IMAGE_SUBCLASS) &&\r
-                   (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == STILL_IMAGE_PROTOCOL))\r
+               USB_Descriptor_Interface_t* CurrentInterface = DESCRIPTOR_PCAST(CurrentDescriptor,\r
+                                                                               USB_Descriptor_Interface_t);\r
+\r
+               if ((CurrentInterface->Class    == STILL_IMAGE_CLASS)    &&\r
+                   (CurrentInterface->SubClass == STILL_IMAGE_SUBCLASS) &&\r
+                   (CurrentInterface->Protocol == STILL_IMAGE_PROTOCOL))\r
                {\r
                        return DESCRIPTOR_SEARCH_Found;\r
                }\r
@@ -145,4 +148,144 @@ void SI_Host_USBTask(USB_ClassInfo_SI_Host_t* SIInterfaceInfo)
 \r
 }\r
 \r
+void SImage_Host_SendBlockHeader(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, SI_PIMA_Container_t* PIMAHeader)\r
+{\r
+       Pipe_SelectPipe(SIInterfaceInfo->Config.DataOUTPipeNumber);\r
+       Pipe_Unfreeze();\r
+\r
+       Pipe_Write_Stream_LE(PIMAHeader, PIMA_COMMAND_SIZE(0), NO_STREAM_CALLBACK);\r
+       \r
+       if (PIMAHeader->Type == CType_CommandBlock)\r
+       {\r
+               uint8_t ParamBytes = (PIMAHeader->DataLength - PIMA_COMMAND_SIZE(0));\r
+\r
+               if (ParamBytes)\r
+                 Pipe_Write_Stream_LE(&PIMAHeader->Params, ParamBytes, NO_STREAM_CALLBACK);\r
+               \r
+               Pipe_ClearOUT();\r
+       }\r
+                                       \r
+       Pipe_Freeze();\r
+}\r
+\r
+uint8_t SImage_Host_RecieveBlockHeader(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, SI_PIMA_Container_t* PIMAHeader)\r
+{\r
+       uint16_t TimeoutMSRem = COMMAND_DATA_TIMEOUT_MS;\r
+\r
+       Pipe_SelectPipe(SIInterfaceInfo->Config.DataINPipeNumber);\r
+       Pipe_Unfreeze();\r
+       \r
+       while (!(Pipe_IsReadWriteAllowed()))\r
+       {\r
+               if (USB_INT_HasOccurred(USB_INT_HSOFI))\r
+               {\r
+                       USB_INT_Clear(USB_INT_HSOFI);\r
+                       TimeoutMSRem--;\r
+\r
+                       if (!(TimeoutMSRem))\r
+                       {\r
+                               return PIPE_RWSTREAM_Timeout;\r
+                       }\r
+               }\r
+               \r
+               Pipe_Freeze();\r
+               Pipe_SelectPipe(SIInterfaceInfo->Config.DataOUTPipeNumber);\r
+               Pipe_Unfreeze();\r
+\r
+               if (Pipe_IsStalled())\r
+               {\r
+                       USB_Host_ClearPipeStall(SIInterfaceInfo->Config.DataOUTPipeNumber);\r
+                       return PIPE_RWSTREAM_PipeStalled;\r
+               }\r
+\r
+               Pipe_Freeze();\r
+               Pipe_SelectPipe(SIInterfaceInfo->Config.DataINPipeNumber);\r
+               Pipe_Unfreeze();\r
+\r
+               if (Pipe_IsStalled())\r
+               {\r
+                       USB_Host_ClearPipeStall(SIInterfaceInfo->Config.DataINPipeNumber);\r
+                       return PIPE_RWSTREAM_PipeStalled;\r
+               }\r
+                 \r
+               if (USB_HostState == HOST_STATE_Unattached)\r
+                 return PIPE_RWSTREAM_DeviceDisconnected;\r
+       }\r
+       \r
+       Pipe_Read_Stream_LE(PIMAHeader, PIMA_COMMAND_SIZE(0), NO_STREAM_CALLBACK);\r
+       \r
+       if (PIMAHeader->Type == CType_ResponseBlock)\r
+       {\r
+               uint8_t ParamBytes = (PIMAHeader->DataLength - PIMA_COMMAND_SIZE(0));\r
+\r
+               if (ParamBytes)\r
+                 Pipe_Read_Stream_LE(&PIMAHeader->Params, ParamBytes, NO_STREAM_CALLBACK);\r
+               \r
+               Pipe_ClearIN();\r
+       }\r
+       \r
+       Pipe_Freeze();\r
+       \r
+       return PIPE_RWSTREAM_NoError;\r
+}\r
+\r
+uint8_t SImage_Host_SendData(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, void* Buffer, uint16_t Bytes)\r
+{\r
+       uint8_t ErrorCode;\r
+\r
+       Pipe_SelectPipe(SIInterfaceInfo->Config.DataOUTPipeNumber);\r
+       Pipe_Unfreeze();\r
+       \r
+       ErrorCode = Pipe_Write_Stream_LE(Buffer, Bytes, NO_STREAM_CALLBACK);\r
+\r
+       Pipe_ClearOUT();\r
+       Pipe_Freeze();\r
+       \r
+       return ErrorCode;\r
+}\r
+\r
+uint8_t SImage_Host_ReadData(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, void* Buffer, uint16_t Bytes)\r
+{\r
+       uint8_t ErrorCode;\r
+\r
+       Pipe_SelectPipe(SIInterfaceInfo->Config.DataINPipeNumber);\r
+       Pipe_Unfreeze();\r
+\r
+       ErrorCode = Pipe_Read_Stream_LE(Buffer, Bytes, NO_STREAM_CALLBACK);\r
+\r
+       Pipe_Freeze();\r
+       \r
+       return ErrorCode;\r
+}\r
+\r
+bool SImage_Host_IsEventReceived(USB_ClassInfo_SI_Host_t* SIInterfaceInfo)\r
+{\r
+       bool IsEventReceived = false;\r
+\r
+       Pipe_SelectPipe(SIInterfaceInfo->Config.EventsPipeNumber);\r
+       Pipe_Unfreeze();\r
+       \r
+       if (Pipe_BytesInPipe())\r
+         IsEventReceived = true;\r
+       \r
+       Pipe_Freeze();\r
+       \r
+       return IsEventReceived;\r
+}\r
+\r
+uint8_t SImage_Host_RecieveEventHeader(USB_ClassInfo_SI_Host_t* SIInterfaceInfo, SI_PIMA_Container_t* PIMAHeader)\r
+{\r
+       uint8_t ErrorCode;\r
+\r
+       Pipe_SelectPipe(SIInterfaceInfo->Config.EventsPipeNumber);\r
+       Pipe_Unfreeze();\r
+       \r
+       ErrorCode = Pipe_Read_Stream_LE(PIMAHeader, sizeof(SI_PIMA_Container_t), NO_STREAM_CALLBACK);\r
+       \r
+       Pipe_ClearIN();\r
+       Pipe_Freeze();\r
+       \r
+       return ErrorCode;\r
+}\r
+\r
 #endif\r