X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fnvidia.c;h=99105218e42768392a1616745f113bc64ee31442;hb=f3b05dae619a7909bd7422b3a82422c9442aa114;hp=5b2bdea3974a4940d85c50535feb9428c852a56e;hpb=b01d095d6b123bcc7ed221cccf2c04295834cc84;p=psensor.git

diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c
index 5b2bdea..9910521 100644
--- a/src/lib/nvidia.c
+++ b/src/lib/nvidia.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -51,7 +51,8 @@ static int get_temp(struct psensor *sensor)
 	if (res == True)
 		return temp;
 
-	log_err(_("Failed to retrieve NVIDIA temperature."));
+	log_debug(_("NVIDIA proprietary driver not used or cannot "
+		    "retrieve NVIDIA GPU temperature."));
 	return 0;
 }
 
@@ -60,16 +61,19 @@ static struct psensor *create_sensor(int id, int values_len)
 	char name[200];
 	char *sid;
 	struct psensor *s;
+	int t;
 
 	sprintf(name, "GPU%d", id);
 
 	sid = malloc(strlen("nvidia") + 1 + strlen(name) + 1);
 	sprintf(sid, "nvidia %s", name);
 
+	t = SENSOR_TYPE_NVCTRL | SENSOR_TYPE_GPU | SENSOR_TYPE_TEMP;
+
 	s = psensor_create(sid,
 			   strdup(name),
 			   strdup("Nvidia GPU"),
-			   SENSOR_TYPE_NVIDIA_TEMP,
+			   t,
 			   values_len);
 
 	s->nvidia_id = id;
@@ -111,7 +115,7 @@ void nvidia_psensor_list_update(struct psensor **sensors)
 	while (*ss) {
 		s = *ss;
 
-		if (s->type == SENSOR_TYPE_NVIDIA_TEMP)
+		if (s->type & SENSOR_TYPE_NVCTRL)
 			psensor_set_current_value(s, get_temp(s));
 
 		ss++;