Skip to content

W
White Rabbit Trigger Distribution
Commit eb5fe4c2 authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

firmware: reorder functions to match the call order.

parent a8349640
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
software/firmware/adc-x2/wrtd-rt-adc-x2.c
View file @ eb5fe4c2
......@@ -49,12 +49,6 @@ static inline int wr_link_up(void)
return adcin_wr_link_up(&adcin[0]);
}
static inline int wr_aux_locked(void)
{
/* No aux clock. */
return 1;
}
static inline int wr_time_ready(void)
{
/* Same time for everyone. */
......@@ -66,6 +60,12 @@ static inline void wr_enable_lock(int enable)
/* No lock. */
}
static inline int wr_aux_locked(void)
{
/* No aux clock. */
return 1;
}
static inline int wr_sync_timeout(void)
{
/* No timeout. */
......
software/firmware/adc/wrtd-rt-adc.c
View file @ eb5fe4c2
......@@ -47,11 +47,6 @@ static inline int wr_link_up(void)
return 1;
}
static inline int wr_aux_locked(void)
{
return 1;
}
static inline int wr_time_ready(void)
{
if (!adcin_wr_time_ready(&adcin0))
......@@ -64,6 +59,11 @@ static inline void wr_enable_lock(int enable)
/* No aux clock on ADC boards */
}
static inline int wr_aux_locked(void)
{
return 1;
}
static inline int wr_sync_timeout(void)
{
return 0;
......
software/firmware/fd-x2/wrtd-rt-fd-x2.c
View file @ eb5fe4c2
......@@ -51,11 +51,6 @@ static int wr_link_up(void)
return fd_wr_link_up(&fd0);
}
static int wr_aux_locked(void)
{
return fd_wr_aux_locked(&fd0) && fd_wr_aux_locked(&fd1);
}
static int wr_time_ready(void)
{
return fd_wr_time_ready(&fd0);
......@@ -67,6 +62,11 @@ static void wr_enable_lock(int enable)
fd_wr_enable_lock(&fd1, enable);
}
static int wr_aux_locked(void)
{
return fd_wr_aux_locked(&fd0) && fd_wr_aux_locked(&fd1);
}
static inline int wr_sync_timeout(void)
{
#ifdef SIMULATION
......
software/firmware/fd/wrtd-rt-fd.c
View file @ eb5fe4c2
......@@ -40,11 +40,6 @@ static int wr_link_up(void)
return fd_wr_link_up(&fd0);
}
static int wr_aux_locked(void)
{
return fd_wr_aux_locked(&fd0);
}
static int wr_time_ready(void)
{
return fd_wr_time_ready(&fd0);
......@@ -55,6 +50,11 @@ static void wr_enable_lock(int enable)
fd_wr_enable_lock(&fd0, enable);
}
static int wr_aux_locked(void)
{
return fd_wr_aux_locked(&fd0);
}
static inline int wr_sync_timeout(void)
{
#ifdef SIMULATION
......
software/firmware/tdc-x2/wrtd-rt-tdc-x2.c
View file @ eb5fe4c2
......@@ -48,11 +48,6 @@ static inline int wr_link_up(void)
return tdc_wr_link_up(&tdc0);
}
static inline int wr_aux_locked(void)
{
return tdc_wr_aux_locked(&tdc0) && tdc_wr_aux_locked(&tdc1);
}
static inline int wr_time_ready(void)
{
// Same value for tdc0 and tdc1.
......@@ -65,6 +60,11 @@ static inline void wr_enable_lock(int enable)
tdc_wr_enable_lock(&tdc1, enable);
}
static inline int wr_aux_locked(void)
{
return tdc_wr_aux_locked(&tdc0) && tdc_wr_aux_locked(&tdc1);
}
static inline int wr_sync_timeout(void)
{
#ifdef SIMULATION
......
software/firmware/tdc/wrtd-rt-tdc.c
View file @ eb5fe4c2
......@@ -40,11 +40,6 @@ static inline int wr_link_up(void)
return tdc_wr_link_up(&tdc0);
}
static inline int wr_aux_locked(void)
{
return tdc_wr_aux_locked(&tdc0);
}
static inline int wr_time_ready(void)
{
return tdc_wr_time_ready(&tdc0);
......@@ -55,6 +50,11 @@ static inline void wr_enable_lock(int enable)
tdc_wr_enable_lock(&tdc0, enable);
}
static inline int wr_aux_locked(void)
{
return tdc_wr_aux_locked(&tdc0);
}
static inline int wr_sync_timeout(void)
{
#ifdef SIMULATION
......
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