415.27

19 files changed, 49 insertions, 171 deletions

diff --git a/doc/version.mk b/doc/version.mk
index 6891b26..303bdf6 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 415.25
+NVIDIA_VERSION = 415.27
diff --git a/samples/Makefile b/samples/Makefile
index 3809736..addfc49 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -54,6 +54,7 @@ XNVCTRL_ARCHIVE       ?= $(XNVCTRL_DIR)/libXNVCtrl.a
 
 CFLAGS                += $(X_CFLAGS)
 CFLAGS                += -I $(XNVCTRL_DIR)
+CFLAGS                += -I $(OUTPUTDIR)
 
 LDFLAGS               += $(X_LDFLAGS)
 LDFLAGS               += -L $(XNVCTRL_DIR)
diff --git a/samples/nv-control-events.c b/samples/nv-control-events.c
index 8e4c23e..cd0f65f 100644
--- a/samples/nv-control-events.c
+++ b/samples/nv-control-events.c
@@ -26,6 +26,7 @@
  * demonstrates how to handle NV-CONTROL events.
  */
 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/samples/nv-control-info.c b/samples/nv-control-info.c
index bfc5045..46f08ec 100644
--- a/samples/nv-control-info.c
+++ b/samples/nv-control-info.c
@@ -27,6 +27,7 @@
  * present.
  */
 
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/samples/version.mk b/samples/version.mk
index 6891b26..303bdf6 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 415.25
+NVIDIA_VERSION = 415.27
diff --git a/src/gtk+-2.x/ctkdisplayconfig-utils.c b/src/gtk+-2.x/ctkdisplayconfig-utils.c
index eed9154..2d90ead 100644
--- a/src/gtk+-2.x/ctkdisplayconfig-utils.c
+++ b/src/gtk+-2.x/ctkdisplayconfig-utils.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses>.
  */
 
+
 #include <stdlib.h> /* malloc */
 #include <string.h> /* strlen,  strdup */
 #include <unistd.h> /* lseek, close */
@@ -679,6 +680,7 @@ static void apply_mode_attribute_token(char *token, char *value, void *data)
         if (!strcasecmp("off", value)) {
             mode->allowGSYNC = False;
         }
+
     }
 
 }
@@ -721,7 +723,6 @@ nvModePtr mode_parse(nvDisplayPtr display, const char *mode_str)
     mode->position_type = CONF_ADJ_ABSOLUTE;
     mode->allowGSYNC = True;
 
-
     /* Read the mode name */
     str = parse_read_name(str, &mode_name, 0);
     if (!str || !mode_name) goto fail;
diff --git a/src/gtk+-2.x/ctkdisplayconfig.c b/src/gtk+-2.x/ctkdisplayconfig.c
index 87a4983..d78fc06 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.c
+++ b/src/gtk+-2.x/ctkdisplayconfig.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses>.
  */
 
+
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/src/gtk+-2.x/ctkdisplayconfig.h b/src/gtk+-2.x/ctkdisplayconfig.h
index fdc299d..9858f29 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.h
+++ b/src/gtk+-2.x/ctkdisplayconfig.h
@@ -20,6 +20,7 @@
 #ifndef __CTK_DISPLAYCONFIG_H__
 #define __CTK_DISPLAYCONFIG_H__
 
+
 #include "ctkevent.h"
 #include "ctkconfig.h"
 #include "ctkdisplaylayout.h"
@@ -162,7 +163,6 @@ typedef struct _CtkDisplayConfig
     GtkWidget *box_display_panning;
     GtkWidget *txt_display_panning;
 
-
     /* X Screen - Info */
     GtkWidget *screen_page;
 
diff --git a/src/gtk+-2.x/ctkdisplaydevice.c b/src/gtk+-2.x/ctkdisplaydevice.c
index c62dd0e..500bdd4 100644
--- a/src/gtk+-2.x/ctkdisplaydevice.c
+++ b/src/gtk+-2.x/ctkdisplaydevice.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses>.
  */
 
+
 #include <gtk/gtk.h>
 #include <NvCtrlAttributes.h>
 #include <string.h>
