lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

- MS Visual C compatibility; make all epicsExportAddress

Browse Source 
extern "C" linkage.
- make debug variables always available.
This commit is contained in:
Ron Sluiter
2004-12-21 15:42:15 +00:00
parent c713483e81
commit bf293c85c2
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/drvMM3000.cc
+9 -11
View File
@@ -2,9 +2,9 @@
FILENAME... drvMM3000.cc
USAGE... Motor record driver level support for Newport MM3000.
Version: $Revision: 1.15 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-11-10 05:27:29 $
Version: $Revision: 1.16 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-12-21 15:42:15 $
*/
/*
@@ -56,6 +56,9 @@ Last Modified: $Date: 2004-11-10 05:27:29 $
* .10 07/09/04 rls - removed unused <driver>Setup() argument.
* .11 07/28/04 rls - "epicsExport" debug variable.
* .12 09/21/04 rls - support for 32axes/controller.
* .13 12/21/04 rls - MS Visual C compatibility; make all epicsExportAddress
* extern "C" linkage.
* - make debug variables always available.
*
*/
@@ -95,15 +98,15 @@ Last Modified: $Date: 2004-11-10 05:27:29 $
/*----------------debugging-----------------*/
#ifdef __GNUG__
#ifdef DEBUG
volatile int drvMM3000debug = 0;
#define Debug(l, f, args...) { if(l<=drvMM3000debug) printf(f,## args); }
epicsExportAddress(int, drvMM3000debug);
#else
#define Debug(l, f, args...)
#endif
#else
#define Debug()
#endif
volatile int drvMM3000debug = 0;
extern "C" {epicsExportAddress(int, drvMM3000debug);}
/* --- Local data. --- */
int MM3000_num_cards = 0;
@@ -149,16 +152,11 @@ struct driver_table MM3000_access =
struct
{
long number;
#ifdef __cplusplus
long (*report) (int);
long (*init) (void);
#else
DRVSUPFUN report;
DRVSUPFUN init;
#endif
} drvMM3000 = {2, report, init};
epicsExportAddress(drvet, drvMM3000);
extern "C" {epicsExportAddress(drvet, drvMM3000);}
STATIC struct thread_args targs = {SCAN_RATE, &MM3000_access};
motorApp/NewportSrc/drvPM500.cc
+9 -6
View File
@@ -2,9 +2,9 @@
FILENAME... drvPM500.cc
USAGE... Motor record driver level support for Newport PM500.
Version: $Revision: 1.14 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-11-10 05:27:30 $
Version: $Revision: 1.15 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-12-21 15:38:50 $
*/
/* Device Driver Support routines for PM500 motor controller */
@@ -43,6 +43,9 @@ Last Modified: $Date: 2004-11-10 05:27:30 $
* .06 07/09/04 rls removed unused <driver>Setup() argument.
* .07 07/28/04 rls "epicsExport" debug variable.
* .08 09/21/04 rls support for 32axes/controller.
* .09 12/21/04 rls - MS Visual C compatibility; make all epicsExportAddress
* extern "C" linkage.
* - make debug variables always available.
*/
@@ -79,15 +82,15 @@ Last Modified: $Date: 2004-11-10 05:27:30 $
/*----------------debugging-----------------*/
#ifdef __GNUG__
#ifdef DEBUG
volatile int drvPM500debug = 0;
#define Debug(l, f, args...) { if(l<=drvPM500debug) printf(f,## args); }
epicsExportAddress(int, drvPM500debug);
#else
#define Debug(l, f, args...)
#endif
#else
#define Debug()
#endif
volatile int drvPM500debug = 0;
extern "C" {epicsExportAddress(int, drvPM500debug);}
/* --- Local data. --- */
int PM500_num_cards = 0;
@@ -144,7 +147,7 @@ struct
#endif
} drvPM500 = {2, report, init};
epicsExportAddress(drvet, drvPM500);
extern "C" {epicsExportAddress(drvet, drvPM500);}
static struct thread_args targs = {SCAN_RATE, &PM500_access};