From owner-p4-projects@FreeBSD.ORG  Sat May 31 06:35:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 99535106566C; Sat, 31 May 2008 06:35:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B118106564A
	for <perforce@freebsd.org>; Sat, 31 May 2008 06:35:50 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 598548FC1E
	for <perforce@freebsd.org>; Sat, 31 May 2008 06:35:50 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4V6ZnNd049539
	for <perforce@freebsd.org>; Sat, 31 May 2008 06:35:49 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4V6ZnjH049537
	for perforce@freebsd.org; Sat, 31 May 2008 06:35:49 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 31 May 2008 06:35:49 GMT
Message-Id: <200805310635.m4V6ZnjH049537@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 142616 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 May 2008 06:35:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=142616

Change 142616 by jb@freebsd3 on 2008/05/31 06:35:03

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#79 integrate
.. //depot/projects/dtrace/ports/MOVED#93 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.python.mk#16 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#12 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/fcntl.c#3 integrate
.. //depot/projects/dtrace/src/lib/libc_r/uthread/uthread_fcntl.c#5 integrate
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_fcntl.c#5 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_syscalls.c#8 integrate
.. //depot/projects/dtrace/src/sys/compat/ndis/subr_ntoskrnl.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#22 integrate
.. //depot/projects/dtrace/src/sys/dev/ie/if_ie.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#18 integrate
.. //depot/projects/dtrace/src/sys/dev/snc/dp83932.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/snc/dp83932subr.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/snc/dp83932var.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/snc/if_sncreg.h#4 integrate
.. //depot/projects/dtrace/src/sys/i386/cpufreq/est.c#9 integrate
.. //depot/projects/dtrace/src/sys/net/radix_mpath.c#4 integrate
.. //depot/projects/dtrace/src/sys/net/radix_mpath.h#3 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#7 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/main.c#10 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/pkg_add.1#8 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/create/main.c#8 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/create/pkg_create.1#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/delete/main.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/delete/pkg_delete.1#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/info/main.c#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/info/pkg_info.1#7 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/lib.h#11 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/main.c#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/pkg_updating.1#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/version/main.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/version/pkg_version.1#6 integrate
.. //depot/projects/dtrace/www/en/multimedia/multimedia-input.xml#2 integrate
.. //depot/projects/dtrace/www/en/multimedia/multimedia.pl#2 integrate
.. //depot/projects/dtrace/www/share/sgml/events.xml#27 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#79 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.799 2008/05/29 05:08:48 chinsan Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.801 2008/05/31 04:24:41 lippe Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -4326,6 +4326,11 @@
     </listitem>
 
     <listitem>
+      <para>Jim Stapleton
+	<email>sjss@var-dev.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Jim Wilson
 	<email>wilson@moria.cygnus.com</email></para>
     </listitem>
@@ -9008,6 +9013,11 @@
     </listitem>
 
     <listitem>
+      <para>Sven Klose
+	<email>pixel@hugbox.org</email></para>
+    </listitem>
+
+    <listitem>
       <para>Sven Mohr
 	<email>svmohr@rm6.net</email></para>
     </listitem>

==== //depot/projects/dtrace/ports/MOVED#93 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1602 2008/05/27 06:27:46 edwin Exp $
+# $FreeBSD: ports/MOVED,v 1.1603 2008/05/30 19:15:50 miwi Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -3483,3 +3483,8 @@
 japanese/kochi-cidfonts||2008-05-25|Removed due to copyright problem
 japanese/latex-japanese|japanese/platex-japanese|2008-05-26|Works only with platex
 ports-mgmt/newportsversioncheck||2008-05-27|Obsoleted by portscout
+net-p2p/dclibc||2008-05-30|Has expired: Abandoned, not used, website disappeared
+net-mgmt/ap-utils||2008-05-30|Has expired: Does not work with gcc4.2; appears to be abandoned
+multimedia/xfce4-xmms-controller-plugin||2008-05-30|Has expired: Project is dead
+www/pear-HTTP_Session||2008-05-30|Has expired: Use www/pear-HTTP_Session2 instead
+security/bioapitool||2008-05-30|Has expired: All functionallity of this tools has been merged with pam_bsdbioapi

==== //depot/projects/dtrace/ports/Mk/bsd.python.mk#16 (text+ko) ====

@@ -1,7 +1,7 @@
 # -*- mode: Makefile; tab-width: 4; -*-
 # ex: ts=4
 #
