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.

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 #1708, Align padding explicitly in cfe_tbl_msg.h #2278

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 docs/src/mnem_maps/cfe_tbl_tlm_mnem_map
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ TBL_VALSUCCESSCTR=$sc_$cpu_TBL_ValSuccessCtr \
TBL_VALFAILEDCTR=$sc_$cpu_TBL_ValFailedCtr \
TBL_VALREQCTR=$sc_$cpu_TBL_ValReqCtr \
TBL_NUMFREESHRBUF=$sc_$cpu_TBL_NumFreeShrBuf \
TBL_BYTEALIGNPAD1=$sc_$cpu_TBL_ByteAlignPad1 \
TBL_HKPADDING=$sc_$cpu_TBL_HkPadding \
TBL_MEMPOOLHANDLE=$sc_$cpu_TBL_MemPoolHandle \
TBL_LASTUPDTIME="$sc_$cpu_TBL_LastUpdTime, $sc_$cpu_TBL_SECONDS, $sc_$cpu_TBL_SUBSECONDS" \
TBL_LASTUPDTBLNAME=$sc_$cpu_TBL_LastUpdTblName[CFE_TB_MAX_FULL_NAME_LEN] \
Expand All @@ -51,4 +51,4 @@ TBL_NAME=$sc_$cpu_TBL_Name[CFE_TB_MAX_FULL_NAME_LEN] \
TBL_LASTFILEUPD=$sc_$cpu_TBL_LastFileUpd[OS_MAX_PATH_LEN] \
TBL_OWNERAPP=$sc_$cpu_TBL_OwnerApp[OS_MAX_API_NAME] \
TBL_CRITICAL=$sc_$cpu_TBL_Spare3 \
TBL_SPARE4=$sc_$cpu_TBL_Spare4
TBL_REGPADDING=$sc_$cpu_TBL_RegPadding
8 changes: 4 additions & 4 deletions modules/tbl/config/default_cfe_tbl_msgdefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ typedef struct CFE_TBL_HousekeepingTlm_Payload
*/
uint8 NumFreeSharedBufs; /**< \cfetlmmnemonic \TBL_NUMFREESHRBUF
\brief Number of free Shared Working Buffers */
uint8 ByteAlignPad1; /**< \cfetlmmnemonic \TBL_BYTEALIGNPAD1
\brief Spare byte to ensure longword alignment */
uint8 HkPadding[3]; /**< \cfetlmmnemonic \TBL_HKPADDING
\brief Structure Padding to align to 32-bit boundaries */
CFE_ES_MemHandle_t MemPoolHandle; /**< \cfetlmmnemonic \TBL_MEMPOOLHANDLE
\brief Handle to TBL's memory pool */
CFE_TIME_SysTime_t LastUpdateTime; /**< \cfetlmmnemonic \TBL_LASTUPDTIME
Expand Down Expand Up @@ -271,8 +271,8 @@ typedef struct CFE_TBL_TblRegPacket_Payload
\brief Name of owning application */
bool Critical; /**< \cfetlmmnemonic \TBL_CRITICAL
\brief Indicates whether table is Critical or not */
uint8 ByteAlign4; /**< \cfetlmmnemonic \TBL_SPARE4
\brief Spare byte to maintain byte alignment */
uint8 RegPadding[3]; /**< \cfetlmmnemonic \TBL_REGPADDING
\brief Structure Padding to align to 32-bit boundaries */
} CFE_TBL_TblRegPacket_Payload_t;

#endif