Changeset bd5f3b7 in mainline for uspace/lib/c/arch/ia32/include/ddi.h

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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:

• uspace/lib/c/arch/ia32/include/ddi.h (modified) (1 diff)

uspace/lib/c/arch/ia32/include/ddi.h

@@ -41 +41 @@
 static inline uint8_t pio_read_8(ioport8_t *port)
 {
-        uint8_t val;
-        
-        asm volatile (
-                "inb %w[port], %b[val]\n"
-                : [val] "=a" (val)
-                : [port] "d" (port)
-        );
-        
-        return val;
+        if (port < (ioport8_t *) 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;
 }
 
 static inline uint16_t pio_read_16(ioport16_t *port)
 {
-        uint16_t val;
-        
-        asm volatile (
-                "inw %w[port], %w[val]\n"
-                : [val] "=a" (val)
-                : [port] "d" (port)
-        );
-        
-        return val;
+        if (port < (ioport16_t *) 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;
 }
 
 static inline uint32_t pio_read_32(ioport32_t *port)
 {
-        uint32_t val;
-        
-        asm volatile (
-                "inl %w[port], %[val]\n"
-                : [val] "=a" (val)
-                : [port] "d" (port)
-        );
-        
-        return val;
+        if (port < (ioport32_t *) 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;
 }
 
 static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
-        asm volatile (
-                "outb %b[val], %w[port]\n"
-                :: [val] "a" (val), [port] "d" (port)
-        );
+        if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outb %b[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
+                );      
+        } else
+                *port = val;
 }
 
 static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
-        asm volatile (
-                "outw %w[val], %w[port]\n"
-                :: [val] "a" (val), [port] "d" (port)
-        );
+        if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outw %w[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
+                );
+        } else
+                *port = val;
 }
 
 static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
-        asm volatile (
-                "outl %[val], %w[port]\n"
-                :: [val] "a" (val), [port] "d" (port)
-        );
+        if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outl %[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
+                );
+        } else
+                *port = val;
 }