diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:59 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:59 +0000 |
| commit | 2eab4a4e2b8f2ec2154738f0dd57cf0dc5c7816a (patch) | |
| tree | add0e49232de50548191a4243ed0d32cc91d1ec5 /src/radeon_probe.h | |
| parent | 770358c0804c3e919440d2575e4ef25365f763b6 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'src/radeon_probe.h')
| -rw-r--r-- | src/radeon_probe.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/radeon_probe.h b/src/radeon_probe.h index 34e5e860..85d43cc0 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h,v 1.8 2002/04/24 16:20:40 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h,v 1.14 2003/11/10 18:41:23 tsi Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and * VA Linux Systems Inc., Fremont, California. @@ -40,13 +40,14 @@ #include "atiproto.h" #include "xf86str.h" +#include "xf86DDC.h" + +#define _XF86MISC_SERVER_ +#include "xf86misc.h" typedef struct { - Bool IsDRIEnabled; - Bool HasSecondary; - Bool BypassSecondary; /* * The next two are used to make sure CRTC2 is restored before CRTC_EXT, @@ -57,6 +58,13 @@ typedef struct ScrnInfoPtr pSecondaryScrn; ScrnInfoPtr pPrimaryScrn; + + int MonType1; + int MonType2; + xf86MonPtr MonInfo1; + xf86MonPtr MonInfo2; + Bool ReversedDAC; /* TVDAC used as primary dac */ + Bool ReversedTMDS; /* DDC_DVI is used for external TMDS */ } RADEONEntRec, *RADEONEntPtr; /* radeon_probe.c */ @@ -79,6 +87,11 @@ extern Bool RADEONScreenInit FunctionPrototype((int, ScreenPtr, int, char **)); extern Bool RADEONSwitchMode FunctionPrototype((int, DisplayModePtr, int)); +#ifdef X_XF86MiscPassMessage +extern Bool RADEONHandleMessage + FunctionPrototype((int, const char*, const char*, + char**)); +#endif extern void RADEONAdjustFrame FunctionPrototype((int, int, int, int)); extern Bool RADEONEnterVT @@ -87,7 +100,7 @@ extern void RADEONLeaveVT FunctionPrototype((int, int)); extern void RADEONFreeScreen FunctionPrototype((int, int)); -extern int RADEONValidMode +extern ModeStatus RADEONValidMode FunctionPrototype((int, DisplayModePtr, Bool, int)); |