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/Config/AppConfig.h | 4 ++-- Projects/XPLAINBridge/Config/LUFAConfig.h | 4 ++-- Projects/XPLAINBridge/Lib/SoftUART.c | 4 ++-- Projects/XPLAINBridge/Lib/SoftUART.h | 4 ++-- Projects/XPLAINBridge/USARTDescriptors.c | 4 ++-- Projects/XPLAINBridge/USARTDescriptors.h | 4 ++-- Projects/XPLAINBridge/XPLAINBridge.c | 4 ++-- Projects/XPLAINBridge/XPLAINBridge.h | 4 ++-- Projects/XPLAINBridge/makefile | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'Projects/XPLAINBridge') diff --git a/Projects/XPLAINBridge/Config/AppConfig.h b/Projects/XPLAINBridge/Config/AppConfig.h index 563f15521..8682696ba 100644 --- a/Projects/XPLAINBridge/Config/AppConfig.h +++ b/Projects/XPLAINBridge/Config/AppConfig.h @@ -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 diff --git a/Projects/XPLAINBridge/Config/LUFAConfig.h b/Projects/XPLAINBridge/Config/LUFAConfig.h index caecfb677..c069717fb 100644 --- a/Projects/XPLAINBridge/Config/LUFAConfig.h +++ b/Projects/XPLAINBridge/Config/LUFAConfig.h @@ -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 diff --git a/Projects/XPLAINBridge/Lib/SoftUART.c b/Projects/XPLAINBridge/Lib/SoftUART.c index f71686fe1..3f684ca7b 100644 --- a/Projects/XPLAINBridge/Lib/SoftUART.c +++ b/Projects/XPLAINBridge/Lib/SoftUART.c @@ -1,6 +1,6 @@ /* LUFA Library - Copyright (C) Dean Camera, 2015. + Copyright (C) Dean Camera, 2016. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org @@ -9,7 +9,7 @@ /* Copyright 2010 David Prentice (david.prentice [at] farming [dot] uk) Copyright 2010 Peter Danneger - 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 diff --git a/Projects/XPLAINBridge/Lib/SoftUART.h b/Projects/XPLAINBridge/Lib/SoftUART.h index 83112f612..3198f1160 100644 --- a/Projects/XPLAINBridge/Lib/SoftUART.h +++ b/Projects/XPLAINBridge/Lib/SoftUART.h @@ -1,6 +1,6 @@ /* LUFA Library - Copyright (C) Dean Camera, 2015. + Copyright (C) Dean Camera, 2016. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org @@ -9,7 +9,7 @@ /* Copyright 2010 David Prentice (david.prentice [at] farming [dot] uk) Copyright 2010 Peter Danneger - 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 diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index 1478e2888..4bbb2c45a 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.c +++ b/Projects/XPLAINBridge/USARTDescriptors.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 diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h index 81a55be16..1eccdac99 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.h +++ b/Projects/XPLAINBridge/USARTDescriptors.h @@ -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 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 diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h index 0ce234f92..302ee869f 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.h +++ b/Projects/XPLAINBridge/XPLAINBridge.h @@ -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 diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile index 65ca730f9..8ff794ae4 100644 --- a/Projects/XPLAINBridge/makefile +++ b/Projects/XPLAINBridge/makefile @@ -1,6 +1,6 @@ # # LUFA Library -# Copyright (C) Dean Camera, 2015. +# Copyright (C) Dean Camera, 2016. # # dean [at] fourwalledcubicle [dot] com # www.lufa-lib.org -- 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/Config/AppConfig.h | 2 -- Projects/XPLAINBridge/Config/LUFAConfig.h | 2 +- Projects/XPLAINBridge/USARTDescriptors.c | 5 +---- Projects/XPLAINBridge/USARTDescriptors.h | 3 +-- Projects/XPLAINBridge/XPLAINBridge.c | 8 +++----- Projects/XPLAINBridge/XPLAINBridge.h | 5 ++--- Projects/XPLAINBridge/XPLAINBridge.txt | 20 -------------------- 7 files changed, 8 insertions(+), 37 deletions(-) (limited to 'Projects/XPLAINBridge') diff --git a/Projects/XPLAINBridge/Config/AppConfig.h b/Projects/XPLAINBridge/Config/AppConfig.h index 8682696ba..ec4fbf929 100644 --- a/Projects/XPLAINBridge/Config/AppConfig.h +++ b/Projects/XPLAINBridge/Config/AppConfig.h @@ -59,8 +59,6 @@ // #define XCK_RESCUE_CLOCK_ENABLE // #define INVERTED_ISP_MISO -// #define LIBUSB_DRIVER_COMPAT -// #define RESET_TOGGLES_LIBUSB_COMPAT // #define FIRMWARE_VERSION_MINOR 0x11 #endif diff --git a/Projects/XPLAINBridge/Config/LUFAConfig.h b/Projects/XPLAINBridge/Config/LUFAConfig.h index c069717fb..ee7bb4085 100644 --- a/Projects/XPLAINBridge/Config/LUFAConfig.h +++ b/Projects/XPLAINBridge/Config/LUFAConfig.h @@ -67,7 +67,7 @@ /* USB Device Mode Driver Related Tokens: */ // #define USE_RAM_DESCRIPTORS -// #define USE_FLASH_DESCRIPTORS + #define USE_FLASH_DESCRIPTORS // #define USE_EEPROM_DESCRIPTORS // #define NO_INTERNAL_SERIAL #define FIXED_CONTROL_ENDPOINT_SIZE 16 diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index 4bbb2c45a..76da7c22e 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.c +++ b/Projects/XPLAINBridge/USARTDescriptors.c @@ -198,8 +198,7 @@ const USB_Descriptor_String_t PROGMEM USART_ProductString = USB_STRING_DESCRIPTO */ uint16_t USART_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, - const void** const DescriptorAddress, - uint8_t* const DescriptorMemorySpace) + const void** const DescriptorAddress) { const uint8_t DescriptorType = (wValue >> 8); const uint8_t DescriptorNumber = (wValue & 0xFF); @@ -207,8 +206,6 @@ uint16_t USART_GetDescriptor(const uint16_t wValue, const void* Address = NULL; uint16_t Size = NO_DESCRIPTOR; - *DescriptorMemorySpace = MEMSPACE_FLASH; - switch (DescriptorType) { case DTYPE_Device: diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h index 1eccdac99..e44503dfe 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.h +++ b/Projects/XPLAINBridge/USARTDescriptors.h @@ -105,8 +105,7 @@ /* Function Prototypes: */ uint16_t USART_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, - const void** const DescriptorAddress, - uint8_t* const DescriptorMemorySpace); + const void** const DescriptorAddress); #endif 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); } diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h index 302ee869f..79858b27d 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.h +++ b/Projects/XPLAINBridge/XPLAINBridge.h @@ -96,9 +96,8 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, - const void** const DescriptorAddress, - uint8_t* const DescriptorMemorySpace) - ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4); + const void** const DescriptorAddress) + ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); #endif diff --git a/Projects/XPLAINBridge/XPLAINBridge.txt b/Projects/XPLAINBridge/XPLAINBridge.txt index 45557ef97..0cf59a67d 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.txt +++ b/Projects/XPLAINBridge/XPLAINBridge.txt @@ -79,26 +79,6 @@ * Description: * * - * LIBUSB_DRIVER_COMPAT - * AppConfig.h - * Define to switch to a non-standard endpoint scheme, breaking compatibility with AVRStudio under Windows but making - * the code compatible with software such as avrdude (all platforms) that use the libUSB driver. - * - * \note This option is incompatible with \c RESET_TOGGLES_LIBUSB_COMPAT. - * - * - * RESET_TOGGLES_LIBUSB_COMPAT - * Makefile LUFA_OPTS - * Define to make the /RESET line of the AVR toggle between Jungo and libUSB driver compatibility modes. Each time the AVR is - * reset externally via the reset pin, the compatibility mode will be toggled. The compatibility mode is preserved between - * power cycles and is not toggled via other forms of reset such as Watchdog or Brown Out. - * - * When this option is enabled, all board LEDs will flash twice on startup for Jungo compatibility mode, and five times for - * libUSB compatibility mode. - * - * \note This option is incompatible with \c LIBUSB_DRIVER_COMPAT. - * - * * FIRMWARE_VERSION_MINOR * AppConfig.h * Define to set the minor firmware revision nunber reported to the host on request. By default this will use a firmware version compatible -- cgit v1.2.3