detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 01:58:00 +02:00
Code Issues Actions Packages Releases Activity

[JUNGFRAU] - Modified memory map address shift for the interface between FPGA and Blackfin SOM. Shift has to be set to 1 since the basic AMC data transfers is 8-bit and not 16-bit.

Browse Source
This commit is contained in:
lopez_c
2018-02-22 11:15:24 +01:00
parent a536f8ac9b
commit 7364f674ed
6 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetectorServer/blackfin.h
View File

@ -12,6 +12,7 @@
u_int32_t CSP0BASE = 0;
#define CSP0 0x20200000
#define MEM_SIZE 0x100000
#define MEM_MAP_SHIFT 1
@ -103,7 +104,7 @@ int64_t set64BitReg(int64_t value, int aLSB, int aMSB){
* @retuns 32 bit data read
*/
u_int32_t readRegister(u_int32_t offset) {
return bus_r(offset << 11);
return bus_r(offset << MEM_MAP_SHIFT);
}
/**
@ -112,7 +113,7 @@ u_int32_t readRegister(u_int32_t offset) {
* @param data 32 bit data
*/
u_int32_t writeRegister(u_int32_t offset, u_int32_t data) {
bus_w(offset << 11, data);
bus_w(offset << MEM_MAP_SHIFT, data);
return readRegister(offset);
}