diff options
| author | Alexey Zaytsev | 2008-03-02 03:19:29 +0100 |
|---|---|---|
| committer | Alexey Zaytsev | 2008-03-02 03:19:29 +0100 |
| commit | 1935439f863a43986ce386c830f4824d10c4cc18 (patch) | |
| tree | fb3d4409e37302a775c66086f8a88717d5568685 /src/arch/i386 | |
| parent | Cleanups (diff) | |
| download | ipxe-1935439f863a43986ce386c830f4824d10c4cc18.tar.gz ipxe-1935439f863a43986ce386c830f4824d10c4cc18.tar.xz ipxe-1935439f863a43986ce386c830f4824d10c4cc18.zip | |
fix the rdtsc namimg
Diffstat (limited to 'src/arch/i386')
| -rw-r--r-- | src/arch/i386/drivers/timer_rdtsc.c (renamed from src/arch/i386/drivers/timer_rtdsc.c) | 14 | ||||
| -rw-r--r-- | src/arch/i386/include/bits/errfile.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/arch/i386/drivers/timer_rtdsc.c b/src/arch/i386/drivers/timer_rdtsc.c index 336e3e6fc..57b8826c7 100644 --- a/src/arch/i386/drivers/timer_rtdsc.c +++ b/src/arch/i386/drivers/timer_rdtsc.c @@ -48,7 +48,7 @@ bad_ctc: } static uint32_t clocks_per_second = 0; -static tick_t rtdsc_currticks(void) +static tick_t rdtsc_currticks(void) { uint32_t clocks_high, clocks_low; uint32_t currticks; @@ -64,7 +64,7 @@ static tick_t rtdsc_currticks(void) return currticks; } -static int rtdsc_ts_init(void) +static int rdtsc_ts_init(void) { struct cpuinfo_x86 cpu_info; @@ -73,19 +73,19 @@ static int rtdsc_ts_init(void) if (cpu_info.features & X86_FEATURE_TSC) { clocks_per_second = calibrate_tsc(); if (clocks_per_second) { - DBG("RTDSC Ticksource installed. CPU running at %ld Mhz\n", + DBG("RDTSC ticksource installed. CPU running at %ld Mhz\n", clocks_per_second/(1000*1000)); return 0; } } - DBG("RTDSC timer not available on this machine.\n"); + DBG("RDTSC ticksource not available on this machine.\n"); return -ENODEV; } -struct timer rtdsc_ts __timer (01) = { - .init = rtdsc_ts_init, +struct timer rdtsc_ts __timer (01) = { + .init = rdtsc_ts_init, .udelay = generic_currticks_udelay, - .currticks = rtdsc_currticks, + .currticks = rdtsc_currticks, }; diff --git a/src/arch/i386/include/bits/errfile.h b/src/arch/i386/include/bits/errfile.h index ce58eefd0..0f1402148 100644 --- a/src/arch/i386/include/bits/errfile.h +++ b/src/arch/i386/include/bits/errfile.h @@ -26,7 +26,7 @@ #define ERRFILE_undionly ( ERRFILE_ARCH | ERRFILE_NET | 0x00030000 ) #define ERRFILE_undirom ( ERRFILE_ARCH | ERRFILE_NET | 0x00040000 ) -#define ERRFILE_timer_rtdsc ( ERRFILE_ARCH | ERRFILE_DRIVER | 0x00000000 ) +#define ERRFILE_timer_rdtsc ( ERRFILE_ARCH | ERRFILE_DRIVER | 0x00000000 ) #define ERRFILE_timer_bios ( ERRFILE_ARCH | ERRFILE_DRIVER | 0x00010000 ) /** @} */ |