Added new SCSI_ASENSE_NOT_READY_TO_READY_CHANGE constant to the Mass Storage class...

[pub/USBasp.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 cf344be..b9e4c9e 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/CDC.c
+++ b/LUFA/Drivers/USB/Class/Host/CDC.c
@@ -205,7 +205,6 @@ void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
          return;
        
        Pipe_SelectPipe(CDCInterfaceInfo->Config.NotificationPipeNumber);
          return;
        
        Pipe_SelectPipe(CDCInterfaceInfo->Config.NotificationPipeNumber);

-       Pipe_SetPipeToken(PIPE_TOKEN_IN);

        Pipe_Unfreeze();
 
        if (Pipe_IsINReceived())
        Pipe_Unfreeze();
 
        if (Pipe_IsINReceived())


@@ -220,14 +219,19 @@ void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
                                            sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),
                                            NO_STREAM_CALLBACK);
                        
                                            sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),
                                            NO_STREAM_CALLBACK);
                        

-               }
-
-               Pipe_ClearIN();
+                       Pipe_ClearIN();

 
 

-               EVENT_CDC_Host_ControLineStateChanged(CDCInterfaceInfo);
+                       EVENT_CDC_Host_ControLineStateChanged(CDCInterfaceInfo);
+               }
+               else
+               {
+                       Pipe_ClearIN();
+               }

        }
        
        Pipe_Freeze();
        }
        
        Pipe_Freeze();

+
+       CDC_Host_Flush(CDCInterfaceInfo);

 }
 
 uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
 }
 
 uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)


@@ -280,7 +284,7 @@ uint8_t CDC_Host_SendBreak(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
 }
 
 uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
 }
 
 uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,

-                            char* const Data,
+                            const char* const Data,

                             const uint16_t Length)
 {
        if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
                             const uint16_t Length)
 {
        if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))


@@ -328,7 +332,6 @@ uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo
          return 0;
        
        Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);
          return 0;
        
        Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);

-       Pipe_SetPipeToken(PIPE_TOKEN_IN);

        Pipe_Unfreeze();
 
        if (Pipe_IsINReceived())
        Pipe_Unfreeze();
 
        if (Pipe_IsINReceived())


@@ -353,24 +356,27 @@ uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo
        }
 }
 
        }
 }
 

-uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
+int16_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)

 {
 {

-       uint8_t ReceivedByte = 0;
-

        if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
        if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))

-         return 0;
+         return -1;

          
          

+       int16_t ReceivedByte = -1;
+

        Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);
        Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipeNumber);

-       Pipe_SetPipeToken(PIPE_TOKEN_IN);

        Pipe_Unfreeze();
 
        Pipe_Unfreeze();
 

-       ReceivedByte = Pipe_Read_Byte();
-       
-       if (!(Pipe_BytesInPipe()))
-         Pipe_ClearIN();
+       if (Pipe_IsINReceived())
+       {
+               if (Pipe_BytesInPipe())
+                 ReceivedByte = Pipe_Read_Byte();
+
+               if (!(Pipe_BytesInPipe()))
+                 Pipe_ClearIN();
+       }

        
        Pipe_Freeze();
        
        Pipe_Freeze();

-       
+

        return ReceivedByte;
 }
 
        return ReceivedByte;
 }
 


@@ -426,15 +432,19 @@ static int CDC_Host_putchar(char c,
 
 static int CDC_Host_getchar(FILE* Stream)
 {
 
 static int CDC_Host_getchar(FILE* Stream)
 {

-       if (!(CDC_Host_BytesReceived((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream))))
+       int16_t ReceivedByte = CDC_Host_ReceiveByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));
+
+       if (ReceivedByte < 0)

          return _FDEV_EOF;
 
          return _FDEV_EOF;
 

-       return CDC_Host_ReceiveByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));
+       return ReceivedByte;

 }
 
 static int CDC_Host_getchar_Blocking(FILE* Stream)
 {
 }
 
 static int CDC_Host_getchar_Blocking(FILE* Stream)
 {

-       while (!(CDC_Host_BytesReceived((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream))))
+       int16_t ReceivedByte;
+       
+       while ((ReceivedByte = CDC_Host_ReceiveByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream))) < 0)

        {
                if (USB_HostState == HOST_STATE_Unattached)
                  return _FDEV_EOF;
        {
                if (USB_HostState == HOST_STATE_Unattached)
                  return _FDEV_EOF;


@@ -443,7 +453,7 @@ static int CDC_Host_getchar_Blocking(FILE* Stream)
                USB_USBTask();
        }
 
                USB_USBTask();
        }
 

-       return CDC_Host_ReceiveByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));
+       return ReceivedByte;

 }
 
 void CDC_Host_Event_Stub(void)
 }
 
 void CDC_Host_Event_Stub(void)