Skip to content

P
PPSi
Commit 58ca782f authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

kill timer_adjust_all() 

Nobody was implementing this timer_adjust_all, and I'm going to
rewrite the timer management anyways, because it is a horrible
complication just to manage some timeouts for packet transmission.

So let it RIP, and let's happily leave without it.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent ef11b762
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 50 deletions
arch-bare-i386/bare-timer.c
View file @ 58ca782f
...@@ -55,17 +55,6 @@ int bare_timer_expired(struct pp_timer *tm) ...@@ -55,17 +55,6 @@ int bare_timer_expired(struct pp_timer *tm)
return 0; return 0;
} }
void bare_timer_adjust_all(struct pp_instance *ppi, int32_t diff)
{
/*
int i;
for (i = 0; i < PP_TIMER_ARRAY_SIZE; i++) {
ppi->timers[i]->start += diff;
}
*/
}
int pp_timer_init(struct pp_instance *ppi) int pp_timer_init(struct pp_instance *ppi)
__attribute__((alias("bare_timer_init"))); __attribute__((alias("bare_timer_init")));
...@@ -77,6 +66,3 @@ int pp_timer_stop(struct pp_timer *tm) ...@@ -77,6 +66,3 @@ int pp_timer_stop(struct pp_timer *tm)
int pp_timer_expired(struct pp_timer *tm) int pp_timer_expired(struct pp_timer *tm)
__attribute__((alias("bare_timer_expired"))); __attribute__((alias("bare_timer_expired")));
void pp_timer_adjust_all(struct pp_instance *ppi, int32_t diff)
__attribute__((alias("bare_timer_adjust_all")));
arch-bare-x86-64/bare-timer.c
View file @ 58ca782f
...@@ -55,16 +55,6 @@ int bare_timer_expired(struct pp_timer *tm) ...@@ -55,16 +55,6 @@ int bare_timer_expired(struct pp_timer *tm)
return 0; return 0;
} }
void bare_timer_adjust_all(struct pp_instance *ppi, int32_t diff)
{
/* int i;
for (i = 0; i < PP_TIMER_ARRAY_SIZE; i++) {
ppi->timers[i]->start += diff;
}
*/
}
int pp_timer_init(struct pp_instance *ppi) int pp_timer_init(struct pp_instance *ppi)
__attribute__((alias("bare_timer_init"))); __attribute__((alias("bare_timer_init")));
...@@ -76,6 +66,3 @@ int pp_timer_stop(struct pp_timer *tm) ...@@ -76,6 +66,3 @@ int pp_timer_stop(struct pp_timer *tm)
int pp_timer_expired(struct pp_timer *tm) int pp_timer_expired(struct pp_timer *tm)
__attribute__((alias("bare_timer_expired"))); __attribute__((alias("bare_timer_expired")));
void pp_timer_adjust_all(struct pp_instance *ppi, int32_t diff)
__attribute__((alias("bare_timer_adjust_all")));
arch-gnu-linux/posix-timer.c
View file @ 58ca782f
...@@ -82,12 +82,6 @@ int posix_timer_expired(struct pp_timer *tm) ...@@ -82,12 +82,6 @@ int posix_timer_expired(struct pp_timer *tm)
return 0; return 0;
} }
void posix_timer_adjust_all(struct pp_instance *ppi, int32_t diff)
{
/* Do nothing, clock_gettime uses MONOTONIC tstamps */
}
int pp_timer_init(struct pp_instance *ppi) int pp_timer_init(struct pp_instance *ppi)
__attribute__((alias("posix_timer_init"))); __attribute__((alias("posix_timer_init")));
...@@ -99,6 +93,3 @@ int pp_timer_stop(struct pp_timer *tm) ...@@ -99,6 +93,3 @@ int pp_timer_stop(struct pp_timer *tm)
int pp_timer_expired(struct pp_timer *tm) int pp_timer_expired(struct pp_timer *tm)
__attribute__((alias("posix_timer_expired"))); __attribute__((alias("posix_timer_expired")));
void pp_timer_adjust_all(struct pp_instance *ppi, int32_t diff)
__attribute__((alias("posix_timer_adjust_all")));
arch-wrpc/wrpc-timer.c
View file @ 58ca782f
...@@ -50,13 +50,6 @@ int wrpc_timer_expired(struct pp_timer *tm) ...@@ -50,13 +50,6 @@ int wrpc_timer_expired(struct pp_timer *tm)
return 0; return 0;
} }
void wrpc_timer_adjust_all(struct pp_instance *ppi, int32_t diff)
{
/* No need for timer adjust in SPEC: it uses a sort of monotonic
* tstamp for timers
*/
}
uint32_t wrpc_timer_get_msec_tics(void) uint32_t wrpc_timer_get_msec_tics(void)
{ {
return timer_get_tics(); return timer_get_tics();
...@@ -74,8 +67,5 @@ int pp_timer_stop(struct pp_timer *tm) ...@@ -74,8 +67,5 @@ int pp_timer_stop(struct pp_timer *tm)
int pp_timer_expired(struct pp_timer *tm) int pp_timer_expired(struct pp_timer *tm)
__attribute__((alias("wrpc_timer_expired"))); __attribute__((alias("wrpc_timer_expired")));
void pp_timer_adjust_all(struct pp_instance *ppi, int32_t diff)
__attribute__((alias("wrpc_timer_adjust_all")));
uint32_t wr_timer_get_msec_tics(void) uint32_t wr_timer_get_msec_tics(void)
__attribute__((alias("wrpc_timer_get_msec_tics"))); __attribute__((alias("wrpc_timer_get_msec_tics")));
include/ppsi/ppsi.h
View file @ 58ca782f
...@@ -358,9 +358,6 @@ extern int pp_timer_init(struct pp_instance *ppi); /* initializes timer common ...@@ -358,9 +358,6 @@ extern int pp_timer_init(struct pp_instance *ppi); /* initializes timer common
extern int pp_timer_start(uint32_t interval_ms, struct pp_timer *tm); extern int pp_timer_start(uint32_t interval_ms, struct pp_timer *tm);
extern int pp_timer_stop(struct pp_timer *tm); extern int pp_timer_stop(struct pp_timer *tm);
extern int pp_timer_expired(struct pp_timer *tm); /* returns 1 when expired */ extern int pp_timer_expired(struct pp_timer *tm); /* returns 1 when expired */
/* pp_adj_timers is called after pp_set_tstamp and must be defined for those
* platform who rely on system timestamp for timer expiration handling */
extern void pp_timer_adjust_all(struct pp_instance *ppi, int32_t diff);
/* Servo */ /* Servo */
extern void pp_init_clock(struct pp_instance *ppi); extern void pp_init_clock(struct pp_instance *ppi);
......
proto-standard/servo.c
View file @ 58ca782f
...@@ -279,7 +279,6 @@ void pp_update_clock(struct pp_instance *ppi) ...@@ -279,7 +279,6 @@ void pp_update_clock(struct pp_instance *ppi)
sub_TimeInternal(&time_tmp, &time_tmp, sub_TimeInternal(&time_tmp, &time_tmp,
&DSCUR(ppi)->offsetFromMaster); &DSCUR(ppi)->offsetFromMaster);
tstamp_diff = pp_set_tstamp(&time_tmp); tstamp_diff = pp_set_tstamp(&time_tmp);
pp_timer_adjust_all(ppi, tstamp_diff);
pp_init_clock(ppi); pp_init_clock(ppi);
} else { } else {
adj = DSCUR(ppi)->offsetFromMaster.nanoseconds adj = DSCUR(ppi)->offsetFromMaster.nanoseconds
......
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