Changeset 8b4d6cb in mainline for kernel/arch/ia64/include/asm.h

Timestamp:

2009-01-03T15:33:55Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2b70a6e

Parents:

fb69f39

Message:

More of ia64 cleanup.

File:

• kernel/arch/ia64/include/asm.h (modified) (5 diffs)

kernel/arch/ia64/include/asm.h

@@ -44 +44 @@
 #define IA64_IOSPACE_ADDRESS 0xE001000000000000ULL
 
-static inline void  outb(ioport_t port,uint8_t v)
-{
-        *((uint8_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
-
-        asm volatile ("mf\n" ::: "memory");
-}
-
-static inline void  outw(ioport_t port,uint16_t v)
-{
-        *((uint16_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
-
-        asm volatile ("mf\n" ::: "memory");
-}
-
-static inline void  outl(ioport_t port,uint32_t v)
-{
-        *((uint32_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
-
-        asm volatile ("mf\n" ::: "memory");
-}
-
-
+static inline void  outb(ioport_t port, uint8_t v)
+{
+        *((uint8_t *)(IA64_IOSPACE_ADDRESS +
+            ((port & 0xfff) | ((port >> 2) << 12)))) = v;
+
+        asm volatile ("mf\n" ::: "memory");
+}
+
+static inline void  outw(ioport_t port, uint16_t v)
+{
+        *((uint16_t *)(IA64_IOSPACE_ADDRESS +
+            ((port & 0xfff) | ((port >> 2) << 12)))) = v;
+
+        asm volatile ("mf\n" ::: "memory");
+}
+
+static inline void  outl(ioport_t port, uint32_t v)
+{
+        *((uint32_t *)(IA64_IOSPACE_ADDRESS +
+            ((port & 0xfff) | ((port >> 2) << 12)))) = v;
+
+        asm volatile ("mf\n" ::: "memory");
+}
 
 static inline uint8_t inb(ioport_t port)
@@ -71 +72 @@
         asm volatile ("mf\n" ::: "memory");
 
-        return *((uint8_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 ))));
+        return *((uint8_t *)(IA64_IOSPACE_ADDRESS +
+            ((port & 0xfff) | ((port >> 2) << 12))));
 }
 
@@ -78 +80 @@
         asm volatile ("mf\n" ::: "memory");
 
-        return *((uint16_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xffE) | ( (port >> 2) << 12 ))));
+        return *((uint16_t *)(IA64_IOSPACE_ADDRESS +
+            ((port & 0xffE) | ((port >> 2) << 12))));
 }
 
@@ -85 +88 @@
         asm volatile ("mf\n" ::: "memory");
 
-        return *((uint32_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 ))));
-}
-
-
+        return *((uint32_t *)(IA64_IOSPACE_ADDRESS +
+            ((port & 0xfff) | ((port >> 2) << 12))));
+}
 
 /** Return base address of current stack
@@ -343 +345 @@
 extern void asm_delay_loop(uint32_t t);
 
-extern void switch_to_userspace(uintptr_t entry, uintptr_t sp, uintptr_t bsp, uintptr_t uspace_uarg, uint64_t ipsr, uint64_t rsc);
+extern void switch_to_userspace(uintptr_t, uintptr_t, uintptr_t, uintptr_t,
+    uint64_t, uint64_t);
 
 #endif