From 913d1c5310958bc452064419f64d393bd4ff6d96 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 13 Jan 2012 09:33:37 +0000 Subject: [PATCH] works with gigabit git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@90 951219d9-93cf-4727-9268-0efd64621fa3 --- .../gotthardDetectorServer/registers_g.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/slsDetectorSoftware/gotthardDetectorServer/registers_g.h b/slsDetectorSoftware/gotthardDetectorServer/registers_g.h index be98abe45..0765031a9 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/registers_g.h +++ b/slsDetectorSoftware/gotthardDetectorServer/registers_g.h @@ -28,6 +28,10 @@ //HV #define HV_REG 0x93<<11 +//configure MAC +#define ENET_CONF_REG 0x91<<11 +#define TSE_CONF_REG 0x90<<11 + //not used so far #define SPEED_REG 0x006000 #define SET_NBITS_REG 0x008000 @@ -68,6 +72,12 @@ //not used #define GET_SHIFT_IN_REG 0x022000 +#define GET_MEASUREMENT_TIME_LSB_REG 0x023000 +#define GET_MEASUREMENT_TIME_MSB_REG 0x024000 + +#define GET_ACTUAL_TIME_LSB_REG 0x025000 +#define GET_ACTUAL_TIME_MSB_REG 0x026000 + //to read back dac registers #define MOD_DACS1_REG 0x41<<11 #define MOD_DACS2_REG 0x42<<11 @@ -202,6 +212,9 @@ #define SW1_BIT 0x00000020 #define SW1_OFFSET 5 +#define WRITE_BACK_BIT 0x00000040 +#define WRITE_BACK_OFFSET 6 + #define RESET_BIT 0x00000080 #define RESET_OFFSET 7