Skip to content
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

Jump to bottom

Fix #171, use osal_id_t for OSAL ID, not int32 #175

Merged
merged 1 commit into from
Jan 18, 2022
Merged

Fix #171, use osal_id_t for OSAL ID, not int32 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions fsw/src/cf_cfdp_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ typedef struct CF_ChunkWrapper
*/
typedef struct CF_Playback
{
uint32 dir_id;
osal_id_t dir_id;
CF_CFDP_Class_t cfdp_class;
CF_TxnFilenames_t fnames;
uint16 num_ts; /* number of transactions -- 16 bit should be enough */
Expand Down Expand Up @@ -387,7 +387,7 @@ typedef struct CF_Channel
/* For polling directories, the configuration data is in a table. */
CF_Poll_t poll[CF_MAX_POLLING_DIR_PER_CHAN];

uint32 sem_id; /* semaphore id for output pipe */
osal_id_t sem_id; /* semaphore id for output pipe */

const CF_Transaction_t *cur; /* current transaction during channel cycle */

Expand Down
2 changes: 1 addition & 1 deletion unit-test/utilities/cf_test_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ typedef struct
{
CF_CListNode_t *start;
CF_CListFn_t fn;
int32 context_fd;
osal_id_t context_fd;
int32 context_result;
int32 context_counter;
} CF_CList_Traverse_TRAV_ARG_T_context_t;
Expand Down