Fixed PDI/TPI programming speed of ~250KHz in the AVRISP-MKII Clone project, instead...

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

diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HID.c
index ce1ceb1..bb10ee2 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   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 2010  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


@@ -32,8 +32,8 @@
 #include "../../HighLevel/USBMode.h"
 #if defined(USB_CAN_BE_HOST)
 
 #include "../../HighLevel/USBMode.h"
 #if defined(USB_CAN_BE_HOST)
 

-#define  __INCLUDE_FROM_HID_CLASS_HOST_C

 #define  __INCLUDE_FROM_HID_DRIVER
 #define  __INCLUDE_FROM_HID_DRIVER

+#define  __INCLUDE_FROM_HID_HOST_C

 #include "HID.h"
 
 uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
 #include "HID.h"
 
 uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,


@@ -44,9 +44,9 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
        USB_Descriptor_Endpoint_t*  DataOUTEndpoint = NULL;
        USB_Descriptor_Interface_t* HIDInterface    = NULL;
        USB_HID_Descriptor_HID_t*   HIDDescriptor   = NULL;
        USB_Descriptor_Endpoint_t*  DataOUTEndpoint = NULL;
        USB_Descriptor_Interface_t* HIDInterface    = NULL;
        USB_HID_Descriptor_HID_t*   HIDDescriptor   = NULL;

-       
+

        memset(&HIDInterfaceInfo->State, 0x00, sizeof(HIDInterfaceInfo->State));
        memset(&HIDInterfaceInfo->State, 0x00, sizeof(HIDInterfaceInfo->State));

-       
+

        if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
          return HID_ENUMERROR_InvalidConfigDescriptor;
 
        if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
          return HID_ENUMERROR_InvalidConfigDescriptor;
 


@@ -58,7 +58,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
                {
                        if (DataINEndpoint || DataOUTEndpoint)
                          break;
                {
                        if (DataINEndpoint || DataOUTEndpoint)
                          break;

-       
+

                        do
                        {
                                if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
                        do
                        {
                                if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,


@@ -66,11 +66,11 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
                                {
                                        return HID_ENUMERROR_NoCompatibleInterfaceFound;
                                }
                                {
                                        return HID_ENUMERROR_NoCompatibleInterfaceFound;
                                }

-                               
+

                                HIDInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
                        } while (HIDInterfaceInfo->Config.HIDInterfaceProtocol &&
                                         (HIDInterface->Protocol != HIDInterfaceInfo->Config.HIDInterfaceProtocol));
                                HIDInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
                        } while (HIDInterfaceInfo->Config.HIDInterfaceProtocol &&
                                         (HIDInterface->Protocol != HIDInterfaceInfo->Config.HIDInterfaceProtocol));

-                       
+

                        if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
                                                      DCOMP_HID_Host_NextHID) != DESCRIPTOR_SEARCH_COMP_Found)
                        {
                        if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
                                                      DCOMP_HID_Host_NextHID) != DESCRIPTOR_SEARCH_COMP_Found)
                        {


@@ -84,15 +84,15 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
 
                        continue;
                }
 
                        continue;
                }

-               
+

                USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);
 
                if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)
                  DataINEndpoint = EndpointData;
                else
                USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);
 
                if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)
                  DataINEndpoint = EndpointData;
                else

-                 DataOUTEndpoint = EndpointData;  
+                 DataOUTEndpoint = EndpointData;

        }
        }

-       
+

        for (uint8_t PipeNum = 1; PipeNum < PIPE_TOTAL_PIPES; PipeNum++)
        {
                if (PipeNum == HIDInterfaceInfo->Config.DataINPipeNumber)
        for (uint8_t PipeNum = 1; PipeNum < PIPE_TOTAL_PIPES; PipeNum++)
        {
                if (PipeNum == HIDInterfaceInfo->Config.DataINPipeNumber)


@@ -101,7 +101,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
                                           DataINEndpoint->EndpointAddress, DataINEndpoint->EndpointSize,
                                           HIDInterfaceInfo->Config.DataINPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);
                        Pipe_SetInterruptPeriod(DataINEndpoint->PollingIntervalMS);
                                           DataINEndpoint->EndpointAddress, DataINEndpoint->EndpointSize,
                                           HIDInterfaceInfo->Config.DataINPipeDoubleBank ? PIPE_BANK_DOUBLE : PIPE_BANK_SINGLE);
                        Pipe_SetInterruptPeriod(DataINEndpoint->PollingIntervalMS);

