xserver-xorg-video-voodoo: Changes to 'upstream-experimental'
.gitignore | 70 - COPYING| 52 ++-- ChangeLog | 48 - Makefile.am| 12 +++- configure.ac | 18 man/.cvsignore |2 - man/Makefile.am| 41 +--- man/voodoo.man |2 - src/.cvsignore |6 src/voodoo.h |2 - src/voodoo_dga.c | 10 +++ src/voodoo_driver.c| 62 ++- src/voodoo_hardware.c | 65 - src/voodoo_pcirename.h |6 ++-- 14 files changed, 232 insertions(+), 164 deletions(-) New commits: commit e58d315815dca51b6fcecdeceb267fc8a7cb19e1 Author: Dave Airlie airl...@redhat.com Date: Mon Jul 5 14:39:03 2010 +1000 voodoo 1.2.4 diff --git a/configure.ac b/configure.ac index cdcf752..086c710 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-voodoo], -1.2.3, +1.2.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-voodoo) commit 180ca72baaa7b384cc6a11694bfd9559e1e071f0 Author: Gaetan Nadon mems...@videotron.ca Date: Sun Jun 13 13:16:34 2010 -0400 COPYING: replace stub file with actual Copyright notices. Signed-off-by: Gaetan Nadon mems...@videotron.ca diff --git a/COPYING b/COPYING index 7f33cbf..9694c64 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,48 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright (c) 2000-2002 Ghozlane Toumi gto...@laposte.net -Please submit updated COPYING files to the Xorg bugzilla: +Relicensed from GPL to the X license by consent of the author -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +Other code Alan Cox (c) Copyright 2004 Red Hat Inc. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Red Hat, Alan Cox and Ghozlane Toumi +not be used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. Th authors make no +representations about the suitability of this software for any purpose. +It is provided as is without express or implied warranty. + +THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL RICHARD HECKER BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +THIS SOFTWARE IS NOT DESIGNED FOR USE IN SAFETY CRITICAL SYSTEMS OF +ANY KIND OR FORM. + +Copyright 2007 George Sapountzis + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the Software), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER 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. -http://lists.freedesktop.org/mailman/listinfo/xorg commit 00216334c95b4e055243a1f363071054c9493e47 Author: Adam Jackson a...@redhat.com Date: Tue May 18 13:15:40 2010 -0400 Remove mibank.h reference Signed-off-by: Adam Jackson a...@redhat.com diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c index 622c1f9..5b960e8 100644 --- a/src/voodoo_dga.c +++ b/src/voodoo_dga.c @@ -38,7 +38,6 @@ #endif #include fb.h -#include mibank.h #include micmap.h #include xf86.h #include xf86_OSproc.h
xserver-xorg-video-voodoo: Changes to 'upstream-experimental'
.cvsignore | 19 ---
.gitignore | 20
configure.ac | 17 ++
man/Makefile.am|1
src/Makefile.am|1
src/voodoo.h |1
src/voodoo_driver.c| 42 ++--
src/voodoo_hardware.c |9 ++-
src/voodoo_pcirename.h | 122 +
9 files changed, 200 insertions(+), 32 deletions(-)
New commits:
commit 7ff6addc069e46060fb0cc8bb8d015d34c90533e
Author: Adam Jackson [EMAIL PROTECTED]
Date: Wed Mar 19 17:09:04 2008 -0400
voodoo 1.2.0
diff --git a/configure.ac b/configure.ac
index 1f7e09e..b7cc28c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
-1.1.1,
+1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
commit b5b0845ed8ef7a2fa2e771961c1155f32258392e
Author: Adam Jackson [EMAIL PROTECTED]
Date: Wed Mar 19 17:07:12 2008 -0400
Death to RCS tags.
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index 7bb15e8..5ad741e 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -39,7 +39,6 @@
* ANY KIND OR FORM.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/voodoo/voodoo_driver.c,v
1.27 2001/08/07 07:04:46 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
commit 8d0a15ff1ee1153175e6049b9cebea0c4f14dd2c
Author: Adam Jackson [EMAIL PROTECTED]
Date: Wed Mar 19 17:07:10 2008 -0400
Fix distcheck
diff --git a/src/Makefile.am b/src/Makefile.am
index b3a34f9..5eb704e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,4 +32,5 @@ voodoo_drv_la_SOURCES = \
voodoo_dga.c \
voodoo_driver.c \
voodoo.h \
+voodoo_pcirename.h \
voodoo_hardware.c
commit 51b6eec500f23e4c9a012a1ab4fe9b4012bc3703
Author: Dave Airlie [EMAIL PROTECTED]
Date: Mon Mar 10 15:21:01 2008 +1000
voodoo: finish pciaccess conversion
thanks to pcpa for pointing these out
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index a70b389..7bb15e8 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -265,7 +265,10 @@ VoodooProbe(DriverPtr drv, int flags)
}
/* PCI BUS */
-if (xf86GetPciVideoInfo() ) {
+#ifndef XSERVER_LIBPCIACCESS
+if (xf86GetPciVideoInfo() )
+#endif
+{
numUsed = xf86MatchPciInstances(VOODOO_NAME, PCI_VENDOR_3DFX,
VoodooChipsets, VoodooPCIChipsets,
devSections,numDevSections,
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index c943ab4..82efaf3 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -145,12 +145,13 @@ static void wait_idle(VoodooPtr pVoo)
static void pci_enable(VoodooPtr pVoo, int wr, int dac, int fifo)
{
- CARD32 x = pciReadLong(pVoo-PciTag, 0x40);
+ CARD32 x;
+ PCI_READ_LONG(pVoo-PciInfo, x, 0x40);
x = ~7;
x |= wr;
x |= fifo1;
x |= dac2;
- pciWriteLong(pVoo-PciTag, 0x40, x);
+ PCI_WRITE_LONG(pVoo-PciInfo, x, 0x40);
}
/*
@@ -160,9 +161,9 @@ static void pci_enable(VoodooPtr pVoo, int wr, int dac, int
fifo)
static void vclock_enable(VoodooPtr pVoo, int enable)
{
if(enable)
- pciWriteLong(pVoo-PciTag, 0xC0, 0);
+ PCI_WRITE_LONG(pVoo-PciInfo, 0, 0xc0);
else
- pciWriteLong(pVoo-PciTag, 0xE0, 0);
+ PCI_WRITE_LONG(pVoo-PciInfo, 0, 0xe0);
}
/*
commit 5d60be68f07479e54b2efeea31e82f858f0d116b
Author: Matthieu Herrb [EMAIL PROTECTED]
Date: Sun Mar 9 00:10:07 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit 2a2703732fb045f2f87d80eb56c8d9c1a58031f2
Author: Dave Airlie [EMAIL PROTECTED]
Date: Wed Feb 27 14:09:59 2008 +1000
oops forgot pcirename file
diff --git a/src/voodoo_pcirename.h b/src/voodoo_pcirename.h
new file mode 100644
index 000..c93988a
--- /dev/null
+++ b/src/voodoo_pcirename.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the Software),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY
xserver-xorg-video-voodoo: Changes to 'upstream-experimental'
man/voodoo.man |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f7710d5ec173626edbbbc3e00717cf8b36f0eb1c Author: Alan Coopersmith [EMAIL PROTECTED] Date: Thu Mar 1 11:11:28 2007 -0800 Replace references to XFree86/XF86Config in man page diff --git a/man/voodoo.man b/man/voodoo.man index 82a3a3f..8e828df 100644 --- a/man/voodoo.man +++ b/man/voodoo.man @@ -14,7 +14,7 @@ voodoo \- Voodoo video driver .fi .SH DESCRIPTION .B voodoo -is an XFree86 driver for Voodoo 1 and Voodoo 2 series video adapters. +is an __xservername__ driver for Voodoo 1 and Voodoo 2 series video adapters. On the Voodoo 1 the driver uses a shadow buffer in system memory as the video adapter has only 3D acceleration. Selected portions of the shadow framebuffer are copied out to the Voodoo board at the right time. Because @@ -67,6 +67,6 @@ The driver interacts badly with the sstfb frame buffer driver as there is insufficient information to restore the chip to its previous state. .SH SEE ALSO -XFree86(1), __xconfigfile__(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) +__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__) .SH AUTHORS Authors: Alan Cox, Ghozlane Toumi, Henrik Harmsen. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
