Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
M
Mock Turtle
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Mock Turtle
Commits
db7739ed
Commit
db7739ed
authored
Jun 07, 2016
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wrtd:rt:*: fix white-spaces
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
019733e5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
18 deletions
+18
-18
wrtd-rt-fd.c
applications/wrtd/rt/fd/wrtd-rt-fd.c
+16
-16
wrtd-rt-tdc.c
applications/wrtd/rt/tdc/wrtd-rt-tdc.c
+2
-2
No files found.
applications/wrtd/rt/fd/wrtd-rt-fd.c
View file @
db7739ed
...
...
@@ -163,7 +163,7 @@ static int wrtd_out_hash_table_find(struct wrtd_trig_id *tid)
return
hidx
;
}
return
-
1
;
return
-
1
;
}
...
...
@@ -282,9 +282,9 @@ static inline int pulse_queue_empty(struct lrt_pulse_queue *p)
*/
static
struct
pulse_queue_entry
*
pulse_queue_front
(
struct
lrt_pulse_queue
*
p
)
{
if
(
!
p
->
count
)
return
NULL
;
return
&
p
->
data
[
p
->
tail
];
if
(
!
p
->
count
)
return
NULL
;
return
&
p
->
data
[
p
->
tail
];
}
...
...
@@ -462,7 +462,7 @@ static void do_output (struct wrtd_out_channel *out)
/* Output is idle: check if there's something in the queue to execute */
if
(
pulse_queue_empty
(
q
))
return
;
return
;
pq_ent
=
pulse_queue_front
(
q
);
ts
=
&
pq_ent
->
trig
.
ts
;
...
...
@@ -636,7 +636,7 @@ static void filter_trigger(struct wrtd_trigger_entry *trig)
void
do_rx
(
void
)
{
volatile
struct
wrtd_trigger_entry
*
ent
;
volatile
struct
wrtd_trigger_entry
*
ent
;
struct
wrtd_trigger_entry
trig
;
struct
wrtd_trigger_message
*
msg
;
int
i
;
...
...
@@ -737,7 +737,7 @@ static int wrtd_out_hash_table_free(struct wrtd_trig_id *tid)
if
(
trig_eq
(
tid
,
&
ht
[
hidx
]
->
id
))
break
;
}
return
-
1
;
return
-
1
;
}
...
...
@@ -818,7 +818,7 @@ static int wrtd_out_trigger_index(struct trtl_proto_header *hin, void *pin,
if
(
hin
->
len
*
4
!=
sizeof
(
struct
wrtd_trig_id
))
{
pp_printf
(
"%s: wrong incoming message size %d (expected %d)
\n
"
,
__func__
,
hin
->
len
*
4
,
sizeof
(
struct
wrtd_trig_id
));
goto
err
;
goto
err
;
}
if
(
!
pout
)
{
pp_printf
(
"%s: missing payload)
\n
"
,
__func__
);
...
...
@@ -967,14 +967,14 @@ void init(void)
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
memset
(
&
wrtd_out_channels
[
i
],
0
,
sizeof
(
struct
wrtd_out_channel
));
wrtd_out_channels
[
i
].
base_addr
=
0x100
+
i
*
0x100
;
wrtd_out_channels
[
i
].
n
=
i
;
wrtd_out_channels
[
i
].
config
.
mode
=
WRTD_TRIGGER_MODE_AUTO
;
wrtd_out_channels
[
i
].
priv
.
pending_trig
=
NULL
;
wrtd_out_channels
[
i
].
config
.
state
=
OUT_ST_IDLE
;
wrtd_out_channels
[
i
].
priv
.
idle
=
1
;
wrtd_out_channels
[
i
].
config
.
dead_time
=
80000
/
8
;
// 80 us
wrtd_out_channels
[
i
].
config
.
width_cycles
=
1250
;
// 1us
wrtd_out_channels
[
i
].
base_addr
=
0x100
+
i
*
0x100
;
wrtd_out_channels
[
i
].
n
=
i
;
wrtd_out_channels
[
i
].
config
.
mode
=
WRTD_TRIGGER_MODE_AUTO
;
wrtd_out_channels
[
i
].
priv
.
pending_trig
=
NULL
;
wrtd_out_channels
[
i
].
config
.
state
=
OUT_ST_IDLE
;
wrtd_out_channels
[
i
].
priv
.
idle
=
1
;
wrtd_out_channels
[
i
].
config
.
dead_time
=
80000
/
8
;
// 80 us
wrtd_out_channels
[
i
].
config
.
width_cycles
=
1250
;
// 1us
pp_printf
(
"mode %d %d
\n
"
,
i
,
wrtd_out_channels
[
i
].
config
.
mode
);
}
...
...
applications/wrtd/rt/tdc/wrtd-rt-tdc.c
View file @
db7739ed
...
...
@@ -278,7 +278,7 @@ static int wrtd_in_trigger_sw(struct trtl_proto_header *hin, void *pin,
So add to it the current time */
struct
wr_timestamp
ts_orig
;
ts_orig
.
seconds
=
lr_readl
(
WRN_CPU_LR_REG_TAI_SEC
);
ts_orig
.
ticks
=
lr_readl
(
WRN_CPU_LR_REG_TAI_CYCLES
);
...
...
@@ -349,7 +349,7 @@ void wr_update_link(void)
}
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
"
);
wr_state
=
WR_LINK_OFFLINE
;
wr_enable_lock
(
0
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment