diff options
Diffstat (limited to 'quantum/serial_link/protocol')
| -rw-r--r-- | quantum/serial_link/protocol/byte_stuffer.c | 55 | ||||
| -rw-r--r-- | quantum/serial_link/protocol/frame_router.c | 23 | ||||
| -rw-r--r-- | quantum/serial_link/protocol/frame_validator.c | 80 | ||||
| -rw-r--r-- | quantum/serial_link/protocol/transport.c | 61 | ||||
| -rw-r--r-- | quantum/serial_link/protocol/transport.h | 168 | ||||
| -rw-r--r-- | quantum/serial_link/protocol/triple_buffered_object.c | 7 | ||||
| -rw-r--r-- | quantum/serial_link/protocol/triple_buffered_object.h | 14 |
7 files changed, 155 insertions, 253 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. | |||
| 34 | typedef struct byte_stuffer_state { | 34 | typedef 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 | ||
| 41 | static byte_stuffer_state_t states[NUM_LINKS]; | 41 | static byte_stuffer_state_t states[NUM_LINKS]; |
| 42 | 42 | ||
| 43 | void init_byte_stuffer_state(byte_stuffer_state_t* state) { | 43 | void 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 | ||
| 49 | void init_byte_stuffer(void) { | 49 | void 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) { | |||
| 105 | static void send_block(uint8_t link, uint8_t* start, uint8_t* end, uint8_t num_non_zero) { | 100 | static 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 | ||
| 29 | static bool is_master; | 29 | static bool is_master; |
| 30 | 30 | ||
| 31 | void router_set_master(bool master) { | 31 | void router_set_master(bool master) { is_master = master; } |
| 32 | is_master = master; | ||
| 33 | } | ||
| 34 | 32 | ||
| 35 | void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size){ | 33 | void 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 | ||
| 30 | const uint32_t poly8_lookup[256] = | 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 | { | 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 | ||
| 98 | static uint32_t crc32_byte(uint8_t *p, uint32_t bytelength) | 35 | static 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) | |||
| 106 | void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size) { | 42 | void 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 |
| 31 | static remote_object_t* remote_objects[MAX_REMOTE_OBJECTS]; | 31 | static remote_object_t* remote_objects[MAX_REMOTE_OBJECTS]; |
| 32 | static uint32_t num_remote_objects = 0; | 32 | static uint32_t num_remote_objects = 0; |
| 33 | 33 | ||
| 34 | void reinitialize_serial_link_transport(void) { | 34 | void reinitialize_serial_link_transport(void) { num_remote_objects = 0; } |
| 35 | num_remote_objects = 0; | ||
| 36 | } | ||
| 37 | 35 | ||
| 38 | void add_remote_objects(remote_object_t** _remote_objects, uint32_t _num_remote_objects) { | 36 | void 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 | ||
| 76 | void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) { | 72 | void 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 | ||
| 100 | void update_transport(void) { | 94 | void 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 | ||
| 43 | typedef struct { | 43 | typedef 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; \ |
| 55 | typedef 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 | |||
| 70 | void triple_buffer_end_write_internal(triple_buffer_object_t* object) { | 69 | void 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. | |||
| 30 | typedef struct { | 30 | typedef 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 | ||
| 35 | void triple_buffer_init(triple_buffer_object_t* object); | 35 | void 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 | ||
| 46 | void* triple_buffer_begin_write_internal(uint16_t object_size, triple_buffer_object_t* object); | 43 | void* triple_buffer_begin_write_internal(uint16_t object_size, triple_buffer_object_t* object); |
| 47 | void triple_buffer_end_write_internal(triple_buffer_object_t* object); | 44 | void triple_buffer_end_write_internal(triple_buffer_object_t* object); |
| 48 | void* triple_buffer_read_internal(uint16_t object_size, triple_buffer_object_t* object); | 45 | void* triple_buffer_read_internal(uint16_t object_size, triple_buffer_object_t* object); |
| 49 | 46 | ||
| 50 | |||
| 51 | #endif | 47 | #endif |