-# $FreeBSD: ports/Mk/bsd.python.mk,v 1.103 2008/03/16 10:25:07 perky Exp $
+# $FreeBSD: ports/Mk/bsd.python.mk,v 1.104 2008/05/30 05:50:03 perky Exp $
 #
 
 .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include)
@@ -382,9 +382,9 @@
 
 # Python-2.3
 .elif ${PYTHON_VERSION} == "python2.3"
-PYTHON_PORTVERSION?=2.3.6
+PYTHON_PORTVERSION?=2.3.7
 PYTHON_PORTSDIR=	${PORTSDIR}/lang/python23
-PYTHON_REL=			236
+PYTHON_REL=			237
 PYTHON_SUFFIX=		23
 PYTHON_VER=			2.3
 

==== //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#12 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.15 2008/05/09 23:00:20 julian Exp $
+ * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.16 2008/05/30 14:47:40 dfr Exp $
  */
 
 /*
@@ -522,6 +522,7 @@
 	__sys_fchown;
 	_fcntl;
 	__sys_fcntl;
+	__fcntl_compat;
 	_fhopen;
 	__sys_fhopen;
 	_fhstat;

==== //depot/projects/dtrace/src/lib/libc/sys/fcntl.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/sys/fcntl.c,v 1.2 2008/05/27 14:03:32 dfr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/sys/fcntl.c,v 1.3 2008/05/30 14:47:40 dfr Exp $");
 
 #include <fcntl.h>
 #include <stdarg.h>
@@ -34,10 +34,10 @@
 #include <sys/syscall.h>
 #include "libc_private.h"
 
-__weak_reference(__fcntl, fcntl);
+__weak_reference(__fcntl_compat, fcntl);
 
 int
-__fcntl(int fd, int cmd, ...)
+__fcntl_compat(int fd, int cmd, ...)
 {
 	va_list args;
 	long arg;

==== //depot/projects/dtrace/src/lib/libc_r/uthread/uthread_fcntl.c#5 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.16 2007/01/12 07:25:25 imp Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.17 2008/05/30 14:47:41 dfr Exp $
  */
 #include <stdarg.h>
 #include <unistd.h>
@@ -36,6 +36,8 @@
 
 __weak_reference(__fcntl, fcntl);
 
+extern int __fcntl_compat(int fd, int cmd, ...);
+
 int
 _fcntl(int fd, int cmd,...)
 {
@@ -124,7 +126,7 @@
 			break;
 		default:
 			/* Might want to make va_arg use a union */
-			ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
+			ret = __fcntl_compat(fd, cmd, va_arg(ap, void *));
 			break;
 		}
 

==== //depot/projects/dtrace/src/lib/libkse/thread/thr_fcntl.c#5 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libkse/thread/thr_fcntl.c,v 1.24 2007/12/16 23:29:55 deischen Exp $
+ * $FreeBSD: src/lib/libkse/thread/thr_fcntl.c,v 1.25 2008/05/30 14:47:42 dfr Exp $
  */
 
 #include "namespace.h"
@@ -37,6 +37,7 @@
 #include "thr_private.h"
 
 int __fcntl(int fd, int cmd,...);
+extern int __fcntl_compat(int fd, int cmd,...);
 
 __weak_reference(__fcntl, fcntl);
 
@@ -68,7 +69,7 @@
 		ret = __sys_fcntl(fd, cmd);
 		break;
 	default:
-		ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
+		ret = __fcntl_compat(fd, cmd, va_arg(ap, void *));
 	}
 	va_end(ap);
 

==== //depot/projects/dtrace/src/lib/libthr/thread/thr_syscalls.c#8 (text+ko) ====

