[Midnightbsd-cvs] src [10089] trunk/sys/dev: sync pcf, ngxe

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun May 27 19:29:38 EDT 2018


Revision: 10089
          http://svnweb.midnightbsd.org/src/?rev=10089
Author:   laffer1
Date:     2018-05-27 19:29:37 -0400 (Sun, 27 May 2018)
Log Message:
-----------
sync pcf, ngxe

Modified Paths:
--------------
    trunk/sys/dev/nxge/if_nxge.c
    trunk/sys/dev/nxge/if_nxge.h
    trunk/sys/dev/nxge/include/build-version.h
    trunk/sys/dev/nxge/include/version.h
    trunk/sys/dev/nxge/include/xge-debug.h
    trunk/sys/dev/nxge/include/xge-defs.h
    trunk/sys/dev/nxge/include/xge-list.h
    trunk/sys/dev/nxge/include/xge-os-pal.h
    trunk/sys/dev/nxge/include/xge-queue.h
    trunk/sys/dev/nxge/include/xgehal-channel.h
    trunk/sys/dev/nxge/include/xgehal-config.h
    trunk/sys/dev/nxge/include/xgehal-device.h
    trunk/sys/dev/nxge/include/xgehal-driver.h
    trunk/sys/dev/nxge/include/xgehal-event.h
    trunk/sys/dev/nxge/include/xgehal-fifo.h
    trunk/sys/dev/nxge/include/xgehal-mgmt.h
    trunk/sys/dev/nxge/include/xgehal-mgmtaux.h
    trunk/sys/dev/nxge/include/xgehal-mm.h
    trunk/sys/dev/nxge/include/xgehal-regs.h
    trunk/sys/dev/nxge/include/xgehal-ring.h
    trunk/sys/dev/nxge/include/xgehal-stats.h
    trunk/sys/dev/nxge/include/xgehal-types.h
    trunk/sys/dev/nxge/include/xgehal.h
    trunk/sys/dev/nxge/xge-osdep.h
    trunk/sys/dev/nxge/xgehal/xge-queue.c
    trunk/sys/dev/nxge/xgehal/xgehal-channel-fp.c
    trunk/sys/dev/nxge/xgehal/xgehal-channel.c
    trunk/sys/dev/nxge/xgehal/xgehal-config.c
    trunk/sys/dev/nxge/xgehal/xgehal-device-fp.c
    trunk/sys/dev/nxge/xgehal/xgehal-device.c
    trunk/sys/dev/nxge/xgehal/xgehal-driver.c
    trunk/sys/dev/nxge/xgehal/xgehal-fifo-fp.c
    trunk/sys/dev/nxge/xgehal/xgehal-fifo.c
    trunk/sys/dev/nxge/xgehal/xgehal-mgmt.c
    trunk/sys/dev/nxge/xgehal/xgehal-mgmtaux.c
    trunk/sys/dev/nxge/xgehal/xgehal-mm.c
    trunk/sys/dev/nxge/xgehal/xgehal-ring-fp.c
    trunk/sys/dev/nxge/xgehal/xgehal-ring.c
    trunk/sys/dev/nxge/xgehal/xgehal-stats.c
    trunk/sys/dev/nxge/xgell-version.h
    trunk/sys/dev/pcf/envctrl.c
    trunk/sys/dev/pcf/pcf.c
    trunk/sys/dev/pcf/pcf_ebus.c
    trunk/sys/dev/pcf/pcf_isa.c
    trunk/sys/dev/pcf/pcfvar.h

Modified: trunk/sys/dev/nxge/if_nxge.c
===================================================================
--- trunk/sys/dev/nxge/if_nxge.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/if_nxge.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/if_nxge.c 332280 2018-04-08 15:35:57Z brooks $
  */
 
 #include <dev/nxge/if_nxge.h>
