TiagoRG
/
it2s-itss-facilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
emanuel 2021-12-22 16:54:35 +00:00
parent 70bb5bf9ee 29677f248e
commit c23724fe51
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpm.c
View File

@ -356,7 +356,7 @@ void parse_can_data_tm(u_int32_t u32_can_id, int i32_can_len, u_int8_t* au8_can_
void parse_input(u_int8_t* u8_input_buffer, int i32_len) { void parse_input(u_int8_t* u8_input_buffer, int i32_len) {
static enum state_t s_state = IDLE; enum state_t s_state = IDLE;
u_int8_t u8_input = 0; u_int8_t u8_input = 0;
int i32_i; int i32_i;

6
src/facilities.c
View File

@ -667,8 +667,7 @@ int main() {
pthread_create(&facilities.infrastructure_service, NULL, infrastructure_service, (void*) &facilities); pthread_create(&facilities.infrastructure_service, NULL, infrastructure_service, (void*) &facilities);
// CPM // CPM
if(facilities.dissemination->active) pthread_create(&facilities.cp_service, NULL, cp_service, (void*) &facilities);
pthread_create(&facilities.cp_service, NULL, cp_service, (void*) &facilities);
// SA // SA
pthread_create(&facilities.sa_service, NULL, sa_service, (void*) &facilities); pthread_create(&facilities.sa_service, NULL, sa_service, (void*) &facilities);
@ -762,8 +761,7 @@ int main() {
pthread_join(facilities.ca_service, NULL); pthread_join(facilities.ca_service, NULL);
pthread_join(facilities.den_service, NULL); pthread_join(facilities.den_service, NULL);
pthread_join(facilities.infrastructure_service, NULL); pthread_join(facilities.infrastructure_service, NULL);
if(facilities.dissemination->active) pthread_join(facilities.cp_service, NULL);
pthread_join(facilities.cp_service, NULL);
return 0; return 0;
} }