diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-10 19:24:58 +0000 | 
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-10 19:24:58 +0000 | 
| commit | 359fbfe14d00ab378f85a36664820ea9ba538c3f (patch) | |
| tree | 0929d5663a3be4dc078dda0aba5ba798ebb627ab /Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c | |
| parent | e8570c4a37e41117e3fd1e989e0b41f1e9608f3c (diff) | |
| download | lufa-359fbfe14d00ab378f85a36664820ea9ba538c3f.tar.gz lufa-359fbfe14d00ab378f85a36664820ea9ba538c3f.tar.bz2 lufa-359fbfe14d00ab378f85a36664820ea9ba538c3f.zip | |
Add branch for the conversion of demos to use standard C header files for configuration, rather than makefile defined macros.
Diffstat (limited to 'Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c')
| -rw-r--r-- | Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c | 15 | 
1 files changed, 6 insertions, 9 deletions
| diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c index 4de6f64c9..a916659ea 100644 --- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c +++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c @@ -104,14 +104,11 @@ void EVENT_USB_Device_ConfigurationChanged(void)  	bool ConfigSuccess = true;  	/* Setup Keyboard HID Report Endpoints */ -	ConfigSuccess &= Endpoint_ConfigureEndpoint(KEYBOARD_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN, -	                                            HID_EPSIZE, ENDPOINT_BANK_SINGLE); -	ConfigSuccess &= Endpoint_ConfigureEndpoint(KEYBOARD_OUT_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_OUT, -	                                            HID_EPSIZE, ENDPOINT_BANK_SINGLE); +	ConfigSuccess &= Endpoint_ConfigureEndpoint(KEYBOARD_IN_EPADDR, EP_TYPE_INTERRUPT, HID_EPSIZE, 1); +	ConfigSuccess &= Endpoint_ConfigureEndpoint(KEYBOARD_OUT_EPADDR, EP_TYPE_INTERRUPT, HID_EPSIZE, 1);  	/* Setup Mouse HID Report Endpoint */ -	ConfigSuccess &= Endpoint_ConfigureEndpoint(MOUSE_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN, -	                                            HID_EPSIZE, ENDPOINT_BANK_SINGLE); +	ConfigSuccess &= Endpoint_ConfigureEndpoint(MOUSE_IN_EPADDR, EP_TYPE_INTERRUPT, HID_EPSIZE, 1);  	/* Indicate endpoint configuration success or failure */  	LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR); @@ -236,7 +233,7 @@ void Keyboard_HID_Task(void)  	}  	/* Select the Keyboard Report Endpoint */ -	Endpoint_SelectEndpoint(KEYBOARD_IN_EPNUM); +	Endpoint_SelectEndpoint(KEYBOARD_IN_EPADDR);  	/* Check if Keyboard Endpoint Ready for Read/Write */  	if (Endpoint_IsReadWriteAllowed()) @@ -252,7 +249,7 @@ void Keyboard_HID_Task(void)  	}  	/* Select the Keyboard LED Report Endpoint */ -	Endpoint_SelectEndpoint(KEYBOARD_OUT_EPNUM); +	Endpoint_SelectEndpoint(KEYBOARD_OUT_EPADDR);  	/* Check if Keyboard LED Endpoint Ready for Read/Write */  	if (Endpoint_IsReadWriteAllowed()) @@ -294,7 +291,7 @@ void Mouse_HID_Task(void)  	}  	/* Select the Mouse Report Endpoint */ -	Endpoint_SelectEndpoint(MOUSE_IN_EPNUM); +	Endpoint_SelectEndpoint(MOUSE_IN_EPADDR);  	/* Check if Mouse Endpoint Ready for Read/Write */  	if (Endpoint_IsReadWriteAllowed()) | 
