summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2012-07-30 14:43:31 -0700
committerAaron Plattner <aplattner@nvidia.com>2012-07-30 14:43:31 -0700
commit2801a2a3ffd88d75f60c6dce69ae36a80ab84c3e (patch)
tree8f397850742210895da8ef1c2045de1c76f61fc1
parente3036ae4c9f79099fe14d6574fe259149fc6a397 (diff)
304.30304.30
-rw-r--r--nvidia-cfg.h74
-rw-r--r--nvidia-xconfig.1.m414
-rw-r--r--version.mk2
3 files changed, 89 insertions, 1 deletions
diff --git a/nvidia-cfg.h b/nvidia-cfg.h
index 2ff08d8..ac97c18 100644
--- a/nvidia-cfg.h
+++ b/nvidia-cfg.h
@@ -64,6 +64,21 @@ typedef struct {
} NvCfgPciDevice;
+/*
+ * NvCfgGSyncDeviceType - type of the GSync device
+ */
+
+typedef enum {
+ NVCFG_TYPE_GSYNC1 = 0,
+ NVCFG_TYPE_GSYNC2,
+ NVCFG_TYPE_GSYNC3
+} NvCfgGSyncDeviceType;
+
+
+
+#define NV_CFG_GSYNC_DEVICE_FIRMWARE_FORMAT_1 1
+
+
/*
* NvCfgDisplayDeviceInformation - this data structure contains
@@ -133,6 +148,15 @@ typedef void * NvCfgDeviceHandle;
/*
+ * NvCfgGSyncHandle - this is an opaque handle identifying a
+ * GSync device.
+ */
+
+typedef void * NvCfgGSyncHandle;
+
+
+
+/*
* NvCfg Boolean values
*/
@@ -329,4 +353,54 @@ NvCfgBool nvCfgIsPrimaryDevice(NvCfgDeviceHandle handle,
NvCfgBool nvCfgGetTeslaSerialNumbers(char ***serials);
+
+/*
+ * nvCfgOpenAllGSyncDevices() - returns an array of NvCfgGSyncHandle's
+ * indicating what GSync devices are present in the system. On success,
+ * NVCFG_TRUE will be returned, n will contain the number of GSync devices
+ * present in the system, and handles will be an allocated array containing
+ * a handle for each of the GSync devices.The caller should free the
+ * handles array when no longer needed. On failure, NVCFG_FALSE will be
+ * returned.
+ */
+
+NvCfgBool nvCfgOpenAllGSyncDevices(int *n, NvCfgGSyncHandle **handles);
+
+
+/*
+ * nvCfgCloseAllGSyncDevices() - close all the GSync device connections
+ * opened by a previous call to nvCfgOpenAllGSyncDevices().
+ */
+
+NvCfgBool nvCfgCloseAllGSyncDevices(void);
+
+
+/*
+ * nvCfgGetGSyncDeviceType() - returns the type of GSync device referenced
+ * by handle.
+ */
+
+NvCfgGSyncDeviceType nvCfgGetGSyncDeviceType(NvCfgGSyncHandle handle);
+
+
+/*
+ * nvCfgGetGSyncDeviceFirmwareVersion() - returns the firmware version of
+ * the GSync device referenced by handle.
+ */
+
+int nvCfgGetGSyncDeviceFirmwareVersion(NvCfgGSyncHandle handle);
+
+
+/*
+ * nvCfgFlashGSyncDevice() - flashes the GSync device referenced by handle.
+ * format contains the firmware format, newFirmwareImage contains the
+ * new firmware image to be flashed, and size contains the size of
+ * newFirmwareImage. On success, NVCFG_TRUE will be returned.
+ * On failure, NVCFG_FALSE will be returned.
+ */
+
+NvCfgBool nvCfgFlashGSyncDevice(NvCfgGSyncHandle handle, int format,
+ const unsigned char *newFirmwareImage,
+ int size);
+
#endif /* __NVIDIA_CFG__ */
diff --git a/nvidia-xconfig.1.m4 b/nvidia-xconfig.1.m4
index 0914700..cdc1b60 100644
--- a/nvidia-xconfig.1.m4
+++ b/nvidia-xconfig.1.m4
@@ -4,6 +4,11 @@ define(__OPTIONS__, [[[include([[[options.1.inc]]])dnl]]])dnl
.\" Copyright (C) 2005-2010 NVIDIA Corporation.
.\"
__HEADER__
+.\" Define the URL macro and then load the URL package if it exists.
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
.TH nvidia\-xconfig 1 "__DATE__" "nvidia\-xconfig __VERSION__"
.SH NAME
nvidia-xconfig \- manipulate X configuration files for the NVIDIA driver
@@ -61,6 +66,15 @@ The
option can be used to print the new configuration to standard out in tree form instead. This option is useful to see what
.B nvidia-xconfig
will do while leaving the original configuration intact.
+.PP
+The source code to
+.B nvidia\-xconfig
+is released under the GPL and available here:
+.sp
+.ti +5
+.URL "ftp://download.nvidia.com/XFree86/nvidia\-xconfig/"
+.sp
+Patches are welcome.
dnl Call gen-manpage-opts to generate this section.
__OPTIONS__
.SH EXAMPLES
diff --git a/version.mk b/version.mk
index 11c1292..ef64379 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.22
+NVIDIA_VERSION = 304.30