vserver 1.9.5.x5

[linux-2.6.git] / include / linux / com20020.h

diff --git a/include/linux/com20020.h b/include/linux/com20020.h
index c88d530..ac6d9a4 100644 (file)
--- a/include/linux/com20020.h
+++ b/include/linux/com20020.h
@@ -34,17 +34,24 @@ int com20020_found(struct net_device *dev, int shared);
 #define ARCNET_TOTAL_SIZE 8
 
 /* various register addresses */
-#define _INTMASK  (ioaddr+0)   /* writable */
-#define _STATUS   (ioaddr+0)   /* readable */
-#define _COMMAND  (ioaddr+1)   /* standard arcnet commands */
-#define _DIAGSTAT (ioaddr+1)   /* diagnostic status register */
-#define _ADDR_HI  (ioaddr+2)   /* control registers for IO-mapped memory */
-#define _ADDR_LO  (ioaddr+3)
-#define _MEMDATA  (ioaddr+4)   /* data port for IO-mapped memory */
-#define _SUBADR   (ioaddr+5)   /* the extended port _XREG refers to */
-#define _CONFIG   (ioaddr+6)   /* configuration register */
-#define _XREG     (ioaddr+7)   /* extra registers (indexed by _CONFIG 
-                                       or _SUBADR) */
+#ifdef CONFIG_SA1100_CT6001
+#define BUS_ALIGN  2  /* 8 bit device on a 16 bit bus - needs padding */
+#else
+#define BUS_ALIGN  1
+#endif
+
+
+#define _INTMASK  (ioaddr+BUS_ALIGN*0) /* writable */
+#define _STATUS   (ioaddr+BUS_ALIGN*0) /* readable */
+#define _COMMAND  (ioaddr+BUS_ALIGN*1) /* standard arcnet commands */
+#define _DIAGSTAT (ioaddr+BUS_ALIGN*1) /* diagnostic status register */
+#define _ADDR_HI  (ioaddr+BUS_ALIGN*2) /* control registers for IO-mapped memory */
+#define _ADDR_LO  (ioaddr+BUS_ALIGN*3)
+#define _MEMDATA  (ioaddr+BUS_ALIGN*4) /* data port for IO-mapped memory */
+#define _SUBADR   (ioaddr+BUS_ALIGN*5) /* the extended port _XREG refers to */
+#define _CONFIG   (ioaddr+BUS_ALIGN*6) /* configuration register */
+#define _XREG     (ioaddr+BUS_ALIGN*7) /* extra registers (indexed by _CONFIG
+                                       or _SUBADR) */
 
 /* in the ADDR_HI register */
 #define RDDATAflag     0x80    /* next access is a read (not a write) */
@@ -99,6 +106,7 @@ int com20020_found(struct net_device *dev, int shared);
                   }
 
 #define ASTATUS()      inb(_STATUS)
+#define ADIAGSTATUS()  inb(_DIAGSTAT)
 #define ACOMMAND(cmd)  outb((cmd),_COMMAND)
 #define AINTMASK(msk)  outb((msk),_INTMASK)