From 8741432f6ad40f6091e0044e3a113845233b5275 Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 17 Mar 2004 20:30:38 +0000 Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) --- README.sgml | 2 +- man/chips.man | 2 +- src/ct_BlitMM.h | 2 +- src/ct_Blitter.h | 2 +- src/ct_BltHiQV.h | 2 +- src/ct_accel.c | 2 +- src/ct_bank.c | 9 ++++++--- src/ct_cursor.c | 2 +- src/ct_ddc.c | 2 +- src/ct_dga.c | 2 +- src/ct_driver.c | 2 +- src/ct_driver.h | 2 +- src/ct_regs.c | 2 +- src/ct_shadow.c | 2 +- src/ct_video.c | 2 +- util/AsmMacros.h | 2 +- util/dRegs.c | 2 +- util/mRegs.c | 2 +- util/modClock.c | 2 +- 19 files changed, 24 insertions(+), 21 deletions(-) diff --git a/README.sgml b/README.sgml index 4edd1cf..c7a1b68 100644 --- a/README.sgml +++ b/README.sgml @@ -11,7 +11,7 @@ 1st January 2001 -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml,v 3.38 2001/10/01 13:44:02 eich Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml,v 3.36 2001/05/19 00:35:42 dawes Exp $ diff --git a/man/chips.man b/man/chips.man index ad05ba6..e69383f 100644 --- a/man/chips.man +++ b/man/chips.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/chips.man,v 1.5 2002/01/04 21:22:27 tsi Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/chips.man,v 1.4 2001/12/17 20:52:32 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH CHIPS __drivermansuffix__ __vendorversion__ diff --git a/src/ct_BlitMM.h b/src/ct_BlitMM.h index 7660241..fb1c4e7 100644 --- a/src/ct_BlitMM.h +++ b/src/ct_BlitMM.h @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_BlitMM.h,v 1.5 2002/11/25 14:04:58 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_BlitMM.h,v 1.3 1998/08/20 08:55:56 dawes Exp $ */ /* Definitions for the Chips and Technology BitBLT engine communication. */ /* These are done using Memory Mapped IO, of the registers */ diff --git a/src/ct_Blitter.h b/src/ct_Blitter.h index ecb84f1..65b0989 100644 --- a/src/ct_Blitter.h +++ b/src/ct_Blitter.h @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_Blitter.h,v 1.4 2002/01/25 21:55:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_Blitter.h,v 1.3 1998/08/29 05:43:06 dawes Exp $ */ /* Definitions for the Chips and Technology BitBLT engine communication. */ /* registers */ diff --git a/src/ct_BltHiQV.h b/src/ct_BltHiQV.h index 6f135bd..b40df72 100644 --- a/src/ct_BltHiQV.h +++ b/src/ct_BltHiQV.h @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_BltHiQV.h,v 1.12 2002/11/25 14:04:58 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_BltHiQV.h,v 1.10 2000/12/06 15:35:12 eich Exp $ */ /* Definitions for the Chips and Technology BitBLT engine communication. */ /* These are done using Memory Mapped IO, of the registers */ diff --git a/src/ct_accel.c b/src/ct_accel.c index 9bf4c55..6309074 100644 --- a/src/ct_accel.c +++ b/src/ct_accel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_accel.c,v 1.41 2003/11/03 05:11:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_accel.c,v 1.40tsi Exp $ */ /* * Copyright 1996, 1997, 1998 by David Bateman * Modified 1997, 1998 by Nozomi Ytow diff --git a/src/ct_bank.c b/src/ct_bank.c index 1e478ee..3be2776 100644 --- a/src/ct_bank.c +++ b/src/ct_bank.c @@ -53,12 +53,15 @@ /* Driver specific headers */ #include "ct_driver.h" -#ifdef __arm32__ -/*#include */ +#if defined(__arm32__) && defined(__NetBSD__) +#include #define arm32_drain_writebuf() sysarch(1, 0) -#define ChipsBank(pScreen) CHIPSPTR(xf86Screens[pScreen->myNum])->Bank +#elif defined(__arm32__) +#define arm32_drain_writebuf() #endif +#define ChipsBank(pScreen) CHIPSPTR(xf86Screens[pScreen->myNum])->Bank + #ifdef DIRECT_REGISTER_ACCESS int CHIPSSetRead(ScreenPtr pScreen, int bank) diff --git a/src/ct_cursor.c b/src/ct_cursor.c index 55b56a3..147469c 100644 --- a/src/ct_cursor.c +++ b/src/ct_cursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c,v 1.28 2003/07/17 08:19:34 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c,v 1.24 2001/10/01 13:44:03 eich Exp $ */ /* * Copyright 1994 The XFree86 Project diff --git a/src/ct_ddc.c b/src/ct_ddc.c index 323dfe9..3cc8dfe 100644 --- a/src/ct_ddc.c +++ b/src/ct_ddc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c,v 1.9 2003/09/24 02:43:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c,v 1.8 2001/05/09 19:57:04 dbateman Exp $ */ /* All drivers should typically include these */ #include "xf86.h" diff --git a/src/ct_dga.c b/src/ct_dga.c index 3d0fe26..7cc3575 100644 --- a/src/ct_dga.c +++ b/src/ct_dga.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_dga.c,v 1.5 2002/11/25 14:04:58 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_dga.c,v 1.3tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/ct_driver.c b/src/ct_driver.c index a39ba2e..6d8593c 100644 --- a/src/ct_driver.c +++ b/src/ct_driver.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c,v 1.133 2003/11/03 05:11:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c,v 1.132tsi Exp $ */ /* * Copyright 1993 by Jon Block diff --git a/src/ct_driver.h b/src/ct_driver.h index 8a66353..293c32f 100644 --- a/src/ct_driver.h +++ b/src/ct_driver.h @@ -22,7 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.h,v 1.35 2003/10/08 15:48:39 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.h,v 1.33 2001/10/01 13:44:04 eich Exp $ */ #ifndef _CT_DRIVER_H_ diff --git a/src/ct_regs.c b/src/ct_regs.c index 99e5791..b7a7199 100644 --- a/src/ct_regs.c +++ b/src/ct_regs.c @@ -19,7 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c,v 1.9 2003/11/03 05:11:09 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c,v 1.8tsi Exp $ */ /* * The functions in this file are used to read/write the C&T extension register diff --git a/src/ct_shadow.c b/src/ct_shadow.c index ecbb642..98bdb8f 100644 --- a/src/ct_shadow.c +++ b/src/ct_shadow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_shadow.c,v 1.1 2000/02/08 13:13:13 eich Exp $ */ +/* $XFree86: Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/ct_video.c b/src/ct_video.c index 666000c..e1704ba 100644 --- a/src/ct_video.c +++ b/src/ct_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c,v 1.17 2003/11/10 18:22:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c,v 1.16tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/util/AsmMacros.h b/util/AsmMacros.h index feb5ce0..24070b9 100644 --- a/util/AsmMacros.h +++ b/util/AsmMacros.h @@ -57,7 +57,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/AsmMacros.h,v 1.1 2001/11/16 21:13:34 tsi Exp $ */ +/* $XFree86$ */ #if defined(__GNUC__) #if defined(linux) && (defined(__alpha__) || defined(__ia64__)) diff --git a/util/dRegs.c b/util/dRegs.c index 0c8ee62..51a384b 100644 --- a/util/dRegs.c +++ b/util/dRegs.c @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/dRegs.c,v 1.9 2001/11/16 21:13:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/dRegs.c,v 1.8 2001/10/01 13:44:04 eich Exp $ */ #ifdef __NetBSD__ # include diff --git a/util/mRegs.c b/util/mRegs.c index 4d8da11..b1688de 100644 --- a/util/mRegs.c +++ b/util/mRegs.c @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.6 2001/11/16 21:13:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.5 2000/10/23 12:10:13 alanh Exp $ */ #ifdef __NetBSD__ # include diff --git a/util/modClock.c b/util/modClock.c index cce4f84..48a1961 100644 --- a/util/modClock.c +++ b/util/modClock.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/modClock.c,v 1.6 2001/11/16 21:13:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/modClock.c,v 1.5 2001/05/09 19:57:06 dbateman Exp $ */ #ifdef __NetBSD__ # include -- cgit v1.2.3