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
38427664
Commit
38427664
authored
Oct 24, 2016
by
Alessandro Rubini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
time: fix proto-ext-whiterabbit
Signed-off-by:
Alessandro Rubini
<
rubini@gnudd.com
>
parent
8d4eba82
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
152 additions
and
165 deletions
+152
-165
hooks.c
proto-ext-whiterabbit/hooks.c
+16
-26
wr-api.h
proto-ext-whiterabbit/wr-api.h
+2
-3
wr-servo.c
proto-ext-whiterabbit/wr-servo.c
+132
-134
state-slave.c
proto-standard/state-slave.c
+2
-2
No files found.
proto-ext-whiterabbit/hooks.c
View file @
38427664
...
...
@@ -73,9 +73,9 @@ static int wr_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
static
int
wr_handle_preq
(
struct
pp_instance
*
ppi
)
{
ppi
->
received_ptp_header
.
correctionfield
.
msb
=
0
;
ppi
->
received_ptp_header
.
correctionfield
.
lsb
=
phase_to_cf_units
(
ppi
->
last_rcv_time
.
phase
)
;
/* FIXME: why do we save this fractional part? */
clear_time
(
&
ppi
->
cField
);
ppi
->
cField
.
scaled_nsecs
=
ppi
->
last_rcv_time
.
scaled_nsecs
&
0xffff
;
return
0
;
}
...
...
@@ -84,7 +84,7 @@ static int wr_master_msg(struct pp_instance *ppi, unsigned char *pkt, int plen,
{
MsgHeader
*
hdr
=
&
ppi
->
received_ptp_header
;
MsgSignaling
wrsig_msg
;
TimeInternal
*
time
=
&
ppi
->
last_rcv_time
;
struct
pp_time
*
time
=
&
ppi
->
last_rcv_time
;
if
(
msgtype
!=
PPM_NO_MESSAGE
)
pp_diag
(
ppi
,
ext
,
2
,
"hook: %s
\n
"
,
__func__
);
...
...
@@ -93,9 +93,8 @@ static int wr_master_msg(struct pp_instance *ppi, unsigned char *pkt, int plen,
/* This case is modified from the default one */
case
PPM_DELAY_REQ
:
hdr
->
correctionfield
.
msb
=
0
;
hdr
->
correctionfield
.
lsb
=
phase_to_cf_units
(
ppi
->
last_rcv_time
.
phase
);
/* there is no cField now, we pp_time includes it all */
clear_time
(
&
hdr
->
cField
);
msg_issue_delay_resp
(
ppi
,
time
);
/* no error check */
msgtype
=
PPM_NO_MESSAGE
;
break
;
...
...
@@ -131,15 +130,12 @@ static int wr_new_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
static
int
wr_handle_resp
(
struct
pp_instance
*
ppi
)
{
MsgHeader
*
hdr
=
&
ppi
->
received_ptp_header
;
TimeInternal
correction_field
;
TimeInternal
*
ofm
=
&
DSCUR
(
ppi
)
->
offsetFromMaster
;
struct
pp_time
*
ofm
=
&
DSCUR
(
ppi
)
->
offsetFromMaster
;
struct
wr_dsport
*
wrp
=
WR_DSPOR
(
ppi
);
pp_diag
(
ppi
,
ext
,
2
,
"hook: %s
\n
"
,
__func__
);
/* FIXME: check sub-nano relevance of correction filed */
cField_to_TimeInternal
(
&
correction_field
,
hdr
->
correctionfield
);
/* This correction_field we received is already part of t4 */
/*
* If no WR mode is on, run normal code, if T2/T3 are valid.
...
...
@@ -147,7 +143,7 @@ static int wr_handle_resp(struct pp_instance *ppi)
* we'll have the Unix time instead, marked by "correct"
*/
if
(
!
wrp
->
wrModeOn
)
{
if
(
!
ppi
->
t2
.
correct
||
!
ppi
->
t3
.
correct
)
{
if
(
is_incorrect
(
&
ppi
->
t2
)
||
is_incorrect
(
&
ppi
->
t3
)
)
{
pp_diag
(
ppi
,
servo
,
1
,
"T2 or T3 incorrect, discarding tuple
\n
"
);
return
0
;
...
...
@@ -156,13 +152,13 @@ static int wr_handle_resp(struct pp_instance *ppi)
/*
* pps always on if offset less than 1 second,
* until ve have a configurable threshold */
if
(
ofm
->
sec
ond
s
)
if
(
ofm
->
secs
)
wrp
->
ops
->
enable_timing_output
(
ppi
,
0
);
else
wrp
->
ops
->
enable_timing_output
(
ppi
,
1
);
}
wr_servo_got_delay
(
ppi
,
hdr
->
correctionfield
.
lsb
);
wr_servo_got_delay
(
ppi
);
wr_servo_update
(
ppi
);
return
0
;
}
...
...
@@ -206,14 +202,13 @@ static int wr_handle_announce(struct pp_instance *ppi)
}
static
int
wr_handle_followup
(
struct
pp_instance
*
ppi
,
TimeInternal
*
precise_orig_timestamp
,
TimeInternal
*
correction_field
)
struct
pp_time
*
precise_orig_timestamp
,
struct
pp_time
*
correction_field
)
{
pp_diag
(
ppi
,
ext
,
2
,
"hook: %s
\n
"
,
__func__
);
if
(
!
WR_DSPOR
(
ppi
)
->
wrModeOn
)
return
0
;
precise_orig_timestamp
->
phase
=
0
;
wr_servo_got_sync
(
ppi
,
precise_orig_timestamp
,
&
ppi
->
t2
);
...
...
@@ -225,13 +220,8 @@ static int wr_handle_followup(struct pp_instance *ppi,
static
__attribute__
((
used
))
int
wr_handle_presp
(
struct
pp_instance
*
ppi
)
{
MsgHeader
*
hdr
=
&
ppi
->
received_ptp_header
;
TimeInternal
correction_field
;
struct
wr_dsport
*
wrp
=
WR_DSPOR
(
ppi
);
TimeInternal
*
ofm
=
&
DSCUR
(
ppi
)
->
offsetFromMaster
;
/* FIXME: check sub-nano relevance of correction filed */
cField_to_TimeInternal
(
&
correction_field
,
hdr
->
correctionfield
);
struct
pp_time
*
ofm
=
&
DSCUR
(
ppi
)
->
offsetFromMaster
;
/*
* If no WR mode is on, run normal code, if T2/T3 are valid.
...
...
@@ -240,7 +230,7 @@ static __attribute__((used)) int wr_handle_presp(struct pp_instance *ppi)
*/
if
(
!
wrp
->
wrModeOn
)
{
if
(
!
ppi
->
t3
.
correct
||
!
ppi
->
t6
.
correct
)
{
if
(
is_incorrect
(
&
ppi
->
t3
)
||
is_incorrect
(
&
ppi
->
t6
)
)
{
pp_diag
(
ppi
,
servo
,
1
,
"T3 or T6 incorrect, discarding tuple
\n
"
);
return
0
;
...
...
@@ -249,7 +239,7 @@ static __attribute__((used)) int wr_handle_presp(struct pp_instance *ppi)
/*
* pps always on if offset less than 1 second,
* until ve have a configurable threshold */
if
(
ofm
->
sec
ond
s
)
if
(
ofm
->
secs
)
wrp
->
ops
->
enable_timing_output
(
ppi
,
0
);
else
wrp
->
ops
->
enable_timing_output
(
ppi
,
1
);
...
...
proto-ext-whiterabbit/wr-api.h
View file @
38427664
...
...
@@ -12,8 +12,7 @@
#include <ppsi/lib.h>
#include "wr-constants.h"
#define WRS_PPSI_SHMEM_VERSION 17
/* Changed definition of field mcast_addr of
* struct pp_instance */
#define WRS_PPSI_SHMEM_VERSION 18
/* New pp_time everywhere */
/*
* This structure is used as extension-specific data in the DSPort
...
...
@@ -135,7 +134,7 @@ void wr_servo_reset(struct pp_instance *ppi);
void
wr_servo_enable_tracking
(
int
enable
);
int
wr_servo_got_sync
(
struct
pp_instance
*
ppi
,
struct
pp_time
*
t1
,
struct
pp_time
*
t2
);
int
wr_servo_got_delay
(
struct
pp_instance
*
ppi
,
Integer32
cf
);
int
wr_servo_got_delay
(
struct
pp_instance
*
ppi
);
int
wr_servo_update
(
struct
pp_instance
*
ppi
);
struct
wr_servo_state
{
...
...
proto-ext-whiterabbit/wr-servo.c
View file @
38427664
This diff is collapsed.
Click to expand it.
proto-standard/state-slave.c
View file @
38427664
...
...
@@ -52,8 +52,8 @@ static int slave_handle_response(struct pp_instance *ppi, unsigned char *pkt,
}
ppi
->
t4
=
resp
.
receiveTimestamp
;
/* Save delay resp cf in ppi->cField */
ppi
->
cField
=
hdr
->
cField
;
/* FIXME: merge cField here?
*/
pp_time_add
(
&
ppi
->
t4
,
&
hdr
->
cField
);
/* NOTE: older code was adding cField later, in hooks.handle_resp
*/
if
(
pp_hooks
.
handle_resp
)
e
=
pp_hooks
.
handle_resp
(
ppi
);
...
...
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