X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Farch%2Fi386%2Finclude%2Farch%2Fio.h;h=aad84088d61fdd576c3b743b98fa6af2fc3839e7;hb=198cb96387c457affa01696405ffaa4531e8e361;hp=3a76579fbc7cd207e79f148eab5296b9f8d77faa;hpb=35b6bbb7217956fe29f5d7f29d3ce780f1e640f5;p=coreboot.git

diff --git a/src/arch/i386/include/arch/io.h b/src/arch/i386/include/arch/io.h
index 3a76579fb..aad84088d 100644
--- a/src/arch/i386/include/arch/io.h
+++ b/src/arch/i386/include/arch/io.h
@@ -82,7 +82,7 @@ static inline uint32_t inl(uint16_t port)
 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)
 		);
@@ -91,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)
 		);
@@ -100,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)
 		);
@@ -110,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)
 		);
@@ -119,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)
 		);
@@ -128,53 +128,12 @@ 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)
 		);
 }
 
-#if 0
-/* XXX XXX XXX This is a story from the evil API from hell XXX XXX XXX
- * We have different functions for memory access in pre-ram stage and ram
- * stage. Those in pre-ram stage are called write32 and expect the address
- * first and the address as a pointer type. Those in ram stage are called
- * writel and expect the datum first and the address as an integer type.
- * Until all code is checked and fixed, I'll add both versions here now.
- */
-
-static inline void writeb(uint8_t b, volatile void *addr)
-{
-	*(volatile uint8_t *) addr = b;
-}
-
-static inline void writew(uint16_t b, volatile void *addr)
-{
-	*(volatile uint16_t *) addr = b;
-}
-
-static inline void writel(uint32_t b, volatile void *addr)
-{
-	*(volatile uint32_t *) addr = b;
-}
-
-static inline uint8_t readb(const volatile void *addr)
-{
-	return *(volatile uint8_t *) addr;
-}
-
-static inline uint16_t readw(const volatile void *addr)
-{
-	return *(volatile uint16_t *) addr;
-}
-
-static inline uint32_t readl(const volatile void *addr)
-{
-	return *(volatile uint32_t *) addr;
-}
-#endif
-
-#if !defined(__PRE_RAM__)
 static inline __attribute__((always_inline)) uint8_t read8(unsigned long addr)
 {
 	return *((volatile uint8_t *)(addr));
@@ -204,7 +163,6 @@ static inline __attribute__((always_inline)) void write32(unsigned long addr, ui
 {
 	*((volatile uint32_t *)(addr)) = value;
 }
-#endif
 
 #endif