updated copyright end date to 2013

[psensor.git] / src / lib / nvidia.c

diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c
index 10d0c65..9910521 100644 (file)
--- a/src/lib/nvidia.c
+++ b/src/lib/nvidia.c
@@ -1,22 +1,21 @@
 /*
-    Copyright (C) 2010-2011 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 published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
+ * 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
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #include <locale.h>
 #include <libintl.h>
 #define _(str) gettext(str)
@@ -52,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;
 }
 
@@ -61,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, 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;
 
@@ -88,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;
        }
 
@@ -97,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;
 }
@@ -110,15 +115,15 @@ void nvidia_psensor_list_update(struct psensor **sensors)
        while (*ss) {
                s = *ss;
 
-               if (s->type == SENSOR_TYPE_NVIDIA)
+               if (s->type & SENSOR_TYPE_NVCTRL)
                        psensor_set_current_value(s, get_temp(s));
 
                ss++;
        }
 }
 
-struct psensor * *
-nvidia_psensor_list_add(struct psensor **sensors, int values_len)
+struct psensor **nvidia_psensor_list_add(struct psensor **sensors,
+                                        int values_len)
 {
        int i, n;
        struct psensor **tmp, **ss, *s;