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 #18, Deprecate shared memory APIs #386

Merged
merged 2 commits into from
Apr 6, 2020
Merged

Fix #18, Deprecate shared memory APIs #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20a83c4
Merge pull request #375 from nasa/integration-candidate
astrogeco Mar 27, 2020
592328b
Fix #18, Depreacate OS_ShMem*
skliper Mar 25, 2020
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: 9 additions & 6 deletions src/os/inc/osapi-os-core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,7 @@ int32 OS_IntGetMask (uint32 *mask);
int32 OS_IntAck (int32 InterruptNumber);
/**@}*/

#ifndef OSAL_OMIT_DEPRECATED
/**
* @defgroup OSAPIShMem OSAL Shared memory APIs
* @deprecated Not in current implementations
Expand All @@ -1302,42 +1303,44 @@ int32 OS_IntAck (int32 InterruptNumber);
*/

/*-------------------------------------------------------------------------------------*/
/** @brief placeholder; not currently implemented
/** @brief DEPRECATED - platform dependent, never implemented in framework OSALs
* @deprecated Never implemented
*/
int32 OS_ShMemInit (void);

/*-------------------------------------------------------------------------------------*/
/** @brief placeholder; not currently implemented
/** @brief DEPRECATED - platform dependent, never implemented in framework OSALs
* @deprecated Never implemented
*/
int32 OS_ShMemCreate (uint32 *Id, uint32 NBytes, const char* SegName);

/*-------------------------------------------------------------------------------------*/
/** @brief placeholder; not currently implemented
/** @brief DEPRECATED - platform dependent, never implemented in framework OSALs
* @deprecated Never implemented
*/
int32 OS_ShMemSemTake (uint32 Id);

/*-------------------------------------------------------------------------------------*/
/** @brief placeholder; not currently implemented
/** @brief DEPRECATED - platform dependent, never implemented in framework OSALs
* @deprecated Never implemented
*/
int32 OS_ShMemSemGive (uint32 Id);

/*-------------------------------------------------------------------------------------*/
/** @brief placeholder; not currently implemented
/** @brief DEPRECATED - platform dependent, never implemented in framework OSALs
* @deprecated Never implemented
*/
int32 OS_ShMemAttach (cpuaddr * Address, uint32 Id);

/*-------------------------------------------------------------------------------------*/
/** @brief placeholder; not currently implemented
/** @brief DEPRECATED - platform dependent, never implemented in framework OSALs
* @deprecated Never implemented
*/
int32 OS_ShMemGetIdByName (uint32 *ShMemId, const char *SegName );
/**@}*/

#endif /* OSAL_OMIT_DEPRECATED */

/** @defgroup OSAPIHeap OSAL Heap APIs
* @{
*/
Expand Down
2 changes: 2 additions & 0 deletions src/unit-test-coverage/ut-stubs/src/osapi-base-impl-stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ void OS_ConsoleOutput_Impl(uint32 local_id)
UT_DEFAULT_IMPL(OS_ConsoleOutput_Impl);
}

#ifndef OSAL_OMIT_DEPRECATED
/*
** Shared memory API
*/
Expand All @@ -132,6 +133,7 @@ UT_DEFAULT_STUB(OS_ShMemSemTake_Impl,(uint32 Id))
UT_DEFAULT_STUB(OS_ShMemSemGive_Impl,(uint32 Id))
UT_DEFAULT_STUB(OS_ShMemAttach_Impl,(uint32 * Address, uint32 Id))
UT_DEFAULT_STUB(OS_ShMemGetIdByName_Impl,(uint32 *ShMemId, const char *SegName ))
#endif /* OSAL_OMIT_DEPRECATED */


/*
Expand Down