Changeset ec7f8b1 in mainline for kernel/arch/amd64/include/asm.h

Timestamp:

2011-08-21T15:35:03Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

bb74dabe

Parents:

c4a8e4a (diff), 5935c079 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

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.
  *
@@ -77 +79 @@
 }
 
-#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
-
 /** Byte from port
  *
@@ -91 +91 @@
         if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
                 uint8_t val;
+                
                 asm volatile (
                         "inb %w[port], %b[val]\n"
@@ -96 +97 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint8_t) *port;
-        }
 }
 
@@ -114 +115 @@
         if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
                 uint16_t val;
+                
                 asm volatile (
                         "inw %w[port], %w[val]\n"
@@ -119 +121 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint16_t) *port;
-        }
 }
 
@@ -137 +139 @@
         if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
                 uint32_t val;
+                
                 asm volatile (
                         "inl %w[port], %[val]\n"
@@ -142 +145 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint32_t) *port;
-        }
 }
 
@@ -163 +166 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );      
-        } else {
+        } else
                 *port = val;
-        }
 }
 
@@ -183 +185 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );
-        } else {
+        } else
                 *port = val;
-        }
 }
 
@@ -203 +204 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );
-        } else {
+        } else
                 *port = val;
-        }
 }