Merge branch 'maint/indent-ppdirectives'

Author: NickeZ

.clang-format

@@ -13,6 +13,7 @@ IndentCaseLabels: false
 PenaltyReturnTypeOnItsOwnLine: 1000
 SpacesBeforeTrailingComments: 1
 IncludeBlocks: Preserve
+IndentPPDirectives: BeforeHash
 # cmocka must come after some std includes
 IncludeCategories:
   - Regex:           '^(<|")cmocka'

src/atecc/atecc.c

@@ -51,7 +51,7 @@ typedef enum {
 // The Counter0/Counter1 values are overwritten at setup via atcab_write_config_counter().
 // Individual slot locking is performed at setup via atcab_lock_data_slot().
 #if (ATCA_ECC_CONFIG_SIZE != 128)
-#error "Unexpected configuration size"
+    #error "Unexpected configuration size"
 #endif
 // clang-format off
 static uint8_t _configuration[ATCA_ECC_CONFIG_SIZE] = {
@@ -510,7 +510,7 @@ static ATCA_STATUS _update_kdf_key(void)
     UTIL_CLEANUP_32(nonce_contribution);
     _interface_functions->random_32_bytes(nonce_contribution);
 #if NONCE_NUMIN_SIZE > 32
-#error "size mismatch"
+    #error "size mismatch"
 #endif
 
     ATCA_STATUS result = _authorize_key();
@@ -695,9 +695,9 @@ static bool _read_data_slot_block(uint8_t* bytes, uint16_t slot, uint8_t block)
     uint8_t nonce_contribution[32] = {0};
     UTIL_CLEANUP_32(nonce_contribution);
     _interface_functions->random_32_bytes(nonce_contribution);
-#if NONCE_NUMIN_SIZE > 32
-#error "size mismatch"
-#endif
+    #if NONCE_NUMIN_SIZE > 32
+        #error "size mismatch"
+    #endif
 
     ATCA_STATUS result = _authorize_key();
     if (result != ATCA_SUCCESS) {
@@ -718,9 +718,9 @@ static bool _write_data_slot_block(uint8_t* bytes, uint16_t slot, uint8_t block)
     uint8_t nonce_contribution[32] = {0};
     UTIL_CLEANUP_32(nonce_contribution);
     _interface_functions->random_32_bytes(nonce_contribution);
-#if NONCE_NUMIN_SIZE > 32
-#error "size mismatch"
-#endif
+    #if NONCE_NUMIN_SIZE > 32
+        #error "size mismatch"
+    #endif
 
     ATCA_STATUS result = _authorize_key();
     if (result != ATCA_SUCCESS) {

src/bootloader/bootloader.c

@@ -37,16 +37,16 @@
 #include <util.h>
 
 #if defined(BOOTLOADER_DEVDEVICE) || PLATFORM_BITBOX02PLUS == 1
-#include <memory/memory_spi.h>
-#include <qtouch/qtouch.h>
+    #include <memory/memory_spi.h>
+    #include <qtouch/qtouch.h>
 #endif
 
 #if PLATFORM_BITBOX02PLUS == 1
-#include <communication_mode.h>
-#include <da14531/da14531.h>
-#include <da14531/da14531_protocol.h>
-#include <uart.h>
-#include <utils_ringbuffer.h>
+    #include <communication_mode.h>
+    #include <da14531/da14531.h>
+    #include <da14531/da14531_protocol.h>
+    #include <uart.h>
+    #include <utils_ringbuffer.h>
 #endif
 
 #include <assert.h>
@@ -108,7 +108,7 @@ COMPILER_PACK_RESET()
 #define FIRMWARE_MAX_NUM_CHUNKS \
     (FLASH_APP_LEN / FIRMWARE_CHUNK_LEN) // app len must be a multiple of chunk len
 #if (FIRMWARE_MAX_NUM_CHUNKS > UINT8_MAX)
-#error "incompatible variable type"
+    #error "incompatible variable type"
 #endif
 
 // Be sure to not overflow boot data area
@@ -120,7 +120,7 @@ static_assert(sizeof(((boot_data_t*)0)->fields) <= FLASH_BOOTDATA_LEN, "boot_dat
         BOOT_SIG_LEN * BOOT_NUM_ROOT_SIGNING_KEYS + 4 /* firmware data version */ + \
         BOOT_SIG_LEN * BOOT_NUM_FIRMWARE_SIGNING_KEYS >                             \
     FIRMWARE_CHUNK_LEN)
-#error "incompatible bootloader data macro"
+    #error "incompatible bootloader data macro"
 #endif
 
 static bool _loading_ready = false;
@@ -142,7 +142,7 @@ static const uint8_t _empty_bare_flash_hash[SHA256_DIGEST_LENGTH] = {
     0x00, 0xb8, 0xaf, 0x3a, 0x79, 0xf8, 0xc6, 0x56, 0x4a, 0x9b, 0x02, 0xe1, 0x8a, 0xb8, 0x21, 0xae,
 };
 #if FLASH_APP_LEN != 884736
-#error "FLASH_APP_LEN changed; recompute _empty_bare_flash_hash"
+    #error "FLASH_APP_LEN changed; recompute _empty_bare_flash_hash"
 #endif
 
 #if PLATFORM_BITBOX02PLUS == 1
@@ -272,7 +272,7 @@ static void _binary_exec(void)
     int i;
 
 #if (FLASH_APP_START & 0x007F)
-#error "app start address not aligned"
+    #error "app start address not aligned"
 #else
     void* app_start_addr = (void*)FLASH_APP_START;
 #endif
@@ -1023,15 +1023,15 @@ static bool _devdevice_enter(secbool_u32 firmware_verified)
     } else {
         UG_PutString(0, SCREEN_HEIGHT - 9, "    No firmware found", false);
     }
-#if PLATFORM_BITBOX02PLUS == 1
+    #if PLATFORM_BITBOX02PLUS == 1
     struct da14531_firmware_version version;
     bool res = memory_spi_get_active_ble_firmware_version(&version);
     if (res) {
         char buf[50];
         snprintf(buf, sizeof(buf), "ble: %d (%s)", version.version, util_dbg_hex(version.hash, 4));
         UG_PutString(0, SCREEN_HEIGHT - 18, buf, false);
     }
-#endif
+    #endif
     uint16_t ypos = SCREEN_HEIGHT / 2 - 4;
     uint16_t xpos = SCREEN_WIDTH - 10;
     if (firmware_verified != sectrue_u32) {

src/bootloader/mpu_regions.c

@@ -16,13 +16,13 @@
 
 #ifndef TESTING
 
-#include <flags.h>
-#include <memory/mpu.h>
+    #include <flags.h>
+    #include <memory/mpu.h>
 
-#include <core_cm4.h>
-#include <samd51j20a.h>
+    #include <core_cm4.h>
+    #include <samd51j20a.h>
 
-#include <stdint.h>
+    #include <stdint.h>
 
 static void _set_mpu_regions(void)
 {

src/bootloader/startup.c

@@ -27,26 +27,26 @@
 #include <usb/usb_processing.h>
 
 #if defined(BOOTLOADER_DEVDEVICE) || PLATFORM_BITBOX02PLUS == 1
-#include <qtouch.h>
+    #include <qtouch.h>
 #endif
 
 #if PLATFORM_BITBOX02PLUS == 1
-#include <communication_mode.h>
-#include <da14531/da14531.h>
-#include <da14531/da14531_handler.h>
-#include <da14531/da14531_protocol.h>
-#include <memory/memory.h>
-#include <memory/memory_shared.h>
-#include <uart.h>
-#include <utils_ringbuffer.h>
-
-#if PRODUCT_BITBOX_PLUS_MULTI == 1
-#define DEVICE_MODE "{\"p\":\"bb02p-bl-multi\",\"v\":\"" BOOTLOADER_VERSION "\"}"
-#elif PRODUCT_BITBOX_PLUS_BTCONLY == 1
-#define DEVICE_MODE "{\"p\":\"bb02p-bl-btconly\",\"v\":\"" BOOTLOADER_VERSION "\"}"
-#else
-#error "unknown product"
-#endif
+    #include <communication_mode.h>
+    #include <da14531/da14531.h>
+    #include <da14531/da14531_handler.h>
+    #include <da14531/da14531_protocol.h>
+    #include <memory/memory.h>
+    #include <memory/memory_shared.h>
+    #include <uart.h>
+    #include <utils_ringbuffer.h>
+
+    #if PRODUCT_BITBOX_PLUS_MULTI == 1
+        #define DEVICE_MODE "{\"p\":\"bb02p-bl-multi\",\"v\":\"" BOOTLOADER_VERSION "\"}"
+    #elif PRODUCT_BITBOX_PLUS_BTCONLY == 1
+        #define DEVICE_MODE "{\"p\":\"bb02p-bl-btconly\",\"v\":\"" BOOTLOADER_VERSION "\"}"
+    #else
+        #error "unknown product"
+    #endif
 #endif // PLATFORM_BITBOX02PLUS == 1
 
 extern void __attribute__((noreturn)) __stack_chk_fail(void);
@@ -63,8 +63,8 @@ uint32_t __stack_chk_guard = 0;
 extern volatile bool measurement_done_touch;
 int bootloader_pairing_request = false;
 uint8_t bootloader_pairing_code_bytes[4] = {0};
-// Must be power of 2, must fit bond_db
-#define UART_OUT_BUF_LEN 2048
+    // Must be power of 2, must fit bond_db
+    #define UART_OUT_BUF_LEN 2048
 struct ringbuffer uart_write_queue;
 uint8_t uart_write_buf[UART_OUT_BUF_LEN];
 #endif

src/cipher/cipher.c

@@ -18,7 +18,7 @@
 #include <rust/rust.h>
 
 #ifdef TESTING
-#include <fake_cipher.h>
+    #include <fake_cipher.h>
 #endif
 
 bool cipher_aes_hmac_encrypt(

src/da14531/da14531_handler.c

@@ -70,7 +70,7 @@ static void _ble_pairing_callback(bool ok, void* param)
     _ble_pairing_component = NULL;
 }
 #else
-#include <bootloader/bootloader.h>
+    #include <bootloader/bootloader.h>
 extern bool bootloader_pairing_request;
 extern uint8_t bootloader_pairing_code_bytes[4];
 #endif

src/da14531/da14531_protocol.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <utils_assert.h>
 #ifndef TESTING
-#include "dap.h"
+    #include "dap.h"
 #endif
 
 #include <hardfault.h>

src/firmware.c

@@ -30,7 +30,7 @@
 #include <ui/oled/oled.h>
 
 #if APP_U2F == 1
-#include <u2f.h>
+    #include <u2f.h>
 #endif
 
 uint32_t __stack_chk_guard = 0;

src/firmware_main_loop.c

@@ -37,9 +37,9 @@
 #include <ui/fonts/monogram_5X9.h>
 #include <utils_ringbuffer.h>
 #if APP_U2F == 1
-#include "u2f.h"
-#include "u2f/u2f_packet.h"
-#include "usb/class/hid/u2f/hid_u2f.h"
+    #include "u2f.h"
+    #include "u2f/u2f_packet.h"
+    #include "usb/class/hid/u2f/hid_u2f.h"
 #endif
 
 // Must be power of 2