Skip to content

P
PPSi
Commit 1fc12250 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

general: kill pp_strcpy 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 2c1a3f6c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
include/ppsi/lib.h
View file @ 1fc12250
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
/* What follow is the old way, being phased out */ /* What follow is the old way, being phased out */
extern void pp_puts(const char *s); extern void pp_puts(const char *s);
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);
......
lib/libc-functions.c
View file @ 1fc12250
...@@ -57,8 +57,6 @@ char *strcpy(char *dest, const char *src) ...@@ -57,8 +57,6 @@ char *strcpy(char *dest, const char *src)
} }
/* As a first step in removing pp_memset etc, provide aliases */ /* As a first step in removing pp_memset etc, provide aliases */
extern char *pp_strcpy(char *dest, const char *src)
__attribute__((alias("strcpy")));
extern void *pp_memcpy(void *d, const void *s, int count) extern void *pp_memcpy(void *d, const void *s, int count)
__attribute__((alias("memcpy"))); __attribute__((alias("memcpy")));
extern int pp_memcmp(const void *s1, const void *s2, int count) extern int pp_memcmp(const void *s1, const void *s2, int count)
......
proto-ext-whiterabbit/wr-servo.c
View file @ 1fc12250
...@@ -206,8 +206,7 @@ int wr_servo_init(struct pp_instance *ppi) ...@@ -206,8 +206,7 @@ int wr_servo_init(struct pp_instance *ppi)
clock->netPath.ifaceName, 16);//fixme clock->netPath.ifaceName, 16);//fixme
*/ */
pp_strcpy(cur_servo_state.slave_servo_state, strcpy(cur_servo_state.slave_servo_state, "Uninitialized");
"Uninitialized");
servo_state_valid = 1; servo_state_valid = 1;
cur_servo_state.valid = 1; cur_servo_state.valid = 1;
...@@ -372,8 +371,7 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -372,8 +371,7 @@ int wr_servo_update(struct pp_instance *ppi)
if(ts_offset_hw.seconds != 0) if(ts_offset_hw.seconds != 0)
{ {
pp_strcpy(cur_servo_state.slave_servo_state, strcpy(cur_servo_state.slave_servo_state, "SYNC_SEC");
"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);
...@@ -385,7 +383,7 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -385,7 +383,7 @@ int wr_servo_update(struct pp_instance *ppi)
break; break;
case WR_SYNC_NSEC: case WR_SYNC_NSEC:
pp_strcpy(cur_servo_state.slave_servo_state, "SYNC_NSEC"); strcpy(cur_servo_state.slave_servo_state, "SYNC_NSEC");
if(ts_offset_hw.nanoseconds != 0) if(ts_offset_hw.nanoseconds != 0)
{ {
...@@ -399,7 +397,7 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -399,7 +397,7 @@ int wr_servo_update(struct pp_instance *ppi)
break; break;
case WR_SYNC_PHASE: case WR_SYNC_PHASE:
pp_strcpy(cur_servo_state.slave_servo_state, "SYNC_PHASE"); 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);
...@@ -429,7 +427,7 @@ int wr_servo_update(struct pp_instance *ppi) ...@@ -429,7 +427,7 @@ int wr_servo_update(struct pp_instance *ppi)
} }
case WR_TRACK_PHASE: case WR_TRACK_PHASE:
pp_strcpy(cur_servo_state.slave_servo_state, "TRACK_PHASE"); 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