-                       
+

                        HIDInterfaceInfo->State.DataINPipeSize = DataINEndpoint->EndpointSize;
                }
                else if (PipeNum == HIDInterfaceInfo->Config.DataOUTPipeNumber)
                        HIDInterfaceInfo->State.DataINPipeSize = DataINEndpoint->EndpointSize;
                }
                else if (PipeNum == HIDInterfaceInfo->Config.DataOUTPipeNumber)


@@ -115,35 +115,38 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
                        HIDInterfaceInfo->State.DeviceUsesOUTPipe = true;
                }
        }
                        HIDInterfaceInfo->State.DeviceUsesOUTPipe = true;
                }
        }

-       
-       HIDInterfaceInfo->State.InterfaceNumber = HIDInterface->InterfaceNumber;
-       HIDInterfaceInfo->State.HIDReportSize   = HIDDescriptor->HIDReportLength;
-       HIDInterfaceInfo->State.SupportsBootProtocol = (HIDInterface->SubClass != HID_BOOTP_NonBootProtocol);
+
+       HIDInterfaceInfo->State.InterfaceNumber      = HIDInterface->InterfaceNumber;
+       HIDInterfaceInfo->State.HIDReportSize        = HIDDescriptor->HIDReportLength;
+       HIDInterfaceInfo->State.SupportsBootProtocol = (HIDInterface->SubClass != HID_CSCP_NonBootProtocol);

        HIDInterfaceInfo->State.LargestReportSize    = 8;
        HIDInterfaceInfo->State.IsActive = true;
        HIDInterfaceInfo->State.LargestReportSize    = 8;
        HIDInterfaceInfo->State.IsActive = true;

-       
+

        return HID_ENUMERROR_NoError;
 }
 
 static uint8_t DCOMP_HID_Host_NextHIDInterface(void* const CurrentDescriptor)
 {
        return HID_ENUMERROR_NoError;
 }
 
 static uint8_t DCOMP_HID_Host_NextHIDInterface(void* const CurrentDescriptor)
 {

-       if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
+       USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
+
+       if (Header->Type == DTYPE_Interface)

        {
        {

-               USB_Descriptor_Interface_t* CurrentInterface = DESCRIPTOR_PCAST(CurrentDescriptor,
-                                                                               USB_Descriptor_Interface_t);
-       
-               if (CurrentInterface->Class == HID_INTERFACE_CLASS)
+               USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
+
+               if (Interface->Class == HID_CSCP_HIDClass)

                  return DESCRIPTOR_SEARCH_Found;
        }
                  return DESCRIPTOR_SEARCH_Found;
        }

-       
+

        return DESCRIPTOR_SEARCH_NotFound;
 }
 
 static uint8_t DCOMP_HID_Host_NextHID(void* const CurrentDescriptor)
 {
        return DESCRIPTOR_SEARCH_NotFound;
 }
 
 static uint8_t DCOMP_HID_Host_NextHID(void* const CurrentDescriptor)
 {

-       if (DESCRIPTOR_TYPE(CurrentDescriptor) == HID_DTYPE_HID)
+       USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
+
+       if (Header->Type == HID_DTYPE_HID)

          return DESCRIPTOR_SEARCH_Found;
          return DESCRIPTOR_SEARCH_Found;

-       else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
+       else if (Header->Type == DTYPE_Interface)

          return DESCRIPTOR_SEARCH_Fail;
        else
          return DESCRIPTOR_SEARCH_NotFound;
          return DESCRIPTOR_SEARCH_Fail;
        else
          return DESCRIPTOR_SEARCH_NotFound;


@@ -151,15 +154,16 @@ static uint8_t DCOMP_HID_Host_NextHID(void* const CurrentDescriptor)
 
 static uint8_t DCOMP_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescriptor)
 {
 
 static uint8_t DCOMP_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescriptor)
 {

-       if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)
+       USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
+
+       if (Header->Type == DTYPE_Endpoint)

        {
        {

-               USB_Descriptor_Endpoint_t* CurrentEndpoint = DESCRIPTOR_PCAST(CurrentDescriptor,
-                                                                             USB_Descriptor_Endpoint_t);       
+               USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);

 
 

-               if (!(Pipe_IsEndpointBound(CurrentEndpoint->EndpointAddress)))
+               if (!(Pipe_IsEndpointBound(Endpoint->EndpointAddress)))

                  return DESCRIPTOR_SEARCH_Found;
        }
                  return DESCRIPTOR_SEARCH_Found;
        }

