From 160d90f22a2076bc83fd71782e06fc0d0b8be72a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 29 Feb 2020 08:00:38 +0100 Subject: [PATCH] (performance counters) Get rid of other duplicate functions --- menu/widgets/menu_dialog.c | 2 +- performance_counters.c | 9 --------- performance_counters.h | 2 -- retroarch.c | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/menu/widgets/menu_dialog.c b/menu/widgets/menu_dialog.c index b8823d0a5e..f1170d8819 100644 --- a/menu/widgets/menu_dialog.c +++ b/menu/widgets/menu_dialog.c @@ -55,7 +55,7 @@ int menu_dialog_iterate(char *s, size_t len, const char *label, static rarch_timer_t timer; if (!rarch_timer_is_running(&timer)) - rarch_timer_begin(&timer, 3); + rarch_timer_begin_us(&timer, 3 * 1000000); rarch_timer_tick(&timer, current_time); diff --git a/performance_counters.c b/performance_counters.c index f2b05e4ec0..d8dd0b7ba1 100644 --- a/performance_counters.c +++ b/performance_counters.c @@ -168,15 +168,6 @@ void rarch_timer_begin_new_time_us(rarch_timer_t *timer, uint64_t usec) timer->timeout_end = timer->current + timer->timeout_us; } -void rarch_timer_begin(rarch_timer_t *timer, uint64_t sec) -{ - if (!timer) - return; - rarch_timer_begin_new_time_us(timer, sec * 1000000); - timer->timer_begin = true; - timer->timer_end = false; -} - void rarch_timer_begin_us(rarch_timer_t *timer, uint64_t usec) { if (!timer) diff --git a/performance_counters.h b/performance_counters.h index b96355e9b7..08674aac6b 100644 --- a/performance_counters.h +++ b/performance_counters.h @@ -95,8 +95,6 @@ bool rarch_timer_is_running(rarch_timer_t *timer); bool rarch_timer_has_expired(rarch_timer_t *timer); -void rarch_timer_begin(rarch_timer_t *timer, uint64_t sec); - void rarch_timer_begin_us(rarch_timer_t *timer, uint64_t usec); void rarch_timer_begin_new_time_us(rarch_timer_t *timer, uint64_t usec); diff --git a/retroarch.c b/retroarch.c index 5f27cb7ea2..9d459db8c0 100644 --- a/retroarch.c +++ b/retroarch.c @@ -27018,7 +27018,7 @@ static bool input_driver_toggle_button_combo( /* user started holding down the start button, start the timer */ if (!rarch_timer_is_running(&timer)) - rarch_timer_begin(&timer, HOLD_START_DELAY_SEC); + rarch_timer_begin_us(&timer, HOLD_START_DELAY_SEC * 1000000); rarch_timer_tick(&timer, current_time);