diff options
| author | njames <njames@us.ibm.com> | 2015-02-27 17:52:17 -0600 |
|---|---|---|
| committer | njames <njames@us.ibm.com> | 2015-02-27 17:52:17 -0600 |
| commit | e3721c636fca16009dac73ea99a775b58c904b92 (patch) | |
| tree | 2e529e2220f3c03994d648094e18ebfbb16026fa /scripts | |
| parent | 9c66ed6680b30f9aacacb5337c6c792e32bc2e77 (diff) | |
| download | serverwiz-e3721c636fca16009dac73ea99a775b58c904b92.tar.gz serverwiz-e3721c636fca16009dac73ea99a775b58c904b92.zip | |
print Err for invalid sensors
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/processMrw.pl | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/scripts/processMrw.pl b/scripts/processMrw.pl index 59a1eff..f087f48 100644 --- a/scripts/processMrw.pl +++ b/scripts/processMrw.pl @@ -229,7 +229,7 @@ sub processIpmiSensors { my $s=sprintf("0x%02X%02X,0x%02X", oct($sensor_type),oct($entity_id),oct($sensor_id)); push(@sensors,$s); - my $sensor_id_str = ""; + my $sensor_id_str = "Err"; if ($sensor_id ne "") { $sensor_id_str = sprintf("0x%02X",oct($sensor_id)); @@ -288,7 +288,7 @@ sub processApss { $name=~s/\s+//g; $name=~s/\t+//g; - my $sensor_id_str = ""; + my $sensor_id_str = "Err"; if ($sensor_id ne "") { $sensor_id_str = sprintf("0x%02X",oct($sensor_id)); @@ -301,6 +301,10 @@ sub processApss { $channel_offsets[$channel] = $channel_offset; $channel_gains[$channel] = $channel_gain; } + else + { + $sensor_id_str="N/A"; + } my $str=sprintf( " %30s | %10s | 0x%02X | 0x%02X | %4s | %4d | %4d | %s\n", $name,"",oct($entity_id),oct($sensor_type), @@ -485,8 +489,6 @@ sub processProcessor "EEPROM_SBE_PRIMARY_INFO","i2cMasterPath",$path); $targetObj->setAttributeField($target, "EEPROM_SBE_BACKUP_INFO","i2cMasterPath",$path); - $targetObj->setAttributeField($target, - "EEPROM_VPD_FRU_INFO","i2cMasterPath",$path); ## initialize master processor FSI's $targetObj->setAttributeField($target, "FSI_OPTION_FLAGS", "flipPort", "0"); @@ -972,8 +974,7 @@ sub processMembufVpdAssociation my $membuf_target = $membuf_assoc->{DEST_PARENT}; setEepromAttributes($targetObj, "EEPROM_VPD_PRIMARY_INFO",$membuf_target,$vpd); - #setEepromAttributes($targetObj, - # "EEPROM_VPD_FRU_INFO",$membuf_target,$vpd,"0++"); + my $index = $targetObj->getBusAttribute($membuf_assoc->{SOURCE}, $membuf_assoc->{BUS_NUM}, "ISDIMM_MBVPD_INDEX"); $targetObj->setAttribute( @@ -1057,9 +1058,6 @@ sub processMembuf setEepromAttributes($targetObj, "EEPROM_VPD_PRIMARY_INFO",$dimm_target, $dimm); - setEepromAttributes($targetObj, - "EEPROM_VPD_FRU_INFO",$dimm_target, - $dimm,"0++"); my $field=getI2cMapField($targetObj,$dimm_target,$dimm); my $map = $dimm_portmap{$dimm_target}; |
