Merge remote-tracking branch 'upstream/master'

1 files changed, 24 insertions, 31 deletions

diff --git a/quantum/serial_link/protocol/byte_stuffer.c b/quantum/serial_link/protocol/byte_stuffer.c
index 2c87d64c2..d3a91d828 100644
--- a/quantum/serial_link/protocol/byte_stuffer.c
+++ b/quantum/serial_link/protocol/byte_stuffer.c
@@ -34,21 +34,21 @@ SOFTWARE.
 typedef struct byte_stuffer_state {
     uint16_t next_zero;
     uint16_t data_pos;
-    bool long_frame;
-    uint8_t data[MAX_FRAME_SIZE];
-}byte_stuffer_state_t;
+    bool     long_frame;
+    uint8_t  data[MAX_FRAME_SIZE];
+} byte_stuffer_state_t;
 
 static byte_stuffer_state_t states[NUM_LINKS];
 
 void init_byte_stuffer_state(byte_stuffer_state_t* state) {
-    state->next_zero = 0;
-    state->data_pos = 0;
+    state->next_zero  = 0;
+    state->data_pos   = 0;
     state->long_frame = false;
 }
 
 void init_byte_stuffer(void) {
     int i;
-    for (i=0;i<NUM_LINKS;i++) {
+    for (i = 0; i < NUM_LINKS; i++) {
         init_byte_stuffer_state(&states[i]);
     }
 }
@@ -57,9 +57,9 @@ void byte_stuffer_recv_byte(uint8_t link, uint8_t data) {
     byte_stuffer_state_t* state = &states[link];
     // Start of a new frame
     if (state->next_zero == 0) {
-        state->next_zero = data;
+        state->next_zero  = data;
         state->long_frame = data == 0xFF;
-        state->data_pos = 0;
+        state->data_pos   = 0;
         return;
     }
 
@@ -70,33 +70,28 @@ void byte_stuffer_recv_byte(uint8_t link, uint8_t data) {
             if (state->data_pos > 0) {
                 validator_recv_frame(link, state->data, state->data_pos);
             }
-        }
-        else {
+        } else {
             // The frame is invalid, so reset
             init_byte_stuffer_state(state);
         }
-    }
-    else {
+    } else {
         if (state->data_pos == MAX_FRAME_SIZE) {
             // We exceeded our maximum frame size
             // therefore there's nothing else to do than reset to a new frame
-            state->next_zero = data;
+            state->next_zero  = data;
             state->long_frame = data == 0xFF;
-            state->data_pos = 0;
-        }
-        else if (state->next_zero == 0) {
+            state->data_pos   = 0;
+        } else if (state->next_zero == 0) {
             if (state->long_frame) {
                 // This is part of a long frame, so continue
-                state->next_zero = data;
+                state->next_zero  = data;
                 state->long_frame = data == 0xFF;
-            }
-            else {
+            } else {
                 // Special case for zeroes
-                state->next_zero = data;
+                state->next_zero               = data;
                 state->data[state->data_pos++] = 0;
             }
-        }
-        else {
+        } else {
             state->data[state->data_pos++] = data;
         }
     }
@@ -105,7 +100,7 @@ void byte_stuffer_recv_byte(uint8_t link, uint8_t data) {
 static void send_block(uint8_t link, uint8_t* start, uint8_t* end, uint8_t num_non_zero) {
     send_data(link, &num_non_zero, 1);
     if (end > start) {
-        send_data(link, start, end-start);
+        send_data(link, start, end - start);
     }
 }
 
@@ -113,24 +108,22 @@ void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size) {
     const uint8_t zero = 0;
     if (size > 0) {
         uint16_t num_non_zero = 1;
-        uint8_t* end = data + size;
-        uint8_t* start = data;
+        uint8_t* end          = data + size;
+        uint8_t* start        = data;
         while (data < end) {
             if (num_non_zero == 0xFF) {
                 // There's more data after big non-zero block
                 // So send it, and start a new block
                 send_block(link, start, data, num_non_zero);
-                start = data;
+                start        = data;
                 num_non_zero = 1;
-            }
-            else {
+            } else {
                 if (*data == 0) {
                     // A zero encountered, so send the block
                     send_block(link, start, data, num_non_zero);
-                    start = data + 1;
+                    start        = data + 1;
                     num_non_zero = 1;
-                }
-                else {
+                } else {
                     num_non_zero++;
                 }
                 ++data;