Update copyright stuff, fix conky.conf weirdness.

[monky] / src / nvidia.c

diff --git a/src/nvidia.c b/src/nvidia.c
index 59659a5..62ae71f 100644 (file)
--- a/src/nvidia.c
+++ b/src/nvidia.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2008 Markus Meissner
- * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -23,19 +23,27 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
  */
 
 #include "nvidia.h"
 
+const int nvidia_query_to_attr[] = {NV_CTRL_GPU_CORE_TEMPERATURE,
+                                   NV_CTRL_GPU_CORE_THRESHOLD,
+                                   NV_CTRL_AMBIENT_TEMPERATURE,
+                                   NV_CTRL_GPU_CURRENT_CLOCK_FREQS,
+                                   NV_CTRL_GPU_CURRENT_CLOCK_FREQS,
+                                   NV_CTRL_IMAGE_SETTINGS};
+
 int get_nvidia_value(QUERY_ID qid, Display *dpy){
        int tmp;
-       if(!XNVCTRLQueryAttribute(dpy, 0, 0, qid, &tmp)){
+       if(!XNVCTRLQueryAttribute(dpy, 0, 0, nvidia_query_to_attr[qid], &tmp)){
                return -1;
        }
        /* FIXME: when are the low 2 bytes of NV_GPU_FREQ needed? */
        if (qid == NV_GPU_FREQ)
                return tmp >> 16;
+       if (qid == NV_MEM_FREQ)
+               return tmp & 0xFFFF;
        return tmp;
 }
 
@@ -55,6 +63,10 @@ int set_nvidia_type(struct nvidia_s *nvidia, const char *arg)
                        else
                                return 1;
                        break;
+               case 'a':                              // ambient temp
+                       nvidia->print_as_float = 1;
+                       nvidia->type = NV_TEMP_AMBIENT;
+                       break;
                case 'g':                              // gpufreq
                        nvidia->type = NV_GPU_FREQ;
                        break;