summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/VISmoveImage.s2
-rw-r--r--src/ffb.h2
-rw-r--r--src/ffb_accel.c4
-rw-r--r--src/ffb_asm.s2
-rw-r--r--src/ffb_attr.c2
-rw-r--r--src/ffb_bcopy.c2
-rw-r--r--src/ffb_checks.c2
-rw-r--r--src/ffb_circle.c2
-rw-r--r--src/ffb_clip.c2
-rw-r--r--src/ffb_clip.h2
-rw-r--r--src/ffb_cplane.c2
-rw-r--r--src/ffb_cursor.c2
-rw-r--r--src/ffb_dac.c2
-rw-r--r--src/ffb_dac.h2
-rw-r--r--src/ffb_dbe.c2
-rw-r--r--src/ffb_ddc.c2
-rw-r--r--src/ffb_dga.c2
-rw-r--r--src/ffb_dri.c2
-rw-r--r--src/ffb_drishare.h2
-rw-r--r--src/ffb_driver.c8
-rw-r--r--src/ffb_fifo.h2
-rw-r--r--src/ffb_frect.c2
-rw-r--r--src/ffb_fspans.c2
-rw-r--r--src/ffb_gc.c2
-rw-r--r--src/ffb_gc.h2
-rw-r--r--src/ffb_glyph.c2
-rw-r--r--src/ffb_gspans.c2
-rw-r--r--src/ffb_line.c2
-rw-r--r--src/ffb_loops.h2
-rw-r--r--src/ffb_plygon.c2
-rw-r--r--src/ffb_point.c2
-rw-r--r--src/ffb_rcache.h2
-rw-r--r--src/ffb_rect.c2
-rw-r--r--src/ffb_regs.h2
-rw-r--r--src/ffb_seg.c2
-rw-r--r--src/ffb_sspans.c2
-rw-r--r--src/ffb_stip.c2
-rw-r--r--src/ffb_stip.h2
-rw-r--r--src/ffb_stubs.c2
-rw-r--r--src/ffb_wid.c2
-rw-r--r--src/ffb_wline.c2
-rw-r--r--src/ffb_zeroarc.c2
42 files changed, 46 insertions, 46 deletions
diff --git a/src/VISmoveImage.s b/src/VISmoveImage.s
index f307173..43815f5 100644
--- a/src/VISmoveImage.s
+++ b/src/VISmoveImage.s
@@ -21,7 +21,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: xc/programs/Xserver/hw/xfree86/drivers/sunffb/VISmoveImage.s,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/VISmoveImage.s,v 1.2 2000/05/23 04:47:43 dawes Exp $ */
/* NOTE NOTE NOTE: All loads in these routines _MUST_ be 64-byte block
diff --git a/src/ffb.h b/src/ffb.h
index 033ca77..af54db2 100644
--- a/src/ffb.h
+++ b/src/ffb.h
@@ -24,7 +24,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb.h,v 1.7tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb.h,v 1.8 2002/12/06 02:44:03 tsi Exp $ */
#ifndef FFB_H
#define FFB_H
diff --git a/src/ffb_accel.c b/src/ffb_accel.c
index f101739..80c2d5c 100644
--- a/src/ffb_accel.c
+++ b/src/ffb_accel.c
@@ -24,7 +24,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c,v 1.6tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c,v 1.6 2003/06/23 17:35:48 eich Exp $ */
#include "scrnintstr.h"
#include "pixmapstr.h"
@@ -457,7 +457,7 @@ CreatorCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
FFBLOG(("CreatorCopyWindow: WIN(%p)\n", pWin));
- REGION_NULL(pScreen, &rgnDst);
+ REGION_INIT(pScreen, &rgnDst, NullBox, 0);
dx = ptOldOrg.x - pWin->drawable.x;
dy = ptOldOrg.y - pWin->drawable.y;
diff --git a/src/ffb_asm.s b/src/ffb_asm.s
index dfc59be..37ca92e 100644
--- a/src/ffb_asm.s
+++ b/src/ffb_asm.s
@@ -22,7 +22,7 @@
* 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/sunffb/ffb_asm.s,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
/* Hardware register offsets */
#define FFB_BY 0x0060
diff --git a/src/ffb_attr.c b/src/ffb_attr.c
index bd40e7d..c3baf31 100644
--- a/src/ffb_attr.c
+++ b/src/ffb_attr.c
@@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_attr.c,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_attr.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
#include "ffb.h"
#include "ffb_fifo.h"
diff --git a/src/ffb_bcopy.c b/src/ffb_bcopy.c
index 195eac3..6de0eac 100644
--- a/src/ffb_bcopy.c
+++ b/src/ffb_bcopy.c
@@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_bcopy.c,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_bcopy.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_checks.c b/src/ffb_checks.c
index 2517f04..d809aa6 100644
--- a/src/ffb_checks.c
+++ b/src/ffb_checks.c
@@ -23,7 +23,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_checks.c,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_checks.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_circle.c b/src/ffb_circle.c
index bd8ea0d..5c46b01 100644
--- a/src/ffb_circle.c
+++ b/src/ffb_circle.c
@@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_circle.c,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_circle.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_clip.c b/src/ffb_clip.c
index ae24b79..2369381 100644
--- a/src/ffb_clip.c
+++ b/src/ffb_clip.c
@@ -22,7 +22,7 @@
* 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/sunffb/ffb_clip.c,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_clip.h b/src/ffb_clip.h
index 85cd4d9..b90655b 100644
--- a/src/ffb_clip.h
+++ b/src/ffb_clip.h
@@ -22,7 +22,7 @@
* 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/sunffb/ffb_clip.h,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
#ifndef FFBCLIP_H
#define FFBCLIP_H
diff --git a/src/ffb_cplane.c b/src/ffb_cplane.c
index 5f5a2e0..6a75d34 100644
--- a/src/ffb_cplane.c
+++ b/src/ffb_cplane.c
@@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cplane.c,v 1.2tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cplane.c,v 1.3 2003/07/19 13:22:29 tsi Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_cursor.c b/src/ffb_cursor.c
index f3a9517..3fc2292 100644
--- a/src/ffb_cursor.c
+++ b/src/ffb_cursor.c
@@ -23,7 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cursor.c,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cursor.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
#include "ffb.h"
diff --git a/src/ffb_dac.c b/src/ffb_dac.c
index d1e841b..01b746e 100644
--- a/src/ffb_dac.c
+++ b/src/ffb_dac.c
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.c,v 1.3tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.c,v 1.4 2002/12/06 02:44:03 tsi Exp $ */
#include "ffb.h"
#include "ffb_rcache.h"
diff --git a/src/ffb_dac.h b/src/ffb_dac.h
index 3f799b5..b6c4f5d 100644
--- a/src/ffb_dac.h
+++ b/src/ffb_dac.h
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.h,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.h,v 1.2 2001/04/05 17:42:33 dawes Exp $ */
#ifndef _FFB_DAC_H
#define _FFB_DAC_H
diff --git a/src/ffb_dbe.c b/src/ffb_dbe.c
index 52b6943..09395f7 100644
--- a/src/ffb_dbe.c
+++ b/src/ffb_dbe.c
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dbe.c,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dbe.c,v 1.2 2003/02/11 03:19:02 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/src/ffb_ddc.c b/src/ffb_ddc.c
index 6185739..6d1a312 100644
--- a/src/ffb_ddc.c
+++ b/src/ffb_ddc.c
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_ddc.c,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
#include "ffb.h"
diff --git a/src/ffb_dga.c b/src/ffb_dga.c
index 0e6c726..3ba43df 100644
--- a/src/ffb_dga.c
+++ b/src/ffb_dga.c
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c,v 1.2 2000/10/17 16:53:17 tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/ffb_dri.c b/src/ffb_dri.c
index c5e624f..334bdfd 100644
--- a/src/ffb_dri.c
+++ b/src/ffb_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c,v 1.8 2001/04/18 14:52:42 dawes Exp $
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c,v 1.9 2001/05/02 15:06:10 dawes Exp $
* Acceleration for the Creator and Creator3D framebuffer - DRI/DRM support.
*
* Copyright (C) 2000 David S. Miller (davem@redhat.com)
diff --git a/src/ffb_drishare.h b/src/ffb_drishare.h
index 4cb8588..501dd5b 100644
--- a/src/ffb_drishare.h
+++ b/src/ffb_drishare.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h,v 1.2 2000/06/21 00:47:37 dawes Exp $ */
#ifndef _FFB_DRISHARE_H
#define _FFB_DRISHARE_H
diff --git a/src/ffb_driver.c b/src/ffb_driver.c
index 0c3d4ce..8921955 100644
--- a/src/ffb_driver.c
+++ b/src/ffb_driver.c
@@ -58,8 +58,8 @@ static void FFBAdjustFrame(int scrnIndex, int x, int y, int flags);
/* Optional functions */
static void FFBFreeScreen(int scrnIndex, int flags);
-static ModeStatus FFBValidMode(int scrnIndex, DisplayModePtr mode,
- Bool verbose, int flags);
+static int FFBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+ int flags);
static void FFBDPMSMode(ScrnInfoPtr pScrn, int DPMSMode, int flags);
/* ffb_dga.c */
extern void FFB_InitDGA(ScreenPtr pScreen);
@@ -114,7 +114,7 @@ static XF86ModuleVersionInfo sunffbVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XORG_VERSION_CURRENT,
+ XF86_VERSION_CURRENT,
FFB_MAJOR_VERSION, FFB_MINOR_VERSION, FFB_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -1078,7 +1078,7 @@ FFBFreeScreen(int scrnIndex, int flags)
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static ModeStatus
+static int
FFBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
if (mode->Flags & V_INTERLACE)
diff --git a/src/ffb_fifo.h b/src/ffb_fifo.h
index 2a156c7..0957e84 100644
--- a/src/ffb_fifo.h
+++ b/src/ffb_fifo.h
@@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fifo.h,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fifo.h,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
#ifndef FFBFIFO_H
#define FFBFIFO_H
diff --git a/src/ffb_frect.c b/src/ffb_frect.c
index eb1a70d..340efef 100644
--- a/src/ffb_frect.c
+++ b/src/ffb_frect.c
@@ -24,7 +24,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_frect.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_frect.c,v 1.3 2001/04/05 17:42:33 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_fspans.c b/src/ffb_fspans.c
index 88b5c82..4599015 100644
--- a/src/ffb_fspans.c
+++ b/src/ffb_fspans.c
@@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fspans.c,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fspans.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_gc.c b/src/ffb_gc.c
index 59c876c..59cde91 100644
--- a/src/ffb_gc.c
+++ b/src/ffb_gc.c
@@ -24,7 +24,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c,v 1.4 2003/06/23 17:35:48 eich Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_gc.h b/src/ffb_gc.h
index 7fd45a2..3e62269 100644
--- a/src/ffb_gc.h
+++ b/src/ffb_gc.h
@@ -24,7 +24,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.h,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.h,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
#ifndef FFBGC_H
#define FFBGC_H
diff --git a/src/ffb_glyph.c b/src/ffb_glyph.c
index eae88a4..76668e3 100644
--- a/src/ffb_glyph.c
+++ b/src/ffb_glyph.c
@@ -24,7 +24,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_glyph.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_glyph.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_gspans.c b/src/ffb_gspans.c
index 99f1042..5c00cb7 100644
--- a/src/ffb_gspans.c
+++ b/src/ffb_gspans.c
@@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gspans.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gspans.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_line.c b/src/ffb_line.c
index a98b1c1..e94fd03 100644
--- a/src/ffb_line.c
+++ b/src/ffb_line.c
@@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_line.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_line.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_loops.h b/src/ffb_loops.h
index c61e1dd..efb14c3 100644
--- a/src/ffb_loops.h
+++ b/src/ffb_loops.h
@@ -23,7 +23,7 @@
* IN THE SOFTWARE.
*
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_loops.h,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
#ifndef FFBLOOPS_H
#define FFBLOOPS_H
diff --git a/src/ffb_plygon.c b/src/ffb_plygon.c
index c51e71a..933b15f 100644
--- a/src/ffb_plygon.c
+++ b/src/ffb_plygon.c
@@ -23,7 +23,7 @@
* IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_plygon.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_plygon.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_point.c b/src/ffb_point.c
index 9a9bc0e..407f22c 100644
--- a/src/ffb_point.c
+++ b/src/ffb_point.c
@@ -23,7 +23,7 @@
* IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_point.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_point.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_rcache.h b/src/ffb_rcache.h
index 09e0f3f..5beb23e 100644
--- a/src/ffb_rcache.h
+++ b/src/ffb_rcache.h
@@ -23,7 +23,7 @@
* IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rcache.h,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rcache.h,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#ifndef FFBRCACHE_H
#define FFBRCACHE_H
diff --git a/src/ffb_rect.c b/src/ffb_rect.c
index bde38be..30ef015 100644
--- a/src/ffb_rect.c
+++ b/src/ffb_rect.c
@@ -21,7 +21,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: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rect.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rect.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#define PSZ 32
diff --git a/src/ffb_regs.h b/src/ffb_regs.h
index 27e2092..7f383d3 100644
--- a/src/ffb_regs.h
+++ b/src/ffb_regs.h
@@ -24,7 +24,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_regs.h,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
#ifndef FFBREGS_H
#define FFBREGS_H
diff --git a/src/ffb_seg.c b/src/ffb_seg.c
index a5fe99f..930632f 100644
--- a/src/ffb_seg.c
+++ b/src/ffb_seg.c
@@ -23,7 +23,7 @@
* IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_seg.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_seg.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_sspans.c b/src/ffb_sspans.c
index 721e6fb..3d4b2ae 100644
--- a/src/ffb_sspans.c
+++ b/src/ffb_sspans.c
@@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_sspans.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_sspans.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_stip.c b/src/ffb_stip.c
index 7744f15..d79b232 100644
--- a/src/ffb_stip.c
+++ b/src/ffb_stip.c
@@ -23,7 +23,7 @@
* IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.c,v 1.1 2000/05/18 23:21:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_stip.h b/src/ffb_stip.h
index ef8935a..3d490d0 100644
--- a/src/ffb_stip.h
+++ b/src/ffb_stip.h
@@ -23,7 +23,7 @@
* IN THE SOFTWARE.
*
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.h,v 1.1 2000/05/18 23:21:38 dawes Exp $ */
#ifndef FFBSTIP_H
#define FFBSTIP_H
diff --git a/src/ffb_stubs.c b/src/ffb_stubs.c
index e5c3a78..aa01018 100644
--- a/src/ffb_stubs.c
+++ b/src/ffb_stubs.c
@@ -22,7 +22,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stubs.c,v 1.1 2000/05/18 23:21:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stubs.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"
diff --git a/src/ffb_wid.c b/src/ffb_wid.c
index b2a1391..f84c0bc 100644
--- a/src/ffb_wid.c
+++ b/src/ffb_wid.c
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wid.c,v 1.2 2000/06/20 05:08:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wid.c,v 1.3 2000/12/01 00:24:34 dawes Exp $ */
#include "ffb.h"
diff --git a/src/ffb_wline.c b/src/ffb_wline.c
index c24b640..feb8034 100644
--- a/src/ffb_wline.c
+++ b/src/ffb_wline.c
@@ -23,7 +23,7 @@
* IN THE SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wline.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wline.c,v 1.3 2001/03/03 22:41:34 tsi Exp $ */
#define PSZ 32
diff --git a/src/ffb_zeroarc.c b/src/ffb_zeroarc.c
index 7147989..86b5876 100644
--- a/src/ffb_zeroarc.c
+++ b/src/ffb_zeroarc.c
@@ -24,7 +24,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_zeroarc.c,v 1.1 2000/05/18 23:21:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_zeroarc.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
#include "ffb.h"
#include "ffb_regs.h"