Skip to content

P
PPSi
Commit 46f1055d authored by Aurelio Colosimo's avatar Aurelio Colosimo
Browse files
Options

pp_strcpy defined and used (for arch compatibility) 

Signed-off-by: Aurelio Colosimo's avatarAurelio Colosimo <aurelio@aureliocolosimo.it>
parent 2bd568e7
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 7 deletions
arch-spec/spec-io.c
View file @ 46f1055d
...@@ -114,3 +114,6 @@ int pp_adj_freq(Integer32 adj) ...@@ -114,3 +114,6 @@ int pp_adj_freq(Integer32 adj)
int32_t pp_set_tstamp(TimeInternal *t) int32_t pp_set_tstamp(TimeInternal *t)
__attribute__((alias("spec_set_tstamp"))); __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 @@ ...@@ -8,6 +8,7 @@
/* We base on puts and a few more functions: each arch must have it */ /* We base on puts and a few more functions: each arch must have it */
extern void pp_puts(const char *s); extern void pp_puts(const char *s);
extern int pp_strnlen(const char *s, int maxlen); 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 void *pp_memcpy(void *d, const void *s, int count);
extern int pp_memcmp(const void *s1, const void *s2, int count); extern int pp_memcmp(const void *s1, const void *s2, int count);
extern void *pp_memset(void *s, int c, 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) ...@@ -226,8 +226,8 @@ int wr_servo_init(struct pp_instance *ppi)
clock->netPath.ifaceName, 16);//fixme clock->netPath.ifaceName, 16);//fixme
*/ */
strcpy(cur_servo_state.slave_servo_state, pp_strcpy(cur_servo_state.slave_servo_state,
"Uninitialized", 32); "Uninitialized");
servo_state_valid = 1; servo_state_valid = 1;
cur_servo_state.valid = 1; cur_servo_state.valid = 1;
...@@ -380,7 +380,7 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -380,7 +380,7 @@ int wr_servo_update(struct pp_instance *ppi)
switch(s->state) switch(s->state)
{ {
case WR_WAIT_SYNC_IDLE: 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()) if(!wr_adjust_in_progress())
{ {
s->state = s->next_state; s->state = s->next_state;
...@@ -393,7 +393,8 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -393,7 +393,8 @@ int wr_servo_update(struct pp_instance *ppi)
if(ts_offset_hw.seconds != 0) 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_counters(ts_offset_hw.seconds, 0);
wr_adjust_phase(0); wr_adjust_phase(0);
...@@ -405,7 +406,7 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -405,7 +406,7 @@ int wr_servo_update(struct pp_instance *ppi)
break; break;
case WR_SYNC_NSEC: 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) if(ts_offset_hw.nanoseconds != 0)
{ {
...@@ -419,7 +420,7 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -419,7 +420,7 @@ int wr_servo_update(struct pp_instance *ppi)
break; break;
case WR_SYNC_PHASE: 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; s->cur_setpoint = ts_offset_hw.phase + ts_offset_hw.nanoseconds * 1000;
wr_adjust_phase(s->cur_setpoint); wr_adjust_phase(s->cur_setpoint);
...@@ -449,7 +450,7 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -449,7 +450,7 @@ int wr_servo_update(struct pp_instance *ppi)
} }
case WR_TRACK_PHASE: 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_setpoint = s->cur_setpoint;
cur_servo_state.cur_skew = s->delta_ms - s->delta_ms_prev; cur_servo_state.cur_skew = s->delta_ms - s->delta_ms_prev;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment