diff options
| author | zx143588 <none@none> | 2007-04-11 11:21:28 -0700 |
|---|---|---|
| committer | zx143588 <none@none> | 2007-04-11 11:21:28 -0700 |
| commit | b423da26b867ead68b8fda8497cf4e5bb7ed1631 (patch) | |
| tree | f2c81bd3b7f4d372b17f8356f1899b5f0713c07b /usr/src/lib/libprtdiag_psr | |
| parent | 2c5134db35fa340a00173be7d903b7a4f1d64e49 (diff) | |
| download | illumos-joyent-b423da26b867ead68b8fda8497cf4e5bb7ed1631.tar.gz | |
6539905 Change PCIE SLot Numbering to start from zero instead of one
Diffstat (limited to 'usr/src/lib/libprtdiag_psr')
| -rw-r--r-- | usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.c | 10 | ||||
| -rw-r--r-- | usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.h | 25 |
2 files changed, 15 insertions, 20 deletions
diff --git a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.c b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.c index bf8652fb17..e7226bc5e7 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.c +++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.c @@ -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 @@ huron_get_slot_number(char *path, struct io_card *card) } 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 @@ huron_get_slot_number(char *path, struct io_card *card) 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; diff --git a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.h b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.h index 9efbfc1f03..3be2f89673 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.h +++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.h @@ -56,26 +56,21 @@ extern "C" { #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" /* |