[Ipmitool-cvs] ipmitool/lib ipmi_sdr.c, 1.70, 1.71 ipmi_sensor.c, 1.28, 1.29

[jordan h. <jh...@us...>]

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

Modified Files:
	ipmi_sdr.c ipmi_sensor.c 
Log Message:
Do not use readings for sensors with Sensor Scanning bit cleared



Index: ipmi_sdr.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/lib/ipmi_sdr.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** ipmi_sdr.c	22 Jul 2006 03:23:40 -0000	1.70
--- ipmi_sdr.c	25 Oct 2006 03:21:57 -0000	1.71
***************
*** 1039,1050 ****
  			/* Sensor Scanning Disabled */
  			validread = 0;
- 			if (rsp->data[0] != 0) {
- 				/* we might still get a valid reading */
- 				val =
- 				    sdr_convert_sensor_reading(sensor,
- 							       rsp->data[0]);
- 				if (val != 0.0)
- 					validread = 1;
- 			}
  		} else if (rsp->data[0] != 0) {
  			/* convert RAW reading into units */
--- 1039,1042 ----

Index: ipmi_sensor.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/lib/ipmi_sensor.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ipmi_sensor.c	12 May 2006 14:07:31 -0000	1.28
--- ipmi_sensor.c	25 Oct 2006 03:21:57 -0000	1.29
***************
*** 44,47 ****
--- 44,48 ----
  extern int verbose;
  
+ #define SCANNING_DISABLED       0x40
  #define READING_UNAVAILABLE	0x20
  
***************
*** 111,114 ****
--- 112,117 ----
  	} else if (rsp->ccode > 0 || (rsp->data[1] & READING_UNAVAILABLE)) {
  		validread = 0;
+ 	} else if (!(rsp->data[1] & SCANNING_DISABLED)) {
+ 	  	validread = 0;
  	} else {
  		/* convert RAW reading into units */
***************
*** 191,194 ****
--- 194,199 ----
  	} else if (rsp->ccode || (rsp->data[1] & READING_UNAVAILABLE)) {
  		validread = 0;
+ 	} else if (!(rsp->data[1] & SCANNING_DISABLED)) {
+ 		validread = 0;
  	} else {
  		/* convert RAW reading into units */
***************
*** 428,431 ****
--- 433,438 ----
  	} else if (rsp->ccode || (rsp->data[1] & READING_UNAVAILABLE)) {
  		validread = 0;
+ 	} else if (!(rsp->data[1] & SCANNING_DISABLED)) {
+ 		validread = 0;
  	} else {
  		/* convert RAW reading into units */
***************
*** 772,775 ****
--- 779,784 ----
  			} else if (rsp->data[1] & READING_UNAVAILABLE) {
  				continue;
+ 			} else if (!(rsp->data[1] & SCANNING_DISABLED)) {
+ 				continue;
  			} else if (rsp->data[0] > 0) {
  				/* convert RAW reading into units */