From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 18 Jul 2011 21:23:32 +0000 (+0000)
Subject: normalize constants naming
X-Git-Tag: v0.8.0.5~701
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=7128025f02e0ab5502a54ffcedbbcba19a2866f0

normalize constants naming
---

diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c
index 0a85275..974ffc7 100644
--- a/src/lib/nvidia.c
+++ b/src/lib/nvidia.c
@@ -68,7 +68,7 @@ static struct psensor *create_sensor(int id, int values_len)
 	sprintf(sid, "nvidia %s", name);
 
 	s = psensor_create(sid, strdup(name),
-			   SENSOR_TYPE_NVIDIA, values_len);
+			   SENSOR_TYPE_NVIDIA_TEMP, values_len);
 
 	s->nvidia_id = id;
 
@@ -110,7 +110,7 @@ void nvidia_psensor_list_update(struct psensor **sensors)
 	while (*ss) {
 		s = *ss;
 
-		if (s->type == SENSOR_TYPE_NVIDIA)
+		if (s->type == SENSOR_TYPE_NVIDIA_TEMP)
 			psensor_set_current_value(s, get_temp(s));
 
 		ss++;
diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 3cd6956..da57f09 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -400,7 +400,7 @@ const char *psensor_type_to_str(unsigned int type)
 	if (type & SENSOR_TYPE_LMSENSOR_FAN)
 		return "Fan";
 
-	if (type & SENSOR_TYPE_NVIDIA)
+	if (type & SENSOR_TYPE_NVIDIA_TEMP)
 		return "NVidia GPU Temperature";
 
 	if (type & SENSOR_TYPE_AMD_TEMP)
diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index a0fef38..49e86d5 100644
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -31,13 +31,16 @@ enum psensor_type {
 	SENSOR_TYPE_FAN = 0x0002,
 	SENSOR_TYPE_REMOTE = 0x0004,
 
-	SENSOR_TYPE_LMSENSOR_TEMP = 0x0100 | SENSOR_TYPE_TEMP,
-	SENSOR_TYPE_NVIDIA = 0x0200 | SENSOR_TYPE_TEMP,
+	SENSOR_TYPE_LMSENSOR = 0x0100,
+	SENSOR_TYPE_NVIDIA_TEMP = 0x0200 | SENSOR_TYPE_TEMP,
 	SENSOR_TYPE_HDD_TEMP = 0x0400 | SENSOR_TYPE_TEMP,
-	SENSOR_TYPE_LMSENSOR_FAN = 0x0800 | SENSOR_TYPE_FAN,
 	SENSOR_TYPE_AMD = 0x1000,
+
 	SENSOR_TYPE_AMD_TEMP = SENSOR_TYPE_AMD | SENSOR_TYPE_TEMP,
-	SENSOR_TYPE_AMD_FAN = SENSOR_TYPE_AMD | SENSOR_TYPE_FAN
+	SENSOR_TYPE_AMD_FAN = SENSOR_TYPE_AMD | SENSOR_TYPE_FAN,
+
+	SENSOR_TYPE_LMSENSOR_TEMP = SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_TEMP,
+	SENSOR_TYPE_LMSENSOR_FAN = SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_FAN
 };
 
 struct psensor {