epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Force panic if application-supplied routine returns a non-zero value.

Browse Source
This commit is contained in:
W. Eric Norum
2006-06-29 20:07:10 +00:00
parent b3ff995884
commit 7dcd682f7d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/RTEMS/base/epicsRtemsInitHooks.h
View File

@@ -17,5 +17,8 @@ extern char *env_nfsServer;
extern char *env_nfsPath;
extern char *env_nfsMountPoint;
/*
* Return 0 for success, non-zero for failure (will cause panic)
*/
int epicsRtemsInitPreSetBootConfigFromNVRAM(struct rtems_bsdnet_config *config);
int epicsRtemsInitPostSetBootConfigFromNVRAM(struct rtems_bsdnet_config *config);

6
src/RTEMS/base/rtems_init.c
View File

@@ -430,12 +430,14 @@ Init (rtems_task_argument ignored)
/*
* Architecture-specific hooks
*/
epicsRtemsInitPreSetBootConfigFromNVRAM(&rtems_bsdnet_config);
if (epicsRtemsInitPreSetBootConfigFromNVRAM(&rtems_bsdnet_config) != 0)
delayedPanic("epicsRtemsInitPreSetBootConfigFromNVRAM");
if (rtems_bsdnet_config.bootp == NULL) {
extern void setBootConfigFromNVRAM(void);
setBootConfigFromNVRAM();
}
epicsRtemsInitPostSetBootConfigFromNVRAM(&rtems_bsdnet_config);
if (epicsRtemsInitPostSetBootConfigFromNVRAM(&rtems_bsdnet_config) != 0)
delayedPanic("epicsRtemsInitPostSetBootConfigFromNVRAM");
/*
* Override RTEMS configuration