linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ralf@linux-mips.org
Date: Wed, 19 Jan 2005 17:00:38 +0000
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/01/19 17:00:32

Modified files:
        include/asm-mips: io.h 

Log message:
        Make __raw_* Operations non-swapping again.  This makes them identical
        to the bus_* operation so they've become a candidate for removal.

diff -urN linux/include/asm-mips/io.h linux/include/asm-mips/io.h
--- linux/include/asm-mips/io.h 2005/01/19 05:09:47     1.80
+++ linux/include/asm-mips/io.h 2005/01/19 17:00:32     1.81
@@ -34,39 +34,41 @@
 #undef CONF_SLOWDOWN_IO
 
 /*
+ * Raw operations are never swapped in software.  Otoh values that raw
+ * operations are working on may or may not have been swapped by the bus
+ * hardware.  An example use would be for flash memory that's used for
+ * execute in place.
+ */
+# define __raw_ioswabb(x)      (x)
+# define __raw_ioswabw(x)      (x)
+# define __raw_ioswabl(x)      (x)
+# define __raw_ioswabq(x)      (x)
+
+/*
  * Sane hardware offers swapping of PCI/ISA I/O space accesses in hardware;
  * less sane hardware forces software to fiddle with this...
  */
 #if defined(CONFIG_SWAP_IO_SPACE)
 
 # define ioswabb(x)            (x)
-# define __raw_ioswabb(x)      (x)
 # ifdef CONFIG_SGI_IP22
 /*
  * IP22 seems braindead enough to swap 16bits values in hardware, but
  * not 32bits.  Go figure... Can't tell without documentation.
  */
 #  define ioswabw(x)           (x)
-#  define __raw_ioswabw(x)     le16_to_cpu(x)
 # else
 #  define ioswabw(x)           le16_to_cpu(x)
-#  define __raw_ioswabw(x)     (x)
 # endif
 # define ioswabl(x)            le32_to_cpu(x)
-# define __raw_ioswabl(x)      (x)
 # define ioswabq(x)            le64_to_cpu(x)
-# define __raw_ioswabq(x)      (x)
 
 #else
 
 # define ioswabb(x)            (x)
-# define __raw_ioswabb(x)      (x)
 # define ioswabw(x)            (x)
-# define __raw_ioswabw(x)      cpu_to_le16(x)
 # define ioswabl(x)            (x)
-# define __raw_ioswabl(x)      cpu_to_le32(x)
 # define ioswabq(x)            (x)
-# define __raw_ioswabq(x)      cpu_to_le64(x)
 
 #endif
 

<Prev in Thread] Current Thread [Next in Thread>