From bc3db793e9867567bc881942845c7d84c2b09e37 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 15 Jan 2012 14:07:14 +0000
Subject: [PATCH] Minor bootloader tweaks; make some functions static where
possible to reduce the compiled binary size, add additional comments to the
makefiles.
---
Bootloaders/CDC/BootloaderCDC.c | 4 ++--
Bootloaders/CDC/BootloaderCDC.h | 4 ++--
Bootloaders/CDC/makefile | 5 +++++
Bootloaders/DFU/BootloaderDFU.c | 4 ++--
Bootloaders/DFU/BootloaderDFU.h | 4 ++--
Bootloaders/DFU/makefile | 5 +++++
Bootloaders/HID/BootloaderHID.c | 2 +-
Bootloaders/HID/BootloaderHID.h | 2 +-
Bootloaders/HID/makefile | 4 ++++
9 files changed, 24 insertions(+), 10 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)
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)
diff --git a/Bootloaders/HID/BootloaderHID.c b/Bootloaders/HID/BootloaderHID.c
index 500d3fecb..d6ad84de7 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 e0f648f59..1f3fe99f2 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 3768320b3..853bcade0 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)
--
GitLab