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

Uncommented the hpet timer from the timers list.

Browse Source 
Lowered its priority of hpet timer so it doesn't get picked up first
(yet)
Changed the debug output to be conditional.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33292 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2009-09-25 10:48:37 +00:00
parent 6d92e80531
commit 6dc4fd11a2
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_timer.c
+1 -1
View File
@@ -38,7 +38,7 @@ extern timer_info gAPICTimer;
extern timer_info gHPETTimer; extern timer_info gHPETTimer;
static timer_info *sTimers[] = { static timer_info *sTimers[] = {
// &gHPETTimer, &gHPETTimer,
&gAPICTimer, &gAPICTimer,
&gPITTimer, &gPITTimer,
NULL NULL
src/system/kernel/arch/x86/timers/x86_hpet.cpp
+8 -8
View File
@@ -40,7 +40,7 @@ struct timer_info gHPETTimer = {
static int static int
hpet_get_prio() hpet_get_prio()
{ {
return 3; return 0; //TODO: Should be 3, so it gets picked first
} }
@@ -68,15 +68,12 @@ hpet_set_hardware_timer(bigtime_t relativeTimeout)
sHPETRegs->timer[2].comparator = convert_timeout(relativeTimeout); sHPETRegs->timer[2].comparator = convert_timeout(relativeTimeout);
// Clear the interrupt (set to 0) // Clear the interrupt (set to 0)
//dprintf("clearing interrupts\n");
sHPETRegs->timer[2].config &= (~31 << 9); sHPETRegs->timer[2].config &= (~31 << 9);
// Non-periodic mode, edge triggered // Non-periodic mode, edge triggered
//dprintf("edge mode\n");
sHPETRegs->timer[2].config &= ~(0x8 & 0x2); sHPETRegs->timer[2].config &= ~(0x8 & 0x2);
// Enable timer // Enable timer
//dprintf("enable\n");
sHPETRegs->timer[2].config |= 0x4; sHPETRegs->timer[2].config |= 0x4;
restore_interrupts(state); restore_interrupts(state);
@@ -120,6 +117,7 @@ hpet_set_legacy(struct hpet_regs *regs, bool enabled)
} }
#ifdef TRACE_HPET
static void static void
dump_timer(volatile struct hpet_timer *timer) dump_timer(volatile struct hpet_timer *timer)
{ {
@@ -128,6 +126,7 @@ dump_timer(volatile struct hpet_timer *timer)
dprintf(" fsb_value: 0x%lx\n", timer->fsb_value); dprintf(" fsb_value: 0x%lx\n", timer->fsb_value);
dprintf(" fsb_addr: 0x%lx\n", timer->fsb_addr); dprintf(" fsb_addr: 0x%lx\n", timer->fsb_addr);
} }
#endif
static status_t static status_t
@@ -170,19 +169,20 @@ hpet_init(struct kernel_args *args)
TRACE(("hpet_init: HPET supports %lu timers, and is %s bits wide.\n", TRACE(("hpet_init: HPET supports %lu timers, and is %s bits wide.\n",
numTimers, HPET_IS_64BIT(sHPETRegs) ? "64" : "32")); numTimers, HPET_IS_64BIT(sHPETRegs) ? "64" : "32"));
dprintf("hpet_init: configuration: 0x%llx, timer_interrupts: 0x%llx\n", TRACE(("hpet_init: configuration: 0x%llx, timer_interrupts: 0x%llx\n",
sHPETRegs->config, sHPETRegs->timer_interrupts); sHPETRegs->config, sHPETRegs->timer_interrupts));
if (numTimers < 3) { if (numTimers < 3) {
dprintf("hpet_init: HPET does not have at least 3 timers. Skipping.\n"); dprintf("hpet_init: HPET does not have at least 3 timers. Skipping.\n");
return B_ERROR; return B_ERROR;
} }
#ifdef TRACE_HPET
for (uint32 c = 0; c < numTimers; c++) { for (uint32 c = 0; c < numTimers; c++) {
dprintf("hpet_init: timer %lu:\n", c); TRACE(("hpet_init: timer %lu:\n", c));
dump_timer(&sHPETRegs->timer[c]); dump_timer(&sHPETRegs->timer[c]);
} }
#endif
install_io_interrupt_handler(0xfb - ARCH_INTERRUPT_BASE, install_io_interrupt_handler(0xfb - ARCH_INTERRUPT_BASE,
&hpet_timer_interrupt, NULL, B_NO_LOCK_VECTOR); &hpet_timer_interrupt, NULL, B_NO_LOCK_VECTOR);
install_io_interrupt_handler(0, &hpet_timer_interrupt, NULL, install_io_interrupt_handler(0, &hpet_timer_interrupt, NULL,