Changed default value for the reset polarity parameter in the AVRISP-MKII project...

[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 f7292d7..bbb32cb 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -36,7 +36,8 @@
 #define  __INCLUDE_FROM_HID_DRIVER
 #include "HID.h"
 
 #define  __INCLUDE_FROM_HID_DRIVER
 #include "HID.h"
 

-uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, uint16_t ConfigDescriptorSize,
+uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
+                                uint16_t ConfigDescriptorSize,

                                 void* ConfigDescriptorData)
 {
        uint8_t FoundEndpoints = 0;
                                 void* ConfigDescriptorData)
 {
        uint8_t FoundEndpoints = 0;


@@ -51,7 +52,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
        do
        {
                if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
        do
        {
                if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

-                                                                         DComp_HID_Host_NextHIDInterface) != DESCRIPTOR_SEARCH_COMP_Found)
+                                                                         DCOMP_HID_Host_NextHIDInterface) != DESCRIPTOR_SEARCH_COMP_Found)

                {
                        return HID_ENUMERROR_NoHIDInterfaceFound;
                }
                {
                        return HID_ENUMERROR_NoHIDInterfaceFound;
                }


@@ -61,19 +62,17 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
                 (CurrentHIDInterface->Protocol != HIDInterfaceInfo->Config.HIDInterfaceProtocol));
 
        HIDInterfaceInfo->State.InterfaceNumber      = CurrentHIDInterface->InterfaceNumber;
                 (CurrentHIDInterface->Protocol != HIDInterfaceInfo->Config.HIDInterfaceProtocol));
 
        HIDInterfaceInfo->State.InterfaceNumber      = CurrentHIDInterface->InterfaceNumber;

-       HIDInterfaceInfo->State.SupportsBootProtocol = (CurrentHIDInterface->SubClass != HID_NON_BOOT_PROTOCOL);
+       HIDInterfaceInfo->State.SupportsBootProtocol = (CurrentHIDInterface->SubClass != HID_BOOTP_NonBootProtocol);

 
 

-       if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, DComp_NextHID) != DESCRIPTOR_SEARCH_COMP_Found)
-       {
-               return HID_ENUMERROR_NoHIDDescriptorFound;
-       }
+       if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, DCOMP_HID_NextHID) != DESCRIPTOR_SEARCH_COMP_Found)
+         return HID_ENUMERROR_NoHIDDescriptorFound;

 
 

-       HIDInterfaceInfo->State.HIDReportSize = DESCRIPTOR_CAST(ConfigDescriptorData, USB_HID_Descriptor_t).HIDReportLength;
+       HIDInterfaceInfo->State.HIDReportSize = DESCRIPTOR_CAST(ConfigDescriptorData, USB_HID_Descriptor_HID_t).HIDReportLength;

 
        while (FoundEndpoints != (HID_FOUND_DATAPIPE_IN | HID_FOUND_DATAPIPE_OUT))
        {
                if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
 
        while (FoundEndpoints != (HID_FOUND_DATAPIPE_IN | HID_FOUND_DATAPIPE_OUT))
        {
                if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,

-                                             DComp_HID_Host_NextHIDInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
+                                             DCOMP_HID_Host_NextHIDInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)

                {
                        if (FoundEndpoints & HID_FOUND_DATAPIPE_IN)
                          break;
                {
                        if (FoundEndpoints & HID_FOUND_DATAPIPE_IN)
                          break;


@@ -110,7 +109,7 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
        return HID_ENUMERROR_NoError;
 }
 
        return HID_ENUMERROR_NoError;
 }
 

-static uint8_t DComp_HID_Host_NextHIDInterface(void* const CurrentDescriptor)
+static uint8_t DCOMP_HID_Host_NextHIDInterface(void* const CurrentDescriptor)

 {
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
        {
 {
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
        {


@@ -124,9 +123,9 @@ static uint8_t DComp_HID_Host_NextHIDInterface(void* const CurrentDescriptor)
        return DESCRIPTOR_SEARCH_NotFound;
 }
 
        return DESCRIPTOR_SEARCH_NotFound;
 }
 

-static uint8_t DComp_NextHID(void* const CurrentDescriptor)
+static uint8_t DCOMP_HID_NextHID(void* const CurrentDescriptor)

 {
 {

-       if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_HID)
+       if (DESCRIPTOR_TYPE(CurrentDescriptor) == HID_DTYPE_HID)

          return DESCRIPTOR_SEARCH_Found;
        else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
          return DESCRIPTOR_SEARCH_Fail;
          return DESCRIPTOR_SEARCH_Found;
        else if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface)
          return DESCRIPTOR_SEARCH_Fail;


@@ -134,7 +133,7 @@ static uint8_t DComp_NextHID(void* const CurrentDescriptor)
          return DESCRIPTOR_SEARCH_NotFound;      
 }
 
          return DESCRIPTOR_SEARCH_NotFound;      
 }
 

-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)
        {
 {
        if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)
        {


@@ -153,15 +152,17 @@ static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescri
 }
 
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
 }
 
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)

