more changes for epicsShare

This commit is contained in:
Marty Kraimer
2003-03-28 16:01:45 +00:00
parent 499d1fa9af
commit 21ee244b5e
35 changed files with 73 additions and 62 deletions

View File

@@ -247,7 +247,7 @@ int main(int argc,char **argv)
fprintf(outFile,"#endif\n");
pdbRecordType = (dbRecordType *)ellFirst(&pdbbase->recordTypeList);
while(pdbRecordType) {
fprintf(outFile,"static int %sRecordSizeOffset(dbRecordType *pdbRecordType)\n{\n",
fprintf(outFile,"epicsShareFunc int %sRecordSizeOffset(dbRecordType *pdbRecordType)\n{\n",
pdbRecordType->name);
fprintf(outFile," %sRecord *prec = 0;\n",pdbRecordType->name);
for(i=0; i<pdbRecordType->no_fields; i++) {

View File

@@ -21,7 +21,7 @@
/*Create the dset for devXxxSoft */
static long init_record();
static long read_xxx();
epicsShareExtern struct {
epicsShareDef struct {
long number;
DEVSUPFUN report;
DEVSUPFUN init;

View File

@@ -40,7 +40,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "aaiRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -40,7 +40,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "aaoRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -37,7 +37,9 @@
#include "special.h"
#include "menuConvert.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "aiRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -38,7 +38,9 @@
#include "menuConvert.h"
#include "menuOmsl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "aoRecord.h"
#undef GEN_SIZE_OFFSET
#include "menuIvoa.h"
/* Create RSET - Record Support Entry Table*/

View File

@@ -36,8 +36,9 @@
#include "recGbl.h"
#include "special.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "biRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL
#define initialize NULL

View File

@@ -36,8 +36,9 @@
#include "recGbl.h"
#include "special.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "boRecord.h"
#undef GEN_SIZE_OFFSET
#include "menuIvoa.h"
#include "menuOmsl.h"

View File

@@ -35,8 +35,9 @@
#include "recGbl.h"
#include "special.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "calcRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -39,8 +39,9 @@
#include "postfix.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "calcoutRecord.h"
#undef GEN_SIZE_OFFSET
#include "menuIvoa.h"
/* Create RSET - Record Support Entry Table*/

View File

@@ -34,8 +34,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "compressRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -40,8 +40,9 @@
#include "special.h"
#include "menuOmsl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "dfanoutRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -30,9 +30,11 @@
#include "errMdef.h"
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "egRecord.h"
#undef GEN_SIZE_OFFSET
#include "egDefs.h"
#define STATIC static

View File

@@ -31,10 +31,10 @@
#include "recGbl.h"
#define epicsExportSharedSymbols
#include "egRecord.h"
#define GEN_SIZE_OFFSET
#include "egeventRecord.h"
#undef GEN_SIZE_OFFSET
#include "egDefs.h"
#define STATIC static

View File

@@ -32,8 +32,9 @@
#include "erDefs.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "erRecord.h"
#undef GEN_SIZE_OFFSET
#define STATIC static

View File

@@ -32,8 +32,9 @@
#include "ereventDefs.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "ereventRecord.h"
#undef GEN_SIZE_OFFSET
#define STATIC static

View File

@@ -34,8 +34,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "eventRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -30,10 +30,11 @@
#include "errMdef.h"
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#include "fanoutRecord.h"
#include "dbCommon.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "fanoutRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -38,8 +38,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "histogramRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -33,8 +33,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "longinRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -30,8 +30,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "longoutRecord.h"
#undef GEN_SIZE_OFFSET
#include "menuIvoa.h"
#include "menuOmsl.h"

View File

@@ -36,8 +36,9 @@
#include "recGbl.h"
#include "special.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "mbbiDirectRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -33,8 +33,9 @@
#include "recGbl.h"
#include "special.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "mbbiRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL
#define initialize NULL

View File

@@ -35,8 +35,9 @@
#include "recGbl.h"
#include "special.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "mbboDirectRecord.h"
#undef GEN_SIZE_OFFSET
#include "menuOmsl.h"
#include "menuIvoa.h"

View File

@@ -35,8 +35,9 @@
#include "recGbl.h"
#include "special.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "mbboRecord.h"
#undef GEN_SIZE_OFFSET
#include "menuOmsl.h"
#include "menuIvoa.h"

View File

@@ -32,8 +32,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "permissiveRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -33,8 +33,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "selRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -33,8 +33,9 @@
#include "callback.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "seqRecord.h"
#undef GEN_SIZE_OFFSET
int seqRecDebug = 0;

View File

@@ -33,8 +33,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "stateRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -34,8 +34,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "stringinRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -34,8 +34,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "stringoutRecord.h"
#undef GEN_SIZE_OFFSET
#include "menuOmsl.h"
#include "menuIvoa.h"

View File

@@ -36,8 +36,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "subArrayRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -37,8 +37,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "subRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL

View File

@@ -35,8 +35,9 @@
#include "recSup.h"
#include "recGbl.h"
#define epicsExportSharedSymbols
#define GEN_SIZE_OFFSET
#include "waveformRecord.h"
#undef GEN_SIZE_OFFSET
/* Create RSET - Record Support Entry Table*/
#define report NULL
#define initialize NULL

View File

@@ -61,26 +61,16 @@ print << "END" ;
#include "registryDriverSupport.h"
#include "iocsh.h"
#include "shareLib.h"
#define GEN_SIZE_OFFSET
END
if($numberRecordType>0) {
for ($i=0; $i<$numberRecordType; $i++) {
print "#include <$recordType[$i]Record.h>\n"
}
}
print "#undef GEN_SIZE_OFFSET\n";
print "extern \"C\" {\n";
#definitions for recordtype
if($numberRecordType>0) {
print "#ifdef __cplusplus\n";
print "extern \"C\" {\n";
print "#endif\n";
for ($i=0; $i<$numberRecordType; $i++) {
print "epicsShareExtern struct rset $recordType[$i]RSET;\n";
print "epicsShareFunc int $recordType[$i]RecordSizeOffset(dbRecordType *pdbRecordType);\n"
}
print "#ifdef __cplusplus\n";
print "}\n";
print "#endif\n";
print "\nstatic const char * const recordTypeNames[$numberRecordType] = {\n";
for ($i=0; $i<$numberRecordType; $i++) {
print " \"$recordType[$i]\"";
@@ -100,15 +90,9 @@ if($numberRecordType>0) {
#definitions for device
if($numberDeviceSupport>0) {
print "#ifdef __cplusplus\n";
print "extern \"C\" {\n";
print "#endif\n";
for ($i=0; $i<$numberDeviceSupport; $i++) {
print "epicsShareExtern struct dset $deviceSupport[$i];\n";
}
print "#ifdef __cplusplus\n";
print "}\n";
print "#endif\n";
print "\nstatic const char * const deviceSupportNames[$numberDeviceSupport] = {\n";
for ($i=0; $i<$numberDeviceSupport; $i++) {
print " \"$deviceSupport[$i]\"";
@@ -128,15 +112,9 @@ if($numberDeviceSupport>0) {
#definitions for driver
if($numberDriverSupport>0) {
print "#ifdef __cplusplus\n";
print "extern \"C\" {\n";
print "#endif\n";
for ($i=0; $i<$numberDriverSupport; $i++) {
print "epicsShareExtern struct drvet $driverSupport[$i];\n";
}
print "#ifdef __cplusplus\n";
print "}\n";
print "#endif\n";
print "\nstatic char *driverSupportNames[$numberDriverSupport] = {\n";
for ($i=0; $i<$numberDriverSupport; $i++) {
print " \"$driverSupport[$i]\"";
@@ -157,11 +135,9 @@ if($numberDriverSupport>0) {
#definitions registrar
if($numberRegistrar>0) {
print "typedef void(*REGISTRARFUNC)(void);\n";
print "extern \"C\" {\n";
for ($i=0; $i<$numberRegistrar; $i++) {
print "epicsShareFunc void $registrar[$i](void);\n";
}
print "}\n\n";
}
#Now actual registration code.
@@ -237,13 +213,12 @@ static const iocshArg *registerRecordDeviceDriverArgs[1] =
{&registerRecordDeviceDriverArg0};
static const iocshFuncDef registerRecordDeviceDriverFuncDef =
{"registerRecordDeviceDriver",1,registerRecordDeviceDriverArgs};
extern "C" {
static void registerRecordDeviceDriverCallFunc(const iocshArgBuf *)
{
registerRecordDeviceDriver(pdbbase);
}
} //extern "C"
} // ext C
/*
* Register commands on application startup
*/