Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

fixes to timer impls:

Browse Source 
pmt: support ACPI 1.0 table name
qpc: just use wcpu_ClockFrequency, can't fail
tsc: do ia32_Init first

This was SVN commit r5111.
This commit is contained in:
janwas 2007-05-28 16:50:08 +00:00
parent e57335cd63
commit 211999ac6a
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/lib/sysdep/win/whrt/pmt.cpp
View File

@ -37,7 +37,8 @@ LibError CounterPMT::Activate()
return ERR::FAIL; // NOWARN (no Administrator privileges)
if(!acpi_Init())
WARN_RETURN(ERR::FAIL);
const FADT* fadt = (const FADT*)acpi_GetTable("FADT");
// (note: it's called FADT, but the signature is "FACP")
const FADT* fadt = (const FADT*)acpi_GetTable("FACP");
if(!fadt)
WARN_RETURN(ERR::NO_SYS);
m_portAddress = u16_from_larger(fadt->pmTimerPortAddress);
@ -73,7 +74,8 @@ u64 CounterPMT::Counter() const
**/
uint CounterPMT::CounterBits() const
{
const FADT* fadt = (const FADT*)acpi_GetTable("FADT");
// (see previous acpi_GetTable call)
const FADT* fadt = (const FADT*)acpi_GetTable("FACP");
debug_assert(fadt); // Activate made sure FADT is available
const uint counterBits = (fadt->flags & TMR_VAL_EXT)? 32 : 24;
return counterBits;

10
source/lib/sysdep/win/whrt/qpc.cpp
View File

@ -68,18 +68,12 @@ bool CounterQPC::IsSafe() const
// therefore considered unsafe and recognized by comparing frequency
// against the CPU clock.
const double cpuClockFrequency = wcpu_ClockFrequency();
// failed for some reason => can't tell if RDTSC is being used
// => assume unsafe
if(cpuClockFrequency == 0.0)
return false;
// QPC frequency matches the CPU clock => it uses RDTSC => unsafe.
if(IsSimilarMagnitude(m_frequency, cpuClockFrequency))
if(IsSimilarMagnitude(m_frequency, wcpu_ClockFrequency()))
return false;
// unconfirmed reports indicate QPC sometimes uses 1/3 of the
// CPU clock frequency, so check that as well.
if(IsSimilarMagnitude(m_frequency, cpuClockFrequency/3))
if(IsSimilarMagnitude(m_frequency, wcpu_ClockFrequency()/3))
return false;
// otherwise: it's apparently using the HPET => safe.

3
source/lib/sysdep/win/whrt/tsc.cpp
View File

@ -95,6 +95,8 @@ static LibError InitPerCpuTscStates(double cpuClockFrequency)
LibError CounterTSC::Activate()
{
ia32_Init();
if(!ia32_cap(IA32_CAP_TSC))
return ERR::NO_SYS; // NOWARN (CPU doesn't support RDTSC)
@ -104,6 +106,7 @@ LibError CounterTSC::Activate()
void CounterTSC::Shutdown()
{
ia32_Shutdown();
}
bool CounterTSC::IsSafe() const