aboutsummaryrefslogtreecommitdiff
path: root/quantum/serial_link
diff options
context:
space:
mode:
Diffstat (limited to 'quantum/serial_link')
-rw-r--r--quantum/serial_link/protocol/byte_stuffer.c55
-rw-r--r--quantum/serial_link/protocol/frame_router.c23
-rw-r--r--quantum/serial_link/protocol/frame_validator.c80
-rw-r--r--quantum/serial_link/protocol/transport.c61
-rw-r--r--quantum/serial_link/protocol/transport.h168
-rw-r--r--quantum/serial_link/protocol/triple_buffered_object.c7
-rw-r--r--quantum/serial_link/protocol/triple_buffered_object.h14
-rw-r--r--quantum/serial_link/system/serial_link.c113
-rw-r--r--quantum/serial_link/system/serial_link.h26
-rw-r--r--quantum/serial_link/tests/byte_stuffer_tests.cpp211
-rw-r--r--quantum/serial_link/tests/frame_router_tests.cpp81
-rw-r--r--quantum/serial_link/tests/frame_validator_tests.cpp45
-rw-r--r--quantum/serial_link/tests/transport_tests.cpp28
-rw-r--r--quantum/serial_link/tests/triple_buffered_object_tests.cpp18
14 files changed, 354 insertions, 576 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.
34typedef struct byte_stuffer_state { 34typedef struct byte_stuffer_state {
35 uint16_t next_zero; 35 uint16_t next_zero;
36 uint16_t data_pos; 36 uint16_t data_pos;
37 bool long_frame; 37 bool long_frame;
38 uint8_t data[MAX_FRAME_SIZE]; 38 uint8_t data[MAX_FRAME_SIZE];
39}byte_stuffer_state_t; 39} byte_stuffer_state_t;
40 40
41static byte_stuffer_state_t states[NUM_LINKS]; 41static byte_stuffer_state_t states[NUM_LINKS];
42 42
43void init_byte_stuffer_state(byte_stuffer_state_t* state) { 43void init_byte_stuffer_state(byte_stuffer_state_t* state) {
44 state->next_zero = 0; 44 state->next_zero = 0;
45 state->data_pos = 0; 45 state->data_pos = 0;
46 state->long_frame = false; 46 state->long_frame = false;
47} 47}
48 48
49void init_byte_stuffer(void) { 49void init_byte_stuffer(void) {
50 int i; 50 int i;
51 for (i=0;i<NUM_LINKS;i++) { 51 for (i = 0; i < NUM_LINKS; i++) {
52 init_byte_stuffer_state(&states[i]); 52 init_byte_stuffer_state(&states[i]);
53 } 53 }
54} 54}
@@ -57,9 +57,9 @@ void byte_stuffer_recv_byte(uint8_t link, uint8_t data) {
57 byte_stuffer_state_t* state = &states[link]; 57 byte_stuffer_state_t* state = &states[link];
58 // Start of a new frame 58 // Start of a new frame
59 if (state->next_zero == 0) { 59 if (state->next_zero == 0) {
60 state->next_zero = data; 60 state->next_zero = data;
61 state->long_frame = data == 0xFF; 61 state->long_frame = data == 0xFF;
62 state->data_pos = 0; 62 state->data_pos = 0;
63 return; 63 return;
64 } 64 }
65 65
@@ -70,33 +70,28 @@ void byte_stuffer_recv_byte(uint8_t link, uint8_t data) {
70 if (state->data_pos > 0) { 70 if (state->data_pos > 0) {
71 validator_recv_frame(link, state->data, state->data_pos); 71 validator_recv_frame(link, state->data, state->data_pos);
72 } 72 }
73 } 73 } else {
74 else {
75 // The frame is invalid, so reset 74 // The frame is invalid, so reset
76 init_byte_stuffer_state(state); 75 init_byte_stuffer_state(state);
77 } 76 }
78 } 77 } else {
79 else {
80 if (state->data_pos == MAX_FRAME_SIZE) { 78 if (state->data_pos == MAX_FRAME_SIZE) {
81 // We exceeded our maximum frame size 79 // We exceeded our maximum frame size
82 // therefore there's nothing else to do than reset to a new frame 80 // therefore there's nothing else to do than reset to a new frame
83 state->next_zero = data; 81 state->next_zero = data;
84 state->long_frame = data == 0xFF; 82 state->long_frame = data == 0xFF;
85 state->data_pos = 0; 83 state->data_pos = 0;
86 } 84 } else if (state->next_zero == 0) {
87 else if (state->next_zero == 0) {
88 if (state->long_frame) { 85 if (state->long_frame) {
89 // This is part of a long frame, so continue 86 // This is part of a long frame, so continue
90 state->next_zero = data; 87 state->next_zero = data;
91 state->long_frame = data == 0xFF; 88 state->long_frame = data == 0xFF;
92 } 89 } else {
93 else {
94 // Special case for zeroes 90 // Special case for zeroes
95 state->next_zero = data; 91 state->next_zero = data;
96 state->data[state->data_pos++] = 0; 92 state->data[state->data_pos++] = 0;
97 } 93 }
98 } 94 } else {
99 else {
100 state->data[state->data_pos++] = data; 95 state->data[state->data_pos++] = data;
101 } 96 }
102 } 97 }
@@ -105,7 +100,7 @@ void byte_stuffer_recv_byte(uint8_t link, uint8_t data) {
105static void send_block(uint8_t link, uint8_t* start, uint8_t* end, uint8_t num_non_zero) { 100static void send_block(uint8_t link, uint8_t* start, uint8_t* end, uint8_t num_non_zero) {
106 send_data(link, &num_non_zero, 1); 101 send_data(link, &num_non_zero, 1);
107 if (end > start) { 102 if (end > start) {
108 send_data(link, start, end-start); 103 send_data(link, start, end - start);
109 } 104 }
110} 105}
111 106
@@ -113,24 +108,22 @@ void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size) {
113 const uint8_t zero = 0; 108 const uint8_t zero = 0;
114 if (size > 0) { 109 if (size > 0) {
115 uint16_t num_non_zero = 1; 110 uint16_t num_non_zero = 1;
116 uint8_t* end = data + size; 111 uint8_t* end = data + size;
117 uint8_t* start = data; 112 uint8_t* start = data;
118 while (data < end) { 113 while (data < end) {
119 if (num_non_zero == 0xFF) { 114 if (num_non_zero == 0xFF) {
120 // There's more data after big non-zero block 115 // There's more data after big non-zero block
121 // So send it, and start a new block 116 // So send it, and start a new block
122 send_block(link, start, data, num_non_zero); 117 send_block(link, start, data, num_non_zero);
123 start = data; 118 start = data;
124 num_non_zero = 1; 119 num_non_zero = 1;
125 } 120 } else {
126 else {
127 if (*data == 0) { 121 if (*data == 0) {
128 // A zero encountered, so send the block 122 // A zero encountered, so send the block
129 send_block(link, start, data, num_non_zero); 123 send_block(link, start, data, num_non_zero);
130 start = data + 1; 124 start = data + 1;
131 num_non_zero = 1; 125 num_non_zero = 1;
132 } 126 } else {
133 else {
134 num_non_zero++; 127 num_non_zero++;
135 } 128 }
136 ++data; 129 ++data;
diff --git a/quantum/serial_link/protocol/frame_router.c b/quantum/serial_link/protocol/frame_router.c
index 04b8c2e75..529267370 100644
--- a/quantum/serial_link/protocol/frame_router.c
+++ b/quantum/serial_link/protocol/frame_router.c
@@ -28,26 +28,22 @@ SOFTWARE.
28 28
29static bool is_master; 29static bool is_master;
30 30
31void router_set_master(bool master) { 31void router_set_master(bool master) { is_master = master; }
32 is_master = master;
33}
34 32
35void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size){ 33void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size) {
36 if (is_master) { 34 if (is_master) {
37 if (link == DOWN_LINK) { 35 if (link == DOWN_LINK) {
38 transport_recv_frame(data[size-1], data, size - 1); 36 transport_recv_frame(data[size - 1], data, size - 1);
39 } 37 }
40 } 38 } else {
41 else {
42 if (link == UP_LINK) { 39 if (link == UP_LINK) {
43 if (data[size-1] & 1) { 40 if (data[size - 1] & 1) {
44 transport_recv_frame(0, data, size - 1); 41 transport_recv_frame(0, data, size - 1);
45 } 42 }
46 data[size-1] >>= 1; 43 data[size - 1] >>= 1;
47 validator_send_frame(DOWN_LINK, data, size); 44 validator_send_frame(DOWN_LINK, data, size);
48 } 45 } else {
49 else { 46 data[size - 1]++;
50 data[size-1]++;
51 validator_send_frame(UP_LINK, data, size); 47 validator_send_frame(UP_LINK, data, size);
52 } 48 }
53 } 49 }
@@ -59,8 +55,7 @@ void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) {
59 data[size] = 1; 55 data[size] = 1;
60 validator_send_frame(UP_LINK, data, size + 1); 56 validator_send_frame(UP_LINK, data, size + 1);
61 } 57 }
62 } 58 } else {
63 else {
64 if (is_master) { 59 if (is_master) {
65 data[size] = destination; 60 data[size] = destination;
66 validator_send_frame(DOWN_LINK, data, size + 1); 61 validator_send_frame(DOWN_LINK, data, size + 1);
diff --git a/quantum/serial_link/protocol/frame_validator.c b/quantum/serial_link/protocol/frame_validator.c
index 474f80ee8..bc9136f70 100644
--- a/quantum/serial_link/protocol/frame_validator.c
+++ b/quantum/serial_link/protocol/frame_validator.c
@@ -27,78 +27,14 @@ SOFTWARE.
27#include "serial_link/protocol/byte_stuffer.h" 27#include "serial_link/protocol/byte_stuffer.h"
28#include <string.h> 28#include <string.h>
29 29
30const uint32_t poly8_lookup[256] = 30const uint32_t poly8_lookup[256] = {0, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
31{ 31 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
32 0, 0x77073096, 0xEE0E612C, 0x990951BA, 32 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
33 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 33 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D};
34 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
35 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
36 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
37 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
38 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
39 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
40 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
41 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
42 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
43 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
44 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
45 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
46 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
47 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
48 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
49 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
50 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
51 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
52 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
53 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
54 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
55 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
56 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
57 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
58 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
59 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
60 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
61 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
62 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
63 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
64 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
65 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
66 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
67 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
68 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
69 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
70 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
71 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
72 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
73 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
74 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
75 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
76 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
77 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
78 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
79 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
80 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
81 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
82 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
83 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
84 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
85 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
86 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
87 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
88 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
89 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
90 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
91 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
92 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
93 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
94 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
95 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
96};
97 34
98static uint32_t crc32_byte(uint8_t *p, uint32_t bytelength) 35static uint32_t crc32_byte(uint8_t* p, uint32_t bytelength) {
99{
100 uint32_t crc = 0xffffffff; 36 uint32_t crc = 0xffffffff;
101 while (bytelength-- !=0) crc = poly8_lookup[((uint8_t) crc ^ *(p++))] ^ (crc >> 8); 37 while (bytelength-- != 0) crc = poly8_lookup[((uint8_t)crc ^ *(p++))] ^ (crc >> 8);
102 // return (~crc); also works 38 // return (~crc); also works
103 return (crc ^ 0xffffffff); 39 return (crc ^ 0xffffffff);
104} 40}
@@ -106,10 +42,10 @@ static uint32_t crc32_byte(uint8_t *p, uint32_t bytelength)
106void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size) { 42void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size) {
107 if (size > 4) { 43 if (size > 4) {
108 uint32_t frame_crc; 44 uint32_t frame_crc;
109 memcpy(&frame_crc, data + size -4, 4); 45 memcpy(&frame_crc, data + size - 4, 4);
110 uint32_t expected_crc = crc32_byte(data, size - 4); 46 uint32_t expected_crc = crc32_byte(data, size - 4);
111 if (frame_crc == expected_crc) { 47 if (frame_crc == expected_crc) {
112 route_incoming_frame(link, data, size-4); 48 route_incoming_frame(link, data, size - 4);
113 } 49 }
114 } 50 }
115} 51}
diff --git a/quantum/serial_link/protocol/transport.c b/quantum/serial_link/protocol/transport.c
index ff795fe20..73b8dc62e 100644
--- a/quantum/serial_link/protocol/transport.c
+++ b/quantum/serial_link/protocol/transport.c
@@ -29,42 +29,38 @@ SOFTWARE.
29 29
30#define MAX_REMOTE_OBJECTS 16 30#define MAX_REMOTE_OBJECTS 16
31static remote_object_t* remote_objects[MAX_REMOTE_OBJECTS]; 31static remote_object_t* remote_objects[MAX_REMOTE_OBJECTS];
32static uint32_t num_remote_objects = 0; 32static uint32_t num_remote_objects = 0;
33 33
34void reinitialize_serial_link_transport(void) { 34void reinitialize_serial_link_transport(void) { num_remote_objects = 0; }
35 num_remote_objects = 0;
36}
37 35
38void add_remote_objects(remote_object_t** _remote_objects, uint32_t _num_remote_objects) { 36void add_remote_objects(remote_object_t** _remote_objects, uint32_t _num_remote_objects) {
39 unsigned int i; 37 unsigned int i;
40 for(i=0;i<_num_remote_objects;i++) { 38 for (i = 0; i < _num_remote_objects; i++) {
41 remote_object_t* obj = _remote_objects[i]; 39 remote_object_t* obj = _remote_objects[i];
42 remote_objects[num_remote_objects++] = obj; 40 remote_objects[num_remote_objects++] = obj;
43 if (obj->object_type == MASTER_TO_ALL_SLAVES) { 41 if (obj->object_type == MASTER_TO_ALL_SLAVES) {
44 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; 42 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer;
45 triple_buffer_init(tb); 43 triple_buffer_init(tb);
46 uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); 44 uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);
47 tb = (triple_buffer_object_t*)start; 45 tb = (triple_buffer_object_t*)start;
48 triple_buffer_init(tb); 46 triple_buffer_init(tb);
49 } 47 } else if (obj->object_type == MASTER_TO_SINGLE_SLAVE) {
50 else if(obj->object_type == MASTER_TO_SINGLE_SLAVE) { 48 uint8_t* start = obj->buffer;
51 uint8_t* start = obj->buffer;
52 unsigned int j; 49 unsigned int j;
53 for (j=0;j<NUM_SLAVES;j++) { 50 for (j = 0; j < NUM_SLAVES; j++) {
54 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; 51 triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
55 triple_buffer_init(tb); 52 triple_buffer_init(tb);
56 start += LOCAL_OBJECT_SIZE(obj->object_size); 53 start += LOCAL_OBJECT_SIZE(obj->object_size);
57 } 54 }
58 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; 55 triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
59 triple_buffer_init(tb); 56 triple_buffer_init(tb);
60 } 57 } else {
61 else { 58 uint8_t* start = obj->buffer;
62 uint8_t* start = obj->buffer; 59 triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
63 triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
64 triple_buffer_init(tb); 60 triple_buffer_init(tb);
65 start += LOCAL_OBJECT_SIZE(obj->object_size); 61 start += LOCAL_OBJECT_SIZE(obj->object_size);
66 unsigned int j; 62 unsigned int j;
67 for (j=0;j<NUM_SLAVES;j++) { 63 for (j = 0; j < NUM_SLAVES; j++) {
68 tb = (triple_buffer_object_t*)start; 64 tb = (triple_buffer_object_t*)start;
69 triple_buffer_init(tb); 65 triple_buffer_init(tb);
70 start += REMOTE_OBJECT_SIZE(obj->object_size); 66 start += REMOTE_OBJECT_SIZE(obj->object_size);
@@ -74,23 +70,21 @@ void add_remote_objects(remote_object_t** _remote_objects, uint32_t _num_remote_
74} 70}
75 71
76void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) { 72void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) {
77 uint8_t id = data[size-1]; 73 uint8_t id = data[size - 1];
78 if (id < num_remote_objects) { 74 if (id < num_remote_objects) {
79 remote_object_t* obj = remote_objects[id]; 75 remote_object_t* obj = remote_objects[id];
80 if (obj->object_size == size - 1) { 76 if (obj->object_size == size - 1) {
81 uint8_t* start; 77 uint8_t* start;
82 if (obj->object_type == MASTER_TO_ALL_SLAVES) { 78 if (obj->object_type == MASTER_TO_ALL_SLAVES) {
83 start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); 79 start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);
84 } 80 } else if (obj->object_type == SLAVE_TO_MASTER) {
85 else if(obj->object_type == SLAVE_TO_MASTER) {
86 start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); 81 start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);
87 start += (from - 1) * REMOTE_OBJECT_SIZE(obj->object_size); 82 start += (from - 1) * REMOTE_OBJECT_SIZE(obj->object_size);
88 } 83 } else {
89 else {
90 start = obj->buffer + NUM_SLAVES * LOCAL_OBJECT_SIZE(obj->object_size); 84 start = obj->buffer + NUM_SLAVES * LOCAL_OBJECT_SIZE(obj->object_size);
91 } 85 }
92 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; 86 triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
93 void* ptr = triple_buffer_begin_write_internal(obj->object_size, tb); 87 void* ptr = triple_buffer_begin_write_internal(obj->object_size, tb);
94 memcpy(ptr, data, size - 1); 88 memcpy(ptr, data, size - 1);
95 triple_buffer_end_write_internal(tb); 89 triple_buffer_end_write_internal(tb);
96 } 90 }
@@ -99,26 +93,25 @@ void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) {
99 93
100void update_transport(void) { 94void update_transport(void) {
101 unsigned int i; 95 unsigned int i;
102 for(i=0;i<num_remote_objects;i++) { 96 for (i = 0; i < num_remote_objects; i++) {
103 remote_object_t* obj = remote_objects[i]; 97 remote_object_t* obj = remote_objects[i];
104 if (obj->object_type == MASTER_TO_ALL_SLAVES || obj->object_type == SLAVE_TO_MASTER) { 98 if (obj->object_type == MASTER_TO_ALL_SLAVES || obj->object_type == SLAVE_TO_MASTER) {
105 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; 99 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer;
106 uint8_t* ptr = (uint8_t*)triple_buffer_read_internal(obj->object_size + LOCAL_OBJECT_EXTRA, tb); 100 uint8_t* ptr = (uint8_t*)triple_buffer_read_internal(obj->object_size + LOCAL_OBJECT_EXTRA, tb);
107 if (ptr) { 101 if (ptr) {
108 ptr[obj->object_size] = i; 102 ptr[obj->object_size] = i;
109 uint8_t dest = obj->object_type == MASTER_TO_ALL_SLAVES ? 0xFF : 0; 103 uint8_t dest = obj->object_type == MASTER_TO_ALL_SLAVES ? 0xFF : 0;
110 router_send_frame(dest, ptr, obj->object_size + 1); 104 router_send_frame(dest, ptr, obj->object_size + 1);
111 } 105 }
112 } 106 } else {
113 else { 107 uint8_t* start = obj->buffer;
114 uint8_t* start = obj->buffer;
115 unsigned int j; 108 unsigned int j;
116 for (j=0;j<NUM_SLAVES;j++) { 109 for (j = 0; j < NUM_SLAVES; j++) {
117 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; 110 triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
118 uint8_t* ptr = (uint8_t*)triple_buffer_read_internal(obj->object_size + LOCAL_OBJECT_EXTRA, tb); 111 uint8_t* ptr = (uint8_t*)triple_buffer_read_internal(obj->object_size + LOCAL_OBJECT_EXTRA, tb);
119 if (ptr) { 112 if (ptr) {
120 ptr[obj->object_size] = i; 113 ptr[obj->object_size] = i;
121 uint8_t dest = j + 1; 114 uint8_t dest = j + 1;
122 router_send_frame(dest, ptr, obj->object_size + 1); 115 router_send_frame(dest, ptr, obj->object_size + 1);
123 } 116 }
124 start += LOCAL_OBJECT_SIZE(obj->object_size); 117 start += LOCAL_OBJECT_SIZE(obj->object_size);
diff --git a/quantum/serial_link/protocol/transport.h b/quantum/serial_link/protocol/transport.h
index 2c5d890b2..309a56b00 100644
--- a/quantum/serial_link/protocol/transport.h
+++ b/quantum/serial_link/protocol/transport.h
@@ -42,104 +42,94 @@ typedef enum {
42 42
43typedef struct { 43typedef struct {
44 remote_object_type object_type; 44 remote_object_type object_type;
45 uint16_t object_size; 45 uint16_t object_size;
46 uint8_t buffer[] __attribute__((aligned(4))); 46 uint8_t buffer[] __attribute__((aligned(4)));
47} remote_object_t; 47} remote_object_t;
48 48
49#define REMOTE_OBJECT_SIZE(objectsize) \ 49#define REMOTE_OBJECT_SIZE(objectsize) (sizeof(triple_buffer_object_t) + objectsize * 3)
50 (sizeof(triple_buffer_object_t) + objectsize * 3) 50#define LOCAL_OBJECT_SIZE(objectsize) (sizeof(triple_buffer_object_t) + (objectsize + LOCAL_OBJECT_EXTRA) * 3)
51#define LOCAL_OBJECT_SIZE(objectsize) \ 51
52 (sizeof(triple_buffer_object_t) + (objectsize + LOCAL_OBJECT_EXTRA) * 3) 52#define REMOTE_OBJECT_HELPER(name, type, num_local, num_remote) \
53 53 typedef struct { \
54#define REMOTE_OBJECT_HELPER(name, type, num_local, num_remote) \ 54 remote_object_t object; \
55typedef struct { \ 55 uint8_t buffer[num_remote * REMOTE_OBJECT_SIZE(sizeof(type)) + num_local * LOCAL_OBJECT_SIZE(sizeof(type))]; \
56 remote_object_t object; \ 56 } remote_object_##name##_t;
57 uint8_t buffer[ \ 57
58 num_remote * REMOTE_OBJECT_SIZE(sizeof(type)) + \ 58#define MASTER_TO_ALL_SLAVES_OBJECT(name, type) \
59 num_local * LOCAL_OBJECT_SIZE(sizeof(type))]; \ 59 REMOTE_OBJECT_HELPER(name, type, 1, 1) \
60} remote_object_##name##_t; 60 remote_object_##name##_t remote_object_##name = {.object = { \
61 61 .object_type = MASTER_TO_ALL_SLAVES, \
62#define MASTER_TO_ALL_SLAVES_OBJECT(name, type) \ 62 .object_size = sizeof(type), \
63 REMOTE_OBJECT_HELPER(name, type, 1, 1) \ 63 }}; \
64 remote_object_##name##_t remote_object_##name = { \ 64 type* begin_write_##name(void) { \
65 .object = { \ 65 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
66 .object_type = MASTER_TO_ALL_SLAVES, \ 66 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
67 .object_size = sizeof(type), \
68 } \
69 }; \
70 type* begin_write_##name(void) { \
71 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
72 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
73 return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \ 67 return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \
74 }\ 68 } \
75 void end_write_##name(void) { \ 69 void end_write_##name(void) { \
76 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ 70 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
77 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \ 71 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
78 triple_buffer_end_write_internal(tb); \ 72 triple_buffer_end_write_internal(tb); \
79 signal_data_written(); \ 73 signal_data_written(); \
80 }\ 74 } \
81 type* read_##name(void) { \ 75 type* read_##name(void) { \
82 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ 76 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
83 uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);\ 77 uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); \
84 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ 78 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
85 return (type*)triple_buffer_read_internal(obj->object_size, tb); \ 79 return (type*)triple_buffer_read_internal(obj->object_size, tb); \
86 } 80 }
87 81
88#define MASTER_TO_SINGLE_SLAVE_OBJECT(name, type) \ 82#define MASTER_TO_SINGLE_SLAVE_OBJECT(name, type) \
89 REMOTE_OBJECT_HELPER(name, type, NUM_SLAVES, 1) \ 83 REMOTE_OBJECT_HELPER(name, type, NUM_SLAVES, 1) \
90 remote_object_##name##_t remote_object_##name = { \ 84 remote_object_##name##_t remote_object_##name = {.object = { \
91 .object = { \ 85 .object_type = MASTER_TO_SINGLE_SLAVE, \
92 .object_type = MASTER_TO_SINGLE_SLAVE, \ 86 .object_size = sizeof(type), \
93 .object_size = sizeof(type), \ 87 }}; \
94 } \ 88 type* begin_write_##name(uint8_t slave) { \
95 }; \ 89 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
96 type* begin_write_##name(uint8_t slave) { \ 90 uint8_t* start = obj->buffer; \
97 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ 91 start += slave * LOCAL_OBJECT_SIZE(obj->object_size); \
98 uint8_t* start = obj->buffer;\ 92 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
99 start += slave * LOCAL_OBJECT_SIZE(obj->object_size); \
100 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
101 return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \ 93 return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \
102 }\ 94 } \
103 void end_write_##name(uint8_t slave) { \ 95 void end_write_##name(uint8_t slave) { \
104 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ 96 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
105 uint8_t* start = obj->buffer;\ 97 uint8_t* start = obj->buffer; \
106 start += slave * LOCAL_OBJECT_SIZE(obj->object_size); \ 98 start += slave * LOCAL_OBJECT_SIZE(obj->object_size); \
107 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ 99 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
108 triple_buffer_end_write_internal(tb); \ 100 triple_buffer_end_write_internal(tb); \
109 signal_data_written(); \ 101 signal_data_written(); \
110 }\ 102 } \
111 type* read_##name() { \ 103 type* read_##name() { \
112 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ 104 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
113 uint8_t* start = obj->buffer + NUM_SLAVES * LOCAL_OBJECT_SIZE(obj->object_size);\ 105 uint8_t* start = obj->buffer + NUM_SLAVES * LOCAL_OBJECT_SIZE(obj->object_size); \
114 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ 106 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
115 return (type*)triple_buffer_read_internal(obj->object_size, tb); \ 107 return (type*)triple_buffer_read_internal(obj->object_size, tb); \
116 } 108 }
117 109
118#define SLAVE_TO_MASTER_OBJECT(name, type) \ 110#define SLAVE_TO_MASTER_OBJECT(name, type) \
119 REMOTE_OBJECT_HELPER(name, type, 1, NUM_SLAVES) \ 111 REMOTE_OBJECT_HELPER(name, type, 1, NUM_SLAVES) \
120 remote_object_##name##_t remote_object_##name = { \ 112 remote_object_##name##_t remote_object_##name = {.object = { \
121 .object = { \ 113 .object_type = SLAVE_TO_MASTER, \
122 .object_type = SLAVE_TO_MASTER, \ 114 .object_size = sizeof(type), \
123 .object_size = sizeof(type), \ 115 }}; \
124 } \ 116 type* begin_write_##name(void) { \
125 }; \ 117 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
126 type* begin_write_##name(void) { \ 118 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
127 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
128 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
129 return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \ 119 return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \
130 }\ 120 } \
131 void end_write_##name(void) { \ 121 void end_write_##name(void) { \
132 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ 122 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
133 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \ 123 triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
134 triple_buffer_end_write_internal(tb); \ 124 triple_buffer_end_write_internal(tb); \
135 signal_data_written(); \ 125 signal_data_written(); \
136 }\ 126 } \
137 type* read_##name(uint8_t slave) { \ 127 type* read_##name(uint8_t slave) { \
138 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ 128 remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
139 uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);\ 129 uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); \
140 start+=slave * REMOTE_OBJECT_SIZE(obj->object_size); \ 130 start += slave * REMOTE_OBJECT_SIZE(obj->object_size); \
141 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ 131 triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
142 return (type*)triple_buffer_read_internal(obj->object_size, tb); \ 132 return (type*)triple_buffer_read_internal(obj->object_size, tb); \
143 } 133 }
144 134
145#define REMOTE_OBJECT(name) (remote_object_t*)&remote_object_##name 135#define REMOTE_OBJECT(name) (remote_object_t*)&remote_object_##name
diff --git a/quantum/serial_link/protocol/triple_buffered_object.c b/quantum/serial_link/protocol/triple_buffered_object.c
index e3e8989d3..e0c6d702a 100644
--- a/quantum/serial_link/protocol/triple_buffered_object.c
+++ b/quantum/serial_link/protocol/triple_buffered_object.c
@@ -49,14 +49,13 @@ void* triple_buffer_read_internal(uint16_t object_size, triple_buffer_object_t*
49 serial_link_lock(); 49 serial_link_lock();
50 if (GET_DATA_AVAILABLE()) { 50 if (GET_DATA_AVAILABLE()) {
51 uint8_t shared_index = GET_SHARED_INDEX(); 51 uint8_t shared_index = GET_SHARED_INDEX();
52 uint8_t read_index = GET_READ_INDEX(); 52 uint8_t read_index = GET_READ_INDEX();
53 SET_READ_INDEX(shared_index); 53 SET_READ_INDEX(shared_index);
54 SET_SHARED_INDEX(read_index); 54 SET_SHARED_INDEX(read_index);
55 SET_DATA_AVAILABLE(false); 55 SET_DATA_AVAILABLE(false);
56 serial_link_unlock(); 56 serial_link_unlock();
57 return object->buffer + object_size * shared_index; 57 return object->buffer + object_size * shared_index;
58 } 58 } else {
59 else {
60 serial_link_unlock(); 59 serial_link_unlock();
61 return NULL; 60 return NULL;
62 } 61 }
@@ -70,7 +69,7 @@ void* triple_buffer_begin_write_internal(uint16_t object_size, triple_buffer_obj
70void triple_buffer_end_write_internal(triple_buffer_object_t* object) { 69void triple_buffer_end_write_internal(triple_buffer_object_t* object) {
71 serial_link_lock(); 70 serial_link_lock();
72 uint8_t shared_index = GET_SHARED_INDEX(); 71 uint8_t shared_index = GET_SHARED_INDEX();
73 uint8_t write_index = GET_WRITE_INDEX(); 72 uint8_t write_index = GET_WRITE_INDEX();
74 SET_SHARED_INDEX(write_index); 73 SET_SHARED_INDEX(write_index);
75 SET_WRITE_INDEX(shared_index); 74 SET_WRITE_INDEX(shared_index);
76 SET_DATA_AVAILABLE(true); 75 SET_DATA_AVAILABLE(true);
diff --git a/quantum/serial_link/protocol/triple_buffered_object.h b/quantum/serial_link/protocol/triple_buffered_object.h
index 2e57db3f5..6ec98d52b 100644
--- a/quantum/serial_link/protocol/triple_buffered_object.h
+++ b/quantum/serial_link/protocol/triple_buffered_object.h
@@ -30,22 +30,18 @@ SOFTWARE.
30typedef struct { 30typedef struct {
31 uint8_t state; 31 uint8_t state;
32 uint8_t buffer[] __attribute__((aligned(4))); 32 uint8_t buffer[] __attribute__((aligned(4)));
33}triple_buffer_object_t; 33} triple_buffer_object_t;
34 34
35void triple_buffer_init(triple_buffer_object_t* object); 35void triple_buffer_init(triple_buffer_object_t* object);
36 36
37#define triple_buffer_begin_write(object) \ 37#define triple_buffer_begin_write(object) (typeof(*object.buffer[0])*)triple_buffer_begin_write_internal(sizeof(*object.buffer[0]), (triple_buffer_object_t*)object)
38 (typeof(*object.buffer[0])*)triple_buffer_begin_write_internal(sizeof(*object.buffer[0]), (triple_buffer_object_t*)object)
39 38
40#define triple_buffer_end_write(object) \ 39#define triple_buffer_end_write(object) triple_buffer_end_write_internal((triple_buffer_object_t*)object)
41 triple_buffer_end_write_internal((triple_buffer_object_t*)object)
42 40
43#define triple_buffer_read(object) \ 41#define triple_buffer_read(object) (typeof(*object.buffer[0])*)triple_buffer_read_internal(sizeof(*object.buffer[0]), (triple_buffer_object_t*)object)
44 (typeof(*object.buffer[0])*)triple_buffer_read_internal(sizeof(*object.buffer[0]), (triple_buffer_object_t*)object)
45 42
46void* triple_buffer_begin_write_internal(uint16_t object_size, triple_buffer_object_t* object); 43void* triple_buffer_begin_write_internal(uint16_t object_size, triple_buffer_object_t* object);
47void triple_buffer_end_write_internal(triple_buffer_object_t* object); 44void triple_buffer_end_write_internal(triple_buffer_object_t* object);
48void* triple_buffer_read_internal(uint16_t object_size, triple_buffer_object_t* object); 45void* triple_buffer_read_internal(uint16_t object_size, triple_buffer_object_t* object);
49 46
50
51#endif 47#endif
diff --git a/quantum/serial_link/system/serial_link.c b/quantum/serial_link/system/serial_link.c
index b3bee62a1..feac64e29 100644
--- a/quantum/serial_link/system/serial_link.c
+++ b/quantum/serial_link/system/serial_link.c
@@ -34,45 +34,37 @@ SOFTWARE.
34#include "config.h" 34#include "config.h"
35 35
36static event_source_t new_data_event; 36static event_source_t new_data_event;
37static bool serial_link_connected; 37static bool serial_link_connected;
38static bool is_master = false; 38static bool is_master = false;
39 39
40static uint8_t keyboard_leds(void); 40static uint8_t keyboard_leds(void);
41static void send_keyboard(report_keyboard_t *report); 41static void send_keyboard(report_keyboard_t* report);
42static void send_mouse(report_mouse_t *report); 42static void send_mouse(report_mouse_t* report);
43static void send_system(uint16_t data); 43static void send_system(uint16_t data);
44static void send_consumer(uint16_t data); 44static void send_consumer(uint16_t data);
45 45
46host_driver_t serial_driver = { 46host_driver_t serial_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer};
47 keyboard_leds,
48 send_keyboard,
49 send_mouse,
50 send_system,
51 send_consumer
52};
53 47
54// Define these in your Config.h file 48// Define these in your Config.h file
55#ifndef SERIAL_LINK_BAUD 49#ifndef SERIAL_LINK_BAUD
56#error "Serial link baud is not set" 50# error "Serial link baud is not set"
57#endif 51#endif
58 52
59#ifndef SERIAL_LINK_THREAD_PRIORITY 53#ifndef SERIAL_LINK_THREAD_PRIORITY
60#error "Serial link thread priority not set" 54# error "Serial link thread priority not set"
61#endif 55#endif
62 56
63static SerialConfig config = { 57static SerialConfig config = {.sc_speed = SERIAL_LINK_BAUD};
64 .sc_speed = SERIAL_LINK_BAUD
65};
66 58
67//#define DEBUG_LINK_ERRORS 59//#define DEBUG_LINK_ERRORS
68 60
69static uint32_t read_from_serial(SerialDriver* driver, uint8_t link) { 61static uint32_t read_from_serial(SerialDriver* driver, uint8_t link) {
70 const uint32_t buffer_size = 16; 62 const uint32_t buffer_size = 16;
71 uint8_t buffer[buffer_size]; 63 uint8_t buffer[buffer_size];
72 uint32_t bytes_read = sdAsynchronousRead(driver, buffer, buffer_size); 64 uint32_t bytes_read = sdAsynchronousRead(driver, buffer, buffer_size);
73 uint8_t* current = buffer; 65 uint8_t* current = buffer;
74 uint8_t* end = current + bytes_read; 66 uint8_t* end = current + bytes_read;
75 while(current < end) { 67 while (current < end) {
76 byte_stuffer_recv_byte(link, *current); 68 byte_stuffer_recv_byte(link, *current);
77 current++; 69 current++;
78 } 70 }
@@ -93,7 +85,6 @@ static void print_error(char* str, eventflags_t flags, SerialDriver* driver) {
93 print(str); 85 print(str);
94 uint32_t size = qSpaceI(&(driver->iqueue)); 86 uint32_t size = qSpaceI(&(driver->iqueue));
95 xprintf(" Overrun error, queue size %d\n", size); 87 xprintf(" Overrun error, queue size %d\n", size);
96
97 } 88 }
98 if (flags & SD_NOISE_ERROR) { 89 if (flags & SD_NOISE_ERROR) {
99 print(str); 90 print(str);
@@ -110,9 +101,7 @@ static void print_error(char* str, eventflags_t flags, SerialDriver* driver) {
110#endif 101#endif
111} 102}
112 103
113bool is_serial_link_master(void) { 104bool is_serial_link_master(void) { return is_master; }
114 return is_master;
115}
116 105
117// TODO: Optimize the stack size, this is probably way too big 106// TODO: Optimize the stack size, this is probably way too big
118static THD_WORKING_AREA(serialThreadStack, 1024); 107static THD_WORKING_AREA(serialThreadStack, 1024);
@@ -122,18 +111,11 @@ static THD_FUNCTION(serialThread, arg) {
122 event_listener_t sd1_listener; 111 event_listener_t sd1_listener;
123 event_listener_t sd2_listener; 112 event_listener_t sd2_listener;
124 chEvtRegister(&new_data_event, &new_data_listener, 0); 113 chEvtRegister(&new_data_event, &new_data_listener, 0);
125 eventflags_t events = CHN_INPUT_AVAILABLE 114 eventflags_t events = CHN_INPUT_AVAILABLE | SD_PARITY_ERROR | SD_FRAMING_ERROR | SD_OVERRUN_ERROR | SD_NOISE_ERROR | SD_BREAK_DETECTED;
126 | SD_PARITY_ERROR | SD_FRAMING_ERROR | SD_OVERRUN_ERROR | SD_NOISE_ERROR | SD_BREAK_DETECTED; 115 chEvtRegisterMaskWithFlags(chnGetEventSource(&SD1), &sd1_listener, EVENT_MASK(1), events);
127 chEvtRegisterMaskWithFlags(chnGetEventSource(&SD1), 116 chEvtRegisterMaskWithFlags(chnGetEventSource(&SD2), &sd2_listener, EVENT_MASK(2), events);
128 &sd1_listener,
129 EVENT_MASK(1),
130 events);
131 chEvtRegisterMaskWithFlags(chnGetEventSource(&SD2),
132 &sd2_listener,
133 EVENT_MASK(2),
134 events);
135 bool need_wait = false; 117 bool need_wait = false;
136 while(true) { 118 while (true) {
137 eventflags_t flags1 = 0; 119 eventflags_t flags1 = 0;
138 eventflags_t flags2 = 0; 120 eventflags_t flags2 = 0;
139 if (need_wait) { 121 if (need_wait) {
@@ -162,8 +144,7 @@ static THD_FUNCTION(serialThread, arg) {
162void send_data(uint8_t link, const uint8_t* data, uint16_t size) { 144void send_data(uint8_t link, const uint8_t* data, uint16_t size) {
163 if (link == DOWN_LINK) { 145 if (link == DOWN_LINK) {
164 sdWrite(&SD1, data, size); 146 sdWrite(&SD1, data, size);
165 } 147 } else {
166 else {
167 sdWrite(&SD2, data, size); 148 sdWrite(&SD2, data, size);
168 } 149 }
169} 150}
@@ -187,13 +168,12 @@ static remote_object_t* remote_objects[] = {
187void init_serial_link(void) { 168void init_serial_link(void) {
188 serial_link_connected = false; 169 serial_link_connected = false;
189 init_serial_link_hal(); 170 init_serial_link_hal();
190 add_remote_objects(remote_objects, sizeof(remote_objects)/sizeof(remote_object_t*)); 171 add_remote_objects(remote_objects, sizeof(remote_objects) / sizeof(remote_object_t*));
191 init_byte_stuffer(); 172 init_byte_stuffer();
192 sdStart(&SD1, &config); 173 sdStart(&SD1, &config);
193 sdStart(&SD2, &config); 174 sdStart(&SD2, &config);
194 chEvtObjectInit(&new_data_event); 175 chEvtObjectInit(&new_data_event);
195 (void)chThdCreateStatic(serialThreadStack, sizeof(serialThreadStack), 176 (void)chThdCreateStatic(serialThreadStack, sizeof(serialThreadStack), SERIAL_LINK_THREAD_PRIORITY, serialThread, NULL);
196 SERIAL_LINK_THREAD_PRIORITY, serialThread, NULL);
197} 177}
198 178
199void matrix_set_remote(matrix_row_t* rows, uint8_t index); 179void matrix_set_remote(matrix_row_t* rows, uint8_t index);
@@ -204,19 +184,19 @@ void serial_link_update(void) {
204 } 184 }
205 185
206 matrix_object_t matrix; 186 matrix_object_t matrix;
207 bool changed = false; 187 bool changed = false;
208 for(uint8_t i=0;i<MATRIX_ROWS;i++) { 188 for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
209 matrix.rows[i] = matrix_get_row(i); 189 matrix.rows[i] = matrix_get_row(i);
210 changed |= matrix.rows[i] != last_matrix.rows[i]; 190 changed |= matrix.rows[i] != last_matrix.rows[i];
211 } 191 }
212 192
213 systime_t current_time = chVTGetSystemTimeX(); 193 systime_t current_time = chVTGetSystemTimeX();
214 systime_t delta = current_time - last_update; 194 systime_t delta = current_time - last_update;
215 if (changed || delta > US2ST(5000)) { 195 if (changed || delta > US2ST(5000)) {
216 last_update = current_time; 196 last_update = current_time;
217 last_matrix = matrix; 197 last_matrix = matrix;
218 matrix_object_t* m = begin_write_keyboard_matrix(); 198 matrix_object_t* m = begin_write_keyboard_matrix();
219 for(uint8_t i=0;i<MATRIX_ROWS;i++) { 199 for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
220 m->rows[i] = matrix.rows[i]; 200 m->rows[i] = matrix.rows[i];
221 } 201 }
222 end_write_keyboard_matrix(); 202 end_write_keyboard_matrix();
@@ -230,36 +210,19 @@ void serial_link_update(void) {
230 } 210 }
231} 211}
232 212
233void signal_data_written(void) { 213void signal_data_written(void) { chEvtBroadcast(&new_data_event); }
234 chEvtBroadcast(&new_data_event);
235}
236 214
237bool is_serial_link_connected(void) { 215bool is_serial_link_connected(void) { return serial_link_connected; }
238 return serial_link_connected;
239}
240 216
241host_driver_t* get_serial_link_driver(void) { 217host_driver_t* get_serial_link_driver(void) { return &serial_driver; }
242 return &serial_driver;
243}
244 218
245// NOTE: The driver does nothing, because the master handles everything 219// NOTE: The driver does nothing, because the master handles everything
246uint8_t keyboard_leds(void) { 220uint8_t keyboard_leds(void) { return 0; }
247 return 0;
248}
249 221
250void send_keyboard(report_keyboard_t *report) { 222void send_keyboard(report_keyboard_t* report) { (void)report; }
251 (void)report;
252}
253 223
254void send_mouse(report_mouse_t *report) { 224void send_mouse(report_mouse_t* report) { (void)report; }
255 (void)report;
256}
257 225
258void send_system(uint16_t data) { 226void send_system(uint16_t data) { (void)data; }
259 (void)data;
260}
261
262void send_consumer(uint16_t data) {
263 (void)data;
264}
265 227
228void send_consumer(uint16_t data) { (void)data; }
diff --git a/quantum/serial_link/system/serial_link.h b/quantum/serial_link/system/serial_link.h
index 351e03877..f48fbe9ea 100644
--- a/quantum/serial_link/system/serial_link.h
+++ b/quantum/serial_link/system/serial_link.h
@@ -28,33 +28,27 @@ SOFTWARE.
28#include "host_driver.h" 28#include "host_driver.h"
29#include <stdbool.h> 29#include <stdbool.h>
30 30
31void init_serial_link(void); 31void init_serial_link(void);
32void init_serial_link_hal(void); 32void init_serial_link_hal(void);
33bool is_serial_link_connected(void); 33bool is_serial_link_connected(void);
34bool is_serial_link_master(void); 34bool is_serial_link_master(void);
35host_driver_t* get_serial_link_driver(void); 35host_driver_t* get_serial_link_driver(void);
36void serial_link_update(void); 36void serial_link_update(void);
37 37
38#if defined(PROTOCOL_CHIBIOS) 38#if defined(PROTOCOL_CHIBIOS)
39#include "ch.h" 39# include "ch.h"
40 40
41static inline void serial_link_lock(void) { 41static inline void serial_link_lock(void) { chSysLock(); }
42 chSysLock();
43}
44 42
45static inline void serial_link_unlock(void) { 43static inline void serial_link_unlock(void) { chSysUnlock(); }
46 chSysUnlock();
47}
48 44
49void signal_data_written(void); 45void signal_data_written(void);
50 46
51#else 47#else
52 48
53inline void serial_link_lock(void) { 49inline void serial_link_lock(void) {}
54}
55 50
56inline void serial_link_unlock(void) { 51inline void serial_link_unlock(void) {}
57}
58 52
59void signal_data_written(void); 53void signal_data_written(void);
60 54
diff --git a/quantum/serial_link/tests/byte_stuffer_tests.cpp b/quantum/serial_link/tests/byte_stuffer_tests.cpp
index ff49d727b..9e4e1768f 100644
--- a/quantum/serial_link/tests/byte_stuffer_tests.cpp
+++ b/quantum/serial_link/tests/byte_stuffer_tests.cpp
@@ -33,25 +33,21 @@ extern "C" {
33} 33}
34 34
35using testing::_; 35using testing::_;
36using testing::ElementsAreArray;
37using testing::Args; 36using testing::Args;
37using testing::ElementsAreArray;
38 38
39class ByteStuffer : public ::testing::Test{ 39class ByteStuffer : public ::testing::Test {
40public: 40 public:
41 ByteStuffer() { 41 ByteStuffer() {
42 Instance = this; 42 Instance = this;
43 init_byte_stuffer(); 43 init_byte_stuffer();
44 } 44 }
45 45
46 ~ByteStuffer() { 46 ~ByteStuffer() { Instance = nullptr; }
47 Instance = nullptr;
48 }
49 47
50 MOCK_METHOD3(validator_recv_frame, void (uint8_t link, uint8_t* data, uint16_t size)); 48 MOCK_METHOD3(validator_recv_frame, void(uint8_t link, uint8_t* data, uint16_t size));
51 49
52 void send_data(uint8_t link, const uint8_t* data, uint16_t size) { 50 void send_data(uint8_t link, const uint8_t* data, uint16_t size) { std::copy(data, data + size, std::back_inserter(sent_data)); }
53 std::copy(data, data + size, std::back_inserter(sent_data));
54 }
55 std::vector<uint8_t> sent_data; 51 std::vector<uint8_t> sent_data;
56 52
57 static ByteStuffer* Instance; 53 static ByteStuffer* Instance;
@@ -60,52 +56,42 @@ public:
60ByteStuffer* ByteStuffer::Instance = nullptr; 56ByteStuffer* ByteStuffer::Instance = nullptr;
61 57
62extern "C" { 58extern "C" {
63 void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size) { 59void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size) { ByteStuffer::Instance->validator_recv_frame(link, data, size); }
64 ByteStuffer::Instance->validator_recv_frame(link, data, size);
65 }
66 60
67 void send_data(uint8_t link, const uint8_t* data, uint16_t size) { 61void send_data(uint8_t link, const uint8_t* data, uint16_t size) { ByteStuffer::Instance->send_data(link, data, size); }
68 ByteStuffer::Instance->send_data(link, data, size);
69 }
70} 62}
71 63
72TEST_F(ByteStuffer, receives_no_frame_for_a_single_zero_byte) { 64TEST_F(ByteStuffer, receives_no_frame_for_a_single_zero_byte) {
73 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 65 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).Times(0);
74 .Times(0);
75 byte_stuffer_recv_byte(0, 0); 66 byte_stuffer_recv_byte(0, 0);
76} 67}
77 68
78TEST_F(ByteStuffer, receives_no_frame_for_a_single_FF_byte) { 69TEST_F(ByteStuffer, receives_no_frame_for_a_single_FF_byte) {
79 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 70 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).Times(0);
80 .Times(0);
81 byte_stuffer_recv_byte(0, 0xFF); 71 byte_stuffer_recv_byte(0, 0xFF);
82} 72}
83 73
84TEST_F(ByteStuffer, receives_no_frame_for_a_single_random_byte) { 74TEST_F(ByteStuffer, receives_no_frame_for_a_single_random_byte) {
85 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 75 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).Times(0);
86 .Times(0);
87 byte_stuffer_recv_byte(0, 0x4A); 76 byte_stuffer_recv_byte(0, 0x4A);
88} 77}
89 78
90TEST_F(ByteStuffer, receives_no_frame_for_a_zero_length_frame) { 79TEST_F(ByteStuffer, receives_no_frame_for_a_zero_length_frame) {
91 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 80 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).Times(0);
92 .Times(0);
93 byte_stuffer_recv_byte(0, 1); 81 byte_stuffer_recv_byte(0, 1);
94 byte_stuffer_recv_byte(0, 0); 82 byte_stuffer_recv_byte(0, 0);
95} 83}
96 84
97TEST_F(ByteStuffer, receives_single_byte_valid_frame) { 85TEST_F(ByteStuffer, receives_single_byte_valid_frame) {
98 uint8_t expected[] = {0x37}; 86 uint8_t expected[] = {0x37};
99 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 87 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
100 .With(Args<1, 2>(ElementsAreArray(expected)));
101 byte_stuffer_recv_byte(0, 2); 88 byte_stuffer_recv_byte(0, 2);
102 byte_stuffer_recv_byte(0, 0x37); 89 byte_stuffer_recv_byte(0, 0x37);
103 byte_stuffer_recv_byte(0, 0); 90 byte_stuffer_recv_byte(0, 0);
104} 91}
105TEST_F(ByteStuffer, receives_three_bytes_valid_frame) { 92TEST_F(ByteStuffer, receives_three_bytes_valid_frame) {
106 uint8_t expected[] = {0x37, 0x99, 0xFF}; 93 uint8_t expected[] = {0x37, 0x99, 0xFF};
107 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 94 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
108 .With(Args<1, 2>(ElementsAreArray(expected)));
109 byte_stuffer_recv_byte(0, 4); 95 byte_stuffer_recv_byte(0, 4);
110 byte_stuffer_recv_byte(0, 0x37); 96 byte_stuffer_recv_byte(0, 0x37);
111 byte_stuffer_recv_byte(0, 0x99); 97 byte_stuffer_recv_byte(0, 0x99);
@@ -115,8 +101,7 @@ TEST_F(ByteStuffer, receives_three_bytes_valid_frame) {
115 101
116TEST_F(ByteStuffer, receives_single_zero_valid_frame) { 102TEST_F(ByteStuffer, receives_single_zero_valid_frame) {
117 uint8_t expected[] = {0}; 103 uint8_t expected[] = {0};
118 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 104 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
119 .With(Args<1, 2>(ElementsAreArray(expected)));
120 byte_stuffer_recv_byte(0, 1); 105 byte_stuffer_recv_byte(0, 1);
121 byte_stuffer_recv_byte(0, 1); 106 byte_stuffer_recv_byte(0, 1);
122 byte_stuffer_recv_byte(0, 0); 107 byte_stuffer_recv_byte(0, 0);
@@ -124,8 +109,7 @@ TEST_F(ByteStuffer, receives_single_zero_valid_frame) {
124 109
125TEST_F(ByteStuffer, receives_valid_frame_with_zeroes) { 110TEST_F(ByteStuffer, receives_valid_frame_with_zeroes) {
126 uint8_t expected[] = {5, 0, 3, 0}; 111 uint8_t expected[] = {5, 0, 3, 0};
127 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 112 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
128 .With(Args<1, 2>(ElementsAreArray(expected)));
129 byte_stuffer_recv_byte(0, 2); 113 byte_stuffer_recv_byte(0, 2);
130 byte_stuffer_recv_byte(0, 5); 114 byte_stuffer_recv_byte(0, 5);
131 byte_stuffer_recv_byte(0, 2); 115 byte_stuffer_recv_byte(0, 2);
@@ -134,14 +118,11 @@ TEST_F(ByteStuffer, receives_valid_frame_with_zeroes) {
134 byte_stuffer_recv_byte(0, 0); 118 byte_stuffer_recv_byte(0, 0);
135} 119}
136 120
137
138TEST_F(ByteStuffer, receives_two_valid_frames) { 121TEST_F(ByteStuffer, receives_two_valid_frames) {
139 uint8_t expected1[] = {5, 0}; 122 uint8_t expected1[] = {5, 0};
140 uint8_t expected2[] = {3}; 123 uint8_t expected2[] = {3};
141 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 124 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected1)));
142 .With(Args<1, 2>(ElementsAreArray(expected1))); 125 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected2)));
143 EXPECT_CALL(*this, validator_recv_frame(_, _, _))
144 .With(Args<1, 2>(ElementsAreArray(expected2)));
145 byte_stuffer_recv_byte(1, 2); 126 byte_stuffer_recv_byte(1, 2);
146 byte_stuffer_recv_byte(1, 5); 127 byte_stuffer_recv_byte(1, 5);
147 byte_stuffer_recv_byte(1, 1); 128 byte_stuffer_recv_byte(1, 1);
@@ -153,8 +134,7 @@ TEST_F(ByteStuffer, receives_two_valid_frames) {
153 134
154TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_zero) { 135TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_zero) {
155 uint8_t expected[] = {5, 7}; 136 uint8_t expected[] = {5, 7};
156 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 137 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
157 .With(Args<1, 2>(ElementsAreArray(expected)));
158 byte_stuffer_recv_byte(1, 3); 138 byte_stuffer_recv_byte(1, 3);
159 byte_stuffer_recv_byte(1, 1); 139 byte_stuffer_recv_byte(1, 1);
160 byte_stuffer_recv_byte(1, 0); 140 byte_stuffer_recv_byte(1, 0);
@@ -166,11 +146,10 @@ TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_zero) {
166 146
167TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_non_zero) { 147TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_non_zero) {
168 uint8_t expected[] = {5, 7}; 148 uint8_t expected[] = {5, 7};
169 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 149 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
170 .With(Args<1, 2>(ElementsAreArray(expected)));
171 byte_stuffer_recv_byte(0, 2); 150 byte_stuffer_recv_byte(0, 2);
172 byte_stuffer_recv_byte(0, 9); 151 byte_stuffer_recv_byte(0, 9);
173 byte_stuffer_recv_byte(0, 4); // This should have been zero 152 byte_stuffer_recv_byte(0, 4); // This should have been zero
174 byte_stuffer_recv_byte(0, 0); 153 byte_stuffer_recv_byte(0, 0);
175 byte_stuffer_recv_byte(0, 3); 154 byte_stuffer_recv_byte(0, 3);
176 byte_stuffer_recv_byte(0, 5); 155 byte_stuffer_recv_byte(0, 5);
@@ -180,31 +159,29 @@ TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_non_zero) {
180 159
181TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_and_then_end_of_frame) { 160TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_and_then_end_of_frame) {
182 uint8_t expected[254]; 161 uint8_t expected[254];
183 int i; 162 int i;
184 for (i=0;i<254;i++) { 163 for (i = 0; i < 254; i++) {
185 expected[i] = i + 1; 164 expected[i] = i + 1;
186 } 165 }
187 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 166 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
188 .With(Args<1, 2>(ElementsAreArray(expected)));
189 byte_stuffer_recv_byte(0, 0xFF); 167 byte_stuffer_recv_byte(0, 0xFF);
190 for (i=0;i<254;i++) { 168 for (i = 0; i < 254; i++) {
191 byte_stuffer_recv_byte(0, i+1); 169 byte_stuffer_recv_byte(0, i + 1);
192 } 170 }
193 byte_stuffer_recv_byte(0, 0); 171 byte_stuffer_recv_byte(0, 0);
194} 172}
195 173
196TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_non_zero) { 174TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_non_zero) {
197 uint8_t expected[255]; 175 uint8_t expected[255];
198 int i; 176 int i;
199 for (i=0;i<254;i++) { 177 for (i = 0; i < 254; i++) {
200 expected[i] = i + 1; 178 expected[i] = i + 1;
201 } 179 }
202 expected[254] = 7; 180 expected[254] = 7;
203 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 181 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
204 .With(Args<1, 2>(ElementsAreArray(expected)));
205 byte_stuffer_recv_byte(0, 0xFF); 182 byte_stuffer_recv_byte(0, 0xFF);
206 for (i=0;i<254;i++) { 183 for (i = 0; i < 254; i++) {
207 byte_stuffer_recv_byte(0, i+1); 184 byte_stuffer_recv_byte(0, i + 1);
208 } 185 }
209 byte_stuffer_recv_byte(0, 2); 186 byte_stuffer_recv_byte(0, 2);
210 byte_stuffer_recv_byte(0, 7); 187 byte_stuffer_recv_byte(0, 7);
@@ -213,16 +190,15 @@ TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_
213 190
214TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_zero) { 191TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_zero) {
215 uint8_t expected[255]; 192 uint8_t expected[255];
216 int i; 193 int i;
217 for (i=0;i<254;i++) { 194 for (i = 0; i < 254; i++) {
218 expected[i] = i + 1; 195 expected[i] = i + 1;
219 } 196 }
220 expected[254] = 0; 197 expected[254] = 0;
221 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 198 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
222 .With(Args<1, 2>(ElementsAreArray(expected)));
223 byte_stuffer_recv_byte(0, 0xFF); 199 byte_stuffer_recv_byte(0, 0xFF);
224 for (i=0;i<254;i++) { 200 for (i = 0; i < 254; i++) {
225 byte_stuffer_recv_byte(0, i+1); 201 byte_stuffer_recv_byte(0, i + 1);
226 } 202 }
227 byte_stuffer_recv_byte(0, 1); 203 byte_stuffer_recv_byte(0, 1);
228 byte_stuffer_recv_byte(0, 1); 204 byte_stuffer_recv_byte(0, 1);
@@ -231,25 +207,24 @@ TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_
231 207
232TEST_F(ByteStuffer, receives_two_long_frames_and_some_more) { 208TEST_F(ByteStuffer, receives_two_long_frames_and_some_more) {
233 uint8_t expected[515]; 209 uint8_t expected[515];
234 int i; 210 int i;
235 int j; 211 int j;
236 for (j=0;j<2;j++) { 212 for (j = 0; j < 2; j++) {
237 for (i=0;i<254;i++) { 213 for (i = 0; i < 254; i++) {
238 expected[i+254*j] = i + 1; 214 expected[i + 254 * j] = i + 1;
239 } 215 }
240 } 216 }
241 for (i=0;i<7;i++) { 217 for (i = 0; i < 7; i++) {
242 expected[254*2+i] = i + 1; 218 expected[254 * 2 + i] = i + 1;
243 } 219 }
244 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 220 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
245 .With(Args<1, 2>(ElementsAreArray(expected)));
246 byte_stuffer_recv_byte(0, 0xFF); 221 byte_stuffer_recv_byte(0, 0xFF);
247 for (i=0;i<254;i++) { 222 for (i = 0; i < 254; i++) {
248 byte_stuffer_recv_byte(0, i+1); 223 byte_stuffer_recv_byte(0, i + 1);
249 } 224 }
250 byte_stuffer_recv_byte(0, 0xFF); 225 byte_stuffer_recv_byte(0, 0xFF);
251 for (i=0;i<254;i++) { 226 for (i = 0; i < 254; i++) {
252 byte_stuffer_recv_byte(0, i+1); 227 byte_stuffer_recv_byte(0, i + 1);
253 } 228 }
254 byte_stuffer_recv_byte(0, 8); 229 byte_stuffer_recv_byte(0, 8);
255 byte_stuffer_recv_byte(0, 1); 230 byte_stuffer_recv_byte(0, 1);
@@ -264,24 +239,22 @@ TEST_F(ByteStuffer, receives_two_long_frames_and_some_more) {
264 239
265TEST_F(ByteStuffer, receives_an_all_zeros_frame_that_is_maximum_size) { 240TEST_F(ByteStuffer, receives_an_all_zeros_frame_that_is_maximum_size) {
266 uint8_t expected[MAX_FRAME_SIZE] = {}; 241 uint8_t expected[MAX_FRAME_SIZE] = {};
267 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 242 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
268 .With(Args<1, 2>(ElementsAreArray(expected)));
269 int i; 243 int i;
270 byte_stuffer_recv_byte(0, 1); 244 byte_stuffer_recv_byte(0, 1);
271 for(i=0;i<MAX_FRAME_SIZE;i++) { 245 for (i = 0; i < MAX_FRAME_SIZE; i++) {
272 byte_stuffer_recv_byte(0, 1); 246 byte_stuffer_recv_byte(0, 1);
273 } 247 }
274 byte_stuffer_recv_byte(0, 0); 248 byte_stuffer_recv_byte(0, 0);
275} 249}
276 250
277TEST_F(ByteStuffer, doesnt_recv_a_frame_thats_too_long_all_zeroes) { 251TEST_F(ByteStuffer, doesnt_recv_a_frame_thats_too_long_all_zeroes) {
278 uint8_t expected[1] = {0}; 252 uint8_t expected[1] = {0};
279 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 253 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).Times(0);
280 .Times(0);
281 int i; 254 int i;
282 byte_stuffer_recv_byte(0, 1); 255 byte_stuffer_recv_byte(0, 1);
283 for(i=0;i<MAX_FRAME_SIZE;i++) { 256 for (i = 0; i < MAX_FRAME_SIZE; i++) {
284 byte_stuffer_recv_byte(0, 1); 257 byte_stuffer_recv_byte(0, 1);
285 } 258 }
286 byte_stuffer_recv_byte(0, 1); 259 byte_stuffer_recv_byte(0, 1);
287 byte_stuffer_recv_byte(0, 0); 260 byte_stuffer_recv_byte(0, 0);
@@ -289,12 +262,11 @@ TEST_F(ByteStuffer, doesnt_recv_a_frame_thats_too_long_all_zeroes) {
289 262
290TEST_F(ByteStuffer, received_frame_is_aborted_when_its_too_long) { 263TEST_F(ByteStuffer, received_frame_is_aborted_when_its_too_long) {
291 uint8_t expected[1] = {1}; 264 uint8_t expected[1] = {1};
292 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 265 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
293 .With(Args<1, 2>(ElementsAreArray(expected)));
294 int i; 266 int i;
295 byte_stuffer_recv_byte(0, 1); 267 byte_stuffer_recv_byte(0, 1);
296 for(i=0;i<MAX_FRAME_SIZE;i++) { 268 for (i = 0; i < MAX_FRAME_SIZE; i++) {
297 byte_stuffer_recv_byte(0, 1); 269 byte_stuffer_recv_byte(0, 1);
298 } 270 }
299 byte_stuffer_recv_byte(0, 2); 271 byte_stuffer_recv_byte(0, 2);
300 byte_stuffer_recv_byte(0, 1); 272 byte_stuffer_recv_byte(0, 1);
@@ -364,14 +336,14 @@ TEST_F(ByteStuffer, sends_three_byte_frame_with_all_zeroes) {
364 336
365TEST_F(ByteStuffer, sends_frame_with_254_non_zeroes) { 337TEST_F(ByteStuffer, sends_frame_with_254_non_zeroes) {
366 uint8_t data[254]; 338 uint8_t data[254];
367 int i; 339 int i;
368 for(i=0;i<254;i++) { 340 for (i = 0; i < 254; i++) {
369 data[i] = i + 1; 341 data[i] = i + 1;
370 } 342 }
371 byte_stuffer_send_frame(0, data, 254); 343 byte_stuffer_send_frame(0, data, 254);
372 uint8_t expected[256]; 344 uint8_t expected[256];
373 expected[0] = 0xFF; 345 expected[0] = 0xFF;
374 for(i=1;i<255;i++) { 346 for (i = 1; i < 255; i++) {
375 expected[i] = i; 347 expected[i] = i;
376 } 348 }
377 expected[255] = 0; 349 expected[255] = 0;
@@ -380,14 +352,14 @@ TEST_F(ByteStuffer, sends_frame_with_254_non_zeroes) {
380 352
381TEST_F(ByteStuffer, sends_frame_with_255_non_zeroes) { 353TEST_F(ByteStuffer, sends_frame_with_255_non_zeroes) {
382 uint8_t data[255]; 354 uint8_t data[255];
383 int i; 355 int i;
384 for(i=0;i<255;i++) { 356 for (i = 0; i < 255; i++) {
385 data[i] = i + 1; 357 data[i] = i + 1;
386 } 358 }
387 byte_stuffer_send_frame(0, data, 255); 359 byte_stuffer_send_frame(0, data, 255);
388 uint8_t expected[258]; 360 uint8_t expected[258];
389 expected[0] = 0xFF; 361 expected[0] = 0xFF;
390 for(i=1;i<255;i++) { 362 for (i = 1; i < 255; i++) {
391 expected[i] = i; 363 expected[i] = i;
392 } 364 }
393 expected[255] = 2; 365 expected[255] = 2;
@@ -398,15 +370,15 @@ TEST_F(ByteStuffer, sends_frame_with_255_non_zeroes) {
398 370
399TEST_F(ByteStuffer, sends_frame_with_254_non_zeroes_followed_by_zero) { 371TEST_F(ByteStuffer, sends_frame_with_254_non_zeroes_followed_by_zero) {
400 uint8_t data[255]; 372 uint8_t data[255];
401 int i; 373 int i;
402 for(i=0;i<254;i++) { 374 for (i = 0; i < 254; i++) {
403 data[i] = i + 1; 375 data[i] = i + 1;
404 } 376 }
405 data[254] = 0; 377 data[254] = 0;
406 byte_stuffer_send_frame(0, data, 255); 378 byte_stuffer_send_frame(0, data, 255);
407 uint8_t expected[258]; 379 uint8_t expected[258];
408 expected[0] = 0xFF; 380 expected[0] = 0xFF;
409 for(i=1;i<255;i++) { 381 for (i = 1; i < 255; i++) {
410 expected[i] = i; 382 expected[i] = i;
411 } 383 }
412 expected[255] = 1; 384 expected[255] = 1;
@@ -416,68 +388,63 @@ TEST_F(ByteStuffer, sends_frame_with_254_non_zeroes_followed_by_zero) {
416} 388}
417 389
418TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_small_packet) { 390TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_small_packet) {
419 uint8_t original_data[] = { 1, 2, 3}; 391 uint8_t original_data[] = {1, 2, 3};
420 byte_stuffer_send_frame(0, original_data, sizeof(original_data)); 392 byte_stuffer_send_frame(0, original_data, sizeof(original_data));
421 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 393 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(original_data)));
422 .With(Args<1, 2>(ElementsAreArray(original_data)));
423 int i; 394 int i;
424 for(auto& d : sent_data) { 395 for (auto& d : sent_data) {
425 byte_stuffer_recv_byte(1, d); 396 byte_stuffer_recv_byte(1, d);
426 } 397 }
427} 398}
428 399
429TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_small_packet_with_zeros) { 400TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_small_packet_with_zeros) {
430 uint8_t original_data[] = { 1, 0, 3, 0, 0, 9}; 401 uint8_t original_data[] = {1, 0, 3, 0, 0, 9};
431 byte_stuffer_send_frame(1, original_data, sizeof(original_data)); 402 byte_stuffer_send_frame(1, original_data, sizeof(original_data));
432 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 403 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(original_data)));
433 .With(Args<1, 2>(ElementsAreArray(original_data)));
434 int i; 404 int i;
435 for(auto& d : sent_data) { 405 for (auto& d : sent_data) {
436 byte_stuffer_recv_byte(1, d); 406 byte_stuffer_recv_byte(1, d);
437 } 407 }
438} 408}
439 409
440TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_254_bytes) { 410TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_254_bytes) {
441 uint8_t original_data[254]; 411 uint8_t original_data[254];
442 int i; 412 int i;
443 for(i=0;i<254;i++) { 413 for (i = 0; i < 254; i++) {
444 original_data[i] = i + 1; 414 original_data[i] = i + 1;
445 } 415 }
446 byte_stuffer_send_frame(0, original_data, sizeof(original_data)); 416 byte_stuffer_send_frame(0, original_data, sizeof(original_data));
447 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 417 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(original_data)));
448 .With(Args<1, 2>(ElementsAreArray(original_data))); 418 for (auto& d : sent_data) {
449 for(auto& d : sent_data) { 419 byte_stuffer_recv_byte(1, d);
450 byte_stuffer_recv_byte(1, d);
451 } 420 }
452} 421}
453 422
454TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_256_bytes) { 423TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_256_bytes) {
455 uint8_t original_data[256]; 424 uint8_t original_data[256];
456 int i; 425 int i;
457 for(i=0;i<254;i++) { 426 for (i = 0; i < 254; i++) {
458 original_data[i] = i + 1; 427 original_data[i] = i + 1;
459 } 428 }
460 original_data[254] = 22; 429 original_data[254] = 22;
461 original_data[255] = 23; 430 original_data[255] = 23;
462 byte_stuffer_send_frame(0, original_data, sizeof(original_data)); 431 byte_stuffer_send_frame(0, original_data, sizeof(original_data));
463 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 432 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(original_data)));
464 .With(Args<1, 2>(ElementsAreArray(original_data))); 433 for (auto& d : sent_data) {
465 for(auto& d : sent_data) { 434 byte_stuffer_recv_byte(1, d);
466 byte_stuffer_recv_byte(1, d);
467 } 435 }
468} 436}
469 437
470TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_254_bytes_and_then_zero) { 438TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_254_bytes_and_then_zero) {
471 uint8_t original_data[255]; 439 uint8_t original_data[255];
472 int i; 440 int i;
473 for(i=0;i<254;i++) { 441 for (i = 0; i < 254; i++) {
474 original_data[i] = i + 1; 442 original_data[i] = i + 1;
475 } 443 }
476 original_data[254] = 0; 444 original_data[254] = 0;
477 byte_stuffer_send_frame(0, original_data, sizeof(original_data)); 445 byte_stuffer_send_frame(0, original_data, sizeof(original_data));
478 EXPECT_CALL(*this, validator_recv_frame(_, _, _)) 446 EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(original_data)));
479 .With(Args<1, 2>(ElementsAreArray(original_data))); 447 for (auto& d : sent_data) {
480 for(auto& d : sent_data) { 448 byte_stuffer_recv_byte(1, d);
481 byte_stuffer_recv_byte(1, d);
482 } 449 }
483} 450}
diff --git a/quantum/serial_link/tests/frame_router_tests.cpp b/quantum/serial_link/tests/frame_router_tests.cpp
index 2bd5bf830..f76dfb33d 100644
--- a/quantum/serial_link/tests/frame_router_tests.cpp
+++ b/quantum/serial_link/tests/frame_router_tests.cpp
@@ -26,27 +26,23 @@ SOFTWARE.
26#include "gmock/gmock.h" 26#include "gmock/gmock.h"
27#include <array> 27#include <array>
28extern "C" { 28extern "C" {
29 #include "serial_link/protocol/transport.h" 29#include "serial_link/protocol/transport.h"
30 #include "serial_link/protocol/byte_stuffer.h" 30#include "serial_link/protocol/byte_stuffer.h"
31 #include "serial_link/protocol/frame_router.h" 31#include "serial_link/protocol/frame_router.h"
32} 32}
33 33
34using testing::_; 34using testing::_;
35using testing::ElementsAreArray;
36using testing::Args; 35using testing::Args;
36using testing::ElementsAreArray;
37 37
38class FrameRouter : public testing::Test { 38class FrameRouter : public testing::Test {
39public: 39 public:
40 FrameRouter() : 40 FrameRouter() : current_router_buffer(nullptr) {
41 current_router_buffer(nullptr)
42 {
43 Instance = this; 41 Instance = this;
44 init_byte_stuffer(); 42 init_byte_stuffer();
45 } 43 }
46 44
47 ~FrameRouter() { 45 ~FrameRouter() { Instance = nullptr; }
48 Instance = nullptr;
49 }
50 46
51 void send_data(uint8_t link, const uint8_t* data, uint16_t size) { 47 void send_data(uint8_t link, const uint8_t* data, uint16_t size) {
52 auto& buffer = current_router_buffer->send_buffers[link]; 48 auto& buffer = current_router_buffer->send_buffers[link];
@@ -55,31 +51,26 @@ public:
55 51
56 void receive_data(uint8_t link, uint8_t* data, uint16_t size) { 52 void receive_data(uint8_t link, uint8_t* data, uint16_t size) {
57 int i; 53 int i;
58 for(i=0;i<size;i++) { 54 for (i = 0; i < size; i++) {
59 byte_stuffer_recv_byte(link, data[i]); 55 byte_stuffer_recv_byte(link, data[i]);
60 } 56 }
61 } 57 }
62 58
63 void activate_router(uint8_t num) { 59 void activate_router(uint8_t num) {
64 current_router_buffer = router_buffers + num; 60 current_router_buffer = router_buffers + num;
65 router_set_master(num==0); 61 router_set_master(num == 0);
66 } 62 }
67 63
68 void simulate_transport(uint8_t from, uint8_t to) { 64 void simulate_transport(uint8_t from, uint8_t to) {
69 activate_router(to); 65 activate_router(to);
70 if (from > to) { 66 if (from > to) {
71 receive_data(DOWN_LINK, 67 receive_data(DOWN_LINK, router_buffers[from].send_buffers[UP_LINK].data(), router_buffers[from].send_buffers[UP_LINK].size());
72 router_buffers[from].send_buffers[UP_LINK].data(), 68 } else if (to > from) {
73 router_buffers[from].send_buffers[UP_LINK].size()); 69 receive_data(UP_LINK, router_buffers[from].send_buffers[DOWN_LINK].data(), router_buffers[from].send_buffers[DOWN_LINK].size());
74 } 70 }
75 else if(to > from) {
76 receive_data(UP_LINK,
77 router_buffers[from].send_buffers[DOWN_LINK].data(),
78 router_buffers[from].send_buffers[DOWN_LINK].size());
79 }
80 } 71 }
81 72
82 MOCK_METHOD3(transport_recv_frame, void (uint8_t from, uint8_t* data, uint16_t size)); 73 MOCK_METHOD3(transport_recv_frame, void(uint8_t from, uint8_t* data, uint16_t size));
83 74
84 std::vector<uint8_t> received_data; 75 std::vector<uint8_t> received_data;
85 76
@@ -87,7 +78,7 @@ public:
87 std::vector<uint8_t> send_buffers[2]; 78 std::vector<uint8_t> send_buffers[2];
88 }; 79 };
89 80
90 router_buffer router_buffers[8]; 81 router_buffer router_buffers[8];
91 router_buffer* current_router_buffer; 82 router_buffer* current_router_buffer;
92 83
93 static FrameRouter* Instance; 84 static FrameRouter* Instance;
@@ -95,22 +86,15 @@ public:
95 86
96FrameRouter* FrameRouter::Instance = nullptr; 87FrameRouter* FrameRouter::Instance = nullptr;
97 88
98
99typedef struct { 89typedef struct {
100 std::array<uint8_t, 4> data; 90 std::array<uint8_t, 4> data;
101 uint8_t extra[16]; 91 uint8_t extra[16];
102} frame_buffer_t; 92} frame_buffer_t;
103 93
104
105extern "C" { 94extern "C" {
106 void send_data(uint8_t link, const uint8_t* data, uint16_t size) { 95void send_data(uint8_t link, const uint8_t* data, uint16_t size) { FrameRouter::Instance->send_data(link, data, size); }
107 FrameRouter::Instance->send_data(link, data, size);
108 }
109 96
110 97void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) { FrameRouter::Instance->transport_recv_frame(from, data, size); }
111 void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) {
112 FrameRouter::Instance->transport_recv_frame(from, data, size);
113 }
114} 98}
115 99
116TEST_F(FrameRouter, master_broadcast_is_received_by_everyone) { 100TEST_F(FrameRouter, master_broadcast_is_received_by_everyone) {
@@ -120,14 +104,12 @@ TEST_F(FrameRouter, master_broadcast_is_received_by_everyone) {
120 router_send_frame(0xFF, (uint8_t*)&data, 4); 104 router_send_frame(0xFF, (uint8_t*)&data, 4);
121 EXPECT_GT(router_buffers[0].send_buffers[DOWN_LINK].size(), 0); 105 EXPECT_GT(router_buffers[0].send_buffers[DOWN_LINK].size(), 0);
122 EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0); 106 EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0);
123 EXPECT_CALL(*this, transport_recv_frame(0, _, _)) 107 EXPECT_CALL(*this, transport_recv_frame(0, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
124 .With(Args<1, 2>(ElementsAreArray(data.data)));
125 simulate_transport(0, 1); 108 simulate_transport(0, 1);
126 EXPECT_GT(router_buffers[1].send_buffers[DOWN_LINK].size(), 0); 109 EXPECT_GT(router_buffers[1].send_buffers[DOWN_LINK].size(), 0);
127 EXPECT_EQ(router_buffers[1].send_buffers[UP_LINK].size(), 0); 110 EXPECT_EQ(router_buffers[1].send_buffers[UP_LINK].size(), 0);
128 111
129 EXPECT_CALL(*this, transport_recv_frame(0, _, _)) 112 EXPECT_CALL(*this, transport_recv_frame(0, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
130 .With(Args<1, 2>(ElementsAreArray(data.data)));
131 simulate_transport(1, 2); 113 simulate_transport(1, 2);
132 EXPECT_GT(router_buffers[2].send_buffers[DOWN_LINK].size(), 0); 114 EXPECT_GT(router_buffers[2].send_buffers[DOWN_LINK].size(), 0);
133 EXPECT_EQ(router_buffers[2].send_buffers[UP_LINK].size(), 0); 115 EXPECT_EQ(router_buffers[2].send_buffers[UP_LINK].size(), 0);
@@ -145,14 +127,12 @@ TEST_F(FrameRouter, master_send_is_received_by_targets) {
145 EXPECT_GT(router_buffers[1].send_buffers[DOWN_LINK].size(), 0); 127 EXPECT_GT(router_buffers[1].send_buffers[DOWN_LINK].size(), 0);
146 EXPECT_EQ(router_buffers[1].send_buffers[UP_LINK].size(), 0); 128 EXPECT_EQ(router_buffers[1].send_buffers[UP_LINK].size(), 0);
147 129
148 EXPECT_CALL(*this, transport_recv_frame(0, _, _)) 130 EXPECT_CALL(*this, transport_recv_frame(0, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
149 .With(Args<1, 2>(ElementsAreArray(data.data)));
150 simulate_transport(1, 2); 131 simulate_transport(1, 2);
151 EXPECT_GT(router_buffers[2].send_buffers[DOWN_LINK].size(), 0); 132 EXPECT_GT(router_buffers[2].send_buffers[DOWN_LINK].size(), 0);
152 EXPECT_EQ(router_buffers[2].send_buffers[UP_LINK].size(), 0); 133 EXPECT_EQ(router_buffers[2].send_buffers[UP_LINK].size(), 0);
153 134
154 EXPECT_CALL(*this, transport_recv_frame(0, _, _)) 135 EXPECT_CALL(*this, transport_recv_frame(0, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
155 .With(Args<1, 2>(ElementsAreArray(data.data)));
156 simulate_transport(2, 3); 136 simulate_transport(2, 3);
157 EXPECT_GT(router_buffers[3].send_buffers[DOWN_LINK].size(), 0); 137 EXPECT_GT(router_buffers[3].send_buffers[DOWN_LINK].size(), 0);
158 EXPECT_EQ(router_buffers[3].send_buffers[UP_LINK].size(), 0); 138 EXPECT_EQ(router_buffers[3].send_buffers[UP_LINK].size(), 0);
@@ -166,8 +146,7 @@ TEST_F(FrameRouter, first_link_sends_to_master) {
166 EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0); 146 EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0);
167 EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0); 147 EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0);
168 148
169 EXPECT_CALL(*this, transport_recv_frame(1, _, _)) 149 EXPECT_CALL(*this, transport_recv_frame(1, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
170 .With(Args<1, 2>(ElementsAreArray(data.data)));
171 simulate_transport(1, 0); 150 simulate_transport(1, 0);
172 EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0); 151 EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0);
173 EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0); 152 EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0);
@@ -185,8 +164,7 @@ TEST_F(FrameRouter, second_link_sends_to_master) {
185 EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0); 164 EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0);
186 EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0); 165 EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0);
187 166
188 EXPECT_CALL(*this, transport_recv_frame(2, _, _)) 167 EXPECT_CALL(*this, transport_recv_frame(2, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
189 .With(Args<1, 2>(ElementsAreArray(data.data)));
190 simulate_transport(1, 0); 168 simulate_transport(1, 0);
191 EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0); 169 EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0);
192 EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0); 170 EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0);
@@ -218,12 +196,9 @@ TEST_F(FrameRouter, master_receives_on_uplink_does_nothing) {
218 EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0); 196 EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0);
219 EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0); 197 EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0);
220 198
221 EXPECT_CALL(*this, transport_recv_frame(_, _, _)) 199 EXPECT_CALL(*this, transport_recv_frame(_, _, _)).Times(0);
222 .Times(0);
223 activate_router(0); 200 activate_router(0);
224 receive_data(UP_LINK, 201 receive_data(UP_LINK, router_buffers[1].send_buffers[UP_LINK].data(), router_buffers[1].send_buffers[UP_LINK].size());
225 router_buffers[1].send_buffers[UP_LINK].data(),
226 router_buffers[1].send_buffers[UP_LINK].size());
227 EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0); 202 EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0);
228 EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0); 203 EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0);
229} 204}
diff --git a/quantum/serial_link/tests/frame_validator_tests.cpp b/quantum/serial_link/tests/frame_validator_tests.cpp
index 9223af83b..43dc57b63 100644
--- a/quantum/serial_link/tests/frame_validator_tests.cpp
+++ b/quantum/serial_link/tests/frame_validator_tests.cpp
@@ -29,21 +29,17 @@ extern "C" {
29} 29}
30 30
31using testing::_; 31using testing::_;
32using testing::ElementsAreArray;
33using testing::Args; 32using testing::Args;
33using testing::ElementsAreArray;
34 34
35class FrameValidator : public testing::Test { 35class FrameValidator : public testing::Test {
36public: 36 public:
37 FrameValidator() { 37 FrameValidator() { Instance = this; }
38 Instance = this;
39 }
40 38
41 ~FrameValidator() { 39 ~FrameValidator() { Instance = nullptr; }
42 Instance = nullptr;
43 }
44 40
45 MOCK_METHOD3(route_incoming_frame, void (uint8_t link, uint8_t* data, uint16_t size)); 41 MOCK_METHOD3(route_incoming_frame, void(uint8_t link, uint8_t* data, uint16_t size));
46 MOCK_METHOD3(byte_stuffer_send_frame, void (uint8_t link, uint8_t* data, uint16_t size)); 42 MOCK_METHOD3(byte_stuffer_send_frame, void(uint8_t link, uint8_t* data, uint16_t size));
47 43
48 static FrameValidator* Instance; 44 static FrameValidator* Instance;
49}; 45};
@@ -51,18 +47,13 @@ public:
51FrameValidator* FrameValidator::Instance = nullptr; 47FrameValidator* FrameValidator::Instance = nullptr;
52 48
53extern "C" { 49extern "C" {
54void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size) { 50void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size) { FrameValidator::Instance->route_incoming_frame(link, data, size); }
55 FrameValidator::Instance->route_incoming_frame(link, data, size);
56}
57 51
58void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size) { 52void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size) { FrameValidator::Instance->byte_stuffer_send_frame(link, data, size); }
59 FrameValidator::Instance->byte_stuffer_send_frame(link, data, size);
60}
61} 53}
62 54
63TEST_F(FrameValidator, doesnt_validate_frames_under_5_bytes) { 55TEST_F(FrameValidator, doesnt_validate_frames_under_5_bytes) {
64 EXPECT_CALL(*this, route_incoming_frame(_, _, _)) 56 EXPECT_CALL(*this, route_incoming_frame(_, _, _)).Times(0);
65 .Times(0);
66 uint8_t data[] = {1, 2}; 57 uint8_t data[] = {1, 2};
67 validator_recv_frame(0, 0, 1); 58 validator_recv_frame(0, 0, 1);
68 validator_recv_frame(0, data, 2); 59 validator_recv_frame(0, data, 2);
@@ -72,44 +63,38 @@ TEST_F(FrameValidator, doesnt_validate_frames_under_5_bytes) {
72 63
73TEST_F(FrameValidator, validates_one_byte_frame_with_correct_crc) { 64TEST_F(FrameValidator, validates_one_byte_frame_with_correct_crc) {
74 uint8_t data[] = {0x44, 0x04, 0x6A, 0xB3, 0xA3}; 65 uint8_t data[] = {0x44, 0x04, 0x6A, 0xB3, 0xA3};
75 EXPECT_CALL(*this, route_incoming_frame(_, _, _)) 66 EXPECT_CALL(*this, route_incoming_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(data, 1)));
76 .With(Args<1, 2>(ElementsAreArray(data, 1)));
77 validator_recv_frame(0, data, 5); 67 validator_recv_frame(0, data, 5);
78} 68}
79 69
80TEST_F(FrameValidator, does_not_validate_one_byte_frame_with_incorrect_crc) { 70TEST_F(FrameValidator, does_not_validate_one_byte_frame_with_incorrect_crc) {
81 uint8_t data[] = {0x44, 0, 0, 0, 0}; 71 uint8_t data[] = {0x44, 0, 0, 0, 0};
82 EXPECT_CALL(*this, route_incoming_frame(_, _, _)) 72 EXPECT_CALL(*this, route_incoming_frame(_, _, _)).Times(0);
83 .Times(0);
84 validator_recv_frame(1, data, 5); 73 validator_recv_frame(1, data, 5);
85} 74}
86 75
87TEST_F(FrameValidator, validates_four_byte_frame_with_correct_crc) { 76TEST_F(FrameValidator, validates_four_byte_frame_with_correct_crc) {
88 uint8_t data[] = {0x44, 0x10, 0xFF, 0x00, 0x74, 0x4E, 0x30, 0xBA}; 77 uint8_t data[] = {0x44, 0x10, 0xFF, 0x00, 0x74, 0x4E, 0x30, 0xBA};
89 EXPECT_CALL(*this, route_incoming_frame(_, _, _)) 78 EXPECT_CALL(*this, route_incoming_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(data, 4)));
90 .With(Args<1, 2>(ElementsAreArray(data, 4)));
91 validator_recv_frame(1, data, 8); 79 validator_recv_frame(1, data, 8);
92} 80}
93 81
94TEST_F(FrameValidator, validates_five_byte_frame_with_correct_crc) { 82TEST_F(FrameValidator, validates_five_byte_frame_with_correct_crc) {
95 uint8_t data[] = {1, 2, 3, 4, 5, 0xF4, 0x99, 0x0B, 0x47}; 83 uint8_t data[] = {1, 2, 3, 4, 5, 0xF4, 0x99, 0x0B, 0x47};
96 EXPECT_CALL(*this, route_incoming_frame(_, _, _)) 84 EXPECT_CALL(*this, route_incoming_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(data, 5)));
97 .With(Args<1, 2>(ElementsAreArray(data, 5)));
98 validator_recv_frame(0, data, 9); 85 validator_recv_frame(0, data, 9);
99} 86}
100 87
101TEST_F(FrameValidator, sends_one_byte_with_correct_crc) { 88TEST_F(FrameValidator, sends_one_byte_with_correct_crc) {
102 uint8_t original[] = {0x44, 0, 0, 0, 0}; 89 uint8_t original[] = {0x44, 0, 0, 0, 0};
103 uint8_t expected[] = {0x44, 0x04, 0x6A, 0xB3, 0xA3}; 90 uint8_t expected[] = {0x44, 0x04, 0x6A, 0xB3, 0xA3};
104 EXPECT_CALL(*this, byte_stuffer_send_frame(_, _, _)) 91 EXPECT_CALL(*this, byte_stuffer_send_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
105 .With(Args<1, 2>(ElementsAreArray(expected)));
106 validator_send_frame(0, original, 1); 92 validator_send_frame(0, original, 1);
107} 93}
108 94
109TEST_F(FrameValidator, sends_five_bytes_with_correct_crc) { 95TEST_F(FrameValidator, sends_five_bytes_with_correct_crc) {
110 uint8_t original[] = {1, 2, 3, 4, 5, 0, 0, 0, 0}; 96 uint8_t original[] = {1, 2, 3, 4, 5, 0, 0, 0, 0};
111 uint8_t expected[] = {1, 2, 3, 4, 5, 0xF4, 0x99, 0x0B, 0x47}; 97 uint8_t expected[] = {1, 2, 3, 4, 5, 0xF4, 0x99, 0x0B, 0x47};
112 EXPECT_CALL(*this, byte_stuffer_send_frame(_, _, _)) 98 EXPECT_CALL(*this, byte_stuffer_send_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
113 .With(Args<1, 2>(ElementsAreArray(expected)));
114 validator_send_frame(0, original, 5); 99 validator_send_frame(0, original, 5);
115} 100}
diff --git a/quantum/serial_link/tests/transport_tests.cpp b/quantum/serial_link/tests/transport_tests.cpp
index 21b7b165f..cfd111046 100644
--- a/quantum/serial_link/tests/transport_tests.cpp
+++ b/quantum/serial_link/tests/transport_tests.cpp
@@ -26,8 +26,8 @@ SOFTWARE.
26#include "gmock/gmock.h" 26#include "gmock/gmock.h"
27 27
28using testing::_; 28using testing::_;
29using testing::ElementsAreArray;
30using testing::Args; 29using testing::Args;
30using testing::ElementsAreArray;
31 31
32extern "C" { 32extern "C" {
33#include "serial_link/protocol/transport.h" 33#include "serial_link/protocol/transport.h"
@@ -53,7 +53,7 @@ static remote_object_t* test_remote_objects[] = {
53}; 53};
54 54
55class Transport : public testing::Test { 55class Transport : public testing::Test {
56public: 56 public:
57 Transport() { 57 Transport() {
58 Instance = this; 58 Instance = this;
59 add_remote_objects(test_remote_objects, sizeof(test_remote_objects) / sizeof(remote_object_t*)); 59 add_remote_objects(test_remote_objects, sizeof(test_remote_objects) / sizeof(remote_object_t*));
@@ -64,8 +64,8 @@ public:
64 reinitialize_serial_link_transport(); 64 reinitialize_serial_link_transport();
65 } 65 }
66 66
67 MOCK_METHOD0(signal_data_written, void ()); 67 MOCK_METHOD0(signal_data_written, void());
68 MOCK_METHOD1(router_send_frame, void (uint8_t destination)); 68 MOCK_METHOD1(router_send_frame, void(uint8_t destination));
69 69
70 void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) { 70 void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) {
71 router_send_frame(destination); 71 router_send_frame(destination);
@@ -80,13 +80,9 @@ public:
80Transport* Transport::Instance = nullptr; 80Transport* Transport::Instance = nullptr;
81 81
82extern "C" { 82extern "C" {
83void signal_data_written(void) { 83void signal_data_written(void) { Transport::Instance->signal_data_written(); }
84 Transport::Instance->signal_data_written();
85}
86 84
87void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) { 85void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) { Transport::Instance->router_send_frame(destination, data, size); }
88 Transport::Instance->router_send_frame(destination, data, size);
89}
90} 86}
91 87
92TEST_F(Transport, write_to_local_signals_an_event) { 88TEST_F(Transport, write_to_local_signals_an_event) {
@@ -104,7 +100,7 @@ TEST_F(Transport, write_to_local_signals_an_event) {
104TEST_F(Transport, writes_from_master_to_all_slaves) { 100TEST_F(Transport, writes_from_master_to_all_slaves) {
105 update_transport(); 101 update_transport();
106 test_object1* obj = begin_write_master_to_slave(); 102 test_object1* obj = begin_write_master_to_slave();
107 obj->test = 5; 103 obj->test = 5;
108 EXPECT_CALL(*this, signal_data_written()); 104 EXPECT_CALL(*this, signal_data_written());
109 end_write_master_to_slave(); 105 end_write_master_to_slave();
110 EXPECT_CALL(*this, router_send_frame(0xFF)); 106 EXPECT_CALL(*this, router_send_frame(0xFF));
@@ -118,7 +114,7 @@ TEST_F(Transport, writes_from_master_to_all_slaves) {
118TEST_F(Transport, writes_from_slave_to_master) { 114TEST_F(Transport, writes_from_slave_to_master) {
119 update_transport(); 115 update_transport();
120 test_object1* obj = begin_write_slave_to_master(); 116 test_object1* obj = begin_write_slave_to_master();
121 obj->test = 7; 117 obj->test = 7;
122 EXPECT_CALL(*this, signal_data_written()); 118 EXPECT_CALL(*this, signal_data_written());
123 end_write_slave_to_master(); 119 end_write_slave_to_master();
124 EXPECT_CALL(*this, router_send_frame(0)); 120 EXPECT_CALL(*this, router_send_frame(0));
@@ -133,7 +129,7 @@ TEST_F(Transport, writes_from_slave_to_master) {
133TEST_F(Transport, writes_from_master_to_single_slave) { 129TEST_F(Transport, writes_from_master_to_single_slave) {
134 update_transport(); 130 update_transport();
135 test_object1* obj = begin_write_master_to_single_slave(3); 131 test_object1* obj = begin_write_master_to_single_slave(3);
136 obj->test = 7; 132 obj->test = 7;
137 EXPECT_CALL(*this, signal_data_written()); 133 EXPECT_CALL(*this, signal_data_written());
138 end_write_master_to_single_slave(3); 134 end_write_master_to_single_slave(3);
139 EXPECT_CALL(*this, router_send_frame(4)); 135 EXPECT_CALL(*this, router_send_frame(4));
@@ -147,7 +143,7 @@ TEST_F(Transport, writes_from_master_to_single_slave) {
147TEST_F(Transport, ignores_object_with_invalid_id) { 143TEST_F(Transport, ignores_object_with_invalid_id) {
148 update_transport(); 144 update_transport();
149 test_object1* obj = begin_write_master_to_single_slave(3); 145 test_object1* obj = begin_write_master_to_single_slave(3);
150 obj->test = 7; 146 obj->test = 7;
151 EXPECT_CALL(*this, signal_data_written()); 147 EXPECT_CALL(*this, signal_data_written());
152 end_write_master_to_single_slave(3); 148 end_write_master_to_single_slave(3);
153 EXPECT_CALL(*this, router_send_frame(4)); 149 EXPECT_CALL(*this, router_send_frame(4));
@@ -161,7 +157,7 @@ TEST_F(Transport, ignores_object_with_invalid_id) {
161TEST_F(Transport, ignores_object_with_size_too_small) { 157TEST_F(Transport, ignores_object_with_size_too_small) {
162 update_transport(); 158 update_transport();
163 test_object1* obj = begin_write_master_to_slave(); 159 test_object1* obj = begin_write_master_to_slave();
164 obj->test = 7; 160 obj->test = 7;
165 EXPECT_CALL(*this, signal_data_written()); 161 EXPECT_CALL(*this, signal_data_written());
166 end_write_master_to_slave(); 162 end_write_master_to_slave();
167 EXPECT_CALL(*this, router_send_frame(_)); 163 EXPECT_CALL(*this, router_send_frame(_));
@@ -175,7 +171,7 @@ TEST_F(Transport, ignores_object_with_size_too_small) {
175TEST_F(Transport, ignores_object_with_size_too_big) { 171TEST_F(Transport, ignores_object_with_size_too_big) {
176 update_transport(); 172 update_transport();
177 test_object1* obj = begin_write_master_to_slave(); 173 test_object1* obj = begin_write_master_to_slave();
178 obj->test = 7; 174 obj->test = 7;
179 EXPECT_CALL(*this, signal_data_written()); 175 EXPECT_CALL(*this, signal_data_written());
180 end_write_master_to_slave(); 176 end_write_master_to_slave();
181 EXPECT_CALL(*this, router_send_frame(_)); 177 EXPECT_CALL(*this, router_send_frame(_));
diff --git a/quantum/serial_link/tests/triple_buffered_object_tests.cpp b/quantum/serial_link/tests/triple_buffered_object_tests.cpp
index 7724bbee9..8de9bfdeb 100644
--- a/quantum/serial_link/tests/triple_buffered_object_tests.cpp
+++ b/quantum/serial_link/tests/triple_buffered_object_tests.cpp
@@ -27,18 +27,16 @@ extern "C" {
27#include "serial_link/protocol/triple_buffered_object.h" 27#include "serial_link/protocol/triple_buffered_object.h"
28} 28}
29 29
30struct test_object{ 30struct test_object {
31 uint8_t state; 31 uint8_t state;
32 uint32_t buffer[3]; 32 uint32_t buffer[3];
33}; 33};
34 34
35test_object test_object; 35test_object test_object;
36 36
37class TripleBufferedObject : public testing::Test { 37class TripleBufferedObject : public testing::Test {
38public: 38 public:
39 TripleBufferedObject() { 39 TripleBufferedObject() { triple_buffer_init((triple_buffer_object_t*)&test_object); }
40 triple_buffer_init((triple_buffer_object_t*)&test_object);
41 }
42}; 40};
43 41
44TEST_F(TripleBufferedObject, writes_and_reads_object) { 42TEST_F(TripleBufferedObject, writes_and_reads_object) {
@@ -47,9 +45,7 @@ TEST_F(TripleBufferedObject, writes_and_reads_object) {
47 EXPECT_EQ(*triple_buffer_read(&test_object), 0x3456ABCC); 45 EXPECT_EQ(*triple_buffer_read(&test_object), 0x3456ABCC);
48} 46}
49 47
50TEST_F(TripleBufferedObject, does_not_read_empty) { 48TEST_F(TripleBufferedObject, does_not_read_empty) { EXPECT_EQ(triple_buffer_read(&test_object), nullptr); }
51 EXPECT_EQ(triple_buffer_read(&test_object), nullptr);
52}
53 49
54TEST_F(TripleBufferedObject, writes_twice_and_reads_object) { 50TEST_F(TripleBufferedObject, writes_twice_and_reads_object) {
55 *triple_buffer_begin_write(&test_object) = 0x3456ABCC; 51 *triple_buffer_begin_write(&test_object) = 0x3456ABCC;
@@ -62,7 +58,7 @@ TEST_F(TripleBufferedObject, writes_twice_and_reads_object) {
62TEST_F(TripleBufferedObject, performs_another_write_in_the_middle_of_read) { 58TEST_F(TripleBufferedObject, performs_another_write_in_the_middle_of_read) {
63 *triple_buffer_begin_write(&test_object) = 1; 59 *triple_buffer_begin_write(&test_object) = 1;
64 triple_buffer_end_write(&test_object); 60 triple_buffer_end_write(&test_object);
65 uint32_t* read = triple_buffer_read(&test_object); 61 uint32_t* read = triple_buffer_read(&test_object);
66 *triple_buffer_begin_write(&test_object) = 2; 62 *triple_buffer_begin_write(&test_object) = 2;
67 triple_buffer_end_write(&test_object); 63 triple_buffer_end_write(&test_object);
68 EXPECT_EQ(*read, 1); 64 EXPECT_EQ(*read, 1);
@@ -73,7 +69,7 @@ TEST_F(TripleBufferedObject, performs_another_write_in_the_middle_of_read) {
73TEST_F(TripleBufferedObject, performs_two_writes_in_the_middle_of_read) { 69TEST_F(TripleBufferedObject, performs_two_writes_in_the_middle_of_read) {
74 *triple_buffer_begin_write(&test_object) = 1; 70 *triple_buffer_begin_write(&test_object) = 1;
75 triple_buffer_end_write(&test_object); 71 triple_buffer_end_write(&test_object);
76 uint32_t* read = triple_buffer_read(&test_object); 72 uint32_t* read = triple_buffer_read(&test_object);
77 *triple_buffer_begin_write(&test_object) = 2; 73 *triple_buffer_begin_write(&test_object) = 2;
78 triple_buffer_end_write(&test_object); 74 triple_buffer_end_write(&test_object);
79 *triple_buffer_begin_write(&test_object) = 3; 75 *triple_buffer_begin_write(&test_object) = 3;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-08 14:05:08 +0000