| Message ID | 1424281003-28195-1-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | Accepted |
| Commit | 9a34f7108f2dc1409c5e17975fe16408e72778c3 |
| Headers | show |
On Wed, Feb 18, 2015 at 11:36 AM, Mike Holmes <mike.holmes@linaro.org> wrote: > From: Simon Kagstrom <simon.kagstrom@netinsight.net> > > Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> > Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> > --- V2 > Fixed compile > > example/timer/odp_timer_test.c | 2 +- > include/odp/api/timer.h | 2 +- > test/validation/odp_timer.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/example/timer/odp_timer_test.c > b/example/timer/odp_timer_test.c > index fbadf8c..6b60ec4 100644 > --- a/example/timer/odp_timer_test.c > +++ b/example/timer/odp_timer_test.c > @@ -387,7 +387,7 @@ int main(int argc, char *argv[]) > tparams.min_tmo = args.min_us*ODP_TIME_USEC; > tparams.max_tmo = args.max_us*ODP_TIME_USEC; > tparams.num_timers = num_workers; /* One timer per worker */ > - tparams.private = 0; /* Shared */ > + tparams.priv = 0; /* Shared */ > tparams.clk_src = ODP_CLOCK_CPU; > tp = odp_timer_pool_create("timer_pool", &tparams); > if (tp == ODP_TIMER_POOL_INVALID) { > diff --git a/include/odp/api/timer.h b/include/odp/api/timer.h > index 5b1490e..0dc9415 100644 > --- a/include/odp/api/timer.h > +++ b/include/odp/api/timer.h > @@ -100,7 +100,7 @@ typedef struct { > uint64_t min_tmo; /**< Minimum relative timeout in nanoseconds */ > uint64_t max_tmo; /**< Maximum relative timeout in nanoseconds */ > uint32_t num_timers; /**< (Minimum) number of supported timers */ > - int private; /**< Shared (false) or private (true) timer pool */ > + int priv; /**< Shared (false) or private (true) timer pool */ > odp_timer_clk_src_t clk_src; /**< Clock source for timers */ > } odp_timer_pool_param_t; > > diff --git a/test/validation/odp_timer.c b/test/validation/odp_timer.c > index 57db959..b24c2c5 100644 > --- a/test/validation/odp_timer.c > +++ b/test/validation/odp_timer.c > @@ -294,7 +294,7 @@ static void test_odp_timer_all(void) > tparam.min_tmo = MIN; > tparam.max_tmo = MAX; > tparam.num_timers = num_workers * NTIMERS; > - tparam.private = 0; > + tparam.priv = 0; > tparam.clk_src = ODP_CLOCK_CPU; > tp = odp_timer_pool_create(NAME, &tparam); > if (tp == ODP_TIMER_POOL_INVALID) > -- > 2.1.0 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
Merged, Maxim. On 02/18/2015 08:36 PM, Mike Holmes wrote: > From: Simon Kagstrom <simon.kagstrom@netinsight.net> > > Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> > --- > V2 > Fixed compile > > example/timer/odp_timer_test.c | 2 +- > include/odp/api/timer.h | 2 +- > test/validation/odp_timer.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c > index fbadf8c..6b60ec4 100644 > --- a/example/timer/odp_timer_test.c > +++ b/example/timer/odp_timer_test.c > @@ -387,7 +387,7 @@ int main(int argc, char *argv[]) > tparams.min_tmo = args.min_us*ODP_TIME_USEC; > tparams.max_tmo = args.max_us*ODP_TIME_USEC; > tparams.num_timers = num_workers; /* One timer per worker */ > - tparams.private = 0; /* Shared */ > + tparams.priv = 0; /* Shared */ > tparams.clk_src = ODP_CLOCK_CPU; > tp = odp_timer_pool_create("timer_pool", &tparams); > if (tp == ODP_TIMER_POOL_INVALID) { > diff --git a/include/odp/api/timer.h b/include/odp/api/timer.h > index 5b1490e..0dc9415 100644 > --- a/include/odp/api/timer.h > +++ b/include/odp/api/timer.h > @@ -100,7 +100,7 @@ typedef struct { > uint64_t min_tmo; /**< Minimum relative timeout in nanoseconds */ > uint64_t max_tmo; /**< Maximum relative timeout in nanoseconds */ > uint32_t num_timers; /**< (Minimum) number of supported timers */ > - int private; /**< Shared (false) or private (true) timer pool */ > + int priv; /**< Shared (false) or private (true) timer pool */ > odp_timer_clk_src_t clk_src; /**< Clock source for timers */ > } odp_timer_pool_param_t; > > diff --git a/test/validation/odp_timer.c b/test/validation/odp_timer.c > index 57db959..b24c2c5 100644 > --- a/test/validation/odp_timer.c > +++ b/test/validation/odp_timer.c > @@ -294,7 +294,7 @@ static void test_odp_timer_all(void) > tparam.min_tmo = MIN; > tparam.max_tmo = MAX; > tparam.num_timers = num_workers * NTIMERS; > - tparam.private = 0; > + tparam.priv = 0; > tparam.clk_src = ODP_CLOCK_CPU; > tp = odp_timer_pool_create(NAME, &tparam); > if (tp == ODP_TIMER_POOL_INVALID)
diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index fbadf8c..6b60ec4 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -387,7 +387,7 @@ int main(int argc, char *argv[]) tparams.min_tmo = args.min_us*ODP_TIME_USEC; tparams.max_tmo = args.max_us*ODP_TIME_USEC; tparams.num_timers = num_workers; /* One timer per worker */ - tparams.private = 0; /* Shared */ + tparams.priv = 0; /* Shared */ tparams.clk_src = ODP_CLOCK_CPU; tp = odp_timer_pool_create("timer_pool", &tparams); if (tp == ODP_TIMER_POOL_INVALID) { diff --git a/include/odp/api/timer.h b/include/odp/api/timer.h index 5b1490e..0dc9415 100644 --- a/include/odp/api/timer.h +++ b/include/odp/api/timer.h @@ -100,7 +100,7 @@ typedef struct { uint64_t min_tmo; /**< Minimum relative timeout in nanoseconds */ uint64_t max_tmo; /**< Maximum relative timeout in nanoseconds */ uint32_t num_timers; /**< (Minimum) number of supported timers */ - int private; /**< Shared (false) or private (true) timer pool */ + int priv; /**< Shared (false) or private (true) timer pool */ odp_timer_clk_src_t clk_src; /**< Clock source for timers */ } odp_timer_pool_param_t; diff --git a/test/validation/odp_timer.c b/test/validation/odp_timer.c index 57db959..b24c2c5 100644 --- a/test/validation/odp_timer.c +++ b/test/validation/odp_timer.c @@ -294,7 +294,7 @@ static void test_odp_timer_all(void) tparam.min_tmo = MIN; tparam.max_tmo = MAX; tparam.num_timers = num_workers * NTIMERS; - tparam.private = 0; + tparam.priv = 0; tparam.clk_src = ODP_CLOCK_CPU; tp = odp_timer_pool_create(NAME, &tparam); if (tp == ODP_TIMER_POOL_INVALID)