Reformat source files with clang-format

Author: monkbroc

.clang-format

@@ -0,0 +1,57 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -4
+ConstructorInitializerIndentWidth: 4
+AlignEscapedNewlinesLeft: false
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AlwaysBreakTemplateDeclarations: true
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeBinaryOperators: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BinPackParameters: true
+ColumnLimit:     100
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+DerivePointerAlignment: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: false
+IndentWrappedFunctionNames: false
+IndentFunctionDeclarationAfterType: false
+MaxEmptyLinesToKeep: 1
+KeepEmptyLinesAtTheStartOfBlocks: true
+NamespaceIndentation: None
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Left
+SpacesBeforeTrailingComments: 1
+Cpp11BracedListStyle: true
+Standard:        Cpp11
+IndentWidth:     4
+TabWidth:        8
+UseTab:          Never
+BreakBeforeBraces: Allman
+SpacesInParentheses: false
+SpacesInAngles:  false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 4
+CommentPragmas:  '^ IWYU pragma:'
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SpaceBeforeParens: ControlStatements
+DisableFormat:   false
+...
+

bootloader/src/core/dfu_usb.c

@@ -42,7 +42,7 @@ uint8_t DeviceStatus[6];
 
 /* Extern variables ----------------------------------------------------------*/
 /* Private function prototypes -----------------------------------------------*/
-static void IntToUnicode (uint32_t value , uint8_t *pbuf , uint8_t len);
+static void IntToUnicode(uint32_t value, uint8_t* pbuf, uint8_t len);
 
 /* Private functions ---------------------------------------------------------*/
 
@@ -105,8 +105,8 @@ void Get_SerialNum(void)
 
     if (Device_Serial0 != 0)
     {
-        IntToUnicode (Device_Serial0, &DFU_StringSerial[2] , 8);
-        IntToUnicode (Device_Serial1, &DFU_StringSerial[18], 4);
+        IntToUnicode(Device_Serial0, &DFU_StringSerial[2], 8);
+        IntToUnicode(Device_Serial1, &DFU_StringSerial[18], 4);
     }
 }
 
@@ -116,24 +116,24 @@ void Get_SerialNum(void)
  * Input          : None.
  * Return         : None.
  *******************************************************************************/
-static void IntToUnicode (uint32_t value , uint8_t *pbuf , uint8_t len)
+static void IntToUnicode(uint32_t value, uint8_t* pbuf, uint8_t len)
 {
     uint8_t idx = 0;
 
-    for( idx = 0 ; idx < len ; idx ++)
+    for (idx = 0; idx < len; idx++)
     {
-        if( ((value >> 28)) < 0xA )
+        if (((value >> 28)) < 0xA)
         {
-            pbuf[ 2* idx] = (value >> 28) + '0';
+            pbuf[2 * idx] = (value >> 28) + '0';
         }
         else
         {
-            pbuf[2* idx] = (value >> 28) + 'A' - 10;
+            pbuf[2 * idx] = (value >> 28) + 'A' - 10;
         }
 
         value = value << 4;
 
-        pbuf[ 2* idx + 1] = 0;
+        pbuf[2 * idx + 1] = 0;
     }
 }
 

bootloader/src/stm32f2xx/bkpreg_hal.c

@@ -1,4 +1,4 @@
 
-// pull in the sources from the HAL. It's a bit of a hack, but is simpler than trying to link the full
-// hal library.
+// pull in the sources from the HAL. It's a bit of a hack, but is simpler than trying to link the
+// full hal library.
 #include "../src/stm32f2xx/bkpreg_hal.c"

bootloader/src/stm32f2xx/dfu_usb.c

@@ -60,12 +60,10 @@ void HAL_DFU_USB_Init(void)
 {
     USBD_Init(&USB_OTG_dev,
 #ifdef USE_USB_OTG_FS
-            USB_OTG_FS_CORE_ID,
+              USB_OTG_FS_CORE_ID,
 #elif defined USE_USB_OTG_HS
-            USB_OTG_HS_CORE_ID,
+              USB_OTG_HS_CORE_ID,
 #endif
-            &USR_desc,
-            &DFU_cb,
-            NULL); //Passing NULL here to reduce bootloader flash requirements
+              &USR_desc, &DFU_cb,
+              NULL); // Passing NULL here to reduce bootloader flash requirements
 }
