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
d5fa46ca
Commit
d5fa46ca
authored
Apr 15, 2016
by
Adam Wujek
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wr-servo: pass ppi context to the wr_servo_reset
Signed-off-by:
Adam Wujek
<
adam.wujek@cern.ch
>
parent
fb0941b2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
12 deletions
+7
-12
wrc_ptp_ppsi.c
arch-wrpc/wrc_ptp_ppsi.c
+2
-2
main-loop.c
arch-wrs/main-loop.c
+1
-1
wr-api.h
proto-ext-whiterabbit/wr-api.h
+1
-1
wr-servo.c
proto-ext-whiterabbit/wr-servo.c
+3
-8
No files found.
arch-wrpc/wrc_ptp_ppsi.c
View file @
d5fa46ca
...
...
@@ -201,7 +201,7 @@ int wrc_ptp_start()
start_tics
=
timer_get_tics
();
WR_DSPOR
(
ppi
)
->
linkUP
=
FALSE
;
wr_servo_reset
();
wr_servo_reset
(
ppi
);
ptp_enabled
=
1
;
return
0
;
...
...
@@ -219,7 +219,7 @@ int wrc_ptp_stop()
ppi
->
frgn_rec_num
=
0
;
/* no known master */
ptp_enabled
=
0
;
wr_servo_reset
();
wr_servo_reset
(
ppi
);
pp_close_globals
(
&
ppg_static
);
return
0
;
...
...
arch-wrs/main-loop.c
View file @
d5fa46ca
...
...
@@ -57,7 +57,7 @@ static int run_all_state_machines(struct pp_globals *ppg)
ppi
->
frgn_rec_num
=
0
;
ppi
->
frgn_rec_best
=
-
1
;
if
(
ppg
->
ebest_idx
==
ppi
->
port_idx
)
wr_servo_reset
();
wr_servo_reset
(
ppi
);
}
}
...
...
proto-ext-whiterabbit/wr-api.h
View file @
d5fa46ca
...
...
@@ -131,7 +131,7 @@ enum {
/* wr_servo interface */
int
wr_servo_init
(
struct
pp_instance
*
ppi
);
void
wr_servo_reset
(
void
);
void
wr_servo_reset
(
struct
pp_instance
*
ppi
);
void
wr_servo_enable_tracking
(
int
enable
);
int
wr_servo_got_sync
(
struct
pp_instance
*
ppi
,
TimeInternal
*
t1
,
TimeInternal
*
t2
);
...
...
proto-ext-whiterabbit/wr-servo.c
View file @
d5fa46ca
...
...
@@ -28,9 +28,6 @@ static const char *servo_name[] = {
/* Enable tracking by default. Disabling the tracking is used for demos. */
static
int
tracking_enabled
=
1
;
extern
struct
wrs_shm_head
*
ppsi_head
;
static
struct
wr_servo_state
*
saved_servo_pointer
;
/* required for
* wr_servo_reset, which doesn't
* have ppi context. */
void
wr_servo_enable_tracking
(
int
enable
)
{
...
...
@@ -144,10 +141,9 @@ static TimeInternal ts_hardwarize(TimeInternal ts, int clock_period_ps)
static
int
got_sync
=
0
;
void
wr_servo_reset
(
void
)
void
wr_servo_reset
(
struct
pp_instance
*
ppi
)
{
if
(
saved_servo_pointer
)
saved_servo_pointer
->
flags
=
0
;
ppi
->
flags
=
0
;
}
static
inline
int32_t
delta_to_ps
(
struct
FixedDelta
d
)
...
...
@@ -184,8 +180,7 @@ int wr_servo_init(struct pp_instance *ppi)
strcpy
(
s
->
servo_state_name
,
"Uninitialized"
);
saved_servo_pointer
=
s
;
saved_servo_pointer
->
flags
|=
WR_FLAG_VALID
;
s
->
flags
|=
WR_FLAG_VALID
;
s
->
update_count
=
0
;
s
->
tracking_enabled
=
tracking_enabled
;
...
...
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