[Ipmitool-cvs] ipmitool/lib ipmi_sdr.c,1.82,1.83

[Carol H. <ca...@us...>]

Update of /cvsroot/ipmitool/ipmitool/lib
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21878

Modified Files:
	ipmi_sdr.c 
Log Message:
Bernard Manjou fix for discrete sensor state print routines to address state bits 8-14

Index: ipmi_sdr.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/lib/ipmi_sdr.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** ipmi_sdr.c	3 Jul 2008 19:46:44 -0000	1.82
--- ipmi_sdr.c	8 Jul 2008 22:37:55 -0000	1.83
***************
*** 1542,1546 ****
  	int pre = 0, c = 0;
  
! 	if (state1 == 0)
  		return;
  
--- 1542,1546 ----
  	int pre = 0, c = 0;
  
! 	if (state1 == 0 && (state2 & 0x7f) == 0)
  		return;
  
***************
*** 1558,1562 ****
  
  		if (evt->offset > 7) {
! 			if ((1 << (evt->offset - 8)) & state2) {
  				if (pre++ != 0)
  					printf("%s", separator);
--- 1558,1562 ----
  
  		if (evt->offset > 7) {
! 			if ((1 << (evt->offset - 8)) & (state2 & 0x7f)) {
  				if (pre++ != 0)
  					printf("%s", separator);
***************
*** 1593,1597 ****
  	int pre = 0, c = 0;
  
! 	if (state1 == 0)
  		return;
  
--- 1593,1597 ----
  	int pre = 0, c = 0;
  
! 	if (state1 == 0 && (state2 & 0x7f) == 0)
  		return;
  
***************
*** 1614,1618 ****
  
  		if (evt->offset > 7) {
! 			if ((1 << (evt->offset - 8)) & state2) {
  				if (evt->desc) {
  					printf("                         "
--- 1614,1618 ----
  
  		if (evt->offset > 7) {
! 			if ((1 << (evt->offset - 8)) & (state2 & 0x7f)) {
  				if (evt->desc) {
  					printf("                         "