summaryrefslogtreecommitdiffstats
path: root/pts-core
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-25 09:15:30 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-25 09:15:30 -0500
commit0a120772bd4f503d59af2018d7402b412e6138aa (patch)
treede077295115b0a36d73efa49701d7e86c92f3910 /pts-core
parenta7e772c8f1027b5cc1bf94fa4aa4592c59ad255d (diff)
downloadphoronix-test-suite-upstream-0a120772bd4f503d59af2018d7402b412e6138aa.tar.gz
phoronix-test-suite-upstream-0a120772bd4f503d59af2018d7402b412e6138aa.tar.xz
phoronix-test-suite-upstream-0a120772bd4f503d59af2018d7402b412e6138aa.zip
pts-core: Improve motherboard southbridge detection for some Intel ICH
Chipsets
Diffstat (limited to 'pts-core')
-rw-r--r--pts-core/functions/pts-functions_system_hardware.php15
1 files changed, 11 insertions, 4 deletions
diff --git a/pts-core/functions/pts-functions_system_hardware.php b/pts-core/functions/pts-functions_system_hardware.php
index dd69ec4..05ab514 100644
--- a/pts-core/functions/pts-functions_system_hardware.php
+++ b/pts-core/functions/pts-functions_system_hardware.php
@@ -148,6 +148,7 @@ function hw_sys_chipset_string()
{
// Attempt to detect Southbridge (if applicable)
$southbridge = read_pci(array("ISA bridge", "SATA controller"), false);
+ $southbridge_clean = null;
if(($start_cut = strpos($southbridge, "(")) > 0 && ($end_cut = strpos($southbridge, ")", $start_cut + 1)) > 0)
{
@@ -157,16 +158,22 @@ function hw_sys_chipset_string()
{
$southbridge_extract = explode(" ", $southbridge_extract);
$southbridge_clean = $southbridge_extract[0];
-
- $info .= " + " . $southbridge_clean;
+ }
+ else if(($s = strpos($southbridge, "ICH")) > 0)
+ {
+ $southbridge_extract = substr($southbridge, $s);
+ $southbridge_clean = substr($southbridge_extract, 0, strpos($southbridge_extract, " "));
}
}
else if(($start_cut = strpos($southbridge, "SB")) > 0)
{
$southbridge_extract = substr($southbridge, $start_cut);
- $southbridge_extract = substr($southbridge_extract, 0, strpos($southbridge_extract, " "));
+ $southbridge_clean = substr($southbridge_extract, 0, strpos($southbridge_extract, " "));
+ }
- $info .= " + " . $southbridge_extract;
+ if(!empty($southbridge_clean))
+ {
+ $info .= " + " . $southbridge_clean;
}
}