Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Software for White Rabbit PTP Core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
30
Issues
30
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Schedules
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
Software for White Rabbit PTP Core
Commits
6194dc7c
Commit
6194dc7c
authored
Aug 18, 2014
by
Grzegorz Daniluk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
spll: don't touch MPLL when in free-running mode
parent
146c1411
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
spll_main.c
softpll/spll_main.c
+6
-1
spll_main.h
softpll/spll_main.h
+1
-0
No files found.
softpll/spll_main.c
View file @
6194dc7c
...
@@ -40,6 +40,7 @@ void mpll_init(struct spll_main_state *s, int id_ref,
...
@@ -40,6 +40,7 @@ void mpll_init(struct spll_main_state *s, int id_ref,
#error "Please set CONFIG for wr switch or wr node"
#error "Please set CONFIG for wr switch or wr node"
#endif
#endif
s
->
delock_count
=
0
;
s
->
delock_count
=
0
;
s
->
enabled
=
0
;
/* Freqency branch lock detection */
/* Freqency branch lock detection */
s
->
ld
.
threshold
=
1200
;
s
->
ld
.
threshold
=
1200
;
...
@@ -71,7 +72,7 @@ void mpll_start(struct spll_main_state *s)
...
@@ -71,7 +72,7 @@ void mpll_start(struct spll_main_state *s)
s
->
phase_shift_target
=
0
;
s
->
phase_shift_target
=
0
;
s
->
phase_shift_current
=
0
;
s
->
phase_shift_current
=
0
;
s
->
sample_n
=
0
;
s
->
sample_n
=
0
;
s
->
enabled
=
1
;
pi_init
((
spll_pi_t
*
)
&
s
->
pi
);
pi_init
((
spll_pi_t
*
)
&
s
->
pi
);
ld_init
((
spll_lock_det_t
*
)
&
s
->
ld
);
ld_init
((
spll_lock_det_t
*
)
&
s
->
ld
);
...
@@ -83,10 +84,14 @@ void mpll_start(struct spll_main_state *s)
...
@@ -83,10 +84,14 @@ void mpll_start(struct spll_main_state *s)
void
mpll_stop
(
struct
spll_main_state
*
s
)
void
mpll_stop
(
struct
spll_main_state
*
s
)
{
{
spll_enable_tagger
(
s
->
id_out
,
0
);
spll_enable_tagger
(
s
->
id_out
,
0
);
s
->
enabled
=
0
;
}
}
int
mpll_update
(
struct
spll_main_state
*
s
,
int
tag
,
int
source
)
int
mpll_update
(
struct
spll_main_state
*
s
,
int
tag
,
int
source
)
{
{
if
(
!
s
->
enabled
)
return
SPLL_LOCKED
;
int
err
,
y
;
int
err
,
y
;
if
(
source
==
s
->
id_ref
)
if
(
source
==
s
->
id_ref
)
...
...
softpll/spll_main.h
View file @
6194dc7c
...
@@ -35,6 +35,7 @@ struct spll_main_state {
...
@@ -35,6 +35,7 @@ struct spll_main_state {
int
sample_n
;
int
sample_n
;
int
delock_count
;
int
delock_count
;
int
dac_index
;
int
dac_index
;
int
enabled
;
};
};
void
mpll_init
(
struct
spll_main_state
*
s
,
int
id_ref
,
void
mpll_init
(
struct
spll_main_state
*
s
,
int
id_ref
,
...
...
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