[LV-kern-commit] CVS: kernel-2.4/include/asm-ia64/sn/sn1 addrs.h,1.1.1.1,1.2 arch.h,1.1.1.1,1.2 bedr

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1
In directory usw-pr-cvs1:/tmp/cvs-serv9454/asm-ia64/sn/sn1

Modified Files:
	addrs.h arch.h bedrock.h hubdev.h hubio.h hubio_next.h hublb.h 
	hublb_next.h hubmd.h hubmd_next.h hubni.h hubni_next.h hubpi.h 
	hubpi_next.h hubxb.h hubxb_next.h ip27config.h kldir.h leds.h 
	promlog.h router.h slotnum.h sn1.h uart16550.h 
Removed Files:
	war.h 
Log Message:
Synch to 2.4.15 commit 1


Index: addrs.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/addrs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

--- addrs.h	14 Jan 2001 17:02:03 -0000	1.1.1.1
+++ addrs.h	9 Apr 2002 12:33:12 -0000	1.2
@@ -43,22 +43,19 @@
 #if defined(_RUN_UNCACHED)
 #define CAC_BASE		0x9600000000000000
 #else
+#ifndef __ia64
 #define CAC_BASE		0xa800000000000000
+#else
+#define CAC_BASE                0xe000000000000000
+#endif
 #endif
 
-#ifdef Colin
-#define HSPEC_BASE		0x9000000000000000
-#define IO_BASE			0x9200000000000000
-#define MSPEC_BASE		0x9400000000000000
-#define UNCAC_BASE		0x9600000000000000
-#else
 #define HSPEC_BASE              0xc0000b0000000000
 #define HSPEC_SWIZ_BASE         0xc000030000000000
 #define IO_BASE                 0xc0000a0000000000
 #define IO_SWIZ_BASE            0xc000020000000000
 #define MSPEC_BASE              0xc000000000000000
 #define UNCAC_BASE              0xc000000000000000
-#endif
 
 #define TO_PHYS(x)		(	      ((x) & TO_PHYS_MASK))
 #define TO_CAC(x)		(CAC_BASE   | ((x) & TO_PHYS_MASK))

Index: arch.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/arch.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: bedrock.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/bedrock.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- bedrock.h	14 Jan 2001 17:02:04 -0000	1.1.1.1
+++ bedrock.h	9 Apr 2002 12:33:12 -0000	1.2
@@ -11,6 +11,8 @@
 #ifndef _ASM_SN_SN1_BEDROCK_H
 #define _ASM_SN_SN1_BEDROCK_H
 
+#include <linux/config.h>
+
 /* The secret password; used to release protection */
 #define HUB_PASSWORD		0x53474972756c6573ull
 
@@ -22,7 +24,6 @@
 
 #define MAX_HUB_PATH		80
 
-#include <linux/config.h>
 #if defined(CONFIG_SGI_IP35) || defined(CONFIG_IA64_SGI_SN1) || defined(CONFIG_IA64_GENERIC)
 #include <asm/sn/arch.h>
 #include <asm/sn/sn1/addrs.h>

Index: hubdev.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hubdev.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: hubio.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hubio.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: hubio_next.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hubio_next.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- hubio_next.h	14 Jan 2001 17:02:30 -0000	1.1.1.1
+++ hubio_next.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -43,6 +43,8 @@
 #define IIO_IOPRB_0		IIO_IPRB0
 #define IIO_PRTE_0      	IIO_IPRTE0        /* PIO Read address table entry 0 */
 #define IIO_PRTE(_x)    	(IIO_PRTE_0 + (8 * (_x)))
+#define IIO_NUM_IPRBS 		(9) 
+#define IIO_WIDPRTE(x)  IIO_PRTE(((x) - 8)) /* widget ID to its PRTE num */
 
 #define IIO_LLP_CSR_IS_UP               0x00002000
 #define IIO_LLP_CSR_LLP_STAT_MASK       0x00003000
@@ -192,6 +194,21 @@
 #define       HUBII_XBOW_CREDIT       3
 #define       HUBII_XBOW_REV2_CREDIT  4
 
