detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 03:25:13 +01:00
Code Issues Actions Packages Releases Activity

updated ctb and moench, moench not tested

Browse Source
This commit is contained in:
maliakal_d
2019-03-05 09:38:10 +01:00
parent 08bd2378f4
commit c56561bc9f
17 changed files with 433 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/ctbDetectorServer/RegisterDefs.h
View File

@@ -85,8 +85,8 @@
#define FIFO_DATA_HRDWR_SRL_NMBR_OFST (0) #define FIFO_DATA_HRDWR_SRL_NMBR_OFST (0)
#define FIFO_DATA_HRDWR_SRL_NMBR_MSK (0x0000FFFF << FIFO_DATA_HRDWR_SRL_NMBR_OFST) #define FIFO_DATA_HRDWR_SRL_NMBR_MSK (0x0000FFFF << FIFO_DATA_HRDWR_SRL_NMBR_OFST)
//0xCACA#define FIFO_DATA_WRD_OFST (16) //#define FIFO_DATA_WRD_OFST (16)
//0xCACA#define FIFO_DATA_WRD_MSK (0x0000FFFF << FIFO_DATA_WRD_OFST) //#define FIFO_DATA_WRD_MSK (0x0000FFFF << FIFO_DATA_WRD_OFST)
/* FIFO Status RO register TODO */ /* FIFO Status RO register TODO */
#define FIFO_STATUS_REG (0x07 << MEM_MAP_SHIFT) #define FIFO_STATUS_REG (0x07 << MEM_MAP_SHIFT)

8
slsDetectorServers/ctbDetectorServer/gitInfo.txt
View File

@@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer Path: slsDetectorPackage/slsDetectorServers/ctbDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: ebee9e308e98f518775d42685602febda9b763ea Repsitory UUID: 08bd2378f4956ea9a0b75381872854b3b129288f
Revision: 29 Revision: 32
Branch: refactor Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4365 Last Changed Rev: 4372
Last Changed Date: 2019-03-01 08:13:34.000000002 +0100 ./RegisterDefs.h Last Changed Date: 2019-03-04 17:47:37.000000002 +0100 ./RegisterDefs.h

6
slsDetectorServers/ctbDetectorServer/gitInfoCtb.h
View File

@@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "ebee9e308e98f518775d42685602febda9b763ea" #define GITREPUUID "08bd2378f4956ea9a0b75381872854b3b129288f"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4365 #define GITREV 0x4372
#define GITDATE 0x20190301 #define GITDATE 0x20190304
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

