Skip to content

F
FMC DEL 1ns 4cha
Commit 754b2473 authored by Tomasz Wlostowski's avatar Tomasz Wlostowski
Browse files
Options

software/lib: normalize negative timestamps, SPI idle fix

parent 605c84cc
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 1 deletion
software/include/fdelay_private.h
View file @ 754b2473
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define CS_DAC 0 /* AD9516 PLL */ #define CS_DAC 0 /* AD9516 PLL */
#define CS_PLL 1 /* AD9516 PLL */ #define CS_PLL 1 /* AD9516 PLL */
#define CS_GPIO 2 /* MCP23S17 GPIO */ #define CS_GPIO 2 /* MCP23S17 GPIO */
#define CS_NONE 3
/* MCP23S17 GPIO expander pin locations: bit 8 = select bank 2, bits 7..0 = mask of the pin in the selected bank */ /* MCP23S17 GPIO expander pin locations: bit 8 = select bank 2, bits 7..0 = mask of the pin in the selected bank */
#define SGPIO_TERM_EN (1<<0) /* Input termination enable (1 = on) */ #define SGPIO_TERM_EN (1<<0) /* Input termination enable (1 = on) */
......
software/lib/fdelay_lib.c
View file @ 754b2473
...@@ -273,6 +273,7 @@ MCP23S17 SPI I/O Port Driver ...@@ -273,6 +273,7 @@ MCP23S17 SPI I/O Port Driver
static inline void mcp_write(fdelay_device_t *dev, uint8_t reg, uint8_t val) static inline void mcp_write(fdelay_device_t *dev, uint8_t reg, uint8_t val)
{ {
oc_spi_txrx(dev, CS_GPIO, 24, 0x4e0000 | (((uint32_t)reg)<<8) | (uint32_t)val, NULL); oc_spi_txrx(dev, CS_GPIO, 24, 0x4e0000 | (((uint32_t)reg)<<8) | (uint32_t)val, NULL);
oc_spi_txrx(dev, CS_NONE, 24, 0, NULL);
} }
/* Reads MCP23S17 register */ /* Reads MCP23S17 register */
...@@ -280,6 +281,8 @@ static uint8_t mcp_read(fdelay_device_t *dev, uint8_t reg) ...@@ -280,6 +281,8 @@ static uint8_t mcp_read(fdelay_device_t *dev, uint8_t reg)
{ {
uint32_t rval; uint32_t rval;
oc_spi_txrx(dev, CS_GPIO, 24, 0x4f0000 | (((uint32_t)reg)<<8), &rval); oc_spi_txrx(dev, CS_GPIO, 24, 0x4f0000 | (((uint32_t)reg)<<8), &rval);
oc_spi_txrx(dev, CS_NONE, 24, 0, NULL);
return rval & 0xff; return rval & 0xff;
} }
...@@ -1141,6 +1144,24 @@ int fdelay_configure_readout(fdelay_device_t *dev, int enable) ...@@ -1141,6 +1144,24 @@ int fdelay_configure_readout(fdelay_device_t *dev, int enable)
return 0; return 0;
} }
fdelay_time_t ts_normalize(fdelay_time_t denorm)
{
if(denorm.coarse & (1<<27))
{
denorm.coarse += 125000000;
denorm.coarse &= 0xfffffff;
denorm.utc--;
}
if(denorm.coarse >= 125000000)
{
denorm.coarse -= 125000000;
denorm.utc++;
}
return denorm;
}
/* Reads up to (how_many) timestamps from the FD ring buffer and stores them in (timestamps). /* Reads up to (how_many) timestamps from the FD ring buffer and stores them in (timestamps).
Returns the number of read timestamps. */ Returns the number of read timestamps. */
int fdelay_read(fdelay_device_t *dev, fdelay_time_t *timestamps, int how_many) int fdelay_read(fdelay_device_t *dev, fdelay_time_t *timestamps, int how_many)
...@@ -1164,7 +1185,7 @@ int fdelay_read(fdelay_device_t *dev, fdelay_time_t *timestamps, int how_many) ...@@ -1164,7 +1185,7 @@ int fdelay_read(fdelay_device_t *dev, fdelay_time_t *timestamps, int how_many)
ts.seq_id = FD_TSBR_FID_SEQID_R(seq_frac); ts.seq_id = FD_TSBR_FID_SEQID_R(seq_frac);
// ts.channel = FD_TSBR_FID_CHANNEL_R(seq_frac); // ts.channel = FD_TSBR_FID_CHANNEL_R(seq_frac);
*timestamps++ = ts_add_ps(ts, hw->input_user_offset); *timestamps++ = ts_add_ps(ts_normalize(ts), hw->input_user_offset);
how_many--; how_many--;
n_read++; n_read++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment