diff options
author | Adam Jackson <ajax@nwnk.net> | 2004-07-30 20:30:51 +0000 |
---|---|---|
committer | Adam Jackson <ajax@nwnk.net> | 2004-07-30 20:30:51 +0000 |
commit | d04f61bfaf6952e832d52e1cd6014e86435aebd9 (patch) | |
tree | ad73f5d8f2d8290a60cce830230344aa812a8acf /src/radeon_probe.h | |
parent | 6dcb78bb818c3c1c7fe406bee5379f9bef023f4b (diff) |
Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
framebuffer formats except cfb and the overlay modes should work, and
r128 and radeon need to be loaded from the ati driver (both issues to
be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
drivers. elfloader users shouldn't be affected.
Diffstat (limited to 'src/radeon_probe.h')
-rw-r--r-- | src/radeon_probe.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/radeon_probe.h b/src/radeon_probe.h index 77d7e86..b3666eb 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.11 2003/07/02 17:31:30 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h,v 1.13 2003/10/30 17:37:00 tsi Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and * VA Linux Systems Inc., Fremont, California. @@ -60,9 +60,9 @@ typedef struct ScrnInfoPtr pPrimaryScrn; int MonType1; - int MonType2; + int MonType2; xf86MonPtr MonInfo1; - xf86MonPtr MonInfo2; + xf86MonPtr MonInfo2; Bool ReversedDAC; /* TVDAC used as primary dac */ Bool ReversedTMDS; /* DDC_DVI is used for external TMDS */ } RADEONEntRec, *RADEONEntPtr; @@ -100,10 +100,14 @@ extern void RADEONLeaveVT FunctionPrototype((int, int)); extern void RADEONFreeScreen FunctionPrototype((int, int)); -extern int RADEONValidMode +extern ModeStatus RADEONValidMode FunctionPrototype((int, DisplayModePtr, Bool, int)); -extern const OptionInfoRec RADEONOptions[]; +extern OptionInfoRec * RADEONOptionsWeak + FunctionPrototype((void)); + +extern void RADEONFillInScreenInfo + FunctionPrototype((ScrnInfoPtr)); #endif /* _RADEON_PROBE_H_ */ |