X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Flib%2Fnvidia.c;fp=src%2Flib%2Fnvidia.c;h=92d7574c056aaefdeb80c77c56dedcc4b468091b;hp=1e9ea4fa9d14512f2ef45a1ec8dbc7a4e578fda9;hb=dcd813f21c83592155f712ff1acf450b483d8072;hpb=f055e7507526592d3a74c652f5f053701614c9c0

diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c
index 1e9ea4f..92d7574 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-2013 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;
 
-	fprintf(stderr, _("ERROR: failed to retrieve nvidia temperature\n"));
+	log_debug(_("NVIDIA proprietary driver not used or cannot "
+		    "retrieve NVIDIA GPU temperature."));
 	return 0;
 }
 
@@ -60,14 +61,20 @@ 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);
 
-	s = psensor_create(sid, strdup(name),
-			   SENSOR_TYPE_NVIDIA_TEMP, values_len);
+	t = SENSOR_TYPE_NVCTRL | SENSOR_TYPE_GPU | SENSOR_TYPE_TEMP;
+
+	s = psensor_create(sid,
+			   strdup(name),
+			   strdup("Nvidia GPU"),
+			   t,
+			   values_len);
 
 	s->nvidia_id = id;
 
@@ -87,8 +94,7 @@ static int init()
 	display = XOpenDisplay(NULL);
 
 	if (!display) {
-		fprintf(stderr,
-			_("ERROR: Cannot open connection to X Server\n"));
+		log_err(_("Cannot open connection to X11 server."));
 		return 0;
 	}
 
@@ -96,7 +102,7 @@ static int init()
 	    XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_GPU, &n))
 		return n;
 
-	fprintf(stderr, _("ERROR: Cannot retrieve NVidia information\n"));
+	log_err(_("Failed to retrieve NVIDIA information."));
 
 	return 0;
 }
@@ -109,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++;