From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Thu, 14 Mar 2013 11:11:34 +0000 (+0000)
Subject: flags changes
X-Git-Tag: v0.8.0.5~167
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=d074ace80d66bc5e375d6b7c36e06eff122fb42a

flags changes
---

diff --git a/src/lib/amd.c b/src/lib/amd.c
index 966c24f..2488c59 100644
--- a/src/lib/amd.c
+++ b/src/lib/amd.c
@@ -110,11 +110,15 @@ static struct psensor *create_sensor(int id, int values_len)
 	if (id & 1) {/* odd number ids represent fan sensors */
 		id = id >> 1;
 		sprintf(name, "GPU%dfan", id);
-		sensor_type = SENSOR_TYPE_AMD_FAN;
+		sensor_type = SENSOR_TYPE_ATIADL 
+			| SENSOR_TYPE_FAN
+			| SENSOR_TYPE_RPM;
 	} else {/* even number ids represent temperature sensors */
 		id = id >> 1;
 		sprintf(name, "GPU%dtemp", id);
-		sensor_type = SENSOR_TYPE_AMD_TEMP;
+		sensor_type = SENSOR_TYPE_ATIADL 
+			| SENSOR_TYPE_GPU
+			| SENSOR_TYPE_TEMP;
 	}
 
 	sid = malloc(strlen("amd") + 1 + strlen(name) + 1);
@@ -231,12 +235,14 @@ void amd_psensor_list_update(struct psensor **sensors)
 	while (*ss) {
 		s = *ss;
 
-		if (s->type == SENSOR_TYPE_AMD_TEMP)
-			psensor_set_current_value(s, get_temp(s));
-		else if (s->type == SENSOR_TYPE_AMD_FAN)
-			psensor_set_current_value(s, get_fanspeed(s));
-
-		ss++;
+		if (s->type & SENSOR_TYPE_ATIADL) {
+			if (s->type & SENSOR_TYPE_TEMP)
+				psensor_set_current_value(s, get_temp(s));
+			else if (s->type & SENSOR_TYPE_FAN)
+				psensor_set_current_value(s, get_fanspeed(s));
+		}
+			
+			ss++;
 	}
 }