-       else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
+       else if (Header->Type == DTYPE_Interface)

        {
                return DESCRIPTOR_SEARCH_Fail;
        }
        {
                return DESCRIPTOR_SEARCH_Fail;
        }


@@ -182,11 +186,11 @@ uint8_t HID_Host_ReceiveReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
        };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);
        };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);

-       
+

        return USB_Host_SendControlRequest(Buffer);
 }
 #endif
        return USB_Host_SendControlRequest(Buffer);
 }
 #endif

- 
+

 uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
                                void* Buffer)
 {
 uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
                                void* Buffer)
 {


@@ -197,7 +201,7 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
 
        Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipeNumber);
        Pipe_Unfreeze();
 
        Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipeNumber);
        Pipe_Unfreeze();

-       
+

        uint16_t ReportSize;
        uint8_t* BufferPos = Buffer;
 
        uint16_t ReportSize;
        uint8_t* BufferPos = Buffer;
 


@@ -205,13 +209,13 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
        if (!(HIDInterfaceInfo->State.UsingBootProtocol))
        {
                uint8_t ReportID = 0;
        if (!(HIDInterfaceInfo->State.UsingBootProtocol))
        {
                uint8_t ReportID = 0;

-       
+

                if (HIDInterfaceInfo->Config.HIDParserData->UsingReportIDs)
                {
                        ReportID = Pipe_Read_Byte();
                        *(BufferPos++) = ReportID;
                }
                if (HIDInterfaceInfo->Config.HIDParserData->UsingReportIDs)
                {
                        ReportID = Pipe_Read_Byte();
                        *(BufferPos++) = ReportID;
                }

-               
+

                ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, HID_REPORT_ITEM_In);
        }
        else
                ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, HID_REPORT_ITEM_In);
        }
        else


@@ -222,10 +226,10 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
 
        if ((ErrorCode = Pipe_Read_Stream_LE(BufferPos, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)
          return ErrorCode;
 
        if ((ErrorCode = Pipe_Read_Stream_LE(BufferPos, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)
          return ErrorCode;

-        
+

        Pipe_ClearIN();
        Pipe_Freeze();
        Pipe_ClearIN();
        Pipe_Freeze();

-       
+

        return PIPE_RWSTREAM_NoError;
 }
 
        return PIPE_RWSTREAM_NoError;
 }
 


@@ -244,19 +248,19 @@ uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
        if (HIDInterfaceInfo->State.DeviceUsesOUTPipe && (ReportType == HID_REPORT_ITEM_Out))
        {
                uint8_t ErrorCode;
        if (HIDInterfaceInfo->State.DeviceUsesOUTPipe && (ReportType == HID_REPORT_ITEM_Out))
        {
                uint8_t ErrorCode;

-       
+

                Pipe_SelectPipe(HIDInterfaceInfo->Config.DataOUTPipeNumber);
                Pipe_Unfreeze();
                Pipe_SelectPipe(HIDInterfaceInfo->Config.DataOUTPipeNumber);
                Pipe_Unfreeze();

-               
+

                if (ReportID)
                  Pipe_Write_Stream_LE(&ReportID, sizeof(ReportID), NO_STREAM_CALLBACK);
                if (ReportID)
                  Pipe_Write_Stream_LE(&ReportID, sizeof(ReportID), NO_STREAM_CALLBACK);

-               
+

                if ((ErrorCode = Pipe_Write_Stream_LE(Buffer, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)
                  return ErrorCode;
                if ((ErrorCode = Pipe_Write_Stream_LE(Buffer, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)
                  return ErrorCode;

-               
+

                Pipe_ClearOUT();
                Pipe_Freeze();
                Pipe_ClearOUT();
                Pipe_Freeze();

-               
+

                return PIPE_RWSTREAM_NoError;
        }
        else
                return PIPE_RWSTREAM_NoError;
        }
        else


@@ -276,7 +280,7 @@ uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
                };
 
                Pipe_SelectPipe(PIPE_CONTROLPIPE);
                };
 
                Pipe_SelectPipe(PIPE_CONTROLPIPE);

-               
+

                return USB_Host_SendControlRequest(Buffer);
        }
 }
                return USB_Host_SendControlRequest(Buffer);
        }
 }


