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

- Moved timer conversion to a method, and added LL to the conversion

Browse Source 
factor to avoid compiler issues.
- Removed some useless and commented debug stuff.
- Now prints also the global HPET configuration.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33291 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2009-09-25 10:36:39 +00:00
parent 4687d95b68
commit 6d92e80531
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/timers/x86_hpet.cpp
+14 -13
View File
@@ -51,22 +51,21 @@ hpet_timer_interrupt(void *arg)
} }
static inline bigtime_t
convert_timeout(const bigtime_t &relativeTimeout)
{
return ((relativeTimeout * 1000000000LL)
/ sHPETRegs->period) + sHPETRegs->counter;
}
static status_t static status_t
hpet_set_hardware_timer(bigtime_t relativeTimeout) hpet_set_hardware_timer(bigtime_t relativeTimeout)
{ {
//dprintf("disabling interrupts\n");
cpu_status state = disable_interrupts(); cpu_status state = disable_interrupts();
//dprintf("getting value\n");
uint64 timerValue = relativeTimeout;
timerValue *= 1000000000;
timerValue /= sHPETRegs->period;
//dprintf("adding hpet counter value\n");
timerValue += sHPETRegs->counter;
//dprintf("setting value %d, cur is %d\n", timerValue, sHPETRegs->counter); //dprintf("setting value %d, cur is %d\n", timerValue, sHPETRegs->counter);
sHPETRegs->timer[2].comparator = timerValue; sHPETRegs->timer[2].comparator = convert_timeout(relativeTimeout);
// Clear the interrupt (set to 0) // Clear the interrupt (set to 0)
//dprintf("clearing interrupts\n"); //dprintf("clearing interrupts\n");
@@ -80,7 +79,6 @@ hpet_set_hardware_timer(bigtime_t relativeTimeout)
//dprintf("enable\n"); //dprintf("enable\n");
sHPETRegs->timer[2].config |= 0x4; sHPETRegs->timer[2].config |= 0x4;
//dprintf("reenable interrupts\n");
restore_interrupts(state); restore_interrupts(state);
return B_OK; return B_OK;
@@ -110,8 +108,8 @@ hpet_set_enabled(struct hpet_regs *regs, bool enabled)
static status_t static status_t
hpet_set_legacy(struct hpet_regs *regs, bool enabled) hpet_set_legacy(struct hpet_regs *regs, bool enabled)
{ {
// if (!HPET_IS_LEGACY_CAPABLE(regs)) if (!HPET_IS_LEGACY_CAPABLE(regs))
// return B_NOT_SUPPORTED; return B_NOT_SUPPORTED;
if (enabled) if (enabled)
regs->config |= HPET_CONF_MASK_LEGACY; regs->config |= HPET_CONF_MASK_LEGACY;
@@ -171,6 +169,9 @@ hpet_init(struct kernel_args *args)
HPET_IS_LEGACY_CAPABLE(sHPETRegs) ? "" : " not")); HPET_IS_LEGACY_CAPABLE(sHPETRegs) ? "" : " not"));
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",
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");