Changes in kernel/arch/amd64/include/asm.h [c22531fc:667a4f8] in mainline

File:

• kernel/arch/amd64/include/asm.h (modified) (11 diffs)

kernel/arch/amd64/include/asm.h

@@ -41 +41 @@
 #include <trace.h>
 
-#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
-
 /** Return base address of current stack.
  *
@@ -79 +77 @@
 }
 
+#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
+
 /** Byte from port
  *
@@ -89 +89 @@
 NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
-        if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
                 uint8_t val;
-                
                 asm volatile (
                         "inb %w[port], %b[val]\n"
@@ -97 +96 @@
                         : [port] "d" (port)
                 );
-                
                 return val;
-        } else
+        } else {
                 return (uint8_t) *port;
+        }
 }
 
@@ -113 +112 @@
 NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
-        if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
                 uint16_t val;
-                
                 asm volatile (
                         "inw %w[port], %w[val]\n"
@@ -121 +119 @@
                         : [port] "d" (port)
                 );
-                
                 return val;
-        } else
+        } else {
                 return (uint16_t) *port;
+        }
 }
 
@@ -137 +135 @@
 NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
-        if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
                 uint32_t val;
-                
                 asm volatile (
                         "inl %w[port], %[val]\n"
@@ -145 +142 @@
                         : [port] "d" (port)
                 );
-                
                 return val;
-        } else
+        } else {
                 return (uint32_t) *port;
+        }
 }
 
@@ -161 +158 @@
 NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
-        if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
                 asm volatile (
                         "outb %b[val], %w[port]\n"
                         :: [val] "a" (val), [port] "d" (port)
                 );      
-        } else
-                *port = val;
+        } else {
+                *((uint8_t *) port) = val;
+        }
 }
 
@@ -180 +178 @@
 NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
-        if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
                 asm volatile (
                         "outw %w[val], %w[port]\n"
                         :: [val] "a" (val), [port] "d" (port)
                 );
-        } else
-                *port = val;
+        } else {
+                *((uint16_t *) port) = val;
+        }
 }
 
@@ -199 +198 @@
 NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
-        if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
                 asm volatile (
                         "outl %[val], %w[port]\n"
                         :: [val] "a" (val), [port] "d" (port)
                 );
-        } else
-                *port = val;
+        } else {
+                *((uint32_t *) port) = val;
+        }
 }