+/*
+ * Number of credits that xtalk devices should use when communicating
+ * with a Bedrock (depth of Bedrock's queue).
+ */
+#define HUB_CREDIT 4
+
+/*
+ * Some IIO_PRB fields
+ */
+#define IIO_PRB_MULTI_ERR	(1LL << 63)
+#define IIO_PRB_SPUR_RD		(1LL << 51)
+#define IIO_PRB_SPUR_WR		(1LL << 50)
+#define IIO_PRB_RD_TO		(1LL << 49)
+#define IIO_PRB_ERROR		(1LL << 48)
+
 /*************************************************************************
 
  Some of the IIO field masks and shifts are defined here.
@@ -245,6 +262,29 @@
 #define IBCT_ZFIL_MODE		(0x1 << 0)
 
 /*
+ * IIO Incoming Error Packet Header (IIO_IIEPH1/IIO_IIEPH2)
+ */
+#define IIEPH1_VALID		(1 << 44)
+#define IIEPH1_OVERRUN		(1 << 40)
+#define IIEPH1_ERR_TYPE_SHFT	32
+#define IIEPH1_ERR_TYPE_MASK	0xf
+#define IIEPH1_SOURCE_SHFT	20
+#define IIEPH1_SOURCE_MASK	11
+#define IIEPH1_SUPPL_SHFT	8
+#define IIEPH1_SUPPL_MASK	11
+#define IIEPH1_CMD_SHFT		0
+#define IIEPH1_CMD_MASK		7
+
+#define IIEPH2_TAIL		(1 << 40)
+#define IIEPH2_ADDRESS_SHFT	0
+#define IIEPH2_ADDRESS_MASK	38
+
+#define IIEPH1_ERR_SHORT_REQ	2
+#define IIEPH1_ERR_SHORT_REPLY	3
+#define IIEPH1_ERR_LONG_REQ	4
+#define IIEPH1_ERR_LONG_REPLY	5
+
+/*
  * IO Error Clear register bit field definitions
  */
 #define IECLR_PI1_FWD_INT	(1 << 31)  /* clear PI1_FORWARD_INT in iidsr */
@@ -363,6 +403,10 @@
 /* A few more #defines for backwards compatibility */
 #define iprb_t          ii_iprb0_u_t
 #define iprb_regval     ii_iprb0_regval
+#define iprb_mult_err	ii_iprb0_fld_s.i_mult_err
+#define iprb_spur_rd	ii_iprb0_fld_s.i_spur_rd
+#define iprb_spur_wr	ii_iprb0_fld_s.i_spur_wr
+#define iprb_rd_to	ii_iprb0_fld_s.i_rd_to
 #define iprb_ovflow     ii_iprb0_fld_s.i_of_cnt
 #define iprb_error      ii_iprb0_fld_s.i_error
 #define iprb_ff         ii_iprb0_fld_s.i_f
@@ -385,7 +429,6 @@
 
 #define IO_PERF_SETS	32
 
-#ifdef BRINGUP
 #if __KERNEL__
 #if _LANGUAGE_C
 /* XXX moved over from SN/SN0/hubio.h -- each should be checked for SN1 */
@@ -646,6 +689,11 @@
                 device_desc_t dev_desc,         /* device descriptor */
                 devfs_handle_t owner_dev);        /* owner of this interrupt */
 
+extern hub_intr_t
+hub_intr_alloc_nothd(devfs_handle_t dev,          /* which device */
+                device_desc_t dev_desc,         /* device descriptor */
+                devfs_handle_t owner_dev);        /* owner of this interrupt */
+
 extern void
 hub_intr_free(hub_intr_t intr_hdl);
 
@@ -710,5 +758,4 @@
 
 #endif /* _LANGUAGE_C */
 #endif /* _KERNEL */
-#endif /* BRINGUP */
 #endif  /* _ASM_SN_SN1_HUBIO_NEXT_H */

Index: hublb.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hublb.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: hublb_next.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hublb_next.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: hubmd.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hubmd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- hubmd.h	14 Jan 2001 17:02:50 -0000	1.1.1.1
+++ hubmd.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -2140,7 +2140,7 @@
  * corresponds to the valid bit, and bit 1 of each two-bit field        *
  * corresponds to the overrun bit.                                      *
  * The rule for the valid bit is that it gets set whenever that error   *
