diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2009-01-30 18:46:53 -0800 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2009-01-30 18:46:53 -0800 |
| commit | bff3a55890967cb405e751de91b55cd45bd3fd3c (patch) | |
| tree | 39f5d786efe8af40d78670cf48e01a48bf458cce | |
| parent | f6dccc8377d4ddf9255d05f959df6ee87089e609 (diff) | |
| -rw-r--r-- | src/gtk+-2.x/ctkevent.c | 3 | ||||
| -rw-r--r-- | src/libXNVCtrl/NVCtrl.h | 14 | ||||
| -rw-r--r-- | src/parse.c | 3 |
3 files changed, 16 insertions, 4 deletions
diff --git a/src/gtk+-2.x/ctkevent.c b/src/gtk+-2.x/ctkevent.c index 7dac617..0055e35 100644 --- a/src/gtk+-2.x/ctkevent.c +++ b/src/gtk+-2.x/ctkevent.c @@ -266,6 +266,7 @@ static void ctk_event_class_init(CtkEventClass *ctk_event_class) MAKE_SIGNAL(NV_CTRL_IS_GVO_DISPLAY); MAKE_SIGNAL(NV_CTRL_PCI_ID); MAKE_SIGNAL(NV_CTRL_GVO_FULL_RANGE_COLOR); + MAKE_SIGNAL(NV_CTRL_GVO_ENABLE_RGB_DATA); #undef MAKE_SIGNAL @@ -276,7 +277,7 @@ static void ctk_event_class_init(CtkEventClass *ctk_event_class) * knows about. */ -#if NV_CTRL_LAST_ATTRIBUTE != NV_CTRL_GVO_FULL_RANGE_COLOR +#if NV_CTRL_LAST_ATTRIBUTE != NV_CTRL_GVO_ENABLE_RGB_DATA #warning "There are attributes that do not emit signals!" #endif diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h index a9e4f75..3767edf 100644 --- a/src/libXNVCtrl/NVCtrl.h +++ b/src/libXNVCtrl/NVCtrl.h @@ -2291,11 +2291,21 @@ * without clamping to [64-940]. */ -#define NV_CTRL_GVO_FULL_RANGE_COLOR 302 /* R-- */ +#define NV_CTRL_GVO_FULL_RANGE_COLOR 302 /* RW- */ #define NV_CTRL_GVO_FULL_RANGE_COLOR_DISABLED 0 #define NV_CTRL_GVO_FULL_RANGE_COLOR_ENABLED 1 -#define NV_CTRL_LAST_ATTRIBUTE NV_CTRL_GVO_FULL_RANGE_COLOR +/* + * NV_CTRL_GVO_ENABLE_RGB_DATA - Allows clients to specify when + * the GVO board should process colors as RGB when the output data + * format is one of the NV_CTRL_GVO_DATA_FORMAT_???_PASSTRHU modes. + */ + +#define NV_CTRL_GVO_ENABLE_RGB_DATA 304 /* RW- */ +#define NV_CTRL_GVO_ENABLE_RGB_DATA_DISABLE 0 +#define NV_CTRL_GVO_ENABLE_RGB_DATA_ENABLE 1 + +#define NV_CTRL_LAST_ATTRIBUTE NV_CTRL_GVO_ENABLE_RGB_DATA diff --git a/src/parse.c b/src/parse.c index 016f8dc..d871dd5 100644 --- a/src/parse.c +++ b/src/parse.c @@ -211,6 +211,7 @@ AttributeTableEntry attributeTable[] = { { "GvoSyncToDisplay", NV_CTRL_GVO_SYNC_TO_DISPLAY, I|N, "Controls synchronization of the non-SDI display to the SDI display when both are active." }, { "GvoFullRangeColor", NV_CTRL_GVO_FULL_RANGE_COLOR, I, "Allow full range color data [4-1019]. If disabled, color data is clamped to [64-940]." }, { "IsGvoDisplay", NV_CTRL_IS_GVO_DISPLAY, N|D, "Returns whether or not the given display device is driven by the GVO device." }, + { "GvoEnableRGBData", NV_CTRL_GVO_ENABLE_RGB_DATA, I, "Indicates that RGB data is being sent via a PASSTHU mode." }, /* Display */ { "Brightness", BRIGHTNESS_VALUE|ALL_CHANNELS, N|C|G, "Controls the overall brightness of the display." }, @@ -285,7 +286,7 @@ AttributeTableEntry attributeTable[] = { * about. */ -#if NV_CTRL_LAST_ATTRIBUTE != NV_CTRL_GVO_FULL_RANGE_COLOR +#if NV_CTRL_LAST_ATTRIBUTE != NV_CTRL_GVO_ENABLE_RGB_DATA #warning "Have you forgotten to add a new integer attribute to attributeTable?" #endif |