@@ -28,7 +28,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.17 2007/12/20 04:32:28 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.18 2008/05/30 14:47:42 dfr Exp $
  */
 
 /*
@@ -132,6 +132,7 @@
 int	__close(int);
 int	__connect(int, const struct sockaddr *, socklen_t);
 int	__fcntl(int, int,...);
+extern int __fcntl_compat(int, int,...);
 int	__fsync(int);
 int	__msync(void *, size_t, int);
 int	__nanosleep(const struct timespec *, struct timespec *);
@@ -252,7 +253,7 @@
 		ret = __sys_fcntl(fd, cmd);
 		break;
 	default:
-		ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
+		ret = __fcntl_compat(fd, cmd, va_arg(ap, void *));
 	}
 	va_end(ap);
 

==== //depot/projects/dtrace/src/sys/compat/ndis/subr_ntoskrnl.c#11 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.94 2007/12/25 17:51:56 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.95 2008/05/30 06:31:55 weongyo Exp $");
 
 #include <sys/ctype.h>
 #include <sys/unistd.h>
@@ -1591,8 +1591,9 @@
 		}
 
 		if (satisfied == TRUE)
-			cv_broadcastpri(&we->we_cv, w->wb_oldpri -
-			    (increment * 4));
+			cv_broadcastpri(&we->we_cv,
+			    (w->wb_oldpri - (increment * 4)) > PRI_MIN_KERN ?
+			    w->wb_oldpri - (increment * 4) : PRI_MIN_KERN);
 
 		e = e->nle_flink;
 	}
@@ -3384,8 +3385,9 @@
 			}
 		} else {
 			w->wb_awakened |= TRUE;
-			cv_broadcastpri(&we->we_cv, w->wb_oldpri -
-			    (increment * 4));
+			cv_broadcastpri(&we->we_cv,
+			    (w->wb_oldpri - (increment * 4)) > PRI_MIN_KERN ?
+			    w->wb_oldpri - (increment * 4) : PRI_MIN_KERN);
 		}
 	}
 

==== //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#22 (text) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.39 2008/05/08 15:05:38 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.40 2008/05/30 18:26:37 jhb Exp $");
 
 /*
  * The following controllers are supported by this driver:
@@ -779,7 +779,7 @@
 #ifdef BCE_USE_SPLIT_HEADER
 	sc->rx_bd_mbuf_alloc_size = MHLEN;
 #else
-	sc->rx_bd_mbuf_alloc_size = MCLBYTES;;
+	sc->rx_bd_mbuf_alloc_size = MCLBYTES;
 #endif
 	sc->pg_bd_mbuf_alloc_size = MCLBYTES;
 

==== //depot/projects/dtrace/src/sys/dev/ie/if_ie.c#5 (text+ko) ====

@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.107 2008/05/29 17:32:55 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ie/if_ie.c,v 1.108 2008/05/30 16:22:30 jhb Exp $");
 
 /*
  * Intel 82586 Ethernet chip
@@ -365,7 +365,7 @@
 #ifdef DEBUG
 		in_ierint++;
 		if (ie_debug & IED_RINT)
-			if_printf(ifp, "rint\n");
+			if_printf(sc->ifp, "rint\n");
 #endif
 		ierint(sc);
 #ifdef DEBUG
@@ -376,7 +376,7 @@
 #ifdef DEBUG
 		in_ietint++;
 		if (ie_debug & IED_TINT)
-			if_printf(ifp, "tint\n");
+			if_printf(sc->ifp, "tint\n");
 #endif
 		ietint(sc);
 #ifdef DEBUG
@@ -386,13 +386,13 @@
 	if (status & IE_ST_RNR) {
 #ifdef DEBUG
 		if (ie_debug & IED_RNR)
-			if_printf(ifp, "rnr\n");
+			if_printf(sc->ifp, "rnr\n");
 #endif
 		iernr(sc);
 	}
 #ifdef DEBUG
 	if ((status & IE_ST_ALLDONE) && (ie_debug & IED_CNA))
-		if_printf(ifp, "cna\n");
+		if_printf(sc->ifp, "cna\n");
 #endif
 
 	if ((status = sc->scb->ie_status) & IE_ST_WHENCE)

==== //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#18 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.139 2008/05/12 00:15:28 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.140 2008/05/30 07:17:51 weongyo Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -996,15 +996,18 @@
 	sc = device_get_softc(dev);
 	NDIS_LOCK(sc);
 	ifp = sc->ifp;
-	ifp->if_flags &= ~IFF_UP;
+	if (ifp != NULL)
+		ifp->if_flags &= ~IFF_UP;
 
 	if (device_is_attached(dev)) {
 		NDIS_UNLOCK(sc);
 		ndis_stop(sc);
-		if (sc->ndis_80211)
-			ieee80211_ifdetach(ifp->if_l2com);
-		else
-			ether_ifdetach(ifp);
+		if (ifp != NULL) {
+			if (sc->ndis_80211)
+				ieee80211_ifdetach(ifp->if_l2com);
+			else
+				ether_ifdetach(ifp);
+		}
 	} else
 		NDIS_UNLOCK(sc);
 

==== //depot/projects/dtrace/src/sys/dev/snc/dp83932.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/dev/snc/dp83932.c,v 1.23 2005/12/06 11:19:37 ru Exp $	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932.c,v 1.24 2008/05/30 21:48:04 jhb Exp $	*/
 /*	$NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $	*/
 /*	$NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $	*/
 
