EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

some cleanup after manual merge

Browse Source
This commit is contained in:
zimoch
2018-05-23 11:19:20 +02:00
parent 099585fa91
commit cbc549f355
4 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/CONFIG_STREAM
View File

@ -1,6 +1,3 @@
# Want debugging?
# HOST_OPT = NO
# You may add more record interfaces # You may add more record interfaces
# This requires the naming conventions # This requires the naming conventions
# dev$(RECORDTYPE)Stream.c # dev$(RECORDTYPE)Stream.c
@ -18,11 +15,9 @@ RECORDTYPES += aai aao
# Do you have synApps and want support for scalcout? # Do you have synApps and want support for scalcout?
# Then define CALC or SYNAPPS in your RELEASE file # Then define CALC or SYNAPPS in your RELEASE file
# pointing to the 'calc' module of synApps. # pointing to the 'calc' module of synApps.
# Due to strange cross dependencies in synApps # Older 'calc' versions have a cross reference on
# you have to build the 'sscan' and 'genSub' # 'sscan' and/or 'genSub', so you may have to build them first.
# modules before building 'calc'. # Up to version 2-6 (synApps 5-1) the 'calc' module needs a fix.
# The 'calc' version must be 2-4 or higher.
# Up to version 2-6 (synApps 5.1) the 'calc' module needs a fix.
# See doc/scalcout.html for details. # See doc/scalcout.html for details.
ifneq ($(words $(CALC) $(SYNAPPS)), 0) ifneq ($(words $(CALC) $(SYNAPPS)), 0)
RECORDTYPES += scalcout RECORDTYPES += scalcout
@ -31,7 +26,8 @@ endif
# You may add more bus interfaces # You may add more bus interfaces
# This requires the naming convention # This requires the naming convention
# $(BUS)Interface.cc # $(BUS)Interface.cc
# asynDriver interface is added if ASYN is defined in your RELEASE file. # asynDriver interface is added automatically
# if ASYN is defined in your RELEASE file.
BUSSES += Debug BUSSES += Debug
BUSSES += Dummy BUSSES += Dummy

14
src/devaiStream.c
View File

@ -18,16 +18,12 @@
* * * *
***************************************************************/ ***************************************************************/
#include <aiRecord.h> #include <math.h>
#include "epicsMath.h"
#include "menuConvert.h"
#include "aiRecord.h"
#include "epicsExport.h"
#include "devStream.h" #include "devStream.h"
#ifdef EPICS_3_13
#include <private/mathP.h>
#define isinf(x) isInf(x)
#define isnan(x) isNan(x)
#else
#include <epicsMath.h>
#endif
#include <epicsExport.h>
static long readData (dbCommon *record, format_t *format) static long readData (dbCommon *record, format_t *format)
{ {

5
src/devaoStream.c
View File

@ -18,9 +18,10 @@
* * * *
***************************************************************/ ***************************************************************/
#include <aoRecord.h> #include "menuConvert.h"
#include "aoRecord.h"
#include "epicsExport.h"
#include "devStream.h" #include "devStream.h"
#include <epicsExport.h>
static long readData (dbCommon *record, format_t *format) static long readData (dbCommon *record, format_t *format)
{ {

6
streamApp/Makefile
View File

@ -1,6 +1,6 @@
TOP:=../$(TOP) TOP:=../$(TOP)
# Look if we have EPICS R3.13 or R3.14 # Look if we have EPICS R3.13 or R3.14+
ifeq ($(wildcard $(TOP)/configure),) ifeq ($(wildcard $(TOP)/configure),)
# EPICS R3.13 # EPICS R3.13
include $(TOP)/config/CONFIG_APP include $(TOP)/config/CONFIG_APP
@ -8,11 +8,9 @@ include $(TOP)/config/CONFIG_APP
include $(TOP)/config/RULES_ARCHS include $(TOP)/config/RULES_ARCHS
else else
# EPICS R3.14 # EPICS R3.14+
include $(TOP)/configure/CONFIG include $(TOP)/configure/CONFIG
#HOST_OPT = NO
PROD = streamApp PROD = streamApp
DBD = streamApp.dbd DBD = streamApp.dbd