Changeset 756f475 in mainline

Timestamp:

2008-10-11T17:39:26Z (16 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

338a8382

Parents:

c61d34b

Message:

Macro naming correction

File:

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

kernel/arch/ia64/include/asm.h

@@ -45 +45 @@
 static inline void  outb(uint64_t port,uint8_t v)
 {
-        *((char *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
-
-        asm volatile ("mf\n" ::: "memory");
-}
+        *((uint8_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
+
+        asm volatile ("mf\n" ::: "memory");
+}
+
+static inline void  outw(uint64_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(uint64_t port,uint32_t v)
+{
+        *((uint32_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
+
+        asm volatile ("mf\n" ::: "memory");
+}
+
 
 
@@ -55 +70 @@
         asm volatile ("mf\n" ::: "memory");
 
-        return *((char *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 ))));
+        return *((uint8_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 ))));
+}
+
+static inline uint16_t inw(uint64_t port)
+{
+        asm volatile ("mf\n" ::: "memory");
+
+        return *((uint16_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xffE) | ( (port >> 2) << 12 ))));
+}
+
+static inline uint32_t inl(uint64_t port)
+{
+        asm volatile ("mf\n" ::: "memory");
+
+        return *((uint32_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 ))));
 }