diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:55 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:55 +0000 |
| commit | 5d7a9acfd861e8d3c80d26576e1336d968a458ca (patch) | |
| tree | 3abb4db7ebf2585dae6fbce13ba183facd8ee4c6 | |
| parent | 71922f77be69323dcb937e8c8e00249d187f581f (diff) | |
DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-merge
| -rw-r--r-- | man/suncg3.man | 8 | ||||
| -rw-r--r-- | src/cg3.h | 2 | ||||
| -rw-r--r-- | src/cg3_driver.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/man/suncg3.man b/man/suncg3.man index 5182c80..8c1c8f1 100644 --- a/man/suncg3.man +++ b/man/suncg3.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.1 2001/01/24 00:06:29 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/suncg3.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH SUNCG3 __drivermansuffix__ __vendorversion__ @@ -14,17 +14,17 @@ suncg3 \- CG3 video driver .fi .SH DESCRIPTION .B suncg3 -is an __xservername__ driver for Sun CG3 video cards. +is an XFree86 driver for Sun CG3 video cards. THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE The .B suncg3 driver supports... .SH CONFIGURATION DETAILS -Please refer to __xconfigfile__(__filemansuffix__) for general configuration +Please refer to XF86Config(__filemansuffix__) for general configuration details. This section only covers configuration details specific to this driver. .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) +XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) .SH AUTHORS Authors include: Jakub Jelinek <jakub@redhat.com> @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86:$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg3/cg3.h,v 1.1 2000/06/30 17:15:15 dawes Exp $ */ #ifndef CG3_H #define CG3_H diff --git a/src/cg3_driver.c b/src/cg3_driver.c index 60f61bf..12e14e6 100644 --- a/src/cg3_driver.c +++ b/src/cg3_driver.c @@ -53,8 +53,8 @@ static void CG3AdjustFrame(int scrnIndex, int x, int y, int flags); /* Optional functions */ static void CG3FreeScreen(int scrnIndex, int flags); -static ModeStatus CG3ValidMode(int scrnIndex, DisplayModePtr mode, - Bool verbose, int flags); +static int CG3ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, + int flags); void CG3Sync(ScrnInfoPtr pScrn); @@ -97,7 +97,7 @@ static XF86ModuleVersionInfo suncg3VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XORG_VERSION_CURRENT, + XF86_VERSION_CURRENT, CG3_MAJOR_VERSION, CG3_MINOR_VERSION, CG3_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, @@ -565,7 +565,7 @@ CG3FreeScreen(int scrnIndex, int flags) /* Checks if a mode is suitable for the selected chipset. */ /* Optional */ -static ModeStatus +static int CG3ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { if (mode->Flags & V_INTERLACE) |