Oops - Bootloader optimizations to GetDescriptor() don't work, as the Configuration...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Device / CDC.c

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c
index 3915460..9204f1b 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -29,67 +29,63 @@
 */
 
 #define  __INCLUDE_FROM_USB_DRIVER
 */
 
 #define  __INCLUDE_FROM_USB_DRIVER

-#include "../../HighLevel/USBMode.h"
+#include "../../Core/USBMode.h"
+

 #if defined(USB_CAN_BE_DEVICE)
 
 #if defined(USB_CAN_BE_DEVICE)
 

-#define  __INCLUDE_FROM_CDC_CLASS_DEVICE_C

 #define  __INCLUDE_FROM_CDC_DRIVER
 #define  __INCLUDE_FROM_CDC_DRIVER

+#define  __INCLUDE_FROM_CDC_DEVICE_C

 #include "CDC.h"
 
 #include "CDC.h"
 

-void CDC_Device_Event_Stub(void)
-{
-
-}
-

 void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
 {
        if (!(Endpoint_IsSETUPReceived()))
          return;
 void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
 {
        if (!(Endpoint_IsSETUPReceived()))
          return;

-         
+

        if (USB_ControlRequest.wIndex != CDCInterfaceInfo->Config.ControlInterfaceNumber)
          return;
 
        switch (USB_ControlRequest.bRequest)
        {
        if (USB_ControlRequest.wIndex != CDCInterfaceInfo->Config.ControlInterfaceNumber)
          return;
 
        switch (USB_ControlRequest.bRequest)
        {

-               case REQ_GetLineEncoding:
+               case CDC_REQ_GetLineEncoding:

                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
                        {
                                Endpoint_ClearSETUP();
                                Endpoint_Write_Control_Stream_LE(&CDCInterfaceInfo->State.LineEncoding, sizeof(CDCInterfaceInfo->State.LineEncoding));
                                Endpoint_ClearOUT();
                        }
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
                        {
                                Endpoint_ClearSETUP();
                                Endpoint_Write_Control_Stream_LE(&CDCInterfaceInfo->State.LineEncoding, sizeof(CDCInterfaceInfo->State.LineEncoding));
                                Endpoint_ClearOUT();
                        }

-                       
+

                        break;
                        break;

-               case REQ_SetLineEncoding:
+               case CDC_REQ_SetLineEncoding:

                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
                        {
                                Endpoint_ClearSETUP();
                                Endpoint_Read_Control_Stream_LE(&CDCInterfaceInfo->State.LineEncoding, sizeof(CDCInterfaceInfo->State.LineEncoding));
                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
                        {
                                Endpoint_ClearSETUP();
                                Endpoint_Read_Control_Stream_LE(&CDCInterfaceInfo->State.LineEncoding, sizeof(CDCInterfaceInfo->State.LineEncoding));

-                               EVENT_CDC_Device_LineEncodingChanged(CDCInterfaceInfo);

                                Endpoint_ClearIN();
                                Endpoint_ClearIN();

+
+                               EVENT_CDC_Device_LineEncodingChanged(CDCInterfaceInfo);

                        }
                        }

-       
+

                        break;
                        break;

-               case REQ_SetControlLineState:
+               case CDC_REQ_SetControlLineState:

                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

-                       {                               
+                       {

                                Endpoint_ClearSETUP();
                                Endpoint_ClearSETUP();

-                               
+                               Endpoint_ClearStatusStage();
+

                                CDCInterfaceInfo->State.ControlLineStates.HostToDevice = USB_ControlRequest.wValue;
                                CDCInterfaceInfo->State.ControlLineStates.HostToDevice = USB_ControlRequest.wValue;

-                               EVENT_CDC_Device_ControLineStateChanged(CDCInterfaceInfo);

 
 

-                               Endpoint_ClearStatusStage();
+                               EVENT_CDC_Device_ControLineStateChanged(CDCInterfaceInfo);

                        }
                        }

-       
+

                        break;
                        break;

-               case REQ_SendBreak:
+               case CDC_REQ_SendBreak:

                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

-                       {                               
+                       {

                                Endpoint_ClearSETUP();
                                Endpoint_ClearSETUP();

-                               
-                               EVENT_CDC_Device_BreakSent(CDCInterfaceInfo, (uint8_t)USB_ControlRequest.wValue);
-

                                Endpoint_ClearStatusStage();
                                Endpoint_ClearStatusStage();

+
+                               EVENT_CDC_Device_BreakSent(CDCInterfaceInfo, (uint8_t)USB_ControlRequest.wValue);

                        }
 
                        break;
                        }
 
                        break;


@@ -100,25 +96,44 @@ bool CDC_Device_ConfigureEndpoints(USB_ClassInfo_CDC_Device_t* const CDCInterfac
 {
        memset(&CDCInterfaceInfo->State, 0x00, sizeof(CDCInterfaceInfo->State));
 
 {
        memset(&CDCInterfaceInfo->State, 0x00, sizeof(CDCInterfaceInfo->State));
 

-       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_BULK,
-                                                                ENDPOINT_DIR_IN, CDCInterfaceInfo->Config.DataINEndpointSize,
-                                                                CDCInterfaceInfo->Config.DataINEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))
+       for (uint8_t EndpointNum = 1; EndpointNum < ENDPOINT_TOTAL_ENDPOINTS; EndpointNum++)

        {
        {

-               return false;
-       }
+               uint16_t Size;
+               uint8_t  Type;
+               uint8_t  Direction;
+               bool     DoubleBanked;

 
 

-       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber, EP_TYPE_BULK,
-                                        ENDPOINT_DIR_OUT, CDCInterfaceInfo->Config.DataOUTEndpointSize,
-                                        CDCInterfaceInfo->Config.DataOUTEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))
-       {
-               return false;
-       }
+               if (EndpointNum == CDCInterfaceInfo->Config.DataINEndpointNumber)
+               {
+                       Size         = CDCInterfaceInfo->Config.DataINEndpointSize;
+                       Direction    = ENDPOINT_DIR_IN;
+                       Type         = EP_TYPE_BULK;
+                       DoubleBanked = CDCInterfaceInfo->Config.DataINEndpointDoubleBank;
+               }
+               else if (EndpointNum == CDCInterfaceInfo->Config.DataOUTEndpointNumber)
+               {
+                       Size         = CDCInterfaceInfo->Config.DataOUTEndpointSize;
+                       Direction    = ENDPOINT_DIR_OUT;
+                       Type         = EP_TYPE_BULK;
+                       DoubleBanked = CDCInterfaceInfo->Config.DataOUTEndpointDoubleBank;
+               }
+               else if (EndpointNum == CDCInterfaceInfo->Config.NotificationEndpointNumber)
+               {
+                       Size         = CDCInterfaceInfo->Config.NotificationEndpointSize;
+                       Direction    = ENDPOINT_DIR_IN;
+                       Type         = EP_TYPE_INTERRUPT;
+                       DoubleBanked = CDCInterfaceInfo->Config.NotificationEndpointDoubleBank;
+               }
+               else
+               {
+                       continue;
+               }

 
 

-       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->Config.NotificationEndpointNumber, EP_TYPE_INTERRUPT,
-                                        ENDPOINT_DIR_IN, CDCInterfaceInfo->Config.NotificationEndpointSize,
-                                        CDCInterfaceInfo->Config.NotificationEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))
-       {
-               return false;
+               if (!(Endpoint_ConfigureEndpoint(EndpointNum, Type, Direction, Size,
+                                                DoubleBanked ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))
+               {
+                       return false;
+               }

        }
 
        return true;
        }
 
        return true;


@@ -128,19 +143,31 @@ void CDC_Device_USBTask(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
 {
        if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
          return;
 {
        if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
          return;

-         
+
+       #if !defined(NO_CLASS_DRIVER_AUTOFLUSH)

        CDC_Device_Flush(CDCInterfaceInfo);
        CDC_Device_Flush(CDCInterfaceInfo);

+       #endif

 }
 
 uint8_t CDC_Device_SendString(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
 }
 
 uint8_t CDC_Device_SendString(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,

-                              const char* const Data,
-                              const uint16_t Length)
+                              const char* const String)

 {
        if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
          return ENDPOINT_RWSTREAM_DeviceDisconnected;
 {
        if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
          return ENDPOINT_RWSTREAM_DeviceDisconnected;

-       
+

        Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);
        Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);

-       return Endpoint_Write_Stream_LE(Data, Length, NO_STREAM_CALLBACK);
+       return Endpoint_Write_Stream_LE(String, strlen(String), NULL);
+}
+
+uint8_t CDC_Device_SendData(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
+                            const char* const Buffer,
+                            const uint16_t Length)
+{
+       if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
+         return ENDPOINT_RWSTREAM_DeviceDisconnected;
+
+       Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);
+       return Endpoint_Write_Stream_LE(Buffer, Length, NULL);

 }
 
 uint8_t CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
 }
 
 uint8_t CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,


