projects / phoronix-test-suite.git / commitdiff
Build Results
 
Summary

Description: Phoronix Test Suite open-source benchmarking development
Last Change: Tue 5/5/15 9:21

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Wed 12/31/69 19:00
d70e64d59829038334cb89970ce0e86d85abb9ad  
Merge pull request #65... 
Wed 12/31/69 19:00
cd0b59bf87276c589fd4e65b4caff4b75d5c71e5  
Merge pull request #64... 
Wed 12/31/69 19:00
dc4b713855f46c728c99669169e1a5512472e94d  
Merge pull request #62... 
Fri 4/24/15 10:44
Michael Larabel  
phoromatic: Fix jumping... 
Thu 4/23/15 8:43
Michael Larabel  
phoromatic: Remove... 
Wed 4/22/15 21:06
Michael Larabel  
phoromatic: Disable IP... 
 
> --git a/pts-core/objects/phodevi/components/phodevi_memory.php b/pts-core/objects/phodevi/components/phodevi_memory.php
index cf7a7d4
..7cc8059 100644
--- a/pts-core/objects/phodevi/components/phodevi_memory.php
+++ b/pts-core/objects/phodevi/components/phodevi_memory.php
@@ -89,+89,@@ class phodevi_memory extends phodevi_device_interface
             $mem_size 
phodevi_linux_parser::read_dmidecode('memory''Memory Device''Size'false, array('Not Installed''No Module Installed'));
             
$mem_speed phodevi_linux_parser::read_dmidecode('memory''Memory Device''Speed'true'Unknown');
             
$mem_type phodevi_linux_parser::read_dmidecode('memory''Memory Device''Type'true, array('Unknown''Other'));
-            
$mem_manufacturer phodevi_linux_parser::read_dmidecode('memory''Memory Device''Manufacturer'false, array('Unknown'));
-            
$mem_part phodevi_linux_parser::read_dmidecode('memory''Memory Device''Part Number'false, array('Unknown'));
+            
$mem_manufacturer phodevi_linux_parser::read_dmidecode('memory''Memory Device''Manufacturer'true, array('Unknown'));
+            
$mem_part phodevi_linux_parser::read_dmidecode('memory''Memory Device''Part Number'true, array('Unknown'));
         }

         if(
is_array($mem_type))
@@ -
182,24 +182,14 @@ class phodevi_memory extends phodevi_device_interface

                 $product_string 
null;

-                if(
is_array($mem_manufacturer) && count(array_unique($mem_manufacturer)) == 1)
+                if(!empty(
$mem_manufacturer) && stripos($mem_manufacturer'manufacturer') === false)
                 {
-                    
$mem_manufacturer array_pop($mem_manufacturer);
-
-                    if(!empty(
$mem_manufacturer))
-                    {
-                        
$product_string .= ' ' $mem_manufacturer;
-                    }
+                    
$product_string .= ' ' $mem_manufacturer;
                 }

-                if(
is_array($mem_part) && count(array_unique($mem_part)) == 1)
+                if(!empty(
$mem_part) && stripos($mem_manufacturer'part') === false)
                 {
-                    
$mem_part array_pop($mem_part);
-
-                    if(!empty(
$mem_part))
-                    {
-                        
$product_string .= ' ' $mem_part;
-                    }
+                    
$product_string .= ' ' $mem_part;
                 }

                 
$mem_string $mem_count ' x ' $mem_size[0] . ' ' $mem_prefix $product_string;
<
 
Phoronix.com
Linux Driver Forums
Copyright © 2015 by Phoronix Media