summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2011-05-19 12:20:57 -0700
committerAaron Plattner <aplattner@nvidia.com>2011-05-19 12:20:57 -0700
commit5d27ee4a3ce39b2bcb7c1b545b26528f33ed0b4b (patch)
treed8e723f9f397a87ecf8b31ababcaeff1162441f1
parent5840a732643bb1e8091b8306fccaebc16908a161 (diff)
275.09275.09
-rw-r--r--common-utils/nvgetopt.h8
-rw-r--r--nvidia-xconfig.h3
-rw-r--r--option_table.h4
-rw-r--r--options.c1
-rw-r--r--version.mk2
5 files changed, 16 insertions, 2 deletions
diff --git a/common-utils/nvgetopt.h b/common-utils/nvgetopt.h
index 7083860..13b54d4 100644
--- a/common-utils/nvgetopt.h
+++ b/common-utils/nvgetopt.h
@@ -30,6 +30,14 @@
/*
+ * mask of bits not used by nvgetopt in NVGetoptOption::flags;
+ * these bits are available for use within specific users of
+ * nvgetopt
+ */
+
+#define NVGETOPT_UNUSED_FLAG_RANGE 0xffff0000
+
+/*
* indicates that the option is a boolean value; the presence of the
* option will be interpretted as a TRUE value; if the option is
* prepended with '--no-', the option will be interpretted as a FALSE
diff --git a/nvidia-xconfig.h b/nvidia-xconfig.h
index 225ad9c..a6e7832 100644
--- a/nvidia-xconfig.h
+++ b/nvidia-xconfig.h
@@ -81,8 +81,9 @@ typedef struct {
#define MODE_DEBUG_BOOL_OPTION 39
#define THERMAL_CONFIGURATION_CHECK_BOOL_OPTION 40
#define PRESERVE_BUSID_BOOL_OPTION 41
+#define BASE_MOSAIC_BOOL_OPTION 42
-#define XCONFIG_BOOL_OPTION_COUNT (PRESERVE_BUSID_BOOL_OPTION + 1)
+#define XCONFIG_BOOL_OPTION_COUNT (BASE_MOSAIC_BOOL_OPTION + 1)
/* # of 32-bit variables needed to hold all the boolean options (bits) */
#define XCONFIG_BOOL_OPTION_SLOTS \
diff --git a/option_table.h b/option_table.h
index 14b5c4c..fa247da 100644
--- a/option_table.h
+++ b/option_table.h
@@ -663,5 +663,9 @@ static const NVGetoptOption __options[] = {
"are: 0 (Assume it is a CRT), 1 (Assume it is a DLP) and "
"2 (Assume it is a DLP TV and enable the checkerboard output)." },
+ { "base-mosaic",
+ XCONFIG_BOOL_VAL(BASE_MOSAIC_BOOL_OPTION), NVGETOPT_IS_BOOLEAN, NULL,
+ "Enable or disable the \"BaseMosaic\" X configuration option." },
+
{ NULL, 0, 0, NULL, NULL },
};
diff --git a/options.c b/options.c
index 75a9444..98bef91 100644
--- a/options.c
+++ b/options.c
@@ -77,6 +77,7 @@ static const NvidiaXConfigOption __options[] = {
{ CONNECT_TO_ACPID_BOOL_OPTION, FALSE, "ConnectToAcpid" },
{ ENABLE_ACPI_HOTKEYS_BOOL_OPTION, FALSE, "EnableACPIHotkeys" },
{ MODE_DEBUG_BOOL_OPTION, FALSE, "ModeDebug" },
+ { BASE_MOSAIC_BOOL_OPTION, FALSE, "BaseMosaic" },
{ 0, FALSE, NULL },
};
diff --git a/version.mk b/version.mk
index ac06417..f15c207 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 270.41.19
+NVIDIA_VERSION = 275.09