detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-05-19 08:36:48 +02:00
Code Issues Actions Packages Releases Activity

testing matterhorn1 SPI on altera CTB, works for dummy-chip

Browse Source
This commit is contained in:
muelle_m1
2026-03-30 15:21:04 +02:00
parent 4ee61ae791
commit c3b8d59de4
2 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorServers/ctbDetectorServer/RegisterDefs.h
+10
View File
@@ -628,6 +628,16 @@
#define ADC_SLOW_CTRL_DONE_OFST (1)
#define ADC_SLOW_CTRL_DONE_MSK (0x00000001 << ADC_SLOW_CTRL_DONE_OFST)
/* SPI */
#define SPI_CTRL_REG (0x48 << MEM_MAP_SHIFT)
#define SPI_CTRL_READSTROBE_BIT 0
#define SPI_CTRL_WRITESTROBE_BIT 1
#define SPI_CTRL_RX_EMPTY_BIT 2
#define SPI_CTRL_CHIPSELECT_BIT 4
#define SPI_CTRL_NBIT_OFST 16
#define SPI_WRITEDATA_REG (0x49 << MEM_MAP_SHIFT)
#define SPI_READDATA_REG (0x4A << MEM_MAP_SHIFT)
/** I2C Control register */
#define I2C_TRANSFER_COMMAND_FIFO_REG (0x100 << MEM_MAP_SHIFT)
#define I2C_RX_DATA_FIFO_REG (0x101 << MEM_MAP_SHIFT)
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+55 -7
View File
@@ -11071,7 +11071,7 @@ int set_pattern_wait_interval(int file_des) {
*/
int spi_read(int file_des) {
#if !defined(XILINX_CHIPTESTBOARDD)
#if !defined(XILINX_CHIPTESTBOARDD) && !defined(CHIPTESTBOARDD)
functionNotImplemented();
return sendError(file_des);
#endif
@@ -11121,7 +11121,7 @@ int spi_read(int file_des) {
for (int i = 0; i < n_bytes; i++) {
fake_register[i] = (uint8_t)((i * 2) % 256);
}
#else
#elif defined(XILINX_CHIPTESTBOARDD)
int spifd = open("/dev/spidev2.0", O_RDWR);
LOG(logINFO, ("SPI Read: opened spidev2.0 with fd=%d\n", spifd));
if (spifd < 0) {
@@ -11130,7 +11130,7 @@ int spi_read(int file_des) {
}
#endif
// Allocate dummy data to shif in, we keep a copy of this
// Allocate dummy data to shift in, we keep a copy of this
// to double check that we access a register of the correct size
uint8_t *dummy_data = malloc(n_bytes);
if (dummy_data == NULL) {
@@ -11197,7 +11197,7 @@ int spi_read(int file_des) {
fake_register[i] = local_tx[i + 1];
}
#else
#elif defined(XILINX_CHIPTESTBOARDD)
// For the real detector we do the transfer here
if (ioctl(spifd, SPI_IOC_MESSAGE(1), &send_cmd) < 0) {
// cleanup since we return early
@@ -11211,6 +11211,22 @@ int spi_read(int file_des) {
sprintf(mess, "SPI write failed with %d:%s\n", errno, strerror(errno));
return sendError(file_des);
}
#elif defined(CHIPTESTBOARDD)
// set spi to 8 bit per word (-1 comes from the firmware), set chipselect
bus_w(SPI_CTRL_REG, ((8 - 1) << SPI_CTRL_NBIT_OFST)+ (1 << SPI_CTRL_CHIPSELECT_BIT));
for (int i = 0; i < n_bytes + 1; ++i) {
bus_w(SPI_WRITEDATA_REG, local_tx[i]);
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) | (1 << SPI_CTRL_WRITESTROBE_BIT));
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) & ~(1 << SPI_CTRL_WRITESTROBE_BIT));
usleep(50);
local_rx[i] = (uint8_t)bus_r(SPI_READDATA_REG);
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) | (1 << SPI_CTRL_READSTROBE_BIT));
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) & ~(1 << SPI_CTRL_READSTROBE_BIT));
}
#endif
// Copy everything but the first received byte to the user. First byte
@@ -11231,7 +11247,7 @@ int spi_read(int file_des) {
local_rx[i + 1] = fake_register[i];
}
free(fake_register); // we are done with the fake register
#else
#elif defined(XILINX_CHIPTESTBOARDD)
if (ioctl(spifd, SPI_IOC_MESSAGE(1), &send_cmd) < 0) {
// cleanup since we return early
close(spifd);
@@ -11245,6 +11261,21 @@ int spi_read(int file_des) {
return sendError(file_des);
}
close(spifd);
#elif defined(CHIPTESTBOARDD)
for (int i = 0; i < n_bytes + 1; ++i) {
bus_w(SPI_WRITEDATA_REG, local_tx[i]);
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) | (1 << SPI_CTRL_WRITESTROBE_BIT));
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) & ~(1 << SPI_CTRL_WRITESTROBE_BIT));
usleep(50);
local_rx[i] = (uint8_t)bus_r(SPI_READDATA_REG);
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) | (1 << SPI_CTRL_READSTROBE_BIT));
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) & ~(1 << SPI_CTRL_READSTROBE_BIT));
}
bus_w(SPI_CTRL_REG, (8 - 1) << SPI_CTRL_NBIT_OFST); // remove chip-select
#endif
ret = OK;
LOG(logDEBUG1, ("SPI Read Complete\n"));
@@ -11262,7 +11293,7 @@ int spi_read(int file_des) {
* Write to SPI register.
*/
int spi_write(int file_des) {
#if !defined(XILINX_CHIPTESTBOARDD)
#if !defined(XILINX_CHIPTESTBOARDD) && !defined(CHIPTESTBOARDD)
functionNotImplemented();
return Server_SendResult(file_des, INT32, NULL, 0);
#endif
@@ -11343,7 +11374,7 @@ int spi_write(int file_des) {
for (int i = 0; i < n_bytes + 1; i++) {
local_rx[i] = local_tx[i];
}
#else
#elif defined(XILINX_CHIPTESTBOARDD)
int spifd = open("/dev/spidev2.0", O_RDWR);
LOG(logINFO, ("SPI Read: opened spidev2.0 with fd=%d\n", spifd));
if (spifd < 0) {
@@ -11362,6 +11393,23 @@ int spi_write(int file_des) {
return sendError(file_des);
}
close(spifd);
#elif defined(CHIPTESTBOARDD)
// set spi to 8 bit per word (-1 comes from firmware), set chip-select
bus_w(SPI_CTRL_REG, ((8 - 1) << SPI_CTRL_NBIT_OFST)+ (1 << SPI_CTRL_CHIPSELECT_BIT));
for (int i = 0; i < n_bytes + 1; ++i) {
bus_w(SPI_WRITEDATA_REG, local_tx[i]);
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) | (1 << SPI_CTRL_WRITESTROBE_BIT));
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) & ~(1 << SPI_CTRL_WRITESTROBE_BIT));
usleep(50);
local_rx[i] = (uint8_t)bus_r(SPI_READDATA_REG);
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) | (1 << SPI_CTRL_READSTROBE_BIT));
bus_w(SPI_CTRL_REG,
bus_r(SPI_CTRL_REG) & ~(1 << SPI_CTRL_READSTROBE_BIT));
}
bus_w(SPI_CTRL_REG, (8 - 1) << SPI_CTRL_NBIT_OFST); // remove chip-select
#endif
ret = OK;