@@ -1361,11 +1362,16 @@
 xge_ioctl_stats(xge_lldev_t *lldev, struct ifreq *ifreqp)
 {
 	xge_hal_status_e status = XGE_HAL_OK;
-	char *data = (char *)ifreqp->ifr_data;
+	char cmd, mode;
 	void *info = NULL;
-	int retValue = EINVAL;
+	int retValue;
 
-	switch(*data) {
+	cmd = retValue = fubyte(ifreqp->ifr_data);
+	if (retValue == -1)
+		return (EFAULT);
+
+	retValue = EINVAL;
+	switch(cmd) {
 	    case XGE_QUERY_STATS:
 	        mtx_lock(&lldev->mtx_drv);
 	        status = xge_hal_stats_hw(lldev->devh,
@@ -1493,8 +1499,8 @@
 	    case XGE_SET_BUFFER_MODE_1:
 	    case XGE_SET_BUFFER_MODE_2:
 	    case XGE_SET_BUFFER_MODE_5:
-	        *data = (*data == XGE_SET_BUFFER_MODE_1) ? 'Y':'N';
-	        if(copyout(data, ifreqp->ifr_data, sizeof(data)) == 0)
+	        mode = (cmd == XGE_SET_BUFFER_MODE_1) ? 'Y':'N';
+	        if(copyout(&mode, ifreqp->ifr_data, sizeof(mode)) == 0)
 	            retValue = 0;
 	        break;
 	    default:
@@ -1515,11 +1521,18 @@
 int
 xge_ioctl_registers(xge_lldev_t *lldev, struct ifreq *ifreqp)
 {
-	xge_register_t *data = (xge_register_t *)ifreqp->ifr_data;
+	xge_register_t tmpdata;
+	xge_register_t *data;
 	xge_hal_status_e status = XGE_HAL_OK;
 	int retValue = EINVAL, offset = 0, index = 0;
+	int error;
 	u64 val64 = 0;
 
+	error = copyin(ifreqp->ifr_data, &tmpdata, sizeof(tmpdata));
+	if (error != 0)
+		return (error);
+	data = &tmpdata;
+
 	/* Reading a register */
 	if(strcmp(data->option, "-r") == 0) {
 	    data->value = 0x0000;
@@ -1743,7 +1756,7 @@
 	    return;
 
 	/* Initializing timer */
-	callout_init(&lldev->timer, CALLOUT_MPSAFE);
+	callout_init(&lldev->timer, 1);
 
 	xge_trace(XGE_TRACE, "Set MTU size");
 	status = xge_hal_device_mtu_set(hldev, ifnetp->if_mtu);
@@ -3507,7 +3520,8 @@
 	DEVMETHOD(device_attach,    xge_attach),
 	DEVMETHOD(device_detach,    xge_detach),
 	DEVMETHOD(device_shutdown,  xge_shutdown),
-	{0, 0}
+
+	DEVMETHOD_END
 };
 
 static driver_t xge_driver = {

Modified: trunk/sys/dev/nxge/if_nxge.h
===================================================================
--- trunk/sys/dev/nxge/if_nxge.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/if_nxge.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/if_nxge.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef _IF_XGE_H

Modified: trunk/sys/dev/nxge/include/build-version.h
===================================================================
--- trunk/sys/dev/nxge/include/build-version.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/build-version.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,6 +1,7 @@
+/* $MidnightBSD$ */
 #ifndef BUILD_VERSION_H
 #define BUILD_VERSION_H
 /* Do not edit! Automatically generated when released.*/
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/dev/nxge/include/build-version.h 173139 2007-10-29 14:19:32Z rwatson $ */
 #define GENERATED_BUILD_VERSION "11230"
 #endif /* BUILD_VERSION_H */

Modified: trunk/sys/dev/nxge/include/version.h
===================================================================
--- trunk/sys/dev/nxge/include/version.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/version.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/version.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef VERSION_H

Modified: trunk/sys/dev/nxge/include/xge-debug.h
===================================================================
--- trunk/sys/dev/nxge/include/xge-debug.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xge-debug.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xge-debug.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_DEBUG_H

Modified: trunk/sys/dev/nxge/include/xge-defs.h
===================================================================
--- trunk/sys/dev/nxge/include/xge-defs.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xge-defs.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xge-defs.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_DEFS_H

Modified: trunk/sys/dev/nxge/include/xge-list.h
===================================================================
--- trunk/sys/dev/nxge/include/xge-list.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xge-list.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xge-list.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_LIST_H

Modified: trunk/sys/dev/nxge/include/xge-os-pal.h
===================================================================
--- trunk/sys/dev/nxge/include/xge-os-pal.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xge-os-pal.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xge-os-pal.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_OS_PAL_H

Modified: trunk/sys/dev/nxge/include/xge-queue.h
===================================================================
--- trunk/sys/dev/nxge/include/xge-queue.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xge-queue.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xge-queue.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_QUEUE_H

Modified: trunk/sys/dev/nxge/include/xgehal-channel.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-channel.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-channel.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-channel.h 230133 2012-01-15 13:23:33Z uqs $
  */
 
 #ifndef XGE_HAL_CHANNEL_H
@@ -139,7 +140,7 @@
  * Channel callback gets called by HAL if, and only if, there is at least
  * one new completion on a given ring or fifo channel. Upon processing the
  * first @dtrh ULD is _supposed_ to continue consuming completions
- * using\xE1one of the following HAL APIs:
+ * using one of the following HAL APIs:
  *    - xge_hal_fifo_dtr_next_completed()
  *      or
  *    - xge_hal_ring_dtr_next_completed().

Modified: trunk/sys/dev/nxge/include/xgehal-config.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-config.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-config.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-config.h 230134 2012-01-15 13:23:43Z uqs $
  */
 
 #ifndef XGE_HAL_CONFIG_H
@@ -621,7 +622,7 @@
  * stable in order for the adapter to declare "LINK UP".
  * The enumerated settings (see Xframe-II UG) are:
  *      0 ........... instantaneous
- *      1 ........... 500 \xB3s
+ *      1 ........... 500 μs
  *      2 ........... 1 ms
  *      3 ........... 64 ms
  *      4 ........... 256 ms

Modified: trunk/sys/dev/nxge/include/xgehal-device.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-device.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-device.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-device.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_DEVICE_H

Modified: trunk/sys/dev/nxge/include/xgehal-driver.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-driver.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-driver.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-driver.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_DRIVER_H

Modified: trunk/sys/dev/nxge/include/xgehal-event.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-event.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-event.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-event.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_EVENT_H

Modified: trunk/sys/dev/nxge/include/xgehal-fifo.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-fifo.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-fifo.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-fifo.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_FIFO_H

Modified: trunk/sys/dev/nxge/include/xgehal-mgmt.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-mgmt.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-mgmt.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-mgmt.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_MGMT_H

Modified: trunk/sys/dev/nxge/include/xgehal-mgmtaux.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-mgmtaux.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-mgmtaux.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-mgmtaux.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_MGMTAUX_H

Modified: trunk/sys/dev/nxge/include/xgehal-mm.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-mm.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-mm.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-mm.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_MM_H

Modified: trunk/sys/dev/nxge/include/xgehal-regs.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-regs.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-regs.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-regs.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_REGS_H

Modified: trunk/sys/dev/nxge/include/xgehal-ring.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-ring.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-ring.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-ring.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_RING_H

Modified: trunk/sys/dev/nxge/include/xgehal-stats.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-stats.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-stats.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-stats.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_STATS_H

Modified: trunk/sys/dev/nxge/include/xgehal-types.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal-types.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal-types.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal-types.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_TYPES_H

Modified: trunk/sys/dev/nxge/include/xgehal.h
===================================================================
--- trunk/sys/dev/nxge/include/xgehal.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/include/xgehal.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/include/xgehal.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGE_HAL_H

Modified: trunk/sys/dev/nxge/xge-osdep.h
===================================================================
--- trunk/sys/dev/nxge/xge-osdep.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xge-osdep.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xge-osdep.h 185162 2008-11-22 05:55:56Z kmacy $
  */
 
 #ifndef XGE_OSDEP_H

Modified: trunk/sys/dev/nxge/xgehal/xge-queue.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xge-queue.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xge-queue.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xge-queue.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #include <dev/nxge/include/xge-queue.h>

Modified: trunk/sys/dev/nxge/xgehal/xgehal-channel-fp.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-channel-fp.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-channel-fp.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-channel-fp.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifdef XGE_DEBUG_FP

Modified: trunk/sys/dev/nxge/xgehal/xgehal-channel.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-channel.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-channel.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-channel.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #include <dev/nxge/include/xgehal-channel.h>

Modified: trunk/sys/dev/nxge/xgehal/xgehal-config.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-config.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-config.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-config.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #include <dev/nxge/include/xgehal-config.h>

Modified: trunk/sys/dev/nxge/xgehal/xgehal-device-fp.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-device-fp.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-device-fp.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-device-fp.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifdef XGE_DEBUG_FP

Modified: trunk/sys/dev/nxge/xgehal/xgehal-device.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-device.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-device.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-device.c 242692 2012-11-07 07:00:59Z kevlo $
  */
 
 #include <dev/nxge/include/xgehal-device.h>
@@ -6793,7 +6794,7 @@
 	} else {
 	    /*
 	     * Logging Error messages in the excess temperature,
-	     * Bias current, laser ouput for three cycle
+	     * Bias current, laser output for three cycle
 	     */
 	    __hal_updt_stats_xpak(hldev);
 	    hldev->stats.sw_dev_err_stats.xpak_counter.tick_period = 0;

Modified: trunk/sys/dev/nxge/xgehal/xgehal-driver.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-driver.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-driver.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-driver.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #include <dev/nxge/include/xgehal-driver.h>

Modified: trunk/sys/dev/nxge/xgehal/xgehal-fifo-fp.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-fifo-fp.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-fifo-fp.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-fifo-fp.c 230133 2012-01-15 13:23:33Z uqs $
  */
 
 #ifdef XGE_DEBUG_FP
@@ -794,7 +795,7 @@
  * in fifo descriptor.
  * @channelh: Channel handle.
  * @dtrh: Descriptor handle.
- * @frag_idx: Index of the data buffer in the caller's scatter-gather list\xE1
+ * @frag_idx: Index of the data buffer in the caller's scatter-gather list
  *            (of buffers).
  * @vaddr: Virtual address of the data buffer.
  * @dma_pointer: DMA address of the data buffer referenced by @frag_idx.
@@ -1015,7 +1016,7 @@
  * descriptor.
  * @channelh: Channel handle.
  * @dtrh: Descriptor handle.
- * @frag_idx: Index of the data buffer in the caller's scatter-gather list\xE1
+ * @frag_idx: Index of the data buffer in the caller's scatter-gather list
  *            (of buffers).
  * @dma_pointer: DMA address of the data buffer referenced by @frag_idx.
  * @size: Size of the data buffer (in bytes).

Modified: trunk/sys/dev/nxge/xgehal/xgehal-fifo.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-fifo.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-fifo.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-fifo.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #include <dev/nxge/include/xgehal-fifo.h>

Modified: trunk/sys/dev/nxge/xgehal/xgehal-mgmt.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-mgmt.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-mgmt.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-mgmt.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #include <dev/nxge/include/xgehal-mgmt.h>

Modified: trunk/sys/dev/nxge/xgehal/xgehal-mgmtaux.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-mgmtaux.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-mgmtaux.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-mgmtaux.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #include <dev/nxge/include/xgehal-mgmt.h>

Modified: trunk/sys/dev/nxge/xgehal/xgehal-mm.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-mm.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-mm.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-mm.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #include <dev/nxge/include/xge-os-pal.h>

Modified: trunk/sys/dev/nxge/xgehal/xgehal-ring-fp.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-ring-fp.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-ring-fp.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-ring-fp.c 218909 2011-02-21 09:01:34Z brucec $
  */
 
 #ifdef XGE_DEBUG_FP

Modified: trunk/sys/dev/nxge/xgehal/xgehal-ring.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-ring.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-ring.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-ring.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #include <dev/nxge/include/xgehal-ring.h>

Modified: trunk/sys/dev/nxge/xgehal/xgehal-stats.c
===================================================================
--- trunk/sys/dev/nxge/xgehal/xgehal-stats.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgehal/xgehal-stats.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgehal/xgehal-stats.c 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #include <dev/nxge/include/xgehal-stats.h>

Modified: trunk/sys/dev/nxge/xgell-version.h
===================================================================
--- trunk/sys/dev/nxge/xgell-version.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/nxge/xgell-version.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2007 Neterion, Inc.
  * All rights reserved.
@@ -23,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/nxge/xgell-version.h 173139 2007-10-29 14:19:32Z rwatson $
  */
 
 #ifndef XGELL_VERSION_H

Modified: trunk/sys/dev/pcf/envctrl.c
===================================================================
--- trunk/sys/dev/pcf/envctrl.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/pcf/envctrl.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2004 Joerg Wunsch
  *
@@ -28,7 +29,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/pcf/envctrl.c 181332 2008-08-05 17:39:37Z jhb $");
 
 /*
  * Device specific driver for the SUNW,envctrl device found on some

Modified: trunk/sys/dev/pcf/pcf.c
===================================================================
--- trunk/sys/dev/pcf/pcf.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/pcf/pcf.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1998 Nicolas Souchu, Marc Bouget
  * Copyright (c) 2004 Joerg Wunsch
@@ -26,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/pcf/pcf.c 289666 2015-10-20 21:20:34Z ian $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -170,7 +171,7 @@
 		printf("pcf: busy!\n");
 #endif
 		PCF_UNLOCK(sc);
-		return (IIC_EBUSBSY);
+		return (IIC_EBUSERR);
 	}
 
 	/* set slave address to PCF. Last bit (LSB) must be set correctly

Modified: trunk/sys/dev/pcf/pcf_ebus.c
===================================================================
--- trunk/sys/dev/pcf/pcf_ebus.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/pcf/pcf_ebus.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2004 Marius Strobl, Joerg Wunsch
  *
@@ -28,7 +29,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/pcf/pcf_ebus.c 233018 2012-03-15 22:53:39Z nwhitehorn $");
 
 /*
  * Device specific driver for the EBus i2c devices found on some sun4u

Modified: trunk/sys/dev/pcf/pcf_isa.c
===================================================================
--- trunk/sys/dev/pcf/pcf_isa.c	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/pcf/pcf_isa.c	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2004 Joerg Wunsch
  *
@@ -28,7 +29,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/pcf/pcf_isa.c 181332 2008-08-05 17:39:37Z jhb $");
 
 /*
  * Hardware driver for a Philips PCF8584 I2C bus controller sitting

Modified: trunk/sys/dev/pcf/pcfvar.h
===================================================================
--- trunk/sys/dev/pcf/pcfvar.h	2018-05-27 23:29:07 UTC (rev 10088)
+++ trunk/sys/dev/pcf/pcfvar.h	2018-05-27 23:29:37 UTC (rev 10089)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1998 Nicolas Souchu, Marc Bouget
  * Copyright (c) 2004 Joerg Wunsch
@@ -24,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/pcf/pcfvar.h 194026 2009-06-11 17:15:44Z avg $
  */
 
 #ifndef __PCFVAR_H__



More information about the Midnightbsd-cvs mailing list