Skip to content

L
LHC Instability Trigger Distribution LIST
Commit a2b128c8 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

rt: add \r for better visualization 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@vaga.pv.it>
parent 9ec18b1b
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
rt/fd/wrtd-rt-fd.c
View file @ a2b128c8
...@@ -101,7 +101,7 @@ void wr_update_link(void) ...@@ -101,7 +101,7 @@ void wr_update_link(void)
break; break;
case WR_LINK_SYNCING: case WR_LINK_SYNCING:
if (wr_time_locked()) { if (wr_time_locked()) {
pp_printf("WR link up!\n"); pp_printf("WR link up!\n\r");
wr_state = WR_LINK_SYNCED; wr_state = WR_LINK_SYNCED;
} }
break; break;
...@@ -112,7 +112,7 @@ void wr_update_link(void) ...@@ -112,7 +112,7 @@ void wr_update_link(void)
} }
if( wr_state != WR_LINK_OFFLINE && !wr_link_up() ) { if( wr_state != WR_LINK_OFFLINE && !wr_link_up() ) {
pp_printf("rt-out: WR sync lost\n"); pp_printf("rt-out: WR sync lost\n\r");
wr_state = WR_LINK_OFFLINE; wr_state = WR_LINK_OFFLINE;
wr_enable_lock(0); wr_enable_lock(0);
} }
...@@ -527,7 +527,7 @@ static void enqueue_trigger(int output, struct lrt_output_rule *rule, ...@@ -527,7 +527,7 @@ static void enqueue_trigger(int output, struct lrt_output_rule *rule,
struct wrtd_trigger_entry ent; struct wrtd_trigger_entry ent;
#ifdef RTDEBUG #ifdef RTDEBUG
pp_printf("%s:%d ch %d 0x%x\n", __func__, __LINE__, output, rule->state); pp_printf("%s:%d ch %d 0x%x\n\r", __func__, __LINE__, output, rule->state);
#endif #endif
if(rule->state & HASH_ENT_DISABLED) if(rule->state & HASH_ENT_DISABLED)
return; return;
...@@ -625,7 +625,7 @@ static void filter_trigger(struct wrtd_trigger_entry *trig) ...@@ -625,7 +625,7 @@ static void filter_trigger(struct wrtd_trigger_entry *trig)
log_trigger(WRTD_LOG_PROMISC, 0, NULL, trig); log_trigger(WRTD_LOG_PROMISC, 0, NULL, trig);
wrtd_out_device.last_received = *trig; wrtd_out_device.last_received = *trig;
#ifdef RTDEBUG #ifdef RTDEBUG
pp_printf("%s:%d Trigger %d:%d:%d - entry %p\n", pp_printf("%s:%d Trigger %d:%d:%d - entry %p\n\r",
__func__, __LINE__, __func__, __LINE__,
trig->id.system, trig->id.source_port, trig->id.trigger, ent); trig->id.system, trig->id.source_port, trig->id.trigger, ent);
#endif #endif
...@@ -756,7 +756,7 @@ static int wrtd_out_hash_table_insert(struct trtl_proto_header *hin, void *pin, ...@@ -756,7 +756,7 @@ static int wrtd_out_hash_table_insert(struct trtl_proto_header *hin, void *pin,
int hidx; int hidx;
if (tlist_count >= FD_HASH_ENTRIES) { if (tlist_count >= FD_HASH_ENTRIES) {
pp_printf("Too many triggers %d/%d\n", pp_printf("Too many triggers %d/%d\n\r",
tlist_count, FD_HASH_ENTRIES); tlist_count, FD_HASH_ENTRIES);
return -1; return -1;
} }
...@@ -789,7 +789,7 @@ static int wrtd_out_hash_table_remove(struct trtl_proto_header *hin, void *pin, ...@@ -789,7 +789,7 @@ static int wrtd_out_hash_table_remove(struct trtl_proto_header *hin, void *pin,
int hidx; int hidx;
if (tlist_count <= 0) { if (tlist_count <= 0) {
pp_printf("No trigger to remove %d/%d\n", pp_printf("No trigger to remove %d/%d\n\r",
tlist_count, FD_HASH_ENTRIES); tlist_count, FD_HASH_ENTRIES);
return -1; return -1;
} }
...@@ -821,12 +821,12 @@ static int wrtd_out_trigger_index(struct trtl_proto_header *hin, void *pin, ...@@ -821,12 +821,12 @@ static int wrtd_out_trigger_index(struct trtl_proto_header *hin, void *pin,
/* Verify that the size is correct */ /* Verify that the size is correct */
if (hin->len * 4 != sizeof(struct wrtd_trig_id)) { if (hin->len * 4 != sizeof(struct wrtd_trig_id)) {
pp_printf("%s: wrong incoming message size %d (expected %d)\n", pp_printf("%s: wrong incoming message size %d (expected %d)\n\r",
__func__, hin->len * 4, sizeof(struct wrtd_trig_id)); __func__, hin->len * 4, sizeof(struct wrtd_trig_id));
goto err; goto err;
} }
if (!pout) { if (!pout) {
pp_printf("%s: missing payload)\n", __func__); pp_printf("%s: missing payload)\n\r", __func__);
goto err; goto err;
} }
...@@ -980,7 +980,7 @@ void init(void) ...@@ -980,7 +980,7 @@ void init(void)
wrtd_out_channels[i].priv.idle = 1; wrtd_out_channels[i].priv.idle = 1;
wrtd_out_channels[i].config.dead_time = 80000 / 8; // 80 us wrtd_out_channels[i].config.dead_time = 80000 / 8; // 80 us
wrtd_out_channels[i].config.width_cycles = 1250; // 1us wrtd_out_channels[i].config.width_cycles = 1250; // 1us
pp_printf("mode %d %d\n", i , wrtd_out_channels[i].config.mode); pp_printf("mode %d %d\n\r", i , wrtd_out_channels[i].config.mode);
} }
/* Triggers */ /* Triggers */
...@@ -1000,7 +1000,7 @@ void init(void) ...@@ -1000,7 +1000,7 @@ void init(void)
wrtd_out_structures[j].len = sizeof(struct wrtd_out_trigger); wrtd_out_structures[j].len = sizeof(struct wrtd_out_trigger);
} }
pp_printf("rt-output firmware initialized.\n"); pp_printf("rt-output firmware initialized.\n\r");
} }
int main(void) int main(void)
......
rt/tdc/wrtd-rt-tdc.c
View file @ a2b128c8
...@@ -336,14 +336,14 @@ void wr_update_link(void) ...@@ -336,14 +336,14 @@ void wr_update_link(void)
break; break;
case WR_LINK_SYNCING: case WR_LINK_SYNCING:
if (wr_time_locked()) { if (wr_time_locked()) {
pp_printf("rt-tdc: WR synced, waiting for TDC plumbing to catch up...\n"); pp_printf("rt-tdc: WR synced, waiting for TDC plumbing to catch up...\n\r");
wr_state = WR_LINK_TDC_WAIT; wr_state = WR_LINK_TDC_WAIT;
tai_start = lr_readl(WRN_CPU_LR_REG_TAI_SEC); tai_start = lr_readl(WRN_CPU_LR_REG_TAI_SEC);
} }
break; break;
case WR_LINK_TDC_WAIT: case WR_LINK_TDC_WAIT:
if (lr_readl(WRN_CPU_LR_REG_TAI_SEC) == (tai_start + 4)) { if (lr_readl(WRN_CPU_LR_REG_TAI_SEC) == (tai_start + 4)) {
pp_printf("rt-tdc: WR TDC synced\n"); pp_printf("rt-tdc: WR TDC synced\n\r");
wr_state = WR_LINK_SYNCED; wr_state = WR_LINK_SYNCED;
} }
break; break;
...@@ -354,7 +354,7 @@ void wr_update_link(void) ...@@ -354,7 +354,7 @@ void wr_update_link(void)
} }
if ( wr_state != WR_LINK_OFFLINE && !wr_link_up() ) { if ( wr_state != WR_LINK_OFFLINE && !wr_link_up() ) {
pp_printf("rt-tdc: WR sync lost\n"); pp_printf("rt-tdc: WR sync lost\n\r");
wr_state = WR_LINK_OFFLINE; wr_state = WR_LINK_OFFLINE;
wr_enable_lock(0); wr_enable_lock(0);
} }
......
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