Skip to content

W
White Rabbit Trigger Distribution
Commit 369dd3f2 authored by Dimitris Lampridis's avatar Dimitris Lampridis
Browse files
Options

sw: fix wrong CPU index in wrtd out lib

parent 65cb8d57
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
software/lib/libwrtd-output.c
View file @ 369dd3f2
......@@ -153,7 +153,7 @@ int wrtd_out_state_get(struct wrtd_node *dev, unsigned int output,
return -1;
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
......@@ -187,7 +187,7 @@ int wrtd_out_state_get(struct wrtd_node *dev, unsigned int output,
tlv.type = OUT_STRUCT_DEVICE;
tlv.size = sizeof(struct wrtd_out);
tlv.buf = &out;
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
state->received_messages = out.counter_etherbone;
......@@ -218,7 +218,7 @@ int wrtd_out_enable(struct wrtd_node *dev, unsigned int output,
return -1;
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
......@@ -234,7 +234,7 @@ int wrtd_out_enable(struct wrtd_node *dev, unsigned int output,
return -1;
}
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
}
......@@ -254,7 +254,7 @@ static int wrtd_out_trig_assign_condition_by_index(struct wrtd_node *dev,
}
tlv = wrtd_trigger_tlv(trig_idx, &trig);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
wrtd_output_rule_endianess_fix(&trig.ocfg[output]);
......@@ -270,12 +270,12 @@ static int wrtd_out_trig_assign_condition_by_index(struct wrtd_node *dev,
trig.ocfg[output].cond_ptr = cond_idx;
wrtd_output_rule_endianess_fix(&trig.ocfg[output]);
err = trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
tlv = wrtd_trigger_tlv(cond_idx, &trig);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
wrtd_output_rule_endianess_fix(&trig.ocfg[output]);
......@@ -291,7 +291,7 @@ static int wrtd_out_trig_assign_condition_by_index(struct wrtd_node *dev,
trig.ocfg[output].cond_ptr = -1;
wrtd_output_rule_endianess_fix(&trig.ocfg[output]);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
}
......@@ -311,13 +311,13 @@ static int wrtd_out_flag_set(struct wrtd_node *dev, unsigned int output,
return -1;
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
chan.config.flags |= flags;
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
}
/**
......@@ -337,13 +337,13 @@ static int wrtd_out_flag_clr(struct wrtd_node *dev, unsigned int output,
return -1;
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
chan.config.flags &= ~flags;
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
}
static int wrtd_out_trig_assign_one(struct wrtd_node *dev, unsigned int output,
......@@ -367,7 +367,7 @@ static int wrtd_out_trig_assign_one(struct wrtd_node *dev, unsigned int output,
handle->ptr_trig = ret;
tlv = wrtd_trigger_tlv(handle->ptr_trig, &trig);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
......@@ -380,7 +380,7 @@ static int wrtd_out_trig_assign_one(struct wrtd_node *dev, unsigned int output,
trig.ocfg[handle->channel].cond_ptr = -1;
wrtd_output_rule_endianess_fix(&trig.ocfg[handle->channel]);
err = trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
......@@ -453,7 +453,7 @@ int wrtd_out_trig_unassign(struct wrtd_node *dev,
return -1;
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
wrtd_output_rule_endianess_fix(&trig.ocfg[handle->channel]);
......@@ -467,7 +467,7 @@ int wrtd_out_trig_unassign(struct wrtd_node *dev,
trig.flags &= ~ENTRY_FLAG_VALID;
wrtd_output_rule_endianess_fix(&trig.ocfg[handle->channel]);
err = trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
err = wrtd_out_trigger_remove(wrtd, handle->ptr_trig);
......@@ -606,7 +606,7 @@ int wrtd_out_trig_state_get_by_index(struct wrtd_node *dev, unsigned int index,
struct wrtd_output_trigger_state cond;
int err;
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
wrtd_output_rule_endianess_fix(&trig.ocfg[output]);
......@@ -674,7 +674,7 @@ static int wrtd_out_rule_delay_set(struct wrtd_node *dev,
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
wrtd_output_rule_endianess_fix(&trig.ocfg[output]);
......@@ -689,7 +689,7 @@ static int wrtd_out_rule_delay_set(struct wrtd_node *dev,
trig.ocfg[output].delay_frac = t.frac;
wrtd_output_rule_endianess_fix(&trig.ocfg[output]);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
}
......@@ -733,13 +733,13 @@ int wrtd_out_pulse_width_set(struct wrtd_node *dev, unsigned int output,
return -1;
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
chan.config.width_cycles = width_ps / 8000ULL;
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
}
......@@ -770,13 +770,13 @@ int wrtd_out_dead_time_set(struct wrtd_node *dev, unsigned int output,
return -1;
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
chan.config.dead_time = dead_time_ps / 8000;
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
}
......@@ -820,7 +820,7 @@ int wrtd_out_trig_enable(struct wrtd_node *dev,
return -1;
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
wrtd_output_rule_endianess_fix(&trig.ocfg[handle->channel]);
......@@ -836,7 +836,7 @@ int wrtd_out_trig_enable(struct wrtd_node *dev,
trig.ocfg[handle->channel].state |= HASH_ENT_DISABLED;
wrtd_output_rule_endianess_fix(&trig.ocfg[handle->channel]);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
}
......@@ -861,7 +861,7 @@ int wrtd_out_trigger_mode_set(struct wrtd_node *dev,
return -1;
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
......@@ -872,7 +872,7 @@ int wrtd_out_trigger_mode_set(struct wrtd_node *dev,
chan.config.state = OUT_ST_IDLE;
}
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
}
......@@ -895,7 +895,7 @@ int wrtd_out_arm(struct wrtd_node *dev, unsigned int output, int armed)
return -1;
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
......@@ -908,7 +908,7 @@ int wrtd_out_arm(struct wrtd_node *dev, unsigned int output, int armed)
chan.config.state = OUT_ST_IDLE;
}
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
}
......@@ -929,7 +929,7 @@ int wrtd_out_counters_reset(struct wrtd_node *dev, unsigned int output)
return -1;
}
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
err = trtl_fw_buffer_get(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
if (err)
return err;
......@@ -939,7 +939,7 @@ int wrtd_out_counters_reset(struct wrtd_node *dev, unsigned int output)
chan.stats.miss_overflow = 0;
chan.config.flags &= ~WRTD_LAST_VALID;
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_TDC, 0, &tlv, 1);
return trtl_fw_buffer_set(wrtd->trtl, WRTD_CPU_FD, 0, &tlv, 1);
}
......@@ -1075,7 +1075,7 @@ int wrtd_out_base_time(struct wrtd_node *dev, struct wr_timestamp *ts)
OUT_VAR_DEVICE_TIME_T, 0};
int err;
err = trtl_fw_variable_get(wrtd->trtl, WRTD_CPU_TDC, 0, variables, 2);
err = trtl_fw_variable_get(wrtd->trtl, WRTD_CPU_FD, 0, variables, 2);
if (err)
return err;
ts->seconds = variables[1];
......
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