@@ -70,9 +70,6 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/errno.h>
-#if defined(NRND) && NRND > 0
-#include <sys/rnd.h>
-#endif
 
 #include <net/ethernet.h>
 #include <net/if.h>
@@ -88,29 +85,29 @@
 #include <dev/snc/dp83932reg.h>
 #include <dev/snc/dp83932var.h>
 
-hide void	sncwatchdog(struct ifnet *);
-hide void	sncinit(void *);
-hide int	sncstop(struct snc_softc *sc);
-hide int	sncioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
-hide void	sncstart(struct ifnet *ifp);
-hide void	sncreset(struct snc_softc *sc);
+static void	sncwatchdog(struct ifnet *);
+static void	sncinit(void *);
+static int	sncstop(struct snc_softc *sc);
+static int	sncioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
+static void	sncstart(struct ifnet *ifp);
+static void	sncreset(struct snc_softc *sc);
 
-hide void	caminitialise(struct snc_softc *);
-hide void	camentry(struct snc_softc *, int, u_char *ea);
-hide void	camprogram(struct snc_softc *);
-hide void	initialise_tda(struct snc_softc *);
-hide void	initialise_rda(struct snc_softc *);
-hide void	initialise_rra(struct snc_softc *);
+static void	caminitialise(struct snc_softc *);
+static void	camentry(struct snc_softc *, int, u_char *ea);
+static void	camprogram(struct snc_softc *);
+static void	initialise_tda(struct snc_softc *);
+static void	initialise_rda(struct snc_softc *);
+static void	initialise_rra(struct snc_softc *);
 #ifdef SNCDEBUG
-hide void	camdump(struct snc_softc *sc);
+static void	camdump(struct snc_softc *sc);
 #endif
 
-hide void	sonictxint(struct snc_softc *);
-hide void	sonicrxint(struct snc_softc *);
+static void	sonictxint(struct snc_softc *);
+static void	sonicrxint(struct snc_softc *);
 
-hide u_int	sonicput(struct snc_softc *sc, struct mbuf *m0, int mtd_next);
-hide int	sonic_read(struct snc_softc *, u_int32_t, int);
-hide struct mbuf *sonic_get(struct snc_softc *, u_int32_t, int);
+static u_int	sonicput(struct snc_softc *sc, struct mbuf *m0, int mtd_next);
+static int	sonic_read(struct snc_softc *, u_int32_t, int);
+static struct mbuf *sonic_get(struct snc_softc *, u_int32_t, int);
 
 int	snc_enable(struct snc_softc *);
 void	snc_disable(struct snc_softc *);
@@ -118,14 +115,6 @@
 int	snc_mediachange(struct ifnet *);
 void	snc_mediastatus(struct ifnet *, struct ifmediareq *);
 
-#ifdef NetBSD
-#if NetBSD <= 199714
-struct cfdriver snc_cd = {
-	NULL, "snc", DV_IFNET
-};
-#endif
-#endif
-
 #undef assert
 #undef _assert
 
@@ -201,11 +190,6 @@
 	}
 
 	ether_ifattach(ifp, myea);
-
-#if defined(NRND) && NRND > 0
-	rnd_attach_source(&sc->rnd_source, device_get_nameunit(sc->sc_dev),
-	    RND_TYPE_NET, 0);
-#endif
 }
 
 void
@@ -251,7 +235,7 @@
 }
 
 
-hide int
+static int
 sncioctl(ifp, cmd, data)
 	struct ifnet *ifp;
 	u_long cmd;
