diff options
| author | zx143588 <none@none> | 2006-07-25 07:24:16 -0700 |
|---|---|---|
| committer | zx143588 <none@none> | 2006-07-25 07:24:16 -0700 |
| commit | 077f2dab07dda71c691d93b8e183876d7eb912a8 (patch) | |
| tree | c494034d7e14d000800ab9fafbc4e7bd33dca0a5 /usr/src/lib/libprtdiag_psr | |
| parent | ae347574c7f17d33bb822cb146d7f67c88ab1f68 (diff) | |
| download | illumos-joyent-077f2dab07dda71c691d93b8e183876d7eb912a8.tar.gz | |
6278422 Need to support new ontario platform SPARC-Enterprise-T2000 for fujitsu re-branding
6446309 Need to support new Erie platform SPARC-Enterprise-T1000 for fujitsu re-branding
Diffstat (limited to 'usr/src/lib/libprtdiag_psr')
3 files changed, 12 insertions, 10 deletions
diff --git a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/erie.h b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/erie.h index e507541f89..9e65c5dbfc 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/erie.h +++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/erie.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -42,6 +41,7 @@ extern "C" { #endif #define ERIE_PLATFORM "SUNW,Sun-Fire-T1000" +#define ERIE_PLATFORM2 "SUNW,SPARC-Enterprise-T1000" #define ERIE_PCIE_COMP 8 #define ERIE_PCIX_COMP 20 #define NO_SLOT -1 diff --git a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.c b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.c index 4cbe33a73d..c2ff7503b0 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.c +++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.c @@ -317,9 +317,11 @@ sun4v_display_pci(picl_nodehdl_t plafh) * Call functions based on appropriate platform */ if ((strncmp(platbuf, ONTARIO_PLATFORM, - strlen(ONTARIO_PLATFORM))) == 0) { + strlen(ONTARIO_PLATFORM)) == 0) || + (strncmp(platbuf, ONTARIO_PLATFORM2, + strlen(ONTARIO_PLATFORM2)) == 0)) { (void) picl_walk_tree_by_class(plafh, "pciex", - "pciex", ontario_pci_callback); + "pciex", ontario_pci_callback); } else if ((strncmp(platbuf, PELTON_PLATFORM, strlen(PELTON_PLATFORM))) == 0) { (void) picl_walk_tree_by_class(plafh, "pciex", diff --git a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.h b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.h index cfb5646fec..d6bdd45faa 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.h +++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -42,6 +41,7 @@ extern "C" { #endif #define ONTARIO_PLATFORM "SUNW,Sun-Fire-T200" +#define ONTARIO_PLATFORM2 "SUNW,SPARC-Enterprise-T2000" #define H20_IMPL 0x5678 #define IS_H20(impl) ((impl) == H20_IMPL) #define PCIE_COMP_NUM 20 |