Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
PPSi
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
50
Issues
50
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
PPSi
Commits
4e060475
Commit
4e060475
authored
Oct 03, 2014
by
Grzegorz Daniluk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't kill pps-out when we connect backup link
parent
2810cbee
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
wr-servo.c
proto-ext-whiterabbit/wr-servo.c
+4
-3
No files found.
proto-ext-whiterabbit/wr-servo.c
View file @
4e060475
...
...
@@ -156,7 +156,8 @@ int wr_servo_init(struct pp_instance *ppi)
&
s
->
fiber_fix_alpha
,
&
s
->
clock_period_ps
)
!=
WR_HW_CALIB_OK
)
return
-
1
;
wrp
->
ops
->
enable_timing_output
(
ppi
,
0
);
if
(
ppi
->
slave_prio
==
0
)
wrp
->
ops
->
enable_timing_output
(
ppi
,
0
);
/* FIXME useful?
strncpy(s->if_name, clock->netPath.ifaceName, 16);
...
...
@@ -329,7 +330,7 @@ int wr_servo_update(struct pp_instance *ppi)
if
(
wrp
->
ops
->
locking_poll
(
ppi
,
0
)
!=
WR_SPLL_READY
)
{
pp_diag
(
ppi
,
servo
,
1
,
"PLL OutOfLock, should restart sync
\n
"
);
wrp
->
ops
->
enable_timing_output
(
ppi
,
0
);
if
(
ppi
->
slave_prio
==
0
)
wrp
->
ops
->
enable_timing_output
(
ppi
,
0
);
/* TODO check
* DSPOR(ppi)->doRestart = TRUE; */
}
...
...
@@ -351,7 +352,7 @@ int wr_servo_update(struct pp_instance *ppi)
case
WR_SYNC_TAI
:
pp_diag
(
ppi
,
servo
,
1
,
" WR_SYNC_TAI
\n
"
);
wrp
->
ops
->
enable_timing_output
(
ppi
,
0
);
if
(
ppi
->
slave_prio
==
0
)
wrp
->
ops
->
enable_timing_output
(
ppi
,
0
);
if
(
ts_offset_hw
.
seconds
!=
0
)
{
pp_diag
(
ppi
,
servo
,
1
,
" WR_SYNC_TAI-> counters touching at seconds
\n
"
);
...
...
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