diff options
Diffstat (limited to 'Demos/DualRole/ClassDriver/MouseHostDevice')
4 files changed, 20 insertions, 12 deletions
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c index 2ee35de87..71643be29 100644 --- a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c +++ b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c @@ -136,10 +136,10 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =  		{  			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, -			.EndpointAddress        = (ENDPOINT_DIR_IN | MOUSE_EPNUM), +			.EndpointAddress        = MOUSE_EPADDR,  			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),  			.EndpointSize           = MOUSE_EPSIZE, -			.PollingIntervalMS      = 0x01 +			.PollingIntervalMS      = 0x05  		}  }; diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h index da78dd0ff..14cb8e9a3 100644 --- a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h +++ b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h @@ -57,8 +57,8 @@  		} USB_Descriptor_Configuration_t;  	/* Macros: */ -		/** Endpoint number of the Mouse HID reporting IN endpoint. */ -		#define MOUSE_EPNUM               1 +		/** Endpoint address of the Mouse HID reporting IN endpoint. */ +		#define MOUSE_EPADDR              (ENDPOINT_DIR_IN | 1)  		/** Size in bytes of the Mouse HID reporting IN endpoint. */  		#define MOUSE_EPSIZE              8 diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c index 16fc3fb2b..39a682a60 100644 --- a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c +++ b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c @@ -48,11 +48,12 @@ USB_ClassInfo_HID_Device_t Mouse_HID_Device_Interface =  		.Config =  			{  				.InterfaceNumber            = 0, - -				.ReportINEndpointNumber     = MOUSE_EPNUM, -				.ReportINEndpointSize       = MOUSE_EPSIZE, -				.ReportINEndpointDoubleBank = false, - +				.ReportINEndpoint           = +					{ +						.Address            = MOUSE_EPADDR, +						.Size               = MOUSE_EPSIZE, +						.Banks              = 1, +					},  				.PrevReportINBuffer         = PrevMouseHIDReportBuffer,  				.PrevReportINBufferSize     = sizeof(PrevMouseHIDReportBuffer),  			}, diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c index a71e85b5a..29def30d5 100644 --- a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c +++ b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c @@ -44,9 +44,16 @@ USB_ClassInfo_HID_Host_t Mouse_HID_Host_Interface =  	{  		.Config =  			{ -				.DataINPipeNumber       = 1, -				.DataOUTPipeNumber      = 2, - +				.DataINPipe             = +					{ +						.Address        = (PIPE_DIR_IN  | 1), +						.Banks          = 1, +					}, +				.DataINPipe             = +					{ +						.Address        = (PIPE_DIR_OUT | 2), +						.Banks          = 1, +					},  				.HIDInterfaceProtocol   = HID_CSCP_MouseBootProtocol,  			},  	};  | 
