From a641728c6923d9fb374f973b1c216515a082e21f Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Fri, 12 Apr 2019 17:40:55 +0000 Subject: Revert "Add Inventory/MultiRecord interfaces" This reverts commit 393530883ad5b93e90af0b669a95bf97e5c4d058. Reason for revert: Breaks the build, and interface likely needs discussed further. Submitter also mentioned he had changes that he wanted to make to address comments. Change-Id: Iacf8933675f1f5c45f433ad8592a3c152f1c314c Signed-off-by: Ed Tanous --- .../Inventory/MultiRecord/DcOutput.interface.yaml | 48 -------- .../MultiRecord/PowerSupply.interface.yaml | 121 --------------------- 2 files changed, 169 deletions(-) delete mode 100644 xyz/openbmc_project/Inventory/MultiRecord/DcOutput.interface.yaml delete mode 100644 xyz/openbmc_project/Inventory/MultiRecord/PowerSupply.interface.yaml (limited to 'xyz') diff --git a/xyz/openbmc_project/Inventory/MultiRecord/DcOutput.interface.yaml b/xyz/openbmc_project/Inventory/MultiRecord/DcOutput.interface.yaml deleted file mode 100644 index 28cfee0..0000000 --- a/xyz/openbmc_project/Inventory/MultiRecord/DcOutput.interface.yaml +++ /dev/null @@ -1,48 +0,0 @@ -description: > - IPMI FRU MultiRecord Area, DC Output record (Type 0x01) - In accordance with IPMI Platform Management FRU Information - Storage Definition v1.0 Document Revision 1.3, Table 18-2 - -properties: - - name: Standby - type: boolean - description: > - Offset 0, bit 7. - Standby. - - name: OutputNumber - type: int64 - description: > - Offset 0, bits 3..0. - Output number. - - name: NominalVoltage - type: int64 - description: > - Offset 1. - Nominal voltage (10 mV). - - name: MaxNegativeVoltage - type: int64 - description: > - Offset 3. - Maximum negative voltage (10 mV) - (most negative voltage with respect to nominal). - - name: MaxPositiveVoltage - type: int64 - description: > - Offset 5. - Maximum positive voltage (10 mV) - (most positive voltage with respect to nominal). - - name: RippleAndNoise - type: int64 - description: > - Offset 7. - Ripple and Noise pk-pk 10Hz to 30 MHz (mV). - - name: MinCurrentDraw - type: int64 - description: > - Offset 9. - Minimum current draw (mA). - - name: MaxCurrentDraw - type: int64 - description: > - Offset 11. - Maximum current draw (mA). diff --git a/xyz/openbmc_project/Inventory/MultiRecord/PowerSupply.interface.yaml b/xyz/openbmc_project/Inventory/MultiRecord/PowerSupply.interface.yaml deleted file mode 100644 index 688b901..0000000 --- a/xyz/openbmc_project/Inventory/MultiRecord/PowerSupply.interface.yaml +++ /dev/null @@ -1,121 +0,0 @@ -description: > - MultiRecord Power Supply Information (Record Type 0x00) - In accordance with IPMI Platform Management FRU Information - Storage Definition v1.0 Document Revision 1.3, Table 18-1. - -properties: - - name: OveralCapacity - type: int64 - description: > - Offset 0, bits 11..0. - Overall capacity (watts) - - name: PeakVA - type: int64 - description: > - Offset 2. - Peak VA - - name: InrushCurrent - type: int64 - description: > - Offset 4. - Inrush current - - name: InrushInterval - type: int64 - description: > - Offset 5. - Inrush interval in ms. - - name: LowInputVoltage1 - type: int64 - description: > - Offset 6. - Low end Input voltage range 1 (10mV) - - name: HighInputVoltage1 - type: int64 - description: > - Offset 8. - High end Input voltage range 1 (10mV) - - name: LowInputVoltage2 - type: int64 - description: > - Offset 10. - Low end Input voltage range 2 (10mV) - - name: HighInputVoltage2 - type: int64 - description: > - Offset 12. - High end Input voltage range 2 (10mV) - - name: LowInputFrequency - type: int64 - description: > - Offset 14. - Low end Input frequency range - - name: HighInputFrequency - type: int64 - description: > - Offset 15. - High end Input frequency range - - name: InDropoutTolerance - type: int64 - description: > - Offset 16. - Input dropout tolerance in ms - - name: TachoPPR_FailPinPolarity - type: boolean - description: > - Offset 17, bit 4. - Tachometer pulses per rotation/Predictive fail pin polarity. - Meaning depends on PrediciveFailSupport. - False means 1 pulse per rotation (for tacho) or assertion indicates failure (for predictive falure pin). - True means 2 pulses per rotation (for tacho) or deassertion indicates failure (for predictive falure pin). - - name: HotSwap - type: boolean - description: > - Offset 17, bit 3. - Hot Swap Support - - name: Autoswitch - type: boolean - description: > - Offset 17, bit 2. - Autoswitch - - name: PowerFactor - type: boolean - description: > - Offset 17, bit 1. - Power factor correction - - name: PredictiveFailSupport - type: boolean - description: > - Offset 17, bit 0. - Predictive fail pin supported. When false, tachometer is used instead. - Affects meaning of TachoPPR_FailPinPolarity. - - name: HoldUpTime - type: int64 - description: > - Offset 18, bits 15..12. - Peak Wattage hold up time in seconds - - name: PeakCapacity - type: int64 - description: > - Offset 18, bits 11..0. - Peak capacity (watts) - - name: Voltage1 - type: int64 - description: > - Offset 20, byte 1, bits 7..4. - Combined Wattage Voltage 1 - - name: Voltage2 - type: int64 - description: > - Offset 20, byte 1, bits 3..0. - Combined Wattage Voltage 2 - - name: TotalWattage - type: int64 - description: > - Offset 20, bytes 2..3. - Total Combined Wattage - - name: TachometerLow - type: int64 - description: > - Offset 23. - Predictive fail tachometer lower threshold (RPS). - Used when PredictiveFailSupport is false. -- cgit v1.2.1