Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

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

diff --git a/include/linux/zorro.h b/include/linux/zorro.h
index 913bfc2..2f135cf 100644 (file)
--- a/include/linux/zorro.h
+++ b/include/linux/zorro.h
@@ -11,6 +11,8 @@
 #ifndef _LINUX_ZORRO_H
 #define _LINUX_ZORRO_H
 
+#ifndef __ASSEMBLY__
+
 #include <linux/device.h>
 
 
@@ -110,6 +112,45 @@ struct ConfigDev {
     __u32              cd_Unused[4];   /* for whatever the driver wants */
 } __attribute__ ((packed));
 
+#else /* __ASSEMBLY__ */
+
+LN_Succ                = 0
+LN_Pred                = LN_Succ+4
+LN_Type                = LN_Pred+4
+LN_Pri         = LN_Type+1
+LN_Name                = LN_Pri+1
+LN_sizeof      = LN_Name+4
+
+ER_Type                = 0
+ER_Product     = ER_Type+1
+ER_Flags       = ER_Product+1
+ER_Reserved03  = ER_Flags+1
+ER_Manufacturer        = ER_Reserved03+1
+ER_SerialNumber        = ER_Manufacturer+2
+ER_InitDiagVec = ER_SerialNumber+4
+ER_Reserved0c  = ER_InitDiagVec+2
+ER_Reserved0d  = ER_Reserved0c+1
+ER_Reserved0e  = ER_Reserved0d+1
+ER_Reserved0f  = ER_Reserved0e+1
+ER_sizeof      = ER_Reserved0f+1
+
+CD_Node                = 0
+CD_Flags       = CD_Node+LN_sizeof
+CD_Pad         = CD_Flags+1
+CD_Rom         = CD_Pad+1
+CD_BoardAddr   = CD_Rom+ER_sizeof
+CD_BoardSize   = CD_BoardAddr+4
+CD_SlotAddr    = CD_BoardSize+4
+CD_SlotSize    = CD_SlotAddr+2
+CD_Driver      = CD_SlotSize+2
+CD_NextCD      = CD_Driver+4
+CD_Unused      = CD_NextCD+4
+CD_sizeof      = CD_Unused+(4*4)
+
+#endif /* __ASSEMBLY__ */
+
+#ifndef __ASSEMBLY__
+
 #define ZORRO_NUM_AUTO         16
 
 #ifdef __KERNEL__
@@ -249,6 +290,7 @@ extern DECLARE_BITMAP(zorro_unused_z2ram, 128);
 #define Z2RAM_CHUNKSHIFT       (16)
 
 
+#endif /* !__ASSEMBLY__ */
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_ZORRO_H */