Skip to content

Make a msg_buff pointer for backwards compatibility #728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 19, 2019
Merged

Make a msg_buff pointer for backwards compatibility #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
516304b
Make a msg_buff pointer for backwards compatibility
denniszollo Sep 19, 2019
0e2d94b
Use Macro
denniszollo Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions c/include/libsbp/sbp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ typedef struct {
u16 frame_len;
u8 n_read;
u8 frame_buff[SBP_MAX_FRAME_LEN];
u8* msg_buff;
void* io_context;
sbp_msg_callbacks_node_t* sbp_msg_callbacks_head;
} sbp_state_t;
Expand Down
1 change: 1 addition & 0 deletions c/src/sbp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ void sbp_state_init(sbp_state_t *s)

/* Set the IO context pointer, passed to read and write functions, to NULL. */
s->io_context = 0;
s->msg_buff = SBP_FRAME_MSG_PAYLOAD(s->frame_buff);

/* Clear the callbacks, if any, currently in s */
sbp_clear_callbacks(s);
Expand Down
30 changes: 29 additions & 1 deletion c/test/check_sbp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,13 +814,41 @@ START_TEST(test_frame_callbacks)
}
END_TEST

START_TEST(test_msg_buff_backwards_compatibility)
{
/* TODO: Tests with different read function behaviour. */

sbp_state_t s;
sbp_state_init(&s);
sbp_state_set_io_context(&s, &DUMMY_MEMORY_FOR_IO);

static sbp_msg_callbacks_node_t n;

sbp_register_callback(&s, 0x2269, &test_callback, &DUMMY_MEMORY_FOR_CALLBACKS, &n);

u8 test_data[] = { 0x01, 0x02, 0x03, 0x04 };

dummy_reset();
sbp_send_message(&s, 0x2269, 0x42, sizeof(test_data), test_data, &dummy_write);

while (dummy_rd < dummy_wr) {
fail_unless(sbp_process(&s, &dummy_read) >= SBP_OK,
"sbp_process threw an error!");
}
fail_unless(s.msg_buff[0] == 0x01, "msg_buff backwards compatibility broken!");
fail_unless(s.msg_buff[1] == 0x02, "msg_buff backwards compatibility broken!");
fail_unless(s.msg_buff[2] == 0x03, "msg_buff backwards compatibility broken!");
fail_unless(s.msg_buff[3] == 0x04, "msg_buff backwards compatibility broken!");
}
END_TEST

Suite* sbp_suite(void)
{
Suite *s = suite_create("SBP");

TCase *tc_core = tcase_create("Core");


tcase_add_test(tc_core, test_msg_buff_backwards_compatibility);
tcase_add_test(tc_core, test_callbacks);
tcase_add_test(tc_core, test_sbp_send_message);
tcase_add_test(tc_core, test_sbp_process);
Expand Down