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/CDC | |
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/CDC')
-rw-r--r-- | Bootloaders/CDC/BootloaderCDC.c | 4 | ||||
-rw-r--r-- | Bootloaders/CDC/BootloaderCDC.h | 4 | ||||
-rw-r--r-- | Bootloaders/CDC/makefile | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index 0e7920a15..c8ade7dcb 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -88,7 +88,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); @@ -350,7 +350,7 @@ static void WriteNextResponseByte(const uint8_t Response) /** Task to read in AVR910 commands from the CDC data OUT endpoint, process them, perform the required actions * and send the appropriate response back to the host. */ -void CDC_Task(void) +static void CDC_Task(void) { /* Select the OUT endpoint */ Endpoint_SelectEndpoint(CDC_RX_EPNUM); diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h index bfc8af585..7bd687d92 100644 --- a/Bootloaders/CDC/BootloaderCDC.h +++ b/Bootloaders/CDC/BootloaderCDC.h @@ -72,8 +72,8 @@ typedef void (*AppPtr_t)(void) ATTR_NO_RETURN; /* Function Prototypes: */ - void CDC_Task(void); - void SetupHardware(void); + static void CDC_Task(void); + static void SetupHardware(void); void EVENT_USB_Device_ConfigurationChanged(void); diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile index f98372dfb..850d9dfc8 100644 --- a/Bootloaders/CDC/makefile +++ b/Bootloaders/CDC/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) |