aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/asm-mips/sn/klconfig.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/include/asm-mips/sn/klconfig.h b/include/asm-mips/sn/klconfig.h
index 19ece28c5e8b..ec469a3d2939 100644
--- a/include/asm-mips/sn/klconfig.h
+++ b/include/asm-mips/sn/klconfig.h
@@ -64,11 +64,7 @@
64 64
65#define KLCFGINFO_MAGIC 0xbeedbabe 65#define KLCFGINFO_MAGIC 0xbeedbabe
66 66
67#ifdef FRUTEST
68typedef u64 klconf_off_t;
69#else
70typedef s32 klconf_off_t; 67typedef s32 klconf_off_t;
71#endif
72 68
73/* 69/*
74 * Some IMPORTANT OFFSETS. These are the offsets on all NODES. 70 * Some IMPORTANT OFFSETS. These are the offsets on all NODES.
@@ -474,14 +470,6 @@ typedef struct lboard_s {
474#define KLCF_NUM_COMPS(_brd) ((_brd)->brd_numcompts) 470#define KLCF_NUM_COMPS(_brd) ((_brd)->brd_numcompts)
475#define KLCF_MODULE_ID(_brd) ((_brd)->brd_module) 471#define KLCF_MODULE_ID(_brd) ((_brd)->brd_module)
476 472
477#ifdef FRUTEST
478
479#define KLCF_NEXT(_brd) ((_brd)->brd_next ? (lboard_t *)((_brd)->brd_next): NULL)
480#define KLCF_COMP(_brd, _ndx) (klinfo_t *)((_brd)->brd_compts[(_ndx)])
481#define KLCF_COMP_ERROR(_brd, _comp) (_brd = _brd , (_comp)->errinfo)
482
483#else
484
485#define KLCF_NEXT(_brd) \ 473#define KLCF_NEXT(_brd) \
486 ((_brd)->brd_next ? \ 474 ((_brd)->brd_next ? \
487 (lboard_t *)(NODE_OFFSET_TO_K1(NASID_GET(_brd), (_brd)->brd_next)):\ 475 (lboard_t *)(NODE_OFFSET_TO_K1(NASID_GET(_brd), (_brd)->brd_next)):\
@@ -493,8 +481,6 @@ typedef struct lboard_s {
493#define KLCF_COMP_ERROR(_brd, _comp) \ 481#define KLCF_COMP_ERROR(_brd, _comp) \
494 (NODE_OFFSET_TO_K1(NASID_GET(_brd), (_comp)->errinfo)) 482 (NODE_OFFSET_TO_K1(NASID_GET(_brd), (_comp)->errinfo))
495 483
496#endif
497
498#define KLCF_COMP_TYPE(_comp) ((_comp)->struct_type) 484#define KLCF_COMP_TYPE(_comp) ((_comp)->struct_type)
499#define KLCF_BRIDGE_W_ID(_comp) ((_comp)->physid) /* Widget ID */ 485#define KLCF_BRIDGE_W_ID(_comp) ((_comp)->physid) /* Widget ID */
500 486