Merge pull request nasa#175 from jphickey/fix-171-osal-id-type

Fix nasa#171, use osal_id_t for OSAL ID, not int32
chillfig · Jan 18, 2022 · d04e98c · d04e98c
2 parents 8d71b91 + 84072d3
commit d04e98c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/fsw/src/cf_cfdp_types.h b/fsw/src/cf_cfdp_types.h
@@ -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 */
@@ -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 */
 

diff --git a/unit-test/utilities/cf_test_utils.h b/unit-test/utilities/cf_test_utils.h
@@ -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;