Skip to content

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

wrtd: minor cleanup.

parent d11fcb12
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 23 deletions
software/firmware/fd/wrtd-rt-fd.c
View file @ 9d98a661
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
#include "wrtd-fd.h" #include "wrtd-fd.h"
#define OUT_TIMEOUT 10
#define NBR_CPUS 2 #define NBR_CPUS 2
#define CPU_IDX 0 #define CPU_IDX 0
...@@ -41,11 +39,6 @@ struct wrtd_fd_dev fd0 = { ...@@ -41,11 +39,6 @@ struct wrtd_fd_dev fd0 = {
.io_addr = 0x0 .io_addr = 0x0
}; };
static int wr_present(void)
{
return fd_wr_present(&fd0);
}
static int wr_link_up(void) static int wr_link_up(void)
{ {
return fd_wr_link_up(&fd0); return fd_wr_link_up(&fd0);
...@@ -111,7 +104,7 @@ static int wrtd_o_sim_init(void) ...@@ -111,7 +104,7 @@ static int wrtd_o_sim_init(void)
*/ */
static int wrtd_user_init(void) static int wrtd_user_init(void)
{ {
if (!wr_present()) { if (!fd_wr_present(&fd0)) {
pr_error("WhiteRabbit not found\n\r"); pr_error("WhiteRabbit not found\n\r");
return -EINVAL; return -EINVAL;
} }
......
software/firmware/tdc/wrtd-rt-tdc.c
View file @ 9d98a661
...@@ -14,12 +14,6 @@ ...@@ -14,12 +14,6 @@
#include "hw/fmctdc-direct.h" #include "hw/fmctdc-direct.h"
#include "hw/tdc_regs.h" #include "hw/tdc_regs.h"
#ifdef SIMULATION
static const int is_simulation = 1;
#else
static const int is_simulation = 0;
#endif
#define NBR_CPUS 2 #define NBR_CPUS 2
#define CPU_IDX 0 #define CPU_IDX 0
...@@ -77,9 +71,9 @@ static void wrtd_local_output(struct wrtd_event *ev, unsigned ch) ...@@ -77,9 +71,9 @@ static void wrtd_local_output(struct wrtd_event *ev, unsigned ch)
return; return;
} }
#ifdef SIMULATION
static int wrtd_i_sim_init(struct wrtd_tdc_dev *tdc) static int wrtd_i_sim_init(struct wrtd_tdc_dev *tdc)
{ {
#if 0
/* TODO: preconfigure the rules. */ /* TODO: preconfigure the rules. */
int i; int i;
...@@ -91,25 +85,25 @@ static int wrtd_i_sim_init(struct wrtd_tdc_dev *tdc) ...@@ -91,25 +85,25 @@ static int wrtd_i_sim_init(struct wrtd_tdc_dev *tdc)
wrtd_in_channels[i].config.flags = wrtd_in_channels[i].config.flags =
WRTD_ENABLED | WRTD_ARMED | WRTD_TRIGGER_ASSIGNED; WRTD_ENABLED | WRTD_ARMED | WRTD_TRIGGER_ASSIGNED;
} }
#endif
tdc_writel(tdc, 0x40, BASE_DP_TDC_DIRECT + DR_REG_DEAD_TIME); tdc_writel(tdc, 0x40, BASE_DP_TDC_DIRECT + DR_REG_DEAD_TIME);
tdc_writel(tdc, 0x1f, BASE_DP_TDC_DIRECT + DR_REG_CHAN_ENABLE); tdc_writel(tdc, 0x1f, BASE_DP_TDC_DIRECT + DR_REG_CHAN_ENABLE);
return 0; return 0;
} }
#endif
static int wrtd_user_init(void) static int wrtd_user_init(void)
{ {
if (!is_simulation) #ifdef SIMULATION
tdc_init(&tdc0);
tdc_wr_enable_lock(&tdc0, 0);
/* Skip WR sync and automatically generate some events when /* Skip WR sync and automatically generate some events when
simulating */ simulating */
if (is_simulation) wrtd_i_sim_init(&tdc0);
wrtd_i_sim_init(&tdc0); #else
tdc_init(&tdc0);
#endif
wr_enable_lock(0);
pr_debug("rt-input firmware initialized.\n\r"); pr_debug("rt-input firmware initialized.\n\r");
......
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