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 #933, Remove SenderReporting from SB global #1099

Merged
merged 1 commit into from
Jan 21, 2021
Merged

Fix #933, Remove SenderReporting from SB global #1099

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
15 changes: 0 additions & 15 deletions cmake/sample_defs/cpu1_platform_cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,21 +304,6 @@
#define CFE_PLATFORM_SB_MEM_BLOCK_SIZE_16 32768
#define CFE_PLATFORM_SB_MAX_BLOCK_SIZE (CFE_MISSION_SB_MAX_SB_MSG_SIZE + 40)

/**
** \cfesbcfg Define Default Sender Information Storage Mode
**
** \par Description:
** Defines the default mode for the storing of sender information when sending
** a software bus message. If set to 1, the sender information will be stored.
** If set to 0, the sender information will not be stored.
**
** \par Limits
** There is a lower limit of 0 and an upper limit of 1 on this configuration
** paramater.
*/
#define CFE_PLATFORM_SB_DEFAULT_REPORT_SENDER 1


/**
** \cfetimecfg Time Server or Time Client Selection
**
Expand Down
3 changes: 0 additions & 3 deletions fsw/cfe-core/src/sb/cfe_sb_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ int32 CFE_SB_EarlyInit (void) {
/* Initialize the state of susbcription reporting */
CFE_SB.SubscriptionReporting = CFE_SB_DISABLE;

/* Initialize the state of sender reporting */
CFE_SB.SenderReporting = CFE_PLATFORM_SB_DEFAULT_REPORT_SENDER;

/* Initialize memory partition. */
Stat = CFE_SB_InitBuffers();
if(Stat != CFE_SUCCESS){
Expand Down
1 change: 0 additions & 1 deletion fsw/cfe-core/src/sb/cfe_sb_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ typedef struct
{
osal_id_t SharedDataMutexId;
uint32 SubscriptionReporting;
uint32 SenderReporting;
CFE_ES_ResourceID_t AppId;
uint32 StopRecurseFlags[OS_MAX_TASKS];
void *ZeroCopyTail;
Expand Down
8 changes: 0 additions & 8 deletions fsw/cfe-core/src/sb/cfe_sb_verify.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,6 @@
#error CFE_PLATFORM_SB_MEM_BLOCK_SIZE_16 must be less than CFE_PLATFORM_SB_MAX_BLOCK_SIZE
#endif

#if CFE_PLATFORM_SB_DEFAULT_REPORT_SENDER < 0
#error CFE_PLATFORM_SB_DEFAULT_REPORT_SENDER cannot be less than 0!
#endif

#if CFE_PLATFORM_SB_DEFAULT_REPORT_SENDER > 1
#error CFE_PLATFORM_SB_DEFAULT_REPORT_SENDER cannot be greater than 1!
#endif

#if CFE_PLATFORM_SB_DEFAULT_MSG_LIMIT < 4
#error CFE_PLATFORM_SB_DEFAULT_MSG_LIMIT cannot be less than 4!
#endif
Expand Down
1 change: 0 additions & 1 deletion fsw/cfe-core/unit-test/sb_UT.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3946,7 +3946,6 @@ void Test_SB_TransmitMsgPaths_Nominal(void)
MsgId = SB_UT_CMD_MID;
Size = sizeof(TlmPkt);
Type = CFE_MSG_Type_Cmd;
CFE_SB.SenderReporting = 0;
SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "TestPipe"));

/* Will fail because of deferred CFE_ES_GetPoolBuf failure return */
Expand Down