epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

api changes

Browse Source
This commit is contained in:
Jeff Hill
1997-04-10 20:01:14 +00:00
parent 7a8878dec6
commit 0804f7fb08
11 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dbStatic/dbStaticLib.c
View File

@@ -1338,7 +1338,7 @@ long dbFreeRecords(DBBASE *pdbbase)
return(0);
}
long dbFindRecord(DBENTRY *pdbentry,char *precordName)
long dbFindRecord(DBENTRY *pdbentry,const char *precordName)
{
dbBase *pdbbase = pdbentry->pdbbase;
int lenName=0;
@@ -1522,7 +1522,7 @@ long dbCopyRecord(DBENTRY *pdbentry,char *newRecordName,int overWriteOK)
return(dbFindRecord(pdbentry,newRecordName));
}
long dbFindField(DBENTRY *pdbentry,char *pname)
long dbFindField(DBENTRY *pdbentry,const char *pname)
{
dbRecordType *precordType = pdbentry->precordType;
dbRecordNode *precnode = pdbentry->precnode;

4
src/dbStatic/dbStaticLib.h
View File

@@ -135,7 +135,7 @@ int dbGetPromptGroup(DBENTRY *pdbentry);
long dbCreateRecord(DBENTRY *pdbentry,char *precordName);
long dbDeleteRecord(DBENTRY *pdbentry);
long dbFreeRecords(DBBASE *pdbbase);
long dbFindRecord(DBENTRY *pdbentry,char *precordName);
long dbFindRecord(DBENTRY *pdbentry,const char *precordName);
long dbFirstRecord(DBENTRY *pdbentry); /*first of record type*/
long dbNextRecord(DBENTRY *pdbentry);
int dbGetNRecords(DBENTRY *pdbentry);
@@ -147,7 +147,7 @@ long dbVisibleRecord(DBENTRY *pdbentry);
long dbInvisibleRecord(DBENTRY *pdbentry);
int dbIsVisibleRecord(DBENTRY *pdbentry);
long dbFindField(DBENTRY *pdbentry,char *pfieldName);
long dbFindField(DBENTRY *pdbentry,const char *pfieldName);
int dbFoundField(DBENTRY *pdbentry);
char *dbGetString(DBENTRY *pdbentry);
long dbPutString(DBENTRY *pdbentry,char *pstring);

16
src/gdd/aitConvert.h
View File

@@ -8,6 +8,9 @@
* $Id$
*
* $Log$
* Revision 1.3 1996/10/17 12:41:07 jbk
* network byte order stuff / added strDup function to Helpers
*
* Revision 1.2 1996/08/13 23:13:34 jhill
* win NT changes
*
@@ -22,11 +25,8 @@
#include <sys/types.h>
#ifdef WIN32
#include <winsock.h>
#else
#include <netinet/in.h>
#endif
#include "shareLib.h"
#include "osiSock.h"
#include "aitTypes.h"
@@ -50,11 +50,11 @@ extern "C" {
#endif
/* main conversion table */
extern aitFunc aitConvertTable[aitTotal][aitTotal];
epicsShareExtern aitFunc aitConvertTable[aitTotal][aitTotal];
/* do not make conversion table if not needed */
#ifdef AIT_NEED_BYTE_SWAP
extern aitFunc aitConvertToNetTable[aitTotal][aitTotal];
extern aitFunc aitConvertFromNetTable[aitTotal][aitTotal];
epicsShareExtern aitFunc aitConvertToNetTable[aitTotal][aitTotal];
epicsShareExtern aitFunc aitConvertFromNetTable[aitTotal][aitTotal];
#else
#define aitConvertToNetTable aitConvertTable
#define aitConvertFromNetTable aitConvertTable

9
src/gdd/aitHelpers.h
View File

@@ -8,6 +8,9 @@
* $Id$
*
* $Log$
* Revision 1.11 1997/03/21 01:56:00 jbk
* *** empty log message ***
*
* Revision 1.10 1996/11/02 01:28:15 jhill
* removed merge problems
*
@@ -63,9 +66,9 @@ inline char* strDup(const char* x)
}
class aitTimeStamp {
friend aitTimeStamp operator+ (const aitTimeStamp &lhs, const aitTimeStamp &rhs);
friend aitTimeStamp operator- (const aitTimeStamp &lhs, const aitTimeStamp &rhs);
friend int operator>= (const aitTimeStamp &lhs, const aitTimeStamp &rhs);
friend inline aitTimeStamp operator+ (const aitTimeStamp &lhs, const aitTimeStamp &rhs);
friend inline aitTimeStamp operator- (const aitTimeStamp &lhs, const aitTimeStamp &rhs);
friend inline int operator>= (const aitTimeStamp &lhs, const aitTimeStamp &rhs);
public:
aitTimeStamp () : tv_sec(0u), tv_nsec(0u) {}
aitTimeStamp (const aitTimeStamp &t) : tv_sec(t.tv_sec), tv_nsec(t.tv_nsec) {}

9
src/gdd/aitTypes.c
View File

@@ -5,6 +5,9 @@
* $Id$
*
* $Log$
* Revision 1.1 1996/06/25 19:11:32 jbk
* new in EPICS base
*
* Revision 1.1 1996/05/31 13:15:21 jbk
* add new stuff
*
@@ -14,7 +17,7 @@
#include <sys/types.h>
#include "aitTypes.h"
const size_t aitSize[aitTotal] = {
epicsShareDecl const size_t aitSize[aitTotal] = {
0,
sizeof(aitInt8),
sizeof(aitUint8),
@@ -30,7 +33,7 @@ const size_t aitSize[aitTotal] = {
0
};
const char* aitName[aitTotal] = {
epicsShareDecl const char* aitName[aitTotal] = {
"aitInvalid",
"aitInt8",
"aitUint8",
@@ -46,7 +49,7 @@ const char* aitName[aitTotal] = {
"aitContainer"
};
const char* aitStringType[aitTotal] = {
epicsShareDecl const char* aitStringType[aitTotal] = {
"%8.8x",
"%2.2x",
"%2.2x",

11
src/gdd/aitTypes.h
View File

@@ -8,6 +8,9 @@
* $Id$
*
* $Log$
* Revision 1.3 1997/03/21 01:56:00 jbk
* *** empty log message ***
*
* Revision 1.2 1996/08/22 21:05:40 jbk
* More fixes to make strings and fixed string work better.
*
@@ -31,6 +34,8 @@
#include <sys/types.h>
#include <string.h>
#include "shareLib.h"
typedef char aitInt8;
typedef unsigned char aitUint8;
typedef short aitInt16;
@@ -139,9 +144,9 @@ typedef union {
#ifdef __cplusplus
extern "C" {
#endif
extern const size_t aitSize[aitTotal];
extern const char* aitName[aitTotal];
extern const char* aitStringType[aitTotal];
epicsShareExtern const size_t aitSize[aitTotal];
epicsShareExtern const char* aitName[aitTotal];
epicsShareExtern const char* aitStringType[aitTotal];
#ifdef __cplusplus
}
#endif

10
src/gdd/dbMapper.h
View File

@@ -8,12 +8,16 @@
* $Id$
*
* $Log$
* Revision 1.1 1996/06/25 19:11:36 jbk
* new in EPICS base
*
*
* *Revision 1.1 1996/05/31 13:15:24 jbk
* *add new stuff
*
*/
#include "shareLib.h"
#include "aitTypes.h"
#include "gdd.h"
@@ -49,9 +53,9 @@ struct gddDbrToAitTable {
};
typedef struct gddDbrToAitTable gddDbrToAitTable;
extern gddDbrToAitTable gddDbrToAit[];
extern const chtype gddAitToDbr[];
extern gddDbrMapFuncTable gddMapDbr[];
epicsShareExtern gddDbrToAitTable gddDbrToAit[];
epicsShareExtern const chtype gddAitToDbr[];
epicsShareExtern gddDbrMapFuncTable gddMapDbr[];
void gddMakeMapDBR(gddApplicationTypeTable& tt);
void gddMakeMapDBR(gddApplicationTypeTable* tt);

7
src/gdd/gddErrorCodes.h
View File

@@ -8,6 +8,9 @@
* $Id$
*
* $Log$
* Revision 1.2 1996/08/27 13:05:10 jbk
* final repairs to string functions, put() functions, and error code printing
*
* Revision 1.1 1996/06/25 19:11:43 jbk
* new in EPICS base
*
@@ -19,6 +22,8 @@
*
*/
#include "shareLib.h"
/*
gdd.cc contains a table (gddErrorMessages) that has all the text
strings for each of the error codes
@@ -37,7 +42,7 @@ typedef long gddStatus;
#define gddErrorOverflow -9
#define gddErrorUnderflow -10
extern char* gddErrorMessages[];
epicsShareExtern char* gddErrorMessages[];
#define gddPrintError(x) \
fprintf(stderr,"gdd Error: %s\n",gddErrorMessages[x*(-1)]);

12
src/include/osiMutexNOOP.h
View File

@@ -3,6 +3,14 @@
// osiMutex - OS independent mutex
// (NOOP on single threaded OS)
//
// NOTE:
// I have made lock/unlock const because this allows
// a list to be run in a const member function on a
// multi-threaded os (since paired lock/unlock
// requests really do not modify the internal
// state of the object and neither does
// running the list if we dont modify the list).
//
class osiMutex {
public:
//
@@ -10,8 +18,8 @@ public:
// (since g++ does not have exceptions)
//
int init() {return 0;}
void osiLock() {}
void osiUnlock() {}
void osiLock() const {}
void osiUnlock() const {}
void show (unsigned) const {}
private:
};

4
src/util/Makefile.Host
View File

@@ -5,8 +5,8 @@ TOP = ../../..
include $(TOP)/config/CONFIG_BASE
# default Unix needs lib m, every system needs libs ca & Com:
PROD_LIBS_DEFAULT := m
PROD_LIBS_WIN32 := -nil-
SYS_PROD_LIBS_DEFAULT := m
SYS_PROD_LIBS_WIN32 := -nil-
PROD_LIBS := ca Com
PROD_DEFAULT := ca_test iocLogServer startCArepeater

7
src/util/iocLogServer.c
View File

@@ -47,6 +47,9 @@
* .09 050494 pg HPUX port changes.
* .10 021694 joh ANSI C
* $Log$
* Revision 1.24 1996/11/22 20:43:03 jhill
* doc
*
* Revision 1.22 1996/11/02 02:20:36 jhill
* use osiSock.h
*
@@ -140,7 +143,7 @@ static void logTime (struct iocLogClient *pclient);
static int getConfig(void);
static int openLogFile(struct ioc_log_server *pserver);
static void handleLogFileError(void);
static void envFailureNotify(ENV_PARAM *pparam);
static void envFailureNotify(const ENV_PARAM *pparam);
static void freeLogClient(struct iocLogClient *pclient);
static void sighupHandler(void);
@@ -747,7 +750,7 @@ static int getConfig(void)
*
*
*/
static void envFailureNotify(ENV_PARAM *pparam)
static void envFailureNotify(const ENV_PARAM *pparam)
{
fprintf(stderr,
"iocLogServer: EPICS environment variable `%s' undefined\n",