deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-11 11:07:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

There is a bug in ipmi_sdr.h which prevents ipmitool from correctly displaying

Browse Source 
thresholds and threshold mask. The "Discrete reading mask/Settable threshold
mask, Readable threshold mask" field in SDR has two bytes (16 bits). The 16 bits
should be treated as one uint16_t instead of two bytes. Otherwise, if someone
sets the fields to 0x3f, it will be mistakenly interpreted as 0x3f00 instead of
0x003f.
This commit is contained in:
John Blair 2006-07-28 20:43:50 +00:00
parent ab58809b3b
commit 0d6fecc737
1 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ipmitool/include/ipmitool/ipmi_sdr.h
View File

@ -159,7 +159,7 @@ struct sdr_record_mask {
struct { struct {
uint16_t assert_event; /* assertion event mask */ uint16_t assert_event; /* assertion event mask */
uint16_t deassert_event; /* de-assertion event mask */ uint16_t deassert_event; /* de-assertion event mask */
uint16_t read; /* discrete reaading mask */ uint16_t read; /* discrete reading mask */
} discrete; } discrete;
struct { struct {
#if WORDS_BIGENDIAN #if WORDS_BIGENDIAN
@ -232,44 +232,52 @@ struct sdr_record_mask {
uint16_t status_unr:1; uint16_t status_unr:1;
uint16_t reserved_2:1; uint16_t reserved_2:1;
#endif #endif
struct { union {
#if WORDS_BIGENDIAN /* settable threshold mask */ struct {
uint8_t reserved:2; #if WORDS_BIGENDIAN /* settable threshold mask */
uint8_t unr:1; uint16_t reserved:2;
uint8_t ucr:1; uint16_t unr:1;
uint8_t unc:1; uint16_t ucr:1;
uint8_t lnr:1; uint16_t unc:1;
uint8_t lcr:1; uint16_t lnr:1;
uint8_t lnc:1; uint16_t lcr:1;
uint16_t lnc:1;
/* padding lower 8 bits */
uint16_t readable:8;
#else #else
uint8_t lnc:1; uint16_t readable:8;
uint8_t lcr:1; uint16_t lnc:1;
uint8_t lnr:1; uint16_t lcr:1;
uint8_t unc:1; uint16_t lnr:1;
uint8_t ucr:1; uint16_t unc:1;
uint8_t unr:1; uint16_t ucr:1;
uint8_t reserved:2; uint16_t unr:1;
uint16_t reserved:2;
#endif #endif
} set; } set;
struct { struct {
#if WORDS_BIGENDIAN /* readable threshold mask */ #if WORDS_BIGENDIAN /* readable threshold mask */
uint8_t reserved:2; /* padding upper 8 bits */
uint8_t unr:1; uint16_t settable:8;
uint8_t ucr:1; uint16_t reserved:2;
uint8_t unc:1; uint16_t unr:1;
uint8_t lnr:1; uint16_t ucr:1;
uint8_t lcr:1; uint16_t unc:1;
uint8_t lnc:1; uint16_t lnr:1;
uint16_t lcr:1;
uint16_t lnc:1;
#else #else
uint8_t lnc:1; uint16_t lnc:1;
uint8_t lcr:1; uint16_t lcr:1;
uint8_t lnr:1; uint16_t lnr:1;
uint8_t unc:1; uint16_t unc:1;
uint8_t ucr:1; uint16_t ucr:1;
uint8_t unr:1; uint16_t unr:1;
uint8_t reserved:2; uint16_t reserved:2;
uint16_t settable:8;
#endif #endif
} read; } read;
};
} threshold; } threshold;
} type; } type;
} __attribute__ ((packed)); } __attribute__ ((packed));