Changeset a1d89ad in mainline

Timestamp:

2009-04-13T20:34:25Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

37c312a

Parents:

3cc6a52

Message:

Prevent optimizing ia64's PIO away.
This solves the frequent hangs of HelenOS/ia64 in i8042_init().

Files:

• kernel/arch/ia64/include/asm.h (modified) (6 diffs)
• uspace/lib/libc/arch/ia64/include/ddi.h (modified) (6 diffs)

kernel/arch/ia64/include/asm.h

@@ -47 +47 @@
         uintptr_t prt = (uintptr_t) port;
 
-        *((uint8_t *)(IA64_IOSPACE_ADDRESS +
+        *((ioport8_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
 
@@ -57 +57 @@
         uintptr_t prt = (uintptr_t) port;
 
-        *((uint16_t *)(IA64_IOSPACE_ADDRESS +
+        *((ioport16_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
 
@@ -67 +67 @@
         uintptr_t prt = (uintptr_t) port;
 
-        *((uint32_t *)(IA64_IOSPACE_ADDRESS +
+        *((ioport32_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
 
@@ -79 +79 @@
         asm volatile ("mf\n" ::: "memory");
 
-        return *((uint8_t *)(IA64_IOSPACE_ADDRESS +
+        return *((ioport8_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12))));
 }
@@ -89 +89 @@
         asm volatile ("mf\n" ::: "memory");
 
-        return *((uint16_t *)(IA64_IOSPACE_ADDRESS +
+        return *((ioport16_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12))));
 }
@@ -99 +99 @@
         asm volatile ("mf\n" ::: "memory");
 
-        return *((uint32_t *)(IA64_IOSPACE_ADDRESS +
+        return *((ioport32_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12))));
 }

uspace/lib/libc/arch/ia64/include/ddi.h

@@ -54 +54 @@
         uintptr_t prt = (uintptr_t) port;
 
-        *((uint8_t *)(IA64_IOSPACE_ADDRESS +
+        *((ioport8_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
 
@@ -64 +64 @@
         uintptr_t prt = (uintptr_t) port;
 
-        *((uint16_t *)(IA64_IOSPACE_ADDRESS +
+        *((ioport16_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
 
@@ -74 +74 @@
         uintptr_t prt = (uintptr_t) port;
 
-        *((uint32_t *)(IA64_IOSPACE_ADDRESS +
+        *((ioport32_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
 
@@ -86 +86 @@
         asm volatile ("mf\n" ::: "memory");
 
-        return *((uint8_t *)(IA64_IOSPACE_ADDRESS +
+        return *((ioport8_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12))));
 }
@@ -96 +96 @@
         asm volatile ("mf\n" ::: "memory");
 
-        return *((uint16_t *)(IA64_IOSPACE_ADDRESS +
+        return *((ioport16_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12))));
 }
@@ -106 +106 @@
         asm volatile ("mf\n" ::: "memory");
 
-        return *((uint32_t *)(IA64_IOSPACE_ADDRESS +
+        return *((ioport32_t *)(IA64_IOSPACE_ADDRESS +
             ((prt & 0xfff) | ((prt >> 2) << 12))));
 }