Skip to content
GitLab
Commit 5cba3ce3 authored by Dean Camera's avatar Dean Camera
Browse files

AppConfigHeaders: Merge in latest trunk.

parents 40fd566d 998009c4
Expand all Hide whitespace changes
Inline Side-by-side
Bootloaders/CDC/BootloaderAPITable.S
View file @ 5cba3ce3
......@@ -48,7 +48,15 @@ BootloaderAPI_ReadLock_Trampoline:
jmp BootloaderAPI_ReadLock
BootloaderAPI_WriteLock_Trampoline:
jmp BootloaderAPI_WriteLock
BootloaderAPU_UNUSED:
BootloaderAPU_UNUSED1:
ret
BootloaderAPU_UNUSED2:
ret
BootloaderAPU_UNUSED3:
ret
BootloaderAPU_UNUSED4:
ret
BootloaderAPU_UNUSED5:
ret
; API function jump table
......@@ -62,11 +70,11 @@ BootloaderAPI_JumpTable:
rjmp BootloaderAPI_ReadFuse_Trampoline
rjmp BootloaderAPI_ReadLock_Trampoline
rjmp BootloaderAPI_WriteLock_Trampoline
rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY
rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY
rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY
rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY
rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY
rjmp BootloaderAPU_UNUSED1 ; UNUSED ENTRY 1
rjmp BootloaderAPU_UNUSED2 ; UNUSED ENTRY 2
rjmp BootloaderAPU_UNUSED3 ; UNUSED ENTRY 3
rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4
rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5
; Bootloader table signatures and information
.org (96 - 8)
......
Bootloaders/CDC/BootloaderCDC.txt
View file @ 5cba3ce3
......@@ -95,7 +95,9 @@
* following layout:
*
* \code
* #define BOOTLOADER_API_CALL(Index) (void*)(((FLASHEND - 32) + (2 * Index)) / 2)
* #define BOOTLOADER_API_TABLE_SIZE 32
* #define BOOTLOADER_API_TABLE_START ((FLASHEND + 1UL) - BOOTLOADER_API_TABLE_SIZE)
* #define BOOTLOADER_API_CALL(Index) (void*)((BOOTLOADER_API_TABLE_START + (Index * 2)) / 2)
*
* void (*BootloaderAPI_ErasePage)(uint32_t Address) = BOOTLOADER_API_CALL(0);
* void (*BootloaderAPI_WritePage)(uint32_t Address) = BOOTLOADER_API_CALL(1);
......@@ -105,13 +107,13 @@
* uint8_t (*BootloaderAPI_ReadLock)(void) = BOOTLOADER_API_CALL(5);
* void (*BootloaderAPI_WriteLock)(uint8_t LockBits) = BOOTLOADER_API_CALL(6);
*
* #define BOOTLOADER_MAGIC_SIGNATURE_START (FLASHEND - 2)
* #define BOOTLOADER_MAGIC_SIGNATURE_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 2))
* #define BOOTLOADER_MAGIC_SIGNATURE 0xDCFB
*
* #define BOOTLOADER_CLASS_SIGNATURE_START (FLASHEND - 4)
* #define BOOTLOADER_CLASS_SIGNATURE_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 4))
* #define BOOTLOADER_CDC_SIGNATURE 0xCDC1
*
* #define BOOTLOADER_ADDRESS_START (FLASHEND - 8)
* #define BOOTLOADER_ADDRESS_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 8))
* #define BOOTLOADER_ADDRESS_LENGTH 4
* \endcode
*
......
Bootloaders/DFU/BootloaderAPITable.S
View file @ 5cba3ce3
......@@ -48,7 +48,15 @@ BootloaderAPI_ReadLock_Trampoline:
jmp BootloaderAPI_ReadLock
BootloaderAPI_WriteLock_Trampoline:
jmp BootloaderAPI_WriteLock
BootloaderAPU_UNUSED:
BootloaderAPU_UNUSED1:
ret
BootloaderAPU_UNUSED2:
ret
BootloaderAPU_UNUSED3:
ret
BootloaderAPU_UNUSED4:
ret
BootloaderAPU_UNUSED5:
ret
; API function jump table
......@@ -62,11 +70,11 @@ BootloaderAPI_JumpTable:
rjmp BootloaderAPI_ReadFuse_Trampoline
rjmp BootloaderAPI_ReadLock_Trampoline
rjmp BootloaderAPI_WriteLock_Trampoline
rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY
rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY
rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY
rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY
rjmp BootloaderAPU_UNUSED ; UNUSED ENTRY
rjmp BootloaderAPU_UNUSED1 ; UNUSED ENTRY 1
rjmp BootloaderAPU_UNUSED2 ; UNUSED ENTRY 2
rjmp BootloaderAPU_UNUSED3 ; UNUSED ENTRY 3
rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4
rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5
; Bootloader table signatures and information
.org (96 - 8)
......
Bootloaders/DFU/BootloaderDFU.txt
View file @ 5cba3ce3
......@@ -100,7 +100,9 @@
* following layout:
*
* \code
* #define BOOTLOADER_API_CALL(Index) (void*)(((FLASHEND - 32) + (2 * Index)) / 2)
* #define BOOTLOADER_API_TABLE_SIZE 32
* #define BOOTLOADER_API_TABLE_START ((FLASHEND + 1UL) - BOOTLOADER_API_TABLE_SIZE)
* #define BOOTLOADER_API_CALL(Index) (void*)((BOOTLOADER_API_TABLE_START + (Index * 2)) / 2)
*
* void (*BootloaderAPI_ErasePage)(uint32_t Address) = BOOTLOADER_API_CALL(0);
* void (*BootloaderAPI_WritePage)(uint32_t Address) = BOOTLOADER_API_CALL(1);
......@@ -110,13 +112,13 @@
* uint8_t (*BootloaderAPI_ReadLock)(void) = BOOTLOADER_API_CALL(5);
* void (*BootloaderAPI_WriteLock)(uint8_t LockBits) = BOOTLOADER_API_CALL(6);
*
* #define BOOTLOADER_MAGIC_SIGNATURE_START (FLASHEND - 2)
* #define BOOTLOADER_MAGIC_SIGNATURE_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 2))
* #define BOOTLOADER_MAGIC_SIGNATURE 0xDCFB
*
* #define BOOTLOADER_CLASS_SIGNATURE_START (FLASHEND - 4)
* #define BOOTLOADER_DFU_SIGNATURE 0xDFB1
* #define BOOTLOADER_CLASS_SIGNATURE_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 4))
* #define BOOTLOADER_CDC_SIGNATURE 0xDFB1
*
* #define BOOTLOADER_ADDRESS_START (FLASHEND - 8)
* #define BOOTLOADER_ADDRESS_START (BOOTLOADER_API_TABLE_START + (BOOTLOADER_API_TABLE_SIZE - 8))
* #define BOOTLOADER_ADDRESS_LENGTH 4
* \endcode
*
......
BuildTests/BoardDriverTest/BoardDeviceMap.cfg
View file @ 5cba3ce3
# BOARD DEFINE = {ARCH} : {MCU} :
BOARD_USER = avr8 : at90usb1287 :
BOARD_NONE = avr8 : at90usb1287 :
BOARD_USBKEY = avr8 : at90usb1287 :
......@@ -48,4 +49,4 @@ BOARD_MULTIO = avr8 : at90usb162 :
BOARD_BIGMULTIO = avr8 : atmega32u4 :
BOARD_DUCE = avr8 : atmega32u2 :
BOARD_OLIMEX32U4 = avr8 : atmega32u4 :
BOARD_OLIMEXT32U4 = avr8 : atmega32u4 :
\ No newline at end of file
BOARD_OLIMEXT32U4 = avr8 : atmega32u4 :
BuildTests/BoardDriverTest/makefile
View file @ 5cba3ce3
......@@ -29,11 +29,11 @@ makeboardlist:
@grep "BOARD_" $(LUFA_ROOT_PATH)/LUFA/Common/BoardTypes.h | cut -d'#' -f2 | cut -d' ' -f2 | grep "BOARD_" > BoardList.txt
testboards:
echo "buildtest:" > BuildMakefile
@echo "buildtest:" > BuildMakefile
@while read line; \
do \
build_cfg=`grep "$$line " BoardDeviceMap.cfg | sed 's/ //g' | cut -d'=' -f2-`; \
build_cfg=`grep "$$line " BoardDeviceMap.cfg | sed 's/ //g' | grep -v "#" | cut -d'=' -f2-`; \
\
build_board=$$line; \
build_arch=`echo $$build_cfg | cut -d':' -f1`; \
......
BuildTests/BootloaderTest/BootloaderDeviceMap.cfg 0 → 100644
View file @ 5cba3ce3
# BOOTLOADER = {ARCH} : {MCU} : {BOARD} : {FLASH SIZE KB} : {BOOT SIZE KB} :
# ------------ CDC Bootloader -------------
CDC = avr8 : at90usb1287 : NONE : 128 : 8 :
CDC = avr8 : at90usb647 : NONE : 64 : 4 :
CDC = avr8 : at90usb1286 : NONE : 128 : 8 :
CDC = avr8 : at90usb646 : NONE : 64 : 4 :
CDC = avr8 : atmega32u4 : NONE : 32 : 4 :
CDC = avr8 : atmega16u4 : NONE : 16 : 4 :
CDC = avr8 : atmega32u2 : NONE : 32 : 4 :
CDC = avr8 : atmega16u2 : NONE : 16 : 4 :
CDC = avr8 : atmega8u2 : NONE : 8 : 4 :
CDC = avr8 : at90usb162 : NONE : 16 : 4 :
CDC = avr8 : at90usb82 : NONE : 8 : 4 :
# ------------ DFU Bootloader -------------
DFU = avr8 : at90usb1287 : NONE : 128 : 8 :
DFU = avr8 : at90usb647 : NONE : 64 : 4 :
DFU = avr8 : at90usb1286 : NONE : 128 : 8 :
DFU = avr8 : at90usb646 : NONE : 64 : 4 :
DFU = avr8 : atmega32u6 : NONE : 32 : 4 :
DFU = avr8 : atmega32u4 : NONE : 32 : 4 :
DFU = avr8 : atmega16u4 : NONE : 16 : 4 :
DFU = avr8 : atmega32u2 : NONE : 32 : 4 :
DFU = avr8 : atmega16u2 : NONE : 16 : 4 :
DFU = avr8 : atmega8u2 : NONE : 8 : 4 :
DFU = avr8 : at90usb162 : NONE : 16 : 4 :
DFU = avr8 : at90usb82 : NONE : 8 : 4 :
# ------------ HID Bootloader -------------
HID = avr8 : at90usb1287 : NONE : 128 : 4 :
HID = avr8 : at90usb647 : NONE : 64 : 4 :
HID = avr8 : at90usb1286 : NONE : 128 : 4 :
HID = avr8 : at90usb646 : NONE : 64 : 4 :
HID = avr8 : atmega32u6 : NONE : 32 : 4 :
HID = avr8 : atmega32u4 : NONE : 32 : 4 :
HID = avr8 : atmega16u4 : NONE : 16 : 4 :
HID = avr8 : atmega32u2 : NONE : 32 : 2 :
HID = avr8 : atmega16u2 : NONE : 16 : 2 :
HID = avr8 : atmega8u2 : NONE : 8 : 2 :
HID = avr8 : at90usb162 : NONE : 16 : 2 :
HID = avr8 : at90usb82 : NONE : 8 : 2 :
BuildTests/BootloaderTest/makefile 0 → 100644
View file @ 5cba3ce3
#
# LUFA Library
# Copyright (C) Dean Camera, 2011.
#
# dean [at] fourwalledcubicle [dot] com
# www.lufa-lib.org
#
# Makefile for the bootloader build test. This
# test attempts to build all the bootloaders
# with all supported device configurations.
# Path to the root of the LUFA tree to scan
LUFA_ROOT_PATH = ../..
all: begin testbootloaders clean end
begin:
@echo Executing build test "BootloaderTest".
@echo
end:
@echo Build test "BootloaderTest" complete.
@echo
testbootloaders:
@echo "buildtest:" > BuildMakefile
@while read line; \
do \
build_cfg=`echo $$line | sed 's/ //g' | grep -v "#"`; \
\
if ( ! test -z "$$build_cfg" ); then \
build_bootloader=`echo $$build_cfg | cut -d'=' -f1`; \
build_arch=`echo $$build_cfg | cut -d'=' -f2- | cut -d':' -f1`; \
build_mcu=`echo $$build_cfg | cut -d'=' -f2- | cut -d':' -f2`; \
build_board=`echo $$build_cfg | cut -d'=' -f2- | cut -d':' -f3`; \
build_flashsize=`echo $$build_cfg | cut -d'=' -f2- | cut -d':' -f4`; \
build_bootsize=`echo $$build_cfg | cut -d'=' -f2- | cut -d':' -f5`; \
\
printf "Found bootloader configuration for bootloader '%s' (FLASH: %3s KB | BOOT: %3s KB | MCU: %12s / %4s)\n" $$build_bootloader $$build_flashsize $$build_bootsize $$build_mcu $$build_arch; \
\
printf "\t@echo Building bootloader %s - %s - FLASH: %s KB, BOOT: %s KB\n" $$build_bootloader $$build_mcu $$build_flashsize $$build_bootsize >> BuildMakefile; \
printf "\tmake -s -C $(LUFA_ROOT_PATH)/Bootloaders/%s/ clean\n" $$build_bootloader >> BuildMakefile; \
printf "\tmake -s -C $(LUFA_ROOT_PATH)/Bootloaders/%s/ MCU=%s BOARD=%s FLASH_SIZE_KB=%s BOOT_SECTION_SIZE_KB=%s elf\n\n" $$build_bootloader $$build_mcu $$build_board $$build_flashsize $$build_bootsize >> BuildMakefile; \
fi; \
done < BootloaderDeviceMap.cfg
$(MAKE) -f BuildMakefile buildtest
clean:
rm -f BuildMakefile
%:
\ No newline at end of file
BuildTests/makefile
View file @ 5cba3ce3
......@@ -13,6 +13,7 @@
all:
%:
$(MAKE) -C BoardDriverTest $@
$(MAKE) -C BootloaderTest $@
$(MAKE) -C ModuleTest $@
$(MAKE) -C SingleUSBModeTest $@
$(MAKE) -C StaticAnalysisTest $@
LUFA.pnproj
View file @ 5cba3ce3
This diff is collapsed.
LUFA/DoxygenPages/ChangeLog.txt
View file @ 5cba3ce3
......@@ -15,6 +15,9 @@
* - Added support for the Olimex AVR-USB-T32U4 board
* - Added new Endpoint_ConfigureEndpointTable() function
* - Added new Pipe_ConfigurePipeTable() function
* - Added build test to verify correct compilation of all board drivers using all driver APIs
* - Added build test to verify correct compilation of all bootloaders using all supported devices
* - Added build test to verify that there are no detectable errors in the codebase via static analysis
* - Library Applications:
* - Modified the CDC Host demos to set a default CDC Line Encoding on enumerated devices
* - Added Dataflash operational checks and aborts to all projects using the Dataflash to ensure it is working correctly before use
......@@ -66,6 +69,7 @@
* defined (thanks to Steven Morehouse)
* - Fixed AVRISP-MKII programmer project reset line polarity inverted when the generated EEP file is loaded into the USB AVR's EEPROM and avr-dude is used
* - Fixed CDC and DFU bootloaders failing to compile when the bootloader section size is 8KB or more (thanks to Georg Glock)
* - Fixed CDC and DFU bootloaders API function offsets incorrect on some devices (thanks to Rod DeMay)
* - Fixed incorrect DFU version number reported to the host in the DFU bootloader descriptors (thanks to Georg Glock)
* - Fixed incorrect version hundredths value encoding in VERSION_BCD() macro (thanks to Georg Glock)
*
......
LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
View file @ 5cba3ce3
......@@ -216,9 +216,9 @@
static inline uint16_t Endpoint_BytesInEndpoint(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
static inline uint16_t Endpoint_BytesInEndpoint(void)
{
#if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
#if (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)) && !defined(__AVR_ATmega32U6__)
return UEBCX;
#elif defined(USB_SERIES_4_AVR)
#elif defined(USB_SERIES_4_AVR) || defined(__AVR_ATmega32U6__)
return (((uint16_t)UEBCHX << 8) | UEBCLX);
#elif defined(USB_SERIES_2_AVR)
return UEBCLX;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment