- Remove $FreeBSD$ tags as they weren't too useful and merges are now being

    done through perforce.
- Add copyright headers to drm_os_*bsd.h, still need to research the other
    copyright-less files better.

27 files changed, 67 insertions, 32 deletions

diff --git a/bsd/Makefile b/bsd/Makefile
index 6281b00c..04058648 100644
--- a/bsd/Makefile
+++ b/bsd/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 # i810, i830 & sis are not complete
 SUBDIR = mga r128 radeon tdfx # i810 i830 sis gamma
 
diff --git a/bsd/Makefile.bsd b/bsd/Makefile.bsd
index 6281b00c..04058648 100644
--- a/bsd/Makefile.bsd
+++ b/bsd/Makefile.bsd
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 # i810, i830 & sis are not complete
 SUBDIR = mga r128 radeon tdfx # i810 i830 sis gamma
 
diff --git a/bsd/ati_pcigart.h b/bsd/ati_pcigart.h
index b5fe35c8..0a05dda6 100644
--- a/bsd/ati_pcigart.h
+++ b/bsd/ati_pcigart.h
@@ -26,7 +26,6 @@
  * Authors:
  *   Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/ati_pcigart.h,v 1.1 2003/03/09 02:08:28 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/bsd/drm.h b/bsd/drm.h
index df2fa246..b66b2426 100644
--- a/bsd/drm.h
+++ b/bsd/drm.h
@@ -30,7 +30,6 @@
  * Acknowledgements:
  * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg.
  *
- * $FreeBSD: src/sys/dev/drm/drm.h,v 1.3 2003/03/09 02:08:28 anholt Exp $
  */
 
 #ifndef _DRM_H_
diff --git a/bsd/drmP.h b/bsd/drmP.h
index c417a0ab..ff4cd895 100644
--- a/bsd/drmP.h
+++ b/bsd/drmP.h
@@ -27,7 +27,7 @@
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
- * $FreeBSD: src/sys/dev/drm/drmP.h,v 1.4 2003/04/25 01:18:46 anholt Exp $
+ *
  */
 
 #ifndef _DRM_P_H_
diff --git a/bsd/drm_agpsupport.h b/bsd/drm_agpsupport.h
index 71d91e91..7e290b87 100644
--- a/bsd/drm_agpsupport.h
+++ b/bsd/drm_agpsupport.h
@@ -27,7 +27,7 @@
  * Author:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
- * $FreeBSD: src/sys/dev/drm/drm_agpsupport.h,v 1.2 2003/03/09 02:08:28 anholt Exp $
+ *
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_auth.h b/bsd/drm_auth.h
index c506ee7e..67ab6a12 100644
--- a/bsd/drm_auth.h
+++ b/bsd/drm_auth.h
@@ -27,7 +27,7 @@
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
- * $FreeBSD: src/sys/dev/drm/drm_auth.h,v 1.3 2003/03/09 02:08:28 anholt Exp $
+ *
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_bufs.h b/bsd/drm_bufs.h
index 9ed35eba..645698cc 100644
--- a/bsd/drm_bufs.h
+++ b/bsd/drm_bufs.h
@@ -27,7 +27,7 @@
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
- * $FreeBSD: src/sys/dev/drm/drm_bufs.h,v 1.5 2003/04/25 01:18:46 anholt Exp $
+ *
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_context.h b/bsd/drm_context.h
index d1a021a6..b4ec3bc3 100644
--- a/bsd/drm_context.h
+++ b/bsd/drm_context.h
@@ -27,7 +27,7 @@
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
- * $FreeBSD: src/sys/dev/drm/drm_context.h,v 1.4 2003/04/25 01:18:46 anholt Exp $
+ *
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_dma.h b/bsd/drm_dma.h
index accbb7fd..ec17d557 100644
--- a/bsd/drm_dma.h
+++ b/bsd/drm_dma.h
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.5 2003/04/25 01:18:46 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_drawable.h b/bsd/drm_drawable.h
index 25dfc6d9..890de1fb 100644
--- a/bsd/drm_drawable.h
+++ b/bsd/drm_drawable.h
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/drm_drawable.h,v 1.2 2003/03/09 02:08:28 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_drv.h b/bsd/drm_drv.h
index 24878482..8bec4da3 100644
--- a/bsd/drm_drv.h
+++ b/bsd/drm_drv.h
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.13 2003/04/25 01:18:46 anholt Exp $
  */
 
 /*
diff --git a/bsd/drm_fops.h b/bsd/drm_fops.h
index 417c87f3..0ebf6ee4 100644
--- a/bsd/drm_fops.h
+++ b/bsd/drm_fops.h
@@ -29,7 +29,6 @@
  *    Daryll Strauss <daryll@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.7 2003/04/25 01:18:46 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_ioctl.h b/bsd/drm_ioctl.h
index 4297ff83..33146bb5 100644
--- a/bsd/drm_ioctl.h
+++ b/bsd/drm_ioctl.h
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/drm_ioctl.h,v 1.4 2003/04/25 01:18:46 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_lock.h b/bsd/drm_lock.h
index 6d7202d5..a87e0a3a 100644
--- a/bsd/drm_lock.h
+++ b/bsd/drm_lock.h
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/drm_lock.h,v 1.3 2003/04/25 01:18:46 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_memory.h b/bsd/drm_memory.h
index 086b0511..edd9ffa6 100644
--- a/bsd/drm_memory.h
+++ b/bsd/drm_memory.h
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/drm_memory.h,v 1.8 2003/04/25 01:18:46 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_memory_debug.h b/bsd/drm_memory_debug.h
index 422a6f8e..c4bad089 100644
--- a/bsd/drm_memory_debug.h
+++ b/bsd/drm_memory_debug.h
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/drm_memory.h,v 1.8 2003/04/25 01:18:46 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_os_freebsd.h b/bsd/drm_os_freebsd.h
index 560a63f7..acf21f01 100644
--- a/bsd/drm_os_freebsd.h
+++ b/bsd/drm_os_freebsd.h
@@ -1,6 +1,34 @@
+/**
+ * \file drm_os_freebsd.h
+ * OS-specific #defines for FreeBSD
+ * 
+ * \author Eric Anholt <anholt@FreeBSD.org>
+ */
+
 /*
- * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.11 2003/05/31 19:31:46 phk Exp $
+ * Copyright 2003 Eric Anholt
+ * All Rights Reserved.
+ *
+ * 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
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS 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.
  */