diff --git a/src/gtk+-2.x/ctkdisplaylayout.h b/src/gtk+-2.x/ctkdisplaylayout.h
index f36c7ab..80cfc20 100644
--- a/src/gtk+-2.x/ctkdisplaylayout.h
+++ b/src/gtk+-2.x/ctkdisplaylayout.h
@@ -20,6 +20,7 @@
 #ifndef __CTK_DISPLAYLAYOUT_H__
 #define __CTK_DISPLAYLAYOUT_H__
 
+
 #include "ctkevent.h"
 #include "ctkconfig.h"
 
diff --git a/src/gtk+-2.x/ctkevent.c b/src/gtk+-2.x/ctkevent.c
index 69387b1..f3d27de 100644
--- a/src/gtk+-2.x/ctkevent.c
+++ b/src/gtk+-2.x/ctkevent.c
@@ -28,6 +28,7 @@
  *   NV-CONTROL -> event -> glib -> CtkEvent -> signal -> GUI
  */
 
+
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/src/gtk+-2.x/ctkopengl.c b/src/gtk+-2.x/ctkopengl.c
index c8836ce..132ed82 100644
--- a/src/gtk+-2.x/ctkopengl.c
+++ b/src/gtk+-2.x/ctkopengl.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses>.
  */
 
+
 #include <gtk/gtk.h>
 #include <NvCtrlAttributes.h>
 #include <stdlib.h>