-uint8_t HID_Host_ReceiveReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, const uint8_t ReportID, void* Buffer)
+uint8_t HID_Host_ReceiveReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
+                                   const uint8_t ReportID,
+                                   void* Buffer)

 {
        USB_ControlRequest = (USB_Request_Header_t)
        {
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
 {
        USB_ControlRequest = (USB_Request_Header_t)
        {
                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),

-               .bRequest      = REQ_SetReport,
-               .wValue        = ((REPORT_ITEM_TYPE_In + 1) << 8) | ReportID,
+               .bRequest      = HID_REQ_SetReport,
+               .wValue        = ((HID_REPORT_ITEM_In + 1) << 8) | ReportID,

                .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
                .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,

-               .wLength       = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In),
+               .wLength       = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, HID_REPORT_ITEM_In),

        };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);
        };
 
        Pipe_SelectPipe(PIPE_CONTROLPIPE);


@@ -170,7 +171,8 @@ uint8_t HID_Host_ReceiveReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
 }                                                                                         
 #endif
                                                                                   
 }                                                                                         
 #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)

 {
        if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))
          return PIPE_READYWAIT_DeviceDisconnected;
 {
        if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))
          return PIPE_READYWAIT_DeviceDisconnected;


@@ -194,7 +196,7 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
                        *(BufferPos++) = ReportID;
                }
                
                        *(BufferPos++) = ReportID;
                }
                

-               ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In);
+               ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, HID_REPORT_ITEM_In);

        }
        else
 #endif
        }
        else
 #endif


@@ -215,13 +217,15 @@ uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
                                 const uint8_t ReportID,
 #endif
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
                                 const uint8_t ReportID,
 #endif

-                                void* Buffer, const uint16_t ReportSize)
+                                const uint8_t ReportType,
+                                void* Buffer,
+                                const uint16_t ReportSize)

 {
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
        if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))
          return false;
 
 {
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
        if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))
          return false;
 

-       if (HIDInterfaceInfo->State.DeviceUsesOUTPipe)
+       if (HIDInterfaceInfo->State.DeviceUsesOUTPipe && (ReportType == HID_REPORT_ITEM_Out))

        {
                uint8_t ErrorCode;
        
        {
                uint8_t ErrorCode;
        


@@ -245,11 +249,11 @@ uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo
                USB_ControlRequest = (USB_Request_Header_t)
                {
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
                USB_ControlRequest = (USB_Request_Header_t)
                {
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),

-                       .bRequest      = REQ_SetReport,
+                       .bRequest      = HID_REQ_SetReport,

 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
 #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)

-                       .wValue        = ((REPORT_ITEM_TYPE_Out + 1) << 8) | ReportID,
+                       .wValue        = ((ReportType + 1) << 8) | ReportID,

 #else
 #else

-                       .wValue        = ((REPORT_ITEM_TYPE_Out + 1) << 8),
+                       .wValue        = ((ReportType + 1) << 8),

 #endif
                        .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
                        .wLength       = ReportSize,
 #endif
                        .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
                        .wLength       = ReportSize,


@@ -285,7 +289,7 @@ uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInf
        USB_ControlRequest = (USB_Request_Header_t)
                {
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
        USB_ControlRequest = (USB_Request_Header_t)
                {
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),

-                       .bRequest      = REQ_SetProtocol,
+                       .bRequest      = HID_REQ_SetProtocol,

                        .wValue        = 0,
                        .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
                        .wLength       = 0,
                        .wValue        = 0,
                        .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
                        .wLength       = 0,


@@ -316,7 +320,7 @@ uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
                {
                        .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE),
                        .bRequest      = REQ_GetDescriptor,
                {
                        .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE),
                        .bRequest      = REQ_GetDescriptor,

-                       .wValue        = (DTYPE_Report << 8),
+                       .wValue        = (HID_DTYPE_Report << 8),

                        .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
                        .wLength       = HIDInterfaceInfo->State.HIDReportSize,
                };
                        .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
                        .wLength       = HIDInterfaceInfo->State.HIDReportSize,
                };


@@ -331,7 +335,7 @@ uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceI
                USB_ControlRequest = (USB_Request_Header_t)
                        {
                                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
                USB_ControlRequest = (USB_Request_Header_t)
                        {
                                .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),

-                               .bRequest      = REQ_SetProtocol,
+                               .bRequest      = HID_REQ_SetProtocol,

                                .wValue        = 1,
                                .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
                                .wLength       = 0,
                                .wValue        = 1,
                                .wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
                                .wLength       = 0,