byte swapping

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1413 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 24 insertions, 12 deletions

diff --git a/src/arch/ppc/include/arch/io.h b/src/arch/ppc/include/arch/io.h
index a6ef47f687..fd0d1e4654 100644
--- a/src/arch/ppc/include/arch/io.h
+++ b/src/arch/ppc/include/arch/io.h
@@ -36,12 +36,8 @@
  * are arrays of bytes, and byte-swapping is not appropriate in
  * that case.  - paulus
  */
-#define insb(port, buf, ns)	_insb((uint8_t *)((port)+_IO_BASE), (buf), (ns))
-#define outsb(port, buf, ns)	_outsb((uint8_t *)((port)+_IO_BASE), (buf), (ns))
 #define insw(port, buf, ns)	_insw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns))
 #define outsw(port, buf, ns)	_outsw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns))
-#define insl(port, buf, nl)	_insl_ns((uint32_t *)((port)+_IO_BASE), (buf), (nl))
-#define outsl(port, buf, nl)	_outsl_ns((uint32_t *)((port)+_IO_BASE), (buf), (nl))
 
 #define inb(port)		in_8((uint8_t *)((port)+_IO_BASE))
 #define outb(val, port)		out_8((uint8_t *)((port)+_IO_BASE), (val))
@@ -58,14 +54,10 @@
 #define outl_p(val, port)	outl((val), (port))
 
 /*
- * The *_ns versions below don't do byte-swapping.
- * Neither do the standard versions now, these are just here
- * for older code.
+ * The *_ns versions below do byte-swapping.
  */
-#define insw_ns(port, buf, ns)	_insw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns))
-#define outsw_ns(port, buf, ns)	_outsw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns))
-#define insl_ns(port, buf, nl)	_insl_ns((uint32_t *)((port)+_IO_BASE), (buf), (nl))
-#define outsl_ns(port, buf, nl)	_outsl_ns((uint32_t *)((port)+_IO_BASE), (buf), (nl))
+#define insw_ns(port, buf, ns)	_insw((uint16_t *)((port)+_IO_BASE), (buf), (ns))
+#define outsw_ns(port, buf, ns)	_outsw((uint16_t *)((port)+_IO_BASE), (buf), (ns))
 
 
 #define IO_SPACE_LIMIT ~0
@@ -168,7 +160,7 @@ static inline void _insw_ns(volatile uint16_t *port, void *buf, int ns)
 	uint16_t *   b = (uint16_t *)buf;    
 
 	while (ns > 0) {    
-		*b++ = readw(port);
+		*b++ = in_le16(port);
 		ns--;
 	}
 }
@@ -182,4 +174,24 @@ static inline void _outsw_ns(volatile uint16_t *port, const void *buf, int ns)
 		ns--;
 	}
 }
+
+static inline void _insw(volatile uint16_t *port, void *buf, int ns)
+{
+	uint16_t *   b = (uint16_t *)buf;    
+
+	while (ns > 0) {    
+		*b++ = in_be16(port);
+		ns--;
+	}
+}
+
+static inline void _outsw(volatile uint16_t *port, const void *buf, int ns)
+{
+	uint16_t *   b = (uint16_t *)buf;    
+
+	while (ns > 0) {    
+		out_be16(port, *b++);
+		ns--;
+	}
+}
 #endif