Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / net / ibm_emac / ibm_emac_tah.h

diff --git a/drivers/net/ibm_emac/ibm_emac_tah.h b/drivers/net/ibm_emac/ibm_emac_tah.h
index ecfc698..9299b5d 100644 (file)
--- a/drivers/net/ibm_emac/ibm_emac_tah.h
+++ b/drivers/net/ibm_emac/ibm_emac_tah.h
@@ -1,9 +1,13 @@
 /*
- * Defines for the IBM TAH
+ * drivers/net/ibm_emac/ibm_emac_tah.h
+ *
+ * Driver for PowerPC 4xx on-chip ethernet controller, TAH support.
  *
  * Copyright 2004 MontaVista Software, Inc.
  * Matt Porter <mporter@kernel.crashing.org>
  *
+ * Copyright (c) 2005 Eugene Surovegin <ebs@ebshome.net>
+ *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
  * Free Software Foundation;  either version 2 of the  License, or (at your
@@ -13,36 +17,72 @@
 #ifndef _IBM_EMAC_TAH_H
 #define _IBM_EMAC_TAH_H
 
+#include <linux/config.h>
+#include <linux/init.h>
+#include <asm/ocp.h>
+
 /* TAH */
-typedef struct tah_regs {
-       u32 tah_revid;
+struct tah_regs {
+       u32 revid;
        u32 pad[3];
-       u32 tah_mr;
-       u32 tah_ssr0;
-       u32 tah_ssr1;
-       u32 tah_ssr2;
-       u32 tah_ssr3;
-       u32 tah_ssr4;
-       u32 tah_ssr5;
-       u32 tah_tsr;
-} tah_t;
+       u32 mr;
+       u32 ssr0;
+       u32 ssr1;
+       u32 ssr2;
+       u32 ssr3;
+       u32 ssr4;
+       u32 ssr5;
+       u32 tsr;
+};
 
 /* TAH engine */
-#define TAH_MR_CVR                     0x80000000
-#define TAH_MR_SR                      0x40000000
-#define TAH_MR_ST_256                  0x01000000
-#define TAH_MR_ST_512                  0x02000000
-#define TAH_MR_ST_768                  0x03000000
-#define TAH_MR_ST_1024                 0x04000000
-#define TAH_MR_ST_1280                 0x05000000
-#define TAH_MR_ST_1536                 0x06000000
-#define TAH_MR_TFS_16KB                        0x00000000
-#define TAH_MR_TFS_2KB                 0x00200000
-#define TAH_MR_TFS_4KB                 0x00400000
-#define TAH_MR_TFS_6KB                 0x00600000
-#define TAH_MR_TFS_8KB                 0x00800000
-#define TAH_MR_TFS_10KB                        0x00a00000
-#define TAH_MR_DTFP                    0x00100000
-#define TAH_MR_DIG                     0x00080000
+#define TAH_MR_CVR             0x80000000
+#define TAH_MR_SR              0x40000000
+#define TAH_MR_ST_256          0x01000000
+#define TAH_MR_ST_512          0x02000000
+#define TAH_MR_ST_768          0x03000000
+#define TAH_MR_ST_1024         0x04000000
+#define TAH_MR_ST_1280         0x05000000
+#define TAH_MR_ST_1536         0x06000000
+#define TAH_MR_TFS_16KB                0x00000000
+#define TAH_MR_TFS_2KB         0x00200000
+#define TAH_MR_TFS_4KB         0x00400000
+#define TAH_MR_TFS_6KB         0x00600000
+#define TAH_MR_TFS_8KB         0x00800000
+#define TAH_MR_TFS_10KB                0x00a00000
+#define TAH_MR_DTFP            0x00100000
+#define TAH_MR_DIG             0x00080000
+
+#ifdef CONFIG_IBM_EMAC_TAH
+int tah_attach(void *emac) __init;
+
+void __tah_fini(struct ocp_device *ocpdev) __exit;
+static inline void tah_fini(struct ocp_device *ocpdev)
+{
+       if (ocpdev)
+               __tah_fini(ocpdev);
+}
+
+void __tah_reset(struct ocp_device *ocpdev);
+static inline void tah_reset(struct ocp_device *ocpdev)
+{
+       if (ocpdev)
+               __tah_reset(ocpdev);
+}
+
+int __tah_get_regs_len(struct ocp_device *ocpdev);
+static inline int tah_get_regs_len(struct ocp_device *ocpdev)
+{
+       return ocpdev ? __tah_get_regs_len(ocpdev) : 0;
+}
+
+void *tah_dump_regs(struct ocp_device *ocpdev, void *buf);
+#else
+# define tah_attach(x)         0
+# define tah_fini(x)           ((void)0)
+# define tah_reset(x)          ((void)0)
+# define tah_get_regs_len(x)   0
+# define tah_dump_regs(x,buf)  (buf)
+#endif                         /* !CONFIG_IBM_EMAC_TAH */
 
 #endif                         /* _IBM_EMAC_TAH_H */