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
46f1055d
Commit
46f1055d
authored
Oct 30, 2012
by
Aurelio Colosimo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pp_strcpy defined and used (for arch compatibility)
Signed-off-by:
Aurelio Colosimo
<
aurelio@aureliocolosimo.it
>
parent
2bd568e7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
7 deletions
+12
-7
spec-io.c
arch-spec/spec-io.c
+3
-0
lib.h
include/ppsi/lib.h
+1
-0
wr-servo.c
proto-ext-whiterabbit/wr-servo.c
+8
-7
No files found.
arch-spec/spec-io.c
View file @
46f1055d
...
...
@@ -114,3 +114,6 @@ int pp_adj_freq(Integer32 adj)
int32_t
pp_set_tstamp
(
TimeInternal
*
t
)
__attribute__
((
alias
(
"spec_set_tstamp"
)));
char
*
pp_strcpy
(
char
*
dest
,
const
char
*
src
)
__attribute__
((
alias
(
"strcpy"
)));
include/ppsi/lib.h
View file @
46f1055d
...
...
@@ -8,6 +8,7 @@
/* We base on puts and a few more functions: each arch must have it */
extern
void
pp_puts
(
const
char
*
s
);
extern
int
pp_strnlen
(
const
char
*
s
,
int
maxlen
);
extern
char
*
pp_strcpy
(
char
*
dest
,
const
char
*
src
);
extern
void
*
pp_memcpy
(
void
*
d
,
const
void
*
s
,
int
count
);
extern
int
pp_memcmp
(
const
void
*
s1
,
const
void
*
s2
,
int
count
);
extern
void
*
pp_memset
(
void
*
s
,
int
c
,
int
count
);
...
...
proto-ext-whiterabbit/wr-servo.c
View file @
46f1055d
...
...
@@ -226,8 +226,8 @@ int wr_servo_init(struct pp_instance *ppi)
clock->netPath.ifaceName, 16);//fixme
*/
strcpy
(
cur_servo_state
.
slave_servo_state
,
"Uninitialized"
,
32
);
pp_
strcpy
(
cur_servo_state
.
slave_servo_state
,
"Uninitialized"
);
servo_state_valid
=
1
;
cur_servo_state
.
valid
=
1
;
...
...
@@ -380,7 +380,7 @@ int wr_servo_update(struct pp_instance *ppi)
switch
(
s
->
state
)
{
case
WR_WAIT_SYNC_IDLE
:
strcpy
(
cur_servo_state
.
slave_servo_state
,
"SYNC_IDLE"
);
pp_
strcpy
(
cur_servo_state
.
slave_servo_state
,
"SYNC_IDLE"
);
if
(
!
wr_adjust_in_progress
())
{
s
->
state
=
s
->
next_state
;
...
...
@@ -393,7 +393,8 @@ int wr_servo_update(struct pp_instance *ppi)
if
(
ts_offset_hw
.
seconds
!=
0
)
{
strcpy
(
cur_servo_state
.
slave_servo_state
,
"SYNC_SEC"
);
pp_strcpy
(
cur_servo_state
.
slave_servo_state
,
"SYNC_SEC"
);
wr_adjust_counters
(
ts_offset_hw
.
seconds
,
0
);
wr_adjust_phase
(
0
);
...
...
@@ -405,7 +406,7 @@ int wr_servo_update(struct pp_instance *ppi)
break
;
case
WR_SYNC_NSEC
:
strcpy
(
cur_servo_state
.
slave_servo_state
,
"SYNC_NSEC"
);
pp_
strcpy
(
cur_servo_state
.
slave_servo_state
,
"SYNC_NSEC"
);
if
(
ts_offset_hw
.
nanoseconds
!=
0
)
{
...
...
@@ -419,7 +420,7 @@ int wr_servo_update(struct pp_instance *ppi)
break
;
case
WR_SYNC_PHASE
:
strcpy
(
cur_servo_state
.
slave_servo_state
,
"SYNC_PHASE"
);
pp_
strcpy
(
cur_servo_state
.
slave_servo_state
,
"SYNC_PHASE"
);
s
->
cur_setpoint
=
ts_offset_hw
.
phase
+
ts_offset_hw
.
nanoseconds
*
1000
;
wr_adjust_phase
(
s
->
cur_setpoint
);
...
...
@@ -449,7 +450,7 @@ int wr_servo_update(struct pp_instance *ppi)
}
case
WR_TRACK_PHASE
:
strcpy
(
cur_servo_state
.
slave_servo_state
,
"TRACK_PHASE"
);
pp_
strcpy
(
cur_servo_state
.
slave_servo_state
,
"TRACK_PHASE"
);
cur_servo_state
.
cur_setpoint
=
s
->
cur_setpoint
;
cur_servo_state
.
cur_skew
=
s
->
delta_ms
-
s
->
delta_ms_prev
;
...
...
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