patch-pre2.0.5 linux/include/asm-m68k/zorro.h

• Lines: 61
• Date: Thu May 16 09:05:11 1996
• Orig file: pre2.0.4/linux/include/asm-m68k/zorro.h
• Orig date: Tue Apr 23 13:57:12 1996

diff -u --recursive --new-file pre2.0.4/linux/include/asm-m68k/zorro.h linux/include/asm-m68k/zorro.h
@@ -11,6 +11,8 @@
 #ifndef _ASM_M68K_ZORRO_H_
 #define _ASM_M68K_ZORRO_H_
 
+#ifndef __ASSEMBLY__
+
 #include <linux/config.h>
 #include <asm/amigatypes.h>
 
@@ -302,6 +304,44 @@
     u_long		cd_Unused[4];	/* for whatever the driver wants */
 };
 
+#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__
 
 /*
  * Zorro Functions
@@ -341,5 +381,6 @@
 extern int zorro_get_list(char *buffer);
 #endif CONFIG_ZORRO
 
+#endif	/* __ASSEMBLY__ */
 
 #endif /* _ASM_M68K_ZORRO_H_ */