@@ -290,11 +294,11 @@ bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
 
        Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipeNumber);
        Pipe_Unfreeze();
 
        Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipeNumber);
        Pipe_Unfreeze();

-       
+

        ReportReceived = Pipe_IsINReceived();
        ReportReceived = Pipe_IsINReceived();

-       
+

        Pipe_Freeze();
        Pipe_Freeze();

-       
+

        return ReportReceived;
 }
 
        return ReportReceived;
 }
 


@@ -312,7 +316,7 @@ uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInf
                };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);
                };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);

-       
+

        if (!(HIDInterfaceInfo->State.SupportsBootProtocol))
          return HID_ERROR_LOGICAL;
 
        if (!(HIDInterfaceInfo->State.SupportsBootProtocol))
          return HID_ERROR_LOGICAL;
 


@@ -321,7 +325,7 @@ uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInf
 
        HIDInterfaceInfo->State.LargestReportSize = 8;
        HIDInterfaceInfo->State.UsingBootProtocol = true;
 
        HIDInterfaceInfo->State.LargestReportSize = 8;
        HIDInterfaceInfo->State.UsingBootProtocol = true;

-       
+

        return HOST_SENDCONTROL_Successful;
 }
 
        return HOST_SENDCONTROL_Successful;
 }
 


@@ -331,7 +335,7 @@ uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
        uint8_t ErrorCode;
 
        uint8_t HIDReportData[HIDInterfaceInfo->State.HIDReportSize];
        uint8_t ErrorCode;
 
        uint8_t HIDReportData[HIDInterfaceInfo->State.HIDReportSize];

-       
+

        USB_ControlRequest = (USB_Request_Header_t)
                {
                        .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE),
        USB_ControlRequest = (USB_Request_Header_t)
                {
                        .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE),


@@ -345,7 +349,7 @@ uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
 
        if ((ErrorCode = USB_Host_SendControlRequest(HIDReportData)) != HOST_SENDCONTROL_Successful)
          return ErrorCode;
 
        if ((ErrorCode = USB_Host_SendControlRequest(HIDReportData)) != HOST_SENDCONTROL_Successful)
          return ErrorCode;

-         
+

        if (HIDInterfaceInfo->State.UsingBootProtocol)
        {
                USB_ControlRequest = (USB_Request_Header_t)
        if (HIDInterfaceInfo->State.UsingBootProtocol)
        {
                USB_ControlRequest = (USB_Request_Header_t)


@@ -362,10 +366,10 @@ uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
 
                HIDInterfaceInfo->State.UsingBootProtocol = false;
        }
 
                HIDInterfaceInfo->State.UsingBootProtocol = false;
        }

-       
+

        if (HIDInterfaceInfo->Config.HIDParserData == NULL)
          return HID_ERROR_LOGICAL;
        if (HIDInterfaceInfo->Config.HIDParserData == NULL)
          return HID_ERROR_LOGICAL;

-               
+

        if ((ErrorCode = USB_ProcessHIDReport(HIDReportData, HIDInterfaceInfo->State.HIDReportSize,
                                              HIDInterfaceInfo->Config.HIDParserData)) != HID_PARSE_Successful)
        {
        if ((ErrorCode = USB_ProcessHIDReport(HIDReportData, HIDInterfaceInfo->State.HIDReportSize,
                                              HIDInterfaceInfo->Config.HIDParserData)) != HID_PARSE_Successful)
        {


@@ -380,3 +384,4 @@ uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
 #endif
 
 #endif
 #endif
 
 #endif

+