[Xen-devel] [PATCH 2/5] vtdt: Define APIC_TIMER_MODE_xxx in apicdef.h

["Wei, Gang" <gang.wei@xxxxxxxxx>]

vtdt: Define APIC_TIMER_MODE_xxx in apicdef.h

Remove redundant in apic.c

Signed-off-by: Wei Gang <gang.wei@xxxxxxxxx>

diff -r 845b84dfc591 xen/arch/x86/apic.c
--- a/xen/arch/x86/apic.c       Thu Dec 09 22:32:55 2010 +0800
+++ b/xen/arch/x86/apic.c       Thu Dec 09 22:32:58 2010 +0800
@@ -37,11 +37,6 @@
 #include <asm/asm_defns.h> /* for BUILD_SMP_INTERRUPT */
 #include <mach_apic.h>
 #include <io_ports.h>
-
-#define APIC_TIMER_MODE_ONESHOT         (0 << 17)
-#define APIC_TIMER_MODE_PERIODIC        (1 << 17)
-#define APIC_TIMER_MODE_TSC_DEADLINE    (2 << 17)
-#define APIC_TIMER_MODE_MASK            (3 << 17)
 
 static int tdt_enabled __read_mostly;
 static int tdt_enable __initdata = 1;
diff -r 845b84dfc591 xen/include/asm-x86/apicdef.h
--- a/xen/include/asm-x86/apicdef.h     Thu Dec 09 22:32:55 2010 +0800
+++ b/xen/include/asm-x86/apicdef.h     Thu Dec 09 22:32:58 2010 +0800
@@ -84,13 +84,19 @@
 #define                APIC_LVT0       0x350
 #define                APIC_CMCI       0x2F0
 
+/* ?? anybody using below definitions? Possible to remove them? */
 #define                        APIC_LVT_TIMER_BASE_MASK        (0x3<<18)
 #define                        GET_APIC_TIMER_BASE(x)          (((x)>>18)&0x3)
 #define                        SET_APIC_TIMER_BASE(x)          (((x)<<18))
 #define                        APIC_TIMER_BASE_CLKIN           0x0
 #define                        APIC_TIMER_BASE_TMBASE          0x1
 #define                        APIC_TIMER_BASE_DIV             0x2
-#define                        APIC_LVT_TIMER_PERIODIC         (1<<17)
+/* ?? anybody using above definitions? Possible to remove them? */
+#define                        APIC_TIMER_MODE_MASK            (0x3<<17)
+#define                        APIC_TIMER_MODE_ONESHOT         (0x0<<17)
+#define                        APIC_TIMER_MODE_PERIODIC        (0x1<<17)
+#define                        APIC_TIMER_MODE_TSC_DEADLINE    (0x2<<17)
+#define                        APIC_TIMER_MODE_RESERVED        (0x3<<17)
 #define                        APIC_LVT_MASKED                 (1<<16)
 #define                        APIC_LVT_LEVEL_TRIGGER          (1<<15)
 #define                        APIC_LVT_REMOTE_IRR             (1<<14)

Attachment: 3-def-timermode.patch
Description: 3-def-timermode.patch

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel