Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src: .svn Only in src: CVS diff -r src/Makefile /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/Makefile 29c29,30 < #USR_CFLAGS += -pedantic --- > # Don't use -O0 for RTEMS as it generates undef references to in_be16() > #USR_CFLAGS_Linux += -O0 70,75c71,75 < PROD_IOC_vxWorks += devMrfEgLib < LIBRARY_IOC_RTEMS += devMrfEg < LIBRARY_IOC_vxWorks += devMrfEg < ifeq ($(EVR_DRIVER_SUPPORT_LINUX), YES) < LIBRARY_IOC_Linux += devMrfEg < devMrfEg_OBJS_Linux += drvLinuxEvg --- > PROD_IOC_vxWorks += devMrfEgLib > LIBRARY_IOC_RTEMS += devMrfEg > LIBRARY_IOC_vxWorks += devMrfEg > ifeq ($(EVR_DRIVER_SUPPORT_LINUX), YES) > LIBRARY_IOC_Linux += devMrfEg 78,82c78,85 < devMrfEg_OBJS_RTEMS += drvMrfEg < devMrfEg_OBJS_vxWorks += drvMrfEg < devMrfEg_OBJS += devMrfEg < devMrfEg_OBJS += egRecord < devMrfEg_OBJS += egeventRecord --- > # Source objects for Event Generator Library > devMrfEg_OBJS += egRecord > devMrfEg_OBJS += egeventRecord > devMrfEg_OBJS_RTEMS += drvMrfEg > devMrfEg_OBJS_vxWorks += drvMrfEg > ifeq ($(EVR_DRIVER_SUPPORT_LINUX), YES) > devMrfEg_OBJS_Linux += drvLinuxEvg > endif 93,94c96,97 < PROD_IOC_vxWorks += devMrfErLib < LIBRARY_IOC_RTEMS += devMrfEr --- > PROD_IOC_vxWorks += devMrfErLib > LIBRARY_IOC_RTEMS += devMrfEr 97,98c100 < LIBRARY_IOC_Linux += devMrfEr < devMrfEr_OBJS_Linux += drvLinuxEvr --- > LIBRARY_IOC_Linux += devMrfEr 100a103,108 > # Source objects for Event Receiver Library > devMrfEr_OBJS += devMrfEr > devMrfEr_OBJS += erRecord > devMrfEr_OBJS += ereventRecord > > # RTEMS source 102,103d109 < devMrfEr_OBJS_vxWorks += drvMrfEr < devMrfEr_OBJS += devMrfEr 106a113,118 > devMrfEr_OBJS_RTEMS += evrEEPROMFixup > endif > > # VxWorks source > devMrfEr_OBJS_vxWorks += drvMrfEr > ifeq ($(BSP_SUPPORTS_PCI), YES) 109c121,126 < devMrfEr_OBJS_RTEMS += evrEEPROMFixup --- > devMrfEr_OBJS_vxWorks += evrEEPROMFixup > endif > > # Linux source > ifeq ($(EVR_DRIVER_SUPPORT_LINUX), YES) > devMrfEr_OBJS_Linux += drvLinuxEvr 111,112d127 < devMrfEr_OBJS += erRecord < devMrfEr_OBJS += ereventRecord 120c135 < # Build the Library for Accessing VME-64X CR/CSR space --- > # Build the Library for the MRF driver level access 122,124c137,148 < PROD_IOC_vxWorks += mrfVme64xLib < LIBRARY_IOC_RTEMS += mrfVme64x < LIBRARY_IOC_vxWorks += mrfVme64x --- > PROD_IOC_vxWorks += drvMrfLib > LIBRARY_IOC_RTEMS += drvMrf > LIBRARY_IOC_vxWorks += drvMrf > ifeq ($(EVR_DRIVER_SUPPORT_LINUX), YES) > LIBRARY_IOC_Linux += drvMrf > endif > > # Source objects for MRF driver Library > drvMrf_OBJS_RTEMS += mrfVme64x > drvMrf_OBJS_RTEMS += $(CRCSR_PROBE_NAME) > drvMrf_OBJS_vxWorks += mrfVme64x > drvMrf_OBJS_vxWorks += $(CRCSR_PROBE_NAME) 126,128c150,151 < LIBRARY_IOC_Linux += drvMrf < drvMrf_OBJS_Linux += drvLinux < drvMrf_OBJS_Linux += $(MRFAPI_DIR)/erapi.o --- > drvMrf_OBJS_Linux += drvLinux > drvMrfLib_LIBS_Linux+= mrfApi 131,134c154 < mrfVme64x_OBJS_RTEMS += mrfVme64x < mrfVme64x_OBJS_vxWorks += mrfVme64x < mrfVme64x_OBJS_RTEMS += $(CRCSR_PROBE_NAME) < mrfVme64x_OBJS_vxWorks += $(CRCSR_PROBE_NAME) --- > drvMrfLib_OBJS += $(drvMrf_OBJS) 136c156 < mrfVme64xLib_OBJS += $(mrfVme64x_OBJS) --- > OBJS_IOC_vxWorks += $(drvMrf_OBJS) 138d157 < OBJS_IOC_vxWorks += $(mrfVme64x_OBJS) diff -r src/O.Common/devMrfEgLib.dbd /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.Common/devMrfEgLib.dbd 310c310 < interest(4) --- > interest(2) 1088c1088 < interest(4) --- > interest(2) diff -r src/O.Common/devMrfEgLib.dbd.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.Common/devMrfEgLib.dbd.depends 3,4c3,8 < ../O.Common/devMrfEgLib.dbd : ../devMrfEg.dbd ../devMrfEgEvent.dbd \ < ../drvMrfEg.dbd ../egRecord.dbd ../egeventRecord.dbd --- > ../O.Common/devMrfEgLib.dbd : ../devMrfEg.dbd > ../O.Common/devMrfEgLib.dbd : ../devMrfEgEvent.dbd > ../O.Common/devMrfEgLib.dbd : ../drvMrfEg.dbd > ../O.Common/devMrfEgLib.dbd : ../egRecord.dbd > ../O.Common/devMrfEgLib.dbd : ../egeventRecord.dbd > 6,11d9 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../devMrfEg.dbd : < ../devMrfEgEvent.dbd : < ../drvMrfEg.dbd : < ../egRecord.dbd : < ../egeventRecord.dbd : diff -r src/O.Common/devMrfErLib.dbd /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.Common/devMrfErLib.dbd 417c417 < interest(4) --- > interest(2) 881c881 < interest(4) --- > interest(2) 1402c1402 < interest(4) --- > interest(2) 1739c1739 < interest(4) --- > interest(2) 2121c2121 < interest(4) --- > interest(2) 2133a2134 > initial("0") 2413c2414 < extra("char rpcl[200]") --- > extra("char rpcl[INFIX_TO_POSTFIX_SIZE(40)]") 2652c2653 < interest(4) --- > interest(2) 2667c2668 < extra("void * rpvt") --- > extra("struct rpvtStruct *rpvt") 2679a2681 > initial("0") 2881a2884 > initial("0") 3129c3132 < extra("char rpcl[184]") --- > extra("char rpcl[INFIX_TO_POSTFIX_SIZE(40)]") 3135c3138 < extra("char orpc[184]") --- > extra("char orpc[INFIX_TO_POSTFIX_SIZE(40)]") 3374c3377 < interest(4) --- > interest(2) 3728c3731 < interest(4) --- > interest(2) 4146c4149 < interest(4) --- > interest(2) 4423c4426 < interest(4) --- > interest(2) 4717c4720 < interest(4) --- > interest(2) 5093c5096 < interest(4) --- > interest(2) 5500c5503 < interest(4) --- > interest(2) 6200c6203 < interest(4) --- > interest(2) 6598c6601 < interest(4) --- > interest(2) 7327c7330 < interest(4) --- > interest(2) 7783c7786 < interest(4) --- > interest(2) 8052c8055 < interest(4) --- > interest(2) 8589c8592 < interest(4) --- > interest(2) 9048c9051 < interest(4) --- > interest(2) 9304c9307 < interest(4) --- > interest(2) 9603c9606 < interest(4) --- > interest(2) 9920c9923 < interest(4) --- > interest(2) 10466c10469 < interest(4) --- > interest(2) 10781c10784 < interest(4) --- > interest(2) 11112c11115 < interest(4) --- > interest(2) 12177c12180 < interest(4) --- > interest(2) 12369a12373 > variable(dbBptNotMonotonic,int) diff -r src/O.Common/devMrfErLib.dbd.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.Common/devMrfErLib.dbd.depends 3,4c3,7 < ../O.Common/devMrfErLib.dbd : ../devMrfEr.dbd ../drvMrfEr.dbd \ < ../erRecord.dbd ../ereventRecord.dbd --- > ../O.Common/devMrfErLib.dbd : ../devMrfEr.dbd > ../O.Common/devMrfErLib.dbd : ../drvMrfEr.dbd > ../O.Common/devMrfErLib.dbd : ../erRecord.dbd > ../O.Common/devMrfErLib.dbd : ../ereventRecord.dbd > 6,10d8 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../devMrfEr.dbd : < ../drvMrfEr.dbd : < ../erRecord.dbd : < ../ereventRecord.dbd : diff -r src/O.RTEMS-beatnik/MakefileInclude /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/MakefileInclude 242,243c242,243 < ifneq ($(strip $(mrfVme64x_SRCS_$(OS_CLASS))),) < mrfVme64x_SRCS+=$(subst -nil-,,$(mrfVme64x_SRCS_$(OS_CLASS))) --- > ifneq ($(strip $(drvMrf_SRCS_$(OS_CLASS))),) > drvMrf_SRCS+=$(subst -nil-,,$(drvMrf_SRCS_$(OS_CLASS))) 245,246c245,246 < ifdef mrfVme64x_SRCS_DEFAULT < mrfVme64x_SRCS+=$(mrfVme64x_SRCS_DEFAULT) --- > ifdef drvMrf_SRCS_DEFAULT > drvMrf_SRCS+=$(drvMrf_SRCS_DEFAULT) 249,250c249,250 < ifneq ($(strip $(mrfVme64x_RCS_$(OS_CLASS))),) < mrfVme64x_RCS+=$(subst -nil-,,$(mrfVme64x_RCS_$(OS_CLASS))) --- > ifneq ($(strip $(drvMrf_RCS_$(OS_CLASS))),) > drvMrf_RCS+=$(subst -nil-,,$(drvMrf_RCS_$(OS_CLASS))) 252,253c252,253 < ifdef mrfVme64x_RCS_DEFAULT < mrfVme64x_RCS+=$(mrfVme64x_RCS_DEFAULT) --- > ifdef drvMrf_RCS_DEFAULT > drvMrf_RCS+=$(drvMrf_RCS_DEFAULT) 256,257c256,257 < ifneq ($(strip $(mrfVme64x_OBJS_$(OS_CLASS))),) < mrfVme64x_OBJS+=$(subst -nil-,,$(mrfVme64x_OBJS_$(OS_CLASS))) --- > ifneq ($(strip $(drvMrf_OBJS_$(OS_CLASS))),) > drvMrf_OBJS+=$(subst -nil-,,$(drvMrf_OBJS_$(OS_CLASS))) 259,260c259,260 < ifdef mrfVme64x_OBJS_DEFAULT < mrfVme64x_OBJS+=$(mrfVme64x_OBJS_DEFAULT) --- > ifdef drvMrf_OBJS_DEFAULT > drvMrf_OBJS+=$(drvMrf_OBJS_DEFAULT) 263,264c263,264 < ifneq ($(strip $(mrfVme64x_LDFLAGS_$(OS_CLASS))),) < mrfVme64x_LDFLAGS+=$(subst -nil-,,$(mrfVme64x_LDFLAGS_$(OS_CLASS))) --- > ifneq ($(strip $(drvMrf_LDFLAGS_$(OS_CLASS))),) > drvMrf_LDFLAGS+=$(subst -nil-,,$(drvMrf_LDFLAGS_$(OS_CLASS))) 266,267c266,267 < ifdef mrfVme64x_LDFLAGS_DEFAULT < mrfVme64x_LDFLAGS+=$(mrfVme64x_LDFLAGS_DEFAULT) --- > ifdef drvMrf_LDFLAGS_DEFAULT > drvMrf_LDFLAGS+=$(drvMrf_LDFLAGS_DEFAULT) 270,271c270,271 < ifneq ($(strip $(mrfVme64x_OBJLIBS_$(OS_CLASS))),) < mrfVme64x_OBJLIBS+=$(subst -nil-,,$(mrfVme64x_OBJLIBS_$(OS_CLASS))) --- > ifneq ($(strip $(drvMrf_OBJLIBS_$(OS_CLASS))),) > drvMrf_OBJLIBS+=$(subst -nil-,,$(drvMrf_OBJLIBS_$(OS_CLASS))) 273,274c273,274 < ifdef mrfVme64x_OBJLIBS_DEFAULT < mrfVme64x_OBJLIBS+=$(mrfVme64x_OBJLIBS_DEFAULT) --- > ifdef drvMrf_OBJLIBS_DEFAULT > drvMrf_OBJLIBS+=$(drvMrf_OBJLIBS_DEFAULT) 277,278c277,278 < ifneq ($(strip $(mrfVme64x_LDOBJS_$(OS_CLASS))),) < mrfVme64x_LDOBJS+=$(subst -nil-,,$(mrfVme64x_LDOBJS_$(OS_CLASS))) --- > ifneq ($(strip $(drvMrf_LDOBJS_$(OS_CLASS))),) > drvMrf_LDOBJS+=$(subst -nil-,,$(drvMrf_LDOBJS_$(OS_CLASS))) 280,281c280,281 < ifdef mrfVme64x_LDOBJS_DEFAULT < mrfVme64x_LDOBJS+=$(mrfVme64x_LDOBJS_DEFAULT) --- > ifdef drvMrf_LDOBJS_DEFAULT > drvMrf_LDOBJS+=$(drvMrf_LDOBJS_DEFAULT) 284,286c284,286 < mrfVme64x_LDLIBS+=$(mrfVme64x_LIBS) < ifneq ($(strip $(mrfVme64x_LIBS_$(OS_CLASS))),) < mrfVme64x_LDLIBS+=$(subst -nil-,,$(mrfVme64x_LIBS_$(OS_CLASS))) --- > drvMrf_LDLIBS+=$(drvMrf_LIBS) > ifneq ($(strip $(drvMrf_LIBS_$(OS_CLASS))),) > drvMrf_LDLIBS+=$(subst -nil-,,$(drvMrf_LIBS_$(OS_CLASS))) 288,289c288,289 < ifdef mrfVme64x_LIBS_DEFAULT < mrfVme64x_LDLIBS+=$(mrfVme64x_LIBS_DEFAULT) --- > ifdef drvMrf_LIBS_DEFAULT > drvMrf_LDLIBS+=$(drvMrf_LIBS_DEFAULT) 292,293c292,293 < ifneq ($(strip $(mrfVme64x_SYS_LIBS_$(OS_CLASS))),) < mrfVme64x_SYS_LIBS+=$(subst -nil-,,$(mrfVme64x_SYS_LIBS_$(OS_CLASS))) --- > ifneq ($(strip $(drvMrf_SYS_LIBS_$(OS_CLASS))),) > drvMrf_SYS_LIBS+=$(subst -nil-,,$(drvMrf_SYS_LIBS_$(OS_CLASS))) 295,296c295,296 < ifdef mrfVme64x_SYS_LIBS_DEFAULT < mrfVme64x_SYS_LIBS+=$(mrfVme64x_SYS_LIBS_DEFAULT) --- > ifdef drvMrf_SYS_LIBS_DEFAULT > drvMrf_SYS_LIBS+=$(drvMrf_SYS_LIBS_DEFAULT) 299c299 < mrfVme64x_OBJS+=$(addsuffix $(OBJ),$(basename $(mrfVme64x_SRCS))) --- > drvMrf_OBJS+=$(addsuffix $(OBJ),$(basename $(drvMrf_SRCS))) 301,307c301,307 < ifeq ($(filter mrfVme64x,$(TESTPROD) $(PROD)),mrfVme64x) < ifeq (,$(strip $(mrfVme64x_OBJS) $(PRODUCT_OBJS))) < mrfVme64x_OBJS+=mrfVme64x$(OBJ) < endif < mrfVme64x_RESS+=$(addsuffix $(RES),$(basename $(mrfVme64x_RCS))) < mrfVme64x_OBJSNAME+=$(addsuffix $(OBJ),$(basename $(mrfVme64x_OBJS))) < mrfVme64x_DEPLIBS=$(foreach lib, $(mrfVme64x_LDLIBS),\ --- > ifeq ($(filter drvMrf,$(TESTPROD) $(PROD)),drvMrf) > ifeq (,$(strip $(drvMrf_OBJS) $(PRODUCT_OBJS))) > drvMrf_OBJS+=drvMrf$(OBJ) > endif > drvMrf_RESS+=$(addsuffix $(RES),$(basename $(drvMrf_RCS))) > drvMrf_OBJSNAME+=$(addsuffix $(OBJ),$(basename $(drvMrf_OBJS))) > drvMrf_DEPLIBS=$(foreach lib, $(drvMrf_LDLIBS),\ 312c312 < mrfVme64x$(EXE): $(mrfVme64x_OBJSNAME) $(mrfVme64x_RESS) $(mrfVme64x_DEPLIBS) --- > drvMrf$(EXE): $(drvMrf_OBJSNAME) $(drvMrf_RESS) $(drvMrf_DEPLIBS) 315,322c315,322 < ifeq ($(filter mrfVme64x,$(LIBRARY)),mrfVme64x) < ifneq ($(filter mrfVme64x,$(LOADABLE_LIBRARY)),mrfVme64x) < ifneq (,$(strip $(mrfVme64x_OBJS) $(LIBRARY_OBJS))) < BUILD_LIBRARY += mrfVme64x < endif < mrfVme64x_RESS+=$(addsuffix $(RES),$(basename $(mrfVme64x_RCS))) < mrfVme64x_OBJSNAME+=$(addsuffix $(OBJ),$(basename $(mrfVme64x_OBJS))) < mrfVme64x_DEPLIBS=$(foreach lib, $(mrfVme64x_LDLIBS),\ --- > ifeq ($(filter drvMrf,$(LIBRARY)),drvMrf) > ifneq ($(filter drvMrf,$(LOADABLE_LIBRARY)),drvMrf) > ifneq (,$(strip $(drvMrf_OBJS) $(LIBRARY_OBJS))) > BUILD_LIBRARY += drvMrf > endif > drvMrf_RESS+=$(addsuffix $(RES),$(basename $(drvMrf_RCS))) > drvMrf_OBJSNAME+=$(addsuffix $(OBJ),$(basename $(drvMrf_OBJS))) > drvMrf_DEPLIBS=$(foreach lib, $(drvMrf_LDLIBS),\ 327c327 < mrfVme64x_DLL_DEPLIBS=$(foreach lib, $(mrfVme64x_DLL_LIBS),\ --- > drvMrf_DLL_DEPLIBS=$(foreach lib, $(drvMrf_DLL_LIBS),\ 332,336c332,336 < $(LIB_PREFIX)mrfVme64x$(LIB_SUFFIX):$(mrfVme64x_OBJSNAME) $(mrfVme64x_RESS) < $(LIB_PREFIX)mrfVme64x$(LIB_SUFFIX):$(mrfVme64x_DEPLIBS) < $(LIB_PREFIX)mrfVme64x$(SHRLIB_SUFFIX):$(mrfVme64x_OBJSNAME) $(mrfVme64x_RESS) < $(LIB_PREFIX)mrfVme64x$(SHRLIB_SUFFIX):$(mrfVme64x_DEPLIBS) < $(LIB_PREFIX)mrfVme64x$(SHRLIB_SUFFIX):$(mrfVme64x_DLL_DEPLIBS) --- > $(LIB_PREFIX)drvMrf$(LIB_SUFFIX):$(drvMrf_OBJSNAME) $(drvMrf_RESS) > $(LIB_PREFIX)drvMrf$(LIB_SUFFIX):$(drvMrf_DEPLIBS) > $(LIB_PREFIX)drvMrf$(SHRLIB_SUFFIX):$(drvMrf_OBJSNAME) $(drvMrf_RESS) > $(LIB_PREFIX)drvMrf$(SHRLIB_SUFFIX):$(drvMrf_DEPLIBS) > $(LIB_PREFIX)drvMrf$(SHRLIB_SUFFIX):$(drvMrf_DLL_DEPLIBS) 339,345c339,345 < ifeq ($(filter mrfVme64x,$(LOADABLE_LIBRARY)),mrfVme64x) < ifneq (,$(strip $(mrfVme64x_OBJS) $(LIBRARY_OBJS))) < LOADABLE_BUILD_LIBRARY += mrfVme64x < endif < mrfVme64x_RESS+=$(addsuffix $(RES),$(basename $(mrfVme64x_RCS))) < mrfVme64x_OBJSNAME+=$(addsuffix $(OBJ),$(basename $(mrfVme64x_OBJS))) < mrfVme64x_DEPLIBS=$(foreach lib, $(mrfVme64x_LDLIBS),\ --- > ifeq ($(filter drvMrf,$(LOADABLE_LIBRARY)),drvMrf) > ifneq (,$(strip $(drvMrf_OBJS) $(LIBRARY_OBJS))) > LOADABLE_BUILD_LIBRARY += drvMrf > endif > drvMrf_RESS+=$(addsuffix $(RES),$(basename $(drvMrf_RCS))) > drvMrf_OBJSNAME+=$(addsuffix $(OBJ),$(basename $(drvMrf_OBJS))) > drvMrf_DEPLIBS=$(foreach lib, $(drvMrf_LDLIBS),\ 350c350 < mrfVme64x_DLL_DEPLIBS=$(foreach lib, $(mrfVme64x_DLL_LIBS),\ --- > drvMrf_DLL_DEPLIBS=$(foreach lib, $(drvMrf_DLL_LIBS),\ 355,357c355,357 < $(LOADABLE_SHRLIB_PREFIX)mrfVme64x$(LOADABLE_SHRLIB_SUFFIX):$(mrfVme64x_OBJSNAME) $(mrfVme64x_RESS) < $(LOADABLE_SHRLIB_PREFIX)mrfVme64x$(LOADABLE_SHRLIB_SUFFIX):$(mrfVme64x_DEPLIBS) < $(LOADABLE_SHRLIB_PREFIX)mrfVme64x$(LOADABLE_SHRLIB_SUFFIX):$(mrfVme64x_DLL_DEPLIBS) --- > $(LOADABLE_SHRLIB_PREFIX)drvMrf$(LOADABLE_SHRLIB_SUFFIX):$(drvMrf_OBJSNAME) $(drvMrf_RESS) > $(LOADABLE_SHRLIB_PREFIX)drvMrf$(LOADABLE_SHRLIB_SUFFIX):$(drvMrf_DEPLIBS) > $(LOADABLE_SHRLIB_PREFIX)drvMrf$(LOADABLE_SHRLIB_SUFFIX):$(drvMrf_DLL_DEPLIBS) diff -r src/O.RTEMS-beatnik/devLibPMC.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/devLibPMC.depends 3c3,8 < devLibPMC.o : ../debugPrint.h ../mrfCommon.h ../devLibPMC.h --- > devLibPMC.o : /reg/g/pcds/package/rtems/rtems-4.7.1/target/ssrlApps/powerpc-rtems/beatnik//include/bsp/bspExt.h > devLibPMC.o : ../debugPrint.h > devLibPMC.o : ../mrfCommon.h > devLibPMC.o : ../devLibPMC.h > devLibPMC.o : /reg/g/pcds/package/epics/3.14//modules/miscUtils/R1.0.2.1-0.3.0/include/basicIoOps.h > 5,8d9 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../debugPrint.h : < ../mrfCommon.h : < ../devLibPMC.h : Binary files src/O.RTEMS-beatnik/devLibPMC.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/devLibPMC.o differ Only in src/O.RTEMS-beatnik: devMrfEg.depends Only in src/O.RTEMS-beatnik: devMrfEg.o diff -r src/O.RTEMS-beatnik/devMrfEr.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/devMrfEr.depends 3,4c3,49 < devMrfEr.o : ../../../include/erRecord.h ../../../include/ereventRecord.h \ < ../erDefs.h ../devMrfEr.h ../drvMrfEr.h ../mrfCommon.h ../debugPrint.h --- > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsStdlib.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsStdio.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTypes.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsInterrupt.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsMutex.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/alarm.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccess.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbScan.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/devLib.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/devSup.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/ellLib.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errlog.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/recGbl.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/registryFunction.h > devMrfEr.o : ../../../include/erRecord.h > devMrfEr.o : ../../../include/ereventRecord.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/eventRecord.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/biRecord.h > devMrfEr.o : ../erDefs.h > devMrfEr.o : ../devMrfEr.h > devMrfEr.o : ../drvMrfEr.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsExport.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/shareLib.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdStrtod.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/compilerDependencies.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdInterrupt.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsAssert.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdMutex.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbDefs.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTime.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/caeventmask.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbFldTypes.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/link.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbBase.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAddr.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbLock.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccessDefs.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCa.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCommon.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/db_field_log.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdVME.h > devMrfEr.o : ../mrfCommon.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errMdef.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdTime.h > devMrfEr.o : ../debugPrint.h > devMrfEr.o : /reg/g/pcds/package/epics/3.14//modules/miscUtils/R1.0.2.1-0.3.0/include/basicIoOps.h > 6,13d50 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../../../include/erRecord.h : < ../../../include/ereventRecord.h : < ../erDefs.h : < ../devMrfEr.h : < ../drvMrfEr.h : < ../mrfCommon.h : < ../debugPrint.h : Binary files src/O.RTEMS-beatnik/devMrfEr.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/devMrfEr.o differ diff -r src/O.RTEMS-beatnik/drvMrfEg.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/drvMrfEg.depends 3,4c3,50 < drvMrfEg.o : ../mrfVme64x.h ../drvMrfEg.h ../../../include/egRecord.h \ < ../../../include/egeventRecord.h ../mrfCommon.h ../debugPrint.h --- > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsEvent.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsExport.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsStdlib.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsStdio.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTypes.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsInterrupt.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsMutex.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsThread.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccess.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbEvent.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/devLib.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/drvSup.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/ellLib.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errlog.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/registryFunction.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/iocsh.h > drvMrfEg.o : ../mrfVme64x.h > drvMrfEg.o : ../drvMrfEg.h > drvMrfEg.o : ../../../include/egRecord.h > drvMrfEg.o : ../../../include/egeventRecord.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsAssert.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/shareLib.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdEvent.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdStrtod.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/compilerDependencies.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdInterrupt.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdMutex.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdThread.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbDefs.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTime.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/caeventmask.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbFldTypes.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/link.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbBase.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAddr.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbLock.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccessDefs.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCa.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCommon.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/db_field_log.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdVME.h > drvMrfEg.o : ../mrfCommon.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbScan.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errMdef.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdTime.h > drvMrfEg.o : ../debugPrint.h > drvMrfEg.o : /reg/g/pcds/package/epics/3.14//modules/miscUtils/R1.0.2.1-0.3.0/include/basicIoOps.h > 6,12d51 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../mrfVme64x.h : < ../drvMrfEg.h : < ../../../include/egRecord.h : < ../../../include/egeventRecord.h : < ../mrfCommon.h : < ../debugPrint.h : Binary files src/O.RTEMS-beatnik/drvMrfEg.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/drvMrfEg.o differ diff -r src/O.RTEMS-beatnik/drvMrfEr.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/drvMrfEr.depends 3,4c3,37 < drvMrfEr.o : ../devLibPMC.h ../mrfVme64x.h ../drvMrfEr.h ../mrfCommon.h \ < ../debugPrint.h --- > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsStdlib.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsStdio.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTypes.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsInterrupt.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsMutex.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsThread.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsExit.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/devLib.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/drvSup.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/ellLib.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errlog.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/registryFunction.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/iocsh.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsExport.h > drvMrfEr.o : ../devLibPMC.h > drvMrfEr.o : ../mrfVme64x.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//modules/miscUtils/R1.0.2.1-0.3.0/include/basicIoOps.h > drvMrfEr.o : ../drvMrfEr.h > drvMrfEr.o : ../pci_mrfev.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/shareLib.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdStrtod.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/compilerDependencies.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdInterrupt.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsAssert.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdMutex.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsEvent.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdThread.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbDefs.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdVME.h > drvMrfEr.o : ../mrfCommon.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbScan.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdEvent.h > drvMrfEr.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errMdef.h > drvMrfEr.o : ../debugPrint.h > 6,11d38 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../devLibPMC.h : < ../mrfVme64x.h : < ../drvMrfEr.h : < ../mrfCommon.h : < ../debugPrint.h : Binary files src/O.RTEMS-beatnik/drvMrfEr.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/drvMrfEr.o differ diff -r src/O.RTEMS-beatnik/egRecord.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/egRecord.depends 3c3,40 < egRecord.o : ../../../include/egRecord.h ../egDefs.h --- > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsStdio.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbDefs.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsPrint.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/alarm.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccess.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbEvent.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbFldTypes.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/devSup.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errMdef.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/recSup.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/recGbl.h > egRecord.o : ../../../include/egRecord.h > egRecord.o : ../egDefs.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsExport.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/shareLib.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/compilerDependencies.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTypes.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errlog.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTime.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/caeventmask.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/link.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbBase.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAddr.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbLock.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccessDefs.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCa.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCommon.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/db_field_log.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsThread.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/ellLib.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsMutex.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdTime.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsEvent.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdThread.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsAssert.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdMutex.h > egRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdEvent.h > 5,7d41 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../../../include/egRecord.h : < ../egDefs.h : Binary files src/O.RTEMS-beatnik/egRecord.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/egRecord.o differ diff -r src/O.RTEMS-beatnik/egeventRecord.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/egeventRecord.depends 3,4c3,41 < egeventRecord.o : ../../../include/egRecord.h \ < ../../../include/egeventRecord.h ../egDefs.h --- > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsStdio.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbDefs.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsPrint.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/alarm.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccess.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbEvent.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbFldTypes.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/devSup.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errMdef.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/recSup.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/recGbl.h > egeventRecord.o : ../../../include/egRecord.h > egeventRecord.o : ../../../include/egeventRecord.h > egeventRecord.o : ../egDefs.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsExport.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/shareLib.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/compilerDependencies.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTypes.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errlog.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTime.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/caeventmask.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/link.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbBase.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAddr.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbLock.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccessDefs.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCa.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCommon.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/db_field_log.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsThread.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/ellLib.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsMutex.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdTime.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsEvent.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdThread.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsAssert.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdMutex.h > egeventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdEvent.h > 6,9d42 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../../../include/egRecord.h : < ../../../include/egeventRecord.h : < ../egDefs.h : Binary files src/O.RTEMS-beatnik/egeventRecord.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/egeventRecord.o differ diff -r src/O.RTEMS-beatnik/erRecord.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/erRecord.depends 3c3,40 < erRecord.o : ../erDefs.h ../../../include/erRecord.h --- > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsStdio.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbDefs.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsPrint.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/alarm.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccess.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbEvent.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbFldTypes.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/devSup.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errMdef.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/recSup.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/recGbl.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsExport.h > erRecord.o : ../erDefs.h > erRecord.o : ../../../include/erRecord.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/shareLib.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/compilerDependencies.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTypes.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errlog.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTime.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/caeventmask.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/link.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbBase.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAddr.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbLock.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccessDefs.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCa.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCommon.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/db_field_log.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsThread.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/ellLib.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsMutex.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdTime.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsEvent.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdThread.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsAssert.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdMutex.h > erRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdEvent.h > 5,7d41 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../erDefs.h : < ../../../include/erRecord.h : Binary files src/O.RTEMS-beatnik/erRecord.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/erRecord.o differ diff -r src/O.RTEMS-beatnik/ereventRecord.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/ereventRecord.depends 3c3,39 < ereventRecord.o : ../erDefs.h ../../../include/ereventRecord.h --- > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbDefs.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsPrint.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/alarm.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccess.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbEvent.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbFldTypes.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/devSup.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errMdef.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/recSup.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/recGbl.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsExport.h > ereventRecord.o : ../erDefs.h > ereventRecord.o : ../../../include/ereventRecord.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTypes.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/errlog.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/shareLib.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTime.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/caeventmask.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/link.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbBase.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAddr.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbLock.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbAccessDefs.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCa.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/dbCommon.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/db_field_log.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsThread.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/ellLib.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsMutex.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/compilerDependencies.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdTime.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsEvent.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdThread.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsAssert.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdMutex.h > ereventRecord.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdEvent.h > 5,7d40 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../erDefs.h : < ../../../include/ereventRecord.h : Binary files src/O.RTEMS-beatnik/ereventRecord.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/ereventRecord.o differ diff -r src/O.RTEMS-beatnik/evrEEPROMFixup.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/evrEEPROMFixup.depends 3a4,9 > evrEEPROMFixup.o : ../pci_mrfev.h > evrEEPROMFixup.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/registryFunction.h > evrEEPROMFixup.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/iocsh.h > evrEEPROMFixup.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsExport.h > evrEEPROMFixup.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/shareLib.h > 5,6d10 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../plx9080_eeprom.h : Binary files src/O.RTEMS-beatnik/evrEEPROMFixup.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/evrEEPROMFixup.o differ Binary files src/O.RTEMS-beatnik/libdevMrfEg.a and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/libdevMrfEg.a differ Binary files src/O.RTEMS-beatnik/libdevMrfEr.a and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/libdevMrfEr.a differ Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik: libdrvMrf.a Only in src/O.RTEMS-beatnik: libmrfVme64x.a diff -r src/O.RTEMS-beatnik/mrfVme64x.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/mrfVme64x.depends 3c3,15 < mrfVme64x.o : ../mrfVme64x.h ../mrfCommon.h ../debugPrint.h --- > mrfVme64x.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsStdlib.h > mrfVme64x.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsStdio.h > mrfVme64x.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTypes.h > mrfVme64x.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsExport.h > mrfVme64x.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/iocsh.h > mrfVme64x.o : ../mrfVme64x.h > mrfVme64x.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/shareLib.h > mrfVme64x.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/os/RTEMS/osdStrtod.h > mrfVme64x.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/compilerDependencies.h > mrfVme64x.o : ../mrfCommon.h > mrfVme64x.o : ../debugPrint.h > mrfVme64x.o : /reg/g/pcds/package/epics/3.14//modules/miscUtils/R1.0.2.1-0.3.0/include/basicIoOps.h > 5,8d16 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../mrfVme64x.h : < ../mrfCommon.h : < ../debugPrint.h : Binary files src/O.RTEMS-beatnik/mrfVme64x.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/mrfVme64x.o differ diff -r src/O.RTEMS-beatnik/plx9080_eeprom.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/plx9080_eeprom.depends 5,6c5 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../plx9080_eeprom.h : --- > Binary files src/O.RTEMS-beatnik/plx9080_eeprom.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/plx9080_eeprom.o differ diff -r src/O.RTEMS-beatnik/vmeCSRMemProbeB.depends /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/vmeCSRMemProbeB.depends 3c3,10 < vmeCSRMemProbeB.o : ../debugPrint.h ../mrfVme64x.h ../mrfCommon.h --- > vmeCSRMemProbeB.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/epicsTypes.h > vmeCSRMemProbeB.o : ../debugPrint.h > vmeCSRMemProbeB.o : /reg/g/pcds/package/rtems/rtems-4.7.1/target/ssrlApps/powerpc-rtems/beatnik//include/bsp/bspExt.h > vmeCSRMemProbeB.o : ../mrfVme64x.h > vmeCSRMemProbeB.o : /reg/g/pcds/package/epics/3.14//base/R3.14.9-0.2.0/include/shareLib.h > vmeCSRMemProbeB.o : ../mrfCommon.h > vmeCSRMemProbeB.o : /reg/g/pcds/package/epics/3.14//modules/miscUtils/R1.0.2.1-0.3.0/include/basicIoOps.h > 5,8d11 < #Depend files must be targets to avoid 'No rule to make target ...' errors < ../debugPrint.h : < ../mrfVme64x.h : < ../mrfCommon.h : Binary files src/O.RTEMS-beatnik/vmeCSRMemProbeB.o and /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.RTEMS-beatnik/vmeCSRMemProbeB.o differ Only in src: O.RTEMS-uC5282 Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: MakefileInclude Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: devMrfEr.depends Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: devMrfEr.o Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: drvLinux.depends Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: drvLinux.o Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: drvLinuxEvg.depends Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: drvLinuxEvg.o Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: drvLinuxEvr.depends Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: drvLinuxEvr.o Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: egRecord.depends Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: egRecord.o Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: egeventRecord.depends Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: egeventRecord.o Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: erRecord.depends Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: erRecord.o Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: ereventRecord.depends Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: ereventRecord.o Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: libdevMrfEg.a Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: libdevMrfEg.so Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: libdevMrfEr.a Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: libdevMrfEr.so Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: libdrvMrf.a Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/O.linux-x86: libdrvMrf.so Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src: O.linux-x86_64 diff -r src/devMrfEr.c /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/devMrfEr.c 192c192 < "devMrfEr::ErInitErRec() onlyone record allowed per card"); --- > "devMrfEr::ErInitErRec() only one record allowed per card"); 302a303,311 > * Update the delayed pulse generator outputs first > * Set the programmable delay (DG) output parameters (Enable, Delay, Width, Prescaler, Polarity) > */ > ErSetDg (pCard, 0, pRec->dg0e, pRec->dg0d, pRec->dg0w, pRec->dg0c, pRec->dg0p); > ErSetDg (pCard, 1, pRec->dg1e, pRec->dg1d, pRec->dg1w, pRec->dg1c, pRec->dg1p); > ErSetDg (pCard, 2, pRec->dg2e, pRec->dg2d, pRec->dg2w, pRec->dg2c, pRec->dg2p); > ErSetDg (pCard, 3, pRec->dg3e, pRec->dg3d, pRec->dg3w, pRec->dg3c, pRec->dg3p); > > /*--------------------- 360,367d368 < * Set the programmable delay (DG) output parameters (Enable, Delay, Width, Prescaler, Polarity) < */ < ErSetDg (pCard, 0, pRec->dg0e, pRec->dg0d, pRec->dg0w, pRec->dg0c, pRec->dg0p); < ErSetDg (pCard, 1, pRec->dg1e, pRec->dg1d, pRec->dg1w, pRec->dg1c, pRec->dg1p); < ErSetDg (pCard, 2, pRec->dg2e, pRec->dg2d, pRec->dg2w, pRec->dg2c, pRec->dg2p); < ErSetDg (pCard, 3, pRec->dg3e, pRec->dg3d, pRec->dg3w, pRec->dg3c, pRec->dg3p); < < /*--------------------- 1115c1116 < if(ErDebug) { --- > if(ErDebug > 2) { diff -r src/drvLinuxEvr.c /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/drvLinuxEvr.c 1c1,2 < /* This code is a dummy implementation of the mrfApp EVR/EVG driver code --- > /* > * This code is a linux implementation of the mrfApp EVR driver code 3,4c4,7 < * Copyright 2008, Stanford University < * Author: Remi Machet --- > * Copyright 2010, Stanford University > * Authors: > * Remi Machet > * Bruce Hill 10a14 > #undef EVR_MAX_BUFFER 39c43,44 < enum outputs_mapping_id { --- > enum outputs_mapping_id > { 68c73,74 < enum transition_board_channel { --- > enum transition_board_channel > { 106,111c112,118 < struct PulseInfo { < epicsBoolean DBusEnable; /* Set if the DBus is used instead of Pulse */ < epicsBoolean Enable; /* Should a pulse generator be used */ < epicsUInt32 Delay; /* Desired delay */ < epicsUInt32 Width; /* Desired width */ < epicsBoolean Pol; /* Desired polarity */ --- > struct PulseInfo > { > epicsBoolean DBusEnable; /* Set if the DBus is used instead of Pulse */ > epicsBoolean Enable; /* Should a pulse generator be used */ > epicsUInt32 Delay; /* Desired delay */ > epicsUInt32 Width; /* Desired width */ > epicsBoolean Pol; /* Desired polarity */ 114,115c121,123 < struct LinuxErCardStruct { < struct ErCardStruct ErCard; --- > struct LinuxErCardStruct > { > struct ErCardStruct ErCard; 117,118c125,126 < a common set of ressources, we need to keep track of them */ < struct PulseInfo OTP[EVR_NUM_OTP]; --- > a common set of resources, we need to keep track of them */ > struct PulseInfo OTP[EVR_NUM_OTP]; 120,122c128,130 < enum outputs_mapping_id tb_channel[TOTAL_TB_CHANNELS]; < enum transition_board_channel fp_channel[TOTAL_FP_CHANNELS]; < enum outputs_mapping_id pulse_irq; --- > enum outputs_mapping_id tb_channel[TOTAL_TB_CHANNELS]; > enum transition_board_channel fp_channel[TOTAL_FP_CHANNELS]; > enum outputs_mapping_id pulse_irq; 148a157,185 > char * FormFactorToString( int formFactor ) > { > char * pString; > switch ( formFactor ) > { > default: pString = "Invalid"; break; > case PMC_EVR: pString = "PMC_EVR"; break; > case CPCI_EVR: pString = "cPCI_EVR"; break; > case VME_EVR: pString = "VME_EVR"; break; > } > return pString; > } > > > int ErGetFormFactor( struct MrfErRegs * pEr ) > { > int formFactor; > int id = (be32_to_cpu(pEr->FPGAVersion)>>24) & 0x0F; > switch ( id ) > { > case 0x1: formFactor = PMC_EVR; break; > case 0x0: formFactor = CPCI_EVR; break; > case 0x2: formFactor = VME_EVR; break; > default: formFactor = -1; break; > } > return formFactor; > } > > 154c191 < for(pulse = PULSE_GENERATOR_0; pulse <= PULSE_GENERATOR_9; pulse++) { --- > for(pulse = PULSE_GENERATOR_4; pulse <= PULSE_GENERATOR_9; pulse++) { 162a200,201 > if ( ErDebug >= 1 ) > printf( "%s: Pulse %d is available.\n", __func__, pulse - PULSE_GENERATOR_0 ); 176,177c215,217 < if(channel >= 32) /* just in case someone would call this API with a value < that is valid for FP but has no meaning as a TB output */ --- > /* just in case someone would call this API with a value > that is valid for FP but has no meaning as a TB output */ > if(channel >= 32) 181c221,229 < EvrSetFPOutMap(pLinuxErCard->ErCard.pEr, fp, pLinuxErCard->tb_channel[channel]); --- > if(pLinuxErCard->ErCard.FormFactor == PMC_EVR) > { > if ( ErDebug >= 1 ) > printf( "%s: Calling EvrSetFPOutMap for ch %d to pulse %d\n", __func__, > channel, pLinuxErCard->tb_channel[channel] ); > EvrSetFPOutMap(pLinuxErCard->ErCard.pEr, fp, pLinuxErCard->tb_channel[channel]); > } > if(pLinuxErCard->ErCard.FormFactor == CPCI_EVR) > EvrSetUnivOutMap(pLinuxErCard->ErCard.pEr, fp, pLinuxErCard->tb_channel[channel]); 355c403,404 < int ret, fdEvr, id; --- > int ret, fdEvr; > int actualFormFactor; 359a409 > u32 FPGAVersion; 398a449,470 > > /* Check the firmware version */ > FPGAVersion = be32_to_cpu(pEr->FPGAVersion); > printf( "PMC EVR Found with Firmware Revision 0x%04X\n", FPGAVersion ); > switch ( FPGAVersion ) > { > default: > printf( "ErConfigure: WARNING: Unknown firmware revision on PMC EVR!\n" ); > break; > case PMC_EVR_FIRMWARE_REV_LINUX1: > case PMC_EVR_FIRMWARE_REV_LINUX2: > case PMC_EVR_FIRMWARE_REV_LINUX3: > break; > case PMC_EVR_FIRMWARE_REV_VME1: > fprintf ( stderr, > "\nErConfigure ERROR: This PMC EVR has firmware for a linux based system\n" > "and cannot be used under RTEMS!\n" ); > EvrClose(fdEvr); > epicsMutexUnlock(ErCardListLock); > return ERROR; > } > 400,401c472,473 < if((be32_to_cpu(pEr->FPGAVersion)>>28) != 0x1) { < errlogPrintf("%s: invalid hardware signature: 0x%08x.\n", __func__, be32_to_cpu(pEr->FPGAVersion)); --- > if(( FPGAVersion >>28) != 0x1) { > errlogPrintf("%s: invalid hardware signature: 0x%08x.\n", __func__, FPGAVersion ); 405a478 > 407,422c480,484 < id = (be32_to_cpu(pEr->FPGAVersion)>>24) & 0x0F; < switch(FormFactor) { < case PMC_EVR: < if(id != 0x1) < ret = -1; < break; < case CPCI_EVR: < if(id != 0x0) < ret = -1; < break; < case VME_EVR: < if(id != 0x2) < ret = -1; < break; < default: < ret = -1; --- > actualFormFactor = ErGetFormFactor( pEr ); > if ( FormFactor == actualFormFactor ) > { > printf( "Found a %s %s\n", > FormFactorToString( FormFactor ), strDevice ); 424c486,490 < if (ret < 0) { --- > else > { > printf( "Configured for %s form factor, but %s has %s form factor.\n", > FormFactorToString( FormFactor ), strDevice, > FormFactorToString( actualFormFactor ) ); 463d528 < EvrIrqAssignHandler(pEr, fdEvr, ErIrqHandler); 464a530 > EvrIrqAssignHandler(pEr, fdEvr, ErIrqHandler); 509c575 < |* 0: Now debug output produced. --- > |* 0: No debug output produced. 744c810,813 < --- > > if ( pEr == NULL ) > errlogPrintf( "%s: NULL EVR structure pointer\n", __func__ ); > 750a820,850 > |* ErGetSecondsSR () -- Return the Event Receiver's Unlatched Seconds Register > |*------------------------------------------------------------------------------------------------- > |* > |* Read the unlatched timestamp "seconds" from the Event Receiver's SecondsSR register. > |* > |*------------------------------------------------------------------------------------------------- > |* CALLING SEQUENCE: > |* version = ErGetSecondsSR (pCard); > |* > |*------------------------------------------------------------------------------------------------- > |* INPUT PARAMETERS: > |* pCard = (ErCardStruct *) Pointer to the Event Receiver card structure. > |* > |*------------------------------------------------------------------------------------------------- > |* RETURNS: > |* seconds = (epicsUInt16) The timestamp "seconds" of the requested Event Receiver Card. > |* > \**************************************************************************************************/ > > GLOBAL_RTN > epicsUInt32 ErGetSecondsSR (ErCardStruct *pCard) > { > struct MrfErRegs * pEr = (struct MrfErRegs *)pCard->pEr; > > /* no need for a lock, this is a read only register */ > epicsUInt32 secondsSR = be32_to_cpu(pEr->SecondsShift); > return secondsSR; > > }/*end ErGetSecondsSR()*/ > > /************************************************************************************************** 1005,1006c1105,1113 < < if(Channel >= EVR_NUM_DG) { --- > > if ( ErDebug >= 1 ) > printf( "%s: EVR %d-%d %s DG %d: pre=%u, del=%u, wid=%u, pol=%s.\n", > __func__, pCard->Cardno, pCard->Slot, > ( Enable ? "Enable" : "Disable" ), > Channel, Prescaler, Delay, Width, > ( Pol ? "Nml" : "Inv" ) ); > > if( Channel < 0 || Channel >= EVR_NUM_DG ) { 1010c1117 < --- > 1017c1124 < pulse = find_free_pulsegen(pLinuxErCard); --- > pulse = Channel; /* pulse = find_free_pulsegen(pLinuxErCard); */ 1021c1128 < errlogPrintf("%s: reached max number of pulse generator.\n", __func__); --- > errlogPrintf("%s: No free pulse generators! Wrong template?\n", __func__); 1042c1149,1153 < } --- > } > > if ( ErDebug >= 2 ) > EvrDumpPulses( pEr, 10 ); > 1070a1182,1187 > if ( ErDebug >= 1 ) > printf( "%s: EVR %d-%d %s D-IRQ: del=%u, pre=%u.\n", > __func__, pCard->Cardno, pCard->Slot, > ( Enable ? "Enable" : "Disable" ), > Delay, Prescaler ); > 1078c1195 < errlogPrintf("%s: reached max number of pulse generator.\n", __func__); --- > errlogPrintf("%s: No free pulse generators! Wrong template?\n", __func__); 1167a1285,1290 > if ( ErDebug >= 1 ) > printf( "%s: EVR %d-%d %s OTB %d\n", > __func__, pCard->Cardno, pCard->Slot, > ( Enable ? "Enable" : "Disable" ), > Channel ); > 1177,1180c1300,1303 < ErSetOtp(pCard, Channel, pLinuxErCard->OTP[Channel].Enable, < pLinuxErCard->OTP[Channel].Delay, < pLinuxErCard->OTP[Channel].Width, < pLinuxErCard->OTP[Channel].Pol); --- > ErSetOtp( pCard, Channel, pLinuxErCard->OTP[Channel].Enable, > pLinuxErCard->OTP[Channel].Delay, > pLinuxErCard->OTP[Channel].Width, > pLinuxErCard->OTP[Channel].Pol ); 1225c1348 < errlogPrintf("%s: reached max number of pulse generator.\n", __func__); --- > errlogPrintf("%s: No free pulse generators! Wrong template?\n", __func__); 1250,1254d1372 < void ErSetOtp( < < /***********************************************************************************************/ < /* Parameter Declarations */ < /***********************************************************************************************/ 1255a1374,1377 > /** ErSetOtp > * Enable or disable a Programmable Width (OTP) channel > ***********************************************************************************************/ > void ErSetOtp( 1257c1379 < int Channel, /* Channel number of the OTP channel to set */ --- > int Channel, /* Channel number (0-13) of the OTP channel */ 1267,1268c1389,1397 < < if(Channel >= EVR_NUM_OTP) { --- > > if ( ErDebug >= 1 ) > printf( "%s: EVR %d-%d %s OTP%d: del=%u, wid=%u, pol=%s.\n", > __func__, pCard->Cardno, pCard->Slot, > ( Enable ? "Enable" : "Disable" ), > Channel, Delay, Width, > ( Pol ? "Nml" : "Inv" ) ); > > if( Channel < 0 || Channel >= EVR_NUM_OTP ) { 1290c1419 < errlogPrintf("%s: reached max number of pulse generator.\n", __func__); --- > errlogPrintf("%s: No free pulse generators! Wrong template?\n", __func__); 1322a1452,1457 > > if ( ErDebug >= 1 ) > printf( "%s: EVR %d-%d %s Trg %d.\n", > __func__, pCard->Cardno, pCard->Slot, > ( Enable ? "Enable" : "Disable" ), > Channel ); 1324c1459 < if(Channel >= EVR_NUM_TRG) { --- > if ( Channel < 0 || Channel >= EVR_NUM_TRG ) { 1328c1463 < --- > 1342c1477 < errlogPrintf("%s: reached max number of pulse generator.\n", __func__); --- > errlogPrintf("%s: No free pulse generators! Wrong template?\n", __func__); 1346c1481 < EvrSetPulseParams(pEr, pulse, 1, 0, 0); --- > EvrSetPulseParams(pEr, pulse, 0, 0, 0); 1554c1689 < printf(" Form factor %d.\n", EvrGetFormFactor(pEr)); --- > printf(" Form factor %s.\n", FormFactorToString( ErGetFormFactor(pEr) ) ); 1557,1558c1692,1697 < printf (" %s, ", ErMasterEnableGet(pCard)? "Enabled" : "Disabled"); < printf (" %d Frame Errors\n", pCard->RxvioCount); --- > printf (" %s, ", ErMasterEnableGet(pCard)? "Enabled" : "Disabled"); > printf (" %d Frame Errors\n", pCard->RxvioCount); > EvrDumpStatus( pEr ); > EvrDumpPulses( pEr, 10 ); > EvrDumpFPOutMap( pEr, 3 ); > EvrDumpTBOutMap( pEr, 3 ); 1619c1758,1759 < drvet drvMrf200Er = { --- > drvet drvMrf200Er = > { 1647c1787,1788 < LOCAL_RTN void ErConfigureCall(const iocshArgBuf * args) { --- > LOCAL_RTN void ErConfigureCall(const iocshArgBuf * args) > { 1658c1799,1800 < LOCAL_RTN void ErDebugLevelCall(const iocshArgBuf * args) { --- > LOCAL_RTN void ErDebugLevelCall(const iocshArgBuf * args) > { 1661a1804,1813 > /* iocsh command: ErDrvReport */ > LOCAL const iocshArg ErDrvReportArg0 = {"Level" , iocshArgInt}; > LOCAL const iocshArg *const ErDrvReportArgs[1] = {&ErDrvReportArg0}; > LOCAL const iocshFuncDef ErDrvReportDef = {"ErDrvReport", 1, ErDrvReportArgs}; > > LOCAL_RTN void ErDrvReportCall(const iocshArgBuf * args) > { > ErDrvReport((epicsInt32)args[0].ival); > } > 1663c1815,1816 < LOCAL void drvMrfErRegister() { --- > LOCAL void drvMrfErRegister() > { 1668,1669c1821,1823 < iocshRegister(&ErConfigureDef, ErConfigureCall); < iocshRegister(&ErDebugLevelDef, ErDebugLevelCall); --- > iocshRegister( &ErConfigureDef, ErConfigureCall ); > iocshRegister( &ErDebugLevelDef, ErDebugLevelCall ); > iocshRegister( &ErDrvReportDef, ErDrvReportCall ); diff -r src/drvMrfEg.c /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/drvMrfEg.c 70,72d69 < /* NOT REACHING drvMrfEg.h FOR SOME REASON < #define EVG_DRIVER_SUPPORT_MODULE Indicates we are in the driver support module environment */ < 459c456,461 < MRF_VME_REG32_WRITE(&pEvg->FracDivControl, FR_SYNTH_WORD); --- > MRF_VME_REG16_WRITE(&pEvg->Control, 0x8000); /* Disable all local event generation */ > /* Do not re-program the SY87729L unless necessary to avoid glitches */ > if(MRF_VME_REG32_READ(&pEvg->FracDivControl) != FR_SYNTH_WORD) { > MRF_VME_REG32_WRITE(&pEvg->FracDivControl, FR_SYNTH_WORD); > usleep(100); > } 467c469,470 < ellAdd (&EgCardList, &pCard->Link); /* NEW 3/30/06 */ --- > ellAdd (&EgCardList, &pCard->Link); > EgResetAll(pCard); 497c500 < int dummy; /*trick to flush bridge pipeline*/ --- > int dummy; /*trick to flush bridge pipeline*/ 546c549 < --- > 964a968,972 > volatile unsigned short *pAddr; > volatile unsigned int *pTime; > volatile unsigned short *pData; > volatile int dummy; /*trick to flush bridge pipeline*/ > int i; 974a983,985 > pAddr = &pEg->Seq1Addr; > pTime = &pEg->Seq1Time; > pData = &pEg->Seq1Data; 984a996,1007 > pAddr = &pEg->Seq2Addr; > pTime = &pEg->Seq2Time; > pData = &pEg->Seq2Data; > } > else return ERROR; > for(i=0; iMaxRamPos; i++) > { > /* put the record's event code into the RAM */ > MRF_VME_REG16_WRITE(pAddr, i); > dummy = MRF_VME_DUMMY_READ(pAddr); > MRF_VME_REG32_WRITE(pTime, 0); > MRF_VME_REG16_WRITE(pData, 0); 1312,1313c1335,1336 < Addr &= 0x0fff8; /* high word select */ < Addr |= j; --- > Addr &= 0x0fff0; > Addr |= 0x8 | j; /* high word select */ 1336c1359 < MRF_VME_REG16_READ(&pEg->MuxCountSelect)&0xfff7); /* high word clear */ --- > MRF_VME_REG16_READ(&pEg->MuxCountSelect)&0xfff0); /* high word clear */ 2034a2058 > printf("xhh - read register at hex address hh\n"); 2080a2105,2107 > case 'x': > printf("Register 0x%02lx: 0x%04x.\n",strtol(buf+1, (char **)NULL, 16),MRF_VME_REG16_READ((epicsUInt32)pCard->pEg + strtol(buf+1, (char **)NULL, 16))); > break; 2170a2198 > volatile int dummy; /*trick to flush bridge pipeline*/ 2176a2205 > dummy = MRF_VME_DUMMY_READ(address); 2180a2210 > dummy = MRF_VME_DUMMY_READ(address); diff -r src/drvMrfEr.c /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/drvMrfEr.c 111c111 < #include /* for out_le16, in_le16 */ --- > #include "basicIoOps.h" /* for out_le16, in_le16 */ 112a113,114 > #include "pci_mrfev.h" /* MRF PCI device id's */ > 342,344d343 < #ifndef PCI_DEVICE_ID_MRF_EVR200 < #define PCI_DEVICE_ID_MRF_EVR200 (0x10c8) /* as per email Jukka Pietarinen to TSS, 2/7/7 */ < #endif 843a843 > epicsUInt16 FPGAVersion; /* FPGA Firmware Version Number */ 1083c1083 < { int plx, unit; --- > { 1085,1088c1085,1087 < < plx = 0; < unit = 0; < DeviceId = PCI_DEVICE_ID_MRF_EVR200; --- > epicsUInt32 subIdEvr200 = ( PCI_DEVICE_ID_MRF_PMCEVR200 << 16 ) | VendorId; > epicsUInt32 subIdEvr230 = ( PCI_DEVICE_ID_MRF_PMCEVR230 << 16 ) | VendorId; > int unit = 0; 1090c1089 < if (epicsPciFindDevice(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, plx, &pciBusNo, &pciDevNo, &pciFuncNo) == ERROR) { --- > if (epicsPciFindDevice(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, unit, &pciBusNo, &pciDevNo, &pciFuncNo) == ERROR) { 1093,1094c1092,1093 < ("ErConfigure: epicsPciFindDevice unable to find match for subsystem vendorid %d, device %d and instance #%d.\n", < VendorId, DeviceId, Card)); --- > ("ErConfigure: epicsPciFindDevice unable to find EVR's PLX9030 vendorid 0x%04X, device 0x%04X.\n", > VendorId, DeviceId )); 1102,1104c1101,1116 < plx++; < } while ( (subId != ((DeviceId << 16) | VendorId)) || < (unit++ < ErPMCCount) ); --- > if ( subId == subIdEvr200 > || subId == subIdEvr230 ) { > if ( unit < ErPMCCount ) > /* Skip units we've already found */ > continue; > > /* Found PMC EVR! */ > printf( "ErConfigure: Found PMC EVR with subsystem vendor ID 0x%04X and device ID 0x%04X.\n", > (subId & 0xFFFF ), (subId >> 16) ); > break; > } > else { > printf( "ErConfigure: PLX9030 found but subsystem vendor ID 0x%04X and device ID 0x%04X is not an EVR.\n", > (subId & 0xFFFF ), (subId >> 16) ); > } > } while ( 1 ); 1218a1231,1253 > /* > * Check the firmware version > */ > FPGAVersion = ErGetFpgaVersion(pCard); > printf( "PMC EVR Found with Firmware Revision 0x%04X\n", FPGAVersion ); > switch ( FPGAVersion ) > { > default: > printf( "ErConfigure: WARNING: Unknown firmware revision on PMC EVR!\n" ); > break; > case PMC_EVR_FIRMWARE_REV_VME1: > break; > case (PMC_EVR_FIRMWARE_REV_LINUX1 & 0xFFFF): /* VME Firmware field is only 16 bits */ > case (PMC_EVR_FIRMWARE_REV_LINUX2 & 0xFFFF): /* VME Firmware field is only 16 bits */ > case (PMC_EVR_FIRMWARE_REV_LINUX3 & 0xFFFF): /* VME Firmware field is only 16 bits */ > fprintf ( stderr, > "\nErConfigure ERROR: This PMC EVR has firmware for a linux\n" > "based system and cannot be used under RTEMS!\n" ); > epicsMutexDestroy (pCard->CardLock); > free (pCard); > return ERROR; > } > diff -r src/drvMrfEr.h /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/drvMrfEr.h 71a72,94 > > /* > * Firmware revisions > */ > > /* > * This firmware revision has been verified to use the VME compatible > * register map and work with drvMrfEr.c > */ > #define PMC_EVR_FIRMWARE_REV_VME1 0xF305 > > /* > * These firmware revisions are known to use the modular memory map > * and are intended for use on linux based systems with drvLinuxEvr.c > */ > #define PMC_EVR_FIRMWARE_REV_LINUX1 0x11000002 > #define PMC_EVR_FIRMWARE_REV_LINUX2 0x11000003 > #define PMC_EVR_FIRMWARE_REV_LINUX3 0x11000103 > > /**************************************************************************************************/ > /* Configuration Constants */ > /**************************************************************************************************/ > diff -r src/evrEEPROMFixup.c /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/evrEEPROMFixup.c 1a2 > #ifdef RTEMS 2a4,5 > #endif /* RTEMS */ > 4d6 < #include 6c8,10 < #endif --- > #include > #endif /* PCI */ > 21,22c25,26 < #ifndef PCI_DEVICE_ID_MRF_EVR200 < #define PCI_DEVICE_ID_MRF_EVR200 0x10c8 --- > #ifndef PCI_DEVICE_ID_MRF_PMCEVR200 > #define PCI_DEVICE_ID_MRF_PMCEVR200 0x10c8 41,42c45,52 < if ( PCI_DEVICE_ID_MRF_EVR200 == ssdid && PCI_VENDOR_ID_MRF == ssvid ) { < fprintf(stderr,"EVR EEPROM Contents already OK, leaving now.\n"); --- > if ( PCI_DEVICE_ID_MRF_PMCEVR200 == ssdid && PCI_VENDOR_ID_MRF == ssvid ) { > fprintf( stderr, "Subsystem vendor and device ID match PMC EVR-200\n" ); > fprintf( stderr, "EVR EEPROM ID's already OK, leaving now.\n"); > return 0; > } > if ( PCI_DEVICE_ID_MRF_PMCEVR230 == ssdid && PCI_VENDOR_ID_MRF == ssvid ) { > fprintf( stderr, "Subsystem vendor and device ID match PMC EVR-230\n" ); > fprintf( stderr, "EVR EEPROM ID's already OK, leaving now.\n"); 46,47c56,58 < fprintf(stderr,"Subsystem vendor/device ID in EEPROM has already\n"); < fprintf(stderr,"been programmed: SSVID 0x%04x/SSDID 0x%04x.\n", ssvid, ssdid); --- > fprintf(stderr,"Subsystem vendor ID 0x%04X and device ID 0x%04X in PLX9030 EEPROM\n", > ssvid, ssdid); > fprintf(stderr,"do not match known PMC EVR models.\n" ); 50a62,65 > else { > fprintf( stderr, "Subsystem vendor and device ID match generic unflashed PMC EVR\n" ); > fprintf(stderr, "EEPROM needs fixup ...\n"); > } 58,60c73,75 < fprintf(stderr, "> Writing EVR id (0x%04x) to EEPROM SSDID\n", PCI_DEVICE_ID_MRF_EVR200); < x = plx9080_ee_write(PLX9030_EE_OFFSET_SSDID, PCI_DEVICE_ID_MRF_EVR200); < if ( PCI_DEVICE_ID_MRF_EVR200 != x ) --- > fprintf(stderr, "> Writing EVR id (0x%04x) to EEPROM SSDID\n", PCI_DEVICE_ID_MRF_PMCEVR200); > x = plx9080_ee_write(PLX9030_EE_OFFSET_SSDID, PCI_DEVICE_ID_MRF_PMCEVR200); > if ( PCI_DEVICE_ID_MRF_PMCEVR200 != x ) Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src: evrEEPROMFixup.h Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/os: .svn Only in src/os: CVS Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/os/RTEMS: .svn Only in src/os/RTEMS: CVS Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/os/vxWorks: .svn Only in src/os/vxWorks: CVS Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src: pci_mrfev.h diff -r src/plx9080_eeprom.c /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/plx9080_eeprom.c 9a10 > #ifdef RTEMS 12a14 > #endif /* RTEMS */ diff -r src/plx9080_eeprom.h /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src/plx9080_eeprom.h 5a6 > 6a8,9 > > #ifdef RTEMS 7a11,15 > #endif /* RTEMS */ > > #ifdef linux > #include "linux/pci_ids.h" > #else 8a17 > #endif /* linux */