6756610 Update license comment

8 files changed, 87 insertions, 12 deletions

diff --git a/usr/src/pkgdefs/SUNWbge/Makefile b/usr/src/pkgdefs/SUNWbge/Makefile
index 0a8bee4648..026864b001 100644
--- a/usr/src/pkgdefs/SUNWbge/Makefile
+++ b/usr/src/pkgdefs/SUNWbge/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
+LICENSEFILES += ../../uts/common/io/bge/THIRDPARTYLICENSE
+
 DATAFILES += depend
 
 .KEEP_STATE:
diff --git a/usr/src/uts/common/Makefile.files b/usr/src/uts/common/Makefile.files
index 2decf3e625..aae92677b9 100644
--- a/usr/src/uts/common/Makefile.files
+++ b/usr/src/uts/common/Makefile.files
@@ -1485,7 +1485,7 @@ KMDB_OBJS += kdrv.o
 AFE_OBJS += afe.o
 
 BGE_OBJS += bge_main2.o bge_chip2.o bge_kstats.o bge_log.o bge_ndd.o \
-		bge_atomic.o bge_mii.o bge_send.o bge_recv2.o
+		bge_atomic.o bge_mii.o bge_send.o bge_recv2.o bge_mii_5906.o
 
 DMFE_OBJS += dmfe_log.o dmfe_main.o dmfe_mii.o dmfe_ndd.o
 
diff --git a/usr/src/uts/common/io/bge/THIRDPARTYLICENSE b/usr/src/uts/common/io/bge/THIRDPARTYLICENSE
new file mode 100644
index 0000000000..f51e723ae7
--- /dev/null
+++ b/usr/src/uts/common/io/bge/THIRDPARTYLICENSE
@@ -0,0 +1,29 @@
+ * Copyright (c) 2000
+ *	Bill Paul <wpaul@ee.columbia.edu>.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Bill Paul.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/usr/src/uts/common/io/bge/THIRDPARTYLICENSE.descrip b/usr/src/uts/common/io/bge/THIRDPARTYLICENSE.descrip
new file mode 100644
index 0000000000..f6ddfd0008
--- /dev/null
+++ b/usr/src/uts/common/io/bge/THIRDPARTYLICENSE.descrip
@@ -0,0 +1 @@
+BROADCOM BCM5906M ETHERNET DRIVER
diff --git a/usr/src/uts/common/io/bge/bge_impl.h b/usr/src/uts/common/io/bge/bge_impl.h
index e00446cd1c..961bf14064 100644
--- a/usr/src/uts/common/io/bge/bge_impl.h
+++ b/usr/src/uts/common/io/bge/bge_impl.h
@@ -1234,6 +1234,9 @@ void bge_atomic_sub64(uint64_t *count_p, uint64_t n);
 uint64_t bge_atomic_clr64(uint64_t *sp, uint64_t bits);
 uint32_t bge_atomic_shl32(uint32_t *sp, uint_t count);
 
+/* bge_mii_5906.c */
+void bge_adj_volt_5906(bge_t *bgep);
+
 /*
  * Reset type
  */
diff --git a/usr/src/uts/common/io/bge/bge_main2.c b/usr/src/uts/common/io/bge/bge_main2.c
index 023c61e53a..5125c86101 100644
--- a/usr/src/uts/common/io/bge/bge_main2.c
+++ b/usr/src/uts/common/io/bge/bge_main2.c
@@ -32,7 +32,7 @@
  * This is the string displayed by modinfo, etc.
  * Make sure you keep the version ID up to date!
  */
-static char bge_ident[] = "Broadcom Gb Ethernet v0.70";
+static char bge_ident[] = "Broadcom Gb Ethernet v0.71";
 
 /*
  * Property names
diff --git a/usr/src/uts/common/io/bge/bge_mii.c b/usr/src/uts/common/io/bge/bge_mii.c
index 9c59f6f788..ddb57f68e5 100644
--- a/usr/src/uts/common/io/bge/bge_mii.c
+++ b/usr/src/uts/common/io/bge/bge_mii.c
@@ -232,9 +232,8 @@ bge_phy_reset(bge_t *bgep)
 			return (B_TRUE);
 	}
 
-	/* Adjust output voltage (From bsd driver) */
 	if (DEVICE_5906_SERIES_CHIPSETS(bgep))
-		bge_mii_put16(bgep, 0x17, 0x12);
+		(void) bge_adj_volt_5906(bgep);
 
 	BGE_DEBUG(("bge_phy_reset: FAILED, control now 0x%x", control));
 
@@ -491,9 +490,8 @@ bge_phy_reset_and_check(bge_t *bgep)
 	extctrl = bge_mii_get16(bgep, 0x10);
 	bge_mii_put16(bgep, 0x10, extctrl & ~0x3000);
 
-	/* Adjust output voltage (From bsd driver) */
 	if (DEVICE_5906_SERIES_CHIPSETS(bgep))
-		bge_mii_put16(bgep, 0x17, 0x12);
+		(void) bge_adj_volt_5906(bgep);
 
 	if (!reset_success)
 		bge_fm_ereport(bgep, DDI_FM_DEVICE_NO_RESPONSE);
diff --git a/usr/src/uts/common/io/bge/bge_mii_5906.c b/usr/src/uts/common/io/bge/bge_mii_5906.c
new file mode 100644
index 0000000000..cb9d9b5e1b
--- /dev/null
+++ b/usr/src/uts/common/io/bge/bge_mii_5906.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * Copyright (c) 2000
+ *	Bill Paul <wpaul@ee.columbia.edu>.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Bill Paul.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "bge_impl.h"
+
+void
+bge_adj_volt_5906(bge_t *bgep)
+{
+	/* Adjust output voltage (From bsd driver) */
+	bge_mii_put16(bgep, 0x17, 0x12);
+}