Add StillImage Host Class Driver functions for opening and closing sessions. Ensure...

[pub/lufa.git] / LUFA / Drivers / USB / Class / Host / CDC.c

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDC.c
index cb70808..68dddea 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/CDC.c
+++ b/LUFA/Drivers/USB/Class/Host/CDC.c
@@ -131,7 +131,7 @@ uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint
                }\r
        }\r
 \r
                }\r
        }\r
 \r

-       CDCInterfaceInfo->State.Active = true;\r
+       CDCInterfaceInfo->State.IsActive = true;\r

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


@@ -196,7 +196,7 @@ static uint8_t DComp_CDC_Host_NextCDCInterfaceEndpoint(void* CurrentDescriptor)
 \r
 void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
 {\r
 \r
 void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
 {\r

-       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.Active))\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))\r

          return;\r
        \r
        Pipe_SelectPipe(CDCInterfaceInfo->Config.NotificationPipeNumber);       \r
          return;\r
        \r
        Pipe_SelectPipe(CDCInterfaceInfo->Config.NotificationPipeNumber);       \r


@@ -258,7 +258,7 @@ uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* CDCInterfa
 \r
 uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, char* Data, uint16_t Length)\r
 {\r
 \r
 uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, char* Data, uint16_t Length)\r
 {\r

-       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.Active))\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))\r

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


@@ -273,10 +273,10 @@ uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, char* Da
 \r
 uint8_t CDC_Host_SendByte(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint8_t Data)\r
 {\r
 \r
 uint8_t CDC_Host_SendByte(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint8_t Data)\r
 {\r

-       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.Active))\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))\r

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

-       uint8_t ErrorCode = PIPE_READYWAIT_NoError;\r
+       uint8_t ErrorCode;\r

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


@@ -284,20 +284,22 @@ uint8_t CDC_Host_SendByte(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint8_t Da
        if (!(Pipe_IsReadWriteAllowed()))\r
        {\r
                Pipe_ClearOUT();\r
        if (!(Pipe_IsReadWriteAllowed()))\r
        {\r
                Pipe_ClearOUT();\r

-               ErrorCode = Pipe_WaitUntilReady();\r
+\r
+               if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)\r
+                 return ErrorCode;\r

        }\r
 \r
        Pipe_Write_Byte(Data);  \r
        Pipe_Freeze();\r
        \r
        }\r
 \r
        Pipe_Write_Byte(Data);  \r
        Pipe_Freeze();\r
        \r

-       return ErrorCode;\r
+       return PIPE_READYWAIT_NoError;\r

 }\r
 \r
 uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
 {\r
        uint16_t BytesInPipe = 0;\r
 \r
 }\r
 \r
 uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)\r
 {\r
        uint16_t BytesInPipe = 0;\r
 \r

-       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.Active))\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))\r

          return BytesInPipe;\r
        \r
        Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);     \r
          return BytesInPipe;\r
        \r
        Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);     \r


@@ -316,7 +318,7 @@ uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)
 {\r
        uint8_t ReceivedByte = 0;\r
 \r
 {\r
        uint8_t ReceivedByte = 0;\r
 \r

-       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.Active))\r
+       if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))\r

          return ReceivedByte;\r
          \r
        Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);     \r
          return ReceivedByte;\r
          \r
        Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);     \r