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

Moved environment parameter defaults to config/CONFIG_ENV

Browse Source
This commit is contained in:
Andrew Johnson
1995-04-24 16:02:24 +00:00
parent 18b173eeb6
commit 561e2e9fb9
4 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libCom/Makefile.Unix
View File

@@ -56,6 +56,10 @@ errSymTbl.c errInc.o: errInc.c
@$(RM) errInc.o
@$(EPICS_BASE)/tools/blderrSymTbl;
envSubr.o: envData.h
envData.h: $(EPICS_BASE)/include/envDefs.h $(EPICS)/config/CONFIG_ENV
$(EPICS_BASE)/tools/bldEnvData
pre_build:
@test -f errInc.c || ln -s ../errInc.c errInc.c
@@ -63,5 +67,5 @@ tsTest: tsSubr.o
$(LINK.c) -o $@ tsSubr.o -lCom -lDb -lCom -lm -s
clean::
@$(RM) errInc.c errSymTbl.c
@$(RM) errInc.c errSymTbl.c envData.h

6
src/libCom/Makefile.Vx
View File

@@ -44,7 +44,7 @@ PROD = libCom
include $(EPICS)/config/RULES.Vx
clean::
@$(RM) errInc.c errSymTbl.c
@$(RM) errInc.c errSymTbl.c envData.h
build: errSymTbl.o errInc.o
@@ -52,6 +52,10 @@ errSymTbl.c errInc.o: errInc.c
@$(RM) errInc.o
@$(EPICS_BASE)/tools/blderrSymTbl
envSubr.o: envData.h
envData.h: $(EPICS_BASE)/include/envDefs.h $(EPICS)/config/CONFIG_ENV
$(EPICS_BASE)/tools/bldEnvData
pre_build:
@test -f errInc.c || ln -s ../errInc.c errInc.c

52
src/libCom/env/envSubr.c vendored
View File

@@ -30,6 +30,7 @@
* .03 08-07-91 joh added config get for struct in_addr type
* .04 01-11-95 joh use getenv()/putenv() to fetch/write env
* vars under vxWorks
* .05 04-20-95 anj changes to use CONFIG_ENV
*
* make options
* -DvxWorks makes a version for VxWorks
@@ -79,10 +80,9 @@
#include <errnoLib.h>
#endif
#define ENV_PRIVATE_DATA
#include <envDefs.h>
#include "envData.h"
#include <errMdef.h>
#include <epicsEnvParams.h>
/*+/subr**********************************************************************
@@ -423,34 +423,36 @@ char *value; /* I pointer to value string */
}
/*parameters meant to be modified in epicsEnvParams.h*/
/* epicsSetEnvParams not required any more - do not use */
int epicsSetEnvParams()
{
printf("setting EPICS environment parameters\n");
envSetConfigParam(&EPICS_TS_MIN_WEST, EPICS_TS_MIN_VALUE);
envSetConfigParam(&EPICS_AR_PORT, "7002");
envSetConfigParam(&EPICS_IOC_LOG_INET, EPICS_IOC_LOG_VALUE);
envSetConfigParam(&EPICS_IOC_LOG_PORT, "7004");
envSetConfigParam(&EPICS_IOC_LOG_FILE_LIMIT, EPICS_IOC_FILE_VALUE);
envSetConfigParam(&EPICS_IOC_LOG_FILE_NAME, EPICS_IOC_LOG_FILE_TXT);
return 0;
}
int epicsPrtEnvParams()
/*+/subr**********************************************************************
* NAME epicsPrtEnvParams - print value of all configuration parameters
*
* DESCRIPTION
* Prints all configuration parameters and their current value.
*
* RETURNS
* 0
*
* EXAMPLE
* 1. Print the value for all EPICS-defined environment parameters.
*
* #include <envDefs.h>
*
* epicsPrtEnvParams();
*
*-*/
long
epicsPrtEnvParams()
{
envPrtConfigParam(&EPICS_TS_MIN_WEST);
envPrtConfigParam(&EPICS_CMD_PROTO_PORT);
envPrtConfigParam(&EPICS_AR_PORT);
envPrtConfigParam(&EPICS_IOC_LOG_INET);
envPrtConfigParam(&EPICS_IOC_LOG_PORT);
envPrtConfigParam(&EPICS_IOC_LOG_FILE_LIMIT);
envPrtConfigParam(&EPICS_IOC_LOG_FILE_NAME);
envPrtConfigParam(&EPICS_CA_ADDR_LIST);
envPrtConfigParam(&EPICS_CA_CONN_TMO);
envPrtConfigParam(&EPICS_CA_BEACON_PERIOD);
envPrtConfigParam(&EPICS_CA_AUTO_ADDR_LIST);
envPrtConfigParam(&EPICS_CA_REPEATER_PORT);
envPrtConfigParam(&EPICS_CA_SERVER_PORT);
return 0;
ENV_PARAM **ppParam = env_param_list;
while (*ppParam != NULL)
envPrtConfigParam(*(ppParam++));
}

