ソースを参照

fix the rdtsc namimg

tags/v0.9.4
Alexey Zaytsev 16年前
コミット
1935439f86
4個のファイルの変更11行の追加11行の削除
  1. 7
    7
      src/arch/i386/drivers/timer_rdtsc.c
  2. 1
    1
      src/arch/i386/include/bits/errfile.h
  3. 1
    1
      src/config.h
  4. 2
    2
      src/core/config.c

src/arch/i386/drivers/timer_rtdsc.c → src/arch/i386/drivers/timer_rdtsc.c ファイルの表示

@@ -48,7 +48,7 @@ bad_ctc:
48 48
 }
49 49
 static uint32_t clocks_per_second = 0;
50 50
 
51
-static tick_t rtdsc_currticks(void)
51
+static tick_t rdtsc_currticks(void)
52 52
 {
53 53
 	uint32_t clocks_high, clocks_low;
54 54
 	uint32_t currticks;
@@ -64,7 +64,7 @@ static tick_t rtdsc_currticks(void)
64 64
 	return currticks;
65 65
 }
66 66
 
67
-static int rtdsc_ts_init(void)
67
+static int rdtsc_ts_init(void)
68 68
 {
69 69
 
70 70
 	struct cpuinfo_x86 cpu_info;
@@ -73,19 +73,19 @@ static int rtdsc_ts_init(void)
73 73
 	if (cpu_info.features & X86_FEATURE_TSC) {
74 74
 		clocks_per_second = calibrate_tsc();
75 75
 		if (clocks_per_second) {
76
-			DBG("RTDSC Ticksource installed. CPU running at %ld Mhz\n",
76
+			DBG("RDTSC ticksource installed. CPU running at %ld Mhz\n",
77 77
 				clocks_per_second/(1000*1000));
78 78
 			return 0;
79 79
 		}
80 80
 	}
81 81
 
82
-	DBG("RTDSC timer not available on this machine.\n");
82
+	DBG("RDTSC ticksource not available on this machine.\n");
83 83
 	return -ENODEV;
84 84
 }
85 85
 
86
-struct timer rtdsc_ts __timer (01) = {
87
-	.init = rtdsc_ts_init,
86
+struct timer rdtsc_ts __timer (01) = {
87
+	.init = rdtsc_ts_init,
88 88
 	.udelay = generic_currticks_udelay,
89
-	.currticks = rtdsc_currticks,
89
+	.currticks = rdtsc_currticks,
90 90
 };
91 91
 

+ 1
- 1
src/arch/i386/include/bits/errfile.h ファイルの表示

@@ -26,7 +26,7 @@
26 26
 #define ERRFILE_undionly	 ( ERRFILE_ARCH | ERRFILE_NET | 0x00030000 )
27 27
 #define ERRFILE_undirom		 ( ERRFILE_ARCH | ERRFILE_NET | 0x00040000 )
28 28
 
29
-#define ERRFILE_timer_rtdsc    ( ERRFILE_ARCH | ERRFILE_DRIVER | 0x00000000 )
29
+#define ERRFILE_timer_rdtsc    ( ERRFILE_ARCH | ERRFILE_DRIVER | 0x00000000 )
30 30
 #define ERRFILE_timer_bios     ( ERRFILE_ARCH | ERRFILE_DRIVER | 0x00010000 )
31 31
 
32 32
 /** @} */

+ 1
- 1
src/config.h ファイルの表示

@@ -24,7 +24,7 @@
24 24
 #undef	CONSOLE_PC_KBD		/* Direct access to PC keyboard */
25 25
 
26 26
 #define TIMER_BIOS
27
-#define TIMER_RTDSC
27
+#define TIMER_RDTSC
28 28
 
29 29
 /* @END general.h */
30 30
 

+ 2
- 2
src/core/config.c ファイルの表示

@@ -82,8 +82,8 @@ REQUIRE_OBJECT ( syslog );
82 82
 REQUIRE_OBJECT ( timer_bios );
83 83
 #endif
84 84
 
85
-#ifdef TIMER_RTDSC
86
-REQUIRE_OBJECT ( timer_rtdsc );
85
+#ifdef TIMER_RDTSC
86
+REQUIRE_OBJECT ( timer_rdtsc );
87 87
 #endif
88 88
 /*
89 89
  * Drag in all requested protocols

読み込み中…
キャンセル
保存