- * occurs, regardless of whether a higher priority error has occured.   *
+ * occurs, regardless of whether a higher priority error has occurred.   *
  * The rule for the overrun bit is that it gets set whenever we are     *
  * unable to record the address information for this particular         *
  * error, due to a previous error of the same or higher priority.       *
@@ -2221,7 +2221,7 @@
  * corresponds to the valid bit, and bit 1 of each two-bit field        *
  * corresponds to the overrun bit.                                      *
  * The rule for the valid bit is that it gets set whenever that error   *
- * occurs, regardless of whether a higher priority error has occured.   *
+ * occurs, regardless of whether a higher priority error has occurred.  *
  * The rule for the overrun bit is that it gets set whenever we are     *
  * unable to record the address information for this particular         *
  * error, due to a previous error of the same or higher priority.       *

Index: hubmd_next.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hubmd_next.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- hubmd_next.h	14 Jan 2001 17:02:54 -0000	1.1.1.1
+++ hubmd_next.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -648,7 +648,7 @@
 #define MD_SDIR_MASK            0xffffffff
 
 /* When premium mode is on for probing but standard directory memory
-   is installed, the vaild directory bits depend on the phys. bank */
+   is installed, the valid directory bits depend on the phys. bank */
 #define MD_PDIR_PROBE_MASK(pb)  0xffffffffffffffff
 #define MD_SDIR_PROBE_MASK(pb)  (0xffff0000ffff << ((pb) ? 16 : 0))
 

Index: hubni.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hubni.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: hubni_next.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hubni_next.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: hubpi.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hubpi.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: hubpi_next.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hubpi_next.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- hubpi_next.h	14 Jan 2001 17:03:25 -0000	1.1.1.1
+++ hubpi_next.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -274,7 +274,9 @@
  * The following three macros define all possible error int pends. 
  */
 
-#define PI_FATAL_ERR_CPU_A	(PI_ERR_SYSAD_BAD_DATA_A | \
+#define PI_FATAL_ERR_CPU_A	(PI_ERR_IRB_TIMEOUT_A	| \
+				 PI_ERR_IRB_ERR_A	| \
+				 PI_ERR_PKT_LEN_ERR_A	| \
 				 PI_ERR_SYSSTATE_TAG_A 	| \
 				 PI_ERR_BAD_SPOOL_A 	| \
 				 PI_ERR_SYSCMD_ADDR_A 	| \
@@ -283,17 +285,17 @@
 				 PI_ERR_SYSAD_DATA_A	| \
 				 PI_ERR_SYSSTATE_A)
 
-#define PI_MISC_ERR_CPU_A	(PI_ERR_IRB_TIMEOUT_A   | \
-				 PI_ERR_IRB_ERR_A       | \
-				 PI_ERR_PKT_LEN_ERR_A   | \
-				 PI_ERR_UE_CACHED_A     | \
+#define PI_MISC_ERR_CPU_A	(PI_ERR_UE_CACHED_A	| \
+				 PI_ERR_SYSAD_BAD_DATA_A| \
 				 PI_ERR_UNCAC_UNCORR_A 	| \
 				 PI_ERR_WRB_WERR_A 	| \
 				 PI_ERR_WRB_TERR_A 	| \
 				 PI_ERR_SPUR_MSG_A 	| \
 				 PI_ERR_SPOOL_CMP_A)
 
-#define PI_FATAL_ERR_CPU_B	(PI_ERR_SYSAD_BAD_DATA_B | \
+#define PI_FATAL_ERR_CPU_B	(PI_ERR_IRB_TIMEOUT_B	| \
+				 PI_ERR_IRB_ERR_B	| \
+				 PI_ERR_PKT_LEN_ERR_B	| \
 				 PI_ERR_SYSSTATE_TAG_B 	| \
 				 PI_ERR_BAD_SPOOL_B 	| \
 				 PI_ERR_SYSCMD_ADDR_B 	| \
@@ -302,11 +304,9 @@
 				 PI_ERR_SYSAD_DATA_B	| \
 				 PI_ERR_SYSSTATE_B)
 
