]>
Commit | Line | Data |
---|---|---|
c2487ec3 | 1 | diff -u -r1.24 trident_video.c |
2 | --- XFree86-4.2.0/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 2002/04/01 12:06:20 1.24 | |
3 | +++ XFree86-4.2.0/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 2002/04/03 22:47:27 | |
4 | @@ -63,7 +63,9 @@ | |
5 | static int TRIDENTQueryImageAttributes(ScrnInfoPtr, | |
6 | int, unsigned short *, unsigned short *, int *, int *); | |
7 | static void TRIDENTVideoTimerCallback(ScrnInfoPtr pScrn, Time time); | |
8 | +#if 0 | |
9 | static void tridentSetVideoGamma(TRIDENTPtr pTrident,int value,int brightness); | |
10 | +#endif | |
11 | static void tridentSetVideoContrast(TRIDENTPtr pTrident,int value); | |
12 | static void tridentSetVideoParameters(TRIDENTPtr pTrident, int brightness, | |
13 | int saturation, int hue); | |
14 | @@ -305,7 +307,9 @@ | |
15 | break; | |
16 | } | |
17 | } | |
18 | +#if 0 | |
19 | tridentSetVideoGamma(pTrident,pPriv->Gamma,pPriv->Brightness); | |
20 | +#endif | |
21 | tridentSetVideoContrast(pTrident,pPriv->Contrast); | |
22 | tridentSetVideoParameters(pTrident,pPriv->Brightness,pPriv->Saturation, | |
23 | pPriv->HUE); | |
24 | @@ -355,7 +359,9 @@ | |
25 | pPriv->Brightness = 45; | |
26 | pPriv->Saturation = 80; | |
27 | pPriv->Contrast = 4; | |
28 | +#if 0 | |
29 | pPriv->Gamma = 0; | |
30 | +#endif | |
31 | pPriv->HUE = 0; | |
32 | pPriv->videoStatus = 0; | |
33 | pPriv->fixFrame = 100; | |
34 | @@ -371,7 +377,9 @@ | |
35 | xvBrightness = MAKE_ATOM("XV_BRIGHTNESS"); | |
36 | xvSaturation = MAKE_ATOM("XV_SATURATION"); | |
37 | xvHUE = MAKE_ATOM("XV_HUE"); | |
38 | +#if 0 | |
39 | xvGamma = MAKE_ATOM("XV_GAMMA"); | |
40 | +#endif | |
41 | xvContrast = MAKE_ATOM("XV_CONTRAST"); | |
42 | } | |
43 | ||
44 | @@ -595,12 +603,14 @@ | |
45 | pPriv->HUE = value; | |
46 | tridentSetVideoParameters(pTrident, pPriv->Brightness, pPriv->Saturation, | |
47 | pPriv->HUE); | |
48 | +#if 0 | |
49 | tridentSetVideoGamma(pTrident,pPriv->Gamma,pPriv->Brightness); | |
50 | } else if (attribute == xvGamma) { | |
51 | if ((value < -128) || (value > 127)) | |
52 | return BadValue; | |
53 | pPriv->Gamma = value; | |
54 | tridentSetVideoGamma(pTrident,value,pPriv->Brightness); | |
55 | +#endif | |
56 | } else if (attribute == xvContrast) { | |
57 | if ((value < 0) || (value > 127)) | |
58 | return BadValue; | |
59 | @@ -629,8 +639,10 @@ | |
60 | *value = pPriv->Saturation; | |
61 | } else if (attribute == xvHUE) { | |
62 | *value = pPriv->HUE; | |
63 | +#if 0 | |
64 | } else if (attribute == xvGamma) { | |
65 | *value = pPriv->Gamma; | |
66 | +#endif | |
67 | } else if (attribute == xvContrast) { | |
68 | *value = pPriv->Contrast; | |
69 | } else |