@@ -259,7 +243,7 @@
 {
 	struct ifreq *ifr;
 	struct snc_softc *sc = ifp->if_softc;
-	int	s = splhardnet(), err = 0;
+	int	s = splimp(), err = 0;
 	int	temp;
 
 	switch (cmd) {
@@ -322,7 +306,7 @@
 /*
  * Encapsulate a packet of type family for the local net.
  */
-hide void
+static void
 sncstart(ifp)
 	struct ifnet *ifp;
 {
@@ -384,7 +368,7 @@
  * reset and restart the SONIC.  Called in case of fatal
  * hardware/software errors.
  */
-hide void
+static void
 sncreset(sc)
 	struct snc_softc *sc;
 {
@@ -392,7 +376,7 @@
 	sncinit(sc);
 }
 
-hide void
+static void
 sncinit(xsc)
 	void *xsc;
 {
@@ -404,7 +388,7 @@
 		/* already running */
 		return;
 
-	s = splhardnet();
+	s = splimp();
 
 	NIC_PUT(sc, SNCR_CR, CR_RST);	/* DCR only accessable in reset mode! */
 
@@ -464,12 +448,12 @@
  * Called on final close of device, or if sncinit() fails
  * part way through.
  */
-hide int
+static int
 sncstop(sc)
 	struct snc_softc *sc;
 {
 	struct mtd *mtd;
-	int	s = splhardnet();
+	int	s = splimp();
 
 	/* stick chip in reset */
 	NIC_PUT(sc, SNCR_CR, CR_RST);
@@ -498,7 +482,7 @@
  * In all cases we just reset the chip, and any retransmission
  * will be handled by higher level protocol timeouts.
  */
-hide void
+static void
 sncwatchdog(ifp)
 	struct ifnet *ifp;
 {
@@ -524,7 +508,7 @@
 /*
  * stuff packet into sonic (at splnet)
  */
-hide u_int
+static u_int
 sonicput(sc, m0, mtd_next)
 	struct snc_softc *sc;
 	struct mbuf *m0;
@@ -615,7 +599,7 @@
 /*
  * CAM support
  */
-hide void
+static void
 caminitialise(sc)
 	struct snc_softc *sc;
 {
@@ -639,7 +623,7 @@
 #endif
 }
 
-hide void
+static void
 camentry(sc, entry, ea)
 	int entry;
 	u_char *ea;
@@ -656,7 +640,7 @@
 	    (SRO(sc, v_cda, CDA_ENABLE) | (1 << entry)));
 }
 
-hide void
+static void
 camprogram(sc)
 	struct snc_softc *sc;
 {
@@ -718,7 +702,7 @@
 }
 
 #ifdef SNCDEBUG
-hide void
+static void
 camdump(sc)
 	struct snc_softc *sc;
 {
@@ -744,7 +728,7 @@
 }
 #endif
 
-hide void
+static void
 initialise_tda(sc)
 	struct snc_softc *sc;
 {
@@ -766,7 +750,7 @@
 	NIC_PUT(sc, SNCR_CTDA, LOWER(sc->mtda[0].mtd_vtxp));
 }
 
-hide void
+static void
 initialise_rda(sc)
 	struct snc_softc *sc;
 {
@@ -795,7 +779,7 @@
 	wbflush();
 }
 
-hide void
+static void
 initialise_rra(sc)
 	struct snc_softc *sc;
 {
@@ -820,8 +804,8 @@
 		v = SONIC_GETDMA(sc->rbuf[i]);
 		SWO(sc, sc->v_rra[i], RXRSRC_PTRHI, UPPER(v));
 		SWO(sc, sc->v_rra[i], RXRSRC_PTRLO, LOWER(v));
-		SWO(sc, sc->v_rra[i], RXRSRC_WCHI, UPPER(NBPG/2));
-		SWO(sc, sc->v_rra[i], RXRSRC_WCLO, LOWER(NBPG/2));
+		SWO(sc, sc->v_rra[i], RXRSRC_WCHI, UPPER(PAGE_SIZE/2));
+		SWO(sc, sc->v_rra[i], RXRSRC_WCLO, LOWER(PAGE_SIZE/2));
 	}
 	sc->sc_rramark = NRBA;
 	NIC_PUT(sc, SNCR_RWP, LOWER(sc->v_rra[sc->sc_rramark]));
@@ -889,11 +873,6 @@
 #endif
 		}
 		sncstart(sc->sc_ifp);
-
-#if defined(NRND) && NRND > 0
-		if (isr)
-			rnd_add_uint32(&sc->rnd_source, isr);
-#endif
 	}
 	return;
 }
@@ -901,7 +880,7 @@
 /*
  * Transmit interrupt routine
  */
-hide void
+static void
 sonictxint(sc)
 	struct snc_softc *sc;
 {
@@ -978,7 +957,7 @@
 /*
  * Receive interrupt routine
  */
-hide void
+static void
 sonicrxint(sc)
 	struct snc_softc *sc;
 {
@@ -1002,9 +981,9 @@
 		 */
 		len = SRO(sc, rda, RXPKT_BYTEC) - FCSSIZE;
 		if (status & RCR_PRX) {
-			/* XXX: Does PGOFSET require? */
+			/* XXX: Does PAGE_MASK require? */
 			u_int32_t pkt =
-			    sc->rbuf[orra & RBAMASK] + (rxpkt_ptr & PGOFSET);
+			    sc->rbuf[orra & RBAMASK] + (rxpkt_ptr & PAGE_MASK);
 			if (sonic_read(sc, pkt, len))
 				sc->sc_ifp->if_ipackets++;
 			else
@@ -1072,7 +1051,7 @@
  * sonic_read -- pull packet off interface and forward to
  * appropriate protocol handler
  */
-hide int
+static int
 sonic_read(sc, pkt, len)
 	struct snc_softc *sc;
 	u_int32_t pkt;
@@ -1117,7 +1096,7 @@
 /*
  * munge the received packet into an mbuf chain
  */
-hide struct mbuf *
+static struct mbuf *
 sonic_get(sc, pkt, datalen)
 	struct snc_softc *sc;
 	u_int32_t pkt;

==== //depot/projects/dtrace/src/sys/dev/snc/dp83932subr.c#4 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.7 2005/01/06 01:43:15 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.8 2008/05/30 21:48:05 jhb Exp $");
 /*
  * Routines of NEC PC-9801-83, 84, 103, 104, PC-9801N-25 and PC-9801N-J02, J02R 
  * Ethernet interface for NetBSD/pc98, ported by Kouichi Matsuda.
@@ -56,15 +56,6 @@
 #include <net/if_arp.h>
 #include <net/if_media.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/if_inarp.h>
-#endif
-
-
 #include <sys/bus.h>
 #include <machine/bus.h>
 
@@ -73,7 +64,7 @@
 #include <dev/snc/if_sncreg.h>
 #include <dev/snc/dp83932subr.h>
 
-integrate u_int16_t snc_nec16_select_bank
+static __inline u_int16_t snc_nec16_select_bank
 	(struct snc_softc *, u_int32_t, u_int32_t);
 
 /*
@@ -131,27 +122,27 @@
 
 	p = SOALIGN(sc, p);
 
-	if ((p - pp) > NBPG) {
+	if ((p - pp) > PAGE_SIZE) {
 		device_printf (sc->sc_dev, "sizeof RRA (%ld) + CDA (%ld) +"
-		    "TDA (%ld) > NBPG (%d). Punt!\n",
-		    (ulong)sc->v_cda - (ulong)sc->v_rra[0],
-		    (ulong)sc->mtda[0].mtd_vtxp - (ulong)sc->v_cda,
-		    (ulong)p - (ulong)sc->mtda[0].mtd_vtxp,
-		    NBPG);
+		    "TDA (%ld) > PAGE_SIZE (%d). Punt!\n",
+		    (u_long)sc->v_cda - (u_long)sc->v_rra[0],
+		    (u_long)sc->mtda[0].mtd_vtxp - (u_long)sc->v_cda,
+		    (u_long)p - (u_long)sc->mtda[0].mtd_vtxp,
+		    PAGE_SIZE);
 		return(1);
 	}
 
-	p = pp + NBPG;
+	p = pp + PAGE_SIZE;
 	pp = p;
 
-	sc->sc_nrda = NBPG / RXPKT_SIZE(sc);
+	sc->sc_nrda = PAGE_SIZE / RXPKT_SIZE(sc);
 	sc->v_rda = SONIC_GETDMA(p);
 
-	p = pp + NBPG;
+	p = pp + PAGE_SIZE;
 
 	for (i = 0; i < NRBA; i++) {
 		sc->rbuf[i] = p;
-		p += NBPG;
+		p += PAGE_SIZE;
 	}
 
 	pp = p;
@@ -161,10 +152,10 @@
 
 		mtdp->mtd_vbuf = SONIC_GETDMA(p);
 		offset += TXBSIZE;
-		if (offset < NBPG) {
+		if (offset < PAGE_SIZE) {
 			p += TXBSIZE;
 		} else {
-			p = pp + NBPG;
+			p = pp + PAGE_SIZE;
 			pp = p;
 			offset = TXBSIZE;
 		}
@@ -396,7 +387,7 @@
 	/* select SONIC register SNCR_CR */
 	bus_space_write_1(iot, ioh, SNEC_ADDR, SNCR_CR);
 	bus_space_write_2(iot, ioh, SNEC_CTRL, CR_RXDIS | CR_STP | CR_RST);
-	delay(400);
+	DELAY(400);
 
 	cr = bus_space_read_2(iot, ioh, SNEC_CTRL);
 	if (cr != (CR_RXDIS | CR_STP | CR_RST)) {
@@ -535,7 +526,7 @@
  * select memory bank and map
  * where exists specified (internal buffer memory) offset.
  */
-integrate u_int16_t
+static __inline u_int16_t
 snc_nec16_select_bank(sc, base, offset)
 	struct snc_softc *sc;
 	u_int32_t base;
@@ -757,61 +748,61 @@
 		bus_space_write_1(iot, ioh, SNEC_ADDR, SNECR_EEP);
 
 		bus_space_write_1(iot, ioh, SNEC_CTRLB, 0x00);
-		delay(SNEC_EEP_DELAY);
+		DELAY(SNEC_EEP_DELAY);
 
 		/* Start EEPROM access. */
 		bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS);
-		delay(SNEC_EEP_DELAY);
+		DELAY(SNEC_EEP_DELAY);
 
 		bus_space_write_1(iot, ioh, SNEC_CTRLB,
 		    SNECR_EEP_CS | SNECR_EEP_SK);
-		delay(SNEC_EEP_DELAY);
+		DELAY(SNEC_EEP_DELAY);
 
 		bus_space_write_1(iot, ioh, SNEC_CTRLB,
 		    SNECR_EEP_CS | SNECR_EEP_DI);
-		delay(SNEC_EEP_DELAY);
+		DELAY(SNEC_EEP_DELAY);
 
 		bus_space_write_1(iot, ioh, SNEC_CTRLB,
 		    SNECR_EEP_CS | SNECR_EEP_SK | SNECR_EEP_DI);
-		delay(SNEC_EEP_DELAY);
+		DELAY(SNEC_EEP_DELAY);
 
 		bus_space_write_1(iot, ioh, SNEC_CTRLB,
 		    SNECR_EEP_CS | SNECR_EEP_DI);
-		delay(SNEC_EEP_DELAY);
+		DELAY(SNEC_EEP_DELAY);
 
 		bus_space_write_1(iot, ioh, SNEC_CTRLB,
 		    SNECR_EEP_CS | SNECR_EEP_SK | SNECR_EEP_DI);
-		delay(SNEC_EEP_DELAY);
+		DELAY(SNEC_EEP_DELAY);
 
 		bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS);
-		delay(SNEC_EEP_DELAY);
+		DELAY(SNEC_EEP_DELAY);
 
 		bus_space_write_1(iot, ioh, SNEC_CTRLB,
 		    SNECR_EEP_CS | SNECR_EEP_SK);
-		delay(SNEC_EEP_DELAY);
+		DELAY(SNEC_EEP_DELAY);
 
 		/* Pass the iteration count to the chip. */
 		for (bit = 0x20; bit != 0x00; bit >>= 1) {
 			bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS |
 			    ((n & bit) ? SNECR_EEP_DI : 0x00));
-			delay(SNEC_EEP_DELAY);
+			DELAY(SNEC_EEP_DELAY);
 
 			bus_space_write_1(iot, ioh, SNEC_CTRLB,
 			    SNECR_EEP_CS | SNECR_EEP_SK |
 			    ((n & bit) ? SNECR_EEP_DI : 0x00));
-			delay(SNEC_EEP_DELAY);
+			DELAY(SNEC_EEP_DELAY);
 		}
 
 		bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS);
 		(void) bus_space_read_1(iot, ioh, SNEC_CTRLB);	/* ACK */
-		delay(SNEC_EEP_DELAY);
+		DELAY(SNEC_EEP_DELAY);
 
 		/* Read a byte. */
 		val = 0;
 		for (bit = 0x80; bit != 0x00; bit >>= 1) {
 			bus_space_write_1(iot, ioh, SNEC_CTRLB,
 			    SNECR_EEP_CS | SNECR_EEP_SK);
-			delay(SNEC_EEP_DELAY);
+			DELAY(SNEC_EEP_DELAY);
 
 			bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS);
 
@@ -825,7 +816,7 @@
 		for (bit = 0x80; bit != 0x00; bit >>= 1) {
 			bus_space_write_1(iot, ioh, SNEC_CTRLB,
 			    SNECR_EEP_CS | SNECR_EEP_SK);
-			delay(SNEC_EEP_DELAY);
+			DELAY(SNEC_EEP_DELAY);
 
 			bus_space_write_1(iot, ioh, SNEC_CTRLB, SNECR_EEP_CS);
 
@@ -835,7 +826,7 @@
 		*data++ = val;
 
 		bus_space_write_1(iot, ioh, SNEC_CTRLB, 0x00);
-		delay(SNEC_EEP_DELAY);
+		DELAY(SNEC_EEP_DELAY);
 	}
 
 #ifdef	SNCDEBUG
@@ -871,7 +862,7 @@
 	for (n = 0; n < SNC_NREGS; n++) {
 		/* select required SONIC register */
 		bus_space_write_1(iot, ioh, SNEC_ADDR, n);
-		delay(10);
+		DELAY(10);
 		val = bus_space_read_2(iot, ioh, SNEC_CTRL);
 		if ((n % 0x10) == 0)
 			printf("\n%04x ", val);
@@ -884,7 +875,7 @@
 	for (n = SNECR_MEMBS; n <= SNECR_IDENT; n += 2) {
 		/* select required SONIC register */
 		bus_space_write_1(iot, ioh, SNEC_ADDR, n);
-		delay(10);
+		DELAY(10);
 		val = (u_int16_t) bus_space_read_1(iot, ioh, SNEC_CTRLB);
 		printf("%04x ", val);
 	}

==== //depot/projects/dtrace/src/sys/dev/snc/dp83932var.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/dev/snc/dp83932var.h,v 1.6 2005/12/06 11:19:37 ru Exp $	*/
+/*	$FreeBSD: src/sys/dev/snc/dp83932var.h,v 1.7 2008/05/30 21:48:05 jhb Exp $	*/
 /*	$NecBSD: dp83932var.h,v 1.3 1999/01/24 01:39:51 kmatsuda Exp $	*/
 /*	$NetBSD: if_snvar.h,v 1.12 1998/05/01 03:42:47 scottr Exp $	*/
 
@@ -23,31 +23,6 @@
  * (64 * 16 bits) Microwire Serial EEPROM.
  */
 
-/* borrow from arch/mac68k/dev/if_mcvar.h for debug. */
-#ifdef DDB
-#define	integrate
-#define hide
-#else
-#define	integrate	static __inline
-#define hide		static
-#endif
-
-/* NetBSD Emulation */
-#ifdef __NetBSD__
-#define	splhardnet	splnet
-#endif
-#ifdef __FreeBSD__
-#define	splhardnet	splimp
-#ifndef NBPG
-#define NBPG PAGE_SIZE
-#endif
-#ifndef PGOFSET
-#define PGOFSET PAGE_MASK
-#endif
-typedef unsigned long ulong;
-#define delay(x) DELAY(x)
-#endif
-
 /*
  * Vendor types
  */
@@ -225,10 +200,6 @@
 
 	void	*sc_sh;		/* shutdownhook cookie */
 	int	gone;
-
-#if defined(NRND) && NRND > 0
-	rndsource_element_t	rnd_source;
-#endif
 } snc_softc_t;
 
 /*

==== //depot/projects/dtrace/src/sys/dev/snc/if_sncreg.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/dev/snc/if_sncreg.h,v 1.2 2005/01/06 01:43:15 imp Exp $	*/
+/*	$FreeBSD: src/sys/dev/snc/if_sncreg.h,v 1.3 2008/05/30 21:48:05 jhb Exp $	*/
 /*	$NecBSD: if_snreg.h,v 1.3 1999/01/24 01:39:52 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
   
@@ -57,7 +57,7 @@
 #define	SNEC_NREGS	6
 
 /* bank memory size */
-#define	SNEC_NMEMS	(NBPG * 2)
+#define	SNEC_NMEMS	(PAGE_SIZE * 2)
 /* how many bank */
 #define	SNEC_NBANK	0x10
 /* internal buffer size */

==== //depot/projects/dtrace/src/sys/i386/cpufreq/est.c#9 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<