Mercurial > illumos > illumos-gate

changeset 4012:d73a7d74af00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6539905 Change PCIE SLot Numbering to start from zero instead of one
author zx143588
date Wed, 11 Apr 2007 11:21:28 -0700
parents c21745e4c9ae
children da49edb39e10
files usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.c usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.h
diffstat 2 files changed, 15 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.c	Wed Apr 11 10:58:03 2007 -0700
+++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.c	Wed Apr 11 11:21:28 2007 -0700
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -76,6 +76,10 @@
 	} else if (strcmp(path, HURON_N2_XAUI1) == 0) {
 		(void) strcpy(card->slot_str, "1");
 		card->slot = 1;
+	} else if (strncmp(path, HURON_PCIE_SLOT0,
+		strlen(HURON_PCIE_SLOT0)) == 0) {
+		(void) strcpy(card->slot_str, "0");
+		card->slot = 0;
 	} else if (strncmp(path, HURON_PCIE_SLOT1,
 		strlen(HURON_PCIE_SLOT1)) == 0) {
 		(void) strcpy(card->slot_str, "1");
@@ -96,10 +100,6 @@
 		strlen(HURON_PCIE_SLOT5)) == 0) {
 		(void) strcpy(card->slot_str, "5");
 		card->slot = 5;
-	} else if (strncmp(path, HURON_PCIE_SLOT6,
-		strlen(HURON_PCIE_SLOT6)) == 0) {
-		(void) strcpy(card->slot_str, "6");
-		card->slot = 6;
 	} else {
 		(void) strcpy(card->slot_str, MOTHERBOARD);
 		card->slot = NO_SLOT;
--- a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.h	Wed Apr 11 10:58:03 2007 -0700
+++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.h	Wed Apr 11 11:21:28 2007 -0700
@@ -56,26 +56,21 @@
 #define	PCIE			"/PCIE"
 #define	HURON_NIU		"/niu@80"
 #define	HURON_SWITCH_A_PATH	"/pci@0/pci@0"
-#define	HURON_SWITCH_B_PATH	"/pci@0/pci@0/pci@1/pci@0"
-#define	HURON_SWITCH_C_PATH	"/pci@0/pci@0/pci@8/pci@0"
+#define	HURON_SWITCH_B_PATH	"/pci@0/pci@0/pci@8/pci@0"
+#define	HURON_SWITCH_C_PATH	"/pci@0/pci@0/pci@1/pci@0"
 #define	HURON_NETWORK_0		"/pci@0/pci@0/pci@1/pci@0/pci@2/network@0"
 #define	HURON_NETWORK_1		"/pci@0/pci@0/pci@1/pci@0/pci@2/network@0,1"
 #define	HURON_NETWORK_2		"/pci@0/pci@0/pci@1/pci@0/pci@3/network@0"
 #define	HURON_NETWORK_3		"/pci@0/pci@0/pci@1/pci@0/pci@3/network@0,1"
-#define	HURON_USB_0		"/pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@1c"
-#define	HURON_USB_1		"/pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@1c,1"
-#define	HURON_USB_2		"/pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@1c,2"
-#define	HURON_USB_3		"/pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@1c,3"
-#define	HURON_IDE		"/pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/ide@1f"
-#define	HURON_PCIE_SLOT1	"/pci@0/pci@0/pci@8/pci@0/pci@9"
-#define	HURON_PCIE_SLOT2	"/pci@0/pci@0/pci@8/pci@0/pci@1"
-#define	HURON_PCIE_SLOT3	"/pci@0/pci@0/pci@9"
-#define	HURON_PCIE_SLOT4	"/pci@0/pci@0/pci@8/pci@0/pci@a"
-#define	HURON_PCIE_SLOT5	"/pci@0/pci@0/pci@8/pci@0/pci@2"
-#define	HURON_PCIE_SLOT6	"/pci@0/pci@0/pci@8/pci@0/pci@8"
+#define	HURON_PCIE_SLOT0	"/pci@0/pci@0/pci@8/pci@0/pci@9"
+#define	HURON_PCIE_SLOT1	"/pci@0/pci@0/pci@8/pci@0/pci@1"
+#define	HURON_PCIE_SLOT2	"/pci@0/pci@0/pci@9"
+#define	HURON_PCIE_SLOT3	"/pci@0/pci@0/pci@8/pci@0/pci@a"
+#define	HURON_PCIE_SLOT4	"/pci@0/pci@0/pci@8/pci@0/pci@2"
+#define	HURON_PCIE_SLOT5	"/pci@0/pci@0/pci@8/pci@0/pci@8"
 #define	HURON_LSI_PATH		"/pci@0/pci@0/pci@2/scsi@0"
-#define	HURON_N2_XAUI0		"/niu@80/network@0"
-#define	HURON_N2_XAUI1		"/niu@80/network@1"
+#define	HURON_N2_XAUI0		"/niu@80/network@1"
+#define	HURON_N2_XAUI1		"/niu@80/network@0"
 #define	SAS_SATA_HBA		"SAS-SATA-HBA"
 
 /*