Rework iha copyight verbiage to make clear what needs to be clear for

it to remain in the tree. With agreement of Initio.

ok deraadt@

3 files changed, 27 insertions, 55 deletions

diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c
index 08bcad9bad2..29606d0d08d 100644
--- a/sys/dev/ic/iha.c
+++ b/sys/dev/ic/iha.c
@@ -1,9 +1,13 @@
-/*	$OpenBSD: iha.c,v 1.15 2002/10/09 23:43:11 krw Exp $ */
-/*
- * Initio INI-9xxxU/UW SCSI Device Driver
+/*	$OpenBSD: iha.c,v 1.16 2002/11/14 02:31:46 krw Exp $ */
+/*-------------------------------------------------------------------------
+ *
+ * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
  *
- * Copyright (c) 2000-2001 Ken Westerback
- * All rights reserved.
+ * Written for 386bsd and FreeBSD by
+ *	Winston Hung		<winstonh@initio.com>
+ *
+ * Copyright (c) 1997-1999 Initio Corp
+ * Copyright (c) 2000-2002 Ken Westerback
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,19 +31,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  *-------------------------------------------------------------------------
- *
- * Ported from i91u.c, provided by Initio Corporation, which credits:
- *
- * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
- *
- * FreeBSD
- *
- *  Written for 386bsd and FreeBSD by
- *	Winston Hung		<winstonh@initio.com>
- *
- * Copyright (c) 1997-99 Initio Corp.  All rights reserved.
- *
- *-------------------------------------------------------------------------
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/dev/ic/iha.h b/sys/dev/ic/iha.h
index 251c880f778..44bfc6824b2 100644
--- a/sys/dev/ic/iha.h
+++ b/sys/dev/ic/iha.h
@@ -1,9 +1,13 @@
-/*	$OpenBSD: iha.h,v 1.10 2002/03/14 01:26:54 millert Exp $ */
-/*
- * Initio INI-9xxxU/UW SCSI Device Driver
+/*	$OpenBSD: iha.h,v 1.11 2002/11/14 02:31:46 krw Exp $ */
+/*-------------------------------------------------------------------------
+ *
+ * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
  *
- * Copyright (c) 2000-2001 Ken Westerback
- * All rights reserved.
+ * Written for 386bsd and FreeBSD by
+ *	Winston Hung		<winstonh@initio.com>
+ *
+ * Copyright (c) 1997-1999 Initio Corp
+ * Copyright (c) 2000-2002 Ken Westerback
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,20 +31,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  *-------------------------------------------------------------------------
- *
- * Ported from i91uscsi.h, provided by Initio Corporation, which probably
- * came from the same people who provided i91u.c:
- *
- * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
- *
- * FreeBSD
- *
- *  Written for 386bsd and FreeBSD by
- *	Winston Hung		<winstonh@initio.com>
- *
- * Copyright (c) 1997-99 Initio Corp.  All rights reserved.
- *
- *-------------------------------------------------------------------------
  */
 
 #define IHA_MAX_SG_ENTRIES	33
diff --git a/sys/dev/pci/iha_pci.c b/sys/dev/pci/iha_pci.c
index 7df779578bf..228a0d9b6cf 100644
--- a/sys/dev/pci/iha_pci.c
+++ b/sys/dev/pci/iha_pci.c
@@ -1,9 +1,13 @@
-/*	$OpenBSD: iha_pci.c,v 1.7 2002/03/14 01:26:59 millert Exp $ */
-/*
- * Initio INI-9xxxU/UW SCSI Device Driver
+/*	$OpenBSD: iha_pci.c,v 1.8 2002/11/14 02:31:46 krw Exp $ */
+/*-------------------------------------------------------------------------
  *
- * Copyright (c) 2000 Ken Westerback
- * All rights reserved.
+ * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
+ *
+ * Written for 386bsd and FreeBSD by
+ *	Winston Hung		<winstonh@initio.com>
+ *
+ * Copyright (c) 1997-1999 Initio Corp
+ * Copyright (c) 2000-2002 Ken Westerback
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,19 +31,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  *-------------------------------------------------------------------------
- *
- * Ported from i91u.c, provided by Initio Corporation, which credits:
- *
- * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
- *
- * FreeBSD
- *
- *  Written for 386bsd and FreeBSD by
- *	Winston Hung		<winstonh@initio.com>
- *
- * Copyright (c) 1997-99 Initio Corp.  All rights reserved.
- *
- *-------------------------------------------------------------------------
  */
 #include <sys/param.h>
 #include <sys/systm.h>