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 #408, Remove device driver references in code #477

Merged
merged 1 commit into from
Feb 25, 2020
Merged

Fix #408, Remove device driver references in code #477

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
3 changes: 1 addition & 2 deletions docs/src/cfe_es.dox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
high level interface to system control facilities. The ES component is
responsible for starting up and restarting the cFE, starting up, shutting
down, and restarting cFE Applications, logging errors and performance data,
managing device driver services, and providing a persistent memory store
for cFE Applications.
and providing a persistent memory store for cFE Applications.

The interfaces to the ES task include the Ground Interface (commands and
telemetry) and the Application Programmer Interfaces (APIs). The ES task
Expand Down
5 changes: 0 additions & 5 deletions docs/src/main.dox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,11 +493,6 @@
<LI> #CFE_ES_DeleteChildTask - Deletes a task under an existing Application
<LI> #CFE_ES_ExitChildTask - Exit for a cFE Child Task
</UL>
<LI> Driver APIs
<UL>
<LI> \#CFE_ES_RegisterDriver - Registers a Device Driver for a specified device
<LI> \#CFE_ES_UnloadDriver - Removes a Device Driver for a specified device
</UL>
<LI> Critical Data Store APIs
<UL>
<LI> #CFE_ES_RegisterCDS - Reserves space (or obtains previously reserved space)in the Critical Data Store
Expand Down
4 changes: 0 additions & 4 deletions fsw/cfe-core/src/es/cfe_es_apps.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,10 +335,6 @@ int32 CFE_ES_ParseFileEntry(const char **TokenList, uint32 NumTokens)
EntryPoint, AppName);

}
else if(strcmp(EntryType,"CFE_DRV")==0)
{
CFE_ES_WriteToSysLog("ES Startup: Device Drivers not yet implemented. %s\n",FileName);
}
else
{
CFE_ES_WriteToSysLog("ES Startup: Unexpected EntryType %s in startup file.\n",EntryType);
Expand Down
29 changes: 0 additions & 29 deletions fsw/cfe-core/unit-test/es_UT.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,26 +908,6 @@ void TestApps(void)
"CFE_ES_StartApplications",
"Start application; successful");

/* Test parsing the startup script with an invalid CFE driver type */
ES_ResetUnitTest();
{
const char *TokenList[] =
{
"CFE_DRV",
"/cf/apps/tst_lib.bundle",
"TST_LIB_Init",
"TST_LIB",
"0",
"0",
"0x0",
"1"
};
UT_Report(__FILE__, __LINE__,
CFE_ES_ParseFileEntry(TokenList, 8) == CFE_ES_ERR_APP_CREATE,
"CFE_ES_ParseFileEntry",
"Unimplemented CFE driver type");
}

/* Test parsing the startup script with an unknown entry type */
ES_ResetUnitTest();
{
Expand Down Expand Up @@ -7062,15 +7042,6 @@ void TestStaticApp(void)
"CFE_ES_StartStaticApplications",
"*Not implemented* Initialize static shared library; successful");

/* Test successful device driver initialization */
ES_ResetUnitTest();
CFE_ES_StaticStartupTable[0].ObjectType = CFE_ES_STATIC_DRV;
CFE_ES_StartStaticApplications(CFE_PSP_RST_TYPE_PROCESSOR);
UT_Report(__FILE__, __LINE__,
UT_PrintfIsInHistory(UT_OSP_MESSAGES[UT_OSP_NO_MESSAGE]),
"CFE_ES_StartStaticApplications",
"*Not implemented* Device drivers not yet implemented");

/* Test successful static application initialization null action */
ES_ResetUnitTest();
CFE_ES_StaticStartupTable[0].ObjectType = CFE_ES_STATIC_NULL;
Expand Down
5 changes: 2 additions & 3 deletions fsw/cfe-core/unit-test/es_UT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,12 @@ void TestPerf(void);
** \sa #CFE_ES_RegisterApp, #CFE_ES_GetAppID, #CFE_ES_GetAppName
** \sa #CFE_ES_GetTaskInfo, #CFE_ES_CreateChildTask, #CFE_ES_DeleteChildTask
** \sa #CFE_ES_ExitChildTask, #CFE_ES_RegisterChildTask, #CFE_ES_WriteToSysLog
** \sa #CFE_ES_RegisterDriver, #CFE_ES_UnloadDriver, #CFE_ES_CalculateCRC
** \sa #CFE_ES_CalculateCRC, #CFE_ES_WaitForStartupSync, #CFE_ES_ProcessCoreException
** \sa #UT_SetBSPFail, #CFE_ES_RegisterCDS, #CFE_ES_CopyToCDS
** \sa #CFE_ES_RestoreFromCDS, #CFE_ES_LockSharedData, #CFE_ES_UnlockSharedData
** \sa #CFE_ES_RegisterGenCounter, #CFE_ES_GetGenCounterIDByName
** \sa #CFE_ES_DeleteGenCounter, #CFE_ES_IncrementGenCounter
** \sa #CFE_ES_GetGenCount, #CFE_ES_SetGenCount, #CFE_ES_ProcessCoreException
** \sa #CFE_ES_WaitForStartupSync
** \sa #CFE_ES_GetGenCount, #CFE_ES_SetGenCount
**
******************************************************************************/
void TestAPI(void);
Expand Down