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

Fix #1435, Consistent use of uint16 for EventID #1572

Merged
merged 1 commit into from
Jun 2, 2021
Merged

Fix #1435, Consistent use of uint16 for EventID #1572

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
2 changes: 1 addition & 1 deletion modules/core_api/fsw/inc/cfe_evs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ CFE_Status_t CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, uint16 EventID, uin
** \sa #CFE_EVS_ResetAllFilters
**
**/
CFE_Status_t CFE_EVS_ResetFilter(int16 EventID);
CFE_Status_t CFE_EVS_ResetFilter(uint16 EventID);

/**
** \brief Resets all of the calling application's event filters.
Expand Down
4 changes: 2 additions & 2 deletions modules/core_api/ut-stubs/src/cfe_evs_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ CFE_Status_t CFE_EVS_ResetAllFilters(void)
* Generated stub function for CFE_EVS_ResetFilter()
* ----------------------------------------------------
*/
CFE_Status_t CFE_EVS_ResetFilter(int16 EventID)
CFE_Status_t CFE_EVS_ResetFilter(uint16 EventID)
{
UT_GenStub_SetupReturnBuffer(CFE_EVS_ResetFilter, CFE_Status_t);

UT_GenStub_AddParam(CFE_EVS_ResetFilter, int16, EventID);
UT_GenStub_AddParam(CFE_EVS_ResetFilter, uint16, EventID);

UT_GenStub_Execute(CFE_EVS_ResetFilter, Basic, NULL);

Expand Down
2 changes: 1 addition & 1 deletion modules/evs/fsw/src/cfe_evs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ int32 CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, uint16 EventID, uint16 Eve
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
int32 CFE_EVS_ResetFilter(int16 EventID)
int32 CFE_EVS_ResetFilter(uint16 EventID)
{
int32 Status;
EVS_BinFilter_t *FilterPtr = NULL;
Expand Down
2 changes: 1 addition & 1 deletion modules/evs/fsw/src/cfe_evs_task.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

typedef struct
{
int16 EventID; /* Numerical event identifier */
uint16 EventID; /* Numerical event identifier */
uint16 Mask; /* Binary filter mask */
uint16 Count; /* Binary filter counter */
uint16 Padding; /* Structure padding */
Expand Down
2 changes: 1 addition & 1 deletion modules/evs/fsw/src/cfe_evs_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ bool EVS_IsFiltered(EVS_AppData_t *AppDataPtr, uint16 EventID, uint16 EventType)
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
EVS_BinFilter_t *EVS_FindEventID(int16 EventID, EVS_BinFilter_t *FilterArray)
EVS_BinFilter_t *EVS_FindEventID(uint16 EventID, EVS_BinFilter_t *FilterArray)
{
uint32 i;

Expand Down
2 changes: 1 addition & 1 deletion modules/evs/fsw/src/cfe_evs_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ bool EVS_IsFiltered(EVS_AppData_t *AppDataPtr, uint16 EventID, uint16 EventType)
* This routine searches and returns an index to the given Event ID with the
* given application filter array.
*/
EVS_BinFilter_t *EVS_FindEventID(int16 EventID, EVS_BinFilter_t *FilterArray);
EVS_BinFilter_t *EVS_FindEventID(uint16 EventID, EVS_BinFilter_t *FilterArray);

/*---------------------------------------------------------------------------------------*/
/**
Expand Down
6 changes: 3 additions & 3 deletions modules/evs/ut-coverage/evs_UT.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,9 +666,9 @@ void Test_FilterReset(void)
*/
void Test_Format(void)
{
int i;
char long_msg[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH + 2];
int16 EventID[2];
int i;
char long_msg[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH + 2];
uint16 EventID[2];

CFE_TIME_SysTime_t time = {0, 0};
CFE_EVS_SetEventFormatModeCmd_t modecmd;
Expand Down