From dbada9dd5d463dcd39283752cf37b79d0c0a8e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Fri, 22 Sep 2017 02:00:00 +0200 Subject: [PATCH] Extract DEFINE_BOOTLOADER_CONFIG_AREA() --- left/src/bootloader_config.c | 9 +-------- shared/bootloader.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/left/src/bootloader_config.c b/left/src/bootloader_config.c index 9bac24f..83bc15c 100644 --- a/left/src/bootloader_config.c +++ b/left/src/bootloader_config.c @@ -1,11 +1,4 @@ #include "bootloader.h" #include "i2c_addresses.h" -__attribute__((used, section(".BootloaderConfig"))) const bootloader_config_t BootloaderConfig = { - .tag = BOOTLOADER_TAG, - .enabledPeripherals = EnabledBootloaderPeripherial_I2c, - .i2cSlaveAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF_BOOTLOADER, - .peripheralDetectionTimeoutMs = BOOTLOADER_TIMEOUT_MS, - .clockFlags = CLOCK_FLAG_HIGH_SPEED_MODE, - .clockDivider = ~0 -}; +DEFINE_BOOTLOADER_CONFIG_AREA(I2C_ADDRESS_LEFT_KEYBOARD_HALF_BOOTLOADER) diff --git a/shared/bootloader.h b/shared/bootloader.h index aa6233f..108549a 100644 --- a/shared/bootloader.h +++ b/shared/bootloader.h @@ -12,6 +12,16 @@ #define BOOTLOADER_TIMEOUT_MS 100 #define CLOCK_FLAG_HIGH_SPEED_MODE 0x01 + #define DEFINE_BOOTLOADER_CONFIG_AREA(address) \ + __attribute__((used, section(".BootloaderConfig"))) const bootloader_config_t BootloaderConfig = { \ + .tag = BOOTLOADER_TAG, \ + .enabledPeripherals = EnabledBootloaderPeripherial_I2c, \ + .i2cSlaveAddress = address, \ + .peripheralDetectionTimeoutMs = BOOTLOADER_TIMEOUT_MS, \ + .clockFlags = CLOCK_FLAG_HIGH_SPEED_MODE, \ + .clockDivider = ~0 \ + }; + // Typedefs: typedef enum {