i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pretty much reverted r33218.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33224 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2009-09-21 13:16:13 +00:00
parent 77a9df0a47
commit ca7ba3eb23
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_timer.c
+21 -7
View File
@@ -61,7 +61,7 @@ arch_timer_clear_hardware_timer(void)
sTimer->clear_hardware_timer(); sTimer->clear_hardware_timer();
} }
/*
static void static void
sort_timers(timer_info *timers[], int numTimers) sort_timers(timer_info *timers[], int numTimers)
{ {
@@ -85,25 +85,39 @@ sort_timers(timer_info *timers[], int numTimers)
} }
#endif #endif
} }
*/
int int
arch_init_timer(kernel_args *args) arch_init_timer(kernel_args *args)
{ {
int i = 0; int i = 0;
int bestPriority = -1;
timer_info *timer = NULL; timer_info *timer = NULL;
cpu_status state; cpu_status state;
sort_timers(sTimers, (sizeof(sTimers) / sizeof(sTimers[0])) - 1); //sort_timers(sTimers, (sizeof(sTimers) / sizeof(sTimers[0])) - 1);
state = disable_interrupts(); state = disable_interrupts();
for (i = 0; (timer = sTimers[i]) != NULL; i++) { for (i = 0; (timer = sTimers[i]) != NULL; i++) {
if (timer->init(args) == B_OK) int priority = timer->get_priority();
break;
}
sTimer = timer; if (priority < bestPriority) {
TRACE(("arch_init_timer: Skipping %s because there is a higher priority timer (%s) initialized.\n", timer->name, sTimer->name));
continue;
}
if (timer->init(args) != B_OK) {
TRACE(("arch_init_timer: %s failed init. Skipping.\n", timer->name));
continue;
}
if (priority > bestPriority) {
bestPriority = priority;
sTimer = timer;
TRACE(("arch_init_timer: %s is now best timer module with prio %d.\n", timer->name, bestPriority));
}
}
if (sTimer != NULL) { if (sTimer != NULL) {
dprintf("arch_init_timer: using %s timer.\n", sTimer->name); dprintf("arch_init_timer: using %s timer.\n", sTimer->name);