Two hda_verb.h files: Add more comments.

[coreboot.git] / src / arch / i386 / include / arch / io.h

diff --git a/src/arch/i386/include/arch/io.h b/src/arch/i386/include/arch/io.h
index 59af68c203b3c20c1a12e60147cfd6ce98d33dac..aad84088d61fdd576c3b743b98fa6af2fc3839e7 100644 (file)
--- a/src/arch/i386/include/arch/io.h
+++ b/src/arch/i386/include/arch/io.h
@@ -9,7 +9,7 @@
  * (insb/insw/insl/outsb/outsw/outsl). You can also use "pausing"
  * versions of the single-IO instructions (inb_p/inw_p/..).
  */
-#if defined( __ROMCC__ ) && !defined (__GNUC__)
+#if defined(__ROMCC__)
 static inline void outb(uint8_t value, uint16_t port)
 {
        __builtin_outb(value, port);
@@ -42,7 +42,6 @@ static inline uint32_t inl(uint16_t port)
        return __builtin_inl(port);
 }
 #else
-
 static inline void outb(uint8_t value, uint16_t port)
 {
        __asm__ __volatile__ ("outb %b0, %w1" : : "a" (value), "Nd" (port));
@@ -78,13 +77,12 @@ static inline uint32_t inl(uint16_t port)
        __asm__ __volatile__ ("inl %w1, %0" : "=a"(value) : "Nd" (port));
        return value;
 }
-
-#endif /* __ROMCC__ && !__GNUC__*/
+#endif /* __ROMCC__ */
 
 static inline void outsb(uint16_t port, const void *addr, unsigned long count)
 {
        __asm__ __volatile__ (
-               "cld ; rep ; outsb " 
+               "cld ; rep ; outsb "
                : "=S" (addr), "=c" (count)
                : "d"(port), "0"(addr), "1" (count)
                );
@@ -93,7 +91,7 @@ static inline void outsb(uint16_t port, const void *addr, unsigned long count)
 static inline void outsw(uint16_t port, const void *addr, unsigned long count)
 {
        __asm__ __volatile__ (
-               "cld ; rep ; outsw " 
+               "cld ; rep ; outsw "
                : "=S" (addr), "=c" (count)
                : "d"(port), "0"(addr), "1" (count)
                );
@@ -102,7 +100,7 @@ static inline void outsw(uint16_t port, const void *addr, unsigned long count)
 static inline void outsl(uint16_t port, const void *addr, unsigned long count)
 {
        __asm__ __volatile__ (
-               "cld ; rep ; outsl " 
+               "cld ; rep ; outsl "
                : "=S" (addr), "=c" (count)
                : "d"(port), "0"(addr), "1" (count)
                );
@@ -112,7 +110,7 @@ static inline void outsl(uint16_t port, const void *addr, unsigned long count)
 static inline void insb(uint16_t port, void *addr, unsigned long count)
 {
        __asm__ __volatile__ (
-               "cld ; rep ; insb " 
+               "cld ; rep ; insb "
                : "=D" (addr), "=c" (count)
                : "d"(port), "0"(addr), "1" (count)
                );
@@ -121,7 +119,7 @@ static inline void insb(uint16_t port, void *addr, unsigned long count)
 static inline void insw(uint16_t port, void *addr, unsigned long count)
 {
        __asm__ __volatile__ (
-               "cld ; rep ; insw " 
+               "cld ; rep ; insw "
                : "=D" (addr), "=c" (count)
                : "d"(port), "0"(addr), "1" (count)
                );
@@ -130,40 +128,40 @@ static inline void insw(uint16_t port, void *addr, unsigned long count)
 static inline void insl(uint16_t port, void *addr, unsigned long count)
 {
        __asm__ __volatile__ (
-               "cld ; rep ; insl " 
+               "cld ; rep ; insl "
                : "=D" (addr), "=c" (count)
                : "d"(port), "0"(addr), "1" (count)
                );
 }
 
-static inline void writeb(uint8_t b, volatile void *addr)
+static inline __attribute__((always_inline)) uint8_t read8(unsigned long addr)
 {
-       *(volatile uint8_t *) addr = b;
+       return *((volatile uint8_t *)(addr));
 }
 
-static inline void writew(uint16_t b, volatile void *addr)
+static inline __attribute__((always_inline)) uint16_t read16(unsigned long addr)
 {
-       *(volatile uint16_t *) addr = b;
+       return *((volatile uint16_t *)(addr));
 }
 
-static inline void writel(uint32_t b, volatile void *addr)
+static inline __attribute__((always_inline)) uint32_t read32(unsigned long addr)
 {
-       *(volatile uint32_t *) addr = b;
+       return *((volatile uint32_t *)(addr));
 }
 
-static inline uint8_t readb(const volatile void *addr)
+static inline __attribute__((always_inline)) void write8(unsigned long addr, uint8_t value)
 {
-       return *(volatile uint8_t *) addr;
+       *((volatile uint8_t *)(addr)) = value;
 }
 
-static inline uint16_t readw(const volatile void *addr)
+static inline __attribute__((always_inline)) void write16(unsigned long addr, uint16_t value)
 {
-       return *(volatile uint16_t *) addr;
+       *((volatile uint16_t *)(addr)) = value;
 }
 
-static inline uint32_t readl(const volatile void *addr)
+static inline __attribute__((always_inline)) void write32(unsigned long addr, uint32_t value)
 {
-       return *(volatile uint32_t *) addr;
+       *((volatile uint32_t *)(addr)) = value;
 }
 
 #endif