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 25,26d24 < MRFAPI_DIR = ../../mrfApi/O.linux-x86 < 31c29,30 < #USR_CFLAGS += -pedantic --- > # Don't use -O0 for RTEMS as it generates undef references to in_be16() > #USR_CFLAGS_Linux += -O0 72,77c71,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 80,84c78,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 95,96c96,97 < PROD_IOC_vxWorks += devMrfErLib < LIBRARY_IOC_RTEMS += devMrfEr --- > PROD_IOC_vxWorks += devMrfErLib > LIBRARY_IOC_RTEMS += devMrfEr 99,100c100 < LIBRARY_IOC_Linux += devMrfEr < devMrfEr_OBJS_Linux += drvLinuxEvr --- > LIBRARY_IOC_Linux += devMrfEr 102a103,108 > # Source objects for Event Receiver Library > devMrfEr_OBJS += devMrfEr > devMrfEr_OBJS += erRecord > devMrfEr_OBJS += ereventRecord > > # RTEMS source 104,105d109 < devMrfEr_OBJS_vxWorks += drvMrfEr < devMrfEr_OBJS += devMrfEr 108a113,118 > devMrfEr_OBJS_RTEMS += evrEEPROMFixup > endif > > # VxWorks source > devMrfEr_OBJS_vxWorks += drvMrfEr > ifeq ($(BSP_SUPPORTS_PCI), YES) 111c121,126 < devMrfEr_OBJS_RTEMS += evrEEPROMFixup --- > devMrfEr_OBJS_vxWorks += evrEEPROMFixup > endif > > # Linux source > ifeq ($(EVR_DRIVER_SUPPORT_LINUX), YES) > devMrfEr_OBJS_Linux += drvLinuxEvr 113,114d127 < devMrfEr_OBJS += erRecord < devMrfEr_OBJS += ereventRecord 122c135 < # Build the Library for Accessing VME-64X CR/CSR space --- > # Build the Library for the MRF driver level access 124,126c137,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) 128,131c150,151 < LIBRARY_IOC_Linux += drvMrf < drvMrf_OBJS_Linux += drvLinux < #drvMrf_OBJS_Linux += mrfApi < drvMrf_OBJS_Linux += $(MRFAPI_DIR)/erapi.o --- > drvMrf_OBJS_Linux += drvLinux > drvMrfLib_LIBS_Linux+= mrfApi 134,137c154 < mrfVme64x_OBJS_RTEMS += mrfVme64x < mrfVme64x_OBJS_vxWorks += mrfVme64x < mrfVme64x_OBJS_RTEMS += $(CRCSR_PROBE_NAME) < mrfVme64x_OBJS_vxWorks += $(CRCSR_PROBE_NAME) --- > drvMrfLib_OBJS += $(drvMrf_OBJS) 139c156 < mrfVme64xLib_OBJS += $(mrfVme64x_OBJS) --- > OBJS_IOC_vxWorks += $(drvMrf_OBJS) 141d157 < OBJS_IOC_vxWorks += $(mrfVme64x_OBJS) Only in src: Makefile.save Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src: O.Common Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src: O.RTEMS-beatnik Only in /scratch/lcls/epics/mrfLinux/event/R3.2.0-0.4.0/mrfApp/src: O.linux-x86 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) { Only in src: drvLinuxEvr.c~ 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 */ > /**************************************************************************************************/ > Only in src: erapi.depends Only in src: erapi.o 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 */