Merge pull request ARMmbed#128 from ARMmbed/fix/astyle

Format with UC AStyle

Author: seankinghan

.astyleignore

@@ -0,0 +1,2 @@
+BUILD
+scripts

.astylerc

@@ -0,0 +1,59 @@
+# Mbed OS code style definition file for astyle
+
+# Don't create backup files, let git handle it
+suffix=none
+
+# K&R style
+style=kr
+
+# 1 TBS addition to k&r, add braces to one liners
+# Use -j as it was changed in astyle from brackets to braces, this way it is compatible with older astyle versions
+-j
+
+# 4 spaces, convert tabs to spaces
+indent=spaces=4
+convert-tabs
+
+# Indent switches and cases
+indent-switches
+
+# Remove spaces in and around parentheses
+unpad-paren
+
+# Insert a space after if, while, for, and around operators
+pad-header
+pad-oper
+
+# Pointer/reference operators go next to the name (on the right)
+align-pointer=name
+align-reference=name
+
+# Attach { for classes and namespaces
+attach-namespaces
+attach-classes
+
+# Extend longer lines, define maximum 120 value. This results in aligned code,
+# otherwise the lines are broken and not consistent 
+max-continuation-indent=120
+
+
+# Style formatting options for Update Client codebase.
+
+# Each line no greater than 120 characters.
+--max-code-length=120
+
+# Display only files that have been formatted.
+-Q
+
+# Keep one-line blocks, especially for union initialization of error structs.
+--keep-one-line-blocks
+
+# Indent pre-processor block
+# --indent-preproc-block
+
+# Delete empty lines
+# --delete-empty-lines
+
+# Attach the return type to a function definition or declaration.
+--attach-return-type # Definition
+--attach-return-type-decl # Declaration

firmware_update_test/firmware_update_test.cpp

@@ -36,8 +36,8 @@ void copyAppToSDCard(uint32_t firmware_size)
     arm_uc_firmware_details_t details = { 0 };
 
     tr_info("calculate firmware SHA256\r\n");
-    const uint8_t* appStart =
-        (const uint8_t*) (MBED_CONF_APP_APPLICATION_START_ADDRESS);
+    const uint8_t *appStart =
+        (const uint8_t *)(MBED_CONF_APP_APPLICATION_START_ADDRESS);
     mbedtls_sha256(appStart, firmware_size, details.hash, 0);
 
     details.version = UINT32_MAX - 1;
@@ -58,15 +58,11 @@ void copyAppToSDCard(uint32_t firmware_size)
     arm_uc_error_t ucp_status = ARM_UCP_Prepare(0, &details, &temp_buffer);
 
     /* wait for event if call was accepted */
-    if (ucp_status.error == ERR_NONE)
-    {
-        while (event_callback == CLEAR_EVENT)
-        {
+    if (ucp_status.error == ERR_NONE) {
+        while (event_callback == CLEAR_EVENT) {
             __WFI();
         }
-    }
-    else
-    {
+    } else {
         tr_error("ARM_UCP_Prepare failed\r\n");
     }
 
@@ -77,7 +73,7 @@ void copyAppToSDCard(uint32_t firmware_size)
     arm_uc_buffer_t write_buffer = {
         .size_max = firmware_size,
         .size     = firmware_size,
-        .ptr      = (uint8_t*) appStart
+        .ptr      = (uint8_t *) appStart
     };
 
     /* clear most recent event */
@@ -87,15 +83,11 @@ void copyAppToSDCard(uint32_t firmware_size)
     ucp_status = ARM_UCP_Write(0, 0, &write_buffer);
 
     /* wait for event if call was accepted */
-    if (ucp_status.error == ERR_NONE)
-    {
-        while (event_callback == CLEAR_EVENT)
-        {
+    if (ucp_status.error == ERR_NONE) {
+        while (event_callback == CLEAR_EVENT) {
             __WFI();
         }
-    }
-    else
-    {
+    } else {
         tr_error("ARM_UCP_Write failed\r\n");
     }
 
@@ -110,15 +102,11 @@ void copyAppToSDCard(uint32_t firmware_size)
     ucp_status = ARM_UCP_Finalize(0);
 
     /* wait for event if call was accepted */
-    if (ucp_status.error == ERR_NONE)
-    {
-        while (event_callback == CLEAR_EVENT)
-        {
+    if (ucp_status.error == ERR_NONE) {
+        while (event_callback == CLEAR_EVENT) {
             __WFI();
         }
-    }
-    else
-    {
+    } else {
         tr_error("ARM_UCP_Finalize failed\r\n");
     }
 }
@@ -138,18 +126,14 @@ void firmware_update_test_validate()
 
 void firmware_update_test_end()
 {
-    if (firmware_update_test_valid_flag)
-    {
+    if (firmware_update_test_valid_flag) {
         GREENTEA_TESTSUITE_RESULT(true);
-    }
-    else
-    {
+    } else {
         GREENTEA_TESTSUITE_RESULT(false);
     }
 
     /* test end block forever */
-    for (;;)
-    {
+    for (;;) {
         __WFI();
     }
 }

power_cut_test/bootloader_power_cut_test.cpp

@@ -23,7 +23,7 @@
 
 #include "bootloader_power_cut_test.h"
 
-DigitalOut JigTrigger(D2,0);
+DigitalOut JigTrigger(D2, 0);
 
 Timeout JigTimeout;
 
@@ -54,8 +54,7 @@ void power_cut_test_end()
     greentea_send_kv("power_cut_test_end", 0);
 
     /* test end block forever */
-    for (;;)
-    {
+    for (;;) {
         __WFI();
     }
 }