diff options
Diffstat (limited to 'Demos/Device/ClassDriver/GenericHID')
| -rw-r--r-- | Demos/Device/ClassDriver/GenericHID/Descriptors.c | 4 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/GenericHID/Descriptors.h | 4 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/GenericHID/GenericHID.c | 11 | 
3 files changed, 10 insertions, 9 deletions
diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.c b/Demos/Device/ClassDriver/GenericHID/Descriptors.c index ee1ba49c8..a9ca6be1c 100644 --- a/Demos/Device/ClassDriver/GenericHID/Descriptors.c +++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.c @@ -135,10 +135,10 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =  		{  			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, -			.EndpointAddress        = (ENDPOINT_DIR_IN | GENERIC_IN_EPNUM), +			.EndpointAddress        = GENERIC_IN_EPADDR,  			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),  			.EndpointSize           = GENERIC_EPSIZE, -			.PollingIntervalMS      = 0x01 +			.PollingIntervalMS      = 0x05  		},  }; diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.h b/Demos/Device/ClassDriver/GenericHID/Descriptors.h index ddeef240c..0b9ec8f71 100644 --- a/Demos/Device/ClassDriver/GenericHID/Descriptors.h +++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.h @@ -57,8 +57,8 @@  		} USB_Descriptor_Configuration_t;  	/* Macros: */ -		/** Endpoint number of the Generic HID reporting IN endpoint. */ -		#define GENERIC_IN_EPNUM          1 +		/** Endpoint address of the Generic HID reporting IN endpoint. */ +		#define GENERIC_IN_EPADDR         (ENDPOINT_DIR_IN | 1)  		/** Size in bytes of the Generic HID reporting endpoint. */  		#define GENERIC_EPSIZE            8 diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.c b/Demos/Device/ClassDriver/GenericHID/GenericHID.c index 36eb8f7fe..aa365bde2 100644 --- a/Demos/Device/ClassDriver/GenericHID/GenericHID.c +++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.c @@ -48,11 +48,12 @@ USB_ClassInfo_HID_Device_t Generic_HID_Interface =  		.Config =  			{  				.InterfaceNumber              = 0, - -				.ReportINEndpointNumber       = GENERIC_IN_EPNUM, -				.ReportINEndpointSize         = GENERIC_EPSIZE, -				.ReportINEndpointDoubleBank   = false, - +				.ReportINEndpoint             = +					{ +						.Address              = GENERIC_IN_EPADDR, +						.Size                 = GENERIC_EPSIZE, +						.Banks                = 1, +					},  				.PrevReportINBuffer           = PrevHIDReportBuffer,  				.PrevReportINBufferSize       = sizeof(PrevHIDReportBuffer),  			},  | 