+
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/malloc.h>
diff --git a/bsd/drm_os_netbsd.h b/bsd/drm_os_netbsd.h
index b02eadd8..8053f874 100644
--- a/bsd/drm_os_netbsd.h
+++ b/bsd/drm_os_netbsd.h
@@ -1,3 +1,35 @@
+/**
+ * \file drm_os_netbsd.h
+ * OS-specific #defines for NetBSD
+ * 
+ * \author Eric Anholt <anholt@FreeBSD.org>
+ * \author Erik Reid <reide@canuck.com>
+ */
+
+/*
+ * Copyright 2003 Eric Anholt
+ * All Rights Reserved.
+ *
+ * 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
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS 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.
+ */
+
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/malloc.h>
diff --git a/bsd/drm_scatter.h b/bsd/drm_scatter.h
index e57e5e5b..13213227 100644
--- a/bsd/drm_scatter.h
+++ b/bsd/drm_scatter.h
@@ -25,8 +25,8 @@
  *
  * Authors:
  *   Gareth Hughes <gareth@valinux.com>
+ *   Eric Anholt <anholt@FreeBSD.org>
  *
- * $FreeBSD: src/sys/dev/drm/drm_scatter.h,v 1.4 2003/03/09 02:08:28 anholt Exp $
  */
 
 #include "drmP.h"
diff --git a/bsd/drm_sysctl.h b/bsd/drm_sysctl.h
index 9a89a76e..74190bdb 100644
--- a/bsd/drm_sysctl.h
+++ b/bsd/drm_sysctl.h
@@ -1,6 +1,3 @@
-/*
- * $FreeBSD: src/sys/dev/drm/drm_sysctl.h,v 1.3 2003/04/25 01:18:46 anholt Exp $
- */
 
 #ifdef __FreeBSD__
 
diff --git a/bsd/drm_vm.h b/bsd/drm_vm.h
index 66512fb1..d9ee0b3d 100644
--- a/bsd/drm_vm.h
+++ b/bsd/drm_vm.h
@@ -1,6 +1,3 @@
-/*
- * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.6 2003/04/25 01:18:46 anholt Exp $
- */
 
 #if defined(__FreeBSD__) && __FreeBSD_version >= 500102
 static int DRM(dma_mmap)(dev_t kdev, vm_offset_t offset, vm_paddr_t *paddr, 
diff --git a/bsd/mga_drv.c b/bsd/mga_drv.c
index a6f711da..85520d5c 100644
--- a/bsd/mga_drv.c
+++ b/bsd/mga_drv.c
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.5 2003/04/25 01:18:46 anholt Exp $
  */
 
 #include "mga.h"
diff --git a/bsd/r128_drv.c b/bsd/r128_drv.c
index 0aae76e8..14a8cc5f 100644
--- a/bsd/r128_drv.c
+++ b/bsd/r128_drv.c
@@ -28,7 +28,6 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.5 2003/04/25 01:18:46 anholt Exp $
  */
 
 #include "r128.h"
diff --git a/bsd/radeon_drv.c b/bsd/radeon_drv.c
index 5ad5d4b0..bff87cde 100644
--- a/bsd/radeon_drv.c
+++ b/bsd/radeon_drv.c
@@ -26,7 +26,6 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.6 2003/04/25 01:18:46 anholt Exp $
  */
 
 #include "radeon.h"
diff --git a/bsd/tdfx.h b/bsd/tdfx.h
index 820a52da..4e6db524 100644
--- a/bsd/tdfx.h
+++ b/bsd/tdfx.h
@@ -26,7 +26,6 @@
  * Authors:
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/tdfx.h,v 1.1 2002/04/27 20:47:57 anholt Exp $
  */
 
 #ifndef __TDFX_H__
diff --git a/bsd/tdfx_drv.c b/bsd/tdfx_drv.c
index 0229f698..1c803752 100644
--- a/bsd/tdfx_drv.c
+++ b/bsd/tdfx_drv.c
@@ -29,7 +29,6 @@
  *    Daryll Strauss <daryll@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  *
- * $FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.4 2003/04/25 01:18:46 anholt Exp $
  */
 
 #include "tdfx.h"