uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove BootloaderConfiguration alias.

Browse Source
This commit is contained in:
László Monda
2017-05-11 00:09:50 +02:00
parent 6d2d882787
commit 891b063786
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
left/src/main.c
View File

@@ -44,8 +44,7 @@ key_matrix_t keyMatrix = {
volatile bool DisableKeyMatrixScanState; volatile bool DisableKeyMatrixScanState;
typedef struct BootloaderConfiguration typedef struct {
{
uint32_t tag; // Magic number to verify bootloader configuration is valid. Must be set to 'kcfg'. uint32_t tag; // Magic number to verify bootloader configuration is valid. Must be set to 'kcfg'.
uint32_t reserved[3]; uint32_t reserved[3];
uint8_t enabledPeripherals; // Bitfield of peripherals to enable. uint8_t enabledPeripherals; // Bitfield of peripherals to enable.
@@ -61,8 +60,7 @@ typedef struct BootloaderConfiguration
uint8_t clockDivider; // Inverted value of the divider to use for core and bus clocks when in high speed mode. uint8_t clockDivider; // Inverted value of the divider to use for core and bus clocks when in high speed mode.
} bootloader_config_t; } bootloader_config_t;
__attribute__((section(".BootloaderConfig"))) const bootloader_config_t BootloaderConfig = __attribute__((section(".BootloaderConfig"))) const bootloader_config_t BootloaderConfig = {
{
.tag = 0x6766636B, // Magic Number .tag = 0x6766636B, // Magic Number
.enabledPeripherals = 0xE2, // Enabled Peripheral: I2C .enabledPeripherals = 0xE2, // Enabled Peripheral: I2C
.i2cSlaveAddress = 0x10, // Use user-defined I2C address .i2cSlaveAddress = 0x10, // Use user-defined I2C address