@@ -952,7 +953,7 @@ static void post_allow_flipping_button_toggled(CtkOpenGL *ctk_opengl,
 }
 
 static void post_allow_gsync_button_toggled(CtkOpenGL *ctk_opengl,
-                                          gboolean enabled)
+                                            gboolean enabled)
 {
     ctk_config_statusbar_message(ctk_opengl->ctk_config,
                                  "G-SYNC %s.",
@@ -1065,7 +1066,7 @@ static void allow_flipping_button_toggled(GtkWidget *widget,
 }
 
 static void allow_gsync_button_toggled(GtkWidget *widget,
-                                     gpointer user_data)
+                                       gpointer user_data)
 {
     CtkOpenGL *ctk_opengl = CTK_OPENGL(user_data);
     CtrlTarget *ctrl_target = ctk_opengl->ctrl_target;
diff --git a/src/gtk+-2.x/ctkopengl.h b/src/gtk+-2.x/ctkopengl.h
index dc2528e..b7d2a5b 100644
--- a/src/gtk+-2.x/ctkopengl.h
+++ b/src/gtk+-2.x/ctkopengl.h
@@ -20,6 +20,7 @@
 #ifndef __CTK_OPENGL_H__
 #define __CTK_OPENGL_H__
 
+
 #include "ctkevent.h"
 #include "ctkconfig.h"
 
diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h
index 09e27b8..9a06f2d 100644
--- a/src/libXNVCtrl/NVCtrl.h
+++ b/src/libXNVCtrl/NVCtrl.h
@@ -24,6 +24,7 @@
 #ifndef __NVCTRL_H
 #define __NVCTRL_H
 
+
 #include <stdint.h>
 
 /**************************************************************************/
@@ -42,8 +43,7 @@
 #define NV_CTRL_TARGET_TYPE_X_SCREEN       0
 #define NV_CTRL_TARGET_TYPE_GPU            1
 #define NV_CTRL_TARGET_TYPE_FRAMELOCK      2
-/* Visual Computing System - deprecated.  To be removed along with all
- * VCS-specific attributes in a later release. */
+/* Visual Computing System - no longer supported. */
 #define NV_CTRL_TARGET_TYPE_VCSC           3
 #define NV_CTRL_TARGET_TYPE_GVI            4
 #define NV_CTRL_TARGET_TYPE_COOLER         5 /* e.g., fan */
@@ -95,9 +95,6 @@
  *    all Physical X Screens;  assignment of this attribute will be
  *    broadcast by the NVIDIA X Driver to all X Screens.
  *
- * V: The attribute may be queried using an NV_CTRL_TARGET_TYPE_VCSC
- *    target type via XNVCTRLQueryTargetAttribute().
- *
  * I: The attribute may be queried using an NV_CTRL_TARGET_TYPE_GVI target type
  *    via XNVCTRLQueryTargetAttribute().
  *
@@ -2172,15 +2169,10 @@
 
 
 /*
- * NV_CTRL_VCSC_HIGH_PERF_MODE - deprecated
- *
- * Is used to both query High Performance Mode status on the Visual Computing
- * System, and also to enable or disable High Performance Mode.
+ * NV_CTRL_VCSC_HIGH_PERF_MODE - Not supported
  */
 
-#define NV_CTRL_VCSC_HIGH_PERF_MODE                             282 /* RW-V */
-#define NV_CTRL_VCSC_HIGH_PERF_MODE_DISABLE                       0
-#define NV_CTRL_VCSC_HIGH_PERF_MODE_ENABLE                        1
+#define NV_CTRL_VCSC_HIGH_PERF_MODE                             282
 
 /*
  * NV_CTRL_DISPLAYPORT_LINK_RATE - returns the negotiated lane bandwidth of the
@@ -3700,100 +3692,59 @@
 
 
 /*
- * NV_CTRL_STRING_VCSC_PRODUCT_NAME - deprecated
- *
- * Queries the product name of the VCSC device.
- *
- * This attribute must be queried through XNVCTRLQueryTargetStringAttribute()
- * using a NV_CTRL_TARGET_TYPE_VCSC target.
+ * NV_CTRL_STRING_VCSC_PRODUCT_NAME - Not supported
  */
 
-#define NV_CTRL_STRING_VCSC_PRODUCT_NAME                       15   /* R---V */
+#define NV_CTRL_STRING_VCSC_PRODUCT_NAME                       15
 
 
 /*
- * NV_CTRL_STRING_VCSC_PRODUCT_ID - deprecated
- *
- * Queries the product ID of the VCSC device.
- *
- * This attribute must be queried through XNVCTRLQueryTargetStringAttribute()
- * using a NV_CTRL_TARGET_TYPE_VCSC target.
+ * NV_CTRL_STRING_VCSC_PRODUCT_ID - Not supported
  */
 
-#define NV_CTRL_STRING_VCSC_PRODUCT_ID                         16   /* R---V */
+#define NV_CTRL_STRING_VCSC_PRODUCT_ID                         16
 
 
 /*
- * NV_CTRL_STRING_VCSC_SERIAL_NUMBER - deprecated
- *
- * Queries the unique serial number of the VCS device.
- *
- * This attribute must be queried through XNVCTRLQueryTargetStringAttribute()
- * using a NV_CTRL_TARGET_TYPE_VCSC target.
+ * NV_CTRL_STRING_VCSC_SERIAL_NUMBER - Not supported
  */
 
-#define NV_CTRL_STRING_VCSC_SERIAL_NUMBER                      17   /* R---V */
+#define NV_CTRL_STRING_VCSC_SERIAL_NUMBER                      17
 
 
 /*
- * NV_CTRL_STRING_VCSC_BUILD_DATE - deprecated
- *
- * Queries the date of the VCS device.  the returned string is in the following
- * format: "Week.Year"
- *
- * This attribute must be queried through XNVCTRLQueryTargetStringAttribute()
- * using a NV_CTRL_TARGET_TYPE_VCSC target.
+ * NV_CTRL_STRING_VCSC_BUILD_DATE - Not supported
  */
 
-#define NV_CTRL_STRING_VCSC_BUILD_DATE                         18   /* R---V */
+#define NV_CTRL_STRING_VCSC_BUILD_DATE                         18
 
 
 /*
- * NV_CTRL_STRING_VCSC_FIRMWARE_VERSION - deprecated
- *
- * Queries the firmware version of the VCS device.
- *
- * This attribute must be queried through XNVCTRLQueryTargetStringAttribute()
- * using a NV_CTRL_TARGET_TYPE_VCSC target.
+ * NV_CTRL_STRING_VCSC_FIRMWARE_VERSION - Not supported
  */
 
-#define NV_CTRL_STRING_VCSC_FIRMWARE_VERSION                   19   /* R---V */
+#define NV_CTRL_STRING_VCSC_FIRMWARE_VERSION                   19
 
 
 /*
- * NV_CTRL_STRING_VCSC_FIRMWARE_REVISION - deprecated
- *
- * Queries the firmware revision of the VCS device.
- *
- * This attribute must be queried through XNVCTRLQueryTargetStringAttribute()
- * using a NV_CTRL_TARGET_TYPE_VCS target.
+ * NV_CTRL_STRING_VCSC_FIRMWARE_REVISION - Not supported
  */
 
-#define NV_CTRL_STRING_VCSC_FIRMWARE_REVISION                  20   /* R---V */
+#define NV_CTRL_STRING_VCSC_FIRMWARE_REVISION                  20
 
 
 /*
- * NV_CTRL_STRING_VCSC_HARDWARE_VERSION - deprecated
- *
- * Queries the hardware version of the VCS device.
- *
- * This attribute must be queried through XNVCTRLQueryTargetStringAttribute()
- * using a NV_CTRL_TARGET_TYPE_VCSC target.
+ * NV_CTRL_STRING_VCSC_HARDWARE_VERSION - Not supported
  */
 
-#define NV_CTRL_STRING_VCSC_HARDWARE_VERSION                   21   /* R---V */
+#define NV_CTRL_STRING_VCSC_HARDWARE_VERSION                   21
 
 
 /*
- * NV_CTRL_STRING_VCSC_HARDWARE_REVISION - deprecated
- *
- * Queries the hardware revision of the VCS device.
- *
- * This attribute must be queried through XNVCTRLQueryTargetStringAttribute()
- * using a NV_CTRL_TARGET_TYPE_VCSC target.
+ * NV_CTRL_STRING_VCSC_HARDWARE_REVISION - Not supported
  */
 
-#define NV_CTRL_STRING_VCSC_HARDWARE_REVISION                  22   /* R---V */
+#define NV_CTRL_STRING_VCSC_HARDWARE_REVISION                  22
 
 
 /* 
@@ -3997,85 +3948,24 @@
 
 
 /*
- * NV_CTRL_STRING_VCSC_FAN_STATUS - deprecated
- *
- * Returns a string with status of all the fans in the Visual Computing System,
- * if such a query is supported.  Fan information is reported along with its
- * tachometer reading (in RPM) and a flag indicating whether the fan has failed
- * or not.
- * 
- * Valid tokens:
- *
- *    Token      Value
- *   "fan"       integer   - the Fan index
- *   "speed"     integer   - the tachometer reading of the fan in rpm
- *   "fail"      integer   - flag to indicate whether the fan has failed
- *
- * Example:
- *
- *   fan=0, speed=694, fail=0 ; fan=1, speed=693, fail=0
- *
- * This attribute must be queried through XNVCTRLQueryTargetStringAttribute()
- * using a NV_CTRL_TARGET_TYPE_VCSC target.
- *
+ * NV_CTRL_STRING_VCSC_FAN_STATUS - Not supported
  */
 
-#define NV_CTRL_STRING_VCSC_FAN_STATUS                         30   /* R---V */
+#define NV_CTRL_STRING_VCSC_FAN_STATUS                         30
 
 
 /*
- * NV_CTRL_STRING_VCSC_TEMPERATURES - Deprecated
- *
- * Returns a string with all Temperature readings in the Visual Computing
- * System, if such a query is supported.  Intake, Exhaust and Board Temperature
- * values are reported in Celcius.
- * 
- * Valid tokens:
- *
- *    Token      Value
- *   "intake"    integer   - the intake temperature for the VCS
- *   "exhaust"   integer   - the exhaust temperature for the VCS
- *   "board"     integer   - the board temperature of the VCS
- *
- * Example:
- *
- *   intake=29, exhaust=46, board=41
- *
- * This attribute must be queried through XNVCTRLQueryTargetStringAttribute()
- * using a NV_CTRL_TARGET_TYPE_VCSC target.
- *
+ * NV_CTRL_STRING_VCSC_TEMPERATURES - Not supported
  */
 
-#define NV_CTRL_STRING_VCSC_TEMPERATURES                       31   /* R---V */
+#define NV_CTRL_STRING_VCSC_TEMPERATURES                       31
 
 
 /*
- * NV_CTRL_STRING_VCSC_PSU_INFO - Deprecated
- *
- * Returns a string with all Power Supply Unit related readings in the Visual
- * Computing System, if such a query is supported.  Current in amperes, Power
- * in watts, Voltage in volts and PSU state may be reported.  Not all PSU types
- * support all of these values, and therefore some readings may be unknown.
- * 
- * Valid tokens:
- *
- *    Token      Value
- *   "current"   integer   - the current drawn in amperes by the VCS
- *   "power"     integer   - the power drawn in watts by the VCS
- *   "voltage"   integer   - the voltage reading of the VCS
- *   "state"     integer   - flag to indicate whether PSU is operating normally
- *
- * Example:
- *
- *   current=10, power=15, voltage=unknown, state=normal
- *
- * This attribute must be queried through XNVCTRLQueryTargetStringAttribute()
- * using a NV_CTRL_TARGET_TYPE_VCSC target.
- *
+ * NV_CTRL_STRING_VCSC_PSU_INFO - Not supported
  */
 
-
-#define NV_CTRL_STRING_VCSC_PSU_INFO                           32   /* R---V */
+#define NV_CTRL_STRING_VCSC_PSU_INFO                           32
 
 
 /*
@@ -4551,37 +4441,14 @@
 
 
 /*
- * NV_CTRL_BINARY_DATA_GPUS_USING_VCSC - Deprecated
- *
- * Returns the list of GPU devices connected to the given VCS.
- *
- * The format of the returned data is:
- *
- *     4       CARD32 number of GPUs
- *     4 * n   CARD32 GPU indices
- *
- * This attribute can only be queried through XNVCTRLQueryTargetBinaryData()
- * using a NV_CTRL_TARGET_TYPE_VCSC target.  This attribute cannot be
- * queried using a NV_CTRL_TARGET_TYPE_X_SCREEN and cannot be queried using
- * a  NV_CTRL_TARGET_TYPE_X_GPU
+ * NV_CTRL_BINARY_DATA_GPUS_USING_VCSC - Not supported
  */
 
-#define NV_CTRL_BINARY_DATA_GPUS_USING_VCSC                    8   /* R-DV */
+#define NV_CTRL_BINARY_DATA_GPUS_USING_VCSC                    8
 
 
 /*
  * NV_CTRL_BINARY_DATA_VCSCS_USED_BY_GPU - Deprecated
- *
- * Returns the VCSC device that is controlling the given GPU.
- *
- * The format of the returned data is:
- *
- *     4       CARD32 number of VCS (always 1)
- *     4 * n   CARD32 VCS indices
- *
- * This attribute can only be queried through XNVCTRLQueryTargetBinaryData()
- * using a NV_CTRL_TARGET_TYPE_GPU target.  This attribute cannot be
- * queried using a NV_CTRL_TARGET_TYPE_X_SCREEN
  */
 
 #define NV_CTRL_BINARY_DATA_VCSCS_USED_BY_GPU                  9   /* R-DG */
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index 6891b26..303bdf6 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 415.25
+NVIDIA_VERSION = 415.27
diff --git a/src/parse.c b/src/parse.c
index 4df8024..90ba2ee 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses>.
  */
 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/src/version.h b/src/version.h
index f05b39e..88f1f46 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define NVIDIA_VERSION "415.25"
+#define NVIDIA_VERSION "415.27"
diff --git a/src/version.mk b/src/version.mk
index 6891b26..303bdf6 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 415.25
+NVIDIA_VERSION = 415.27
diff --git a/version.mk b/version.mk
index 6891b26..303bdf6 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 415.25
+NVIDIA_VERSION = 415.27