diff --git a/inxi b/inxi index c844167..817629f 100755 --- a/inxi +++ b/inxi @@ -3,7 +3,7 @@ #### Script Name: inxi #### Version: 2.1.98 #### Date: 2014-08-17 -#### Patch Number: 00 +#### Patch Number: 01 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -8534,12 +8534,21 @@ get_ram_data() aArrayData[m,"maxModuleSize"] = 0 # print "yes" } - ## prep for output ## if (aArrayData[m,"maxModuleSize"] == 0 ){ aArrayData[m,"maxModuleSize"]="" } else { + # case where listed max cap is too big for actual slots x max cap, eg: + # listed max cap, 8gb, max mod 2gb, slots 2 + if ( estCap == "" && aArrayData[m,"maxModuleSize"] > 0 ) { + if ( int(workingMaxCap) > int(aArrayData[m,"maxModuleSize"]) * aArrayData[m,"deviceCount16"] ) { + estCap=" (check)" + if ( deBugger1 == "true" ){ + print "G" + } + } + } if (aArrayData[m,"maxModuleSize"] > 1023 ) { aArrayData[m,"maxModuleSize"]=aArrayData[m,"maxModuleSize"] / 1024 " GB" } @@ -8566,10 +8575,12 @@ get_ram_data() # we only want a max 2 decimal places, this trick gives 0 to 2 workingMaxCap=gensub(/([0-9]+\.[0-9][0-9]).*/,"\\1",1,workingMaxCap) workingMaxCap = workingMaxCap unit estCap + } else { workingMaxCap == "" } + print aArrayData[m,"data-type"] "," aArrayData[m,"handle"] "," aArrayData[m,"location"] "," workingMaxCap "," aArrayData[m,"deviceCount16"] "," aArrayData[m,"use"] "," aArrayData[m,"errorCorrection"] "," aArrayData[m,"maxModuleSize"] estMod "," aArrayData[m,"voltage5"] # print device rows next for ( j=0;j<=100;j++ ) { diff --git a/inxi.changelog b/inxi.changelog index a268be0..c3816b4 100755 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,18 @@ +===================================================================================== +Version: 2.1.98 +Patch Version: 01 +Script Date: 2014-08-17 +----------------------------------- +Changes: +----------------------------------- +New patch version, new tarball. Another error case dataset, wrong cap, wrong max mod +size, derived mod size 2gb, listed cap 8, but 2 slots, ie, 2gb x 2 == 4. Made this +retain the listed size, but adds (check) to it because either max mod size is wrong +or cap is wrong. + +----------------------------------- +-- Harald Hope - Sun, 17 Aug 2014 19:40:46 -0700 + ===================================================================================== Version: 2.1.98 Patch Version: 00