diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-21 20:42:56 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-21 20:42:56 +0000 |
| commit | aba30ac2a06ddc85524b0099a6c92982a99dd7f9 (patch) | |
| tree | fb972fbf7861854987a6bcf5f3c98d169131daf5 /Projects | |
| parent | 615d34f1b7b363dc9c1cc79be6834e1e88c30ee8 (diff) | |
| download | lufa-aba30ac2a06ddc85524b0099a6c92982a99dd7f9.tar.gz lufa-aba30ac2a06ddc85524b0099a6c92982a99dd7f9.tar.bz2 lufa-aba30ac2a06ddc85524b0099a6c92982a99dd7f9.zip | |
Fix AVRISP-MKII clone and XPLAINBridge projects not properly configuring the AVRISP IN endpoint when needed if RESET_TOGGLES_LIBUSB_COMPAT compile time option is used.
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/AVRISP-MKII/AVRISP-MKII.c | 8 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/XPLAINBridge.c | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Projects/AVRISP-MKII/AVRISP-MKII.c b/Projects/AVRISP-MKII/AVRISP-MKII.c index 71b6da7cd..cbcf009c9 100644 --- a/Projects/AVRISP-MKII/AVRISP-MKII.c +++ b/Projects/AVRISP-MKII/AVRISP-MKII.c @@ -97,12 +97,12 @@ void EVENT_USB_Device_ConfigurationChanged(void) { bool ConfigSuccess = true; - /* Setup AVRISP Data Endpoint(s) */ + /* Setup AVRISP Data OUT endpoint */ ConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_OUT_EPADDR, EP_TYPE_BULK, AVRISP_DATA_EPSIZE, 1); - #if defined(LIBUSB_DRIVER_COMPAT) - ConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPADDR, EP_TYPE_BULK, AVRISP_DATA_EPSIZE, 1); - #endif + /* Setup AVRISP Data IN endpoint if it is using a physically different endpoint */ + if (AVRISP_DATA_IN_EPADDR != AVRISP_DATA_OUT_EPADDR) + ConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPADDR, EP_TYPE_BULK, AVRISP_DATA_EPSIZE, 1); /* Indicate endpoint configuration success or failure */ LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR); diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 3bd1fbf55..e7d9b2486 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -226,9 +226,8 @@ void EVENT_USB_Device_ConfigurationChanged(void) { ConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_OUT_EPADDR, EP_TYPE_BULK, AVRISP_DATA_EPSIZE, 1); - #if defined(LIBUSB_DRIVER_COMPAT) - ConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPADDR, EP_TYPE_BULK, AVRISP_DATA_EPSIZE, 1); - #endif + if (AVRISP_DATA_IN_EPADDR != AVRISP_DATA_OUT_EPADDR) + ConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPADDR, EP_TYPE_BULK, AVRISP_DATA_EPSIZE, 1); /* Configure the V2 protocol packet handler */ V2Protocol_Init(); |