diff options
| author | Bogdan Diaconescu <b_diaconescu@yahoo.com> | 2005-04-17 23:07:54 +0000 |
|---|---|---|
| committer | Bogdan Diaconescu <b_diaconescu@yahoo.com> | 2005-04-17 23:07:54 +0000 |
| commit | e4623bbce161c41ccac65210fd2539211e8af715 (patch) | |
| tree | cfd3857dd7a372094bc3c3513636e3fec1057f8c | |
| parent | 405b4dcb067346fce7fd9f6d8a6507a58c740ac7 (diff) | |
Now the detection of the theatre chip is in other module called
theatre_detect
| -rw-r--r-- | src/theatre.c | 2 | ||||
| -rw-r--r-- | src/theatre.h | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/theatre.c b/src/theatre.c index 3ff0cb0..7c29e0b 100644 --- a/src/theatre.c +++ b/src/theatre.c @@ -24,6 +24,7 @@ static Bool theatre_write(TheatrePtr t,CARD32 reg, CARD32 data) #define VIP_TYPE "ATI VIP BUS" +#if 0 TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b) { TheatrePtr t; @@ -85,6 +86,7 @@ DumpRageTheatreRegsByName(t); #endif return t; } +#endif enum { diff --git a/src/theatre.h b/src/theatre.h index 287cc1a..afa4fae 100644 --- a/src/theatre.h +++ b/src/theatre.h @@ -11,6 +11,8 @@ typedef struct { int theatre_num; CARD32 theatre_id; int mode; + char* microc_path; + char* microc_type; CARD16 video_decoder_type; CARD32 wStandard; @@ -33,8 +35,6 @@ typedef struct { } TheatreRec, * TheatrePtr; -TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b); - /* DO NOT FORGET to setup constants before calling InitTheatre */ void InitTheatre(TheatrePtr t); @@ -54,11 +54,11 @@ void RageTheatreDebugGain(TheatrePtr t, Bool on, CARD32 gain); void ShutdownTheatre(TheatrePtr t); void DumpRageTheatreRegs(TheatrePtr t); void ResetTheatreRegsForTVout(TheatrePtr t); +void ResetTheatreRegsForNoTVout(TheatrePtr t); #define TheatreSymbolsList \ "InitTheatre" \ - "DetectTheatre" \ "RT_SetTint", \ "RT_SetSaturation", \ "RT_SetBrightness", \ @@ -76,8 +76,6 @@ void ResetTheatreRegsForTVout(TheatrePtr t); #ifdef XFree86LOADER -#define xf86_DetectTheatre ((TheatrePtr (*)(GENERIC_BUS_Ptr))LoaderSymbol("DetectTheatre")) - #define xf86_InitTheatre ((void (*)(TheatrePtr t))LoaderSymbol("InitTheatre")) #define xf86_RT_SetTint ((void (*)(TheatrePtr, int))LoaderSymbol("RT_SetTint")) @@ -95,10 +93,9 @@ void ResetTheatreRegsForTVout(TheatrePtr t); #define xf86_DumpRageTheatreRegs ((void (*)(TheatrePtr))LoaderSymbol("DumpRageTheatreRegs")) #define xf86_ResetTheatreRegsForTVout ((void (*)(TheatrePtr))LoaderSymbol("ResetTheatreRegsForTVout")) #define xf86_ResetTheatreRegsForNoTVout ((void (*)(TheatrePtr))LoaderSymbol("ResetTheatreRegsForNoTVout")) +#define xf86_RT_GetSignalStatus ((void (*)(TheatrePtr))LoaderSymbol("xf86_RT_GetSignalStatus")) #else -#define xf86_DetectTheatre DetectTheatre - #define xf86_InitTheatre InitTheatre #define xf86_RT_SetTint RT_SetTint @@ -114,8 +111,6 @@ void ResetTheatreRegsForTVout(TheatrePtr t); #define xf86_RageTheatreDebugGain RageTheatreDebugGain #define xf86_ShutdownTheatre ShutdownTheatre #define xf86_DumpRageTheatreRegs DumpRageTheatreRegs -#define xf86_ResetTheatreRegsForTVout ResetTheatreRegsForTVout -#define xf86_ResetTheatreRegsForNoTVout ResetTheatreRegsForNoTVout #endif |