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
47
Issues
47
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
2dd6b463
Commit
2dd6b463
authored
Nov 21, 2018
by
Jean-Claude BAU
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix: Hook handling in slave state for SYNC messages
parent
fd1c5d4c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
state-slave.c
proto-standard/state-slave.c
+7
-7
No files found.
proto-standard/state-slave.c
View file @
2dd6b463
...
@@ -38,7 +38,6 @@ static int slave_handle_sync(struct pp_instance *ppi, void *buf,
...
@@ -38,7 +38,6 @@ static int slave_handle_sync(struct pp_instance *ppi, void *buf,
{
{
MsgHeader
*
hdr
=
&
ppi
->
received_ptp_header
;
MsgHeader
*
hdr
=
&
ppi
->
received_ptp_header
;
MsgSync
sync
;
MsgSync
sync
;
int
ret
=
0
;
if
(
!
msg_from_current_master
(
ppi
))
if
(
!
msg_from_current_master
(
ppi
))
return
0
;
return
0
;
...
@@ -66,12 +65,13 @@ static int slave_handle_sync(struct pp_instance *ppi, void *buf,
...
@@ -66,12 +65,13 @@ static int slave_handle_sync(struct pp_instance *ppi, void *buf,
pp_time_add
(
&
ppi
->
t1
,
&
hdr
->
cField
);
pp_time_add
(
&
ppi
->
t1
,
&
hdr
->
cField
);
ppi
->
syncCF
=
0
;
ppi
->
syncCF
=
0
;
/* Call the extension; it may do it all and ask to return */
/* Call the extension; it may do it all and ask to return */
if
(
ppi
->
ext_hooks
->
handle_sync
)
if
(
ppi
->
ext_hooks
->
handle_sync
)
{
ret
=
ppi
->
ext_hooks
->
handle_sync
(
ppi
,
&
ppi
->
t1
);
int
ret
=
ppi
->
ext_hooks
->
handle_sync
(
ppi
,
&
ppi
->
t1
);
if
(
ret
==
1
)
if
(
ret
==
1
)
return
0
;
return
0
;
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
}
if
(
CONFIG_HAS_P2P
&&
ppi
->
delayMechanism
==
P2P
)
if
(
CONFIG_HAS_P2P
&&
ppi
->
delayMechanism
==
P2P
)
pp_servo_got_psync
(
ppi
);
pp_servo_got_psync
(
ppi
);
else
else
...
...
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