diff options
Diffstat (limited to 'quantum/serial_link/protocol')
-rw-r--r-- | quantum/serial_link/protocol/byte_stuffer.c | 135 | ||||
-rw-r--r-- | quantum/serial_link/protocol/byte_stuffer.h | 34 | ||||
-rw-r--r-- | quantum/serial_link/protocol/frame_router.c | 64 | ||||
-rw-r--r-- | quantum/serial_link/protocol/frame_router.h | 35 | ||||
-rw-r--r-- | quantum/serial_link/protocol/frame_validator.c | 57 | ||||
-rw-r--r-- | quantum/serial_link/protocol/frame_validator.h | 31 | ||||
-rw-r--r-- | quantum/serial_link/protocol/physical.h | 27 | ||||
-rw-r--r-- | quantum/serial_link/protocol/transport.c | 121 | ||||
-rw-r--r-- | quantum/serial_link/protocol/transport.h | 139 | ||||
-rw-r--r-- | quantum/serial_link/protocol/triple_buffered_object.c | 77 | ||||
-rw-r--r-- | quantum/serial_link/protocol/triple_buffered_object.h | 44 |
11 files changed, 0 insertions, 764 deletions
diff --git a/quantum/serial_link/protocol/byte_stuffer.c b/quantum/serial_link/protocol/byte_stuffer.c deleted file mode 100644 index d3a91d828..000000000 --- a/quantum/serial_link/protocol/byte_stuffer.c +++ /dev/null | |||
@@ -1,135 +0,0 @@ | |||
1 | /* | ||
2 | The MIT License (MIT) | ||
3 | |||
4 | Copyright (c) 2016 Fred Sundvik | ||
5 | |||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
7 | of this software and associated documentation files (the "Software"), to deal | ||
8 | in the Software without restriction, including without limitation the rights | ||
9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
10 | copies of the Software, and to permit persons to whom the Software is | ||
11 | furnished to do so, subject to the following conditions: | ||
12 | |||
13 | The above copyright notice and this permission notice shall be included in all | ||
14 | copies or substantial portions of the Software. | ||
15 | |||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
22 | SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #include "serial_link/protocol/byte_stuffer.h" | ||
26 | #include "serial_link/protocol/frame_validator.h" | ||
27 | #include "serial_link/protocol/physical.h" | ||
28 | #include <stdbool.h> | ||
29 | |||
30 | // This implements the "Consistent overhead byte stuffing protocol" | ||
31 | // https://en.wikipedia.org/wiki/Consistent_Overhead_Byte_Stuffing | ||
32 | // http://www.stuartcheshire.org/papers/COBSforToN.pdf | ||
33 | |||
34 | typedef struct byte_stuffer_state { | ||
35 | uint16_t next_zero; | ||
36 | uint16_t data_pos; | ||
37 | bool long_frame; | ||
38 | uint8_t data[MAX_FRAME_SIZE]; | ||
39 | } byte_stuffer_state_t; | ||
40 | |||
41 | static byte_stuffer_state_t states[NUM_LINKS]; | ||
42 | |||
43 | void init_byte_stuffer_state(byte_stuffer_state_t* state) { | ||
44 | state->next_zero = 0; | ||
45 | state->data_pos = 0; | ||
46 | state->long_frame = false; | ||
47 | } | ||
48 | |||
49 | void init_byte_stuffer(void) { | ||
50 | int i; | ||
51 | for (i = 0; i < NUM_LINKS; i++) { | ||
52 | init_byte_stuffer_state(&states[i]); | ||
53 | } | ||
54 | } | ||
55 | |||
56 | void byte_stuffer_recv_byte(uint8_t link, uint8_t data) { | ||
57 | byte_stuffer_state_t* state = &states[link]; | ||
58 | // Start of a new frame | ||
59 | if (state->next_zero == 0) { | ||
60 | state->next_zero = data; | ||
61 | state->long_frame = data == 0xFF; | ||
62 | state->data_pos = 0; | ||
63 | return; | ||
64 | } | ||
65 | |||
66 | state->next_zero--; | ||
67 | if (data == 0) { | ||
68 | if (state->next_zero == 0) { | ||
69 | // The frame is completed | ||
70 | if (state->data_pos > 0) { | ||
71 | validator_recv_frame(link, state->data, state->data_pos); | ||
72 | } | ||
73 | } else { | ||
74 | // The frame is invalid, so reset | ||
75 | init_byte_stuffer_state(state); | ||
76 | } | ||
77 | } else { | ||
78 | if (state->data_pos == MAX_FRAME_SIZE) { | ||
79 | // We exceeded our maximum frame size | ||
80 | // therefore there's nothing else to do than reset to a new frame | ||
81 | state->next_zero = data; | ||
82 | state->long_frame = data == 0xFF; | ||
83 | state->data_pos = 0; | ||
84 | } else if (state->next_zero == 0) { | ||
85 | if (state->long_frame) { | ||
86 | // This is part of a long frame, so continue | ||
87 | state->next_zero = data; | ||
88 | state->long_frame = data == 0xFF; | ||
89 | } else { | ||
90 | // Special case for zeroes | ||
91 | state->next_zero = data; | ||
92 | state->data[state->data_pos++] = 0; | ||
93 | } | ||
94 | } else { | ||
95 | state->data[state->data_pos++] = data; | ||
96 | } | ||
97 | } | ||
98 | } | ||
99 | |||
100 | static void send_block(uint8_t link, uint8_t* start, uint8_t* end, uint8_t num_non_zero) { | ||
101 | send_data(link, &num_non_zero, 1); | ||
102 | if (end > start) { | ||
103 | send_data(link, start, end - start); | ||
104 | } | ||
105 | } | ||
106 | |||
107 | void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size) { | ||
108 | const uint8_t zero = 0; | ||
109 | if (size > 0) { | ||
110 | uint16_t num_non_zero = 1; | ||
111 | uint8_t* end = data + size; | ||
112 | uint8_t* start = data; | ||
113 | while (data < end) { | ||
114 | if (num_non_zero == 0xFF) { | ||
115 | // There's more data after big non-zero block | ||
116 | // So send it, and start a new block | ||
117 | send_block(link, start, data, num_non_zero); | ||
118 | start = data; | ||
119 | num_non_zero = 1; | ||
120 | } else { | ||
121 | if (*data == 0) { | ||
122 | // A zero encountered, so send the block | ||
123 | send_block(link, start, data, num_non_zero); | ||
124 | start = data + 1; | ||
125 | num_non_zero = 1; | ||
126 | } else { | ||
127 | num_non_zero++; | ||
128 | } | ||
129 | ++data; | ||
130 | } | ||
131 | } | ||
132 | send_block(link, start, data, num_non_zero); | ||
133 | send_data(link, &zero, 1); | ||
134 | } | ||
135 | } | ||
diff --git a/quantum/serial_link/protocol/byte_stuffer.h b/quantum/serial_link/protocol/byte_stuffer.h deleted file mode 100644 index 397ed3baa..000000000 --- a/quantum/serial_link/protocol/byte_stuffer.h +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | /* | ||
2 | The MIT License (MIT) | ||
3 | |||
4 | Copyright (c) 2016 Fred Sundvik | ||
5 | |||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
7 | of this software and associated documentation files (the "Software"), to deal | ||
8 | in the Software without restriction, including without limitation the rights | ||
9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
10 | copies of the Software, and to permit persons to whom the Software is | ||
11 | furnished to do so, subject to the following conditions: | ||
12 | |||
13 | The above copyright notice and this permission notice shall be included in all | ||
14 | copies or substantial portions of the Software. | ||
15 | |||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
22 | SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #pragma once | ||
26 | |||
27 | #include <stdint.h> | ||
28 | |||
29 | #define MAX_FRAME_SIZE 1024 | ||
30 | #define NUM_LINKS 2 | ||
31 | |||
32 | void init_byte_stuffer(void); | ||
33 | void byte_stuffer_recv_byte(uint8_t link, uint8_t data); | ||
34 | void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size); | ||
diff --git a/quantum/serial_link/protocol/frame_router.c b/quantum/serial_link/protocol/frame_router.c deleted file mode 100644 index 529267370..000000000 --- a/quantum/serial_link/protocol/frame_router.c +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | /* | ||
2 | The MIT License (MIT) | ||
3 | |||
4 | Copyright (c) 2016 Fred Sundvik | ||
5 | |||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
7 | of this software and associated documentation files (the "Software"), to deal | ||
8 | in the Software without restriction, including without limitation the rights | ||
9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
10 | copies of the Software, and to permit persons to whom the Software is | ||
11 | furnished to do so, subject to the following conditions: | ||
12 | |||
13 | The above copyright notice and this permission notice shall be included in all | ||
14 | copies or substantial portions of the Software. | ||
15 | |||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
22 | SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #include "serial_link/protocol/frame_router.h" | ||
26 | #include "serial_link/protocol/transport.h" | ||
27 | #include "serial_link/protocol/frame_validator.h" | ||
28 | |||
29 | static bool is_master; | ||
30 | |||
31 | void router_set_master(bool master) { is_master = master; } | ||
32 | |||
33 | void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size) { | ||
34 | if (is_master) { | ||
35 | if (link == DOWN_LINK) { | ||
36 | transport_recv_frame(data[size - 1], data, size - 1); | ||
37 | } | ||
38 | } else { | ||
39 | if (link == UP_LINK) { | ||
40 | if (data[size - 1] & 1) { | ||
41 | transport_recv_frame(0, data, size - 1); | ||
42 | } | ||
43 | data[size - 1] >>= 1; | ||
44 | validator_send_frame(DOWN_LINK, data, size); | ||
45 | } else { | ||
46 | data[size - 1]++; | ||
47 | validator_send_frame(UP_LINK, data, size); | ||
48 | } | ||
49 | } | ||
50 | } | ||
51 | |||
52 | void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) { | ||
53 | if (destination == 0) { | ||
54 | if (!is_master) { | ||
55 | data[size] = 1; | ||
56 | validator_send_frame(UP_LINK, data, size + 1); | ||
57 | } | ||
58 | } else { | ||
59 | if (is_master) { | ||
60 | data[size] = destination; | ||
61 | validator_send_frame(DOWN_LINK, data, size + 1); | ||
62 | } | ||
63 | } | ||
64 | } | ||
diff --git a/quantum/serial_link/protocol/frame_router.h b/quantum/serial_link/protocol/frame_router.h deleted file mode 100644 index 9325fe4ee..000000000 --- a/quantum/serial_link/protocol/frame_router.h +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | /* | ||
2 | The MIT License (MIT) | ||
3 | |||
4 | Copyright (c) 2016 Fred Sundvik | ||
5 | |||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
7 | of this software and associated documentation files (the "Software"), to deal | ||
8 | in the Software without restriction, including without limitation the rights | ||
9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
10 | copies of the Software, and to permit persons to whom the Software is | ||
11 | furnished to do so, subject to the following conditions: | ||
12 | |||
13 | The above copyright notice and this permission notice shall be included in all | ||
14 | copies or substantial portions of the Software. | ||
15 | |||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
22 | SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #pragma once | ||
26 | |||
27 | #include <stdint.h> | ||
28 | #include <stdbool.h> | ||
29 | |||
30 | #define UP_LINK 0 | ||
31 | #define DOWN_LINK 1 | ||
32 | |||
33 | void router_set_master(bool master); | ||
34 | void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size); | ||
35 | void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size); | ||
diff --git a/quantum/serial_link/protocol/frame_validator.c b/quantum/serial_link/protocol/frame_validator.c deleted file mode 100644 index bc9136f70..000000000 --- a/quantum/serial_link/protocol/frame_validator.c +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | /* | ||
2 | The MIT License (MIT) | ||
3 | |||
4 | Copyright (c) 2016 Fred Sundvik | ||
5 | |||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
7 | of this software and associated documentation files (the "Software"), to deal | ||
8 | in the Software without restriction, including without limitation the rights | ||
9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
10 | copies of the Software, and to permit persons to whom the Software is | ||
11 | furnished to do so, subject to the following conditions: | ||
12 | |||
13 | The above copyright notice and this permission notice shall be included in all | ||
14 | copies or substantial portions of the Software. | ||
15 | |||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
22 | SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #include "serial_link/protocol/frame_validator.h" | ||
26 | #include "serial_link/protocol/frame_router.h" | ||
27 | #include "serial_link/protocol/byte_stuffer.h" | ||
28 | #include <string.h> | ||
29 | |||
30 | const 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 | 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 | 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 | 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 | |||
35 | static uint32_t crc32_byte(uint8_t* p, uint32_t bytelength) { | ||
36 | uint32_t crc = 0xffffffff; | ||
37 | while (bytelength-- != 0) crc = poly8_lookup[((uint8_t)crc ^ *(p++))] ^ (crc >> 8); | ||
38 | // return (~crc); also works | ||
39 | return (crc ^ 0xffffffff); | ||
40 | } | ||
41 | |||
42 | void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size) { | ||
43 | if (size > 4) { | ||
44 | uint32_t frame_crc; | ||
45 | memcpy(&frame_crc, data + size - 4, 4); | ||
46 | uint32_t expected_crc = crc32_byte(data, size - 4); | ||
47 | if (frame_crc == expected_crc) { | ||
48 | route_incoming_frame(link, data, size - 4); | ||
49 | } | ||
50 | } | ||
51 | } | ||
52 | |||
53 | void validator_send_frame(uint8_t link, uint8_t* data, uint16_t size) { | ||
54 | uint32_t crc = crc32_byte(data, size); | ||
55 | memcpy(data + size, &crc, 4); | ||
56 | byte_stuffer_send_frame(link, data, size + 4); | ||
57 | } | ||
diff --git a/quantum/serial_link/protocol/frame_validator.h b/quantum/serial_link/protocol/frame_validator.h deleted file mode 100644 index 0f78768a0..000000000 --- a/quantum/serial_link/protocol/frame_validator.h +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | /* | ||
2 | The MIT License (MIT) | ||
3 | |||
4 | Copyright (c) 2016 Fred Sundvik | ||
5 | |||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
7 | of this software and associated documentation files (the "Software"), to deal | ||
8 | in the Software without restriction, including without limitation the rights | ||
9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
10 | copies of the Software, and to permit persons to whom the Software is | ||
11 | furnished to do so, subject to the following conditions: | ||
12 | |||
13 | The above copyright notice and this permission notice shall be included in all | ||
14 | copies or substantial portions of the Software. | ||
15 | |||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
22 | SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #pragma once | ||
26 | |||
27 | #include <stdint.h> | ||
28 | |||
29 | void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size); | ||
30 | // The buffer pointed to by the data needs 4 additional bytes | ||
31 | void validator_send_frame(uint8_t link, uint8_t* data, uint16_t size); | ||
diff --git a/quantum/serial_link/protocol/physical.h b/quantum/serial_link/protocol/physical.h deleted file mode 100644 index 399c9d1f7..000000000 --- a/quantum/serial_link/protocol/physical.h +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | /* | ||
2 | The MIT License (MIT) | ||
3 | |||
4 | Copyright (c) 2016 Fred Sundvik | ||
5 | |||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
7 | of this software and associated documentation files (the "Software"), to deal | ||
8 | in the Software without restriction, including without limitation the rights | ||
9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
10 | copies of the Software, and to permit persons to whom the Software is | ||
11 | furnished to do so, subject to the following conditions: | ||
12 | |||
13 | The above copyright notice and this permission notice shall be included in all | ||
14 | copies or substantial portions of the Software. | ||
15 | |||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
22 | SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #pragma once | ||
26 | |||
27 | void send_data(uint8_t link, const uint8_t* data, uint16_t size); | ||
diff --git a/quantum/serial_link/protocol/transport.c b/quantum/serial_link/protocol/transport.c deleted file mode 100644 index 73b8dc62e..000000000 --- a/quantum/serial_link/protocol/transport.c +++ /dev/null | |||
@@ -1,121 +0,0 @@ | |||
1 | /* | ||
2 | The MIT License (MIT) | ||
3 | |||
4 | Copyright (c) 2016 Fred Sundvik | ||
5 | |||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
7 | of this software and associated documentation files (the "Software"), to deal | ||
8 | in the Software without restriction, including without limitation the rights | ||
9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
10 | copies of the Software, and to permit persons to whom the Software is | ||
11 | furnished to do so, subject to the following conditions: | ||
12 | |||
13 | The above copyright notice and this permission notice shall be included in all | ||
14 | copies or substantial portions of the Software. | ||
15 | |||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
22 | SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #include "serial_link/protocol/transport.h" | ||
26 | #include "serial_link/protocol/frame_router.h" | ||
27 | #include "serial_link/protocol/triple_buffered_object.h" | ||
28 | #include <string.h> | ||
29 | |||
30 | #define MAX_REMOTE_OBJECTS 16 | ||
31 | static remote_object_t* remote_objects[MAX_REMOTE_OBJECTS]; | ||
32 | static uint32_t num_remote_objects = 0; | ||
33 | |||
34 | void reinitialize_serial_link_transport(void) { num_remote_objects = 0; } | ||
35 | |||
36 | void add_remote_objects(remote_object_t** _remote_objects, uint32_t _num_remote_objects) { | ||
37 | unsigned int i; | ||
38 | for (i = 0; i < _num_remote_objects; i++) { | ||
39 | remote_object_t* obj = _remote_objects[i]; | ||
40 | remote_objects[num_remote_objects++] = obj; | ||
41 | if (obj->object_type == MASTER_TO_ALL_SLAVES) { | ||
42 | triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; | ||
43 | triple_buffer_init(tb); | ||
44 | uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); | ||
45 | tb = (triple_buffer_object_t*)start; | ||
46 | triple_buffer_init(tb); | ||
47 | } else if (obj->object_type == MASTER_TO_SINGLE_SLAVE) { | ||
48 | uint8_t* start = obj->buffer; | ||
49 | unsigned int j; | ||
50 | for (j = 0; j < NUM_SLAVES; j++) { | ||
51 | triple_buffer_object_t* tb = (triple_buffer_object_t*)start; | ||
52 | triple_buffer_init(tb); | ||
53 | start += LOCAL_OBJECT_SIZE(obj->object_size); | ||
54 | } | ||
55 | triple_buffer_object_t* tb = (triple_buffer_object_t*)start; | ||
56 | triple_buffer_init(tb); | ||
57 | } else { | ||
58 | uint8_t* start = obj->buffer; | ||
59 | triple_buffer_object_t* tb = (triple_buffer_object_t*)start; | ||
60 | triple_buffer_init(tb); | ||
61 | start += LOCAL_OBJECT_SIZE(obj->object_size); | ||
62 | unsigned int j; | ||
63 | for (j = 0; j < NUM_SLAVES; j++) { | ||
64 | tb = (triple_buffer_object_t*)start; | ||
65 | triple_buffer_init(tb); | ||
66 | start += REMOTE_OBJECT_SIZE(obj->object_size); | ||
67 | } | ||
68 | } | ||
69 | } | ||
70 | } | ||
71 | |||
72 | void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) { | ||
73 | uint8_t id = data[size - 1]; | ||
74 | if (id < num_remote_objects) { | ||
75 | remote_object_t* obj = remote_objects[id]; | ||
76 | if (obj->object_size == size - 1) { | ||
77 | uint8_t* start; | ||
78 | if (obj->object_type == MASTER_TO_ALL_SLAVES) { | ||
79 | start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); | ||
80 | } else if (obj->object_type == SLAVE_TO_MASTER) { | ||
81 | start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); | ||
82 | start += (from - 1) * REMOTE_OBJECT_SIZE(obj->object_size); | ||
83 | } else { | ||
84 | start = obj->buffer + NUM_SLAVES * LOCAL_OBJECT_SIZE(obj->object_size); | ||
85 | } | ||
86 | triple_buffer_object_t* tb = (triple_buffer_object_t*)start; | ||
87 | void* ptr = triple_buffer_begin_write_internal(obj->object_size, tb); | ||
88 | memcpy(ptr, data, size - 1); | ||
89 | triple_buffer_end_write_internal(tb); | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | |||
94 | void update_transport(void) { | ||
95 | unsigned int i; | ||
96 | for (i = 0; i < num_remote_objects; i++) { | ||
97 | remote_object_t* obj = remote_objects[i]; | ||
98 | if (obj->object_type == MASTER_TO_ALL_SLAVES || obj->object_type == SLAVE_TO_MASTER) { | ||
99 | triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; | ||
100 | uint8_t* ptr = (uint8_t*)triple_buffer_read_internal(obj->object_size + LOCAL_OBJECT_EXTRA, tb); | ||
101 | if (ptr) { | ||
102 | ptr[obj->object_size] = i; | ||
103 | uint8_t dest = obj->object_type == MASTER_TO_ALL_SLAVES ? 0xFF : 0; | ||
104 | router_send_frame(dest, ptr, obj->object_size + 1); | ||
105 | } | ||
106 | } else { | ||
107 | uint8_t* start = obj->buffer; | ||
108 | unsigned int j; | ||
109 | for (j = 0; j < NUM_SLAVES; j++) { | ||
110 | triple_buffer_object_t* tb = (triple_buffer_object_t*)start; | ||
111 | uint8_t* ptr = (uint8_t*)triple_buffer_read_internal(obj->object_size + LOCAL_OBJECT_EXTRA, tb); | ||
112 | if (ptr) { | ||
113 | ptr[obj->object_size] = i; | ||
114 | uint8_t dest = j + 1; | ||
115 | router_send_frame(dest, ptr, obj->object_size + 1); | ||
116 | } | ||
117 | start += LOCAL_OBJECT_SIZE(obj->object_size); | ||
118 | } | ||
119 | } | ||
120 | } | ||
121 | } | ||
diff --git a/quantum/serial_link/protocol/transport.h b/quantum/serial_link/protocol/transport.h deleted file mode 100644 index 3ce0c9fe4..000000000 --- a/quantum/serial_link/protocol/transport.h +++ /dev/null | |||
@@ -1,139 +0,0 @@ | |||
1 | /* | ||
2 | The MIT License (MIT) | ||
3 | |||
4 | Copyright (c) 2016 Fred Sundvik | ||
5 | |||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
7 | of this software and associated documentation files (the "Software"), to deal | ||
8 | in the Software without restriction, including without limitation the rights | ||
9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
10 | copies of the Software, and to permit persons to whom the Software is | ||
11 | furnished to do so, subject to the following conditions: | ||
12 | |||
13 | The above copyright notice and this permission notice shall be included in all | ||
14 | copies or substantial portions of the Software. | ||
15 | |||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
22 | SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #pragma once | ||
26 | |||
27 | #include "serial_link/protocol/triple_buffered_object.h" | ||
28 | #include "serial_link/system/serial_link.h" | ||
29 | |||
30 | #define NUM_SLAVES 8 | ||
31 | #define LOCAL_OBJECT_EXTRA 16 | ||
32 | |||
33 | // master -> slave = 1 local(target all), 1 remote object | ||
34 | // slave -> master = 1 local(target 0), multiple remote objects | ||
35 | // master -> single slave (multiple local, target id), 1 remote object | ||
36 | typedef enum { | ||
37 | MASTER_TO_ALL_SLAVES, | ||
38 | MASTER_TO_SINGLE_SLAVE, | ||
39 | SLAVE_TO_MASTER, | ||
40 | } remote_object_type; | ||
41 | |||
42 | typedef struct { | ||
43 | remote_object_type object_type; | ||
44 | uint16_t object_size; | ||
45 | uint8_t buffer[] __attribute__((aligned(4))); | ||
46 | } remote_object_t; | ||
47 | |||
48 | #define REMOTE_OBJECT_SIZE(objectsize) (sizeof(triple_buffer_object_t) + objectsize * 3) | ||
49 | #define LOCAL_OBJECT_SIZE(objectsize) (sizeof(triple_buffer_object_t) + (objectsize + LOCAL_OBJECT_EXTRA) * 3) | ||
50 | |||
51 | #define REMOTE_OBJECT_HELPER(name, type, num_local, num_remote) \ | ||
52 | typedef struct { \ | ||
53 | remote_object_t object; \ | ||
54 | uint8_t buffer[num_remote * REMOTE_OBJECT_SIZE(sizeof(type)) + num_local * LOCAL_OBJECT_SIZE(sizeof(type))]; \ | ||
55 | } remote_object_##name##_t; | ||
56 | |||
57 | #define MASTER_TO_ALL_SLAVES_OBJECT(name, type) \ | ||
58 | REMOTE_OBJECT_HELPER(name, type, 1, 1) \ | ||
59 | remote_object_##name##_t remote_object_##name = {.object = { \ | ||
60 | .object_type = MASTER_TO_ALL_SLAVES, \ | ||
61 | .object_size = sizeof(type), \ | ||
62 | }}; \ | ||
63 | type* begin_write_##name(void) { \ | ||
64 | remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ | ||
65 | triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \ | ||
66 | return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \ | ||
67 | } \ | ||
68 | void end_write_##name(void) { \ | ||
69 | remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ | ||
70 | triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \ | ||
71 | triple_buffer_end_write_internal(tb); \ | ||
72 | signal_data_written(); \ | ||
73 | } \ | ||
74 | type* read_##name(void) { \ | ||
75 | remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ | ||
76 | uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); \ | ||
77 | triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ | ||
78 | return (type*)triple_buffer_read_internal(obj->object_size, tb); \ | ||
79 | } | ||
80 | |||
81 | #define MASTER_TO_SINGLE_SLAVE_OBJECT(name, type) \ | ||
82 | REMOTE_OBJECT_HELPER(name, type, NUM_SLAVES, 1) \ | ||
83 | remote_object_##name##_t remote_object_##name = {.object = { \ | ||
84 | .object_type = MASTER_TO_SINGLE_SLAVE, \ | ||
85 | .object_size = sizeof(type), \ | ||
86 | }}; \ | ||
87 | type* begin_write_##name(uint8_t slave) { \ | ||
88 | remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ | ||
89 | uint8_t* start = obj->buffer; \ | ||
90 | start += slave * LOCAL_OBJECT_SIZE(obj->object_size); \ | ||
91 | triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ | ||
92 | return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \ | ||
93 | } \ | ||
94 | void end_write_##name(uint8_t slave) { \ | ||
95 | remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ | ||
96 | uint8_t* start = obj->buffer; \ | ||
97 | start += slave * LOCAL_OBJECT_SIZE(obj->object_size); \ | ||
98 | triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ | ||
99 | triple_buffer_end_write_internal(tb); \ | ||
100 | signal_data_written(); \ | ||
101 | } \ | ||
102 | type* read_##name() { \ | ||
103 | remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ | ||
104 | uint8_t* start = obj->buffer + NUM_SLAVES * LOCAL_OBJECT_SIZE(obj->object_size); \ | ||
105 | triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ | ||
106 | return (type*)triple_buffer_read_internal(obj->object_size, tb); \ | ||
107 | } | ||
108 | |||
109 | #define SLAVE_TO_MASTER_OBJECT(name, type) \ | ||
110 | REMOTE_OBJECT_HELPER(name, type, 1, NUM_SLAVES) \ | ||
111 | remote_object_##name##_t remote_object_##name = {.object = { \ | ||
112 | .object_type = SLAVE_TO_MASTER, \ | ||
113 | .object_size = sizeof(type), \ | ||
114 | }}; \ | ||
115 | type* begin_write_##name(void) { \ | ||
116 | remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ | ||
117 | triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \ | ||
118 | return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \ | ||
119 | } \ | ||
120 | void end_write_##name(void) { \ | ||
121 | remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ | ||
122 | triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \ | ||
123 | triple_buffer_end_write_internal(tb); \ | ||
124 | signal_data_written(); \ | ||
125 | } \ | ||
126 | type* read_##name(uint8_t slave) { \ | ||
127 | remote_object_t* obj = (remote_object_t*)&remote_object_##name; \ | ||
128 | uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); \ | ||
129 | start += slave * REMOTE_OBJECT_SIZE(obj->object_size); \ | ||
130 | triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \ | ||
131 | return (type*)triple_buffer_read_internal(obj->object_size, tb); \ | ||
132 | } | ||
133 | |||
134 | #define REMOTE_OBJECT(name) (remote_object_t*)&remote_object_##name | ||
135 | |||
136 | void add_remote_objects(remote_object_t** remote_objects, uint32_t num_remote_objects); | ||
137 | void reinitialize_serial_link_transport(void); | ||
138 | void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size); | ||
139 | void update_transport(void); | ||
diff --git a/quantum/serial_link/protocol/triple_buffered_object.c b/quantum/serial_link/protocol/triple_buffered_object.c deleted file mode 100644 index e0c6d702a..000000000 --- a/quantum/serial_link/protocol/triple_buffered_object.c +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | /* | ||
2 | The MIT License (MIT) | ||
3 | |||
4 | Copyright (c) 2016 Fred Sundvik | ||
5 | |||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
7 | of this software and associated documentation files (the "Software"), to deal | ||
8 | in the Software without restriction, including without limitation the rights | ||
9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
10 | copies of the Software, and to permit persons to whom the Software is | ||
11 | furnished to do so, subject to the following conditions: | ||
12 | |||
13 | The above copyright notice and this permission notice shall be included in all | ||
14 | copies or substantial portions of the Software. | ||
15 | |||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
22 | SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #include "serial_link/protocol/triple_buffered_object.h" | ||
26 | #include "serial_link/system/serial_link.h" | ||
27 | #include <stdbool.h> | ||
28 | #include <stddef.h> | ||
29 | |||
30 | #define GET_READ_INDEX() object->state & 3 | ||
31 | #define GET_WRITE_INDEX() (object->state >> 2) & 3 | ||
32 | #define GET_SHARED_INDEX() (object->state >> 4) & 3 | ||
33 | #define GET_DATA_AVAILABLE() (object->state >> 6) & 1 | ||
34 | |||
35 | #define SET_READ_INDEX(i) object->state = ((object->state & ~3) | i) | ||
36 | #define SET_WRITE_INDEX(i) object->state = ((object->state & ~(3 << 2)) | (i << 2)) | ||
37 | #define SET_SHARED_INDEX(i) object->state = ((object->state & ~(3 << 4)) | (i << 4)) | ||
38 | #define SET_DATA_AVAILABLE(i) object->state = ((object->state & ~(1 << 6)) | (i << 6)) | ||
39 | |||
40 | void triple_buffer_init(triple_buffer_object_t* object) { | ||
41 | object->state = 0; | ||
42 | SET_WRITE_INDEX(0); | ||
43 | SET_READ_INDEX(1); | ||
44 | SET_SHARED_INDEX(2); | ||
45 | SET_DATA_AVAILABLE(0); | ||
46 | } | ||
47 | |||
48 | void* triple_buffer_read_internal(uint16_t object_size, triple_buffer_object_t* object) { | ||
49 | serial_link_lock(); | ||
50 | if (GET_DATA_AVAILABLE()) { | ||
51 | uint8_t shared_index = GET_SHARED_INDEX(); | ||
52 | uint8_t read_index = GET_READ_INDEX(); | ||
53 | SET_READ_INDEX(shared_index); | ||
54 | SET_SHARED_INDEX(read_index); | ||
55 | SET_DATA_AVAILABLE(false); | ||
56 | serial_link_unlock(); | ||
57 | return object->buffer + object_size * shared_index; | ||
58 | } else { | ||
59 | serial_link_unlock(); | ||
60 | return NULL; | ||
61 | } | ||
62 | } | ||
63 | |||
64 | void* triple_buffer_begin_write_internal(uint16_t object_size, triple_buffer_object_t* object) { | ||
65 | uint8_t write_index = GET_WRITE_INDEX(); | ||
66 | return object->buffer + object_size * write_index; | ||
67 | } | ||
68 | |||
69 | void triple_buffer_end_write_internal(triple_buffer_object_t* object) { | ||
70 | serial_link_lock(); | ||
71 | uint8_t shared_index = GET_SHARED_INDEX(); | ||
72 | uint8_t write_index = GET_WRITE_INDEX(); | ||
73 | SET_SHARED_INDEX(write_index); | ||
74 | SET_WRITE_INDEX(shared_index); | ||
75 | SET_DATA_AVAILABLE(true); | ||
76 | serial_link_unlock(); | ||
77 | } | ||
diff --git a/quantum/serial_link/protocol/triple_buffered_object.h b/quantum/serial_link/protocol/triple_buffered_object.h deleted file mode 100644 index 717d6d7b8..000000000 --- a/quantum/serial_link/protocol/triple_buffered_object.h +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | /* | ||
2 | The MIT License (MIT) | ||
3 | |||
4 | Copyright (c) 2016 Fred Sundvik | ||
5 | |||
6 | Permission is hereby granted, free of charge, to any person obtaining a copy | ||
7 | of this software and associated documentation files (the "Software"), to deal | ||
8 | in the Software without restriction, including without limitation the rights | ||
9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
10 | copies of the Software, and to permit persons to whom the Software is | ||
11 | furnished to do so, subject to the following conditions: | ||
12 | |||
13 | The above copyright notice and this permission notice shall be included in all | ||
14 | copies or substantial portions of the Software. | ||
15 | |||
16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
22 | SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #pragma once | ||
26 | |||
27 | #include <stdint.h> | ||
28 | |||
29 | typedef struct { | ||
30 | uint8_t state; | ||
31 | uint8_t buffer[] __attribute__((aligned(4))); | ||
32 | } triple_buffer_object_t; | ||
33 | |||
34 | void triple_buffer_init(triple_buffer_object_t* object); | ||
35 | |||
36 | #define triple_buffer_begin_write(object) (typeof(*object.buffer[0])*)triple_buffer_begin_write_internal(sizeof(*object.buffer[0]), (triple_buffer_object_t*)object) | ||
37 | |||
38 | #define triple_buffer_end_write(object) triple_buffer_end_write_internal((triple_buffer_object_t*)object) | ||
39 | |||
40 | #define triple_buffer_read(object) (typeof(*object.buffer[0])*)triple_buffer_read_internal(sizeof(*object.buffer[0]), (triple_buffer_object_t*)object) | ||
41 | |||
42 | void* triple_buffer_begin_write_internal(uint16_t object_size, triple_buffer_object_t* object); | ||
43 | void triple_buffer_end_write_internal(triple_buffer_object_t* object); | ||
44 | void* triple_buffer_read_internal(uint16_t object_size, triple_buffer_object_t* object); | ||