Changeset 3306

Timestamp:

05/26/06 11:23:10 (7 years ago)

Author:

khali

Message:

Decode size (Direct Rambus and Rambus). At this point, this
script provides all the information "sensors" does for SPD eeproms, so
we're not so far from dropping eeprom support from sensors.
Code cleanups.

Files:

• lm-sensors/trunk/prog/eeprom/decode-dimms.pl (modified) (6 diffs)

lm-sensors/trunk/prog/eeprom/decode-dimms.pl

@@ -420 +420 @@
 
 #size computation
-
-        my $a = $bytes->[3];
-        my $b = $bytes->[4];
-        my $c = $bytes->[5];
-        my $d = $bytes->[17];
         my $k=0;
         my $ii=0;
         
-        $ii = (($a) & 0x0f) + (( $b) & 0x0f) - 17;
-        if (( $c <= 8) && ( $d <= 8)) {
-                 $k = ( $c) * ( $d);
+        $ii = ($bytes->[3] & 0x0f) + ($bytes->[4] & 0x0f) - 17;
+        if (($bytes->[5] <= 8) && ($bytes->[17] <= 8)) {
+                 $k = $bytes->[5] * $bytes->[17];
         }
         
@@ -436 +431 @@
                 printl "Size", ((1 << $ii) * $k) . " MB"; }
         else { 
-                printl "INVALID SIZE", $a . "," . $b . "," . $c . "," . $d;
+                printl "INVALID SIZE", $bytes->[3] . "," . $bytes->[4] . "," .
+                                       $bytes->[5] . "," . $bytes->[17];
         }
 
@@ -577 +573 @@
         if (@cas >= 1) {
                 $l = "Cycle Time (CAS ".$cas[$#cas].")";
-                $temp = ($bytes->[9] >> 4) + ($bytes->[9] & 0xf) * 0.1;
-                printl $l, "$temp ns";
+                printl $l, "$ctime ns";
 
                 $l = "Access Time (CAS ".$cas[$#cas].")";
@@ -712 +707 @@
 
 #size computation
-
         my $k=0;
         my $ii=0;
@@ -825 +819 @@
 
 #size computation
-        my $a = $bytes->[3];
-        my $b = $bytes->[4];
-        my $c = $bytes->[5];
-        my $d = $bytes->[17];
         my $k=0;
         my $ii=0;
 
-        $ii = ($a & 0x0f) + ($b & 0x0f) - 17;
-        $k = (($c & 0x7) + 1) * $d;
+        $ii = ($bytes->[3] & 0x0f) + ($bytes->[4] & 0x0f) - 17;
+        $k = (($bytes->[5] & 0x7) + 1) * $bytes->[17];
         
         if($ii > 0 && $ii <= 12 && $k > 0) {
                 printl "Size", ((1 << $ii) * $k) . " MB"; 
         } else {
-                printl "INVALID SIZE", $a . "," . $b . "," . $c . "," . $d;
+                printl "INVALID SIZE", $bytes->[3] . "," . $bytes->[4] . "," .
+                                       $bytes->[5] . "," . $bytes->[17];
         }
 
@@ -863 +854 @@
 }
 
+# Parameter: bytes 0-63
+sub decode_direct_rambus($)
+{
+        my $bytes = shift;
+
+#size computation
+        my $ii;
+
+        $ii = ($bytes->[4] & 0x0f) + ($bytes->[4] >> 4) + ($bytes->[5] & 0x07) - 13;
+        
+        if ($ii > 0 && $ii < 16) {
+                printl "Size", (1 << $ii) . " MB";
+        } else {
+                printl "INVALID SIZE", sprintf("0x%02x, 0x%02x",
+                                               $bytes->[4], $bytes->[5]);
+        }
+}
+
+# Parameter: bytes 0-63
+sub decode_rambus($)
+{
+        my $bytes = shift;
+
+#size computation
+        my $ii;
+        
+        $ii = ($bytes->[3] & 0x0f) + ($bytes->[3] >> 4) + ($bytes->[5] & 0x07) - 13;
+        
+        if ($ii > 0 && $ii < 16) {
+                printl "Size", (1 << $ii) . " MB";
+        } else {
+                printl "INVALID SIZE", sprintf("0x%02x, 0x%02x",
+                                               $bytes->[3], $bytes->[5]);
+        }
+}
+
 %decode_callback = (
         "SDR SDRAM"     => \&decode_sdr_sdram,
         "DDR SDRAM"     => \&decode_ddr_sdram,
         "DDR2 SDRAM"    => \&decode_ddr2_sdram,
+        "Direct Rambus" => \&decode_direct_rambus,
+        "Rambus"        => \&decode_rambus,
 );