From f60e2af21f39e9f92d62d47c6d682334c6fa2711 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Tue, 25 Nov 2014 18:01:27 +0100 Subject: [PATCH] dde_oss: use dde_kit_timer_ticks The Linux-specific 'jiffies' symbol was removed from dde_kit in 35239b8. Fixes #1302. --- repos/dde_oss/src/drivers/audio_out/include/os.h | 2 +- repos/dde_oss/src/drivers/audio_out/os.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/repos/dde_oss/src/drivers/audio_out/include/os.h b/repos/dde_oss/src/drivers/audio_out/include/os.h index f98ecee32..a2e91595a 100644 --- a/repos/dde_oss/src/drivers/audio_out/include/os.h +++ b/repos/dde_oss/src/drivers/audio_out/include/os.h @@ -181,7 +181,7 @@ enum { } #define HZ DDE_KIT_HZ -#define GET_JIFFIES() jiffies +#define GET_JIFFIES() dde_kit_timer_ticks #define MUTEX_INIT(osdev, mutex, hier) diff --git a/repos/dde_oss/src/drivers/audio_out/os.cc b/repos/dde_oss/src/drivers/audio_out/os.cc index 4c2fe2eb9..93e182d9f 100644 --- a/repos/dde_oss/src/drivers/audio_out/os.cc +++ b/repos/dde_oss/src/drivers/audio_out/os.cc @@ -41,11 +41,11 @@ static Timer::Connection _timer; void oss_udelay(unsigned long usecs) { - unsigned long start = jiffies; + unsigned long start = GET_JIFFIES(); /* check for IRQs etc */ Service_handler::s()->check_signal(false); - unsigned delta = (jiffies - start) * 10000; + unsigned delta = (GET_JIFFIES() - start) * 10000; /* return if already expired */ if (delta > usecs) @@ -187,12 +187,12 @@ extern "C" int oss_sleep(struct oss_wait_queue *wq, oss_mutex_t * mutex, int tic return 0; wq->blocked = 1; - unsigned long start = jiffies; + unsigned long start = GET_JIFFIES(); while (wq->blocked) { Irq::check_irq(true); - if (jiffies - start > (unsigned long)ticks) { + if (GET_JIFFIES() - start > (unsigned long)ticks) { return 0; } }