andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remote object callable from many places 

Change init_transport to add_remote_objects, so that it can be
called many times from different places.
master
Fred Sundvik 2016-03-12 19:35:09 +02:00
parent 168c5b679f
commit 11bd4ba0dd
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
serial_link/protocol/transport.c
View File

@ -27,15 +27,15 @@ SOFTWARE.
#include "serial_link/protocol/triple_buffered_object.h" #include "serial_link/protocol/triple_buffered_object.h"
#include <string.h> #include <string.h>
static remote_object_t** remote_objects; #define MAX_REMOTE_OBJECTS 16
static uint32_t num_remote_objects; static remote_object_t* remote_objects[MAX_REMOTE_OBJECTS];
static uint32_t num_remote_objects = 0;
void init_transport(remote_object_t** _remote_objects, uint32_t _num_remote_objects) { void add_remote_objects(remote_object_t** _remote_objects, uint32_t _num_remote_objects) {
remote_objects = _remote_objects;
num_remote_objects = _num_remote_objects;
unsigned int i; unsigned int i;
for(i=0;i<num_remote_objects;i++) { for(i=0;i<_num_remote_objects;i++) {
remote_object_t* obj = remote_objects[i]; remote_object_t* obj = _remote_objects[i];
remote_objects[num_remote_objects++] = obj;
if (obj->object_type == MASTER_TO_ALL_SLAVES) { if (obj->object_type == MASTER_TO_ALL_SLAVES) {
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer;
triple_buffer_init(tb); triple_buffer_init(tb);

2
serial_link/protocol/transport.h
View File

@ -144,7 +144,7 @@ typedef struct { \
#define REMOTE_OBJECT(name) (remote_object_t*)&remote_object_##name #define REMOTE_OBJECT(name) (remote_object_t*)&remote_object_##name
void init_transport(remote_object_t** remote_objects, uint32_t num_remote_objects); void add_remote_objects(remote_object_t** remote_objects, uint32_t num_remote_objects);
void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size); void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size);
void update_transport(void); void update_transport(void);

4
serial_link/system/system.c
View File

@ -120,7 +120,7 @@ static matrix_object_t last_matrix = {};
SLAVE_TO_MASTER_OBJECT(keyboard_matrix, matrix_object_t); SLAVE_TO_MASTER_OBJECT(keyboard_matrix, matrix_object_t);
MASTER_TO_ALL_SLAVES_OBJECT(serial_link_connected, bool); MASTER_TO_ALL_SLAVES_OBJECT(serial_link_connected, bool);
remote_object_t* test_remote_objects[] = { static remote_object_t* remote_objects[] = {
REMOTE_OBJECT(serial_link_connected), REMOTE_OBJECT(serial_link_connected),
REMOTE_OBJECT(keyboard_matrix), REMOTE_OBJECT(keyboard_matrix),
}; };
@ -128,7 +128,7 @@ remote_object_t* test_remote_objects[] = {
void init_serial_link(void) { void init_serial_link(void) {
serial_link_connected = false; serial_link_connected = false;
init_serial_link_hal(); init_serial_link_hal();
init_transport(test_remote_objects, sizeof(test_remote_objects)/sizeof(remote_object_t*)); add_remote_objects(remote_objects, sizeof(remote_objects)/sizeof(remote_object_t*));
init_byte_stuffer(); init_byte_stuffer();
sdStart(&SD1, &config); sdStart(&SD1, &config);
sdStart(&SD2, &config); sdStart(&SD2, &config);

4
serial_link/tests/transport_tests.c
View File

@ -53,7 +53,7 @@ MASTER_TO_ALL_SLAVES_OBJECT(master_to_slave, test_object1_t);
MASTER_TO_SINGLE_SLAVE_OBJECT(master_to_single_slave, test_object1_t); MASTER_TO_SINGLE_SLAVE_OBJECT(master_to_single_slave, test_object1_t);
SLAVE_TO_MASTER_OBJECT(slave_to_master, test_object1_t); SLAVE_TO_MASTER_OBJECT(slave_to_master, test_object1_t);
remote_object_t* test_remote_objects[] = { static remote_object_t* test_remote_objects[] = {
REMOTE_OBJECT(master_to_slave), REMOTE_OBJECT(master_to_slave),
REMOTE_OBJECT(master_to_single_slave), REMOTE_OBJECT(master_to_single_slave),
REMOTE_OBJECT(slave_to_master), REMOTE_OBJECT(slave_to_master),
@ -61,7 +61,7 @@ remote_object_t* test_remote_objects[] = {
Describe(Transport); Describe(Transport);
BeforeEach(Transport) { BeforeEach(Transport) {
init_transport(test_remote_objects, sizeof(test_remote_objects) / sizeof(remote_object_t*)); add_remote_objects(test_remote_objects, sizeof(test_remote_objects) / sizeof(remote_object_t*));
sent_data_size = 0; sent_data_size = 0;
} }
AfterEach(Transport) {} AfterEach(Transport) {}