From 52e7b836160f07d14f2286cc21a39a7ff9fdb76f Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:11 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich). --- README.sgml | 26 +++++++++++++------------- man/apm.man | 2 +- src/apm.h | 2 +- src/apm_accel.c | 2 +- src/apm_cursor.c | 2 +- src/apm_dga.c | 2 +- src/apm_driver.c | 2 +- src/apm_funcs.c | 2 +- src/apm_i2c.c | 2 +- src/apm_regs.h | 2 +- src/apm_rush.c | 2 +- src/apm_video.c | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.sgml b/README.sgml index ba081fd..edb7f31 100644 --- a/README.sgml +++ b/README.sgml @@ -20,8 +20,8 @@ graphics chipsets. The following chipsets are supported: 6422 - Old chipset. The driver is still very unstable, including computer - crashes. You would prefer using XFree86 3.3.x for this chipset. + Old chipset. The driver is still very unstable and has computer + crashes. You should use XFree86 3.3.x for this chipset. AT24 @@ -63,16 +63,16 @@ Full DGA 2.0 support with framebuffer access and drawing acceleration. Video

-A limited hardware support for video decoding on AT24 and AT25/3D. It can -display an image in YUV colours inside the desktop. There are some more exotic -formats (YUV 4.1.1, YUV 4.0.0, RGB 8,16.32bpp). +It has limited hardware support for video decoding on the AT24 and AT25/3D. It can +also display an image in YUV colours inside the desktop. There are some more exotic +formats such as YUV 4.1.1, YUV 4.0.0 and RGB 8,16.32bpp. Shadow framebuffer

-There is a mode, called shadow framebuffer, where the graphics is only used +There is a mode, called shadow framebuffer, where the graphics are used to display the images. All rendering is done in memory in a so-called shadow framebuffer. This mode is useful if you need lots of reading in the video -memory. You will have to put +memory and to use it you will have to put Option "ShadowFB" @@ -81,7 +81,7 @@ in your XF86Config file. Configuration

-First: Please run the xf86config program to create a correct +First: Run the xf86config program to create a correct configuration. You can turn off hardware cursor by inserting the following line in the @@ -101,12 +101,12 @@ Or turn off MMIO Option "nolinear" -Please don't specify the amount of video RAM you have or which chipset -you have in the config file, let the driver probe for this. Also please +Do not specify either the amount of video RAM or which chipset +in the config file. It is better to let the driver probe for this. Also don't put any "clocks" line in the device section since these chips have -a fully programmable clock that can take (almost) any modeline you throw -at it. It might fail at some specific clock values but you should just -try a slightly different clock and it should work. +a fully programmable clock that can almost take any modeline you throw +at it. It might though fail at some specific clock values but in that case +you should just try a slightly different clock and it should work. glide2x

diff --git a/man/apm.man b/man/apm.man index cb206c1..035f7b0 100644 --- a/man/apm.man +++ b/man/apm.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man,v 1.3 2002/05/07 12:53:49 alanh Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man,v 1.2 2001/01/27 18:20:46 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH APM __drivermansuffix__ __vendorversion__ diff --git a/src/apm.h b/src/apm.h index ddf9b06..ceeffff 100644 --- a/src/apm.h +++ b/src/apm.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.20 2003/11/03 05:11:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.19tsi Exp $ */ /* All drivers should typically include these */ diff --git a/src/apm_accel.c b/src/apm_accel.c index 72b0cee..b59e2a7 100644 --- a/src/apm_accel.c +++ b/src/apm_accel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v 1.21 2002/10/08 22:14:03 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v 1.20tsi Exp $ */ #include "apm.h" #include "miline.h" diff --git a/src/apm_cursor.c b/src/apm_cursor.c index 6a23341..3f26f0d 100644 --- a/src/apm_cursor.c +++ b/src/apm_cursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.15 2003/10/30 18:37:20 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.14 2000/06/30 18:27:02 dawes Exp $ */ #include "X.h" diff --git a/src/apm_dga.c b/src/apm_dga.c index 3a5f362..88867a9 100644 --- a/src/apm_dga.c +++ b/src/apm_dga.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c,v 1.10 2002/01/25 21:55:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c,v 1.9 2001/01/06 21:29:11 tsi Exp $ */ /* * file: apm_dga.c * ported from s3virge, ported from mga diff --git a/src/apm_driver.c b/src/apm_driver.c index 43ee94e..018a4d5 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v 1.66 2003/10/30 18:37:20 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v 1.65 2003/10/30 17:36:57 tsi Exp $ */ #include "apm.h" #include "xf86cmap.h" diff --git a/src/apm_funcs.c b/src/apm_funcs.c index 2a0e6a6..7bfb5a2 100644 --- a/src/apm_funcs.c +++ b/src/apm_funcs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v 1.19 2003/11/03 05:11:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v 1.18tsi Exp $ */ #define FASTER #ifndef PSZ diff --git a/src/apm_i2c.c b/src/apm_i2c.c index dc250b1..aa45bc7 100644 --- a/src/apm_i2c.c +++ b/src/apm_i2c.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c,v 1.7 2002/01/25 21:55:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c,v 1.6.4.1 2001/11/28 22:35:13 tsi Exp $ */ #include "apm.h" #include "apm_regs.h" diff --git a/src/apm_regs.h b/src/apm_regs.h index 633a1eb..bd4d015 100644 --- a/src/apm_regs.h +++ b/src/apm_regs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h,v 1.8 2002/01/25 21:55:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h,v 1.7 2000/02/29 03:09:18 dawes Exp $ */ diff --git a/src/apm_rush.c b/src/apm_rush.c index c26a0d6..4c5161a 100644 --- a/src/apm_rush.c +++ b/src/apm_rush.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.1.4.1 2003/12/18 19:29:14 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.12 2003/02/12 21:46:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.11tsi Exp $ */ /* * Copyright Loïc Grenié 1999 */ diff --git a/src/apm_video.c b/src/apm_video.c index 5a75be0..dcaa00b 100644 --- a/src/apm_video.c +++ b/src/apm_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c,v 1.12 2003/11/10 18:22:17 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c,v 1.11tsi Exp $ */ #if PSZ != 24 #include "dixstruct.h" -- cgit v1.2.3