diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2012-01-15 14:07:14 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-01-15 14:07:14 +0000 |
commit | bc3db793e9867567bc881942845c7d84c2b09e37 (patch) | |
tree | 61a1f5b0c81e24277890d184e4aa9d1005c3fd70 /Bootloaders/DFU | |
parent | 3038ea1c6ea8cbc1a0a61ea1674b6c097b6b006d (diff) | |
download | lufa-bc3db793e9867567bc881942845c7d84c2b09e37.tar.gz lufa-bc3db793e9867567bc881942845c7d84c2b09e37.tar.bz2 lufa-bc3db793e9867567bc881942845c7d84c2b09e37.zip |
Minor bootloader tweaks; make some functions static where possible to reduce the compiled binary size, add additional comments to the makefiles.
Diffstat (limited to 'Bootloaders/DFU')
-rw-r--r-- | Bootloaders/DFU/BootloaderDFU.c | 4 | ||||
-rw-r--r-- | Bootloaders/DFU/BootloaderDFU.h | 4 | ||||
-rw-r--r-- | Bootloaders/DFU/makefile | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 094801924..ba045856a 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -137,7 +137,7 @@ int main(void) } /** Configures all hardware required for the bootloader. */ -void SetupHardware(void) +static void SetupHardware(void) { /* Disable watchdog if enabled by bootloader/fuses */ MCUSR &= ~(1 << WDRF); @@ -160,7 +160,7 @@ void SetupHardware(void) } /** Resets all configured hardware required for the bootloader back to their original states. */ -void ResetHardware(void) +static void ResetHardware(void) { /* Shut down the USB subsystem */ USB_Disable(); diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h index 0c34c2c8c..2c10a1162 100644 --- a/Bootloaders/DFU/BootloaderDFU.h +++ b/Bootloaders/DFU/BootloaderDFU.h @@ -192,8 +192,8 @@ }; /* Function Prototypes: */ - void SetupHardware(void); - void ResetHardware(void); + static void SetupHardware(void); + static void ResetHardware(void); void EVENT_USB_Device_ControlRequest(void); diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index 87cfd072e..14cf3a46f 100644 --- a/Bootloaders/DFU/makefile +++ b/Bootloaders/DFU/makefile @@ -96,6 +96,11 @@ F_USB = $(F_CPU) # bytes, and so will need to be doubled to obtain the byte address needed by AVR-GCC. FLASH_SIZE_KB = 128 BOOT_SECTION_SIZE_KB = 4 + + +# Formulas used to calculate the starting address of the Bootloader section, and the User Application +# API jump table (for more information on the latter, see the bootloader documentation). These formulas +# should not need to be altered - modify the FLASH_SIZE_KB and BOOT_SECTION_KB values above instead. BOOT_START = 0x$(shell echo "obase=16; ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024" | bc) BOOT_API_TABLESTART = 0x$(shell echo "obase=16; (($(FLASH_SIZE_KB) * 1024) - 32)" | bc) |