From 1935439f863a43986ce386c830f4824d10c4cc18 Mon Sep 17 00:00:00 2001
From: Alexey Zaytsev <alexey.zaytsev@gmail.com>
Date: Sun, 2 Mar 2008 05:19:29 +0300
Subject: [PATCH] fix the rdtsc namimg

---
 .../i386/drivers/{timer_rtdsc.c => timer_rdtsc.c}  | 14 +++++++-------
 src/arch/i386/include/bits/errfile.h               |  2 +-
 src/config.h                                       |  2 +-
 src/core/config.c                                  |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename src/arch/i386/drivers/{timer_rtdsc.c => timer_rdtsc.c} (85%)

diff --git a/src/arch/i386/drivers/timer_rtdsc.c b/src/arch/i386/drivers/timer_rdtsc.c
similarity index 85%
rename from src/arch/i386/drivers/timer_rtdsc.c
rename to src/arch/i386/drivers/timer_rdtsc.c
index 336e3e6f..57b8826c 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 ce58eefd..0f140214 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 )
 
 /** @} */
diff --git a/src/config.h b/src/config.h
index af0df1b6..4aac654a 100644
--- a/src/config.h
+++ b/src/config.h
@@ -24,7 +24,7 @@
 #undef	CONSOLE_PC_KBD		/* Direct access to PC keyboard */
 
 #define TIMER_BIOS
-#define TIMER_RTDSC
+#define TIMER_RDTSC
 
 /* @END general.h */
 
diff --git a/src/core/config.c b/src/core/config.c
index f3e17b62..94fd0b82 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -82,8 +82,8 @@ REQUIRE_OBJECT ( syslog );
 REQUIRE_OBJECT ( timer_bios );
 #endif
 
-#ifdef TIMER_RTDSC
-REQUIRE_OBJECT ( timer_rtdsc );
+#ifdef TIMER_RDTSC
+REQUIRE_OBJECT ( timer_rdtsc );
 #endif
 /*
  * Drag in all requested protocols