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 | 761e6a19501473ca3d7c75514b64a8143bf43d79 (patch) | |
| tree | 389af892c74433e1d5219af582bd47d0d477a48d | |
| parent | cde3b2263ac4c74996792b55449ec949f9dc315d (diff) | |
DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-merge
| -rw-r--r-- | man/sunbw2.man | 8 | ||||
| -rw-r--r-- | src/bw2.h | 2 | ||||
| -rw-r--r-- | src/bw2_driver.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/man/sunbw2.man b/man/sunbw2.man index 7520e17..ac05ccf 100644 --- a/man/sunbw2.man +++ b/man/sunbw2.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.1 2001/01/24 00:06:28 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.2 2001/01/27 18:20:53 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH SUNBW2 __drivermansuffix__ __vendorversion__ @@ -14,17 +14,17 @@ sunbw2 \- BW2 video driver .fi .SH DESCRIPTION .B sunbw2 -is an __xservername__ driver for Sun BW2 video cards. +is an XFree86 driver for Sun BW2 video cards. THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE The .B sunbw2 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/sunbw2/bw2.h,v 1.1 2000/06/30 17:15:13 dawes Exp $ */ #ifndef BW2_H #define BW2_H diff --git a/src/bw2_driver.c b/src/bw2_driver.c index e6bd2a9..00b0072 100644 --- a/src/bw2_driver.c +++ b/src/bw2_driver.c @@ -52,8 +52,8 @@ static void BW2AdjustFrame(int scrnIndex, int x, int y, int flags); /* Optional functions */ static void BW2FreeScreen(int scrnIndex, int flags); -static ModeStatus BW2ValidMode(int scrnIndex, DisplayModePtr mode, - Bool verbose, int flags); +static int BW2ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, + int flags); void BW2Sync(ScrnInfoPtr pScrn); @@ -96,7 +96,7 @@ static XF86ModuleVersionInfo sunbw2VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XORG_VERSION_CURRENT, + XF86_VERSION_CURRENT, BW2_MAJOR_VERSION, BW2_MINOR_VERSION, BW2_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, @@ -555,7 +555,7 @@ BW2FreeScreen(int scrnIndex, int flags) /* Checks if a mode is suitable for the selected chipset. */ /* Optional */ -static ModeStatus +static int BW2ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { if (mode->Flags & V_INTERLACE) |