Changeset 6da1013f in mainline for kernel/arch/ia64/include

Timestamp:

2009-02-12T20:09:19Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

84266669

Parents:

7004747

Message:

simplify configuration
introduce arch_construct_function and inb/outb (sometimes empty) on all platforms
various code cleanup

Location:

kernel/arch/ia64/include

Files:

• asm.h (modified) (3 diffs)
• drivers/kbd.h (modified) (1 diff)
• fpu_context.h (modified) (1 diff)
• interrupt.h (modified) (1 diff)

kernel/arch/ia64/include/asm.h

@@ -42 +42 @@
 #define IA64_IOSPACE_ADDRESS 0xE001000000000000ULL
 
-static inline void  outb(ioport_t port, uint8_t v)
+static inline void outb(ioport_t port, uint8_t v)
 {
         *((uint8_t *)(IA64_IOSPACE_ADDRESS +
@@ -50 +50 @@
 }
 
-static inline void  outw(ioport_t port, uint16_t v)
+static inline void outw(ioport_t port, uint16_t v)
 {
         *((uint16_t *)(IA64_IOSPACE_ADDRESS +
@@ -58 +58 @@
 }
 
-static inline void  outl(ioport_t port, uint32_t v)
+static inline void outl(ioport_t port, uint32_t v)
 {
         *((uint32_t *)(IA64_IOSPACE_ADDRESS +

kernel/arch/ia64/include/drivers/kbd.h

@@ -36 +36 @@
 #define KERN_ia64_KBD_H_
 
-
-#define KBD_UNKNOWN 0
-#define KBD_SKI 1
-#define KBD_LEGACY 2
-#define KBD_NS16550 3
-
+#define KBD_UNKNOWN  0
+#define KBD_SKI      1
+#define KBD_LEGACY   2
+#define KBD_NS16550  3
 
 #endif

kernel/arch/ia64/include/fpu_context.h

@@ -36 +36 @@
 #define KERN_ia64_FPU_CONTEXT_H_
 
-#define ARCH_HAS_FPU 1
 #define FPU_CONTEXT_ALIGN 16
 

kernel/arch/ia64/include/interrupt.h

@@ -154 +154 @@
 extern void disabled_fp_register(uint64_t vector, istate_t *istate);
 
+extern void trap_virtual_enable_irqs(uint16_t irqmask);
+
 #endif