[MIPS] SN: Move FRU header one level up; it is not SN0-specific.
authorRalf Baechle <ralf@linux-mips.org>
Fri, 9 Jun 2006 23:37:20 +0000 (00:37 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 19 Jun 2006 16:39:22 +0000 (17:39 +0100)
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
include/asm-mips/sn/fru.h [new file with mode: 0644]
include/asm-mips/sn/klconfig.h
include/asm-mips/sn/sn0/sn0_fru.h [deleted file]

diff --git a/include/asm-mips/sn/fru.h b/include/asm-mips/sn/fru.h
new file mode 100644 (file)
index 0000000..b3e3606
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Derived from IRIX <sys/SN/SN0/sn0_fru.h>
+ *
+ * Copyright (C) 1992 - 1997, 1999 Silcon Graphics, Inc.
+ * Copyright (C) 1999, 2006 Ralf Baechle (ralf@linux-mips)
+ */
+#ifndef __ASM_SN_FRU_H
+#define __ASM_SN_FRU_H
+
+#define MAX_DIMMS                      8        /* max # of dimm banks */
+#define MAX_PCIDEV                     8        /* max # of pci devices on a pci bus */
+
+typedef unsigned char confidence_t;
+
+typedef struct kf_mem_s {
+       confidence_t km_confidence; /* confidence level that the memory is bad
+                                    * is this necessary ?
+                                    */
+       confidence_t km_dimm[MAX_DIMMS];
+                                   /* confidence level that dimm[i] is bad
+                                    *I think this is the right number
+                                    */
+
+} kf_mem_t;
+
+typedef struct kf_cpu_s {
+       confidence_t    kc_confidence; /* confidence level that cpu is bad */
+       confidence_t    kc_icache; /* confidence level that instr. cache is bad */
+       confidence_t    kc_dcache; /* confidence level that data   cache is bad */
+       confidence_t    kc_scache; /* confidence level that sec.   cache is bad */
+       confidence_t    kc_sysbus; /* confidence level that sysad/cmd/state bus is bad */
+} kf_cpu_t;
+
+typedef struct kf_pci_bus_s {
+       confidence_t    kpb_belief;     /* confidence level  that the  pci bus is bad */
+       confidence_t    kpb_pcidev_belief[MAX_PCIDEV];
+                                       /* confidence level that the pci dev is bad */
+} kf_pci_bus_t;
+
+#endif /* __ASM_SN_FRU_H */
index 5deaf1cdaddece20838fb4c893717d6c12ddb1c6..dc706268d2cf2db06da61d82c51cb7e5cc052be6 100644 (file)
@@ -37,7 +37,7 @@
 //#include <sys/SN/router.h>
 // XXX Stolen from <sys/SN/router.h>:
 #define MAX_ROUTER_PORTS (6)    /* Max. number of ports on a router */
-#include <asm/sn/sn0/sn0_fru.h>
+#include <asm/sn/fru.h>
 //#include <sys/graph.h>
 //#include <sys/xtalk/xbow.h>
 
diff --git a/include/asm-mips/sn/sn0/sn0_fru.h b/include/asm-mips/sn/sn0/sn0_fru.h
deleted file mode 100644 (file)
index 82c6377..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Derived from IRIX <sys/SN/SN0/sn0_fru.h>
- *
- * Copyright (C) 1992 - 1997, 1999 Silcon Graphics, Inc.
- * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org)
- */
-#ifndef _ASM_SN_SN0_SN0_FRU_H
-#define _ASM_SN_SN0_SN0_FRU_H
-
-#define MAX_DIMMS                      8        /* max # of dimm banks */
-#define MAX_PCIDEV                     8        /* max # of pci devices on a pci bus */
-
-typedef unsigned char confidence_t;
-
-typedef struct kf_mem_s {
-       confidence_t km_confidence; /* confidence level that the memory is bad
-                                    * is this necessary ?
-                                    */
-       confidence_t km_dimm[MAX_DIMMS];
-                                   /* confidence level that dimm[i] is bad
-                                    *I think this is the right number
-                                    */
-
-} kf_mem_t;
-
-typedef struct kf_cpu_s {
-       confidence_t    kc_confidence; /* confidence level that cpu is bad */
-       confidence_t    kc_icache; /* confidence level that instr. cache is bad */
-       confidence_t    kc_dcache; /* confidence level that data   cache is bad */
-       confidence_t    kc_scache; /* confidence level that sec.   cache is bad */
-       confidence_t    kc_sysbus; /* confidence level that sysad/cmd/state bus is bad */
-} kf_cpu_t;
-
-typedef struct kf_pci_bus_s {
-       confidence_t    kpb_belief;     /* confidence level  that the  pci bus is bad */
-       confidence_t    kpb_pcidev_belief[MAX_PCIDEV];
-                                       /* confidence level that the pci dev is bad */
-} kf_pci_bus_t;
-
-#endif /* _ASM_SN_SN0_SN0_FRU_H */