-#define PI_MISC_ERR_CPU_B 	(PI_ERR_IRB_TIMEOUT_B   | \
-				 PI_ERR_IRB_ERR_B       | \
-				 PI_ERR_PKT_LEN_ERR_B   | \
-				 PI_ERR_UE_CACHED_B     | \
-				 PI_ERR_UNCAC_UNCORR_B  | \
+#define PI_MISC_ERR_CPU_B	(PI_ERR_UE_CACHED_B	| \
+				 PI_ERR_SYSAD_BAD_DATA_B| \
+				 PI_ERR_UNCAC_UNCORR_B 	| \
 				 PI_ERR_WRB_WERR_B 	| \
 				 PI_ERR_WRB_TERR_B 	| \
 				 PI_ERR_SPUR_MSG_B 	| \

Index: hubxb.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hubxb.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: hubxb_next.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/hubxb_next.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- hubxb_next.h	14 Jan 2001 17:03:32 -0000	1.1.1.1
+++ hubxb_next.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -28,5 +28,6 @@
 
 /* XB_PARMS fields */
 #define XBP_RESET_DEFAULTS	0x0008000080000021LL
+#define XBP_ACTIVE_DEFAULTS	0x00080000fffff021LL
 
 #endif	/* _ASM_SN_SN1_HUBXB_NEXT_H */

Index: ip27config.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/ip27config.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ip27config.h	14 Jan 2001 17:03:35 -0000	1.1.1.1
+++ ip27config.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -188,6 +188,10 @@
 #define	IP27C_R10000_SCCD_MASK		(7 << IP27C_R10000_SCCD_SHFT)
 #define	IP27C_R10000_SCCD(_B)		((_B) << IP27C_R10000_SCCD_SHFT)
 
+#define	IP27C_R10000_DDR_SHFT		23
+#define	IP27C_R10000_DDR_MASK		(1 << IP27C_R10000_DDR_SHFT)
+#define	IP27C_R10000_DDR(_B)		((_B) << IP27C_R10000_DDR_SHFT)
+
 #define	IP27C_R10000_SCCT_SHFT		25
 #define	IP27C_R10000_SCCT_MASK		(0xf << IP27C_R10000_SCCT_SHFT)
 #define	IP27C_R10000_SCCT(_B)		((_B) << IP27C_R10000_SCCT_SHFT)
@@ -375,6 +379,7 @@
 	 IP27C_R10000_SCCE(0)	 + \
 	 IP27C_R10000_ME(1)	 + \
 	 IP27C_R10000_SCS(4)	 + \
+	 IP27C_R10000_DDR(1)     + \
 	 IP27C_R10000_SCCD(3)	 + \
 	 IP27C_R10000_SCCT(0xa)	 + \
 	 IP27C_R10000_ODSC(0)	 + \
@@ -503,12 +508,7 @@
  * for building hex images (as required by start.s)
  */
 #ifdef IP27_CONFIG_SN00_4MB_100_200_133
-#ifdef IRIX
-/* Set PrcReqMax to 0 to reduce memory problems */
-#define	BRINGUP_PRM_VAL	0
-#else
 #define	BRINGUP_PRM_VAL	3
-#endif
 #define CONFIG_CPU_MODE \
 	(IP27C_R10000_KSEG0CA(5) + \
 	 IP27C_R10000_DEVNUM(0)	 + \
@@ -593,6 +593,7 @@
 	 IP27C_R10000_ME(1)	 + \
 	 IP27C_R10000_SCS(4)	 + \
 	 IP27C_R10000_SCCD(3)	 + \
+         IP27C_R10000_DDR(1)     + \
 	 IP27C_R10000_SCCT(0xa)	 + \
 	 IP27C_R10000_ODSC(0)	 + \
 	 IP27C_R10000_ODSYS(1)	 + \

Index: kldir.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/kldir.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: leds.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/leds.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- leds.h	14 Jan 2001 17:03:36 -0000	1.1.1.1
+++ leds.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -25,7 +25,7 @@
 	long	*ledp;
 	int	eid;
 
-	eid = hard_processor_sapicid() & 3;
+	eid = hard_smp_processor_id() & 3;
 	ledp = (long*) (LED0 + (eid<<3));
 	*ledp = val;
 }

Index: promlog.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/promlog.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: router.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/router.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- router.h	14 Jan 2001 17:03:40 -0000	1.1.1.1
+++ router.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -513,7 +513,7 @@
 #ifdef DEBUG
 	int64_t	ri_deltatime;	/* Time it took to sample	    */
 #endif