@@ -176,11 +203,11 @@ uint8_t CDC_Device_Flush(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
 
        if (!(Endpoint_BytesInEndpoint()))
          return ENDPOINT_READYWAIT_NoError;
 
        if (!(Endpoint_BytesInEndpoint()))
          return ENDPOINT_READYWAIT_NoError;

-       
+

        bool BankFull = !(Endpoint_IsReadWriteAllowed());
        bool BankFull = !(Endpoint_IsReadWriteAllowed());

-       
+

        Endpoint_ClearIN();
        Endpoint_ClearIN();

-       
+

        if (BankFull)
        {
                if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)
        if (BankFull)
        {
                if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)


@@ -188,7 +215,7 @@ uint8_t CDC_Device_Flush(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
 
                Endpoint_ClearIN();
        }
 
                Endpoint_ClearIN();
        }

-       
+

        return ENDPOINT_READYWAIT_NoError;
 }
 
        return ENDPOINT_READYWAIT_NoError;
 }
 


@@ -225,16 +252,16 @@ int16_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInf
        int16_t ReceivedByte = -1;
 
        Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber);
        int16_t ReceivedByte = -1;
 
        Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber);

-       
+

        if (Endpoint_IsOUTReceived())
        {
                if (Endpoint_BytesInEndpoint())
                  ReceivedByte = Endpoint_Read_Byte();
        if (Endpoint_IsOUTReceived())
        {
                if (Endpoint_BytesInEndpoint())
                  ReceivedByte = Endpoint_Read_Byte();

-       
+

                if (!(Endpoint_BytesInEndpoint()))
                  Endpoint_ClearOUT();
        }
                if (!(Endpoint_BytesInEndpoint()))
                  Endpoint_ClearOUT();
        }

