giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into bugfix/variable-definition

Browse Source
This commit is contained in:
Joakim Eriksson 2018-08-10 18:02:03 +02:00 committed by GitHub
commit 8dc1116241
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/6tisch/sixtop/sf-simple.c
View File

@ -108,7 +108,7 @@ print_cell_list(const uint8_t *cell_list, uint16_t cell_list_len)
uint16_t i; uint16_t i;
sf_simple_cell_t cell; sf_simple_cell_t cell;
for(i = 0; i < (cell_list_len / sizeof(cell)); i++) { for(i = 0; i < cell_list_len; i += sizeof(cell)) {
read_cell(&cell_list[i], &cell); read_cell(&cell_list[i], &cell);
PRINTF("%u ", cell.timeslot_offset); PRINTF("%u ", cell.timeslot_offset);
} }
@ -132,7 +132,7 @@ add_links_to_schedule(const linkaddr_t *peer_addr, uint8_t link_option,
return; return;
} }
for(i = 0; i < (cell_list_len / sizeof(cell)); i++) { for(i = 0; i < cell_list_len; i += sizeof(cell)) {
read_cell(&cell_list[i], &cell); read_cell(&cell_list[i], &cell);
if(cell.timeslot_offset == 0xffff) { if(cell.timeslot_offset == 0xffff) {
continue; continue;
@ -166,7 +166,7 @@ remove_links_to_schedule(const uint8_t *cell_list, uint16_t cell_list_len)
return; return;
} }
for(i = 0; i < (cell_list_len / sizeof(cell)); i++) { for(i = 0; i < cell_list_len; i += sizeof(cell)) {
read_cell(&cell_list[i], &cell); read_cell(&cell_list[i], &cell);
if(cell.timeslot_offset == 0xffff) { if(cell.timeslot_offset == 0xffff) {
continue; continue;
@ -335,7 +335,7 @@ delete_req_input(const uint8_t *body, uint16_t body_len,
if(num_cells > 0 && cell_list_len > 0) { if(num_cells > 0 && cell_list_len > 0) {
/* ensure before delete */ /* ensure before delete */
for(i = 0, removed_link = 0; i < (cell_list_len / sizeof(cell)); i++) { for(i = 0, removed_link = 0; i < cell_list_len; i += sizeof(cell)) {
read_cell(&cell_list[i], &cell); read_cell(&cell_list[i], &cell);
if(tsch_schedule_get_link_by_timeslot(slotframe, if(tsch_schedule_get_link_by_timeslot(slotframe,
cell.timeslot_offset) != NULL) { cell.timeslot_offset) != NULL) {