From 1e05d46b663ded57a06f4d8773f40aea908f8622 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 31 Jan 2016 16:11:09 +1100 Subject: Update copyrights to 2016. --- Projects/XPLAINBridge/XPLAINBridge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Projects/XPLAINBridge/XPLAINBridge.c') diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 173c19cb4..5188e56ea 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2015. + Copyright (C) Dean Camera, 2016. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2015 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2016 Dean Camera (dean [at] fourwalledcubicle [dot] com) Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted -- cgit v1.2.3 From 1d2369e9be57ceee8ba415655ce5f13d9ae8da84 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 7 Feb 2016 15:42:39 +1100 Subject: Remove legacy AVRISP-MKII clone compatibility compile options. --- Projects/XPLAINBridge/XPLAINBridge.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Projects/XPLAINBridge/XPLAINBridge.c') diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 5188e56ea..b5450c109 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -276,19 +276,17 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI * \param[in] wValue Descriptor type and index to retrieve * \param[in] wIndex Sub-index to retrieve (such as a localized string language) * \param[out] DescriptorAddress Address of the retrieved descriptor - * \param[out] DescriptorMemorySpace Memory space that the descriptor is stored in * * \return Length of the retrieved descriptor in bytes, or NO_DESCRIPTOR if the descriptor was not found */ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, - const void** const DescriptorAddress, - uint8_t* const DescriptorMemorySpace) + const void** const DescriptorAddress) { /* Return the correct descriptors based on the selected mode */ if (CurrentFirmwareMode == MODE_USART_BRIDGE) - return USART_GetDescriptor(wValue, wIndex, DescriptorAddress, DescriptorMemorySpace); + return USART_GetDescriptor(wValue, wIndex, DescriptorAddress); else - return AVRISP_GetDescriptor(wValue, wIndex, DescriptorAddress, DescriptorMemorySpace); + return AVRISP_GetDescriptor(wValue, wIndex, DescriptorAddress); } -- cgit v1.2.3