diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-11-17 20:40:25 -0500 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-11-17 20:40:25 -0500 |
| commit | c1e75d2b0ee9ab53367879be8f8d7b5cac25f2ee (patch) | |
| tree | 170a66bf31ac09e4f8ce20d7ed860c0d96e11e9e /pts-core/functions/pts-functions_system.php | |
| parent | 5f9cf59a784c9c9f9ba40c58ba990117e6a92a03 (diff) | |
| download | phoronix-test-suite-upstream-c1e75d2b0ee9ab53367879be8f8d7b5cac25f2ee.tar.gz phoronix-test-suite-upstream-c1e75d2b0ee9ab53367879be8f8d7b5cac25f2ee.tar.xz phoronix-test-suite-upstream-c1e75d2b0ee9ab53367879be8f8d7b5cac25f2ee.zip | |
pts-core: Standardize sw_* functions
Diffstat (limited to 'pts-core/functions/pts-functions_system.php')
| -rw-r--r-- | pts-core/functions/pts-functions_system.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pts-core/functions/pts-functions_system.php b/pts-core/functions/pts-functions_system.php index f73cd00..f78a570 100644 --- a/pts-core/functions/pts-functions_system.php +++ b/pts-core/functions/pts-functions_system.php @@ -47,24 +47,24 @@ function pts_sw_string() // Returns string of software information $software = array(); - array_push($software, "OS: " . operating_system_release()); - array_push($software, "Kernel: " . kernel_string() . " (" . kernel_arch() . ")"); - array_push($software, "X.Org Server: " . graphics_subsystem_version()); + array_push($software, "OS: " . sw_os_release()); + array_push($software, "Kernel: " . sw_os_kernel() . " (" . sw_os_architecture() . ")"); + array_push($software, "X.Org Server: " . sw_os_graphics_subsystem()); - if(($ddx = xorg_ddx_driver_info()) != "") + if(($ddx = sw_xorg_ddx_driver_info()) != "") { array_push($software, "X.Org Driver: " . $ddx); } - array_push($software, "OpenGL: " . opengl_version()); - array_push($software, "Compiler: " . compiler_version()); - array_push($software, "File-System: " . filesystem_type()); + array_push($software, "OpenGL: " . sw_os_opengl()); + array_push($software, "Compiler: " . sw_os_compiler()); + array_push($software, "File-System: " . sw_os_filesystem()); return implode(", ", $software); } function pts_system_identifier_string() { - $components = array(hw_cpu_string(), hw_sys_motherboard_string(), operating_system_release(), compiler_version()); + $components = array(hw_cpu_string(), hw_sys_motherboard_string(), sw_os_release(), sw_os_compiler()); return base64_encode(implode("__", $components)); } |