52
src/libCom/envSubr.c
View File

@@ -30,6 +30,7 @@
* .03 08-07-91 joh added config get for struct in_addr type
* .04 01-11-95 joh use getenv()/putenv() to fetch/write env
* vars under vxWorks
* .05 04-20-95 anj changes to use CONFIG_ENV
*
* make options
* -DvxWorks makes a version for VxWorks
@@ -79,10 +80,9 @@
#include <errnoLib.h>
#endif
#define ENV_PRIVATE_DATA
#include <envDefs.h>
#include "envData.h"
#include <errMdef.h>
#include <epicsEnvParams.h>
/*+/subr**********************************************************************
@@ -423,34 +423,36 @@ char *value; /* I pointer to value string */
}
/*parameters meant to be modified in epicsEnvParams.h*/
/* epicsSetEnvParams not required any more - do not use */
int epicsSetEnvParams()
{
printf("setting EPICS environment parameters\n");
envSetConfigParam(&EPICS_TS_MIN_WEST, EPICS_TS_MIN_VALUE);
envSetConfigParam(&EPICS_AR_PORT, "7002");
envSetConfigParam(&EPICS_IOC_LOG_INET, EPICS_IOC_LOG_VALUE);
envSetConfigParam(&EPICS_IOC_LOG_PORT, "7004");
envSetConfigParam(&EPICS_IOC_LOG_FILE_LIMIT, EPICS_IOC_FILE_VALUE);
envSetConfigParam(&EPICS_IOC_LOG_FILE_NAME, EPICS_IOC_LOG_FILE_TXT);
return 0;
}
int epicsPrtEnvParams()
/*+/subr**********************************************************************
* NAME epicsPrtEnvParams - print value of all configuration parameters
*
* DESCRIPTION
* Prints all configuration parameters and their current value.
*
* RETURNS
* 0
*
* EXAMPLE
* 1. Print the value for all EPICS-defined environment parameters.
*
* #include <envDefs.h>
*
* epicsPrtEnvParams();
*
*-*/
long
epicsPrtEnvParams()
{
envPrtConfigParam(&EPICS_TS_MIN_WEST);
envPrtConfigParam(&EPICS_CMD_PROTO_PORT);
envPrtConfigParam(&EPICS_AR_PORT);
envPrtConfigParam(&EPICS_IOC_LOG_INET);
envPrtConfigParam(&EPICS_IOC_LOG_PORT);
envPrtConfigParam(&EPICS_IOC_LOG_FILE_LIMIT);
envPrtConfigParam(&EPICS_IOC_LOG_FILE_NAME);
envPrtConfigParam(&EPICS_CA_ADDR_LIST);
envPrtConfigParam(&EPICS_CA_CONN_TMO);
envPrtConfigParam(&EPICS_CA_BEACON_PERIOD);
envPrtConfigParam(&EPICS_CA_AUTO_ADDR_LIST);
envPrtConfigParam(&EPICS_CA_REPEATER_PORT);
envPrtConfigParam(&EPICS_CA_SERVER_PORT);
return 0;
ENV_PARAM **ppParam = env_param_list;
while (*ppParam != NULL)
envPrtConfigParam(*(ppParam++));
}