-

hal/src/core/bkpreg_hal.c

@@ -4,18 +4,22 @@
 
 int32_t HAL_Core_Backup_Register(uint32_t BKP_DR)
 {
-    switch(BKP_DR)
+    switch (BKP_DR)
     {
-        case BKP_DR_01: return BKP_DR1;  break;
-        case BKP_DR_10: return BKP_DR10; break;
+    case BKP_DR_01:
+        return BKP_DR1;
+        break;
+    case BKP_DR_10:
+        return BKP_DR10;
+        break;
     }
     return -1;
 }
 
 void HAL_Core_Write_Backup_Register(uint32_t BKP_DR, uint32_t Data)
 {
     uint32_t BKP_DR_Address = HAL_Core_Backup_Register(BKP_DR);
-    if(BKP_DR_Address != -1)
+    if (BKP_DR_Address != -1)
     {
         BKP_WriteBackupRegister(BKP_DR_Address, Data);
     }
@@ -24,10 +28,9 @@ void HAL_Core_Write_Backup_Register(uint32_t BKP_DR, uint32_t Data)
 uint32_t HAL_Core_Read_Backup_Register(uint32_t BKP_DR)
 {
     uint32_t BKP_DR_Address = HAL_Core_Backup_Register(BKP_DR);
-    if(BKP_DR_Address != -1)
+    if (BKP_DR_Address != -1)
     {
         return BKP_ReadBackupRegister(BKP_DR_Address);
     }
     return 0xFFFFFFFF;
 }
-

hal/src/gcc/core_hal.cpp

@@ -346,10 +346,9 @@ int HAL_System_Backup_Restore(size_t offset, void* buffer, size_t max_length, si
 
 #endif
 
-
 int32_t HAL_Core_Backup_Register(uint32_t BKP_DR)
 {
-	return -1;
+    return -1;
 }
 
 void HAL_Core_Write_Backup_Register(uint32_t BKP_DR, uint32_t Data)
@@ -358,6 +357,5 @@ void HAL_Core_Write_Backup_Register(uint32_t BKP_DR, uint32_t Data)
 
 uint32_t HAL_Core_Read_Backup_Register(uint32_t BKP_DR)
 {
-	return 0xFFFFFFFF;
+    return 0xFFFFFFFF;
 }
-

hal/src/stm32f2xx/bkpreg_hal.c

@@ -3,18 +3,22 @@
 
 int32_t HAL_Core_Backup_Register(uint32_t BKP_DR)
 {
-    switch(BKP_DR)
+    switch (BKP_DR)
     {
-        case BKP_DR_01: return RTC_BKP_DR1;  break;
-        case BKP_DR_10: return RTC_BKP_DR10; break;
+    case BKP_DR_01:
+        return RTC_BKP_DR1;
+        break;
+    case BKP_DR_10:
+        return RTC_BKP_DR10;
+        break;
     }
     return -1;
 }
 
 void HAL_Core_Write_Backup_Register(uint32_t BKP_DR, uint32_t Data)
 {
     uint32_t BKP_DR_Address = HAL_Core_Backup_Register(BKP_DR);
-    if(BKP_DR_Address != -1)
+    if (BKP_DR_Address != -1)
     {
         RTC_WriteBackupRegister(BKP_DR_Address, Data);
     }
@@ -23,7 +27,7 @@ void HAL_Core_Write_Backup_Register(uint32_t BKP_DR, uint32_t Data)
 uint32_t HAL_Core_Read_Backup_Register(uint32_t BKP_DR)
 {
     uint32_t BKP_DR_Address = HAL_Core_Backup_Register(BKP_DR);
-    if(BKP_DR_Address != -1)
+    if (BKP_DR_Address != -1)
     {
         return RTC_ReadBackupRegister(BKP_DR_Address);
     }

hal/src/template/core_hal.cpp

@@ -147,7 +147,7 @@ int HAL_Set_System_Config(hal_system_config_t config_item, const void* data, uns
 
 int32_t HAL_Core_Backup_Register(uint32_t BKP_DR)
 {
-	return -1;
+    return -1;
 }
 
 void HAL_Core_Write_Backup_Register(uint32_t BKP_DR, uint32_t Data)
@@ -156,6 +156,5 @@ void HAL_Core_Write_Backup_Register(uint32_t BKP_DR, uint32_t Data)
 
 uint32_t HAL_Core_Read_Backup_Register(uint32_t BKP_DR)
 {
-	return 0xFFFFFFFF;
+    return 0xFFFFFFFF;
 }
-

system/inc/system_update.h

@@ -102,18 +102,18 @@ typedef enum
      */
     SYSTEM_FLAG_RESET_ENABLED,
 
-	/**
-	 * A persistent flag that when set will cause the system to startup
-	 * in listening mode if booting in safe mode. The flag is automatically
-	 * cleared on reboot.
-	 */
-	SYSTEM_FLAG_STARTUP_SAFE_LISTEN_MODE,
+    /**
+     * A persistent flag that when set will cause the system to startup
+     * in listening mode if booting in safe mode. The flag is automatically
+     * cleared on reboot.
+     */
+    SYSTEM_FLAG_STARTUP_SAFE_LISTEN_MODE,
 
     /**
      * When 0, the application code is not paused.
      * When 1, the application code is paused.
      */
-    //SYSTEM_FLAG_APPLICATION_PAUSED=4,
+    // SYSTEM_FLAG_APPLICATION_PAUSED=4,
 
     SYSTEM_FLAG_MAX
 

system/inc/system_ymodem.h

@@ -30,7 +30,6 @@ extern "C" {
 
 bool Ymodem_Serial_Flash_Update(Stream *serialObj, FileTransfer::Descriptor& desc, void*);
 
-
 #ifdef __cplusplus
 }
 #endif
@@ -40,7 +39,6 @@ class YModem
     Stream& stream;
 
 public:
-
     enum protocol_params_t
     {
         PACKET_SEQNO_INDEX = 1,
@@ -59,16 +57,16 @@ class YModem
 
     enum protocol_msg_t
     {
-        SOH = (0x01), /* start of 128-byte data packet */
-        STX = (0x02), /* start of 1024-byte data packet */
-        EOT = (0x04), /* end of transmission */
-        ACK = (0x06), /* acknowledge */
-        NAK = (0x15), /* negative acknowledge */
-        CA = (0x18), /* two of these in succession aborts transfer */
+        SOH = (0x01),   /* start of 128-byte data packet */
+        STX = (0x02),   /* start of 1024-byte data packet */
+        EOT = (0x04),   /* end of transmission */
+        ACK = (0x06),   /* acknowledge */
+        NAK = (0x15),   /* negative acknowledge */
+        CA = (0x18),    /* two of these in succession aborts transfer */
         CRC16 = (0x43), /* 'C' == 0x43, request 16-bit CRC */
 
         ABORT1 = (0x41), /* 'A' == 0x41, abort by user */
-        ABORT2 = (0x61) /* 'a' == 0x61, abort by user */
+        ABORT2 = (0x61)  /* 'a' == 0x61, abort by user */
     };
 
     struct file_desc_t
@@ -77,12 +75,12 @@ class YModem
         char file_size[FILE_SIZE_LENGTH];
     };
 
-    YModem(Stream& stream_) : stream(stream_) { }
-
+    YModem(Stream& stream_) : stream(stream_)
+    {
+    }
 
     int32_t receive_file(FileTransfer::Descriptor& tx, file_desc_t& file_info);
 
-
 private:
     uint8_t packet_data[YModem::PACKET_1K_SIZE + YModem::PACKET_OVERHEAD];
     int32_t session_done, file_done, packets_received, errors, session_begin;
@@ -111,11 +109,9 @@ class YModem
     //#define CMD_STRING_SIZE         128
 
     int32_t receive_packet(uint8_t* data, int32_t& length, uint32_t timeout);
-    int32_t handle_packet(uint8_t* packet_data, int32_t packet_length, FileTransfer::Descriptor& tx, file_desc_t& desc);
+    int32_t handle_packet(uint8_t* packet_data, int32_t packet_length, FileTransfer::Descriptor& tx,
+                          file_desc_t& desc);
     void parse_file_packet(FileTransfer::Descriptor& tx, file_desc_t& desc, uint8_t* packet_data);
-
 };
 
-
 #endif /* SYSTEM_YMODEM_H */
-