27
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@@ -103,7 +103,7 @@ void basictests() {
FILE_LOG(logERROR, ("%s\n\n", firmware_message)); FILE_LOG(logERROR, ("%s\n\n", firmware_message));
firmware_compatibility = FAIL; firmware_compatibility = FAIL;
firmware_check_done = 1; firmware_check_done = 1;
cprintf(RED,"exiting for now!\n");exit(-1); return; return;
} }
uint16_t hversion = getHardwareVersionNumber(); uint16_t hversion = getHardwareVersionNumber();
@@ -204,7 +204,7 @@ int checkType() {
return OK; return OK;
} }
uint32_t testFpga(void) { int testFpga() {
#ifdef VIRTUAL #ifdef VIRTUAL
return OK; return OK;
#endif #endif
@@ -538,6 +538,9 @@ void setupDetector() {
cleanFifos(); // FIXME: why twice? cleanFifos(); // FIXME: why twice?
resetCore(); resetCore();
// 1G UDP
enableTenGigabitEthernet(0);
//Initialization of acquistion parameters //Initialization of acquistion parameters
setTimer(SAMPLES, DEFAULT_NUM_SAMPLES); // update databytes and allocate ram setTimer(SAMPLES, DEFAULT_NUM_SAMPLES); // update databytes and allocate ram
setTimer(FRAME_NUMBER, DEFAULT_NUM_FRAMES); setTimer(FRAME_NUMBER, DEFAULT_NUM_FRAMES);
@@ -545,9 +548,8 @@ void setupDetector() {
setTimer(FRAME_PERIOD, DEFAULT_PERIOD); setTimer(FRAME_PERIOD, DEFAULT_PERIOD);
setTimer(DELAY_AFTER_TRIGGER, DEFAULT_DELAY); setTimer(DELAY_AFTER_TRIGGER, DEFAULT_DELAY);
setTiming(DEFAULT_TIMING_MODE); setTiming(DEFAULT_TIMING_MODE);
setReadOutFlags(NORMAL_READOUT);
// 1G UDP
enableTenGigabitEthernet(0);
// clear roi // clear roi
{ {
int ret = OK, retvalsize = 0; int ret = OK, retvalsize = 0;
@@ -953,7 +955,6 @@ int64_t setTimer(enum timerIndex ind, int64_t val) {
} }
retval = nSamples; retval = nSamples;
FILE_LOG(logINFO, ("\tGetting #samples: %lld\n", (long long int)retval)); FILE_LOG(logINFO, ("\tGetting #samples: %lld\n", (long long int)retval));
break; break;
default: default:
@@ -1031,6 +1032,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
val = (val) / (1E-3 * ADC_CLK); val = (val) / (1E-3 * ADC_CLK);
if (val != retval) if (val != retval)
return FAIL; return FAIL;
break;
default: default:
break; break;
} }
@@ -1614,7 +1616,7 @@ int enableTenGigabitEthernet(int val) {
/* ctb specific - pll, flashing fpga */ /* ctb specific - configure frequency, phase, pll */
// ind can only be ADC_CLK or DBIT_CLK // ind can only be ADC_CLK or DBIT_CLK
@@ -1739,6 +1741,9 @@ int getAdcOffsetRegister(int adc) {
return ((bus_r(ADC_OFFSET_REG) & ADC_OFFSET_DBT_PPLN_MSK) >> ADC_OFFSET_DBT_PPLN_OFST); return ((bus_r(ADC_OFFSET_REG) & ADC_OFFSET_DBT_PPLN_MSK) >> ADC_OFFSET_DBT_PPLN_OFST);
} }
// patterns
uint64_t writePatternIOControl(uint64_t word) { uint64_t writePatternIOControl(uint64_t word) {
if (word != -1) { if (word != -1) {
FILE_LOG(logINFO, ("Setting Pattern - I/O Control: 0x%llx\n", (long long int) word)); FILE_LOG(logINFO, ("Setting Pattern - I/O Control: 0x%llx\n", (long long int) word));
@@ -2176,10 +2181,12 @@ enum runStatus getRunStatus(){
return TRANSMITTING; return TRANSMITTING;
} }
/*if (retval & STATUS_ALL_FF_EMPTY_MSK) { if (digitalEnable && !analogEnable) {
FILE_LOG(logINFOBLUE, ("Status: Transmitting (All fifo empty)\n")); if (retval & STATUS_ALL_FF_EMPTY_MSK) {
return TRANSMITTING; FILE_LOG(logINFOBLUE, ("Status: Transmitting (All fifo empty)\n"));
}*/ return TRANSMITTING;
}
}
if (! (retval & STATUS_IDLE_MSK)) { if (! (retval & STATUS_IDLE_MSK)) {
FILE_LOG(logINFOBLUE, ("Status: Idle\n")); FILE_LOG(logINFOBLUE, ("Status: Idle\n"));

10
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@@ -193,7 +193,7 @@ int64_t getDetectorId(enum idMode arg) {
case DETECTOR_FIRMWARE_VERSION: case DETECTOR_FIRMWARE_VERSION:
return (int64_t)getFirmwareVersion(); return (int64_t)getFirmwareVersion();
case SOFTWARE_FIRMWARE_API_VERSION: case SOFTWARE_FIRMWARE_API_VERSION:
return (int64_t)Beb_GetFirmwareSoftwareAPIVersion(); return (int64_t)getFirmwareAPIVersion();
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
return (GITDATE & 0xFFFFFF); return (GITDATE & 0xFFFFFF);
case CLIENT_SOFTWARE_API_VERSION: case CLIENT_SOFTWARE_API_VERSION:
@@ -214,6 +214,14 @@ u_int64_t getFirmwareVersion() {
#endif #endif
} }
u_int64_t getFirmwareAPIVersion() {
#ifdef VIRTUAL
return 0;
#else
return (u_int64_t)Beb_GetFirmwareSoftwareAPIVersion();
#endif
}
u_int32_t getDetectorNumber() { u_int32_t getDetectorNumber() {

4
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@@ -142,7 +142,7 @@ int checkType() {
return OK; return OK;
} }
u_int32_t testFpga(void) { int testFpga() {
#ifdef VIRTUAL #ifdef VIRTUAL
return OK; return OK;
#endif #endif
@@ -950,6 +950,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
val = (val / (1E-3 * CLK_FREQ)) + 0.5; // convert back to timer val = (val / (1E-3 * CLK_FREQ)) + 0.5; // convert back to timer
if (val != retval) if (val != retval)
return FAIL; return FAIL;
break;
case DELAY_AFTER_TRIGGER: case DELAY_AFTER_TRIGGER:
if (masterflags == IS_MASTER) { if (masterflags == IS_MASTER) {
val += masterdefaultdelay; val += masterdefaultdelay;
@@ -961,6 +962,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
} }
if (val != retval) if (val != retval)
return FAIL; return FAIL;
break;
default: default:
break; break;
} }

13
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@@ -183,7 +183,7 @@ int checkType() {
u_int32_t testFpga(void) { int testFpga() {
#ifdef VIRTUAL #ifdef VIRTUAL
return OK; return OK;
#endif #endif
@@ -699,6 +699,16 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
val = (val + ACQ_TIME_MIN_CLOCK) / (1E-3 * CLK_RUN); val = (val + ACQ_TIME_MIN_CLOCK) / (1E-3 * CLK_RUN);
if (val != retval) if (val != retval)
return FAIL; return FAIL;
break;
case STORAGE_CELL_DELAY:
// convert to freq
val *= (1E-3 * CLK_RUN);
if(val < 0) val = 0;
// convert back to timer
val = val / (1E-3 * CLK_RUN);
if (val != retval)
return FAIL;
break;
case FRAME_PERIOD: case FRAME_PERIOD:
case DELAY_AFTER_TRIGGER: case DELAY_AFTER_TRIGGER:
// convert to freq // convert to freq
@@ -707,6 +717,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
val = (val) / (1E-3 * CLK_SYNC); val = (val) / (1E-3 * CLK_SYNC);
if (val != retval) if (val != retval)
return FAIL; return FAIL;
break;
default: default:
break; break;
} }

2
slsDetectorServers/moenchDetectorServer/Makefile
View File

@@ -1,6 +1,6 @@
CROSS = bfin-uclinux- CROSS = bfin-uclinux-
CC = $(CROSS)gcc CC = $(CROSS)gcc
CFLAGS += -Wall -DMOENCHD -DSTOP_SERVER # -DVERBOSEI #-DVERBOSE CFLAGS += -Wall -DMOENCHD -DSTOP_SERVER -DDEBUG1# -DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lstdc++ LDLIBS += -lm -lstdc++
PROGS = moenchDetectorServer PROGS = moenchDetectorServer

34
slsDetectorServers/moenchDetectorServer/RegisterDefs.h
View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
/* Definitions for FPGA */ /* Definitions for FPGA */
#define MEM_MAP_SHIFT 11 #define MEM_MAP_SHIFT 1
/* FPGA Version RO register */ /* FPGA Version RO register */
@@ -59,7 +59,7 @@
#define STATUS_PLL_PHS_DN_MSK (0x00000001 << STATUS_PLL_PHS_DN_OFST) #define STATUS_PLL_PHS_DN_MSK (0x00000001 << STATUS_PLL_PHS_DN_OFST)
#define STATUS_PT_CNTRL_STTS_OFF_OFST (24) #define STATUS_PT_CNTRL_STTS_OFF_OFST (24)
#define STATUS_PT_CNTRL_STTS_OFF_MSK (0x000000FF << STATUS_PT_CNTRL_STTS_OFF_OFST) #define STATUS_PT_CNTRL_STTS_OFF_MSK (0x000000FF << STATUS_PT_CNTRL_STTS_OFF_OFST)
#define STATUS_IDLE_MSK (0x7FFFF) #define STATUS_IDLE_MSK (0x6FFFF)
/* Look at me RO register TODO */ /* Look at me RO register TODO */
#define LOOK_AT_ME_REG (0x03 << MEM_MAP_SHIFT) #define LOOK_AT_ME_REG (0x03 << MEM_MAP_SHIFT)
@@ -365,6 +365,11 @@
/* Pattern Limit RW regiser */ /* Pattern Limit RW regiser */
#define PATTERN_LIMIT_REG (0x53 << MEM_MAP_SHIFT) #define PATTERN_LIMIT_REG (0x53 << MEM_MAP_SHIFT)
#define PATTERN_LIMIT_STRT_OFST (0)
#define PATTERN_LIMIT_STRT_MSK (0x0000FFFF << PATTERN_LIMIT_STRT_OFST)
#define PATTERN_LIMIT_STP_OFST (16)
#define PATTERN_LIMIT_STP_MSK (0x0000FFFF << PATTERN_LIMIT_STP_OFST)
/* Pattern Loop 0 Address RW regiser */ /* Pattern Loop 0 Address RW regiser */
#define PATTERN_LOOP_0_ADDR_REG (0x54 << MEM_MAP_SHIFT) #define PATTERN_LOOP_0_ADDR_REG (0x54 << MEM_MAP_SHIFT)
@@ -501,19 +506,28 @@
#define DBIT_EXT_TRG_OPRTN_MD_MSK (0x00000001 << DBIT_EXT_TRG_OPRTN_MD_OFST) #define DBIT_EXT_TRG_OPRTN_MD_MSK (0x00000001 << DBIT_EXT_TRG_OPRTN_MD_OFST)
/* Pin Delay 0 RW register */ /* Pin Delay 0 RW register */
#define PIN_DELAY_0_REG (0x7C << MEM_MAP_SHIFT) #define OUTPUT_DELAY_0_REG (0x7C << MEM_MAP_SHIFT)
#define OUTPUT_DELAY_0_OTPT_STTNG_STEPS (25)
#define PIN_DELAY_0_OTPT_STTNG_OFST (0) //t = OTPT_STTNG * 25 ps, max for Cyclone V = 775 ps #define OUTPUT_DELAY_0_OTPT_STTNG_OFST (0) //t = OTPT_STTNG * 25 ps, max for Cyclone V = 775 ps
#define PIN_DELAY_0_OTPT_STTNG_MSK (0x0000001F << PIN_DELAY_0_OFST) #define OUTPUT_DELAY_0_OTPT_STTNG_MSK (0x0000001F << OUTPUT_DELAY_0_OTPT_STTNG_OFST)
#define PIN_DELAY_0_OTPT_TRGGR_OFST (31) // 1: load dynamic output settings, 0: trigger start of dynamic output delay configuration pn falling edge of ODT (output delay trigger) bit
#define PIN_DELAY_0_OTPT_TRGGR_MSK (0x00000001 << PIN_DELAY_0_OFST) #define OUTPUT_DELAY_0_OTPT_TRGGR_OFST (31)
#define PIN_DELAY_0_OTPT_TRGGR_LD_VAL (1) #define OUTPUT_DELAY_0_OTPT_TRGGR_MSK (0x00000001 << OUTPUT_DELAY_0_OTPT_TRGGR_OFST)
#define PIN_DELAY_0_OTPT_TRGGR_STRT_VAL (0) #define OUTPUT_DELAY_0_OTPT_TRGGR_LD_VAL (1)
#define OUTPUT_DELAY_0_OTPT_TRGGR_STRT_VAL (0)
/* Pin Delay 1 RW register /* Pin Delay 1 RW register
* Each bit configured as enable for dynamic output delay configuration */ * Each bit configured as enable for dynamic output delay configuration */
#define PIN_DELAY_1_REG (0x7D << MEM_MAP_SHIFT) #define PIN_DELAY_1_REG (0x7D << MEM_MAP_SHIFT)
/** Pattern Mask 64 bit RW regiser */
#define PATTERN_MASK_LSB_REG (0x80 << MEM_MAP_SHIFT)
#define PATTERN_MASK_MSB_REG (0x81 << MEM_MAP_SHIFT)
/** Pattern Set 64 bit RW regiser */
#define PATTERN_SET_LSB_REG (0x82 << MEM_MAP_SHIFT)
#define PATTERN_SET_MSB_REG (0x83 << MEM_MAP_SHIFT)
/** I2C Control register */ /** I2C Control register */
//#define I2C_TRANSFER_COMMAND_FIFO_REG (0x100 << MEM_MAP_SHIFT) // in FW, but not used anywhere //#define I2C_TRANSFER_COMMAND_FIFO_REG (0x100 << MEM_MAP_SHIFT) // in FW, but not used anywhere
//#define I2C_CONTROL_REG (0x102 << MEM_MAP_SHIFT) // in FW, but not used anywhere //#define I2C_CONTROL_REG (0x102 << MEM_MAP_SHIFT) // in FW, but not used anywhere

1
slsDetectorServers/moenchDetectorServer/UDPPacketHeaderGenerator.h Symbolic link
View File

@@ -0,0 +1 @@
../slsDetectorServer/UDPPacketHeaderGenerator.h

1
slsDetectorServers/moenchDetectorServer/communication_funcs_UDP.h Symbolic link
View File

@@ -0,0 +1 @@
../slsDetectorServer/communication_funcs_UDP.h

8
slsDetectorServers/moenchDetectorServer/gitInfo.txt
View File

@@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/moenchDetectorServer Path: slsDetectorPackage/slsDetectorServers/moenchDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 4b9e41e23b0671478ce0c9beae7a8342e9b2d204 Repsitory UUID: 08bd2378f4956ea9a0b75381872854b3b129288f
Revision: 7 Revision: 9
Branch: refactor Branch: refactor
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4252 Last Changed Rev: 4372
Last Changed Date: 2019-01-15 10:22:16.000000002 +0100 ./RegisterDefs.h Last Changed Date: 2019-03-05 09:35:29.000000002 +0100 ./RegisterDefs.h

6
slsDetectorServers/moenchDetectorServer/gitInfoMoench.h
View File

@@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "4b9e41e23b0671478ce0c9beae7a8342e9b2d204" #define GITREPUUID "08bd2378f4956ea9a0b75381872854b3b129288f"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4252 #define GITREV 0x4372
#define GITDATE 0x20190115 #define GITDATE 0x20190305
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

504
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@@ -3,6 +3,8 @@
#include "versionAPI.h" #include "versionAPI.h"
#include "logger.h" #include "logger.h"
#include "communication_funcs_UDP.h"
#include "UDPPacketHeaderGenerator.h"
#include "AD9257.h" // commonServerFunctions.h, blackfin.h, ansi.h #include "AD9257.h" // commonServerFunctions.h, blackfin.h, ansi.h
#include "LTC2620.h" // dacs #include "LTC2620.h" // dacs
#include "MAX1932.h" // hv #include "MAX1932.h" // hv
@@ -19,8 +21,10 @@
// Global variable from slsDetectorServer_funcs // Global variable from slsDetectorServer_funcs
extern int debugflag; extern int debugflag;
extern int dataBytes;
extern uint16_t *ramValues; // Global variable from UDPPacketHeaderGenerator
extern uint64_t udpFrameNumber;
extern uint32_t udpPacketNumber;
int firmware_compatibility = OK; int firmware_compatibility = OK;
int firmware_check_done = 0; int firmware_check_done = 0;
@@ -32,6 +36,9 @@ int virtual_status = 0;
int virtual_stop = 0; int virtual_stop = 0;
#endif #endif
int dataBytes = 0;
char* ramValues = 0;
char udpPacketData[UDP_PACKET_DATA_BYTES + sizeof(sls_detector_header)];
int32_t clkPhase[NUM_CLOCKS] = {0, 0, 0, 0}; int32_t clkPhase[NUM_CLOCKS] = {0, 0, 0, 0};
uint32_t clkDivider[NUM_CLOCKS] = {40, 20, 20, 200}; uint32_t clkDivider[NUM_CLOCKS] = {40, 20, 20, 200};
@@ -49,6 +56,7 @@ int digitalEnable = 0;
int nSamples = 1; int nSamples = 1;
char volatile *now_ptr = 0; char volatile *now_ptr = 0;
// basic tests
int isFirmwareCheckDone() { int isFirmwareCheckDone() {
return firmware_check_done; return firmware_check_done;
} }
@@ -175,7 +183,7 @@ void basictests() {
firmware_check_done = 1; firmware_check_done = 1;
return; return;
} }
FILE_LOG(logINFO, ("Compatibility - success\n")); FILE_LOG(logINFO, ("\tCompatibility - success\n"));
firmware_check_done = 1; firmware_check_done = 1;
#endif #endif
} }
@@ -184,9 +192,8 @@ int checkType() {
#ifdef VIRTUAL #ifdef VIRTUAL
return OK; return OK;
#endif #endif
uint32_t type = ((bus_r(FPGA_VERSION_REG) & FPGA_VERSION_DTCTR_TYP_MSK) >> FPGA_VERSION_DTCTR_TYP_OFST); uint32_t type = ((bus_r(FPGA_VERSION_REG) & FPGA_VERSION_DTCTR_TYP_MSK) >> FPGA_VERSION_DTCTR_TYP_OFST);
uint32_t expectedType = (((FPGA_VERSION_DTCTR_TYP_MOENCH_VAL) & FPGA_VERSION_DTCTR_TYP_MSK) >> FPGA_VERSION_DTCTR_TYP_OFST);
uint32_t expectedType = FPGA_VERSION_DTCTR_TYP_MOENCH_VAL;
if (type != expectedType) { if (type != expectedType) {
FILE_LOG(logERROR, ("This is not a Moench Detector Server (read %d, expected %d)\n", FILE_LOG(logERROR, ("This is not a Moench Detector Server (read %d, expected %d)\n",
@@ -196,7 +203,7 @@ int checkType() {
return OK; return OK;
} }
uint32_t testFpga(void) { int testFpga() {
#ifdef VIRTUAL #ifdef VIRTUAL
return OK; return OK;
#endif #endif
@@ -206,7 +213,7 @@ uint32_t testFpga(void) {
int ret = OK; int ret = OK;
uint32_t val = bus_r(FIX_PATT_REG); uint32_t val = bus_r(FIX_PATT_REG);
if (val == FIX_PATT_VAL) { if (val == FIX_PATT_VAL) {
FILE_LOG(logINFO, ("Fixed pattern: successful match (0x%08x)\n",val)); FILE_LOG(logINFO, ("\tFixed pattern: successful match (0x%08x)\n",val));
} else { } else {
FILE_LOG(logERROR, ("Fixed pattern does not match! Read 0x%08x, expected 0x%08x\n", val, FIX_PATT_VAL)); FILE_LOG(logERROR, ("Fixed pattern does not match! Read 0x%08x, expected 0x%08x\n", val, FIX_PATT_VAL));
ret = FAIL; ret = FAIL;
@@ -264,7 +271,7 @@ uint32_t testFpga(void) {
// write back previous value // write back previous value
bus_w(addr, previousValue); bus_w(addr, previousValue);
if (ret == OK) { if (ret == OK) {
FILE_LOG(logINFO, ("Successfully tested FPGA Delay LSB Register %d times\n", times)); FILE_LOG(logINFO, ("\tSuccessfully tested FPGA Delay LSB Register %d times\n", times));
} }
} }
@@ -302,7 +309,7 @@ int testBus() {
bus_w(addr, previousValue); bus_w(addr, previousValue);
if (ret == OK) { if (ret == OK) {
FILE_LOG(logINFO, ("Successfully tested bus %d times\n", times)); FILE_LOG(logINFO, ("\tSuccessfully tested bus %d times\n", times));
} }
return ret; return ret;
} }
@@ -457,8 +464,11 @@ void setupDetector() {
int i = 0; int i = 0;
for (i = 0; i < NUM_CLOCKS; ++i) { for (i = 0; i < NUM_CLOCKS; ++i) {
clkPhase[i] = 0; clkPhase[i] = 0;
clkDivider[i] = 0;
} }
clkDivider[RUN_CLK] = DEFAULT_RUN_CLK;
clkDivider[ADC_CLK] = DEFAULT_ADC_CLK;
clkDivider[SYNC_CLK] = DEFAULT_SYNC_CLK;
clkDivider[DBIT_CLK] = DEFAULT_DBIT_CLK;
for (i = 0; i < NDAC; ++i) for (i = 0; i < NDAC; ++i)
dacValues[i] = -1; dacValues[i] = -1;
} }
@@ -480,7 +490,6 @@ void setupDetector() {
// hv // hv
MAX1932_SetDefines(SPI_REG, SPI_HV_SRL_CS_OTPT_MSK, SPI_HV_SRL_CLK_OTPT_MSK, SPI_HV_SRL_DGTL_OTPT_MSK, SPI_HV_SRL_DGTL_OTPT_OFST, HIGHVOLTAGE_MIN, HIGHVOLTAGE_MAX); MAX1932_SetDefines(SPI_REG, SPI_HV_SRL_CS_OTPT_MSK, SPI_HV_SRL_CLK_OTPT_MSK, SPI_HV_SRL_DGTL_OTPT_MSK, SPI_HV_SRL_DGTL_OTPT_OFST, HIGHVOLTAGE_MIN, HIGHVOLTAGE_MAX);
MAX1932_Disable(); MAX1932_Disable();
//FIXME: power regulators??
setHighVoltage(DEFAULT_HIGH_VOLTAGE); setHighVoltage(DEFAULT_HIGH_VOLTAGE);
// adc // adc
@@ -494,7 +503,8 @@ void setupDetector() {
LTC2620_Configure(); LTC2620_Configure();
//FIXME: //FIXME:
// switch off dacs (power regulators most likely only sets to minimum (if power enable on)) // switch off dacs (power regulators most likely only sets to minimum (if power enable on))
{ FILE_LOG(logINFOBLUE, ("Powering down all dacs\n"));
{
int idac = 0; int idac = 0;
for (idac = 0; idac < NDAC; ++idac) { for (idac = 0; idac < NDAC; ++idac) {
setDAC(idac, LTC2620_PWR_DOWN_VAL, 0); setDAC(idac, LTC2620_PWR_DOWN_VAL, 0);
@@ -510,6 +520,9 @@ void setupDetector() {
cleanFifos(); // FIXME: why twice? cleanFifos(); // FIXME: why twice?
resetCore(); resetCore();
// 10 G UDP
enableTenGigabitEthernet(1);
//Initialization of acquistion parameters //Initialization of acquistion parameters
setTimer(SAMPLES, DEFAULT_NUM_SAMPLES); // update databytes and allocate ram setTimer(SAMPLES, DEFAULT_NUM_SAMPLES); // update databytes and allocate ram
setTimer(FRAME_NUMBER, DEFAULT_NUM_FRAMES); setTimer(FRAME_NUMBER, DEFAULT_NUM_FRAMES);
@@ -517,9 +530,8 @@ void setupDetector() {
setTimer(FRAME_PERIOD, DEFAULT_PERIOD); setTimer(FRAME_PERIOD, DEFAULT_PERIOD);
setTimer(DELAY_AFTER_TRIGGER, DEFAULT_DELAY); setTimer(DELAY_AFTER_TRIGGER, DEFAULT_DELAY);
setTiming(DEFAULT_TIMING_MODE); setTiming(DEFAULT_TIMING_MODE);
setReadOutFlags(NORMAL_READOUT);
// send via tcp (moench via udp with configuremac)
sendUDP(0);
// clear roi // clear roi
{ {
int ret = OK, retvalsize = 0; int ret = OK, retvalsize = 0;
@@ -531,6 +543,10 @@ int allocateRAM() {
int oldDataBytes = dataBytes; int oldDataBytes = dataBytes;
updateDataBytes(); updateDataBytes();
// only allcoate RAM for 1 giga udp (if 10G, return)
if (enableTenGigabitEthernet(-1))
return OK;
// update only if change in databytes // update only if change in databytes
if (dataBytes == oldDataBytes) { if (dataBytes == oldDataBytes) {
FILE_LOG(logDEBUG1, ("RAM of size %d already allocated. Nothing to be done.\n", dataBytes)); FILE_LOG(logDEBUG1, ("RAM of size %d already allocated. Nothing to be done.\n", dataBytes));
@@ -554,15 +570,16 @@ int allocateRAM() {
"Probably cause: Memory Leak.\n")); "Probably cause: Memory Leak.\n"));
return FAIL; return FAIL;
} }
FILE_LOG(logINFO, ("RAM allocated to %d bytes\n", dataBytes));
FILE_LOG(logINFO, ("\tRAM allocated to %d bytes\n", dataBytes));
return OK; return OK;
} }
void updateDataBytes() { void updateDataBytes() {
int oldDataBytes = dataBytes; int oldDataBytes = dataBytes;
dataBytes = NCHIP * getChannels() * NUM_BYTES_PER_PIXEL * nSamples; dataBytes = NCHIP * getChannels() * NUM_BYTES_PER_PIXEL * nSamples;
if (oldDataBytes != dataBytes) { if (dataBytes != oldDataBytes) {
FILE_LOG(logINFO, ("Updating Databytes: %d\n", dataBytes)); FILE_LOG(logINFO, ("\tUpdating Databytes: %d\n", dataBytes));
} }
} }
@@ -652,7 +669,7 @@ ROI* setROI(int n, ROI arg[], int *retvalsize, int *ret) {
if (ich >= 0 && ich < NCHAN_ANALOG) if (ich >= 0 && ich < NCHAN_ANALOG)
adcDisableMask &= ~(1 << ich); adcDisableMask &= ~(1 << ich);
FILE_LOG(logDEBUG1, ("\t%d: ich:%d adcDisableMask:0x%08x\n", FILE_LOG(logDEBUG1, ("%d: ich:%d adcDisableMask:0x%08x\n",
iroi, ich, adcDisableMask)); iroi, ich, adcDisableMask));
} }
} }
@@ -663,7 +680,7 @@ ROI* setROI(int n, ROI arg[], int *retvalsize, int *ret) {
// get roi // get roi
adcDisableMask = bus_r(addr); adcDisableMask = bus_r(addr);
FILE_LOG(logDEBUG1, ("\tGetting adcDisableMask: 0x%08x\n", adcDisableMask)); FILE_LOG(logDEBUG1, ("Getting adcDisableMask: 0x%08x\n", adcDisableMask));
nROI = 0; nROI = 0;
if (adcDisableMask) { if (adcDisableMask) {
@@ -826,7 +843,6 @@ enum readOutFlags setReadOutFlags(enum readOutFlags val) {
return retval; return retval;
} }
} }
// get // get
uint32_t regval = bus_r(addr); uint32_t regval = bus_r(addr);
FILE_LOG(logDEBUG1, ("Config Reg: 0x%08x\n", regval)); FILE_LOG(logDEBUG1, ("Config Reg: 0x%08x\n", regval));
@@ -835,13 +851,13 @@ enum readOutFlags setReadOutFlags(enum readOutFlags val) {
digitalEnable = ((regval & CONFIG_ENBLE_DGTL_OTPT_MSK) >> CONFIG_ENBLE_DGTL_OTPT_OFST); digitalEnable = ((regval & CONFIG_ENBLE_DGTL_OTPT_MSK) >> CONFIG_ENBLE_DGTL_OTPT_OFST);
if (analogEnable && digitalEnable) { if (analogEnable && digitalEnable) {
FILE_LOG(logDEBUG1, ("\tGetting readout: Analog & Digital\n")); FILE_LOG(logDEBUG1, ("Getting readout: Analog & Digital\n"));
retval = ANALOG_AND_DIGITAL; retval = ANALOG_AND_DIGITAL;
} else if (analogEnable && !digitalEnable) { } else if (analogEnable && !digitalEnable) {
FILE_LOG(logDEBUG1, ("\tGetting readout: Normal\n")); FILE_LOG(logDEBUG1, ("Getting readout: Normal\n"));
retval = NORMAL_READOUT; retval = NORMAL_READOUT;
} else if (!analogEnable && digitalEnable) { } else if (!analogEnable && digitalEnable) {
FILE_LOG(logDEBUG1, ("\tGetting readout: Digital Only\n")); FILE_LOG(logDEBUG1, ("Getting readout: Digital Only\n"));
retval = DIGITAL_ONLY; retval = DIGITAL_ONLY;
} else { } else {
FILE_LOG(logERROR, ("Read unknown readout (Both digital and analog are disabled). " FILE_LOG(logERROR, ("Read unknown readout (Both digital and analog are disabled). "
@@ -870,7 +886,7 @@ int64_t setTimer(enum timerIndex ind, int64_t val) {
FILE_LOG(logINFO, ("Setting #frames: %lld\n",(long long int)val)); FILE_LOG(logINFO, ("Setting #frames: %lld\n",(long long int)val));
} }
retval = set64BitReg(val, FRAMES_LSB_REG, FRAMES_MSB_REG); retval = set64BitReg(val, FRAMES_LSB_REG, FRAMES_MSB_REG);
FILE_LOG(logDEBUG1, ("Getting #frames: %lld\n", (long long int)retval)); FILE_LOG(logINFO, ("\tGetting #frames: %lld\n", (long long int)retval));
break; break;
case FRAME_PERIOD: case FRAME_PERIOD:
@@ -888,7 +904,7 @@ int64_t setTimer(enum timerIndex ind, int64_t val) {
}*/ }*/
} }
retval = set64BitReg(val, PERIOD_LSB_REG, PERIOD_MSB_REG )/ (1E-3 * clkDivider[ADC_CLK]); retval = set64BitReg(val, PERIOD_LSB_REG, PERIOD_MSB_REG )/ (1E-3 * clkDivider[ADC_CLK]);
FILE_LOG(logDEBUG1, ("Getting period: %lldns\n", (long long int)retval)); FILE_LOG(logINFO, ("\tGetting period: %lldns\n", (long long int)retval));
break; break;
case DELAY_AFTER_TRIGGER: case DELAY_AFTER_TRIGGER:
@@ -897,7 +913,7 @@ int64_t setTimer(enum timerIndex ind, int64_t val) {
val *= (1E-3 * clkDivider[ADC_CLK]); val *= (1E-3 * clkDivider[ADC_CLK]);
} }
retval = set64BitReg(val, DELAY_LSB_REG, DELAY_MSB_REG) / (1E-3 * clkDivider[ADC_CLK]); retval = set64BitReg(val, DELAY_LSB_REG, DELAY_MSB_REG) / (1E-3 * clkDivider[ADC_CLK]);
FILE_LOG(logDEBUG1, ("Getting delay: %lldns\n", (long long int)retval)); FILE_LOG(logINFO, ("\tGetting delay: %lldns\n", (long long int)retval));
break; break;
case CYCLES_NUMBER: case CYCLES_NUMBER:
@@ -905,7 +921,7 @@ int64_t setTimer(enum timerIndex ind, int64_t val) {
FILE_LOG(logINFO, ("Setting #cycles: %lld\n", (long long int)val)); FILE_LOG(logINFO, ("Setting #cycles: %lld\n", (long long int)val));
} }
retval = set64BitReg(val, CYCLES_LSB_REG, CYCLES_MSB_REG); retval = set64BitReg(val, CYCLES_LSB_REG, CYCLES_MSB_REG);
FILE_LOG(logDEBUG1, ("Getting #cycles: %lld\n", (long long int)retval)); FILE_LOG(logINFO, ("\tGetting #cycles: %lld\n", (long long int)retval));
break; break;
case SAMPLES: case SAMPLES:
@@ -918,8 +934,7 @@ int64_t setTimer(enum timerIndex ind, int64_t val) {
} }
} }
retval = nSamples; retval = nSamples;
FILE_LOG(logDEBUG1, ("Getting #samples: %lld\n", (long long int)retval)); FILE_LOG(logINFO, ("\tGetting #samples: %lld\n", (long long int)retval));
break; break;
default: default:
@@ -945,6 +960,11 @@ int64_t getTimeLeft(enum timerIndex ind){
FILE_LOG(logINFO, ("Getting number of frames left: %lld\n",(long long int)retval)); FILE_LOG(logINFO, ("Getting number of frames left: %lld\n",(long long int)retval));
break; break;
case FRAME_PERIOD:
retval = get64BitReg(PERIOD_LEFT_LSB_REG, PERIOD_LEFT_MSB_REG) / (1E-3 * clkDivider[ADC_CLK]);
FILE_LOG(logINFO, ("Getting period left: %lldns\n", (long long int)retval));
break;
case DELAY_AFTER_TRIGGER: case DELAY_AFTER_TRIGGER:
retval = get64BitReg(DELAY_LEFT_LSB_REG, DELAY_LEFT_MSB_REG) / (1E-3 * clkDivider[ADC_CLK]); retval = get64BitReg(DELAY_LEFT_LSB_REG, DELAY_LEFT_MSB_REG) / (1E-3 * clkDivider[ADC_CLK]);
FILE_LOG(logINFO, ("Getting delay left: %lldns\n", (long long int)retval)); FILE_LOG(logINFO, ("Getting delay left: %lldns\n", (long long int)retval));
@@ -992,6 +1012,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
val = (val) / (1E-3 * ADC_CLK); val = (val) / (1E-3 * ADC_CLK);
if (val != retval) if (val != retval)
return FAIL; return FAIL;
break;
default: default:
break; break;
} }
@@ -1007,7 +1028,7 @@ enum detectorSettings getSettings() {
/* parameters - dac, adc, hv */ /* parameters - dac, adc, hv */
void setDAC(enum DACINDEX ind, int val, int mV) { void setDAC(enum DACINDEX ind, int val, int mV) {
if (val < 0) if (val < 0 && val != LTC2620_PWR_DOWN_VAL)
return; return;
FILE_LOG(logDEBUG1, ("Setting dac[%d]: %d %s \n", (int)ind, val, (mV ? "mV" : "dac units"))); FILE_LOG(logDEBUG1, ("Setting dac[%d]: %d %s \n", (int)ind, val, (mV ? "mV" : "dac units")));
@@ -1083,10 +1104,9 @@ int setHighVoltage(int val){
#endif #endif
// setting hv // setting hv
if (val >= 0) { if (val >= 0) {
FILE_LOG(logINFO, ("Setting High voltage: %d V", val)); FILE_LOG(logINFO, ("Setting High voltage: %d V\n", val));
MAX1932_Set(val); MAX1932_Set(val);
highvoltage = val; highvoltage = val;
//FIXME: might have to set the power_reg to set it?
} }
return highvoltage; return highvoltage;
@@ -1172,76 +1192,109 @@ int configureMAC(uint32_t destip, uint64_t destmac, uint64_t sourcemac, uint32_t
return OK; return OK;
#endif #endif
FILE_LOG(logINFOBLUE, ("Configuring MAC\n")); FILE_LOG(logINFOBLUE, ("Configuring MAC\n"));
uint32_t sourceport = DEFAULT_TX_UDP_PORT; // 1 giga udp
if (!enableTenGigabitEthernet(-1)) {
// if it was in 10G mode, it was not allocating RAM
if (allocateRAM() == FAIL)
return -1;
char cDestIp[MAX_STR_LENGTH];
memset(cDestIp, 0, MAX_STR_LENGTH);
sprintf(cDestIp, "%d.%d.%d.%d", (destip>>24)&0xff,(destip>>16)&0xff,(destip>>8)&0xff,(destip)&0xff);
FILE_LOG(logINFO, ("1G UDP: Destination (IP: %s, port:%d)\n", cDestIp, udpport));
if (setUDPDestinationDetails(cDestIp, udpport) == FAIL) {
FILE_LOG(logERROR, ("could not set udp 1G destination IP and port\n"));
return FAIL;
}
return OK;
}
FILE_LOG(logINFO, ("\tSource IP : %d.%d.%d.%d \t\t(0x%08x)\n", // 10 G
(sourceip>>24)&0xff,(sourceip>>16)&0xff,(sourceip>>8)&0xff,(sourceip)&0xff, sourceip)); else {
FILE_LOG(logINFO, ("\tSource MAC : %02x:%02x:%02x:%02x:%02x:%02x \t(0x%010llx)\n", uint32_t sourceport = DEFAULT_TX_UDP_PORT;
(unsigned int)((sourcemac>>40)&0xFF),
(unsigned int)((sourcemac>>32)&0xFF),
(unsigned int)((sourcemac>>24)&0xFF),
(unsigned int)((sourcemac>>16)&0xFF),
(unsigned int)((sourcemac>>8)&0xFF),
(unsigned int)((sourcemac>>0)&0xFF),
(long long unsigned int)sourcemac));
FILE_LOG(logINFO, ("\tSource Port : %d \t\t\t(0x%08x)\n",sourceport, sourceport));
FILE_LOG(logINFO, ("\tDest. IP : %d.%d.%d.%d \t\t(0x%08x)\n", FILE_LOG(logINFO, ("\tSource IP : %d.%d.%d.%d \t\t(0x%08x)\n",
(destip>>24)&0xff,(destip>>16)&0xff,(destip>>8)&0xff,(destip)&0xff, destip)); (sourceip>>24)&0xff,(sourceip>>16)&0xff,(sourceip>>8)&0xff,(sourceip)&0xff, sourceip));
FILE_LOG(logINFO, ("\tDest. MAC : %02x:%02x:%02x:%02x:%02x:%02x \t(0x%010llx)\n", FILE_LOG(logINFO, ("\tSource MAC : %02x:%02x:%02x:%02x:%02x:%02x \t(0x%010llx)\n",
(unsigned int)((destmac>>40)&0xFF), (unsigned int)((sourcemac>>40)&0xFF),
(unsigned int)((destmac>>32)&0xFF), (unsigned int)((sourcemac>>32)&0xFF),
(unsigned int)((destmac>>24)&0xFF), (unsigned int)((sourcemac>>24)&0xFF),
(unsigned int)((destmac>>16)&0xFF), (unsigned int)((sourcemac>>16)&0xFF),
(unsigned int)((destmac>>8)&0xFF), (unsigned int)((sourcemac>>8)&0xFF),
(unsigned int)((destmac>>0)&0xFF), (unsigned int)((sourcemac>>0)&0xFF),
(long long unsigned int)destmac)); (long long unsigned int)sourcemac));
FILE_LOG(logINFO, ("\tDest. Port : %d \t\t\t(0x%08x)\n",udpport, udpport)); FILE_LOG(logINFO, ("\tSource Port : %d \t\t\t(0x%08x)\n",sourceport, sourceport));
long int checksum=calcChecksum(sourceip, destip); FILE_LOG(logINFO, ("\tDest. IP : %d.%d.%d.%d \t\t(0x%08x)\n",
bus_w(TX_IP_REG, sourceip); (destip>>24)&0xff,(destip>>16)&0xff,(destip>>8)&0xff,(destip)&0xff, destip));
bus_w(RX_IP_REG, destip); FILE_LOG(logINFO, ("\tDest. MAC : %02x:%02x:%02x:%02x:%02x:%02x \t(0x%010llx)\n",
(unsigned int)((destmac>>40)&0xFF),
(unsigned int)((destmac>>32)&0xFF),
(unsigned int)((destmac>>24)&0xFF),
(unsigned int)((destmac>>16)&0xFF),
(unsigned int)((destmac>>8)&0xFF),
(unsigned int)((destmac>>0)&0xFF),
(long long unsigned int)destmac));
FILE_LOG(logINFO, ("\tDest. Port : %d \t\t\t(0x%08x)\n",udpport, udpport));
uint32_t val = 0; long int checksum=calcChecksum(sourceip, destip);
bus_w(TX_IP_REG, sourceip);
bus_w(RX_IP_REG, destip);
val = ((sourcemac >> LSB_OF_64_BIT_REG_OFST) & BIT_32_MSK); uint32_t val = 0;
bus_w(TX_MAC_LSB_REG, val);
FILE_LOG(logDEBUG1, ("Read from TX_MAC_LSB_REG: 0x%08x\n", bus_r(TX_MAC_LSB_REG)));
val = ((sourcemac >> MSB_OF_64_BIT_REG_OFST) & BIT_32_MSK); val = ((sourcemac >> LSB_OF_64_BIT_REG_OFST) & BIT_32_MSK);
bus_w(TX_MAC_MSB_REG,val); bus_w(TX_MAC_LSB_REG, val);
FILE_LOG(logDEBUG1, ("Read from TX_MAC_MSB_REG: 0x%08x\n", bus_r(TX_MAC_MSB_REG))); FILE_LOG(logDEBUG1, ("Read from TX_MAC_LSB_REG: 0x%08x\n", bus_r(TX_MAC_LSB_REG)));
val = ((destmac >> LSB_OF_64_BIT_REG_OFST) & BIT_32_MSK); val = ((sourcemac >> MSB_OF_64_BIT_REG_OFST) & BIT_32_MSK);
bus_w(RX_MAC_LSB_REG, val); bus_w(TX_MAC_MSB_REG,val);
FILE_LOG(logDEBUG1, ("Read from RX_MAC_LSB_REG: 0x%08x\n", bus_r(RX_MAC_LSB_REG))); FILE_LOG(logDEBUG1, ("Read from TX_MAC_MSB_REG: 0x%08x\n", bus_r(TX_MAC_MSB_REG)));
val = ((destmac >> MSB_OF_64_BIT_REG_OFST) & BIT_32_MSK); val = ((destmac >> LSB_OF_64_BIT_REG_OFST) & BIT_32_MSK);
bus_w(RX_MAC_MSB_REG, val); bus_w(RX_MAC_LSB_REG, val);
FILE_LOG(logDEBUG1, ("Read from RX_MAC_MSB_REG: 0x%08x\n", bus_r(RX_MAC_MSB_REG))); FILE_LOG(logDEBUG1, ("Read from RX_MAC_LSB_REG: 0x%08x\n", bus_r(RX_MAC_LSB_REG)));
val = (((sourceport << UDP_PORT_TX_OFST) & UDP_PORT_TX_MSK) | val = ((destmac >> MSB_OF_64_BIT_REG_OFST) & BIT_32_MSK);
((udpport << UDP_PORT_RX_OFST) & UDP_PORT_RX_MSK)); bus_w(RX_MAC_MSB_REG, val);
bus_w(UDP_PORT_REG, val); FILE_LOG(logDEBUG1, ("Read from RX_MAC_MSB_REG: 0x%08x\n", bus_r(RX_MAC_MSB_REG)));
FILE_LOG(logDEBUG1, ("Read from UDP_PORT_REG: 0x%08x\n", bus_r(UDP_PORT_REG)));
bus_w(TX_IP_CHECKSUM_REG,(checksum << TX_IP_CHECKSUM_OFST) & TX_IP_CHECKSUM_MSK); val = (((sourceport << UDP_PORT_TX_OFST) & UDP_PORT_TX_MSK) |
FILE_LOG(logDEBUG1, ("Read from TX_IP_CHECKSUM_REG: 0x%08x\n", bus_r(TX_IP_CHECKSUM_REG))); ((udpport << UDP_PORT_RX_OFST) & UDP_PORT_RX_MSK));
bus_w(UDP_PORT_REG, val);
FILE_LOG(logDEBUG1, ("Read from UDP_PORT_REG: 0x%08x\n", bus_r(UDP_PORT_REG)));
cleanFifos();//FIXME: resetPerpheral() for ctb? bus_w(TX_IP_CHECKSUM_REG,(checksum << TX_IP_CHECKSUM_OFST) & TX_IP_CHECKSUM_MSK);
resetPeripheral(); FILE_LOG(logDEBUG1, ("Read from TX_IP_CHECKSUM_REG: 0x%08x\n", bus_r(TX_IP_CHECKSUM_REG)));
usleep(WAIT_TIME_CONFIGURE_MAC); /* todo maybe without */
sendUDP(1); cleanFifos();//FIXME: resetPerpheral() for ctb?
resetPeripheral();
usleep(WAIT_TIME_CONFIGURE_MAC); /* todo maybe without */
}
return OK; return OK;
} }
int enableTenGigabitEthernet(int val) {
uint32_t addr = CONFIG_REG;
// set
if (val != -1) {
FILE_LOG(logINFO, ("Setting 10Gbe: %d\n", (val > 0) ? 1 : 0));
if (val > 0) {
bus_w(addr, bus_r(addr) | CONFIG_GB10_SND_UDP_MSK);
} else {
bus_w(addr, bus_r(addr) & (~CONFIG_GB10_SND_UDP_MSK));
}
//configuremac called from client
}
return ((bus_r(addr) & CONFIG_GB10_SND_UDP_MSK) >> CONFIG_GB10_SND_UDP_OFST);
}
/* jungfrau specific - pll, flashing fpga */
// only for moench /* moench specific - configure frequency, phase, pll, */
int powerChip(int on) { //FIXME only for moench? or only for ctb?
int powerChip(int on) {
uint32_t addr = POWER_REG; uint32_t addr = POWER_REG;
if (on >= 0) { if (on >= 0) {
FILE_LOG(logINFO, ("Powering %s\n", (on > 0 ? "on" : "off"))); FILE_LOG(logINFO, ("Powering %s\n", (on > 0 ? "on" : "off")));
@@ -1259,21 +1312,6 @@ int powerChip(int on) { //FIXME only for moench? or only for ctb?
return 0; return 0;
} }
int sendUDP(int enable) {
FILE_LOG(logINFO, ("Sending via %s\n", (enable ? "Receiver" : "CPU")));
uint32_t addr = CONFIG_REG;
if (enable > 0)
bus_w(addr, bus_r(addr) | CONFIG_GB10_SND_UDP_MSK);
else if (enable == 0)
bus_w(addr, bus_r(addr) & (~CONFIG_GB10_SND_UDP_MSK));
FILE_LOG(logDEBUG, ("\tConfig Reg: 0x%x\n", bus_r(addr)));
return ((bus_r(addr) & CONFIG_GB10_SND_UDP_MSK) >> CONFIG_GB10_SND_UDP_OFST);
}
// ind can only be ADC_CLK or DBIT_CLK // ind can only be ADC_CLK or DBIT_CLK
void configurePhase(enum CLKINDEX ind, int val) { void configurePhase(enum CLKINDEX ind, int val) {
if (val > 65535 || val < -65535) { if (val > 65535 || val < -65535) {
@@ -1387,7 +1425,7 @@ void setAdcOffsetRegister(int adc, int val) {
bus_w(addr, bus_r(addr) & ~ mask); bus_w(addr, bus_r(addr) & ~ mask);
// set value // set value
bus_w(addr, bus_r(addr) | ((val << offset) & mask)); bus_w(addr, bus_r(addr) | ((val << offset) & mask));
FILE_LOG(logDEBUG1, ("\t %s Offset: 0x%8x\n", (adc ? "ADC" : "Dbit"), bus_r(addr))); FILE_LOG(logDEBUG1, (" %s Offset: 0x%8x\n", (adc ? "ADC" : "Dbit"), bus_r(addr)));
} }
int getAdcOffsetRegister(int adc) { int getAdcOffsetRegister(int adc) {
@@ -1396,13 +1434,15 @@ int getAdcOffsetRegister(int adc) {
return ((bus_r(ADC_OFFSET_REG) & ADC_OFFSET_DBT_PPLN_MSK) >> ADC_OFFSET_DBT_PPLN_OFST); return ((bus_r(ADC_OFFSET_REG) & ADC_OFFSET_DBT_PPLN_MSK) >> ADC_OFFSET_DBT_PPLN_OFST);
} }
// patterns
uint64_t writePatternIOControl(uint64_t word) { uint64_t writePatternIOControl(uint64_t word) {
if (word != -1) { if (word != -1) {
FILE_LOG(logINFO, ("Setting Pattern - I/O Control: 0x%llx\n", (long long int) word)); FILE_LOG(logINFO, ("Setting Pattern - I/O Control: 0x%llx\n", (long long int) word));
set64BitReg(word, PATTERN_IO_CNTRL_LSB_REG, PATTERN_IO_CNTRL_MSB_REG); set64BitReg(word, PATTERN_IO_CNTRL_LSB_REG, PATTERN_IO_CNTRL_MSB_REG);
} }
uint64_t retval = get64BitReg(PATTERN_IO_CNTRL_LSB_REG, PATTERN_IO_CNTRL_MSB_REG); uint64_t retval = get64BitReg(PATTERN_IO_CNTRL_LSB_REG, PATTERN_IO_CNTRL_MSB_REG);
FILE_LOG(logDEBUG1, ("\tI/O Control: 0x%llx\n", (long long int) retval)); FILE_LOG(logDEBUG1, ("I/O Control: 0x%llx\n", (long long int) retval));
return retval; return retval;
} }
@@ -1412,19 +1452,19 @@ uint64_t writePatternClkControl(uint64_t word) {
set64BitReg(word, PATTERN_IO_CLK_CNTRL_LSB_REG, PATTERN_IO_CLK_CNTRL_MSB_REG); set64BitReg(word, PATTERN_IO_CLK_CNTRL_LSB_REG, PATTERN_IO_CLK_CNTRL_MSB_REG);
} }
uint64_t retval = get64BitReg(PATTERN_IO_CLK_CNTRL_LSB_REG, PATTERN_IO_CLK_CNTRL_MSB_REG); uint64_t retval = get64BitReg(PATTERN_IO_CLK_CNTRL_LSB_REG, PATTERN_IO_CLK_CNTRL_MSB_REG);
FILE_LOG(logDEBUG1, ("\tClock Control: 0x%llx\n", (long long int) retval)); FILE_LOG(logDEBUG1, ("Clock Control: 0x%llx\n", (long long int) retval));
return retval; return retval;
} }
uint64_t readPatternWord(int addr) { uint64_t readPatternWord(int addr) {
// error (handled in tcp) // error (handled in tcp)
if (addr < 0 || addr >= MAX_PATTERN_LENGTH) { if (addr < 0 || addr > MAX_PATTERN_LENGTH) {
FILE_LOG(logERROR, ("Cannot get Pattern - Word. Invalid addr %d. " FILE_LOG(logERROR, ("Cannot get Pattern - Word. Invalid addr 0x%x. "
"Should be within %d\n", addr, MAX_PATTERN_LENGTH)); "Should be <= 0x%x\n", addr, MAX_PATTERN_LENGTH));
return -1; return -1;
} }
FILE_LOG(logDEBUG1, ("Reading Pattern - Word (addr:%d)\n", addr)); FILE_LOG(logDEBUG1, (" Reading Pattern - Word (addr:0x%x)\n", addr));
uint32_t reg = PATTERN_CNTRL_REG; uint32_t reg = PATTERN_CNTRL_REG;
// overwrite with only addr // overwrite with only addr
@@ -1433,33 +1473,34 @@ uint64_t readPatternWord(int addr) {
// set read strobe // set read strobe
bus_w(reg, bus_r(reg) | PATTERN_CNTRL_RD_MSK); bus_w(reg, bus_r(reg) | PATTERN_CNTRL_RD_MSK);
// read value
uint64_t retval = get64BitReg(PATTERN_OUT_LSB_REG, PATTERN_OUT_MSB_REG);
FILE_LOG(logDEBUG1, ("\tWord(addr:%d): 0x%llx\n", addr, (long long int) retval));
// unset read strobe // unset read strobe
bus_w(reg, bus_r(reg) & (~PATTERN_CNTRL_RD_MSK)); bus_w(reg, bus_r(reg) & (~PATTERN_CNTRL_RD_MSK));
// read value
uint64_t retval = get64BitReg(PATTERN_OUT_LSB_REG, PATTERN_OUT_MSB_REG);
FILE_LOG(logDEBUG1, (" Word(addr:0x%x): 0x%llx\n", addr, (long long int) retval));
return retval; return retval;
} }
uint64_t writePatternWord(int addr, uint64_t word) { uint64_t writePatternWord(int addr, uint64_t word) {
// get // get
if (word != -1) if (word == -1)
return readPatternWord(addr); return readPatternWord(addr);
// error (handled in tcp) // error (handled in tcp)
if (addr < 0 || addr >= MAX_PATTERN_LENGTH) { if (addr < 0 || addr > MAX_PATTERN_LENGTH) {
FILE_LOG(logERROR, ("Cannot set Pattern - Word. Invalid addr %d. " FILE_LOG(logERROR, ("Cannot set Pattern - Word. Invalid addr 0x%x. "
"Should be within %d\n", addr, MAX_PATTERN_LENGTH)); "Should be <= 0x%x\n", addr, MAX_PATTERN_LENGTH));
return -1; return -1;
} }
FILE_LOG(logINFO, ("Setting Pattern - Word (addr:%d, word:0x%llx)\n", addr, (long long int) word)); FILE_LOG(logINFO, ("Setting Pattern - Word (addr:0x%x, word:0x%llx)\n", addr, (long long int) word));
uint32_t reg = PATTERN_CNTRL_REG; uint32_t reg = PATTERN_CNTRL_REG;
// write word // write word
set64BitReg(word, PATTERN_IN_LSB_REG, PATTERN_IN_MSB_REG); set64BitReg(word, PATTERN_IN_LSB_REG, PATTERN_IN_MSB_REG);
FILE_LOG(logDEBUG1, (" Wrote word. PatternIn Reg: 0x%llx\n", get64BitReg(PATTERN_IN_LSB_REG, PATTERN_IN_MSB_REG)));
// overwrite with only addr // overwrite with only addr
bus_w(reg, ((addr << PATTERN_CNTRL_ADDR_OFST) & PATTERN_CNTRL_ADDR_MSK)); bus_w(reg, ((addr << PATTERN_CNTRL_ADDR_OFST) & PATTERN_CNTRL_ADDR_MSK));
@@ -1476,9 +1517,9 @@ uint64_t writePatternWord(int addr, uint64_t word) {
int setPatternWaitAddress(int level, int addr) { int setPatternWaitAddress(int level, int addr) {
// error (handled in tcp) // error (handled in tcp)
if (addr >= (MAX_PATTERN_LENGTH + 1)) { if (addr > MAX_PATTERN_LENGTH) {
FILE_LOG(logERROR, ("Cannot set Pattern - Wait Address. Invalid addr %d. " FILE_LOG(logERROR, ("Cannot set Pattern - Wait Address. Invalid addr 0x%x. "
"Should be within %d\n", addr, MAX_PATTERN_LENGTH + 1)); "Should be <= 0x%x\n", addr, MAX_PATTERN_LENGTH));
return -1; return -1;
} }
@@ -1503,20 +1544,20 @@ int setPatternWaitAddress(int level, int addr) {
mask = PATTERN_WAIT_2_ADDR_MSK; mask = PATTERN_WAIT_2_ADDR_MSK;
break; break;
default: default:
FILE_LOG(logERROR, ("Cannot set Pattern - Wait Address. Invalid level %d. " FILE_LOG(logERROR, ("Cannot set Pattern - Wait Address. Invalid level 0x%x. "
"Should be between 0 and 2.\n", level)); "Should be between 0 and 2.\n", level));
return -1; return -1;
} }
// set // set
if (addr >= 0) { if (addr >= 0) {
FILE_LOG(logINFO, ("Setting Pattern - Wait Address (level:%d, addr:%d)\n", level, addr)); FILE_LOG(logINFO, ("Setting Pattern - Wait Address (level:%d, addr:0x%x)\n", level, addr));
bus_w(reg, ((addr << offset) & mask)); bus_w(reg, ((addr << offset) & mask));
} }
// get // get
uint32_t regval = bus_r((reg & mask) >> offset); uint32_t regval = bus_r((reg & mask) >> offset);
FILE_LOG(logDEBUG1, ("\tWait Address (level:%d, addr:%d)\n", level, regval)); FILE_LOG(logDEBUG1, (" Wait Address (level:%d, addr:0x%x)\n", level, regval));
return regval; return regval;
} }
@@ -1550,8 +1591,8 @@ uint64_t setPatternWaitTime(int level, uint64_t t) {
} }
// get // get
uint32_t regval = get64BitReg(regl, regm); uint64_t regval = get64BitReg(regl, regm);
FILE_LOG(logDEBUG1, ("\tWait Time (level:%d, t:%lld)\n", level, (long long int)regval)); FILE_LOG(logDEBUG1, (" Wait Time (level:%d, t:%lld)\n", level, (long long int)regval));
return regval; return regval;
} }
@@ -1559,17 +1600,17 @@ void setPatternLoop(int level, int *startAddr, int *stopAddr, int *nLoop) {
// level 0-2, addr upto patternlength + 1 (checked at tcp) // level 0-2, addr upto patternlength + 1 (checked at tcp)
if ((level != -1) && if ((level != -1) &&
(*startAddr >= 0 || *stopAddr > (MAX_PATTERN_LENGTH + 1))) { (*startAddr > MAX_PATTERN_LENGTH || *stopAddr > MAX_PATTERN_LENGTH)) {
FILE_LOG(logERROR, ("Cannot set Pattern (Pattern Loop, level:%d, startaddr:%d, stopaddr:%d). " FILE_LOG(logERROR, ("Cannot set Pattern (Pattern Loop, level:%d, startaddr:0x%x, stopaddr:0x%x). "
"Addr must be less than %d\n", "Addr must be <= 0x%x\n",
level, *startAddr, *stopAddr, MAX_PATTERN_LENGTH + 1)); level, *startAddr, *stopAddr, MAX_PATTERN_LENGTH));
} }
//level -1, addr upto patternlength (checked at tcp) //level -1, addr upto patternlength (checked at tcp)
else if ((level == -1) && else if ((level == -1) &&
(*startAddr >= 0 || *stopAddr > MAX_PATTERN_LENGTH)) { (*startAddr > MAX_PATTERN_LENGTH || *stopAddr > MAX_PATTERN_LENGTH)) {
FILE_LOG(logERROR, ("Cannot set Pattern (Pattern Loop, complete pattern, stopaddr:%d). " FILE_LOG(logERROR, ("Cannot set Pattern (Pattern Loop, complete pattern, startaddr:0x%x, stopaddr:0x%x). "
"Addr must be less than %d\n", "Addr must be <= 0x%x\n",
*startAddr, *stopAddr, MAX_PATTERN_LENGTH)); *startAddr, *stopAddr, MAX_PATTERN_LENGTH));
} }
@@ -1609,6 +1650,10 @@ void setPatternLoop(int level, int *startAddr, int *stopAddr, int *nLoop) {
// complete pattern // complete pattern
addr = PATTERN_LIMIT_REG; addr = PATTERN_LIMIT_REG;
nLoopReg = -1; nLoopReg = -1;
startOffset = PATTERN_LIMIT_STRT_OFST;
startMask = PATTERN_LIMIT_STRT_MSK;
stopOffset = PATTERN_LIMIT_STP_OFST;
stopMask = PATTERN_LIMIT_STP_MSK;
break; break;
default: default:
// already checked at tcp interface // already checked at tcp interface
@@ -1624,30 +1669,89 @@ void setPatternLoop(int level, int *startAddr, int *stopAddr, int *nLoop) {
// set iteration // set iteration
if (*nLoop >= 0) { if (*nLoop >= 0) {
FILE_LOG(logINFO, ("Setting Pattern - Pattern Loop (level:%d, nLoop:%d)\n", FILE_LOG(logINFO, ("Setting Pattern - Pattern Loop (level:%d, nLoop:%d)\n",
level, nLoop)); level, *nLoop));
bus_w(nLoopReg, *nLoop); bus_w(nLoopReg, *nLoop);
} }
*nLoop = bus_r(nLoopReg); *nLoop = bus_r(nLoopReg);
} }
// set start and stop addr // set
if (*startAddr == -1) { if (*startAddr != -1 && *stopAddr != -1) {
*startAddr = ((bus_r(addr) >> startOffset) & startMask); // writing start and stop addr
FILE_LOG(logINFO, ("Setting Pattern - Pattern Loop Start Address (level:%d, startAddr:%d was -1)\n", FILE_LOG(logINFO, ("Setting Pattern - Pattern Loop (level:%d, startaddr:0x%x, stopaddr:0x%x)\n",
level, *startAddr)); level, *startAddr, *stopAddr));
} bus_w(addr, ((*startAddr << startOffset) & startMask) | ((*stopAddr << stopOffset) & stopMask));
if (*stopAddr == -1) { FILE_LOG(logDEBUG1, ("Addr:0x%x, val:0x%x\n", addr, bus_r(addr)));
*stopAddr = ((bus_r(addr) >> stopOffset) & stopMask);
FILE_LOG(logINFO, ("Setting Pattern - Pattern Loop Stop Address (level:%d, stopAddr:%d, was -1)\n",
level, *stopAddr));
} }
// writing start and stop addr // get
FILE_LOG(logINFO, ("Setting Pattern - Pattern Loop (level:%d, startaddr:%d, stopaddr:%d)\n", else {
level, *startAddr, *stopAddr)); *startAddr = ((bus_r(addr) & startMask) >> startOffset);
bus_w(addr, ((*startAddr << startOffset) & startMask) | ((*stopAddr << stopOffset) & stopMask)); FILE_LOG(logDEBUG1, ("Getting Pattern - Pattern Loop Start Address (level:%d, Read startAddr:0x%x)\n",
level, *startAddr));
*stopAddr = ((bus_r(addr) & stopMask) >> stopOffset);
FILE_LOG(logDEBUG1, ("Getting Pattern - Pattern Loop Stop Address (level:%d, Read stopAddr:0x%x)\n",
level, *stopAddr));
}
} }
int setLEDEnable(int enable) {
uint32_t addr = CONFIG_REG;
// set
if (enable >= 0) {
FILE_LOG(logINFO, ("Switching LED %s\n", (enable > 0) ? "ON" : "OFF"));
// disable
if (enable == 0) {
bus_w(addr, bus_r(addr) | CONFIG_LED_DSBL_MSK);
}
// enable
else {
bus_w(addr, bus_r(addr) & (~CONFIG_LED_DSBL_MSK));
}
}
// ~ to get the opposite
return (((~bus_r(addr)) & CONFIG_LED_DSBL_MSK) >> CONFIG_LED_DSBL_OFST);
}
void setDigitalIODelay(uint64_t pinMask, int delay) {
FILE_LOG(logINFO, ("Setings Digital IO Delay (pinMask:0x%llx, delay: %d ps)\n",
(long long unsigned int)pinMask, delay));
int delayunit = delay / OUTPUT_DELAY_0_OTPT_STTNG_STEPS;
FILE_LOG(logDEBUG1, ("delay unit: 0x%x (steps of 25ps)\n", delayunit));
// set pin mask
bus_w(PIN_DELAY_1_REG, pinMask);
uint32_t addr = OUTPUT_DELAY_0_REG;
// set delay
bus_w(addr, bus_r(addr) & (~OUTPUT_DELAY_0_OTPT_STTNG_MSK));
bus_w(addr, (bus_r(addr) | ((delayunit << OUTPUT_DELAY_0_OTPT_STTNG_OFST) & OUTPUT_DELAY_0_OTPT_STTNG_MSK)));
// load value
bus_w(addr, bus_r(addr) | OUTPUT_DELAY_0_OTPT_TRGGR_MSK);
// trigger configuration
bus_w(addr, bus_r(addr) & (~OUTPUT_DELAY_0_OTPT_TRGGR_MSK));
}
void setPatternMask(uint64_t mask) {
set64BitReg(mask, PATTERN_MASK_LSB_REG, PATTERN_MASK_MSB_REG);
}
uint64_t getPatternMask() {
return get64BitReg(PATTERN_MASK_LSB_REG, PATTERN_MASK_MSB_REG);
}
void setPatternBitMask(uint64_t mask) {
set64BitReg(mask, PATTERN_SET_LSB_REG, PATTERN_SET_MSB_REG);
}
uint64_t getPatternBitMask() {
return get64BitReg(PATTERN_SET_LSB_REG, PATTERN_SET_MSB_REG);
}
/* aquisition */ /* aquisition */
@@ -1663,14 +1767,21 @@ int startStateMachine(){
FILE_LOG(logINFOGREEN, ("Virtual Acquisition started\n")); FILE_LOG(logINFOGREEN, ("Virtual Acquisition started\n"));
return OK; return OK;
#endif #endif
// 1 giga udp
if (!enableTenGigabitEthernet(-1)) {
// create udp socket
if(createUDPSocket() != OK) {
return FAIL;
}
// update header with modId, detType and version. Reset offset and fnum
createUDPPacketHeader(udpPacketData, getHardwareSerialNumber());
}
FILE_LOG(logINFOBLUE, ("Starting State Machine\n")); FILE_LOG(logINFOBLUE, ("Starting State Machine\n"));
cleanFifos(); cleanFifos();
unsetFifoReadStrobes(); // FIXME: unnecessary to write bus_w(dumm, 0) as it is 0 in the beginnig and the strobes are always unset if set unsetFifoReadStrobes(); // FIXME: unnecessary to write bus_w(dumm, 0) as it is 0 in the beginnig and the strobes are always unset if set
// point the data pointer to the starting position of data
now_ptr = (char*)ramValues;
//start state machine //start state machine
bus_w(CONTROL_REG, bus_r(CONTROL_REG) | CONTROL_STRT_ACQSTN_MSK | CONTROL_STRT_EXPSR_MSK); bus_w(CONTROL_REG, bus_r(CONTROL_REG) | CONTROL_STRT_ACQSTN_MSK | CONTROL_STRT_EXPSR_MSK);
bus_w(CONTROL_REG, bus_r(CONTROL_REG) & ~CONTROL_STRT_ACQSTN_MSK & ~CONTROL_STRT_EXPSR_MSK); bus_w(CONTROL_REG, bus_r(CONTROL_REG) & ~CONTROL_STRT_ACQSTN_MSK & ~CONTROL_STRT_EXPSR_MSK);
@@ -1761,9 +1872,11 @@ enum runStatus getRunStatus(){
return TRANSMITTING; return TRANSMITTING;
} }
if (retval & STATUS_ALL_FF_EMPTY_MSK) { if (digitalEnable && !analogEnable) {
FILE_LOG(logINFOBLUE, ("Status: Transmitting (All fifo empty)\n")); if (retval & STATUS_ALL_FF_EMPTY_MSK) {
return TRANSMITTING; FILE_LOG(logINFOBLUE, ("Status: Transmitting (All fifo empty)\n"));
return TRANSMITTING;
}
} }
if (! (retval & STATUS_IDLE_MSK)) { if (! (retval & STATUS_IDLE_MSK)) {
@@ -1777,6 +1890,32 @@ enum runStatus getRunStatus(){
} }
void readandSendUDPFrames(int *ret, char *mess) {
FILE_LOG(logDEBUG1, ("Reading from 1G UDP\n"));
// validate udp socket
if (getUdPSocketDescriptor() <= 0) {
*ret = FAIL;
sprintf(mess,"UDP Socket not created. sockfd:%d\n", getUdPSocketDescriptor());
FILE_LOG(logERROR, (mess));
return;
}
// every frame read
while(readFrameFromFifo() == OK) {
int bytesToSend = 0, n = 0;
while((bytesToSend = fillUDPPacket(udpPacketData))) {
n += sendUDPPacket(udpPacketData, bytesToSend);
}
if (n >= dataBytes) {
FILE_LOG(logINFO, (" Frame %lld sent (%d packets, %d databytes, n:%d bytes sent)\n",
udpFrameNumber, udpPacketNumber + 1, dataBytes, n));
}
}
closeUDPSocket();
}
void readFrame(int *ret, char *mess) { void readFrame(int *ret, char *mess) {
#ifdef VIRTUAL #ifdef VIRTUAL
@@ -1786,20 +1925,30 @@ void readFrame(int *ret, char *mess) {
} }
return; return;
#endif #endif
// wait for status to be done // 1G
while(runBusy()){ if (!enableTenGigabitEthernet(-1)) {
usleep(500); // random readandSendUDPFrames(ret, mess);
}
// 10G
else {
// wait for acquisition to be done
while(runBusy()){
usleep(500); // random
}
} }
// frames left to give status // ret could be fail in 1gudp for not creating udp sockets
int64_t retval = getTimeLeft(FRAME_NUMBER) + 2; if (*ret != FAIL) {
if ( retval > 1) { // frames left to give status
*ret = (int)FAIL; int64_t retval = getTimeLeft(FRAME_NUMBER) + 2;
sprintf(mess,"No data and run stopped: %lld frames left\n",(long long int)retval); if ( retval > 1) {
FILE_LOG(logERROR, (mess)); *ret = (int)FAIL;
} else { sprintf(mess,"No data and run stopped: %lld frames left\n",(long long int)retval);
*ret = (int)OK; FILE_LOG(logERROR, (mess));
FILE_LOG(logINFOGREEN, ("Acquisition successfully finished\n")); } else {
*ret = (int)OK;
FILE_LOG(logINFOGREEN, ("Acquisition successfully finished\n"));
}
} }
} }
@@ -1807,7 +1956,12 @@ void unsetFifoReadStrobes() {
bus_w(DUMMY_REG, bus_r(DUMMY_REG) & (~DUMMY_ANLG_FIFO_RD_STRBE_MSK) & (~DUMMY_DGTL_FIFO_RD_STRBE_MSK)); bus_w(DUMMY_REG, bus_r(DUMMY_REG) & (~DUMMY_ANLG_FIFO_RD_STRBE_MSK) & (~DUMMY_DGTL_FIFO_RD_STRBE_MSK));
} }
void readSample() { void readSample(int ns) {
if (!(ns%1000)) {
FILE_LOG(logDEBUG2, ("Reading sample ns:%d (out of %d), fifodinstatus:0x%x\n",
ns, nSamples,
bus_r(FIFO_DIN_STATUS_REG)));
}
uint32_t addr = DUMMY_REG; uint32_t addr = DUMMY_REG;
uint32_t fifoAddr = FIFO_DATA_REG; uint32_t fifoAddr = FIFO_DATA_REG;
@@ -1836,8 +1990,8 @@ void readSample() {
// keep reading till the value is the same // keep reading till the value is the same
while (*((uint16_t*)now_ptr) != bus_r16(fifoAddr)) { while (*((uint16_t*)now_ptr) != bus_r16(fifoAddr)) {
FILE_LOG(logDEBUG1, ("%d ", ich));
*((uint16_t*)now_ptr) = bus_r16(fifoAddr); *((uint16_t*)now_ptr) = bus_r16(fifoAddr);
FILE_LOG(logDEBUG1, (""))
} }
// increment pointer to data out destination // increment pointer to data out destination
@@ -1862,6 +2016,10 @@ void readSample() {
// only called for first sample // only called for first sample
int checkDataPresent() { int checkDataPresent() {
uint32_t dataPresent = bus_r(LOOK_AT_ME_REG); uint32_t dataPresent = bus_r(LOOK_AT_ME_REG);
FILE_LOG(logDEBUG2, ("LookatMe:0x%x, status:0x%x\t, fifodinstatus:0x%x\n",
dataPresent,
bus_r(STATUS_REG),
bus_r(FIFO_DIN_STATUS_REG)));
// as long as fifo empty (keep checking) // as long as fifo empty (keep checking)
while (!dataPresent) { while (!dataPresent) {
// acquisition done // acquisition done
@@ -1870,8 +2028,8 @@ int checkDataPresent() {
dataPresent = bus_r(LOOK_AT_ME_REG); dataPresent = bus_r(LOOK_AT_ME_REG);
// still no data // still no data
if (!dataPresent) { if (!dataPresent) {
FILE_LOG(logERROR, ("Acquisition Finished (State: 0x%08x), " FILE_LOG(logINFO, ("Acquisition Finished (State: 0x%08x), "
"but no frame found (Look_at_me: 0x%08x).\n", dataPresent)); "no frame found .\n", bus_r(STATUS_REG)));
return FAIL; return FAIL;
} }
// got data, exit // got data, exit
@@ -1882,19 +2040,23 @@ int checkDataPresent() {
// check if fifo empty again // check if fifo empty again
dataPresent = bus_r(LOOK_AT_ME_REG); dataPresent = bus_r(LOOK_AT_ME_REG);
} }
FILE_LOG(logDEBUG2, ("Got data, Lookatme:0x%x\n", dataPresent));
return OK; return OK;
} }
int readFrameFromFifo() { int readFrameFromFifo() {
int ns = 0; int ns = 0;
// point the data pointer to the starting position of data
now_ptr = ramValues;
// no data for this frame // no data for this frame
if (checkDataPresent(ns) == FAIL) { if (checkDataPresent() == FAIL) {
return FAIL; return FAIL;
} }
// read Sample // read Sample
while(ns < nSamples) { while(ns < nSamples) {
// chceck if no data in fifo, return ns?//FIXME: ask Anna
readSample(ns); readSample(ns);
ns++; ns++;
} }
@@ -1908,7 +2070,7 @@ uint32_t runBusy() {
return virtual_status; return virtual_status;
#endif #endif
uint32_t s = (bus_r(STATUS_REG) & STATUS_RN_BSY_MSK); uint32_t s = (bus_r(STATUS_REG) & STATUS_RN_BSY_MSK);
FILE_LOG(logDEBUG1, ("Status Register: %08x\n", s)); //FILE_LOG(logDEBUG1, ("Status Register: %08x\n", s));
return s; return s;
} }

9
slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
View File

@@ -26,7 +26,7 @@ typedef struct ip_header_struct {
/* Enums */ /* Enums */
enum CLKINDEX {RUN_CLK, ADC_CLK, SYNC_CLK, DBIT_CLK, NUM_CLOCKS}; enum CLKINDEX {RUN_CLK, ADC_CLK, SYNC_CLK, DBIT_CLK, NUM_CLOCKS};
enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7, D8}; enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7};
/* Hardware Definitions */ /* Hardware Definitions */
#define NCHAN (36) #define NCHAN (36)
@@ -49,6 +49,10 @@ enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7, D8};
#define DEFAULT_VLIMIT (-100) #define DEFAULT_VLIMIT (-100)
#define DEFAULT_TIMING_MODE (AUTO_TIMING) #define DEFAULT_TIMING_MODE (AUTO_TIMING)
#define DEFAULT_TX_UDP_PORT (0x7e9a) #define DEFAULT_TX_UDP_PORT (0x7e9a)
#define DEFAULT_RUN_CLK (40)
#define DEFAULT_ADC_CLK (20)
#define DEFAULT_SYNC_CLK (20)
#define DEFAULT_DBIT_CLK (200)
#define HIGHVOLTAGE_MIN (60) #define HIGHVOLTAGE_MIN (60)
#define HIGHVOLTAGE_MAX (200) #define HIGHVOLTAGE_MAX (200)
@@ -57,6 +61,9 @@ enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7, D8};
/* Defines in the Firmware */ /* Defines in the Firmware */
#define MAX_PATTERN_LENGTH (0xFFFF) #define MAX_PATTERN_LENGTH (0xFFFF)
#define DIGITAL_IO_DELAY_MAXIMUM_PS ((OUTPUT_DELAY_0_OTPT_STTNG_MSK >> OUTPUT_DELAY_0_OTPT_STTNG_OFST) * OUTPUT_DELAY_0_OTPT_STTNG_STEPS)
#define WAIT_TME_US_FR_LK_AT_ME_REG (100) // wait time in us after acquisition done to ensure there is no data in fifo #define WAIT_TME_US_FR_LK_AT_ME_REG (100) // wait time in us after acquisition done to ensure there is no data in fifo
#define WAIT_TIME_US_PLL (10 * 1000) #define WAIT_TIME_US_PLL (10 * 1000)
#define WAIT_TIME_US_STP_ACQ (100) #define WAIT_TIME_US_STP_ACQ (100)

18
slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
View File

@@ -20,8 +20,8 @@ int getFirmwareCheckResult(char** mess);
void basictests(); void basictests();
#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD) #if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
int checkType(); int checkType();
u_int32_t testFpga(void); int testFpga();
int testBus(void); int testBus();
#endif #endif
#ifdef GOTTHARDD #ifdef GOTTHARDD
@@ -33,8 +33,8 @@ int detectorTest(enum digitalTestMode arg);
// Ids // Ids
int64_t getDetectorId(enum idMode arg); int64_t getDetectorId(enum idMode arg);
u_int64_t getFirmwareVersion(); u_int64_t getFirmwareVersion();
#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
u_int64_t getFirmwareAPIVersion(); u_int64_t getFirmwareAPIVersion();
#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
u_int16_t getHardwareVersionNumber(); u_int16_t getHardwareVersionNumber();
u_int16_t getHardwareSerialNumber(); u_int16_t getHardwareSerialNumber();
#endif #endif
@@ -183,13 +183,7 @@ int getPower();
void setPower(enum DACINDEX ind, int val); void setPower(enum DACINDEX ind, int val);
void powerOff(); void powerOff();
#endif #endif
/*#ifdef GOTTHARDD
void initDAC(int dac_addr, int value);
void clearDACSregister();
void nextDAC();
void program_one_dac(int addr, int value);
u_int32_t putout(char *s);
#endif*/
#ifndef MOENCHD #ifndef MOENCHD
int getADC(enum ADCINDEX ind); int getADC(enum ADCINDEX ind);
#endif #endif
@@ -232,7 +226,7 @@ int enableTenGigabitEthernet(int val);
int powerChip (int on); int powerChip (int on);
#endif #endif
// chip test board specific - sendudp, pll, flashing firmware // chip test board or moench specific - configure frequency, phase, pll, flashing firmware
#if defined(CHIPTESTBOARDD) || defined(MOENCHD) #if defined(CHIPTESTBOARDD) || defined(MOENCHD)
void configurePhase(enum CLKINDEX ind, int val); void configurePhase(enum CLKINDEX ind, int val);
int getPhase(enum CLKINDEX ind); int getPhase(enum CLKINDEX ind);
@@ -245,7 +239,7 @@ extern void eraseFlash(); // p
extern int startWritingFPGAprogram(FILE** filefp); // programfpga.h extern int startWritingFPGAprogram(FILE** filefp); // programfpga.h
extern void stopWritingFPGAprogram(FILE* filefp); // programfpga.h extern void stopWritingFPGAprogram(FILE* filefp); // programfpga.h
extern int writeFPGAProgram(char* fpgasrc, size_t fsize, FILE* filefp); // programfpga.h extern int writeFPGAProgram(char* fpgasrc, size_t fsize, FILE* filefp); // programfpga.h
// ctb patterns // patterns
uint64_t writePatternIOControl(uint64_t word); uint64_t writePatternIOControl(uint64_t word);
uint64_t writePatternClkControl(uint64_t word); uint64_t writePatternClkControl(uint64_t word);
uint64_t readPatternWord(int addr); uint64_t readPatternWord(int addr);

2
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@@ -3267,6 +3267,7 @@ int power_chip(int file_des) {
retval = powerChip(arg); retval = powerChip(arg);
FILE_LOG(logDEBUG1, ("Power chip: %d\n", retval)); FILE_LOG(logDEBUG1, ("Power chip: %d\n", retval));
validate(arg, retval, "power on/off chip", DEC); validate(arg, retval, "power on/off chip", DEC);
#ifdef JUNGFRAUD
// narrow down error when powering on // narrow down error when powering on
if (ret == FAIL && arg > 0) { if (ret == FAIL && arg > 0) {
if (setTemperatureEvent(-1) == 1) if (setTemperatureEvent(-1) == 1)
@@ -3274,6 +3275,7 @@ int power_chip(int file_des) {
"Clear event & power chip again. Set %d, read %d \n", arg, retval); "Clear event & power chip again. Set %d, read %d \n", arg, retval);
FILE_LOG(logERROR, (mess)); FILE_LOG(logERROR, (mess));
} }
#endif
} }
#endif #endif
return Server_SendResult(file_des, INT32, UPDATE, &retval, sizeof(retval)); return Server_SendResult(file_des, INT32, UPDATE, &retval, sizeof(retval));