-       
+

        return ReceivedByte;
 }
 
        return ReceivedByte;
 }
 


@@ -244,23 +271,24 @@ void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDC
          return;
 
        Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.NotificationEndpointNumber);
          return;
 
        Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.NotificationEndpointNumber);

-       
+

        USB_Request_Header_t Notification = (USB_Request_Header_t)
                {
                        .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
        USB_Request_Header_t Notification = (USB_Request_Header_t)
                {
                        .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),

-                       .bRequest      = NOTIF_SerialState,
+                       .bRequest      = CDC_NOTIF_SerialState,

                        .wValue        = 0,
                        .wIndex        = 0,
                        .wLength       = sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),
                };
 
                        .wValue        = 0,
                        .wIndex        = 0,
                        .wLength       = sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),
                };
 

-       Endpoint_Write_Stream_LE(&Notification, sizeof(USB_Request_Header_t), NO_STREAM_CALLBACK);
+       Endpoint_Write_Stream_LE(&Notification, sizeof(USB_Request_Header_t), NULL);

        Endpoint_Write_Stream_LE(&CDCInterfaceInfo->State.ControlLineStates.DeviceToHost,
                                 sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),
        Endpoint_Write_Stream_LE(&CDCInterfaceInfo->State.ControlLineStates.DeviceToHost,
                                 sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),

-                                NO_STREAM_CALLBACK);
+                                NULL);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }
 

+#if defined(FDEV_SETUP_STREAM)

 void CDC_Device_CreateStream(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
                              FILE* const Stream)
 {
 void CDC_Device_CreateStream(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
                              FILE* const Stream)
 {


@@ -294,17 +322,24 @@ static int CDC_Device_getchar(FILE* Stream)
 static int CDC_Device_getchar_Blocking(FILE* Stream)
 {
        int16_t ReceivedByte;
 static int CDC_Device_getchar_Blocking(FILE* Stream)
 {
        int16_t ReceivedByte;

-       
+

        while ((ReceivedByte = CDC_Device_ReceiveByte((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream))) < 0)
        {
                if (USB_DeviceState == DEVICE_STATE_Unattached)
                  return _FDEV_EOF;
        while ((ReceivedByte = CDC_Device_ReceiveByte((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream))) < 0)
        {
                if (USB_DeviceState == DEVICE_STATE_Unattached)
                  return _FDEV_EOF;

-       
+

                CDC_Device_USBTask((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream));
                CDC_Device_USBTask((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream));

-               USB_USBTask();  
+               USB_USBTask();

        }
 
        return ReceivedByte;
 }
        }
 
        return ReceivedByte;
 }

+#endif
+
+void CDC_Device_Event_Stub(void)
+{
+
+}

 
 #endif
 
 #endif

+