Changes in kernel/arch/ia32/include/asm.h [667a4f8:1c99eae] in mainline

File:

• kernel/arch/ia32/include/asm.h (modified) (9 diffs)

kernel/arch/ia32/include/asm.h

@@ -101 +101 @@
 GEN_WRITE_REG(dr7)
 
-#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
-
 /** Byte to port
  *
@@ -113 +111 @@
 NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
-        if (((void *)port) < IO_SPACE_BOUNDARY) {
-                asm volatile (
-                        "outb %b[val], %w[port]\n"
-                        :: [val] "a" (val), [port] "d" (port)
-                );      
-        } else {
-                *((uint8_t *) port) = val;
-        }
+        asm volatile (
+                "outb %b[val], %w[port]\n"
+                :: [val] "a" (val),
+                   [port] "d" (port)
+        );
 }
 
@@ -133 +128 @@
 NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
-        if (((void *)port) < IO_SPACE_BOUNDARY) {
-                asm volatile (
-                        "outw %w[val], %w[port]\n"
-                        :: [val] "a" (val), [port] "d" (port)
-                );
-        } else {
-                *((uint16_t *) port) = val;
-        }
+        asm volatile (
+                "outw %w[val], %w[port]\n"
+                :: [val] "a" (val),
+                   [port] "d" (port)
+        );
 }
 
@@ -153 +145 @@
 NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
-        if (((void *)port) < IO_SPACE_BOUNDARY) {
-                asm volatile (
-                        "outl %[val], %w[port]\n"
-                        :: [val] "a" (val), [port] "d" (port)
-                );
-        } else {
-                *((uint32_t *) port) = val;
-        }
+        asm volatile (
+                "outl %[val], %w[port]\n"
+                :: [val] "a" (val),
+                   [port] "d" (port)
+        );
 }
 
@@ -173 +162 @@
 NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
-        if (((void *)port) < IO_SPACE_BOUNDARY) {
-                uint8_t val;
-                asm volatile (
-                        "inb %w[port], %b[val]\n"
-                        : [val] "=a" (val)
-                        : [port] "d" (port)
-                );
-                return val;
-        } else {
-                return (uint8_t) *port;
-        }
+        uint8_t val;
+        
+        asm volatile (
+                "inb %w[port], %b[val]\n"
+                : [val] "=a" (val)
+                : [port] "d" (port)
+        );
+        
+        return val;
 }
 
@@ -196 +183 @@
 NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
-        if (((void *)port) < IO_SPACE_BOUNDARY) {
-                uint16_t val;
-                asm volatile (
-                        "inw %w[port], %w[val]\n"
-                        : [val] "=a" (val)
-                        : [port] "d" (port)
-                );
-                return val;
-        } else {
-                return (uint16_t) *port;
-        }
+        uint16_t val;
+        
+        asm volatile (
+                "inw %w[port], %w[val]\n"
+                : [val] "=a" (val)
+                : [port] "d" (port)
+        );
+        
+        return val;
 }
 
@@ -219 +204 @@
 NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
-        if (((void *)port) < IO_SPACE_BOUNDARY) {
-                uint32_t val;
-                asm volatile (
-                        "inl %w[port], %[val]\n"
-                        : [val] "=a" (val)
-                        : [port] "d" (port)
-                );
-                return val;
-        } else {
-                return (uint32_t) *port;
-        }
+        uint32_t val;
+        
+        asm volatile (
+                "inl %w[port], %[val]\n"
+                : [val] "=a" (val)
+                : [port] "d" (port)
+        );
+        
+        return val;
 }
 
@@ -328 +311 @@
 }
 
+#ifndef PROCESSOR_i486
+
 /** Write to MSR */
 NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
@@ -352 +337 @@
         return ((uint64_t) dx << 32) | ax;
 }
+
+#endif /* PROCESSOR_i486 */