Merge pull request epics-modules#11 from anjohnson/master

Minor updates for Base-7.0 and macOS builds
MJGaughran · Nov 19, 2018 · f23de41 · f23de41
2 parents 3ec680c + a2716ba
commit f23de41
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -3,10 +3,10 @@
 # busy
 APS BCDA synApps module: busy
 
-* [**synApps/busy** home page](http://aps.anl.gov/bcda/synApps/busy/busy.html)
+* [**synApps/busy** home page](https://epics.anl.gov/bcda/synApps/busy/busy.html)
 * [documentation](https://github.com/epics-modules/busy/blob/master/documentation/README.md)
 * [Request a feature](https://github.com/epics-modules/busy/issues/new?title=%20FEATURE%20SHORT%20DESCRIPTION&body=**Feature%20Long%20Description**%0A%0A**Why%20should%20this%20be%20added?**%0A&labels=enhancement)
 * [Report an issue with busy](https://github.com/epics-modules/busy/issues/new?title=%20ISSUE%20NAME%20HERE&body=**Describe%20the%20issue**%0A%0A**Steps%20to%20reproduce**%0A1.%20Step%20one%0A2.%20Step%20two%0A3.%20Step%20three%0A%0A**Expected%20behaivour**%0A%0A**Actual%20behaviour**%0A%0A**Build%20Environment**%0AArchitecture:%0AEpics%20Base%20Version:%0ADependent%20Module%20Versions:&labels=bug)
-* [synApps home page](http://www.aps.anl.gov/bcda/synApps)
+* [synApps home page](https://epicss.anl.gov/bcda/synApps)
 
 converted from APS SVN repository: Fri Oct 16 12:24:04 CDT 2015
diff --git a/busyApp/src/Makefile b/busyApp/src/Makefile
@@ -3,6 +3,9 @@ include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 #=============================
+
+USR_CPPFLAGS += -DUSE_TYPED_RSET
+
 DBD_INSTALLS += busySupport.dbd
 DBDINC += busyRecord
 

diff --git a/busyApp/src/busyRecord.c b/busyApp/src/busyRecord.c
@@ -44,18 +44,18 @@
 /* Create RSET - Record Support Entry Table*/
 #define report NULL
 #define initialize NULL
-static long init_record(busyRecord *, int);
-static long process(busyRecord *);
+static long init_record(dbCommon *, int);
+static long process(dbCommon *);
 #define special NULL
 #define get_value NULL
 #define cvt_dbaddr NULL
 #define get_array_info NULL
 #define put_array_info NULL
 #define get_units NULL
-static long get_precision(DBADDR *, long *);
-static long get_enum_str(DBADDR *, char *);
-static long get_enum_strs(DBADDR *, struct dbr_enumStrs *);
-static long put_enum_str(DBADDR *, char *);
+static long get_precision(const DBADDR *, long *);
+static long get_enum_str(const DBADDR *, char *);
+static long get_enum_strs(const DBADDR *, struct dbr_enumStrs *);
+static long put_enum_str(const DBADDR *, const char *);
 #define get_graphic_double NULL
 #define get_control_double NULL
 #define get_alarm_double NULL
@@ -124,8 +124,9 @@ static void myCallbackFunc(CALLBACK *arg)
     dbScanUnlock((struct dbCommon *)prec);
 }
 
-static long init_record(busyRecord *prec, int pass)
+static long init_record(dbCommon *pcommon, int pass)
 {
+    busyRecord *prec = (busyRecord *) pcommon;
     struct busydset *pdset;
     long status=0;
     myCallback *pcallback;
@@ -179,8 +180,9 @@ static long init_record(busyRecord *prec, int pass)
     return(status);
 }
 
-static long process(busyRecord *prec)
+static long process(dbCommon *pcommon)
 {
+    busyRecord *prec = (busyRecord *) pcommon;
     struct busydset    *pdset = (struct busydset *)(prec->dset);
     long         status=0;
     unsigned char    pact=prec->pact;
@@ -272,7 +274,7 @@ static long process(busyRecord *prec)
     return(status);
 }
 
-static long get_precision(DBADDR *paddr, long *precision)
+static long get_precision(const DBADDR *paddr, long *precision)
 {
     busyRecord    *prec=(busyRecord *)paddr->precord;
 
@@ -281,7 +283,7 @@ static long get_precision(DBADDR *paddr, long *precision)
     return(0);
 }
 
-static long get_enum_str(DBADDR *paddr, char *pstring)
+static long get_enum_str(const DBADDR *paddr, char *pstring)
 {
     busyRecord      *prec=(busyRecord *)paddr->precord;
     int             index;
@@ -303,7 +305,7 @@ static long get_enum_str(DBADDR *paddr, char *pstring)
     return(0);
 }
 
-static long get_enum_strs(DBADDR *paddr,struct dbr_enumStrs *pes)
+static long get_enum_strs(const DBADDR *paddr,struct dbr_enumStrs *pes)
 {
     busyRecord    *prec=(busyRecord *)paddr->precord;
 
@@ -316,7 +318,7 @@ static long get_enum_strs(DBADDR *paddr,struct dbr_enumStrs *pes)
     if(*prec->onam!=0) pes->no_str=2;
     return(0);
 }
-static long put_enum_str(DBADDR *paddr, char *pstring)
+static long put_enum_str(const DBADDR *paddr, const char *pstring)
 {
     busyRecord     *prec=(busyRecord *)paddr->precord;