diff options
| author | Hans-Juergen Mauser <hjmauser@gmx.net> | 2012-05-13 17:41:53 +0200 |
|---|---|---|
| committer | Tormod Volden <debian.tormod@gmail.com> | 2012-05-27 19:43:44 +0200 |
| commit | 42a32b41ebb52e58c02bddddfde753d1974f6464 (patch) | |
| tree | e991731636ef36bd6bc42f2f9c1c4a4e704baa56 | |
| parent | ad3816e0fb8846768ce13b70ed890714103f8916 (diff) | |
Change CrtOnly and TvOn option handling
The "CrtOnly" option predates TV support, and was meant for turning off the
LCD screen.
"TvOn" would turn off all other outputs, possibly overriding the
"CrtOnly" option.
Change them to do what they say:
TvOn simply turns on the TV output. CrtOnly turns off all outputs except
CRT, possibly overriding TvOn.
The TvOn option is left undocumented.
Signed-off-by: Hans-Juergen Mauser <hjmauser@gmx.net>
[Tormod: patch split out from a big diff]
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
| -rw-r--r-- | src/savage_vbe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/savage_vbe.c b/src/savage_vbe.c index 05b472c..948cb15 100644 --- a/src/savage_vbe.c +++ b/src/savage_vbe.c @@ -137,10 +137,10 @@ SavageSetVESAMode( SavagePtr psav, int n, int Refresh ) bFirstRun = FALSE; psav->iDevInfoPrim = psav->iDevInfo; } - if( psav->CrtOnly ) - psav->iDevInfo = CRT_ACTIVE; if( psav->TvOn ) - psav->iDevInfo = TV_ACTIVE; + psav->iDevInfo |= TV_ACTIVE; /* TvOn is NOT TvOnly! */ + if( psav->CrtOnly ) + psav->iDevInfo = CRT_ACTIVE; /* do this at last as this is exclusive and cancels other settings */ /* Establish the refresh rate for this mode. */ |