detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-20 19:30:42 +02:00
Code Issues Actions Packages Releases Activity

refactoring code and compiling binary

Browse Source
This commit is contained in:
maliakal_d 2025-05-19 13:19:32 +02:00
parent 9051dae787
commit 1665937540
6 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

30
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -94,7 +94,10 @@ void basictests() {
LOG(logINFOBLUE, ("********* Chip Test Board Virtual Server *********\n")); LOG(logINFOBLUE, ("********* Chip Test Board Virtual Server *********\n"));
#else #else
LOG(logINFOBLUE, ("************* Chip Test Board Server *************\n")); LOG(logINFOBLUE, ("************* Chip Test Board Server *************\n"));
enableBlackfinAMCExternalAccessExtension(); initError = enableBlackfinAMCExternalAccessExtension(initErrorMessage);
if (initError == FAIL) {
return;
}
initError = defineGPIOpins(initErrorMessage); initError = defineGPIOpins(initErrorMessage);
if (initError == FAIL) { if (initError == FAIL) {
return; return;
@ -440,31 +443,30 @@ uint32_t getDetectorIP() {
return res; return res;
} }
void enableBlackfinAMCExternalAccessExtension() { int enableBlackfinAMCExternalAccessExtension(char *mess) {
unsigned int value; unsigned int value;
const char *file_path = "/sys/kernel/debug/blackfin/ebiu_amc/EBIU_AMBCTL1"; const char *file_path = BFIN_AMC_ACCESS_EXTENSION_FNAME;
FILE *file = fopen(file_path, "r"); FILE *file = fopen(file_path, "r");
if (!file) { if (!file) {
LOG(logERROR, ("Failed to read EBIU_AMBCTL1\n")); strcpy(mess, "Failed to enable blackfin AMC access extension. Could "
return; "not read EBIU_AMBCTL1\n");
LOG(logERROR, (mess));
return FAIL;
} }
fscanf(file, "%x", &value); fscanf(file, "%x", &value);
fclose(file); fclose(file);
// enable support for ARDY signal on interface to FPGA value |= BFIN_AMC_ACCESS_EXTENSION_ENA_VAL;
// needed to properly translate avalon_mm_waitrequest in the CTB firmware
// https://www.analog.com/media/en/dsp-documentation/processor-manuals/bf537_hwr_Rev3.2.pdf
// page 274
value |= 0x3;
file = fopen(file_path, "w"); file = fopen(file_path, "w");
if (!file) { if (!file) {
LOG(logERROR, ("Failed to enable blackfin AMC access extension\n")); strcpy(mess, "Failed to enable blackfin AMC access extension. Could "
return; "not write EBIU_AMBCTL1\n");
LOG(logERROR, (mess));
return FAIL;
} }
fprintf(file, "0x%x", value); fprintf(file, "0x%x", value);
fclose(file); fclose(file);
return OK;
} }
/* initialization */ /* initialization */

8
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
View File

@ -7,11 +7,9 @@
#define MIN_REQRD_VRSN_T_RD_API 0x181130 #define MIN_REQRD_VRSN_T_RD_API 0x181130
#define REQRD_FRMWR_VRSN 0x230705 #define REQRD_FRMWR_VRSN 0x230705
#define NUM_HARDWARE_VERSIONS (1) #define NUM_HARDWARE_VERSIONS (1)
#define HARDWARE_VERSION_NUMBERS \ #define HARDWARE_VERSION_NUMBERS {0x3f}
{ 0x3f } #define HARDWARE_VERSION_NAMES {"5.1"}
#define HARDWARE_VERSION_NAMES \
{ "5.1" }
#define LINKED_SERVER_NAME "ctbDetectorServer" #define LINKED_SERVER_NAME "ctbDetectorServer"

17
slsDetectorServers/slsDetectorServer/include/blackfin.h
View File

@ -5,6 +5,23 @@
#include <inttypes.h> #include <inttypes.h>
#include <sys/types.h> #include <sys/types.h>
/** enable support for ARDY signal on interface to FPGA
* needed to properly translate avalon_mm_waitrequest in the CTB firmware
* https://www.analog.com/media/en/dsp-documentation/processor-manuals/bf537_hwr_Rev3.2.pdf
* page 274
* */
#define BFIN_EBIU_AMBCTL1_B2_ARDY_ENA_OFST (0)
#define BFIN_EBIU_AMBCTL1_B2_ARDY_ENA_MSK \
(1 << BFIN_EBIU_AMBCTL1_B2_ARDY_ENA_OFST)
#define BFIN_EBIU_AMBCTL1_B2_ARDY_POL_OFST (1)
#define BFIN_EBIU_AMBCTL1_B2_ARDY_POL_MSK \
(1 << BFIN_EBIU_AMBCTL1_B2_ARDY_POL_OFST)
#define BFIN_AMC_ACCESS_EXTENSION_ENA_VAL \
(BFIN_EBIU_AMBCTL1_B2_ARDY_ENA_MSK | BFIN_EBIU_AMBCTL1_B2_ARDY_POL_MSK)
#define BFIN_AMC_ACCESS_EXTENSION_FNAME \
"/sys/kernel/debug/blackfin/ebiu_amc/EBIU_AMBCTL1"
/** I2C defines */ /** I2C defines */
#define I2C_CLOCK_MHZ (131.25) #define I2C_CLOCK_MHZ (131.25)

5
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -113,6 +113,10 @@ void setModuleId(int modid);
u_int64_t getDetectorMAC(); u_int64_t getDetectorMAC();
u_int32_t getDetectorIP(); u_int32_t getDetectorIP();
#if defined(CHIPTESTBOARDD)
int enableBlackfinAMCExternalAccessExtension(char *mess);
#endif
// initialization // initialization
void initControlServer(); void initControlServer();
void initStopServer(); void initStopServer();
@ -135,7 +139,6 @@ void setupDetector();
#if defined(CHIPTESTBOARDD) #if defined(CHIPTESTBOARDD)
int updateDatabytesandAllocateRAM(); int updateDatabytesandAllocateRAM();
void updateDataBytes(); void updateDataBytes();
void enableBlackfinAMCExternalAccessExtension();
#endif #endif
#if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD) #if !defined(CHIPTESTBOARDD) && !defined(XILINX_CHIPTESTBOARDD)

2
slsSupportLib/include/sls/versionAPI.h
View File

@ -3,10 +3,10 @@
/** API versions */ /** API versions */
#define APILIB "developer 0x241122" #define APILIB "developer 0x241122"
#define APIRECEIVER "developer 0x241122" #define APIRECEIVER "developer 0x241122"
#define APICTB "developer 0x250310"
#define APIGOTTHARD2 "developer 0x250310" #define APIGOTTHARD2 "developer 0x250310"
#define APIMOENCH "developer 0x250310" #define APIMOENCH "developer 0x250310"
#define APIEIGER "developer 0x250310" #define APIEIGER "developer 0x250310"
#define APIXILINXCTB "developer 0x250311" #define APIXILINXCTB "developer 0x250311"
#define APIJUNGFRAU "developer 0x250318" #define APIJUNGFRAU "developer 0x250318"
#define APIMYTHEN3 "developer 0x250409" #define APIMYTHEN3 "developer 0x250409"
#define APICTB "developer 0x250519"