aboutsummaryrefslogtreecommitdiff
path: root/Bootloaders/HID
diff options
context:
space:
mode:
authorDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2012-01-15 14:07:14 +0000
committerDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2012-01-15 14:07:14 +0000
commit2f5bfe92e9017ef3afbc6025febbda482cf8f55d (patch)
tree61a1f5b0c81e24277890d184e4aa9d1005c3fd70 /Bootloaders/HID
parent8fe8bf573bd0ef5487f6bca540d86fcabe945796 (diff)
Minor bootloader tweaks; make some functions static where possible to reduce the compiled binary size, add additional comments to the makefiles.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2010 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Bootloaders/HID')
-rw-r--r--Bootloaders/HID/BootloaderHID.c2
-rw-r--r--Bootloaders/HID/BootloaderHID.h2
-rw-r--r--Bootloaders/HID/makefile4
3 files changed, 6 insertions, 2 deletions
diff --git a/Bootloaders/HID/BootloaderHID.c b/Bootloaders/HID/BootloaderHID.c
index 500d3fec..d6ad84de 100644
--- a/Bootloaders/HID/BootloaderHID.c
+++ b/Bootloaders/HID/BootloaderHID.c
@@ -65,7 +65,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);
diff --git a/Bootloaders/HID/BootloaderHID.h b/Bootloaders/HID/BootloaderHID.h
index e0f648f5..1f3fe99f 100644
--- a/Bootloaders/HID/BootloaderHID.h
+++ b/Bootloaders/HID/BootloaderHID.h
@@ -53,7 +53,7 @@
#define COMMAND_STARTAPPLICATION 0xFFFF
/* Function Prototypes: */
- void SetupHardware(void);
+ static void SetupHardware(void);
void EVENT_USB_Device_ConfigurationChanged(void);
void EVENT_USB_Device_UnhandledControlRequest(void);
diff --git a/Bootloaders/HID/makefile b/Bootloaders/HID/makefile
index 3768320b..853bcade 100644
--- a/Bootloaders/HID/makefile
+++ b/Bootloaders/HID/makefile
@@ -96,6 +96,10 @@ 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. 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)