-	lock_t		ri_lock;	/* Lock for access to router info   */
+	spinlock_t	ri_lock;	/* Lock for access to router info   */
 	net_vec_t	*ri_vecarray;	/* Pointer to array of vectors	    */
 	struct lboard_s	*ri_brd;	/* Pointer to board structure	    */
 	char *		ri_name;	/* This board's hwg path 	    */
@@ -566,6 +566,7 @@
 #define NORMAL_ROUTER_NAME	"normal_router"
 #define NULL_ROUTER_NAME	"null_router"
 #define META_ROUTER_NAME	"meta_router"
+#define REPEATER_ROUTER_NAME	"repeater_router"
 #define UNKNOWN_ROUTER_NAME	"unknown_router" 
 
 /* The following definitions are needed by the router traversing
@@ -630,7 +631,7 @@
  */
 
 #define RRM_RESETOK(_L)		(UINT64_CAST 1 << ((_L) - 1))
-#define RRM_RESETOK_ALL		(UINT64_CAST 0x3f)
+#define RRM_RESETOK_ALL		ALL_PORTS
 
 /*
  * RR_META_TABLE(_x) and RR_LOCAL_TABLE(_x) mask and shift definitions

Index: slotnum.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/slotnum.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- slotnum.h	14 Jan 2001 17:03:40 -0000	1.1.1.1
+++ slotnum.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -14,8 +14,7 @@
 #define SLOTNUM_MAXLENGTH	16
 
 /*
- * This file attempts to define a slot number space across all slots
- * a IP27 module.  Here, we deal with the top level slots.
+ * This file attempts to define a slot number space across all slots.
  *
  *	Node slots
  *	Router slots
@@ -24,16 +23,20 @@
  *	Other slots are children of their parent crosstalk slot:
  *		PCI slots
  *		VME slots
+ *
+ *	The PCI class has been added since the XBridge ASIC on SN-MIPS
+ *	has built-in PCI bridges (2). On IBricks, widget E & F serve
+ *	PCI busses, and on PBricks all widgets serve as PCI busses
+ *	with the use of the super-bridge mode of the XBridge ASIC.
  */
-// #include <slotnum.h>
 
-// #ifdef NOTDEF	/* moved to sys/slotnum.h */
 #define SLOTNUM_NODE_CLASS	0x00	/* Node   */
 #define SLOTNUM_ROUTER_CLASS	0x10	/* Router */
 #define SLOTNUM_XTALK_CLASS	0x20	/* Xtalk  */
 #define SLOTNUM_MIDPLANE_CLASS	0x30	/* Midplane */
 #define SLOTNUM_XBOW_CLASS	0x40	/* Xbow  */
 #define SLOTNUM_KNODE_CLASS	0x50	/* Kego node */
+#define SLOTNUM_PCI_CLASS	0x60	/* PCI widgets on XBridge */
 #define SLOTNUM_INVALID_CLASS	0xf0	/* Invalid */
 
 #define SLOTNUM_CLASS_MASK	0xf0
@@ -41,7 +44,6 @@
 
 #define SLOTNUM_GETCLASS(_sn)	((_sn) & SLOTNUM_CLASS_MASK)
 #define SLOTNUM_GETSLOT(_sn)	((_sn) & SLOTNUM_SLOT_MASK)
-// #endif	/* NOTDEF */
 
 /* This determines module to pnode mapping. */
 /* NODESLOTS_PER_MODULE has changed from 4 to 6

Index: sn1.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/sn1.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: uart16550.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/sn1/uart16550.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- uart16550.h	14 Jan 2001 17:03:42 -0000	1.1.1.1
+++ uart16550.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -1,3 +1,16 @@
+/* $Id$
+ *
+ * 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.
+ *
+ * Copyright (C) 1992 - 1997, 2000 Silicon Graphics, Inc.
+ * Copyright (C) 2000 by Colin Ngam
+ */
+
+#ifndef _ASM_SN_SN1_UART16550_H
+#define _ASM_SN_SN1_UART16550_H
+
 
 /*
  * Definitions for 16550  chip
@@ -212,3 +225,4 @@
 #define INC_RING_POINTER(x) \
 	( ((x & 0xffe0) < 4064) ? (x += 32) : 0 )
 
+#endif /* _ASM_SN_SN1_UART16550_H */

--- war.h DELETED ---



