ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dde_oss: use dde_kit_timer_ticks 

The Linux-specific 'jiffies' symbol was removed from dde_kit in 35239b8.

Fixes #1302.
This commit is contained in:
Christian Helmuth 2014-11-25 18:01:27 +01:00
parent 038a7999bf
commit f60e2af21f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/dde_oss/src/drivers/audio_out/include/os.h
View File

@ -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)

8
repos/dde_oss/src/drivers/audio_out/os.cc
View File

@ -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;
}
}