diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:50:24 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:50:24 +0000 |
commit | 805fdbee866c446db7c3308dd5eca6dee7398831 (patch) | |
tree | e50166dc5bb76a781513bf729b88c08b5e4598f9 | |
parent | ae0914702bc161afee041ba2abcdb61b1c63d3cb (diff) |
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
-rw-r--r-- | README.sgml | 9 | ||||
-rw-r--r-- | src/BT463ramdac.c | 2 | ||||
-rw-r--r-- | src/BTramdac.c | 2 | ||||
-rw-r--r-- | src/IBM561ramdac.c | 2 | ||||
-rw-r--r-- | src/ICS1562.c | 2 | ||||
-rw-r--r-- | src/tga.h | 2 | ||||
-rw-r--r-- | src/tga_accel.c | 2 | ||||
-rw-r--r-- | src/tga_cursor.c | 2 | ||||
-rw-r--r-- | src/tga_dac.c | 2 | ||||
-rw-r--r-- | src/tga_driver.c | 4 | ||||
-rw-r--r-- | src/tga_line.c | 2 | ||||
-rw-r--r-- | src/tga_regs.h | 2 |
12 files changed, 17 insertions, 16 deletions
diff --git a/README.sgml b/README.sgml index 3dba59b..c04cbf4 100644 --- a/README.sgml +++ b/README.sgml @@ -1,14 +1,14 @@ -<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [ +<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [ <!ENTITY % defs SYSTEM "defs.ent"> %defs; ]> <article> <title>Information for DEC 21030 Users (aka TGA) <author>The XFree86 Project, Inc. -<date>March 5th, 2000 +<and>Updates for X11R&relvers; by Jim Gettys +<date>March 25th, 2004 <ident> -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v 3.9 2000/03/06 22:59:23 dawes Exp $ </ident> <toc> @@ -17,7 +17,8 @@ $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v 3.9 2000/03/06 2 <sect>DEC 21030 <p> <itemize> -<item>The DEC 21030 is supported by XFree86 &relvers;. The driver is now +<item>The DEC 21030 is supported by X11R&relvers;. +The driver is now partially accelerated. The built-in graphics on the Multia is supported in 8-plane mode, and PCI cards with 8 or 16 MB framebuffers are supported in 24-plane mode. TGA2 (aka PowerStorm 3D30/4D20) diff --git a/src/BT463ramdac.c b/src/BT463ramdac.c index 44d1f24..c48aead 100644 --- a/src/BT463ramdac.c +++ b/src/BT463ramdac.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/BT463ramdac.c,v 1.1 1998/08/29 05:43:34 dawes Exp $ */ +/* $XFree86$ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/BTramdac.c b/src/BTramdac.c index c2aa06a..52828c7 100644 --- a/src/BTramdac.c +++ b/src/BTramdac.c @@ -24,7 +24,7 @@ * tgaBTOutIndReg() and tgaBTInIndReg() are used to access * the indirect TGA BT RAMDAC registers only. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/BTramdac.c,v 1.5 2000/10/20 12:57:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/BTramdac.c,v 1.4 1999/02/07 11:11:14 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/IBM561ramdac.c b/src/IBM561ramdac.c index c67850a..11aebc7 100644 --- a/src/IBM561ramdac.c +++ b/src/IBM561ramdac.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/IBM561ramdac.c,v 1.4 2003/09/24 02:43:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/IBM561ramdac.c,v 1.3 2001/02/15 11:03:58 alanh Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/ICS1562.c b/src/ICS1562.c index ac72b24..fb3f40e 100644 --- a/src/ICS1562.c +++ b/src/ICS1562.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/ICS1562.c,v 1.3 1999/04/17 07:06:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/ICS1562.c,v 1.2 1998/07/25 16:55:56 dawes Exp $ */ #define BASE_FREQ 14.31818 #define MAX_FREQ 230000 @@ -21,7 +21,7 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga.h,v 1.18 2001/11/21 22:32:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga.h,v 1.17 2001/05/04 19:05:47 dawes Exp $ */ #ifndef _TGA_H_ #define _TGA_H_ diff --git a/src/tga_accel.c b/src/tga_accel.c index 7d1c9dc..433a002 100644 --- a/src/tga_accel.c +++ b/src/tga_accel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_accel.c,v 1.16 2003/09/24 02:43:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_accel.c,v 1.15 2001/11/21 22:32:59 alanh Exp $ */ /* * Copyright 1996,1997 by Alan Hourihane, Wigan, England. diff --git a/src/tga_cursor.c b/src/tga_cursor.c index 1c2d359..9b89a70 100644 --- a/src/tga_cursor.c +++ b/src/tga_cursor.c @@ -25,7 +25,7 @@ * * DEC TGA hardware cursor using BT485 ramdac */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_cursor.c,v 1.2 2000/10/20 12:57:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_cursor.c,v 1.1 1999/04/17 07:06:58 dawes Exp $ */ /* tga_cursor.c */ diff --git a/src/tga_dac.c b/src/tga_dac.c index ec5f866..03b0247 100644 --- a/src/tga_dac.c +++ b/src/tga_dac.c @@ -21,7 +21,7 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_dac.c,v 1.14 2001/10/28 03:33:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_dac.c,v 1.13 2001/02/17 14:18:30 tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/tga_driver.c b/src/tga_driver.c index baa0413..ce7e5b8 100644 --- a/src/tga_driver.c +++ b/src/tga_driver.c @@ -22,7 +22,7 @@ * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> * Matthew Grossman, <mattg@oz.net> - acceleration and misc fixes */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c,v 1.61 2003/11/03 05:11:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c,v 1.60tsi Exp $ */ /* everybody includes these */ #include "xf86.h" @@ -210,7 +210,7 @@ static XF86ModuleVersionInfo tgaVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, TGA_MAJOR_VERSION, TGA_MINOR_VERSION, TGA_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, diff --git a/src/tga_line.c b/src/tga_line.c index b1a510c..3d1696d 100644 --- a/src/tga_line.c +++ b/src/tga_line.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_line.c,v 1.2 1999/12/16 02:26:30 robin Exp $ */ +/* $XFree86: $ */ /* * Copyright 1999 by Matthew Grossman, Seattle, USA. diff --git a/src/tga_regs.h b/src/tga_regs.h index 4bda04a..9e33a53 100644 --- a/src/tga_regs.h +++ b/src/tga_regs.h @@ -21,7 +21,7 @@ * * Author: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_regs.h,v 1.12 2002/05/13 05:22:37 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_regs.h,v 1.11 2000/10/20 12:57:26 alanh Exp $ */ /* TGA hardware description (minimal) * |