pts-core: Return false on failure from read_pci() instead of "Unknown"

string

4 files changed, 8 insertions, 4 deletions

diff --git a/TYDAL-CHANGE-LOG b/TYDAL-CHANGE-LOG
index a80c8f7..5467550 100644
--- a/TYDAL-CHANGE-LOG
+++ b/TYDAL-CHANGE-LOG
@@ -39,6 +39,10 @@ Phoronix Test Suite (Git)
 - pts-core: Eliminate THIS_RUN_TIME constant and add preferred way of using pts_unique_runtime_identifier()
 - pts-core: Add fallback option support for read_sysctl()
 - pts-core: Add internal caching support for lspci and lsb_release information
+- pts-core: Fixes in FreeBSD 7 support
+- pts-core: Return false on failure from read_pci() instead of "Unknown" string
+- pts: Add External Dependencies support for FreeBSD using pkg_add command
+- pts: Update most test profiles to reflect whether they are supported on *BSD operating systems
 - tandem_XmlReader: Switch caching from using a GLOBALS variable to using a static variable within the XML reading class
 - tandem_XmlReader: Write internal regular expression matcher for systems where preg_match and preg_match_all aren't available
 - system_monitor: Update it to work with new APIs
diff --git a/pts-core/functions/pts-functions_system_graphics.php b/pts-core/functions/pts-functions_system_graphics.php
index fca0c09..6dd3d8d 100644
--- a/pts-core/functions/pts-functions_system_graphics.php
+++ b/pts-core/functions/pts-functions_system_graphics.php
@@ -771,7 +771,7 @@ function hw_gpu_string()
 		{
 			$info_pci = read_pci("VGA compatible controller", false);
 
-			if(!empty($info_pci) && $info_pci != "Unknown")
+			if(!empty($info_pci))
 			{
 				$info = $info_pci;
 			}
diff --git a/pts-core/functions/pts-functions_system_hardware.php b/pts-core/functions/pts-functions_system_hardware.php
index a7c4cae..23e4280 100644
--- a/pts-core/functions/pts-functions_system_hardware.php
+++ b/pts-core/functions/pts-functions_system_hardware.php
@@ -111,7 +111,7 @@ function hw_sys_chipset_string()
 		{
 			$bridge = read_pci(array("Bridge", "PCI bridge"));
 
-			if($bridge != "Unknown")
+			if(!empty($bridge))
 			{
 				$match = false;
 				$break_words = array("Ethernet", "PCI", "High", "USB");
@@ -128,7 +128,7 @@ function hw_sys_chipset_string()
 			}
 		}
 
-		if(!isset($bridge) || $bridge != "Unknown")
+		if(!isset($bridge) || !empty($bridge))
 		{
 			// Attempt to detect Southbridge (if applicable)
 			$southbridge = read_pci(array("ISA bridge", "SATA controller"), false);
diff --git a/pts-core/functions/pts-functions_system_parsing.php b/pts-core/functions/pts-functions_system_parsing.php
index 0484022..f08bd88 100644
--- a/pts-core/functions/pts-functions_system_parsing.php
+++ b/pts-core/functions/pts-functions_system_parsing.php
@@ -145,7 +145,7 @@ function read_pci($desc, $clean_string = true)
 {
 	// Read PCI bus information
 	static $pci_info = null;
-	$info = "Unknown";
+	$info = false;
 
 	if(empty($pci_info))
 	{