From owner-p4-projects@FreeBSD.ORG Sun May 28 00:09:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9268116A50E; Sun, 28 May 2006 00:04:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3425516A870 for ; Sat, 27 May 2006 23:57:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00B3043D46 for ; Sat, 27 May 2006 23:57:56 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4RNunfo036426 for ; Sat, 27 May 2006 23:56:49 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4RNunlt036423 for perforce@freebsd.org; Sat, 27 May 2006 23:56:49 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 27 May 2006 23:56:49 GMT Message-Id: <200605272356.k4RNunlt036423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 97983 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 May 2006 00:09:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=97983 Change 97983 by kmacy@kmacy_storage:sun4v_work on 2006/05/27 23:56:30 check in Kris' local config changes Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#14 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#14 (text+ko) ==== @@ -43,6 +43,7 @@ options NFSSERVER # Network Filesystem Server options NFS_ROOT # NFS usable as /, requires NFSCLIENT #options MSDOSFS # MSDOS Filesystem +options NULLFS options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework @@ -69,6 +70,8 @@ options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +options DEBUG_LOCKS +options DEBUG_VFS_LOCKS # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel @@ -205,3 +208,6 @@ #options USBVERBOSE #options DEBUG_LOCKS #options DEBUG_VFS_LOCKS + +device ccd +options SPIN_PROFILING From owner-p4-projects@FreeBSD.ORG Sun May 28 04:04:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 314DE16B79C; Sun, 28 May 2006 04:03:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4FE9016B873 for ; Sun, 28 May 2006 03:56:53 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D14443D46 for ; Sun, 28 May 2006 03:56:53 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4S3tkBP061157 for ; Sun, 28 May 2006 03:55:46 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4S3tkQp061154 for perforce@freebsd.org; Sun, 28 May 2006 03:55:46 GMT (envelope-from csjp@freebsd.org) Date: Sun, 28 May 2006 03:55:46 GMT Message-Id: <200605280355.k4S3tkQp061154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 97988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 May 2006 04:04:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=97988 Change 97988 by csjp@csjp_xor on 2006/05/28 03:55:13 Instead of zeroing out termid, resulting in a bogus origin, use getaudit instead. This will allow remote host information to be propagated through to the subject token. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#23 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#23 $ */ #ifdef __APPLE__ @@ -62,12 +62,12 @@ int reterr, const char *fmt, ...) { char text[MAX_AUDITSTRING_LEN]; - au_tid_t termid; token_t *token; long acond; va_list ap; pid_t pid; int error, afd; + struct auditinfo ai; if (auditon(A_GETCOND, &acond, sizeof(acond)) < 0) { /* @@ -92,11 +92,16 @@ errno = error; return (-1); } - /* XXX what should we do for termid? */ - bzero(&termid, sizeof(termid)); + if (getaudit(&ai) < 0) { + error = errno; + syslog(LOG_AUTH | LOG_ERR, "audit: getaudit failed: %s", + strerror(errno)); + errno = error; + return (-1); + } pid = getpid(); token = au_to_subject32(auid, geteuid(), getegid(), - getuid(), getgid(), pid, pid, &termid); + getuid(), getgid(), pid, pid, &ai.ai_termid); if (token == NULL) { syslog(LOG_AUTH | LOG_ERR, "audit: unable to build subject token"); From owner-p4-projects@FreeBSD.ORG Sun May 28 10:13:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BCF516D29C; Sun, 28 May 2006 10:01:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 91A9216D010 for ; Sun, 28 May 2006 09:41:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54C1643D53 for ; Sun, 28 May 2006 09:41:13 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4S9e5ts000805 for ; Sun, 28 May 2006 09:40:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4S9e5VQ000799 for perforce@freebsd.org; Sun, 28 May 2006 09:40:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 28 May 2006 09:40:05 GMT Message-Id: <200605280940.k4S9e5VQ000799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 May 2006 10:14:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=98001 Change 98001 by hselasky@hselasky_mini_itx on 2006/05/28 09:39:32 Add rangecheck for devinfo. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhub.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhub.c#4 (text+ko) ==== @@ -354,10 +354,8 @@ usb_device_request_t req; usb_hub_descriptor_t hubdesc; int port, nports, removable, pwrdly; - char devinfo[1024]; + char devinfo[256]; - /* XXX no range check for devinfo */ - DPRINTFN(1,("\n")); sc->sc_hub = udev; @@ -564,9 +562,9 @@ usbd_delay_ms(udev, pwrdly); } - usbd_devinfo(udev, 1, &devinfo[0]); - device_set_desc_copy(dev, &devinfo[0]); - device_printf(dev, "%s\n", &devinfo[0]); + usbd_devinfo(udev, 1, devinfo, sizeof(devinfo)); + device_set_desc_copy(dev, devinfo); + device_printf(dev, "%s\n", devinfo); device_printf(dev, "%d port%s with %d " "removable, %s powered\n", nports, (nports != 1) ? "s" : "", ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#4 (text+ko) ==== @@ -189,28 +189,36 @@ } void -usbd_devinfo(struct usbd_device *udev, int showclass, char *cp) +usbd_devinfo(struct usbd_device *udev, int showclass, + char *dst_ptr, u_int16_t dst_len) { usb_device_descriptor_t *udd = &udev->ddesc; char vendor[USB_MAX_STRING_LEN]; char product[USB_MAX_STRING_LEN]; - int bcdDevice, bcdUSB; + u_int16_t bcdDevice, bcdUSB; usbd_devinfo_vp(udev, vendor, product, 1); - cp += sprintf(cp, "%s %s", vendor, product); + + bcdUSB = UGETW(udd->bcdUSB); + bcdDevice = UGETW(udd->bcdDevice); + if(showclass) { - cp += sprintf(cp, ", class %d/%d", - udd->bDeviceClass, udd->bDeviceSubClass); + snprintf(dst_ptr, dst_len, "%s %s, class %d/%d, rev %x.%02x/" + "%x.%02x, addr %d", vendor, product, + udd->bDeviceClass, udd->bDeviceSubClass, + (bcdUSB >> 8), bcdUSB & 0xFF, + (bcdDevice >> 8), bcdDevice & 0xFF, + udev->address); + } + else + { + snprintf(dst_ptr, dst_len, "%s %s, rev %x.%02x/" + "%x.%02x, addr %d", vendor, product, + (bcdUSB >> 8), bcdUSB & 0xFF, + (bcdDevice >> 8), bcdDevice & 0xFF, + udev->address); } - bcdUSB = UGETW(udd->bcdUSB); - bcdDevice = UGETW(udd->bcdDevice); - cp += sprintf(cp, ", rev "); - cp += usbd_printBCD(cp, bcdUSB); - *cp++ = '/'; - cp += usbd_printBCD(cp, bcdDevice); - cp += sprintf(cp, ", addr %d", udev->address); - *cp = 0; return; } @@ -1548,10 +1556,10 @@ void usbd_set_desc(device_t dev, struct usbd_device *udev) { - u_int8_t devinfo[1024]; + u_int8_t devinfo[256]; - usbd_devinfo(udev, 1, &devinfo[0]); - device_set_desc_copy(dev, &devinfo[0]); - device_printf(dev, "<%s>\n", &devinfo[0]); + usbd_devinfo(udev, 1, devinfo, sizeof(devinfo)); + device_set_desc_copy(dev, devinfo); + device_printf(dev, "<%s>\n", devinfo); return; } ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#4 (text+ko) ==== @@ -457,7 +457,8 @@ /* routines from usb_subr.c */ void -usbd_devinfo(struct usbd_device *udev, int showclass, char *cp); +usbd_devinfo(struct usbd_device *udev, int showclass, + char *dst_ptr, u_int16_t dst_len); const char * usbd_errstr(usbd_status err); From owner-p4-projects@FreeBSD.ORG Sun May 28 10:41:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F69716AC4D; Sun, 28 May 2006 10:35:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96FD716C321 for ; Sun, 28 May 2006 10:30:19 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C84743D48 for ; Sun, 28 May 2006 10:30:19 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4SATB5k004355 for ; Sun, 28 May 2006 10:29:11 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4SATBkV004352 for perforce@freebsd.org; Sun, 28 May 2006 10:29:11 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 28 May 2006 10:29:11 GMT Message-Id: <200605281029.k4SATBkV004352@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 May 2006 10:41:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=98004 Change 98004 by rdivacky@rdivacky_witten on 2006/05/28 10:28:52 Test commit - comment addition. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_dummy.c#2 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_dummy.c#2 (text+ko) ==== @@ -61,7 +61,7 @@ DUMMY(rt_sigqueueinfo); DUMMY(capget); DUMMY(capset); -DUMMY(sendfile); +DUMMY(sendfile); /* different semantics */ DUMMY(truncate64); DUMMY(setfsuid); DUMMY(setfsgid); From owner-p4-projects@FreeBSD.ORG Sun May 28 10:44:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79EF116A871; Sun, 28 May 2006 10:39:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C160416AD09 for ; Sun, 28 May 2006 10:36:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E54BA43D5F for ; Sun, 28 May 2006 10:36:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4SAZCNA005065 for ; Sun, 28 May 2006 10:35:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4SAXIrL004540 for perforce@freebsd.org; Sun, 28 May 2006 10:33:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 28 May 2006 10:33:18 GMT Message-Id: <200605281033.k4SAXIrL004540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 98005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 May 2006 10:44:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=98005 Change 98005 by rwatson@rwatson_zoo on 2006/05/28 10:32:26 Integrate TrustedBSD base branch from FreeBSD CVS HEAD: - doxygen - !pcvt - !ip6fw - !alpha - !lnc - scc(4) - openbsd nc version - cached - resolver update - libc version bump - 6.1 release note - mount_ext2fs, mount_linprocfs, mount_procfs, mount_reiserfs no longer needed - ipfw tagging - acpi_dock - linsysfs - device_get_sysctl.9, sysctl.9 - timezone update - rs232x - more arm - linux emulation device numbe translation - midi retrofit - iwi retrofit - early tty retrofit rumblings - usb cleanup - aio locking - variable maximum multicast subscription list - udp6_append - usual plethora of locking fixes and enhancements for sockets, networking, vm, vfs, ... - mpsafe nfs client - ntp update TrustedBSD-related: - Loop back audit of exec argument Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#37 integrate .. //depot/projects/trustedbsd/base/Makefile#44 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#72 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#9 integrate .. //depot/projects/trustedbsd/base/UPDATING#66 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.1#11 integrate .. //depot/projects/trustedbsd/base/bin/sh/input.c#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/atomicio.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/atomicio.h#1 branch .. //depot/projects/trustedbsd/base/contrib/netcat/nc.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/netcat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/socks.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/top/top.X#8 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.8#6 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_namespace.h#1 branch .. //depot/projects/trustedbsd/base/etc/Makefile#49 integrate .. //depot/projects/trustedbsd/base/etc/bluetooth/hcsecd.conf#3 integrate .. //depot/projects/trustedbsd/base/etc/cached.conf#1 branch .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#19 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#53 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.root.dist#13 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#41 integrate .. //depot/projects/trustedbsd/base/etc/nsswitch.conf#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/security/600.ip6fwdenied#6 delete .. //depot/projects/trustedbsd/base/etc/periodic/security/650.ip6fwlimit#7 delete .. //depot/projects/trustedbsd/base/etc/periodic/security/Makefile#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#38 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cached#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/ip6fw#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/isdnd#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mdconfig#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/mdconfig2#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/moused#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nsswitch#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pcvt#5 delete .. //depot/projects/trustedbsd/base/etc/rc.d/syscons#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sysctl#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.firewall6#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#26 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#50 integrate .. //depot/projects/trustedbsd/base/include/arpa/nameser.h#5 integrate .. //depot/projects/trustedbsd/base/include/glob.h#4 integrate .. //depot/projects/trustedbsd/base/include/netdb.h#13 integrate .. //depot/projects/trustedbsd/base/include/nsswitch.h#4 integrate .. //depot/projects/trustedbsd/base/include/res_update.h#2 integrate .. //depot/projects/trustedbsd/base/include/resolv.h#10 integrate .. //depot/projects/trustedbsd/base/include/rpc/rpcent.h#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libroken/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/csu/common/crtbegin.c#3 delete .. //depot/projects/trustedbsd/base/lib/csu/common/crtend.c#2 delete .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#20 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libatm/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#23 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/SYS.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getgrent.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/gethostname.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpwent.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/glob.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/glob.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/signal.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/syslog.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_watch.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/isc/list.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/include/nscache.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/include/nscachedcli.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/nameser/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/nameser/ns_samedomain.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Makefile.inc#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gai_strerror.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#24 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyht.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyname.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbynis.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostnamadr.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnameinfo.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetnamadr.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getproto.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getprotoent.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getprotoname.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservbyname.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/net/getservbyport.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/net/getservent.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#23 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/netdb_private.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/nscache.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/nscachedcli.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/nsdispatch.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/nsparser.y#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_mkupdate.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/net/res_update.c#5 delete .. //depot/projects/trustedbsd/base/lib/libc/resolv/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/resolv/Symbol.map#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/resolv/h_errno.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_findzonecut.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_mkupdate.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_state.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/resolv/res_update.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/rpc/getrpcent.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/a64l.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#26 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtol.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtoul.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chflags.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/wait.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libcam/camlib.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ssh/Makefile#15 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/thr_getcontext.S#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/pthread.map#14 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_symbols.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/pthread.map#7 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_attr.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_getschedparam.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutexattr.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#19 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_setschedparam.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libpthread_db.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libpthread_db.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/libthr_db.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libutil/Makefile#14 integrate .. //depot/projects/trustedbsd/base/lib/libutil/kld.c#2 integrate .. //depot/projects/trustedbsd/base/release/Makefile#75 integrate .. //depot/projects/trustedbsd/base/release/doc/README#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/Makefile#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/Makefile#4 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/article.sgml#3 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#30 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/artheader.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#67 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/Makefile#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/alpha/article.sgml#3 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/artheader.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/install.sgml#18 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/Makefile#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#5 delete .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#100 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#22 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#9 integrate .. //depot/projects/trustedbsd/base/release/doc/share/examples/Makefile.relnotesng#10 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#13 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#8 integrate .. //depot/projects/trustedbsd/base/release/i386/mkisoimages.sh#7 integrate .. //depot/projects/trustedbsd/base/release/picobsd/build/picobsd#12 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#34 integrate .. //depot/projects/trustedbsd/base/sbin/adjkerntz/adjkerntz.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/ip6fw/Makefile#4 delete .. //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.8#13 delete .. //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.c#11 delete .. //depot/projects/trustedbsd/base/sbin/ip6fw/sample.sh#2 delete .. //depot/projects/trustedbsd/base/sbin/ipf/ipf/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#45 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#38 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.8#22 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#21 integrate .. //depot/projects/trustedbsd/base/sbin/mount_std/mount_std.8#11 integrate .. //depot/projects/trustedbsd/base/sbin/rcorder/rcorder.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/setkey/setkey.8#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#22 integrate .. //depot/projects/trustedbsd/base/secure/libexec/sftp-server/Makefile#10 integrate .. //depot/projects/trustedbsd/base/secure/libexec/ssh-keysign/Makefile#5 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/scp/Makefile#9 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/sftp/Makefile#10 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-add/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-agent/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-keygen/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh-keyscan/Makefile#7 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh/Makefile#15 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#20 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/README.examples#5 integrate .. //depot/projects/trustedbsd/base/share/examples/kld/cdev/module/cdevmod.c#5 integrate .. //depot/projects/trustedbsd/base/share/examples/mdoc/example.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#66 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#25 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi_dock.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/aha.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ahb.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ahc.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ahd.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/arcmsr.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ath.4#21 integrate .. //depot/projects/trustedbsd/base/share/man/man4/atkbd.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ciss.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/dc.4#15 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ddb.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fdc.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fxp.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man4/geom.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/hptmv.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ida.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ip.4#16 integrate .. //depot/projects/trustedbsd/base/share/man/man4/isp.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ispfw.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/kbdmux.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/lmc.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/Makefile#22 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/lnc.4#9 delete .. //depot/projects/trustedbsd/base/share/man/man4/mlx.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mly.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mpt.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_etf.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pcvt.4#7 delete .. //depot/projects/trustedbsd/base/share/man/man4/pst.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/rr232x.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/sio.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/smp.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/splash.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/trm.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/twa.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/twe.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vkbd.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wi.4#25 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#23 integrate .. //depot/projects/trustedbsd/base/share/man/man5/devfs.5#6 integrate .. //depot/projects/trustedbsd/base/share/man/man5/ext2fs.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/linprocfs.5#8 integrate .. //depot/projects/trustedbsd/base/share/man/man5/linsysfs.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#41 integrate .. //depot/projects/trustedbsd/base/share/man/man5/nsswitch.conf.5#8 integrate .. //depot/projects/trustedbsd/base/share/man/man5/periodic.conf.5#19 integrate .. //depot/projects/trustedbsd/base/share/man/man5/procfs.5#11 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#58 integrate .. //depot/projects/trustedbsd/base/share/man/man5/reiserfs.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/src.conf.5#2 integrate .. //depot/projects/trustedbsd/base/share/man/man7/build.7#12 integrate .. //depot/projects/trustedbsd/base/share/man/man7/hier.7#27 integrate .. //depot/projects/trustedbsd/base/share/man/man7/security.7#16 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#50 integrate .. //depot/projects/trustedbsd/base/share/man/man9/bus_dma.9#14 integrate .. //depot/projects/trustedbsd/base/share/man/man9/crypto.9#7 integrate .. //depot/projects/trustedbsd/base/share/man/man9/device_get_sysctl.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/make_dev.9#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/suser.9#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sysctl.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/sysctl_add_oid.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sysctl_ctx_init.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/zero_copy.9#9 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#28 integrate .. //depot/projects/trustedbsd/base/share/misc/iso3166#8 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#14 integrate .. //depot/projects/trustedbsd/base/share/syscons/fonts/iso15-8x14.fnt#3 integrate .. //depot/projects/trustedbsd/base/share/syscons/fonts/iso15-8x16.fnt#3 integrate .. //depot/projects/trustedbsd/base/share/syscons/fonts/iso15-8x8.fnt#3 integrate .. //depot/projects/trustedbsd/base/share/syscons/fonts/iso15-thin-8x16.fnt#3 integrate .. //depot/projects/trustedbsd/base/share/termcap/termcap.src#19 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/africa#6 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/antarctica#6 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/asia#11 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/australasia#10 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/backward#8 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/etcetera#3 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/europe#11 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/factory#2 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/leapseconds#10 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/northamerica#11 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/southamerica#12 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/systemv#3 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/yearistype.sh#3 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/zone.tab#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/api_up1000.c#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/atomic.s#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/autoconf.c#12 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/busdma_machdep.c#20 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/busspace.c#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/clock.c#17 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/clock_if.m#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/cpuconf.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_disasm.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_instruction.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_interface.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_trace.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_1000a.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_2100_a50.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_2100_a500.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_3000_300.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_3000_500.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_axppci_33.c#10 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_eb164.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_eb64plus.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_kn20aa.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_kn300.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_kn8ae.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_st550.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_st6600.c#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/divrem.m4#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dump_machdep.c#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/elf_machdep.c#15 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/exception.s#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/fp_emulate.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/gdb_machdep.c#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/genassym.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/ieee_float.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/ieee_float.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/in_cksum.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/interrupt.c#23 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/locore.s#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#44 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mem.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mp_machdep.c#23 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pal.s#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#48 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/prom.c#11 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/prom_disp.s#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/promcons.c#15 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/sgmap.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/support.s#11 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/swtch.s#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/sys_machdep.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#32 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/uio_machdep.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/uma_machdep.c#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#32 delete .. //depot/projects/trustedbsd/base/sys/alpha/compile/.cvsignore#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/.cvsignore#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/DEFAULTS#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#41 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC.hints#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/MAC#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/Makefile#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/conf/NOTES#10 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/_bus.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/_inttypes.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/_limits.h#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/_stdint.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/_types.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/alpha_cpu.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/asm.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/atomic.h#13 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/bootinfo.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/bus.h#18 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/bus_dma.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/bwx.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/chipset.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/clock.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/clockvar.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/cpu.h#13 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/cpuconf.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/cpufunc.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/db_machdep.h#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/elf.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/endian.h#11 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/exec.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/float.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/floatingpoint.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/fpu.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/frame.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/gdb_machdep.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ieee.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ieeefp.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/in_cksum.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/inst.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/intr.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/intrcnt.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ioctl_bt848.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ioctl_meteor.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/kdb.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/limits.h#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/md_var.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/memdev.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/mutex.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pal.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/param.h#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pc/bios.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pc/display.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pc/vesa.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pcb.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pcpu.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pmap.h#19 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pmc_mdep.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ppireg.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/proc.h#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/profile.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/prom.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/pte.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ptrace.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/reg.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/reloc.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/resource.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/rpb.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/runq.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/setjmp.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/sf_buf.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/sgmap.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/sigframe.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/signal.h#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/smp.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/stdarg.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/swiz.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/sysarch.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/timerreg.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/ucontext.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/varargs.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/vmparam.h#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/isa/isa.c#13 delete .. //depot/projects/trustedbsd/base/sys/alpha/isa/isa_dma.c#11 delete .. //depot/projects/trustedbsd/base/sys/alpha/isa/isavar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/isa/mcclock_isa.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux.h#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_dummy.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_genassym.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_ipc64.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_locore.s#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_machdep.c#15 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_proto.h#19 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_syscall.h#18 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysent.c#18 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysvec.c#20 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/syscalls.conf#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/linux/syscalls.master#18 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcbus.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcbusreg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcbusvar.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcmem.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcpcia.c#15 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcpciareg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/mcbus/mcpciavar.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/Makefile#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/README.mach-traps#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/exec_ecoff.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/imgact_osf1.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_ioctl.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_misc.c#26 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_mount.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_proto.h#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_signal.c#19 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_signal.h#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_syscall.h#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_sysent.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_sysvec.c#9 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_util.h#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/syscalls.conf#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/osf1/syscalls.master#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/alphapci_if.m#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/apecs.c#11 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/apecs_pci.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/apecsreg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/apecsvar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/bwx.c#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/cia.c#12 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/cia_pci.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/ciareg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/ciavar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/irongate.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/irongate_pci.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/irongatereg.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/irongatevar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/lca.c#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/lca_pci.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/lcareg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/lcavar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/pci_eb164_intr.s#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/pci_eb64plus_intr.s#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/pcibus.c#10 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/pcibus.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/swiz.c#4 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/t2.c#12 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/t2_pci.c#7 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/t2reg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/t2var.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunami.c#10 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunami_pci.c#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunamireg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/pci/tsunamivar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/dwlpx.c#12 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/dwlpxreg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/dwlpxvar.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/gbus.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/gbusreg.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/gbusvar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/kftxx.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/kftxxreg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/kftxxvar.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/mcclock_tlsb.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsb.c#6 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsbcpu.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsbmem.c#5 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsbreg.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsbvar.h#3 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/zs_tlsb.c#14 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/zsreg.h#2 delete .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/zsvar.h#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/amd64/apic_vector.S#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/busdma_machdep.c#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#25 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#20 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#28 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#22 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/apicvar.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/clock.h#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/cpu.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/mutex.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pmap.h#19 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/smp.h#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/specialreg.h#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/KB920X#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SIMICS#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SKYEYE#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/_types.h#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/atomic.h#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/cpu.h#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#11 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0_io.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/sa11x0_reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_cpu_sa1110.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_dev_sa1110.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_space.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq80321.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/Makefile#15 integrate .. //depot/projects/trustedbsd/base/sys/boot/alpha/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/Makefile.inc#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/boot1/Makefile#8 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/boot1/boot1.c#5 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/cdboot/Makefile#5 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/cdboot/version#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/Makefile.common#7 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/conf.c#6 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/help.alpha#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/ldscript#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/main.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/Makefile#5 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/OSFpal.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/alpha_copy.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/alpha_module.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/bbinfo.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/bootinfo.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/common.h#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/delay.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/devicename.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/elf_freebsd.c#6 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/getsecs.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/libalpha.h#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/pal.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/prom.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/prom_disp.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/prom_swpal.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/reboot.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/srmdisk.c#5 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/srmnet.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/start.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/time.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/loader/Makefile#4 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/loader/version#3 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/netboot/Makefile#5 delete .. //depot/projects/trustedbsd/base/sys/boot/alpha/netboot/version#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/include/arcfuncs.h#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/include/arctypes.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/include/libarc.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/Makefile#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/abort.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arcconsole.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arcdisk.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arch/alpha/copy.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arch/alpha/rpb.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arch/alpha/setjmp.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/arch/alpha/start.S#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/bootinfo.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/delay.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/devicename.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/elf_freebsd.c#6 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/module.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/prom.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/setjmperr.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/time.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/loader/Makefile#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/loader/conf.c#4 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/loader/help.alpha#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/loader/main.c#3 delete .. //depot/projects/trustedbsd/base/sys/boot/arc/loader/version#2 delete .. //depot/projects/trustedbsd/base/sys/boot/common/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/load_elf.c#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/loader.8#32 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/bootinfo.c#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/ficl/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sys/boot/ficl/alpha/sysdep.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/ficl/alpha/sysdep.h#4 delete .. //depot/projects/trustedbsd/base/sys/boot/ficl/loader.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.4th#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#30 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot0/boot0.S#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/bootinfo.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/conf.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/io.c#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/powerpc/loader/conf.c#4 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_ccb.h#8 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_debug.h#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_periph.c#19 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_target.c#18 integrate .. //depot/projects/trustedbsd/base/sys/coda/cnode.h#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#31 integrate .. //depot/projects/trustedbsd/base/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#24 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#35 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.h#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#40 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_signal.c#13 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_socket.c#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#26 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_util.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_util.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_hal.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ntoskrnl.c#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.alpha#17 delete .. //depot/projects/trustedbsd/base/sys/conf/NOTES#71 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#100 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.alpha#30 delete .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#28 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#62 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#53 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.mk#13 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#47 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#42 integrate .. //depot/projects/trustedbsd/base/sys/conf/ldscript.alpha#5 delete .. //depot/projects/trustedbsd/base/sys/conf/options#71 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.alpha#13 delete .. //depot/projects/trustedbsd/base/sys/conf/options.amd64#14 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#8 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#35 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#36 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/oltr/if_oltr.c#17 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf_ioctl.c#13 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_ps.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdSchedule.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#48 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pci.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_resource.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advansys.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_linux.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amrvar.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/arl/if_arl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/arl/if_arl_isa.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#53 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#44 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath_pci.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athvar.h#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/atkbdc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfe.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfereg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#53 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_os.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/cnw/if_cnw.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/cpufreq/ichss.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ct/bshw_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ctau/if_ct.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/cx/if_cx.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons_os.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/de/if_de.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/dec/mc146818reg.h#3 delete .. //depot/projects/trustedbsd/base/sys/dev/dec/mcclock.c#4 delete .. //depot/projects/trustedbsd/base/sys/dev/dec/mcclock_if.m#3 delete .. //depot/projects/trustedbsd/base/sys/dev/dec/mcclockvar.h#3 delete .. //depot/projects/trustedbsd/base/sys/dev/digi/digi.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/dpt/dpt_scsi.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/i915_drv.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/mga_drv.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/r300_cmdbuf.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_cbus.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_pccard.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/boot_font.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/gfb.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/tga.c#7 delete .. //depot/projects/trustedbsd/base/sys/dev/fb/tga.h#3 delete .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#52 integrate .. //depot/projects/trustedbsd/base/sys/dev/gfb/gfb_pci.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/hptmv/entry.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/hptmv/osbsd.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_alpha.c#2 delete .. //depot/projects/trustedbsd/base/sys/dev/ic/ns16550.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/idt/idt.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ie/if_ie_isa.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir_pci.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ips/ips.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_tpublic.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwireg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwivar.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgb/if_ixgb.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgb/if_ixgb_osdep.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/am7990.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/am79900.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/if_le_cbus.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/if_le_isa.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/lance.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/lancereg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/le/lancevar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lgereg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/lmc/if_lmc.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc.c#21 delete .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc_cbus.c#11 delete .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc_isa.c#10 delete .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc_pci.c#12 delete .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lncreg.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lncvar.h#5 delete .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_linux.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ciphy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/e1000phy.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/mii_physubr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/miivar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/nsgphy.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/tdkphy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ukphy_subr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_debug.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mse/mse.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mse/mse_cbus.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mse/mse_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/myri10ge/if_myri10ge.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ncv/ncr53c500.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_ngereg.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/nsp/nsp.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/nve/if_nve.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/ofw_console.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/pbio/pbio.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard.c#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#47 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbvar.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/fixup_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#47 integrate .. //depot/projects/trustedbsd/base/sys/dev/pdq/pdq_freebsd.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/pdq/pdqvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/vpoio.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppc/ppc.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppc/ppc_puc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_bfe.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_bus.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_cfg.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_cfg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_ebus.c#9 delete .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_pccard.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_pci.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_sbus.c#10 delete .. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/pucvar.h#12 delete .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/re/if_re.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/rr232x/LICENSE#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/README#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/array.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/him.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/himfuncs.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/hptintf.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/ldm.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/list.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/os_bsd.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/os_bsd.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/osm.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/osm_bsd.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/rr232x_config.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rr232x/rr232x_config.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/safe/safe.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/safe/safevar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sbsh/if_sbsh.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio_puc.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sk/if_sk.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sk/if_skreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sk/xmaciireg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sk/yukonreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/es1888.c#6 delete .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/gusc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/midi.c#8 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/midi.h#7 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/midiq.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/mpu401.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/mpu401.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/mpu_if.m#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/mpufoi_if.m#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/sequencer.c#9 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/sequencer.h#4 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/synth_if.m#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/cmi.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10k1.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/stg/tmc18c30.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/apm/apm_saver.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/scterm-sc.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/scvesactl.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/scvgarndr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/tga/tga_pci.c#11 delete .. //depot/projects/trustedbsd/base/sys/dev/tga/tga_pci.h#3 delete .. //depot/projects/trustedbsd/base/sys/dev/trm/trm.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_osl_cam.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/txp/if_txp.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus_puc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_core.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_cpu_alpha.c#7 delete .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dbg.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_ns8250.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_dev_z8530.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_tty.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsecvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehcivar.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axereg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohcireg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohcivar.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/sl811hs.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci_pci.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhcivar.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_mem.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#51 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdivar.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/wds/wd7000.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#53 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/zs/zs.c#16 integrate .. //depot/projects/trustedbsd/base/sys/doc/subsys/Dependencies#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-cam#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-geom#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-kern#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-linux#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Doxyfile-vm#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/README#1 branch .. //depot/projects/trustedbsd/base/sys/doc/subsys/common-Doxyfile#1 branch .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vfsops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#32 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#25 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.h#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_subr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#24 integrate .. //depot/projects/trustedbsd/base/sys/gdb/gdb.h#3 integrate .. //depot/projects/trustedbsd/base/sys/gdb/gdb_cons.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gdb/gdb_main.c#6 integrate .. //depot/projects/trustedbsd/base/sys/gdb/gdb_packet.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#33 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#14 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#13 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 28 11:46:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E26FF16A6F9; Sun, 28 May 2006 11:46:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5899616A5DD for ; Sun, 28 May 2006 11:46:52 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0399643D46 for ; Sun, 28 May 2006 11:46:52 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4SBjhbI019356 for ; Sun, 28 May 2006 11:45:43 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4SBjeuf019350 for perforce@freebsd.org; Sun, 28 May 2006 11:45:40 GMT (envelope-from netchild@freebsd.org) Date: Sun, 28 May 2006 11:45:40 GMT Message-Id: <200605281145.k4SBjeuf019350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 98007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 May 2006 11:46:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=98007 Change 98007 by netchild@netchild_magellan on 2006/05/28 11:44:52 Integrate changes from the parent branch, the sound stuff changed (midi). Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/conf/files#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/kmod.mk#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/midi.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/midi.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/midiq.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/mpu401.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/mpu401.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/mpu_if.m#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/mpufoi_if.m#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/sequencer.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/sequencer.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/synth_if.m#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/ohcireg.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/include/npx.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/isa/npx.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_exec.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/sound/driver/cmi/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/sound/driver/emu10k1/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/sound/sound/Makefile#2 integrate Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1118 2006/05/18 23:30:47 ambrisko Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1119 2006/05/27 16:32:05 netchild Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -905,6 +905,12 @@ #dev/sound/usb/upcm.c optional snd_upcm usb dev/sound/usb/uaudio.c optional snd_uaudio usb dev/sound/usb/uaudio_pcm.c optional snd_uaudio usb +dev/sound/midi/midi.c optional sound +dev/sound/midi/mpu401.c optional sound +dev/sound/midi/mpu_if.m optional sound +dev/sound/midi/mpufoi_if.m optional sound +dev/sound/midi/sequencer.c optional sound +dev/sound/midi/synth_if.m optional sound dev/sr/if_sr.c optional sr dev/sr/if_sr_pci.c optional sr pci dev/stg/tmc18c30.c optional stg ==== //depot/projects/soc2006/rbeasley_sound/sys/conf/kmod.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.207 2006/04/28 21:21:51 marcel Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.208 2006/05/27 16:32:05 netchild Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -321,8 +321,9 @@ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ - dev/usb/usb_if.m isa/isa_if.m kern/bus_if.m kern/cpufreq_if.m \ - kern/device_if.m kern/serdev_if.m \ + dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ + dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ + kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/crypto_if.m \ pc98/pc98/canbus_if.m pci/agp_if.m ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt.c#2 (text+ko) ==== @@ -92,7 +92,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.28 2006/05/26 05:41:14 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.29 2006/05/27 17:26:57 mjacob Exp $"); #include #include /* XXX For static handler registration */ @@ -1206,7 +1206,7 @@ void mpt_send_cmd(struct mpt_softc *mpt, request_t *req) { - if (mpt->verbose > MPT_PRT_TRACE) { + if (mpt->verbose > MPT_PRT_DEBUG2) { mpt_dump_request(mpt, req); } bus_dmamap_sync(mpt->request_dmat, mpt->request_dmap, @@ -1685,15 +1685,16 @@ size_t len; rv = mpt_read_cfg_header(mpt, MPI_CONFIG_PAGETYPE_IOC, - /*PageNumber*/2, /*PageAddress*/0, &hdr, - /*sleep_ok*/FALSE, /*timeout_ms*/5000); + 2, 0, &hdr, FALSE, 5000); /* * If it's an invalid page, so what? Not a supported function.... */ - if (rv == EINVAL) + if (rv == EINVAL) { return (0); - if (rv) + } + if (rv) { return (rv); + } #if __FreeBSD_version >= 500000 mpt_lprt(mpt, MPT_PRT_DEBUG, "IOC Page 2 Header: ver %x, len %zx, " @@ -1709,22 +1710,28 @@ len = hdr.PageLength * sizeof(uint32_t); mpt->ioc_page2 = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO); - if (mpt->ioc_page2 == NULL) + if (mpt->ioc_page2 == NULL) { + mpt_prt(mpt, "unable to allocate memory for IOC page 2\n"); + mpt_raid_free_mem(mpt); return (ENOMEM); + } memcpy(&mpt->ioc_page2->Header, &hdr, sizeof(hdr)); - rv = mpt_read_cur_cfg_page(mpt, /*PageAddress*/0, - &mpt->ioc_page2->Header, len, - /*sleep_ok*/FALSE, /*timeout_ms*/5000); + rv = mpt_read_cur_cfg_page(mpt, 0, + &mpt->ioc_page2->Header, len, FALSE, 5000); if (rv) { mpt_prt(mpt, "failed to read IOC Page 2\n"); - } else if (mpt->ioc_page2->CapabilitiesFlags != 0) { + mpt_raid_free_mem(mpt); + return (EIO); + } + + if (mpt->ioc_page2->CapabilitiesFlags != 0) { uint32_t mask; mpt_prt(mpt, "Capabilities: ("); for (mask = 1; mask != 0; mask <<= 1) { - if ((mpt->ioc_page2->CapabilitiesFlags & mask) == 0) + if ((mpt->ioc_page2->CapabilitiesFlags & mask) == 0) { continue; - + } switch (mask) { case MPI_IOCPAGE2_CAP_FLAGS_IS_SUPPORT: mpt_prtc(mpt, " RAID-0"); @@ -1766,11 +1773,11 @@ } len = mpt->ioc_page2->MaxVolumes * sizeof(struct mpt_raid_volume); - mpt->raid_volumes = malloc(len, M_DEVBUF, M_NOWAIT); + mpt->raid_volumes = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO); if (mpt->raid_volumes == NULL) { mpt_prt(mpt, "Could not allocate RAID volume data\n"); - } else { - memset(mpt->raid_volumes, 0, len); + mpt_raid_free_mem(mpt); + return (ENOMEM); } /* @@ -1780,54 +1787,57 @@ */ mpt->raid_max_volumes = mpt->ioc_page2->MaxVolumes; - len = sizeof(*mpt->raid_volumes->config_page) - + (sizeof(RAID_VOL0_PHYS_DISK)*(mpt->ioc_page2->MaxPhysDisks - 1)); + len = sizeof(*mpt->raid_volumes->config_page) + + (sizeof (RAID_VOL0_PHYS_DISK) * (mpt->ioc_page2->MaxPhysDisks - 1)); for (i = 0; i < mpt->ioc_page2->MaxVolumes; i++) { mpt_raid = &mpt->raid_volumes[i]; - mpt_raid->config_page = malloc(len, M_DEVBUF, M_NOWAIT); + mpt_raid->config_page = + malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO); if (mpt_raid->config_page == NULL) { mpt_prt(mpt, "Could not allocate RAID page data\n"); - break; + mpt_raid_free_mem(mpt); + return (ENOMEM); } - memset(mpt_raid->config_page, 0, len); } mpt->raid_page0_len = len; len = mpt->ioc_page2->MaxPhysDisks * sizeof(struct mpt_raid_disk); - mpt->raid_disks = malloc(len, M_DEVBUF, M_NOWAIT); + mpt->raid_disks = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO); if (mpt->raid_disks == NULL) { mpt_prt(mpt, "Could not allocate RAID disk data\n"); - } else { - memset(mpt->raid_disks, 0, len); + mpt_raid_free_mem(mpt); + return (ENOMEM); } - mpt->raid_max_disks = mpt->ioc_page2->MaxPhysDisks; + /* + * Load page 3. + */ rv = mpt_read_cfg_header(mpt, MPI_CONFIG_PAGETYPE_IOC, - /*PageNumber*/3, /*PageAddress*/0, &hdr, - /*sleep_ok*/FALSE, /*timeout_ms*/5000); - if (rv) + 3, 0, &hdr, FALSE, 5000); + if (rv) { + mpt_raid_free_mem(mpt); return (EIO); + } mpt_lprt(mpt, MPT_PRT_DEBUG, "IOC Page 3 Header: %x %x %x %x\n", - hdr.PageVersion, hdr.PageLength, hdr.PageNumber, hdr.PageType); + hdr.PageVersion, hdr.PageLength, hdr.PageNumber, hdr.PageType); - if (mpt->ioc_page3 != NULL) - free(mpt->ioc_page3, M_DEVBUF); len = hdr.PageLength * sizeof(uint32_t); mpt->ioc_page3 = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO); - if (mpt->ioc_page3 == NULL) - return (-1); + if (mpt->ioc_page3 == NULL) { + mpt_prt(mpt, "unable to allocate memory for IOC page 3\n"); + mpt_raid_free_mem(mpt); + return (ENOMEM); + } memcpy(&mpt->ioc_page3->Header, &hdr, sizeof(hdr)); - rv = mpt_read_cur_cfg_page(mpt, /*PageAddress*/0, - &mpt->ioc_page3->Header, len, - /*sleep_ok*/FALSE, /*timeout_ms*/5000); + rv = mpt_read_cur_cfg_page(mpt, 0, + &mpt->ioc_page3->Header, len, FALSE, 5000); if (rv) { - mpt_prt(mpt, "failed to read IOC Page 3\n"); + mpt_raid_free_mem(mpt); + return (EIO); } - mpt_raid_wakeup(mpt); - return (0); } @@ -2458,6 +2468,9 @@ /* * Read IOC configuration information. + * + * We need this to determine whether or not we have certain + * settings for Integrated Mirroring (e.g.). */ mpt_read_config_info_ioc(mpt); ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.19 2006/05/26 05:54:21 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.20 2006/05/27 17:26:57 mjacob Exp $ */ /*- * Generic defines for LSI '909 FC adapters. * FreeBSD Version. @@ -491,7 +491,8 @@ twildcard : 1, tenabled : 1, role : 2, /* none, ini, target, both */ - : 2, + : 1, + raid_enabled : 1, raid_mwce_set : 1, getreqwaiter : 1, shutdwn_raid : 1, @@ -549,7 +550,7 @@ } fc; } cfg; - /* Controller Info */ + /* Controller Info for RAID information */ CONFIG_PAGE_IOC_2 * ioc_page2; CONFIG_PAGE_IOC_3 * ioc_page3; @@ -871,7 +872,7 @@ #define MPT_DUMP_REPLY_FRAME(mpt, reply_frame) \ do { \ - if (mpt->verbose >= MPT_PRT_DEBUG) \ + if (mpt->verbose > MPT_PRT_DEBUG) \ mpt_dump_reply_frame(mpt, reply_frame); \ } while(0) ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_cam.c#2 (text+ko) ==== @@ -91,7 +91,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.18 2006/05/26 05:54:21 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.19 2006/05/27 17:26:57 mjacob Exp $"); #include #include @@ -1184,7 +1184,7 @@ } else { callout_handle_init(&ccb->ccb_h.timeout_ch); } - if (mpt->verbose >= MPT_PRT_DEBUG) { + if (mpt->verbose > MPT_PRT_DEBUG) { int nc = 0; mpt_print_request(req->req_vbuf); for (trq = req->chain; trq; trq = trq->chain) { @@ -1192,6 +1192,7 @@ mpt_dump_sgl(trq->req_vbuf, 0); } } + if (hdrp->Function == MPI_FUNCTION_TARGET_ASSIST) { request_t *cmd_req = MPT_TAG_2_REQ(mpt, ccb->csio.tag_id); mpt_tgt_state_t *tgt = MPT_TGT_STATE(mpt, cmd_req); @@ -1567,7 +1568,7 @@ } else { callout_handle_init(&ccb->ccb_h.timeout_ch); } - if (mpt->verbose >= MPT_PRT_DEBUG) { + if (mpt->verbose > MPT_PRT_DEBUG) { int nc = 0; mpt_print_request(req->req_vbuf); for (trq = req->chain; trq; trq = trq->chain) { @@ -1603,6 +1604,7 @@ struct ccb_scsiio *csio = &ccb->csio; struct ccb_hdr *ccbh = &ccb->ccb_h; bus_dmamap_callback_t *cb; + target_id_t tgt; int raid_passthru; /* Get the pointer for the physical addapter */ @@ -1647,8 +1649,21 @@ mpt_req->Function = MPI_FUNCTION_SCSI_IO_REQUEST; if (raid_passthru) { mpt_req->Function = MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH; + CAMLOCK_2_MPTLOCK(mpt); + if (mpt_map_physdisk(mpt, ccb, &tgt) != 0) { + MPTLOCK_2_CAMLOCK(mpt); + ccb->ccb_h.status &= ~CAM_SIM_QUEUED; + mpt_set_ccb_status(ccb, CAM_DEV_NOT_THERE); + xpt_done(ccb); + return; + } + MPTLOCK_2_CAMLOCK(mpt); + mpt_req->Bus = 0; /* we never set bus here */ + } else { + tgt = ccb->ccb_h.target_id; + mpt_req->Bus = 0; /* XXX */ + } - mpt_req->Bus = 0; /* we don't have multiport devices yet */ mpt_req->SenseBufferLength = (csio->sense_len < MPT_SENSE_SIZE) ? csio->sense_len : MPT_SENSE_SIZE; @@ -1660,7 +1675,7 @@ mpt_req->MsgContext = htole32(req->index | scsi_io_handler_id); /* Which physical device to do the I/O on */ - mpt_req->TargetID = ccb->ccb_h.target_id; + mpt_req->TargetID = tgt; /* We assume a single level LUN type */ if (ccb->ccb_h.target_lun >= 256) { @@ -1722,9 +1737,25 @@ mpt_req->SenseBufferLowAddr = req->sense_pbuf; /* + * Do a *short* print here if we're set to MPT_PRT_DEBUG + */ + if (mpt->verbose == MPT_PRT_DEBUG) { + mpt_prt(mpt, "mpt_start: %s op 0x%x ", + (mpt_req->Function == MPI_FUNCTION_SCSI_IO_REQUEST)? + "SCSI_IO_REQUEST" : "SCSI_IO_PASSTHRU", mpt_req->CDB[0]); + if (mpt_req->Control != MPI_SCSIIO_CONTROL_NODATATRANSFER) { + mpt_prtc(mpt, "(%s %u byte%s ", + (mpt_req->Control == MPI_SCSIIO_CONTROL_READ)? + "read" : "write", csio->dxfer_len, + (csio->dxfer_len == 1)? ")" : "s)"); + } + mpt_prtc(mpt, "tgt %u lun %u req %p:%u\n", tgt, + ccb->ccb_h.target_lun, req, req->serno); + } + + /* * If we have any data to send with this command map it into bus space. */ - if ((ccbh->flags & CAM_DIR_MASK) != CAM_DIR_NONE) { if ((ccbh->flags & CAM_SCATTER_VALID) == 0) { /* @@ -2061,6 +2092,10 @@ inq->device &= ~0x1F; inq->device |= T_NODEVICE; } + if (mpt->verbose == MPT_PRT_DEBUG) { + mpt_prt(mpt, "mpt_scsi_reply_handler: %p:%u complete\n", + req, req->serno); + } ccb->ccb_h.status &= ~CAM_SIM_QUEUED; KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d\n", __LINE__)); MPTLOCK_2_CAMLOCK(mpt); @@ -2631,7 +2666,7 @@ { struct mpt_softc *mpt; struct ccb_trans_settings *cts; - u_int tgt; + target_id_t tgt; int raid_passthru; CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_TRACE, ("mpt_action\n")); @@ -2681,11 +2716,11 @@ case XPT_RESET_BUS: mpt_lprt(mpt, MPT_PRT_DEBUG, "XPT_RESET_BUS\n"); - if (raid_passthru == 0) { - CAMLOCK_2_MPTLOCK(mpt); - (void)mpt_bus_reset(mpt, FALSE); - MPTLOCK_2_CAMLOCK(mpt); - } + + CAMLOCK_2_MPTLOCK(mpt); + (void) mpt_bus_reset(mpt, FALSE); + MPTLOCK_2_CAMLOCK(mpt); + /* * mpt_bus_reset is always successful in that it * will fall back to a hard reset should a bus @@ -2760,11 +2795,20 @@ break; } + if (mpt->ioc_page2 && mpt->ioc_page2->MaxPhysDisks != 0 && + raid_passthru == 0) { + mpt_set_ccb_status(ccb, CAM_REQ_CMP); + break; + } + m = mpt->mpt_port_page2.PortSettings; if ((m & MPI_SCSIPORTPAGE2_PORT_MASK_NEGO_MASTER_SETTINGS) == MPI_SCSIPORTPAGE2_PORT_ALL_MASTER_SETTINGS) { +mpt_prt(mpt, "master settings\n"); +if (raid_passthru == 0) { mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; +} } dval = 0; @@ -2962,7 +3006,8 @@ cpi->hba_inquiry = PI_SDTR_ABLE|PI_TAG_ABLE|PI_WIDE_16; } if (raid_passthru) { - cpi->max_target = mpt->ioc_page2->MaxPhysDisks; + cpi->max_lun = 0; + cpi->hba_misc = PIM_NOBUSRESET; cpi->initiator_id = cpi->max_target+1; } @@ -3057,17 +3102,38 @@ mpt_get_spi_settings(struct mpt_softc *mpt, struct ccb_trans_settings *cts) { #ifdef CAM_NEW_TRAN_CODE - struct ccb_trans_settings_scsi *scsi = - &cts->proto_specific.scsi; - struct ccb_trans_settings_spi *spi = - &cts->xport_specific.spi; + struct ccb_trans_settings_scsi *scsi = &cts->proto_specific.scsi; + struct ccb_trans_settings_spi *spi = &cts->xport_specific.spi; #endif - int tgt; + target_id_t tgt; uint8_t dval, pval, oval; int rv; + /* + * Check to see if this is an Integrated Raid card. + * + * If it is, and we're the RAID bus side, both current + * and goal settings are synthesized as we only look at + * or change actual settings for the physical disk side. + * + * NB: In the future we can just do this on the blacked out + * NB: portion that the RAID volume covers- there may be + * NB: other entities on this bus as well. + */ + + if (mpt->phydisk_sim) { + if (xpt_path_sim(cts->ccb_h.path) != mpt->phydisk_sim) { + dval = DP_WIDE|DP_DISC|DP_TQING; + oval = (mpt->mpt_port_page0.Capabilities >> 16); + pval = (mpt->mpt_port_page0.Capabilities >> 8); + tgt = cts->ccb_h.target_id; + goto skip; + } + } - tgt = cts->ccb_h.target_id; + if (mpt_map_physdisk(mpt, (union ccb *)cts, &tgt) != 0) { + return (-1); + } /* * We aren't going off of Port PAGE2 params for @@ -3115,6 +3181,7 @@ oval = (mpt->mpt_port_page0.Capabilities >> 16); pval = (mpt->mpt_port_page0.Capabilities >> 8); } + skip: #ifndef CAM_NEW_TRAN_CODE cts->flags &= ~(CCB_TRANS_DISC_ENB|CCB_TRANS_TAG_ENB); if (dval & DP_DISC_ENABLE) { ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_pci.c#2 (text+ko) ==== @@ -96,7 +96,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.28 2006/05/04 02:35:04 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.29 2006/05/27 17:26:57 mjacob Exp $"); #include #include @@ -600,27 +600,10 @@ mpt_reset(mpt, /*reinit*/FALSE); mpt_dma_mem_free(mpt); mpt_free_bus_resources(mpt); - if (mpt->raid_volumes != NULL && mpt->ioc_page2 != NULL) { - int i; - for (i = 0; i < mpt->ioc_page2->MaxVolumes; i++) { - struct mpt_raid_volume *mpt_vol; - - mpt_vol = &mpt->raid_volumes[i]; - if (mpt_vol->config_page) { - free(mpt_vol->config_page, M_DEVBUF); - } - } + mpt_raid_free_mem(mpt); + if (mpt->eh != NULL) { + EVENTHANDLER_DEREGISTER(shutdown_final, mpt->eh); } - if (mpt->ioc_page2 != NULL) - free(mpt->ioc_page2, M_DEVBUF); - if (mpt->ioc_page3 != NULL) - free(mpt->ioc_page3, M_DEVBUF); - if (mpt->raid_volumes != NULL) - free(mpt->raid_volumes, M_DEVBUF); - if (mpt->raid_disks != NULL) - free(mpt->raid_disks, M_DEVBUF); - if (mpt->eh != NULL) - EVENTHANDLER_DEREGISTER(shutdown_final, mpt->eh); MPT_UNLOCK(mpt); } return(0); ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_raid.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_raid.c,v 1.7 2006/05/26 05:54:21 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_raid.c,v 1.8 2006/05/27 17:26:57 mjacob Exp $"); #include #include @@ -1494,6 +1494,39 @@ mpt_raid_timer, mpt); } +void +mpt_raid_free_mem(struct mpt_softc *mpt) +{ + + if (mpt->raid_volumes) { + struct mpt_raid_volume *mpt_raid; + int i; + for (i = 0; i < mpt->raid_max_volumes; i++) { + mpt_raid = &mpt->raid_volumes[i]; + if (mpt_raid->config_page) { + free(mpt_raid->config_page, M_DEVBUF); + mpt_raid->config_page = NULL; + } + } + free(mpt->raid_volumes, M_DEVBUF); + mpt->raid_volumes = NULL; + } + if (mpt->raid_disks) { + free(mpt->raid_disks, M_DEVBUF); + mpt->raid_disks = NULL; + } + if (mpt->ioc_page2) { + free(mpt->ioc_page2, M_DEVBUF); + mpt->ioc_page2 = NULL; + } + if (mpt->ioc_page3) { + free(mpt->ioc_page3, M_DEVBUF); + mpt->ioc_page3 = NULL; + } + mpt->raid_max_volumes = 0; + mpt->raid_max_disks = 0; +} + static int mpt_raid_set_vol_resync_rate(struct mpt_softc *mpt, u_int rate) { ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_raid.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt_raid.h,v 1.3 2006/05/26 05:43:14 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt_raid.h,v 1.4 2006/05/27 17:26:57 mjacob Exp $ */ /*- * Definitions for the integrated RAID features LSI MPT Fusion adapters. * @@ -59,12 +59,13 @@ bus_size_t, int, int); cam_status -mpt_map_physdisk(struct mpt_softc *, union ccb *, u_int *); +mpt_map_physdisk(struct mpt_softc *, union ccb *, target_id_t *); cam_status mpt_raid_quiesce_disk(struct mpt_softc *, struct mpt_raid_disk *, request_t *); int mpt_refresh_raid_data(struct mpt_softc *); void mpt_schedule_raid_refresh(struct mpt_softc *); +void mpt_raid_free_mem(struct mpt_softc *); static __inline void mpt_raid_wakeup(struct mpt_softc *mpt) ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/cmi.c#2 (text+ko) ==== @@ -48,10 +48,12 @@ #include #include +#include #include "mixer_if.h" +#include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.34 2006/01/21 09:05:12 joel Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.35 2006/05/27 16:51:37 netchild Exp $"); /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 @@ -112,6 +114,13 @@ int spdif_enabled; unsigned int bufsz; struct sc_chinfo pch, rch; + + struct mpu401 *mpu; + mpu401_intr_t *mpu_intr; + struct resource *mpu_reg; + int mpu_regid; + bus_space_tag_t mpu_bt; + bus_space_handle_t mpu_bh; }; /* Channel caps */ @@ -551,6 +560,9 @@ } } + if(sc->mpu_intr) { + (sc->mpu_intr)(sc->mpu); + } snd_mtxunlock(sc->lock); return; } @@ -747,6 +759,74 @@ }; MIXER_DECLARE(cmi_mixer); +/* + * mpu401 functions + */ + +static unsigned char +cmi_mread(void *arg, struct sc_info *sc, int reg) +{ + unsigned int d; + + d = bus_space_read_1(0,0, 0x330 + reg); + /* printf("cmi_mread: reg %x %x\n",reg, d); + */ + return d; +} + +static void +cmi_mwrite(void *arg, struct sc_info *sc, int reg, unsigned char b) +{ + + bus_space_write_1(0,0,0x330 + reg , b); +} + +static int +cmi_muninit(void *arg, struct sc_info *sc) +{ + + snd_mtxlock(sc->lock); + sc->mpu_intr = 0; + sc->mpu = 0; + snd_mtxunlock(sc->lock); + + return 0; +} + +static kobj_method_t cmi_mpu_methods[] = { + KOBJMETHOD(mpufoi_read, cmi_mread), + KOBJMETHOD(mpufoi_write, cmi_mwrite), + KOBJMETHOD(mpufoi_uninit, cmi_muninit), + { 0, 0 } +}; + +DEFINE_CLASS(cmi_mpu, cmi_mpu_methods, 0); + +static void +cmi_midiattach(struct sc_info *sc) { +/* + const struct { + int port,bits; + } *p, ports[] = { + {0x330,0}, + {0x320,1}, + {0x310,2}, + {0x300,3}, + {0,0} } ; + Notes, CMPCI_REG_VMPUSEL sets the io port for the mpu. Does + anyone know how to bus_space tag? +*/ + cmi_clr4(sc, CMPCI_REG_FUNC_1, CMPCI_REG_UART_ENABLE); + cmi_clr4(sc, CMPCI_REG_LEGACY_CTRL, + CMPCI_REG_VMPUSEL_MASK << CMPCI_REG_VMPUSEL_SHIFT); + cmi_set4(sc, CMPCI_REG_LEGACY_CTRL, + 0 << CMPCI_REG_VMPUSEL_SHIFT ); + cmi_set4(sc, CMPCI_REG_FUNC_1, CMPCI_REG_UART_ENABLE); + sc->mpu = mpu401_init(&cmi_mpu_class, sc, cmi_intr, &sc->mpu_intr); +} + + + /* ------------------------------------------------------------------------- */ /* Power and reset */ @@ -802,6 +882,10 @@ CMPCI_REG_TDMA_INTR_ENABLE); cmi_clr4(sc, CMPCI_REG_FUNC_0, CMPCI_REG_CH0_ENABLE | CMPCI_REG_CH1_ENABLE); + cmi_clr4(sc, CMPCI_REG_FUNC_1, CMPCI_REG_UART_ENABLE); + + if( sc->mpu ) + sc->mpu_intr = 0; } /* ------------------------------------------------------------------------- */ @@ -857,6 +941,8 @@ sc->st = rman_get_bustag(sc->reg); sc->sh = rman_get_bushandle(sc->reg); + cmi_midiattach(sc); + sc->irqid = 0; sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irqid, RF_ACTIVE | RF_SHAREABLE); @@ -936,7 +1022,12 @@ bus_dma_tag_destroy(sc->parent_dmat); bus_teardown_intr(dev, sc->irq, sc->ih); bus_release_resource(dev, SYS_RES_IRQ, sc->irqid, sc->irq); + if(sc->mpu) + mpu401_uninit(sc->mpu); bus_release_resource(dev, SYS_RES_IOPORT, sc->regid, sc->reg); + if (sc->mpu_reg) + bus_release_resource(dev, SYS_RES_IOPORT, sc->mpu_regid, sc->mpu_reg); + snd_mtxfree(sc->lock); free(sc, M_DEVBUF); @@ -1007,4 +1098,5 @@ DRIVER_MODULE(snd_cmi, pci, cmi_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_cmi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); +MODULE_DEPEND(snd_cmi, midi, 1,1,1); MODULE_VERSION(snd_cmi, 1); ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/emu10k1.c#2 (text+ko) ==== @@ -35,7 +35,10 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.58 2006/01/21 16:21:06 netchild Exp $"); +#include +#include "mpufoi_if.h" + +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.59 2006/05/27 16:51:37 netchild Exp $"); /* -------------------------------------------------------------------- */ @@ -137,6 +140,9 @@ struct emu_voice voice[64]; struct sc_pchinfo pch[EMU_MAX_CHANS]; struct sc_rchinfo rch[3]; + struct mpu401 *mpu; + mpu401_intr_t *mpu_intr; + int mputx; }; /* -------------------------------------------------------------------- */ @@ -1059,8 +1065,65 @@ }; CHANNEL_DECLARE(emurchan); +static unsigned char +emu_mread(void *arg, struct sc_info *sc, int reg) +{ + unsigned int d; + + d = emu_rd(sc, 0x18 + reg, 1); + return d; +} + +static void +emu_mwrite(void *arg, struct sc_info *sc, int reg, unsigned char b) +{ + + emu_wr(sc, 0x18 + reg, b, 1); +} + +static int +emu_muninit(void *arg, struct sc_info *sc) +{ + + snd_mtxlock(sc->lock); + sc->mpu_intr = 0; + snd_mtxunlock(sc->lock); + + return 0; +} + +static kobj_method_t emu_mpu_methods[] = { + KOBJMETHOD(mpufoi_read, emu_mread), + KOBJMETHOD(mpufoi_write, emu_mwrite), + KOBJMETHOD(mpufoi_uninit, emu_muninit), + { 0, 0 } +}; + +DEFINE_CLASS(emu_mpu, emu_mpu_methods, 0); + +static void +emu_intr2(void *p) +{ + struct sc_info *sc = (struct sc_info *)p; + + if (sc->mpu_intr) + (sc->mpu_intr)(sc->mpu); +} + +static void +emu_midiattach(struct sc_info *sc) +{ + int i; + + i = emu_rd(sc, INTE, 4); + i |= INTE_MIDIRXENABLE; + emu_wr(sc, INTE, i, 4); + + sc->mpu = mpu401_init(&emu_mpu_class, sc, emu_intr2, &sc->mpu_intr); +} /* -------------------------------------------------------------------- */ /* The interrupt handler */ + static void emu_intr(void *data) { @@ -1100,6 +1163,11 @@ #endif } + if (stat & IPR_MIDIRECVBUFEMPTY) + if (sc->mpu_intr) { + (sc->mpu_intr)(sc->mpu); + ack |= IPR_MIDIRECVBUFEMPTY | IPR_MIDITRANSBUFEMPTY; + } if (stat & ~ack) device_printf(sc->dev, "dodgy irq: %x (harmless)\n", stat & ~ack); @@ -1871,6 +1939,8 @@ emu_free(sc, sc->mem.ptb_pages); emu_free(sc, sc->mem.silent_page); + if(sc->mpu) + mpu401_uninit(sc->mpu); return 0; } @@ -1963,6 +2033,8 @@ gotmic = (ac97_getcaps(codec) & AC97_CAP_MICCHANNEL) ? 1 : 0; if (mixer_init(dev, ac97_getmixerclass(), codec) == -1) goto bad; + emu_midiattach(sc); + i = 0; sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &i, RF_ACTIVE | RF_SHAREABLE); @@ -2041,6 +2113,7 @@ DRIVER_MODULE(snd_emu10k1, cardbus, emu_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_emu10k1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_emu10k1, 1); +MODULE_DEPEND(snd_emu10k1, midi, 1, 1, 1); /* dummy driver to silence the joystick device */ static int ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/ehci.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.45 2006/05/24 03:04:11 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.46 2006/05/28 05:27:08 iedowse Exp $"); #include #include @@ -654,7 +654,7 @@ pipe = xfer->pipe; - p = KERNADDR(&xfer->dmabuf, 0); + p = xfer->buffer; m = min(sc->sc_noport, xfer->length * 8 - 1); memset(p, 0, xfer->length); for (i = 1; i <= m; i++) { @@ -1742,7 +1742,7 @@ index = UGETW(req->wIndex); if (len != 0) - buf = KERNADDR(&xfer->dmabuf, 0); + buf = xfer->buffer; #define C(x,y) ((x) | ((y) << 8)) switch(C(req->bRequest, req->bmRequestType)) { @@ -2335,11 +2335,11 @@ ehci_soft_qtd_t *newinactive, ehci_soft_qtd_t **sp, ehci_soft_qtd_t **ep) { ehci_soft_qtd_t *next, *cur; - ehci_physaddr_t dataphys, dataphyspage, dataphyslastpage, nextphys; + ehci_physaddr_t dataphys, nextphys; u_int32_t qtdstatus; - int len, curlen, mps, offset; - int i, iscontrol; - usb_dma_t *dma = &xfer->dmabuf; + int adj, len, curlen, mps, offset, pagelen, seg, segoff; + int i, iscontrol, forceshort; + struct usb_dma_mapping *dma = &xfer->dmamap; DPRINTFN(alen<4*4096,("ehci_alloc_sqtd_chain: start len=%d\n", alen)); @@ -2347,8 +2347,6 @@ len = alen; iscontrol = (epipe->pipe.endpoint->edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL; - dataphys = DMAADDR(dma, 0); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 28 12:40:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9FD416AF95; Sun, 28 May 2006 12:40:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 99AA016AFB1; Sun, 28 May 2006 12:40:41 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8BA343D4C; Sun, 28 May 2006 12:40:40 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 4482E46C60; Sun, 28 May 2006 08:40:40 -0400 (EDT) Date: Sun, 28 May 2006 13:40:40 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Hans Petter Selasky In-Reply-To: <200605272150.k4RLo9Aw026648@repoman.freebsd.org> Message-ID: <20060528133943.N79162@fledge.watson.org> References: <200605272150.k4RLo9Aw026648@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 97970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 May 2006 12:40:49 -0000 On Sat, 27 May 2006, Hans Petter Selasky wrote: > http://perforce.freebsd.org/chv.cgi?CH=97970 > > Change 97970 by hselasky@hselasky_mini_itx on 2006/05/27 21:49:24 > > Copied old USB files into "/sys/dev/usb.old" for reference. Prepared > "/sys/conf/files" for new USB system. For future reference, you might want to instead add an additional entry in the branch definition for your branch such that the FreeBSD vendor USB code is merged to that directory in your branch. That way the usb.old tree would continue to track changes from the FreeBSD vendor tree when you integrate. You can still set this up, but it might require slight massaging during the first integration. Robert N M Watson > > Affected files ... > > .. //depot/projects/usb/src/sys/conf/files#2 edit > .. //depot/projects/usb/src/sys/dev/usb.old/FILES#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/dsbr100io.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ehci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ehci_pci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ehcireg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ehcivar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/hid.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/hid.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_aue.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_auereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_axe.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_axereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_cdce.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_cdcereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_cue.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_cuereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_kue.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_kuereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_rue.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_ruereg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_udav.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_udavreg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_ural.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_uralreg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/if_uralvar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/kue_fw.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ohci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ohci_pci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ohcireg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ohcivar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/rio500_usb.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/sl811hs.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/sl811hsreg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/sl811hsvar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/slhci_pccard.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ubsa.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ubser.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ubser.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ucom.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ucomvar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ucycom.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/udbp.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/udbp.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ufm.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ufoma.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uftdi.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uftdireg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ugen.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ugraphire_rdesc.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhci_pci.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhcireg.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhcivar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhid.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uhub.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ukbd.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ulpt.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/umass.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/umct.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/umodem.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/ums.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uplcom.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/urio.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_ethersubr.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_ethersubr.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_if.m#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_mem.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_mem.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_port.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_quirks.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_quirks.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usb_subr.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbcdc.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdevs#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdi.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdi.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdi_util.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdi_util.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbdivar.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/usbhid.h#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uscanner.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uvisor.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uvscom.c#1 add > .. //depot/projects/usb/src/sys/dev/usb.old/uxb360gp_rdesc.h#1 add > .. //depot/projects/usb/src/sys/dev/usb/FILES#2 delete > .. //depot/projects/usb/src/sys/dev/usb/dsbr100io.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ehci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ehci.h#1 add > .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ehcireg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ehcivar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/hid.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/hid.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_auereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/kue_fw.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ohci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ohci.h#1 add > .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ohcireg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ohcivar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/rio500_usb.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/sl811hs.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/sl811hsreg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/sl811hsvar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/slhci_pccard.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ubser.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ubser.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ucom.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/udbp.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/udbp.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ufm.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uftdireg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ugen.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ugraphire_rdesc.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhci.h#1 add > .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhcireg.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhcivar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhid.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uhub.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/umass.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/umct.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/umodem.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/ums.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/urio.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb_mem.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb_mem.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#1 add > .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#1 add > .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#1 add > .. //depot/projects/usb/src/sys/dev/usb/usbcdc.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbdi.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbdi_util.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbdi_util.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbdivar.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/usbhid.h#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#2 delete > .. //depot/projects/usb/src/sys/dev/usb/uxb360gp_rdesc.h#2 delete > > Differences ... > > ==== //depot/projects/usb/src/sys/conf/files#2 (text+ko) ==== > > @@ -974,8 +974,23 @@ > dev/ubsec/ubsec.c optional ubsec > # > # USB support > +dev/usb/uhci.c optional uhci > +dev/usb/uhci_pci.c optional uhci > +dev/usb/ohci.c optional ohci > +dev/usb/ohci_pci.c optional ohci > dev/usb/ehci.c optional ehci > -dev/usb/ehci_pci.c optional ehci pci > +dev/usb/ehci_pci.c optional ehci > +dev/usb/uhub.c optional usb > +dev/usb/usb.c optional usb > +dev/usb/usb_requests.c optional usb > +dev/usb/usb_subr.c optional usb > +dev/usb/usb_transfer.c optional usb > +dev/usb/usb_ethersubr.c optional usb > +dev/usb/usb_if.m optional usb > +dev/usb/usb_quirks.c optional usb > +dev/usb/ugen.c optional ugen > +# > +# USB support (not merged) > dev/usb/hid.c optional usb > dev/usb/if_aue.c optional aue > dev/usb/if_axe.c optional axe > @@ -985,8 +1000,6 @@ > dev/usb/if_ural.c optional ural > dev/usb/if_rue.c optional rue > dev/usb/if_udav.c optional udav > -dev/usb/ohci.c optional ohci > -dev/usb/ohci_pci.c optional ohci pci > dev/usb/sl811hs.c optional slhci > dev/usb/slhci_pccard.c optional slhci pccard > dev/usb/ubsa.c optional ubsa ucom > @@ -997,11 +1010,7 @@ > dev/usb/ufoma.c optional ufoma ucom > dev/usb/ufm.c optional ufm > dev/usb/uftdi.c optional uftdi ucom > -dev/usb/ugen.c optional ugen > -dev/usb/uhci.c optional uhci > -dev/usb/uhci_pci.c optional uhci pci > dev/usb/uhid.c optional uhid > -dev/usb/uhub.c optional usb > dev/usb/ukbd.c optional ukbd > dev/usb/ulpt.c optional ulpt > dev/usb/umass.c optional umass > @@ -1010,17 +1019,11 @@ > dev/usb/ums.c optional ums > dev/usb/uplcom.c optional uplcom ucom > dev/usb/urio.c optional urio > -dev/usb/usb.c optional usb > -dev/usb/usb_ethersubr.c optional usb > -dev/usb/usb_if.m optional usb > -dev/usb/usb_mem.c optional usb > -dev/usb/usb_quirks.c optional usb > -dev/usb/usb_subr.c optional usb > -dev/usb/usbdi.c optional usb > -dev/usb/usbdi_util.c optional usb > dev/usb/uscanner.c optional uscanner > dev/usb/uvisor.c optional uvisor ucom > dev/usb/uvscom.c optional uvscom ucom > +# End of USB support > +# > dev/utopia/idtphy.c optional utopia > dev/utopia/suni.c optional utopia > dev/utopia/utopia.c optional utopia > From owner-p4-projects@FreeBSD.ORG Sun May 28 22:12:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EC8B16B650; Sun, 28 May 2006 22:04:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2B6816CE41 for ; Sun, 28 May 2006 22:00:47 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8502D43D88 for ; Sun, 28 May 2006 22:00:30 +0000 (GMT) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4SLxK1W003895 for ; Sun, 28 May 2006 21:59:20 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4SLxJcB003892 for perforce@freebsd.org; Sun, 28 May 2006 21:59:19 GMT (envelope-from ryanb@FreeBSD.org) Date: Sun, 28 May 2006 21:59:19 GMT Message-Id: <200605282159.k4SLxJcB003892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 98038 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 May 2006 22:12:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=98038 Change 98038 by ryanb@ryanb_yuki on 2006/05/28 21:58:19 Imported updated midi.c (changelist \#98014) from parent. See CVS rev 1.117 for specifics. Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/midi.c#2 integrate Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/midi.c#2 (text) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.16 2006/05/27 16:32:05 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.17 2006/05/28 14:07:47 netchild Exp $"); #include #include @@ -1226,7 +1226,7 @@ used = MIN(MIDIQ_AVAIL(m->outq), len); used = MIN(used, MIDI_WSIZE); - MIDI_DEBUG(5,printf("midi_synth: resid %d len %jd avail %jd\n", + MIDI_DEBUG(5,printf("midi_synth: resid %zu len %jd avail %jd\n", len, (intmax_t)MIDIQ_LEN(m->outq), (intmax_t)MIDIQ_AVAIL(m->outq))); From owner-p4-projects@FreeBSD.ORG Mon May 29 03:49:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7BF116A965; Mon, 29 May 2006 03:49:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D80B16A55A for ; Mon, 29 May 2006 03:49:40 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E707E43D4C for ; Mon, 29 May 2006 03:49:39 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4T3mS51033222 for ; Mon, 29 May 2006 03:48:28 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4T3mS9v033219 for perforce@freebsd.org; Mon, 29 May 2006 03:48:28 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 29 May 2006 03:48:28 GMT Message-Id: <200605290348.k4T3mS9v033219@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 98045 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 03:49:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=98045 Change 98045 by soc-andrew@soc-andrew_serv on 2006/05/29 03:47:53 Add Lua bindings for gettext Reorder the installation of packages Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#48 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#48 (text+ko) ==== @@ -823,7 +823,21 @@ # Add the kernel @cp -Rp ${RD}/kernels/GENERIC/ ${RD}/bsdinstaller/root/boot/kernel - # Install Lua into the package root + # Add the required libs to the installer's tree + @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=libaura \ + ROOT=${RD}/bsdinstaller/root + @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=libdfui \ + ROOT=${RD}/bsdinstaller/root + @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=libiconv \ + ROOT=${RD}/bsdinstaller/root + @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=gettext \ + ROOT=${RD}/bsdinstaller/root + + # Add the frontend + @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=dfuife-curses \ + ROOT=${RD}/bsdinstaller/root + + # Add Lua and modules into the installer's tree @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50 \ ROOT=${RD}/bsdinstaller/root @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-compat51 \ @@ -838,13 +852,9 @@ ROOT=${RD}/bsdinstaller/root @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-app \ ROOT=${RD}/bsdinstaller/root - @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=libaura \ - ROOT=${RD}/bsdinstaller/root - @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=libdfui \ - ROOT=${RD}/bsdinstaller/root @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-dfui \ ROOT=${RD}/bsdinstaller/root - @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=dfuife-curses \ + @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-gettext \ ROOT=${RD}/bsdinstaller/root @touch ${RD}/bsdinstaller/root/etc/fstab From owner-p4-projects@FreeBSD.ORG Mon May 29 07:46:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 298E716A448; Mon, 29 May 2006 07:46:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03DBD16A424 for ; Mon, 29 May 2006 07:46:33 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C292643D53 for ; Mon, 29 May 2006 07:46:32 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4T7jKcl063418 for ; Mon, 29 May 2006 07:45:20 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4T7jK1K063415 for perforce@freebsd.org; Mon, 29 May 2006 07:45:20 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 29 May 2006 07:45:20 GMT Message-Id: <200605290745.k4T7jK1K063415@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 98051 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 07:46:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=98051 Change 98051 by kevlo@kevlo_rtsl on 2006/05/29 07:45:06 Import partical support for the FS2410 eval board(Samsung S3C2410 SoC). It's based on the NetBSD code, but large parts are rewritten by cognet. Approved by: cognet Obtained from: cognet Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410var.h#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_clk.c#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0reg.h#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0var.h#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0_space.c#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0reg.h#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/std.s3c2410#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_bus_s3c2410.c#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_cpu_s3c2410.c#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 29 08:22:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 307A116A47D; Mon, 29 May 2006 08:22:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2530A16A45C for ; Mon, 29 May 2006 08:22:18 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D283D43D46 for ; Mon, 29 May 2006 08:22:17 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4T8L5rC066419 for ; Mon, 29 May 2006 08:21:05 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4T8L5Pj066416 for perforce@freebsd.org; Mon, 29 May 2006 08:21:05 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 29 May 2006 08:21:05 GMT Message-Id: <200605290821.k4T8L5Pj066416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 98052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 08:22:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=98052 Change 98052 by cdjones@cdjones_ides on 2006/05/29 08:20:24 Start off the branch.... Affected files ... .. //depot/projects/soc2006/cdjones_jail/README#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 29 08:56:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C261E16A44E; Mon, 29 May 2006 08:56:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 68F1E16A426 for ; Mon, 29 May 2006 08:56:33 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CEEF43D46 for ; Mon, 29 May 2006 08:56:33 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4T8tKxD076496 for ; Mon, 29 May 2006 08:55:20 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4T8tKAs076474 for perforce@freebsd.org; Mon, 29 May 2006 08:55:20 GMT (envelope-from bushman@freebsd.org) Date: Mon, 29 May 2006 08:55:20 GMT Message-Id: <200605290855.k4T8tKAs076474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 98053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 08:56:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=98053 Change 98053 by bushman@bushman_nss_ldap_cached on 2006/05/29 08:52:31 initial branch merging Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/etc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/amd.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/apmd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/auth.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/bluetooth/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/bluetooth/hcsecd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/bluetooth/hosts#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/bluetooth/protocols#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/cached.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/crontab#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/csh.cshrc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/csh.login#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/csh.logout#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/bluetooth.device.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/devfs.rules#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/pccard.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/periodic.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/devd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/devfs.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/dhclient.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/disktab#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/etc.alpha/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/etc.amd64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/etc.arm/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/etc.i386/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/etc.ia64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/etc.powerpc/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/etc.sparc64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/fbtab#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/ftpusers#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/gettytab#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/group#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/gss/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/gss/mech#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/gss/qop#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/hosts#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/hosts.allow#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/hosts.equiv#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/hosts.lpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/inetd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/answer#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/holidays.D#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/isdnd.rates.A#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/isdnd.rates.D#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/isdnd.rates.F#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/isdnd.rates.L#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/isdnd.rates.UK.BT#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/isdnd.rc.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/isdntel.alias.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/isdntel.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/record#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/tell#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/tell-record#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/isdn/unknown_incoming#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/login.access#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/login.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mac.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mail/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mail/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mail/access.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mail/aliases#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mail/mailer.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mail/mailertable.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mail/virtusertable.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/man.alias#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/master.passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/minfree#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/motd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BIND.chroot.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BIND.include.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.include.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.local.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.release.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.root.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.sendmail.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.usr.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.var.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.x11-4.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.x11.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/namedb/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/namedb/PROTO.localhost-v6.rev#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/namedb/PROTO.localhost.rev#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/namedb/make-localhost#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/namedb/named.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/namedb/named.root#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/netconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/netstart#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/network.subr#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/networks#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/newsyslog.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/nls.alias#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/nsmb.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/nsswitch.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/opieaccess#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/convert.pl#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/ftpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/gdm#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/imap#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/kde#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/login#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/other#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/pop3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/rsh#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/sshd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/su#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/system#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/telnetd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pam.d/xdm#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pccard_ether#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/100.clean-disks#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/110.clean-tmps#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/120.clean-preserve#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/130.clean-msgs#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/140.clean-rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/150.clean-hoststat#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/200.backup-passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/210.backup-aliases#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/300.calendar#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/310.accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/330.news#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/400.status-disks#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/405.status-ata-raid#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/406.status-gmirror#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/420.status-network#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/430.status-rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/440.status-mailq#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/450.status-security#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/460.status-mail-rejects#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/470.status-named#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/500.queuerun#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/daily/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/monthly/200.accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/monthly/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/monthly/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/100.chksetuid#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/200.chkmounts#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/300.chkuid0#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/400.passwdless#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/500.ipfwdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/510.ipfdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/520.pfdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/550.ipfwlimit#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/610.ipf6denied#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/700.kernelmsg#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/800.loginfail#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/900.tcpwrap#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/security/security.functions#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/120.clean-kvmdb#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/310.locate#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/320.whatis#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/330.catman#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/340.noid#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/400.status-pkg#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/periodic/weekly/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pf.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pf.os#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/phones#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/portsnap.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/ppp/ppp.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/printcap#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/protocols#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.bsdextended#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/DAEMON#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/LOGIN#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/NETWORKING#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/SERVERS#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/abi#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/addswap#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/adjkerntz#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/amd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/apm#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/apmd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/archdep#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/atm1#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/atm2#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/atm3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/auditd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/bgfsck#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/bluetooth#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/bootconf.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/bootparams#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/bsnmpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/cached#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ccd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/cleanvar#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/cleartmp#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/cron#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/devd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/devfs#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dmesg#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dumpon#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/early.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/encswap#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/fsck#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ftpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/gbde#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/geli#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/geli2#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/hcsecd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/hostapd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/hostname#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/inetd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/initrandom#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ip6addrctl#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ip6fw#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipfilter#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipfs#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipfw#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipmon#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipnat#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipsec#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipxrouted#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/isdnd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/jail#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/kadmind#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/kerberos#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/kernel#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/keyserv#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/kldxref#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/kpasswdd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ldconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/local#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/localpkg#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/lpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mdconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mdconfig2#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mixer#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/motd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mountcritlocal#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mountcritremote#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mountd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/moused#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mroute6d#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mrouted#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/msgs#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/named#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/natd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/netif#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/netoptions#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/network_ipv6#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/newsyslog#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/nfsclient#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/nfsd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/nfslocking#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/nfsserver#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/nisdomain#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/nsswitch#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ntpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ntpdate#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/othermta#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/pf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/pflog#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/pfsync#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/power_profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/powerd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ppp#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/pppoed#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/pwcheck#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/quota#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ramdisk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ramdisk-own#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/random#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/rarpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/resolv#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/root#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/route6d#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/routed#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/routing#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/rpcbind#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/rtadvd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/savecore#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/sdpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/securelevel#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/sendmail#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/serial#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/sppp#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/sshd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/swap1#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/syscons#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/sysctl#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/syslogd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/timed#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/tmp#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ugidfw#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/var#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/virecover#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/watchdogd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/wpa_supplicant#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypbind#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/yppasswdd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypserv#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypset#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypupdated#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypxfrd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.firewall#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.firewall6#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.initdiskless#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.resume#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.sendmail#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.shutdown#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.subr#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.suspend#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/remote#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/root/dot.cshrc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/root/dot.k5login#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/root/dot.login#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/root/dot.profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rpc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/sendmail/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/sendmail/freebsd.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/sendmail/freebsd.submit.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/sendmail/freefall.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/services#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/shells#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/snmpd.config#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/sysctl.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/syslog.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/etc/termcap.small#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/_ctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/a.out.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/ar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/arpa/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/arpa/ftp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/arpa/inet.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/arpa/nameser.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/arpa/nameser_compat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/arpa/telnet.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/arpa/tftp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/assert.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/bitstring.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/complex.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/cpio.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/ctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/db.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/dirent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/dlfcn.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/elf-hints.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/elf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/err.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/fmtmsg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/fnmatch.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/fstab.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/fts.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/ftw.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/getopt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/glob.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/grp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/gssapi.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/gssapi/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/gssapi/gssapi.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/hesiod.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/histedit.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/ieeefp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/ifaddrs.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/inttypes.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/iso646.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/kenv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/langinfo.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/libgen.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/limits.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/link.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/locale.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/malloc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/malloc_np.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/memory.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/monetary.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/mpool.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/mqueue.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/ndbm.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/netconfig.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/netdb.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/nl_types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/nlist.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/nss.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/nsswitch.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/objformat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/paths.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/printf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/proc_service.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/protocols/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/protocols/dumprestore.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/protocols/routed.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/protocols/rwhod.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/protocols/talkd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/protocols/timed.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/pthread.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/pthread_np.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/pwd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/ranlib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/readpassphrase.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/regex.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/regexp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/res_update.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/resolv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/auth.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/auth_des.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/auth_kerb.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/auth_unix.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/clnt_soc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/clnt_stat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/des.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/des_crypt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/nettype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/pmap_clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/pmap_prot.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/pmap_rmt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/raw.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/rpc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/rpc_com.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/rpc_msg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/rpcb_clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/rpcb_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/rpcent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/svc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/svc_auth.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/svc_dg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/svc_soc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpc/xdr.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/bootparam_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/crypt.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/key_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/klm_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/mount.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/nfs_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/nis.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/nis_cache.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/nis_callback.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/nis_db.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/nis_object.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/nis_tags.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/nislib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/nlm_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/pmap_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/rex.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/rnusers.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/rquota.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/rstat.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/rwall.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/sm_inter.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/spray.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/yp.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/yp_prot.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/ypclnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/yppasswd.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/ypupdate_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/rpcsvc/ypxfrd.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/runetype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/search.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/setjmp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/sgtty.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/signal.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/stab.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/stdbool.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/stddef.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/stdio.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/stdlib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/string.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/stringlist.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/strings.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/sysexits.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/tar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/tgmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/time.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/timeconv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/timers.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/ttyent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/ulimit.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/unistd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/utime.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/utmp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/uuid.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/varargs.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/vis.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/wchar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/wctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/include/wordexp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/Versions.def#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/SYS.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/_fpmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/arith.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/_ctx_start.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/_set_tp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/_setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/divrem.m4#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fabs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/flt_rounds.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fpgetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fpgetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fpgetsticky.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fpsetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/fpsetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/infinity.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/makecontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/modf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/rfork_thread.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/signalcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/gen/sigsetjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/byte_swap_2.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/byte_swap_4.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/htonl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/htons.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/ntohl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/net/ntohs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/stdlib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/bcopy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/bzero.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/ffs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/memcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/string/memmove.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/Ovfork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/brk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/cerror.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/exect.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/fork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/pipe.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/ptrace.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/sbrk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/setlogin.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/alpha/sys/sigreturn.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/SYS.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/_fpmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/arith.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/_set_tp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/_setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/fabs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/flt_rounds.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/fpgetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/fpgetprec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/fpgetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/fpgetsticky.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/fpsetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/fpsetprec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/fpsetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/infinity.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/ldexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/makecontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/modf.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/rfork_thread.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/signalcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/sigsetjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/net/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/net/htonl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/net/htons.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/net/ntohl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/net/ntohs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/string/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/string/bcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/string/bcopy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/string/bzero.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/string/memcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/string/memcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/string/memmove.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/string/memset.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/string/strcat.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/string/strcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/string/strcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/amd64_get_fsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/amd64_get_gsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/amd64_set_fsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/amd64_set_gsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/brk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/cerror.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/exect.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/getcontext.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/pipe.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/ptrace.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/reboot.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/sbrk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/setlogin.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/sigreturn.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/vfork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/SYS.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/_fpmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/arith.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/_ctx_start.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/_set_tp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/_setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/alloca.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/divsi3.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/fabs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/infinity.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/makecontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/modf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/signalcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gen/sigsetjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/net/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/net/htonl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/net/htons.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/net/ntohl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/net/ntohs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/softfloat/arm-gcc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/softfloat/milieu.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/softfloat/softfloat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/stdlib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/bcopy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/bzero.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/ffs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/memcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/memcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/memcpy_arm.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/memcpy_xscale.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/memmove.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/memset.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/strcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/strlen.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/string/strncmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/sys/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/sys/Ovfork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/sys/brk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/sys/cerror.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/sys/fork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/sys/pipe.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/sys/ptrace.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/sys/sbrk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/sys/shmat.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/sys/sigreturn.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/sys/syscall.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/creat.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/creat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/gethostid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/gethostid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/getwd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/killpg.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/killpg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/sethostid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/setpgrp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/setrgid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/setruid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/setruid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/sigcompat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/sigpause.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/sigsetmask.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/sigvec.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_close.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_conv.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_debug.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_delete.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_get.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_open.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_overflow.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_page.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_put.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_search.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_seq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_split.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_utils.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/btree.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/changelog#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/db/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/db/db.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/docs/hash.usenix.ps#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/docs/libtp.usenix.ps#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash_bigkey.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash_buf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash_func.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash_log2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash_page.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/ndbm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/page.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/btree.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/dbm.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/dbopen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/hash.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/mpool.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/recno.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/mpool/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/mpool/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/mpool/mpool.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/mpool/mpool.libtp#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_close.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_delete.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_get.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_open.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_put.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_search.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_seq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_utils.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/recno.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/btree.tests/main.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/dbtest.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/driver2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/makedb.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tcreat3.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tdel.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/testit#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/thash4.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tread2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tseq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tverify.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/run.test#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gdtoa/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gdtoa/_hdtoa.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gdtoa/_ldtoa.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gdtoa/glue.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gdtoa/machdep_ldisQ.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gdtoa/machdep_ldisd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gdtoa/machdep_ldisx.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/__xuname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/_pthread_stubs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/_rand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/_spinlock_stub.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/_thread_init.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/alarm.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/alarm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/arc4random.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/arc4random.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/assert.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/basename.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/basename.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/check_utility_compat.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/check_utility_compat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/clock.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/clock.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/closedir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/confstr.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/confstr.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/crypt.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ctermid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ctermid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/daemon.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/daemon.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/devname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/devname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/directory.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/dirname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/dirname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/disklabel.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/dladdr.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/dlfcn.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/dlfunc.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/dlinfo.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/dllockinit.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/dlopen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/drand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/erand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/err.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/err.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/errlst.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/errno.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/exec.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/exec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fmtcheck.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fmtcheck.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fmtmsg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fmtmsg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fnmatch.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fnmatch.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fpclassify.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fpclassify.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/frexp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/frexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fstab.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ftok.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ftok.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fts.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fts.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ftw.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ftw.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getbootfile.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getbootfile.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getbsize.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getbsize.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getcap.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getcap.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getcontext.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getcwd.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getcwd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getdiskbyname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getdomainname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getdomainname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getfsent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrouplist.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrouplist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/gethostname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/gethostname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getloadavg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getloadavg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getlogin.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getmntinfo.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getmntinfo.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getnetgrent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getnetgrent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getobjformat.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getobjformat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getosreldate.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getosreldate.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getpagesize.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getpagesize.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getpass.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getpeereid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getpeereid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getprogname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getprogname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getpwent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getpwent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getttyent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getttyent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getusershell.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getusershell.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getvfsbyname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getvfsbyname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/glob.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/glob.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/initgroups.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/initgroups.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/isatty.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/isgreater.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/isinf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/isnan.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/jrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/lcong48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ldexp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ldexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/lockf.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/lockf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/lrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/makecontext.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/modf.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/mrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/msgctl.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/msgget.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/msgrcv.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/msgsnd.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/nftw.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/nice.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/nice.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/nlist.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/nlist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/nrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/opendir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pause.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pause.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pmadvise.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/popen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/popen.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/posixshm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pselect.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pselect.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/psignal.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/psignal.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pw_scan.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pw_scan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pwcache.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pwcache.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/raise.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/raise.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/rand48.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/rand48.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/readdir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/readpassphrase.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/readpassphrase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/rewinddir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/rfork_thread.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/scandir.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/scandir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/seed48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/seekdir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sem.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sem_destroy.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sem_getvalue.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sem_init.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sem_open.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sem_post.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sem_wait.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/semctl.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setdomainname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sethostname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setjmp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setjmperr.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setmode.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setmode.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setproctitle.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setproctitle.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setprogname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/shm_open.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/siginterrupt.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/siginterrupt.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/siglist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/signal.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/signal.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sigsetops.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sigsetops.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sleep.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sleep.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/srand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/statvfs.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/statvfs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/stringlist.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/stringlist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/strtofflags.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/strtofflags.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/swapcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sysconf.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sysconf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sysctl.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sysctl.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sysctlbyname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sysctlnametomib.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/syslog.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/syslog.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tcgetpgrp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tcsendbreak.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tcsetattr.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tcsetpgrp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/telldir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/telldir.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/termios.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/time.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/time.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/times.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/times.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/timezone.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/timezone.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tls.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ttyname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ttyname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ttyslot.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tzset.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ualarm.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ualarm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ucontext.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ulimit.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ulimit.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/uname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/uname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/unvis.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/unvis.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 29 08:57:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBD0916A42A; Mon, 29 May 2006 08:57:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 87FAC16A420 for ; Mon, 29 May 2006 08:57:35 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39EFA43D46 for ; Mon, 29 May 2006 08:57:35 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4T8uMg6076525 for ; Mon, 29 May 2006 08:56:22 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4T8uMUx076522 for perforce@freebsd.org; Mon, 29 May 2006 08:56:22 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 29 May 2006 08:56:22 GMT Message-Id: <200605290856.k4T8uMUx076522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 98054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 08:57:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=98054 Change 98054 by kevlo@kevlo_rtsl on 2006/05/29 08:55:21 Implement s3c2xx0_bs_unmap. Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0_space.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0_space.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: s3c2xx0_space.c,v 1.3 2003/09/03 03:15:02 mycroft Exp $ */ +/* $NetBSD: s3c2xx0_space.c,v 1.7 2005/11/24 13:08:32 yamt Exp $ */ /* * Copyright (c) 2002 Fujitsu Component Limited @@ -74,29 +74,24 @@ */ #include +__FBSDID("$FreeBSD$"); #include #include -#include -#include -#include -#include +#include #include +#include #include +#include #include -#include -#include #include -#include -#include /* Prototypes for all the bus_space structure functions */ bs_protos(s3c2xx0); bs_protos(generic); bs_protos(generic_armv4); -bs_protos(bs_notimpl); struct bus_space s3c2xx0_bs_tag = { /* cookie */ @@ -176,13 +171,14 @@ u_long startpa, endpa, pa; vm_offset_t va; pt_entry_t *pte; + const struct pmap_devmap *pd; - if ((u_long) bpa > (u_long) KERNBASE) { - /* Some IO registers (ex. UART ports for console) are mapped - * to fixed address by board specific routine. */ - *bshp = bpa; - return (0); + if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) { + /* Device was statically mapped. */ + *bshp = pd->pd_va + (bpa - pd->pd_pa); + return 0; } + startpa = trunc_page(bpa); endpa = round_page(bpa + size); @@ -200,18 +196,29 @@ if ((flag & BUS_SPACE_MAP_CACHEABLE) == 0) *pte &= ~L2_S_CACHE_MASK; } - return (0); } void s3c2xx0_bs_unmap(void *t, bus_size_t size) { + vm_offset_t va, endva; + + if (pmap_devmap_find_va((vm_offset_t)t, size) != NULL) { + /* Device was statically mapped; nothing to do. */ + return; + } - /* Nothing to do. */ + endva = round_page((vm_offset_t)t + size); + va = trunc_page((vm_offset_t)t); + + while (va < endva) { + pmap_kremove(va); + va += PAGE_SIZE; + } + kmem_free(kernel_map, va, endva - va); } - int s3c2xx0_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset, bus_size_t size, bus_space_handle_t * nbshp) @@ -241,6 +248,5 @@ void s3c2xx0_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size) { - panic("s3c2xx0_io_bs_free(): not implemented\n"); } From owner-p4-projects@FreeBSD.ORG Mon May 29 08:59:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD53316A5C2; Mon, 29 May 2006 08:59:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A4AC16A5BC for ; Mon, 29 May 2006 08:59:41 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8F5643D73 for ; Mon, 29 May 2006 08:59:38 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4T8wQb8076590 for ; Mon, 29 May 2006 08:58:26 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4T8wQq1076587 for perforce@freebsd.org; Mon, 29 May 2006 08:58:26 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 29 May 2006 08:58:26 GMT Message-Id: <200605290858.k4T8wQq1076587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 98055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 08:59:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=98055 Change 98055 by kevlo@kevlo_rtsl on 2006/05/29 08:57:56 Implement cpu_reset. Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#2 (text+ko) ==== @@ -30,6 +30,7 @@ */ #include +__FBSDID("$FreeBSD$"); #include #include @@ -172,7 +173,12 @@ void cpu_reset(void) { - while (1); + (void) disable_interrupts(I32_bit|F32_bit); + + *(volatile unsigned int *)(S3C2410_WDT_BASE + WDT_WTCON) + = (0 << WTCON_PRESCALE_SHIFT) | WTCON_ENABLE | + WTCON_CLKSEL_16 | WTCON_ENRST; + for(;;); } int From owner-p4-projects@FreeBSD.ORG Mon May 29 10:43:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FF9816A42A; Mon, 29 May 2006 10:43:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2421016A426 for ; Mon, 29 May 2006 10:43:50 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3F4643D46 for ; Mon, 29 May 2006 10:43:49 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TAgbCi008551 for ; Mon, 29 May 2006 10:42:37 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TAgbFM008548 for perforce@freebsd.org; Mon, 29 May 2006 10:42:37 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 29 May 2006 10:42:37 GMT Message-Id: <200605291042.k4TAgbFM008548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 98056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 10:43:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=98056 Change 98056 by soc-andrew@soc-andrew_serv on 2006/05/29 10:41:52 Remove an unneeded print Fix a printf like string Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/250_partition_disk.lua#5 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/250_partition_disk.lua#5 (text+ko) ==== @@ -814,7 +814,6 @@ return let_user_edit_partitions(step, populate_one_big_partition) end - print(type(App.state.sel_disk)) local response = App.ui:present{ id = "partition_disk", name = _("Partition Disk?"), @@ -828,7 +827,7 @@ "\n\n" .. "If %s already has operating systems on it that you " .. "wish to keep, you should be careful not to change the " .. - "partitions that they are on, if you choose to partition." .. + "partitions that they are on, if you choose to partition.", App.state.sel_disk:get_name(), App.state.sel_disk:get_name(), App.state.sel_disk:get_name() From owner-p4-projects@FreeBSD.ORG Mon May 29 10:46:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 925A116A42F; Mon, 29 May 2006 10:46:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67B8916A423 for ; Mon, 29 May 2006 10:46:54 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D18543D4C for ; Mon, 29 May 2006 10:46:54 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TAjf1C008719 for ; Mon, 29 May 2006 10:45:41 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TAjfxv008716 for perforce@freebsd.org; Mon, 29 May 2006 10:45:41 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 29 May 2006 10:45:41 GMT Message-Id: <200605291045.k4TAjfxv008716@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 98057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 10:46:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=98057 Change 98057 by soc-andrew@soc-andrew_serv on 2006/05/29 10:44:41 Allow setting of DESTDIR Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile.inc1#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile.inc1#2 (text+ko) ==== @@ -1,3 +1,3 @@ BSD_INSTALLER_LUA_DIR=${.CURDIR}/../../../contrib/bsdinstaller/backend/lua -INST_DIR=/usr/libexec/bsdinstaller +INST_DIR=${DESTDIR}/usr/libexec/bsdinstaller From owner-p4-projects@FreeBSD.ORG Mon May 29 10:49:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDE1316A41F; Mon, 29 May 2006 10:49:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0950B16A42A for ; Mon, 29 May 2006 10:48:58 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26C9B43D58 for ; Mon, 29 May 2006 10:48:57 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TAlirf008855 for ; Mon, 29 May 2006 10:47:44 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TAli9K008852 for perforce@freebsd.org; Mon, 29 May 2006 10:47:44 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 29 May 2006 10:47:44 GMT Message-Id: <200605291047.k4TAli9K008852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 98058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 10:49:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=98058 Change 98058 by soc-andrew@soc-andrew_serv on 2006/05/29 10:47:35 Build gettext strings during release Use the new gettext to change "partition" -> "slice" and "subpartition" -> "partition" Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/main.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile#5 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/Makefile#1 add .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/en.po#1 add .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#49 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/main.lua#3 (text+ko) ==== @@ -38,6 +38,8 @@ -- local arg = arg +local POSIX = require("posix") + -- -- Load the application framework. -- @@ -51,7 +53,7 @@ GetText = require("gettext") GetText.set_package("dfuibe_lua") -- XXX use App.conf.dir.root here: - GetText.set_locale_dir("/usr/local/share/locale") + GetText.set_locale_dir("/usr/libexec/bsdinstaller/locale") GetText.init() else GetText = nil @@ -150,6 +152,11 @@ App.state.resolv_conf = ConfigVars.new() -- +-- Change the strings to be correct for the FreeBSD system installer +-- +POSIX.putenv("LANG=en") + +-- -- First let the user configure the important user-interface aspects -- of their system (language, keyboard/screenmap if on console, -- internet connection for logging to remote machine over net, etc.) ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile#5 (text+ko) ==== @@ -1,3 +1,3 @@ -SUBDIR= base conf configure configure.menu inst lib pit +SUBDIR= base conf configure configure.menu inst lib pit po .include ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#49 (text+ko) ==== @@ -857,6 +857,13 @@ @cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-gettext \ ROOT=${RD}/bsdinstaller/root + cd /usr/ports/devel/gettext && \ + env -i FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} && \ + make all install clean BATCH=yes FORCE_PKG_REGISTER=yes + + # Install the BSDInstaller translations + @cd ${.CURDIR}/../libexec/bsdinstaller/po && make all-nls install-nls DESTDIR=${RD}/bsdinstaller/root + @touch ${RD}/bsdinstaller/root/etc/fstab @echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf @echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf From owner-p4-projects@FreeBSD.ORG Mon May 29 11:12:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF09816A436; Mon, 29 May 2006 11:12:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4712A16A432 for ; Mon, 29 May 2006 11:12:28 +0000 (UTC) (envelope-from yuanjue@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B558343D53 for ; Mon, 29 May 2006 11:12:27 +0000 (GMT) (envelope-from yuanjue@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TBBF9F011493 for ; Mon, 29 May 2006 11:11:15 GMT (envelope-from yuanjue@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TBBEBZ011490 for perforce@freebsd.org; Mon, 29 May 2006 11:11:14 GMT (envelope-from yuanjue@FreeBSD.org) Date: Mon, 29 May 2006 11:11:14 GMT Message-Id: <200605291111.k4TBBEBZ011490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yuanjue@FreeBSD.org using -f From: Jue Yuan To: Perforce Change Reviews Cc: Subject: PERFORCE change 98060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 11:12:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=98060 Change 98060 by yuanjue@yuanjue on 2006/05/29 11:10:22 new branch from projects/xen3 Submitted by: Yuan, Jue Affected files ... .. //depot/projects/soc2006/yuanjue-xen3/src/sys/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/io.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/float.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/iodev.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/memdev.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/param.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/mem.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/support.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/conf/IQ31244#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/_types.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/asm.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/bus.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/clock.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/elf.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/endian.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/exec.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/float.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/fp.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/frame.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/intr.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/limits.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/memdev.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/param.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/proc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/profile.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/psl.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/pte.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/reg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/resource.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/runq.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/signal.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/smp.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/swi.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/sysarch.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/trap.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/README#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/boot0/arm_init.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/boot0iic/doit.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/boot0spi/doit.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/bootiic/arm_init.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/bootspi/arm_init.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/eeprom.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/env_vars.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/env_vars.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/loader_prompt.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/loader_prompt.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/p_string.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/boot.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/commands.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/console.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/help.common#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/interp.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/load.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/loader.8#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/ls.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/misc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/module.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/panic.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/pnpdata#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/README#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/forth/loader.conf#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/forth/loader.rc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/forth/screen.4th#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/forth/support.4th#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/loader/version#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/efi/version#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/copy.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ia64/ski/version#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/bsm/audit.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_ccb.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_debug.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_periph.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_periph.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_queue.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_queue.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_sim.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_sim.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_xpt.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_xpt.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/00READ#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/README#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/TODO#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/cnode.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_io.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_kernel.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_namecache.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_namecache.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_opstats.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_psdev.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_psdev.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_subr.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_subr.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_venus.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_venus.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_vnops.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/coda/coda_vnops.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/Makefile#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_fcntl.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_filio.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_filio.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_fuser.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_hrt.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_ioctl.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_ioctl.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_ipc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_ipc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_misc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_mman.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_proto.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_resource.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_resource.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_siginfo.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_signal.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_signal.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_socket.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_socket.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_sockio.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_sockio.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_sockmod.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_stat.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_stat.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_statvfs.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_stream.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_stropts.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_syscall.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_syscallnames.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_sysconfig.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_sysent.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_systeminfo.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_sysvec.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_termios.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_termios.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_time.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_timod.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_ttold.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_ttold.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_types.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_ucontext.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_ulimit.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_ustat.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_util.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_utsname.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/svr4_wait.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/syscalls.conf#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/compat/svr4/syscalls.master#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/Makefile.amd64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/Makefile.arm#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/Makefile.i386#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/Makefile.i386-xen#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/Makefile.ia64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/Makefile.pc98#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/Makefile.powerpc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/Makefile.sparc64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/NOTES#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/defines#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/files#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/files.amd64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/files.arm#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/files.i386#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/files.i386-xen#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/files.ia64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/files.pc98#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/files.powerpc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/files.sparc64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/kern.mk#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/kern.post.mk#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/kern.pre.mk#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/kmod.mk#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/ldscript.amd64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/ldscript.arm#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/ldscript.i386#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/ldscript.ia64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/ldscript.powerpc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/ldscript.sparc64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/makeLINT.mk#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/makeLINT.sed#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/newvers.sh#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/options#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/options.amd64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/options.arm#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/options.i386#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/options.i386-xen#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/options.ia64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/options.pc98#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/options.powerpc#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/options.sparc64#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/conf/systags.sh#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_cbq.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_cbq.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_cdnr.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_cdnr.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_classq.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_hfsc.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_hfsc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_priq.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_priq.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_red.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_red.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_rio.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_rio.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_rmclass.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_rmclass.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_subr.c#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altq_var.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/altqconf.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/altq/altq/if_altq.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/CHANGES.txt#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acapps.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acconfig.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acdebug.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acdispat.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acefi.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acenv.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acevents.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acexcep.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acfreebsd.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acgcc.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acglobal.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/achware.h#1 branch .. //depot/projects/soc2006/yuanjue-xen3/src/sys/contrib/dev/acpica/acinterp.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 29 13:02:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3967916A469; Mon, 29 May 2006 13:02:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B780E16A441 for ; Mon, 29 May 2006 13:02:46 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27E7443D58 for ; Mon, 29 May 2006 13:02:46 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TD1WBj044536 for ; Mon, 29 May 2006 13:01:32 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TD1WFV044533 for perforce@freebsd.org; Mon, 29 May 2006 13:01:32 GMT (envelope-from bushman@freebsd.org) Date: Mon, 29 May 2006 13:01:32 GMT Message-Id: <200605291301.k4TD1WFV044533@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 98064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 13:02:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=98064 Change 98064 by bushman@bushman_nss_ldap_cached on 2006/05/29 13:01:18 Makefiles integrated to create additional libraries (nss modules) Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile.inc#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 29 13:08:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED3AB16A505; Mon, 29 May 2006 13:08:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C629316A4D7 for ; Mon, 29 May 2006 13:08:54 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84D7843D46 for ; Mon, 29 May 2006 13:08:54 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TD7fTO046072 for ; Mon, 29 May 2006 13:07:41 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TD7f7R046069 for perforce@freebsd.org; Mon, 29 May 2006 13:07:41 GMT (envelope-from jhb@freebsd.org) Date: Mon, 29 May 2006 13:07:41 GMT Message-Id: <200605291307.k4TD7f7R046069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 98065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 13:08:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=98065 Change 98065 by jhb@jhb_mutex on 2006/05/29 13:07:19 - Retire linker_lookup_set() and just use linker_file_lookup_set() internally again. - Use TAILQ_FOREACH() in a spot. Affected files ... .. //depot/projects/smpng/sys/kern/kern_linker.c#63 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_linker.c#63 (text+ko) ==== @@ -130,8 +130,6 @@ static int linker_load_module(const char *kldname, const char *modname, struct linker_file *parent, struct mod_depend *verinfo, struct linker_file **lfpp); -static int linker_lookup_set(linker_file_t file, const char *name, - void *firstp, void *lastp, int *countp); static modlist_t modlist_lookup2(const char *name, struct mod_depend *verinfo); static char * @@ -189,7 +187,7 @@ KLD_DPF(FILE, ("linker_file_sysinit: calling SYSINITs for %s\n", lf->filename)); - if (linker_lookup_set(lf, "sysinit_set", &start, &stop, NULL) != 0) + if (linker_file_lookup_set(lf, "sysinit_set", &start, &stop, NULL) != 0) return; /* * Perform a bubble sort of the system initialization objects by @@ -231,7 +229,8 @@ KLD_DPF(FILE, ("linker_file_sysuninit: calling SYSUNINITs for %s\n", lf->filename)); - if (linker_lookup_set(lf, "sysuninit_set", &start, &stop, NULL) != 0) + if (linker_file_lookup_set(lf, "sysuninit_set", &start, &stop, + NULL) != 0) return; /* @@ -275,7 +274,7 @@ ("linker_file_register_sysctls: registering SYSCTLs for %s\n", lf->filename)); - if (linker_lookup_set(lf, "sysctl_set", &start, &stop, NULL) != 0) + if (linker_file_lookup_set(lf, "sysctl_set", &start, &stop, NULL) != 0) return; for (oidp = start; oidp < stop; oidp++) @@ -290,7 +289,7 @@ KLD_DPF(FILE, ("linker_file_unregister_sysctls: registering SYSCTLs" " for %s\n", lf->filename)); - if (linker_lookup_set(lf, "sysctl_set", &start, &stop, NULL) != 0) + if (linker_file_lookup_set(lf, "sysctl_set", &start, &stop, NULL) != 0) return; for (oidp = start; oidp < stop; oidp++) @@ -307,7 +306,7 @@ KLD_DPF(FILE, ("linker_file_register_modules: registering modules" " in %s\n", lf->filename)); - if (linker_lookup_set(lf, "modmetadata_set", &start, &stop, + if (linker_file_lookup_set(lf, "modmetadata_set", &start, &stop, NULL) != 0) { /* * This fallback should be unnecessary, but if we get booted @@ -433,8 +432,7 @@ return (0); } - error = linker_load_module(NULL, modname, NULL, verinfo, - result); + error = linker_load_module(NULL, modname, NULL, verinfo, result); KLD_UNLOCK(); return (error); } @@ -650,20 +648,11 @@ } /* - * Locate a linker set and its contents. This is a helper function to avoid - * linker_if.h exposure elsewhere. Note: firstp and lastp are really void **. - * The first function is an internal wrapper so we can avoid having lots of - * (void **) casts. + * Locate a linker set and its contents. This is a helper function to + * avoid linker_if.h exposure elsewhere. Note: firstp and lastp are + * really void **. This function is used in this file so we can avoid + * having lots of (void **) casts. */ -static int -linker_lookup_set(linker_file_t file, const char *name, - void *firstp, void *lastp, int *countp) -{ - - KLD_LOCK_ASSERT(); - return (LINKER_LOOKUP_SET(file, name, firstp, lastp, countp)); -} - int linker_file_lookup_set(linker_file_t file, const char *name, void *firstp, void *lastp, int *countp) @@ -673,7 +662,7 @@ locked = KLD_LOCKED(); if (!locked) KLD_LOCK(); - error = linker_lookup_set(file, name, firstp, lastp, countp); + error = LINKER_LOOKUP_SET(file, name, firstp, lastp, countp); if (!locked) KLD_UNLOCK(); return (error); @@ -1215,8 +1204,7 @@ if (verinfo == NULL) return (modlist_lookup(name, 0)); bestmod = NULL; - for (mod = TAILQ_FIRST(&found_modules); mod; - mod = TAILQ_NEXT(mod, link)) { + TAILQ_FOREACH(mod, &found_modules, link) { if (strcmp(mod->name, name) != 0) continue; ver = mod->version; @@ -1323,7 +1311,7 @@ /* * First get a list of stuff in the kernel. */ - if (linker_lookup_set(linker_kernel_file, MDT_SETNAME, &start, + if (linker_file_lookup_set(linker_kernel_file, MDT_SETNAME, &start, &stop, NULL) == 0) linker_addmodules(linker_kernel_file, start, stop, 1); @@ -1333,7 +1321,8 @@ */ restart: TAILQ_FOREACH(lf, &loaded_files, loaded) { - error = linker_lookup_set(lf, MDT_SETNAME, &start, &stop, NULL); + error = linker_file_lookup_set(lf, MDT_SETNAME, &start, + &stop, NULL); /* * First, look to see if we would successfully link with this * stuff. @@ -1426,7 +1415,8 @@ panic("cannot add dependency"); } lf->userrefs++; /* so we can (try to) kldunload it */ - error = linker_lookup_set(lf, MDT_SETNAME, &start, &stop, NULL); + error = linker_file_lookup_set(lf, MDT_SETNAME, &start, + &stop, NULL); if (!error) { for (mdp = start; mdp < stop; mdp++) { mp = *mdp; @@ -1457,7 +1447,7 @@ continue; } linker_file_register_modules(lf); - if (linker_lookup_set(lf, "sysinit_set", &si_start, + if (linker_file_lookup_set(lf, "sysinit_set", &si_start, &si_stop, NULL) == 0) sysinit_add(si_start, si_stop); linker_file_register_sysctls(lf); @@ -1918,7 +1908,8 @@ if (error) return (error); } - if (linker_lookup_set(lf, MDT_SETNAME, &start, &stop, &count) != 0) + if (linker_file_lookup_set(lf, MDT_SETNAME, &start, &stop, + &count) != 0) return (0); for (mdp = start; mdp < stop; mdp++) { mp = *mdp; From owner-p4-projects@FreeBSD.ORG Mon May 29 13:16:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B701916A5D3; Mon, 29 May 2006 13:16:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CABF216A433 for ; Mon, 29 May 2006 13:16:09 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D163643D72 for ; Mon, 29 May 2006 13:16:04 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TDEpoJ046949 for ; Mon, 29 May 2006 13:14:51 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TDEp31046946 for perforce@freebsd.org; Mon, 29 May 2006 13:14:51 GMT (envelope-from jhb@freebsd.org) Date: Mon, 29 May 2006 13:14:51 GMT Message-Id: <200605291314.k4TDEp31046946@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 98066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 13:16:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=98066 Change 98066 by jhb@jhb_mutex on 2006/05/29 13:13:59 Style fixup. Affected files ... .. //depot/projects/smpng/sys/kern/subr_firmware.c#4 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_firmware.c#4 (text+ko) ==== @@ -118,10 +118,11 @@ static struct firmware * lookup(const char *name) { + struct firmware *fp; int i; for (i = 0; i < FIRMWARE_MAX; i++) { - struct firmware * fp = &firmware_table[i]; + fp = &firmware_table[i]; if (fp->name != NULL && strcasecmp(name, fp->name) == 0) return fp; } From owner-p4-projects@FreeBSD.ORG Mon May 29 13:51:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A307B16AC61; Mon, 29 May 2006 13:51:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4BFF16AC49 for ; Mon, 29 May 2006 13:50:56 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F49E43D5F for ; Mon, 29 May 2006 13:50:49 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TDnam4048819 for ; Mon, 29 May 2006 13:49:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TDnZhD048816 for perforce@freebsd.org; Mon, 29 May 2006 13:49:35 GMT (envelope-from jhb@freebsd.org) Date: Mon, 29 May 2006 13:49:35 GMT Message-Id: <200605291349.k4TDnZhD048816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 98070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 13:51:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=98070 Change 98070 by jhb@jhb_mutex on 2006/05/29 13:48:39 Diff reductions with CVS and trim a useless else that only serves to obfuscate the code. Affected files ... .. //depot/projects/smpng/sys/kern/kern_linker.c#64 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_linker.c#64 (text+ko) ==== @@ -306,8 +306,8 @@ KLD_DPF(FILE, ("linker_file_register_modules: registering modules" " in %s\n", lf->filename)); - if (linker_file_lookup_set(lf, "modmetadata_set", &start, &stop, - NULL) != 0) { + if (linker_file_lookup_set(lf, "modmetadata_set", &start, + &stop, NULL) != 0) { /* * This fallback should be unnecessary, but if we get booted * from boot2 instead of loader and we are missing our @@ -581,8 +581,8 @@ KLD_DPF(FILE, ("linker_file_unload: module %p" " vetoes unload\n", mod)); return (error); - } else - MOD_XLOCK; + } + MOD_XLOCK; module_release(mod); } MOD_XUNLOCK; @@ -648,10 +648,10 @@ } /* - * Locate a linker set and its contents. This is a helper function to - * avoid linker_if.h exposure elsewhere. Note: firstp and lastp are - * really void **. This function is used in this file so we can avoid - * having lots of (void **) casts. + * Locate a linker set and its contents. This is a helper function to avoid + * linker_if.h exposure elsewhere. Note: firstp and lastp are really void **. + * This function is used in this file so we can avoid having lots of (void **) + * casts. */ int linker_file_lookup_set(linker_file_t file, const char *name, @@ -766,7 +766,7 @@ * * Note that we do not obey list locking protocols here. We really don't need * DDB to hang because somebody's got the lock held. We'll take the chance - * that the files list is inconsistent instead. + * that the files list is inconsistant instead. */ int @@ -1899,7 +1899,7 @@ int ver, error = 0, count; /* - * All files are dependent on /kernel. + * All files are dependant on /kernel. */ KLD_LOCK_ASSERT(); if (linker_kernel_file) { @@ -1952,8 +1952,7 @@ break; continue; } - error = linker_load_module(NULL, modname, lf, verinfo, - NULL); + error = linker_load_module(NULL, modname, lf, verinfo, NULL); if (error) { printf("KLD %s: depends on %s - not available\n", lf->filename, modname); From owner-p4-projects@FreeBSD.ORG Mon May 29 15:39:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5772616A8F2; Mon, 29 May 2006 15:39:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A33B216A6FA for ; Mon, 29 May 2006 15:39:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CC4543D48 for ; Mon, 29 May 2006 15:39:03 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TFbnCF059903 for ; Mon, 29 May 2006 15:37:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TFbnkq059900 for perforce@freebsd.org; Mon, 29 May 2006 15:37:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 29 May 2006 15:37:49 GMT Message-Id: <200605291537.k4TFbnkq059900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 15:39:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=98074 Change 98074 by hselasky@hselasky_mini_itx on 2006/05/29 15:37:49 Created a generic buffer abstraction system for USB device drivers. See "usbd_alloc_mbufs()" in "usbd_subr.c". Reworked the "ulpt" driver. The "ulpt" driver should now be MP-safe. Please test! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#5 (text+ko) ==== @@ -1,0 +1,1133 @@ +/* $NetBSD: ulpt.c,v 1.60 2003/10/04 21:19:50 augustss Exp $ */ + +/*- + * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Lennart Augustsson (lennart@augustsson.net) at + * Carlstedt Research & Technology. + * + * 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 the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 THE FOUNDATION OR CONTRIBUTORS + * 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. + */ + +/* + * Printer Class spec: http://www.usb.org/developers/data/devclass/usbprint109.PDF + * Printer Class spec: http://www.usb.org/developers/devclass_docs/usbprint11.pdf + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.68 2005/11/12 17:39:31 iedowse Exp $"); + +#ifdef USB_DEBUG +#define DPRINTF(n,fmt,...) \ + do { if (ulpt_debug > (n)) { \ + printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0) + +static int ulpt_debug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, ulpt, CTLFLAG_RW, 0, "USB ulpt"); +SYSCTL_INT(_hw_usb_ulpt, OID_AUTO, debug, CTLFLAG_RW, + &ulpt_debug, 0, "ulpt debug level"); +#else +#define DPRINTF(...) +#endif + +#define DEV2SC(dev) (dev)->si_drv1 + +#define ULPT_BSIZE (1<<17) /* bytes */ +#define ULPT_IFQ_MAXLEN 2 /* units */ +#define ULPT_WATCHDOG_INTERVAL 5 /* times per second */ +#define ULPT_N_TRANSFER 4 /* units */ + +#define UR_GET_DEVICE_ID 0x00 +#define UR_GET_PORT_STATUS 0x01 +#define UR_SOFT_RESET 0x02 + +#define LPS_NERR 0x08 /* printer no error */ +#define LPS_SELECT 0x10 /* printer selected */ +#define LPS_NOPAPER 0x20 /* printer out of paper */ +#define LPS_INVERT (LPS_SELECT|LPS_NERR) +#define LPS_MASK (LPS_SELECT|LPS_NERR|LPS_NOPAPER) + +struct ulpt_softc { + device_t sc_dev; + struct usbd_device * sc_udev; + struct cdev * sc_cdev_1; + struct cdev * sc_cdev_2; + struct usbd_xfer * sc_xfer[ULPT_N_TRANSFER]; + struct __callout sc_watchdog; + struct mtx sc_mtx; + struct usbd_ifqueue sc_rdq_free; + struct usbd_ifqueue sc_rdq_used; + struct usbd_ifqueue sc_wrq_free; + struct usbd_ifqueue sc_wrq_used; + + void * sc_mem_ptr_1; /* should be freed at detach */ + void * sc_mem_ptr_2; /* should be freed at detach */ + + u_int32_t sc_flags; +#define ULPT_FLAG_DEV_OPEN 0x00000001 /* device is open */ +#define ULPT_FLAG_NO_READ 0x00000002 /* device has no read endpoint */ +#define ULPT_FLAG_RST_SLP 0x00000004 /* device is sleeping */ +#define ULPT_FLAG_RST_WUP 0x00000008 /* device is waiting for wakeup */ +#define ULPT_FLAG_WR_UIO 0x00000010 /* device is doing I/O */ +#define ULPT_FLAG_RD_UIO 0x00000020 /* device is doing I/O */ +#define ULPT_FLAG_WR_SLP 0x00000040 /* device is sleeping */ +#define ULPT_FLAG_RD_SLP 0x00000080 /* device is sleeping */ +#define ULPT_FLAG_WR_WUP 0x00000100 /* device is waiting for wakeup */ +#define ULPT_FLAG_RD_WUP 0x00000200 /* device is waiting for wakeup */ +#define ULPT_FLAG_CLOSING 0x00000400 /* device is closing */ +#define ULPT_FLAG_GONE 0x00000800 /* device is gone */ +#define ULPT_FLAG_WAIT_USB 0x00001000 /* device is waiting for USB callbacks */ +#define ULPT_FLAG_WAIT_CO 0x00002000 /* device is waiting for callouts */ +#define ULPT_FLAG_DUMP_READ 0x00004000 /* device is not opened for read */ +#define ULPT_FLAG_WR_FLUSH 0x00008000 /* device is flushing write data */ +#define ULPT_FLAG_NO_FLUSH 0x00010000 /* device should not flush write data */ +#define ULPT_FLAG_PIPE_ERR 0x00020000 /* device has signalled an error */ + + u_int8_t sc_iface_no; + u_int8_t sc_last_status; + + u_int8_t sc_wakeup_detach; /* dummy */ + u_int8_t sc_wakeup_reset; /* dummy */ + u_int8_t sc_wakeup_read; /* dummy */ + u_int8_t sc_wakeup_write; /* dummy */ + u_int8_t sc_wakeup_flush; /* dummy */ + u_int8_t sc_wakeup_sync_1; /* dummy */ +}; + +extern cdevsw_t ulpt_cdevsw; + +static void +ulpt_watchdog(void *__sc) +{ + struct ulpt_softc *sc = __sc; + + mtx_assert(&(sc->sc_mtx), MA_OWNED); + + DPRINTF(2, "start sc=%p\n", sc); + + /* start reading of status, if not already started */ + + usbd_transfer_start(sc->sc_xfer[2]); + + if ((sc->sc_flags & (ULPT_FLAG_NO_READ|ULPT_FLAG_DUMP_READ)) && + (sc->sc_flags & (ULPT_FLAG_DEV_OPEN)) && + (!(sc->sc_flags & (ULPT_FLAG_CLOSING)))) { + + /* start reading of data, if not already started */ + + usbd_transfer_start(sc->sc_xfer[1]); + } + + __callout_reset(&(sc->sc_watchdog), + hz / ULPT_WATCHDOG_INTERVAL, + &ulpt_watchdog, sc); + + mtx_unlock(&(sc->sc_mtx)); + + return; +} + +static void +ulpt_write_callback(struct usbd_xfer *xfer) +{ + struct ulpt_softc *sc = xfer->priv_sc; + struct usbd_mbuf *m; + + USBD_CHECK_STATUS(xfer); + + tr_transferred: + tr_setup: + USBD_IF_DEQUEUE(&sc->sc_wrq_used, m); + + if (m) { + + if (m->cur_data_len > ULPT_BSIZE) { + /* extra length check */ + m->cur_data_len = ULPT_BSIZE; + } + + bcopy(m->cur_data_ptr, xfer->buffer, m->cur_data_len); + xfer->length = m->cur_data_len; + + USBD_IF_ENQUEUE(&sc->sc_wrq_free, m); + + usbd_start_hardware(xfer); + + if (sc->sc_flags & ULPT_FLAG_WR_WUP) { + sc->sc_flags &= ~ULPT_FLAG_WR_WUP; + wakeup(&(sc->sc_wakeup_write)); + } + + } else { + if (sc->sc_flags & ULPT_FLAG_WR_FLUSH) { + sc->sc_flags &= ~ULPT_FLAG_WR_FLUSH; + wakeup(&(sc->sc_wakeup_flush)); + } + } + return; + + tr_error: + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + + sc->sc_flags |= ULPT_FLAG_PIPE_ERR; + + if (sc->sc_flags & ULPT_FLAG_WR_WUP) { + sc->sc_flags &= ~ULPT_FLAG_WR_WUP; + wakeup(&(sc->sc_wakeup_write)); + } + + if (sc->sc_flags & ULPT_FLAG_WR_FLUSH) { + sc->sc_flags &= ~ULPT_FLAG_WR_FLUSH; + wakeup(&(sc->sc_wakeup_flush)); + } + + return; +} + +static void +ulpt_read_callback(struct usbd_xfer *xfer) +{ + struct ulpt_softc *sc = xfer->priv_sc; + struct usbd_mbuf *m; + + USBD_CHECK_STATUS(xfer); + + tr_transferred: + if (sc->sc_flags & (ULPT_FLAG_NO_READ|ULPT_FLAG_DUMP_READ)) { + return; + } + + USBD_IF_DEQUEUE(&sc->sc_rdq_free, m); + + if (m) { + USBD_MBUF_RESET(m); + + if (xfer->actlen > ULPT_BSIZE) { + /* extra length check */ + xfer->actlen = ULPT_BSIZE; + } + + bcopy(xfer->buffer, m->cur_data_ptr, xfer->actlen); + m->cur_data_len = xfer->actlen; + + USBD_IF_ENQUEUE(&sc->sc_rdq_used, m); + + if (sc->sc_flags & ULPT_FLAG_RD_WUP) { + sc->sc_flags &= ~ULPT_FLAG_RD_WUP; + wakeup(&(sc->sc_wakeup_read)); + } + } + + tr_setup: + USBD_IF_POLL(&sc->sc_rdq_free, m); + + if (m) { + usbd_start_hardware(xfer); + } + + return; + + tr_error: + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + + sc->sc_flags |= ULPT_FLAG_PIPE_ERR; + + if (sc->sc_flags & ULPT_FLAG_RD_WUP) { + sc->sc_flags &= ~ULPT_FLAG_RD_WUP; + wakeup(&(sc->sc_wakeup_read)); + } + return; +} + +static void +ulpt_status_callback(struct usbd_xfer *xfer) +{ + struct ulpt_softc *sc = xfer->priv_sc; + usb_device_request_t *req = xfer->buffer; + u_int8_t cur_status = req->bData[0]; + u_int8_t new_status; + + USBD_CHECK_STATUS(xfer); + + tr_transferred: + cur_status = (cur_status ^ LPS_INVERT) & LPS_MASK; + new_status = cur_status & ~sc->sc_last_status; + sc->sc_last_status = cur_status; + + if (new_status & LPS_SELECT) + log(LOG_NOTICE, "%s: offline\n", + device_get_nameunit(sc->sc_dev)); + else if (new_status & LPS_NOPAPER) + log(LOG_NOTICE, "%s: out of paper\n", + device_get_nameunit(sc->sc_dev)); + else if (new_status & LPS_NERR) + log(LOG_NOTICE, "%s: output error\n", + device_get_nameunit(sc->sc_dev)); + return; + + tr_setup: + req->bmRequestType = UT_READ_CLASS_INTERFACE; + req->bRequest = UR_GET_PORT_STATUS; + USETW(req->wValue, 0); + USETW(req->wIndex, sc->sc_iface_no); + USETW(req->wLength, 1); + + usbd_start_hardware(xfer); + + return; + + tr_error: + DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + return; +} + +static void +ulpt_reset_callback(struct usbd_xfer *xfer) +{ + struct ulpt_softc *sc = xfer->priv_sc; + usb_device_request_t *req = xfer->buffer; + + USBD_CHECK_STATUS(xfer); + + tr_error: + if (req->bmRequestType == UT_WRITE_CLASS_OTHER) { + /* + * There was a mistake in the USB printer 1.0 spec that + * gave the request type as UT_WRITE_CLASS_OTHER; it + * should have been UT_WRITE_CLASS_INTERFACE. Many + * printers use the old one, so try both: + */ + req->bmRequestType = UT_WRITE_CLASS_INTERFACE; /* 1.1 */ + req->bRequest = UR_SOFT_RESET; + USETW(req->wValue, 0); + USETW(req->wIndex, sc->sc_iface_no); + USETW(req->wLength, 0); + + usbd_start_hardware(xfer); + + return; + } + + tr_transferred: + if (sc->sc_flags & ULPT_FLAG_RST_WUP) { + sc->sc_flags &= ~ULPT_FLAG_RST_WUP; + + wakeup(&(sc->sc_wakeup_reset)); + } + return; + + tr_setup: + req->bmRequestType = UT_WRITE_CLASS_OTHER; /* 1.0 */ + req->bRequest = UR_SOFT_RESET; + USETW(req->wValue, 0); + USETW(req->wIndex, sc->sc_iface_no); + USETW(req->wLength, 0); + + usbd_start_hardware(xfer); + + return; +} + +static const struct usbd_config ulpt_config[ULPT_N_TRANSFER] = { + [0] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = ULPT_BSIZE, + .flags = 0, + .callback = &ulpt_write_callback, + }, + + [1] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = ULPT_BSIZE, + .flags = USBD_SHORT_XFER_OK, + .callback = &ulpt_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t) + 1, + .callback = &ulpt_status_callback, + .timeout = 1000, /* 1 second */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ulpt_reset_callback, + .timeout = 1000, /* 1 second */ + }, +}; + +/* prototypes */ + +static device_probe_t ulpt_probe; +static device_attach_t ulpt_attach; +static device_detach_t ulpt_detach; +static d_close_t ulpt_close; + +static int +ulpt_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + usb_interface_descriptor_t *id; + + DPRINTF(10, "\n"); + + if (uaa->iface == NULL) { + return UMATCH_NONE; + } + + id = usbd_get_interface_descriptor(uaa->iface); + + if ((id != NULL) && + (id->bInterfaceClass == UICLASS_PRINTER) && + (id->bInterfaceSubClass == UISUBCLASS_PRINTER) && + ((id->bInterfaceProtocol == UIPROTO_PRINTER_UNI) || + (id->bInterfaceProtocol == UIPROTO_PRINTER_BI) || + (id->bInterfaceProtocol == UIPROTO_PRINTER_1284))) { + return UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO; + } + return UMATCH_NONE; +} + +static void +ulpt_detach_complete(struct usbd_memory_info *info) +{ + struct ulpt_softc *sc = info->priv_sc; + + mtx_lock(&(sc->sc_mtx)); + + if (sc->sc_flags & ULPT_FLAG_WAIT_USB) { + sc->sc_flags &= ~ULPT_FLAG_WAIT_USB; + wakeup(&(sc->sc_wakeup_detach)); + } + + mtx_unlock(&(sc->sc_mtx)); + + return; +} + +static int +ulpt_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct ulpt_softc *sc = device_get_softc(dev); + struct usbd_interface *iface_ptr = uaa->iface; + usb_interface_descriptor_t *id; + int32_t iface_index = uaa->iface_index; + int32_t iface_alt_index = 0; + int32_t unit = device_get_unit(dev); + usbd_status err; + + DPRINTF(10, "sc=%p\n", sc); + + sc->sc_dev = dev; + sc->sc_udev = uaa->device; + + sc->sc_rdq_free.ifq_maxlen = ULPT_IFQ_MAXLEN; + sc->sc_rdq_used.ifq_maxlen = ULPT_IFQ_MAXLEN; + sc->sc_wrq_free.ifq_maxlen = ULPT_IFQ_MAXLEN; + sc->sc_wrq_used.ifq_maxlen = ULPT_IFQ_MAXLEN; + + usbd_set_desc(dev, sc->sc_udev); + + mtx_init(&(sc->sc_mtx), "ulpt lock", NULL, MTX_DEF|MTX_RECURSE); + + __callout_init_mtx(&(sc->sc_watchdog), + &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); +#if 0 + /* TODO: "__callout_init_mtx()" does not support this: */ + + sc->sc_flags |= ULPT_FLAG_WAIT_CO; +#endif + + sc->sc_mem_ptr_1 = + usbd_alloc_mbufs(M_DEVBUF, &(sc->sc_rdq_free), ULPT_BSIZE, ULPT_IFQ_MAXLEN); + + if (sc->sc_mem_ptr_1 == NULL) { + goto detach; + } + + sc->sc_mem_ptr_2 = + usbd_alloc_mbufs(M_DEVBUF, &(sc->sc_wrq_free), ULPT_BSIZE, ULPT_IFQ_MAXLEN); + + if (sc->sc_mem_ptr_2 == NULL) { + goto detach; + } + + /* search through all the descriptors looking for bidir mode */ + + while(iface_alt_index < 32) { + + err = usbd_fill_iface_data + (sc->sc_udev, iface_index, iface_alt_index); + + if (err) { + DPRINTF(0, "end of alternate settings, " + "error=%s\n", usbd_errstr(err)); + goto detach; + } + + id = usbd_get_interface_descriptor(iface_ptr); + + if ((id->bInterfaceClass == UICLASS_PRINTER) && + (id->bInterfaceSubClass == UISUBCLASS_PRINTER) && + (id->bInterfaceProtocol == UIPROTO_PRINTER_BI)) { + goto found; + } + + iface_alt_index++; + } + goto detach; + + found: + + DPRINTF(0, "setting alternate " + "config number: %d\n", iface_alt_index); + + if (iface_alt_index) { + + err = usbreq_set_interface + (sc->sc_udev, iface_index, iface_alt_index); + + if (err) { + DPRINTF(0, "could not set alternate " + "config, error=%s\n", usbd_errstr(err)); + goto detach; + } + } + + sc->sc_iface_no = id->bInterfaceNumber; + + err = usbd_transfer_setup(sc->sc_udev, iface_index, sc->sc_xfer, + ulpt_config, ULPT_N_TRANSFER, sc, &(sc->sc_mtx), + &ulpt_detach_complete); + if (err) { + DPRINTF(0, "error=%s\n", usbd_errstr(err)) ; + goto detach; + } + + sc->sc_flags |= ULPT_FLAG_WAIT_USB; + + if (usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_BROKEN_BIDIR) { + /* this device doesn't handle reading properly. */ + sc->sc_flags |= ULPT_FLAG_NO_READ; + } + + device_printf(sc->sc_dev, "using %s-directional mode\n", + (sc->sc_flags & ULPT_FLAG_NO_READ) ? "uni" : "bi"); + + +#if 0 +/* + * This code is disabled because for some mysterious reason it causes + * printing not to work. But only sometimes, and mostly with + * UHCI and less often with OHCI. *sigh* + */ + { + usb_config_descriptor_t *cd = usbd_get_config_descriptor(dev); + usb_device_request_t req; + int len, alen; + + req.bmRequestType = UT_READ_CLASS_INTERFACE; + req.bRequest = UR_GET_DEVICE_ID; + USETW(req.wValue, cd->bConfigurationValue); + USETW2(req.wIndex, id->bInterfaceNumber, id->bAlternateSetting); + USETW(req.wLength, sizeof devinfo - 1); + err = usbd_do_request_flags(dev, &req, devinfo, USBD_SHORT_XFER_OK, + &alen, USBD_DEFAULT_TIMEOUT); + if (err) { + device_printf(sc->sc_dev, "cannot get device id\n"); + } else if (alen <= 2) { + device_printf(sc->sc_dev, "empty device id, no " + "printer connected?\n"); + } else { + /* devinfo now contains an IEEE-1284 device ID */ + len = ((devinfo[0] & 0xff) << 8) | (devinfo[1] & 0xff); + if (len > sizeof devinfo - 3) + len = sizeof devinfo - 3; + devinfo[len] = 0; + printf("%s: device id <", device_get_nameunit(sc->sc_dev)); + ieee1284_print_id(devinfo+2); + printf(">\n"); + } + } +#endif + + sc->sc_cdev_1 = make_dev + (&ulpt_cdevsw, (2*unit)|0, UID_ROOT, GID_OPERATOR, + 0644, "ulpt%d", unit); + + sc->sc_cdev_2 = make_dev + (&ulpt_cdevsw, (2*unit)|1, UID_ROOT, GID_OPERATOR, + 0644, "unlpt%d", unit); + + if (sc->sc_cdev_1) { + DEV2SC(sc->sc_cdev_1) = sc; + } + + if (sc->sc_cdev_2) { + DEV2SC(sc->sc_cdev_2) = sc; + } + + /* start watchdog (returns unlocked) */ + + mtx_lock(&(sc->sc_mtx)); + + ulpt_watchdog(sc); + + return 0; + + detach: + ulpt_detach(dev); + return ENOMEM; +} + +static int +ulpt_detach(device_t dev) +{ + struct ulpt_softc *sc = device_get_softc(dev); + int error; + + DPRINTF(0, "sc=%p\n", sc); + + mtx_lock(&(sc->sc_mtx)); + sc->sc_flags |= ULPT_FLAG_GONE; + mtx_unlock(&(sc->sc_mtx)); + + if (sc->sc_cdev_1) { + + ulpt_close(sc->sc_cdev_1, 0, 0, 0); + + DEV2SC(sc->sc_cdev_1) = NULL; + + destroy_dev(sc->sc_cdev_1); + } + + if (sc->sc_cdev_2) { + + ulpt_close(sc->sc_cdev_2, 0, 0, 0); + + DEV2SC(sc->sc_cdev_2) = NULL; + + destroy_dev(sc->sc_cdev_2); + } + + mtx_lock(&(sc->sc_mtx)); + + __callout_stop(&(sc->sc_watchdog)); + + mtx_unlock(&(sc->sc_mtx)); + + usbd_transfer_unsetup(sc->sc_xfer, ULPT_N_TRANSFER); + + if (sc->sc_mem_ptr_1) { + free(sc->sc_mem_ptr_1, M_DEVBUF); + } + + if (sc->sc_mem_ptr_2) { + free(sc->sc_mem_ptr_2, M_DEVBUF); + } + + /* wait for callbacks to be aborted */ + + mtx_lock(&(sc->sc_mtx)); + while (sc->sc_flags & (ULPT_FLAG_WAIT_USB|ULPT_FLAG_WAIT_CO)) { + + error = msleep(&(sc->sc_wakeup_detach), &(sc->sc_mtx), + PRIBIO, "ulpt_sync_2", 0); + } + mtx_unlock(&(sc->sc_mtx)); + + mtx_destroy(&(sc->sc_mtx)); + + return 0; +} + +static int +ulpt_uiomove(struct ulpt_softc *sc, u_int32_t context_bit, void *cp, int n, + struct uio *uio) +{ + int error; + + sc->sc_flags |= context_bit; + + mtx_unlock(&(sc->sc_mtx)); + + /* "uiomove()" can sleep so one + * needs to make a wrapper, exiting + * the mutex and checking things + */ + error = uiomove(cp, n, uio); + + mtx_lock(&(sc->sc_mtx)); + + sc->sc_flags &= ~context_bit; + + if (sc->sc_flags & ULPT_FLAG_CLOSING) { + wakeup(&(sc->sc_wakeup_sync_1)); + error = EINTR; + } + + if (sc->sc_flags & ULPT_FLAG_PIPE_ERR) { + error = EINTR; + } + + if (error) { + sc->sc_flags |= ULPT_FLAG_NO_FLUSH; + } + + return error; +} + +static int +ulpt_msleep(struct ulpt_softc *sc, u_int32_t context_bit, void *ident) +{ + int error; + + sc->sc_flags |= context_bit; + + error = msleep(ident, &(sc->sc_mtx), PRIBIO|PCATCH, "ulpt_sleep", 0); + + sc->sc_flags &= ~context_bit; + + if (sc->sc_flags & ULPT_FLAG_CLOSING) { + wakeup(&(sc->sc_wakeup_sync_1)); + error = EINTR; + } + + if (sc->sc_flags & ULPT_FLAG_PIPE_ERR) { + error = EINTR; + } + + if (error) { + sc->sc_flags |= ULPT_FLAG_NO_FLUSH; + } + return error; +} + +static int +ulpt_reset(struct ulpt_softc *sc) +{ + DPRINTF(1, "\n"); + + /* start reset, if not already started */ + + usbd_transfer_start(sc->sc_xfer[3]); + + return ulpt_msleep(sc, ULPT_FLAG_RST_SLP|ULPT_FLAG_RST_WUP, + &(sc->sc_wakeup_reset)); +} + +static int +ulpt_open(struct cdev *dev, int flag, int mode, struct thread *td) +{ + u_int8_t no_prime = (minor(dev) & 1); + struct ulpt_softc *sc = DEV2SC(dev); + struct usbd_mbuf *m; + int error = 0; + + DPRINTF(1, "\n"); + + if (sc == NULL) { + return EIO; + } + + mtx_lock(&(sc->sc_mtx)); + + if (sc->sc_flags & + (ULPT_FLAG_DEV_OPEN|ULPT_FLAG_GONE| + ULPT_FLAG_RST_SLP|ULPT_FLAG_RST_WUP)) { + error = EBUSY; + goto done; + } + + if (no_prime == 0) { + error = ulpt_reset(sc); + if (error) { + goto done; + } + } + + /* reset read queue */ + + while(1) { + USBD_IF_DEQUEUE(&(sc->sc_rdq_used), m); + + if (m) { + USBD_IF_ENQUEUE(&(sc->sc_rdq_free), m); + } else { + break; + } + } + + /* reset write queue */ + + while(1) { + USBD_IF_DEQUEUE(&(sc->sc_wrq_used), m); + + if (m) { + USBD_IF_ENQUEUE(&(sc->sc_wrq_free), m); + } else { + break; + } + } + + if (flag & FREAD) { + sc->sc_flags &= ~ULPT_FLAG_DUMP_READ; + } else { + sc->sc_flags |= ULPT_FLAG_DUMP_READ; + } + + sc->sc_flags |= ULPT_FLAG_DEV_OPEN; + + done: + mtx_unlock(&(sc->sc_mtx)); + + DPRINTF(0, "done, error=%d\n", error); + return error; +} + +static int +ulpt_close(struct cdev *dev, int flag, int mode, struct thread *td) +{ + struct ulpt_softc *sc = DEV2SC(dev); + int error; + + DPRINTF(1, "\n"); + + if (sc == NULL) { + return EIO; + } + + mtx_lock(&(sc->sc_mtx)); + + if (sc->sc_flags & (ULPT_FLAG_WR_FLUSH|ULPT_FLAG_CLOSING)) { + goto done; + } + + if (sc->sc_flags & ULPT_FLAG_DEV_OPEN) { + + /* + * wait for data to + * be written to pipe: + */ + + if (!(sc->sc_flags & (ULPT_FLAG_GONE|ULPT_FLAG_NO_FLUSH| + ULPT_FLAG_PIPE_ERR))) { + + sc->sc_flags |= ULPT_FLAG_WR_FLUSH; + + /* start write transfer, if not already started */ + + usbd_transfer_start(sc->sc_xfer[0]); + + while (sc->sc_flags & ULPT_FLAG_WR_FLUSH) { + + error = msleep(&(sc->sc_wakeup_flush), &(sc->sc_mtx), + PRIBIO|PCATCH, "ulpt_sync_0", 0); + if (error) { + break; + } + } + } + + sc->sc_flags |= ULPT_FLAG_CLOSING; + + if (sc->sc_xfer[0]) { + usbd_transfer_stop(sc->sc_xfer[0]); + } + + if (sc->sc_xfer[1]) { + usbd_transfer_stop(sc->sc_xfer[1]); + } + + while (sc->sc_flags & + (ULPT_FLAG_RD_SLP|ULPT_FLAG_RD_WUP|ULPT_FLAG_RD_UIO| + ULPT_FLAG_WR_SLP|ULPT_FLAG_WR_WUP|ULPT_FLAG_WR_UIO| + ULPT_FLAG_RST_SLP|ULPT_FLAG_RST_WUP)) { + + if (sc->sc_flags & ULPT_FLAG_RD_WUP) { + sc->sc_flags &= ~ULPT_FLAG_RD_WUP; + wakeup(&(sc->sc_wakeup_read)); + } + + if (sc->sc_flags & ULPT_FLAG_WR_WUP) { + sc->sc_flags &= ~ULPT_FLAG_WR_WUP; + wakeup(&(sc->sc_wakeup_write)); + } + + if (sc->sc_flags & ULPT_FLAG_RST_WUP) { + sc->sc_flags &= ~ULPT_FLAG_RST_WUP; + wakeup(&(sc->sc_wakeup_reset)); + } + + error = msleep(&(sc->sc_wakeup_sync_1), &(sc->sc_mtx), + PRIBIO, "ulpt_sync_1", 0); + } + + sc->sc_flags &= ~(ULPT_FLAG_DEV_OPEN| + ULPT_FLAG_CLOSING| + ULPT_FLAG_WR_FLUSH| + ULPT_FLAG_NO_FLUSH| + ULPT_FLAG_PIPE_ERR); + } + + done: + mtx_unlock(&(sc->sc_mtx)); + + DPRINTF(0, "closed\n"); + + return 0; +} + +static int +ulpt_write(struct cdev *dev, struct uio *uio, int flags) +{ + struct ulpt_softc *sc = DEV2SC(dev); + struct usbd_mbuf *m; + int error = 0; + int io_len; + + DPRINTF(1, "\n"); + + if (sc == NULL) { + return EIO; + } + + mtx_lock(&(sc->sc_mtx)); + + if(sc->sc_flags & (ULPT_FLAG_CLOSING|ULPT_FLAG_GONE| + ULPT_FLAG_WR_SLP|ULPT_FLAG_WR_UIO| + ULPT_FLAG_PIPE_ERR)) { + error = EIO; + goto done; + } + + while (uio->uio_resid) { + + USBD_IF_DEQUEUE(&sc->sc_wrq_free, m); + + if (m == NULL) { + error = ulpt_msleep(sc, (ULPT_FLAG_WR_SLP|ULPT_FLAG_WR_WUP), + &(sc->sc_wakeup_write)); + if (error) { + break; + } else { + continue; + } + } + + USBD_MBUF_RESET(m); + + io_len = min(m->cur_data_len, uio->uio_resid); + + m->cur_data_len = io_len; + + DPRINTF(1, "transfer %d bytes to %p\n", + io_len, m->cur_data_ptr); + + error = ulpt_uiomove(sc, ULPT_FLAG_WR_UIO, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 29 15:45:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E829F16AFD7; Mon, 29 May 2006 15:45:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F146916AFC8 for ; Mon, 29 May 2006 15:45:07 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from mail45.e.nsc.no (mail45.e.nsc.no [193.213.115.45]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BB7643D8A for ; Mon, 29 May 2006 15:44:56 +0000 (GMT) (envelope-from hselasky@c2i.net) Received: from [10.0.0.2] (ti131310a080-14577.bb.online.no [85.165.248.241]) by mail45.nsc.no (8.13.6/8.13.5) with ESMTP id k4TFie56028481 for ; Mon, 29 May 2006 17:44:41 +0200 (CEST) From: Hans Petter Selasky To: Perforce Change Reviews Date: Mon, 29 May 2006 17:44:43 +0200 User-Agent: KMail/1.7 References: <200605272150.k4RLo9Aw026648@repoman.freebsd.org> <20060528133943.N79162@fledge.watson.org> In-Reply-To: <20060528133943.N79162@fledge.watson.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200605291744.43653.hselasky@c2i.net> Cc: Subject: Re: PERFORCE change 97970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 15:45:21 -0000 On Sunday 28 May 2006 14:40, Robert Watson wrote: > On Sat, 27 May 2006, Hans Petter Selasky wrote: > > http://perforce.freebsd.org/chv.cgi?CH=97970 > > > > Change 97970 by hselasky@hselasky_mini_itx on 2006/05/27 21:49:24 > > > > Copied old USB files into "/sys/dev/usb.old" for reference. Prepared > > "/sys/conf/files" for new USB system. > > For future reference, you might want to instead add an additional entry in > the branch definition for your branch such that the FreeBSD vendor USB code > is merged to that directory in your branch. That way the usb.old tree > would continue to track changes from the FreeBSD vendor tree when you > integrate. You can still set this up, but it might require slight massaging > during the first integration. Ok. I am not that good at p4 yet, and I would need some help to do it. My idea was to do a "diff" when the integration process is done and see what patches was missed. --HPS From owner-p4-projects@FreeBSD.ORG Mon May 29 17:08:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69B7216AE9B; Mon, 29 May 2006 17:08:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4135516AE7F for ; Mon, 29 May 2006 17:08:56 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B78A43D46 for ; Mon, 29 May 2006 17:08:56 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TH7g2i081633 for ; Mon, 29 May 2006 17:07:42 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TH7geA081630 for perforce@freebsd.org; Mon, 29 May 2006 17:07:42 GMT (envelope-from csjp@freebsd.org) Date: Mon, 29 May 2006 17:07:42 GMT Message-Id: <200605291707.k4TH7geA081630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 98080 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 17:08:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=98080 Change 98080 by csjp@csjp_xor on 2006/05/29 17:06:58 Add a note to the audit_submit man page informing users that how the terminal ID portion of the subject token will be set. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#7 (text+ko) ==== @@ -26,7 +26,7 @@ .\" 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. -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#6 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#7 $ .Dd April 11, 2006 .Dt audit_submit 3 .Os @@ -65,6 +65,18 @@ If .Fa format is NULL, then no text token is created in the audit record. +.Pp +It should be noted that +.Nm +assumes that +.Xr setaudit 2 , +or +.Xr setaudit_addr 2 +has already been called. As a direct result, the terminal ID for the +subject will be retrieved from the kernel via +.Xr getaudit 2 , +or +.Xr getaudit_addr 2 . .Sh EXAMPLES .Bd -literal -offset indent #include @@ -96,6 +108,7 @@ .Ed .Sh SEE ALSO .Xr auditon 2 , +.Xr getaudit 2 , .Xr libbsm 3 , .Xr stdarg 3 .Sh HISTORY From owner-p4-projects@FreeBSD.ORG Mon May 29 19:56:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD40016A55B; Mon, 29 May 2006 19:56:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 284B416A529 for ; Mon, 29 May 2006 19:56:44 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C50BE43D46 for ; Mon, 29 May 2006 19:56:43 +0000 (GMT) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TJtTo4001891 for ; Mon, 29 May 2006 19:55:29 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TJtJla001870 for perforce@freebsd.org; Mon, 29 May 2006 19:55:19 GMT (envelope-from bz@freebsd.org) Date: Mon, 29 May 2006 19:55:19 GMT Message-Id: <200605291955.k4TJtJla001870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 98088 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 19:56:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=98088 Change 98088 by bz@bz_dopt_ah on 2006/05/29 19:54:27 IFC @98087 Affected files ... .. //depot/projects/fast_ipsec/src/sys/Makefile#4 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_reg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_var.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/uart_dev_sa1110.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/cam/cam_periph.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files#13 integrate .. //depot/projects/fast_ipsec/src/sys/conf/kmod.mk#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/digi/digi.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_debug.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_raid.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/fixup_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/re/if_re.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/dev/safe/safe.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sio/sio.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/midi/midi.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/midi/midi.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/midi/midiq.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/midi/mpu401.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/midi/mpu401.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/midi/mpu_if.m#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/midi/mpufoi_if.m#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/midi/sequencer.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/midi/sequencer.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/midi/synth_if.m#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/apm/apm_saver.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_dbg.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_dev_ns8250.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_tty.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ubsec/ubsec.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ehcivar.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ohci.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ohcireg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ohcivar.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/sl811hs.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uhci.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_mem.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usbdivar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/zs/zs.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Dependencies#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-cam#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-crypto#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-dev_pci#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-dev_sound#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-dev_usb#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-geom#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-i4b#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-kern#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-libkern#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-linux#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-net80211#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-netgraph#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-netinet#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-netinet6#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-netipsec#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-opencrypto#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Doxyfile-vm#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/README#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/common-Doxyfile#1 branch .. //depot/projects/fast_ipsec/src/sys/doc/subsys/notreviewed.dox#1 branch .. //depot/projects/fast_ipsec/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nullfs/null_vfsops.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/gdb/gdb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/gdb/gdb_cons.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gdb/gdb_main.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/gdb/gdb_packet.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/geom_bsd.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/bios/apm.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/npx.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/npx.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/ssc.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/isofs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exec.c#10 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_linker.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_disk.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_taskqueue.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/tty_cons.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vnode_if.src#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/Makefile#10 integrate .. //depot/projects/fast_ipsec/src/sys/modules/mfi/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/sound/driver/cmi/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/sound/driver/emu10k1/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/bpf_filter.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_fw.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/nfs4client/nfs4_vfsops.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_nfsiod.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfsmount.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/opencrypto/crypto.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/opencrypto/cryptodev.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/sio.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/pmap.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/sys/cons.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/kernel.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/queue.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#10 integrate Differences ... ==== //depot/projects/fast_ipsec/src/sys/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.35 2006/03/17 18:54:34 ru Exp $ +# $FreeBSD: src/sys/Makefile,v 1.36 2006/05/29 19:29:41 maxim Exp $ .include @@ -11,10 +11,10 @@ # Directories to include in cscope name file and TAGS. CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ - isofs kern libkern modules net netatalk netatm netgraph \ - netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ - nfsclient nfs4client rpc pccard pci posix4 sys ufs vm \ - ${ARCHDIR} + isofs kern libkern modules net net80211 netatalk netatm \ + netgraph netinet netinet6 netipx netkey netnatm netncp \ + netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \ + ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/fast_ipsec/src/sys/amd64/amd64/busdma_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.74 2006/05/03 04:14:17 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.75 2006/05/28 18:31:32 silby Exp $"); #include #include @@ -492,7 +492,16 @@ } } + /* + * XXX: + * (dmat->alignment < dmat->maxsize) is just a quick hack; the exact + * alignment guarantees of malloc need to be nailed down, and the + * code below should be rewritten to take that into account. + * + * In the meantime, we'll panic if malloc gets it wrong. + */ if ((dmat->maxsize <= PAGE_SIZE) && + (dmat->alignment < dmat->maxsize) && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); } else { @@ -510,6 +519,8 @@ CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); + } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { + panic("bus_dmamem_alloc failed to align memory properly."); } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); @@ -529,8 +540,9 @@ */ if (map != NULL) panic("bus_dmamem_free: Invalid map freed\n"); - if ((dmat->maxsize <= PAGE_SIZE) - && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) + if ((dmat->maxsize <= PAGE_SIZE) && + (dmat->alignment < dmat->maxsize) && + dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) free(vaddr, M_DEVBUF); else { contigfree(vaddr, dmat->maxsize, M_DEVBUF); ==== //depot/projects/fast_ipsec/src/sys/arm/sa11x0/assabet_machdep.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.10 2005/10/03 14:15:50 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.13 2006/05/26 01:41:47 cognet Exp $"); #include "opt_md.h" @@ -93,6 +93,8 @@ #include #include +#include + #define MDROOT_ADDR 0xd0400000 #define KERNEL_PT_VMEM 0 /* Page table for mapping video memory */ @@ -151,9 +153,37 @@ struct pv_addr undstack; struct pv_addr abtstack; struct pv_addr kernelstack; -void enable_mmu(vm_offset_t); static struct trapframe proc0_tf; +/* Static device mappings. */ +static const struct pmap_devmap assabet_devmap[] = { + /* + * Map the on-board devices VA == PA so that we can access them + * with the MMU on or off. + */ + { + SACOM1_VBASE, + SACOM1_BASE, + SACOM1_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { + SAIPIC_BASE, + SAIPIC_BASE, + SAIPIC_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { + 0, + 0, + 0, + 0, + 0, + } +}; + struct arm32_dma_range * bus_dma_get_range(void) { @@ -334,11 +364,8 @@ /* Map the vector page. */ pmap_map_entry(l1pagetable, vector_page, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - /* Map SACOM3. */ - pmap_map_entry(l1pagetable, 0xd000d000, 0x80010000, - VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE); - pmap_map_entry(l1pagetable, 0x90050000, 0x90050000, - VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE); + /* Map the statically mapped devices. */ + pmap_devmap_bootstrap(l1pagetable, assabet_devmap); pmap_map_chunk(l1pagetable, sa1_cache_clean_addr, 0xf0000000, CPU_SA110_CACHE_CLEAN_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); ==== //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_io.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io.c,v 1.7 2006/05/18 22:03:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io.c,v 1.8 2006/05/23 12:14:14 cognet Exp $"); #include #include #include @@ -146,6 +146,13 @@ u_long startpa, endpa, pa; vm_offset_t va; pt_entry_t *pte; + const struct pmap_devmap *pd; + + if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) { + /* Device was statically mapped. */ + *bshp = pd->pd_va + (bpa - pd->pd_pa); + return 0; + } startpa = trunc_page(bpa); endpa = round_page(bpa + size); ==== //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_reg.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/sa11x0/sa11x0_reg.h,v 1.1 2004/05/14 11:46:45 cognet Exp $ + * $FreeBSD: src/sys/arm/sa11x0/sa11x0_reg.h,v 1.3 2006/05/23 12:14:14 cognet Exp $ * */ @@ -48,9 +48,11 @@ #define SARCR_BASE 0x90030000 /* Reset Controller */ #define SAGPIO_BASE 0x90040000 /* GPIO */ #define SAIPIC_BASE 0x90050000 /* Interrupt Controller */ +#define SAIPIC_SIZE 0x24 #define SAPPC_BASE 0x90060000 /* Peripheral Pin Controller */ #define SAUDC_BASE 0x80000000 /* USB Device Controller*/ #define SACOM1_BASE 0x80010000 /* GPCLK/UART 1 */ +#define SACOM1_SIZE 0x24 #define SACOM3_HW_BASE 0x80050000 /* UART 3 */ #define SAMCP_BASE 0x80060000 /* MCP Controller */ #define SASSP_BASE 0x80070000 /* Synchronous serial port */ @@ -59,7 +61,7 @@ #define SALCD_BASE 0xB0100000 /* LCD */ /* Register base virtual addresses mapped by initarm() */ -#define SACOM3_BASE 0xd000d000 +#define SACOM1_VBASE 0xd000d000 /* Interrupt controller registers */ #define SAIPIC_NPORTS 9 ==== //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_var.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/sa11x0/sa11x0_var.h,v 1.2 2005/09/25 21:06:50 cognet Exp $ + * $FreeBSD: src/sys/arm/sa11x0/sa11x0_var.h,v 1.3 2006/05/29 19:32:32 cognet Exp $ * */ @@ -64,15 +64,6 @@ typedef void *sa11x0_chipset_tag_t; extern struct bus_space sa11x0_bs_tag; -struct sa11x0_attach_args { - sa11x0_chipset_tag_t sa_sc; - bus_space_tag_t sa_iot; /* Bus tag */ - bus_addr_t sa_addr; /* i/o address */ - bus_size_t sa_size; - - int sa_intr; - int sa_gpio; -}; void *sa11x0_intr_establish(sa11x0_chipset_tag_t, int, int, int, int (*)(void *), void *); ==== //depot/projects/fast_ipsec/src/sys/arm/sa11x0/uart_cpu_sa1110.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.3 2005/01/05 21:58:48 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_cpu_sa1110.c,v 1.4 2006/05/23 12:14:14 cognet Exp $"); #include #include @@ -36,6 +36,7 @@ #include #include +#include #include bus_space_tag_t uart_bus_space_io; @@ -57,7 +58,7 @@ di->ops = uart_sa1110_ops; di->bas.chan = 0; di->bas.bst = &sa11x0_bs_tag; - di->bas.bsh = 0x80010000; + di->bas.bsh = SACOM1_BASE; di->bas.regshft = 0; di->bas.rclk = 0; di->baudrate = 9600; ==== //depot/projects/fast_ipsec/src/sys/arm/sa11x0/uart_dev_sa1110.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.4 2006/05/18 22:02:33 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.5 2006/05/22 23:25:34 cognet Exp $"); #include #include @@ -38,6 +38,7 @@ #include #include #include +#include #include #include "uart_if.h" @@ -79,7 +80,7 @@ sa1110_addr_change(struct uart_bas *bas) { - bas->bsh = 0xd000d000; + bas->bsh = SACOM1_VBASE; did_mmu = 1; } ==== //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/iq31244_machdep.c#5 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.18 2005/12/21 15:01:49 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.19 2006/05/26 01:41:46 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -147,7 +147,6 @@ struct pv_addr kernelstack; struct pv_addr minidataclean; -void enable_mmu(vm_offset_t); static struct trapframe proc0_tf; #define IQ80321_OBIO_BASE 0xfe800000UL ==== //depot/projects/fast_ipsec/src/sys/cam/cam_ccb.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.29 2006/01/20 19:21:38 mjacob Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.31 2006/05/24 15:23:27 mjacob Exp $ */ #ifndef _CAM_CAM_CCB_H ==== //depot/projects/fast_ipsec/src/sys/cam/cam_periph.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.61 2006/01/08 20:04:55 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.62 2006/05/24 15:22:21 mjacob Exp $"); #include #include @@ -673,6 +673,16 @@ mapinfo->num_bufs_used++; } + /* + * Now that we've gotten this far, change ownership to the kernel + * of the buffers so that we don't run afoul of returning to user + * space with locks (on the buffer) held. + */ + for (i = 0; i < numbufs; i++) { + BUF_KERNPROC(mapinfo->bp[i]); + } + + return(0); } ==== //depot/projects/fast_ipsec/src/sys/cam/scsi/scsi_target.c#2 (text+ko) ==== @@ -28,7 +28,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.68 2005/08/08 19:55:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.70 2006/05/24 15:26:07 mjacob Exp $"); + #include #include @@ -40,6 +41,7 @@ #include #include #include +#include #include #include @@ -89,7 +91,6 @@ targ_state state; struct selinfo read_select; struct devstat device_stats; - struct mtx mtx; }; static d_open_t targopen; @@ -157,10 +158,6 @@ }; PERIPHDRIVER_DECLARE(targ, targdriver); -static struct mtx targ_mtx; -#define TARG_LOCK(softc) mtx_lock(&(softc)->mtx) -#define TARG_UNLOCK(softc) mtx_unlock(&(softc)->mtx) - static MALLOC_DEFINE(M_TARG, "TARG", "TARG data"); /* Create softc and initialize it. Only one proc can open each targ device. */ @@ -169,15 +166,12 @@ { struct targ_softc *softc; - mtx_lock(&targ_mtx); if (dev->si_drv1 != 0) { - mtx_unlock(&targ_mtx); return (EBUSY); } /* Mark device busy before any potentially blocking operations */ dev->si_drv1 = (void *)~0; - mtx_unlock(&targ_mtx); /* Create the targ device, allocate its softc, initialize it */ if ((dev->si_flags & SI_NAMED) == 0) { @@ -190,13 +184,12 @@ softc->state = TARG_STATE_OPENED; softc->periph = NULL; softc->path = NULL; - mtx_init(&softc->mtx, devtoname(dev), "targ cdev", MTX_DEF); TAILQ_INIT(&softc->pending_ccb_queue); TAILQ_INIT(&softc->work_queue); TAILQ_INIT(&softc->abort_queue); TAILQ_INIT(&softc->user_ccb_queue); - knlist_init(&softc->read_select.si_note, &softc->mtx, NULL, NULL, NULL); + knlist_init(&softc->read_select.si_note, NULL, NULL, NULL, NULL); return (0); } @@ -209,22 +202,15 @@ int error; softc = (struct targ_softc *)dev->si_drv1; - TARG_LOCK(softc); error = targdisable(softc); if (error == CAM_REQ_CMP) { dev->si_drv1 = 0; - mtx_lock(&targ_mtx); if (softc->periph != NULL) { cam_periph_invalidate(softc->periph); softc->periph = NULL; } - mtx_unlock(&targ_mtx); - TARG_UNLOCK(softc); - mtx_destroy(&softc->mtx); destroy_dev(dev); FREE(softc, M_TARG); - } else { - TARG_UNLOCK(softc); } return (error); } @@ -253,17 +239,13 @@ printf("Couldn't create path, status %#x\n", status); break; } - TARG_LOCK(softc); status = targenable(softc, path, new_lun->grp6_len, new_lun->grp7_len); - TARG_UNLOCK(softc); xpt_free_path(path); break; } case TARGIOCDISABLE: - TARG_LOCK(softc); status = targdisable(softc); - TARG_UNLOCK(softc); break; case TARGIOCDEBUG: { @@ -280,14 +262,11 @@ cdbg.ccb_h.cbfcnp = targdone; /* If no periph available, disallow debugging changes */ - TARG_LOCK(softc); if ((softc->state & TARG_STATE_LUN_ENABLED) == 0) { status = CAM_DEV_NOT_THERE; - TARG_UNLOCK(softc); break; } xpt_action((union ccb *)&cdbg); - TARG_UNLOCK(softc); status = cdbg.ccb_h.status & CAM_STATUS_MASK; #else status = CAM_FUNC_NOTAVAIL; @@ -315,7 +294,6 @@ revents = poll_events & (POLLOUT | POLLWRNORM); if ((poll_events & (POLLIN | POLLRDNORM)) != 0) { /* Poll for read() depends on user and abort queues. */ - TARG_LOCK(softc); if (!TAILQ_EMPTY(&softc->user_ccb_queue) || !TAILQ_EMPTY(&softc->abort_queue)) { revents |= poll_events & (POLLIN | POLLRDNORM); @@ -323,7 +301,6 @@ /* Only sleep if the user didn't poll for write. */ if (revents == 0) selrecord(td, &softc->read_select); - TARG_UNLOCK(softc); } return (revents); @@ -415,7 +392,6 @@ } /* Destroy any periph on our path if it is disabled */ - mtx_lock(&targ_mtx); periph = cam_periph_find(path, "targ"); if (periph != NULL) { struct targ_softc *del_softc; @@ -427,7 +403,6 @@ } else { printf("Requested path still in use by targ%d\n", periph->unit_number); - mtx_unlock(&targ_mtx); status = CAM_LUN_ALRDY_ENA; goto enable_fail; } @@ -436,7 +411,6 @@ /* Create a periph instance attached to this path */ status = cam_periph_alloc(targctor, NULL, targdtor, targstart, "targ", CAM_PERIPH_BIO, path, targasync, 0, softc); - mtx_unlock(&targ_mtx); if (status != CAM_REQ_CMP) { printf("cam_periph_alloc failed, status %#x\n", status); goto enable_fail; @@ -566,11 +540,9 @@ CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("Sent ATIO/INOT (%p)\n", user_ccb)); xpt_action(ccb); - TARG_LOCK(softc); TAILQ_INSERT_TAIL(&softc->pending_ccb_queue, &ccb->ccb_h, periph_links.tqe); - TARG_UNLOCK(softc); break; default: if ((func_code & XPT_FC_QUEUED) != 0) { @@ -581,10 +553,8 @@ descr->user_ccb = user_ccb; descr->priority = priority; descr->func_code = func_code; - TARG_LOCK(softc); TAILQ_INSERT_TAIL(&softc->work_queue, descr, tqe); - TARG_UNLOCK(softc); xpt_schedule(softc->periph, priority); } else { CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, @@ -629,15 +599,12 @@ softc = (struct targ_softc *)periph->softc; CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("targstart %p\n", start_ccb)); - TARG_LOCK(softc); descr = TAILQ_FIRST(&softc->work_queue); if (descr == NULL) { - TARG_UNLOCK(softc); xpt_release_ccb(start_ccb); } else { TAILQ_REMOVE(&softc->work_queue, descr, tqe); next_descr = TAILQ_FIRST(&softc->work_queue); - TARG_UNLOCK(softc); /* Initiate a transaction using the descr and supplied CCB */ error = targusermerge(softc, descr, start_ccb); @@ -649,9 +616,7 @@ xpt_release_ccb(start_ccb); suword(&descr->user_ccb->ccb_h.status, CAM_REQ_CMP_ERR); - TARG_LOCK(softc); TAILQ_INSERT_TAIL(&softc->abort_queue, descr, tqe); - TARG_UNLOCK(softc); notify_user(softc); } @@ -694,7 +659,6 @@ struct ccb_hdr *ccb_h; cab = (struct ccb_abort *)ccb; - TARG_LOCK(softc); TAILQ_FOREACH(ccb_h, &softc->pending_ccb_queue, periph_links.tqe) { struct targ_cmd_descr *ab_descr; @@ -708,7 +672,6 @@ break; } } - TARG_UNLOCK(softc); /* CCB not found, set appropriate status */ if (ccb_h == NULL) { k_ccbh->status = CAM_PATH_INVALID; @@ -776,10 +739,8 @@ */ CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("sendccb %p\n", ccb)); if (XPT_FC_IS_QUEUED(ccb)) { - TARG_LOCK(softc); TAILQ_INSERT_TAIL(&softc->pending_ccb_queue, ccb_h, periph_links.tqe); - TARG_UNLOCK(softc); } xpt_action(ccb); @@ -795,7 +756,6 @@ CAM_DEBUG(periph->path, CAM_DEBUG_PERIPH, ("targdone %p\n", done_ccb)); softc = (struct targ_softc *)periph->softc; - TARG_LOCK(softc); TAILQ_REMOVE(&softc->pending_ccb_queue, &done_ccb->ccb_h, periph_links.tqe); status = done_ccb->ccb_h.status & CAM_STATUS_MASK; @@ -803,7 +763,6 @@ /* If we're no longer enabled, throw away CCB */ if ((softc->state & TARG_STATE_LUN_ENABLED) == 0) { targfreeccb(softc, done_ccb); - TARG_UNLOCK(softc); return; } /* abort_all_pending() waits for pending queue to be empty */ @@ -817,7 +776,6 @@ case XPT_CONT_TARGET_IO: TAILQ_INSERT_TAIL(&softc->user_ccb_queue, &done_ccb->ccb_h, periph_links.tqe); - TARG_UNLOCK(softc); notify_user(softc); break; default: @@ -839,6 +797,8 @@ union ccb *user_ccb; int read_len, error; + mtx_lock(&Giant); + error = 0; read_len = 0; softc = (struct targ_softc *)dev->si_drv1; @@ -847,12 +807,11 @@ CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("targread\n")); /* If no data is available, wait or return immediately */ - TARG_LOCK(softc); ccb_h = TAILQ_FIRST(user_queue); user_descr = TAILQ_FIRST(abort_queue); while (ccb_h == NULL && user_descr == NULL) { if ((ioflag & IO_NDELAY) == 0) { - error = msleep(user_queue, &softc->mtx, + error = msleep(user_queue, NULL, PRIBIO | PCATCH, "targrd", 0); ccb_h = TAILQ_FIRST(user_queue); user_descr = TAILQ_FIRST(abort_queue); @@ -860,12 +819,11 @@ if (error == ERESTART) { continue; } else { - TARG_UNLOCK(softc); goto read_fail; } } } else { - TARG_UNLOCK(softc); + mtx_unlock(&Giant); return (EAGAIN); } } @@ -877,7 +835,6 @@ if (uio->uio_resid < sizeof(user_ccb)) break; TAILQ_REMOVE(user_queue, ccb_h, periph_links.tqe); - TARG_UNLOCK(softc); descr = (struct targ_cmd_descr *)ccb_h->targ_descr; user_ccb = descr->user_ccb; CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, @@ -890,7 +847,6 @@ goto read_fail; read_len += sizeof(user_ccb); - TARG_LOCK(softc); ccb_h = TAILQ_FIRST(user_queue); } @@ -899,7 +855,6 @@ if (uio->uio_resid < sizeof(user_ccb)) break; TAILQ_REMOVE(abort_queue, user_descr, tqe); - TARG_UNLOCK(softc); user_ccb = user_descr->user_ccb; CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("targread aborted descr %p (%p)\n", @@ -910,10 +865,8 @@ goto read_fail; read_len += sizeof(user_ccb); - TARG_LOCK(softc); user_descr = TAILQ_FIRST(abort_queue); } - TARG_UNLOCK(softc); /* * If we've successfully read some amount of data, don't report an @@ -924,6 +877,7 @@ error = ENOSPC; read_fail: + mtx_unlock(&Giant); return (error); } @@ -1020,7 +974,6 @@ static void targinit(void) { - mtx_init(&targ_mtx, "targ global", NULL, MTX_DEF); EVENTHANDLER_REGISTER(dev_clone, targclone, 0, 1000); } @@ -1086,7 +1039,7 @@ /* If we aborted at least one pending CCB ok, wait for it. */ if (cab.ccb_h.status == CAM_REQ_CMP) { - msleep(&softc->pending_ccb_queue, &softc->mtx, + msleep(&softc->pending_ccb_queue, NULL, PRIBIO | PCATCH, "tgabrt", 0); } @@ -1105,7 +1058,7 @@ * blocking read(). */ selwakeuppri(&softc->read_select, PRIBIO); - KNOTE_LOCKED(&softc->read_select.si_note, 0); + KNOTE_UNLOCKED(&softc->read_select.si_note, 0); wakeup(&softc->user_ccb_queue); } ==== //depot/projects/fast_ipsec/src/sys/conf/files#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1118 2006/05/18 23:30:47 ambrisko Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1119 2006/05/27 16:32:05 netchild Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -905,6 +905,12 @@ #dev/sound/usb/upcm.c optional snd_upcm usb dev/sound/usb/uaudio.c optional snd_uaudio usb dev/sound/usb/uaudio_pcm.c optional snd_uaudio usb +dev/sound/midi/midi.c optional sound +dev/sound/midi/mpu401.c optional sound +dev/sound/midi/mpu_if.m optional sound +dev/sound/midi/mpufoi_if.m optional sound +dev/sound/midi/sequencer.c optional sound +dev/sound/midi/synth_if.m optional sound dev/sr/if_sr.c optional sr dev/sr/if_sr_pci.c optional sr pci dev/stg/tmc18c30.c optional stg ==== //depot/projects/fast_ipsec/src/sys/conf/kmod.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.207 2006/04/28 21:21:51 marcel Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.208 2006/05/27 16:32:05 netchild Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -321,8 +321,9 @@ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ - dev/usb/usb_if.m isa/isa_if.m kern/bus_if.m kern/cpufreq_if.m \ - kern/device_if.m kern/serdev_if.m \ + dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \ + dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ + kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/crypto_if.m \ pc98/pc98/canbus_if.m pci/agp_if.m ==== //depot/projects/fast_ipsec/src/sys/dev/bfe/if_bfe.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.38 2006/05/16 14:36:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.40 2006/05/28 20:35:39 silby Exp $"); #include #include @@ -201,7 +201,7 @@ * greater than 1GB. */ error = bus_dma_tag_create(NULL, /* parent */ - PAGE_SIZE, 0, /* alignment, boundary */ + 4096, 0, /* alignment, boundary */ 0x3FFFFFFF, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ @@ -214,7 +214,7 @@ /* tag for TX ring */ error = bus_dma_tag_create(sc->bfe_parent_tag, - 1, 0, + 4096, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, @@ -232,7 +232,7 @@ /* tag for RX ring */ error = bus_dma_tag_create(sc->bfe_parent_tag, - 1, 0, + 4096, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, @@ -1212,6 +1212,21 @@ } if(istat & BFE_ISTAT_ERRORS) { + + if (istat & BFE_ISTAT_DSCE) { + printf("if_bfe Descriptor Error\n"); + bfe_stop(sc); + BFE_UNLOCK(sc); + return; + } + + if (istat & BFE_ISTAT_DPE) { + printf("if_bfe Descriptor Protocol Error\n"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 29 20:23:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0664916A6DD; Mon, 29 May 2006 20:23:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5783316A71C for ; Mon, 29 May 2006 20:23:19 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC52543D78 for ; Mon, 29 May 2006 20:23:17 +0000 (GMT) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TKM3x1010133 for ; Mon, 29 May 2006 20:22:03 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TKM3Vc010130 for perforce@freebsd.org; Mon, 29 May 2006 20:22:03 GMT (envelope-from brueffer@freebsd.org) Date: Mon, 29 May 2006 20:22:03 GMT Message-Id: <200605292022.k4TKM3Vc010130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 98091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 20:23:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=98091 Change 98091 by brueffer@brueffer_serenity on 2006/05/29 20:21:40 Cleanup. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#8 (text+ko) ==== @@ -26,8 +26,10 @@ .\" 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. -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#7 $ -.Dd April 11, 2006 +.\" +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#8 $ +.\" +.Dd May 29, 2006 .Dt audit_submit 3 .Os .Sh NAME @@ -44,12 +46,12 @@ .Nm function provides a generic programming interface for audit record submission. This audit record will contain a header, subject token, an optional text token, -return token, and a trailer. The header will contain the event class specified -by +return token, and a trailer. +The header will contain the event class specified by .Fa au_event . The subject token will be generated based on .Fa au_ctx . -The return token of is dependant on the +The return token is dependant on the .Fa status and .Fa reterr @@ -72,7 +74,8 @@ .Xr setaudit 2 , or .Xr setaudit_addr 2 -has already been called. As a direct result, the terminal ID for the +has already been called. +As a direct result, the terminal ID for the subject will be retrieved from the kernel via .Xr getaudit 2 , or @@ -114,7 +117,7 @@ .Sh HISTORY The .Nm -first appeared in OpenBSM version 1.0. +function first appeared in OpenBSM version 1.0. OpenBSM 1.0 was introduced in FreeBSD 7.0. .Sh AUTHORS The From owner-p4-projects@FreeBSD.ORG Mon May 29 21:57:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED69216A43B; Mon, 29 May 2006 21:57:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 95C0916B2F5 for ; Mon, 29 May 2006 21:57:31 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01BD843D72 for ; Mon, 29 May 2006 21:57:31 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TLuGI1026924 for ; Mon, 29 May 2006 21:56:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TLuGWd026921 for perforce@freebsd.org; Mon, 29 May 2006 21:56:16 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 29 May 2006 21:56:16 GMT Message-Id: <200605292156.k4TLuGWd026921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 21:57:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=98101 Change 98101 by kmacy@kmacy_storage:sun4v_work on 2006/05/29 21:56:06 don't send shootdowns to cpus we don't own Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#60 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#60 (text+ko) ==== @@ -1144,7 +1144,7 @@ int i, cpu_count; u_int cpus; - cpumask_t cpumask, active; + cpumask_t cpumask, active, curactive; cpumask_t active_total, ackmask; uint16_t *cpulist; @@ -1154,7 +1154,8 @@ cpumask = PCPU_GET(cpumask); cpulist = PCPU_GET(cpulist); - + curactive = 0; + if (rdpr(pil) != 14) panic("pil %ld != 14", rdpr(pil)); @@ -1175,14 +1176,16 @@ #endif active_total = active = PCPU_GET(other_cpus); - if (active_total == 0) + if (active == 0) goto done; + retry: - for (cpu_count = 0, i = 0, cpus = active; i < 32 && cpus; i++, cpus = (cpus>>1)) { + for (i = curactive = cpu_count = 0, cpus = active; i < mp_ncpus && cpus; i++, cpus = (cpus>>1)) { if ((cpus & 0x1) == 0) continue; - + + curactive |= (1 << i); cpulist[cpu_count] = (uint16_t)i; cpu_count++; } @@ -1191,15 +1194,15 @@ cpu_ipi_selected(cpu_count, cpulist, (uint64_t)func, (uint64_t)arg1, (uint64_t)arg2, (uint64_t *)&ackmask); - while (ackmask != active) { + while (ackmask != curactive) { DELAY(1); i++; - if (i > 1000000) - panic(" ackmask=0x%x active=0x%x\n", ackmask, active); + if (i > 100000000) + panic(" ackmask=0x%x active=0x%x\n", ackmask, curactive); } - active_total |= active; + active_total |= curactive; if ((active = (pmap->pm_tlbactive & ~(active_total|cpumask))) != 0) goto retry; From owner-p4-projects@FreeBSD.ORG Mon May 29 21:59:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C6D816A66F; Mon, 29 May 2006 21:59:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40AA316A4D1 for ; Mon, 29 May 2006 21:59:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DE9F43D6E for ; Mon, 29 May 2006 21:59:34 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4TLwJxp027005 for ; Mon, 29 May 2006 21:58:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4TLwJJB027002 for perforce@freebsd.org; Mon, 29 May 2006 21:58:19 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 29 May 2006 21:58:19 GMT Message-Id: <200605292158.k4TLwJJB027002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98102 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2006 21:59:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=98102 Change 98102 by kmacy@kmacy_storage:sun4v_work on 2006/05/29 21:58:01 we have no way of redriving a putc, so keep calling putchar until EWOULDBLOCK is not returned Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hvcons.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hvcons.c#4 (text+ko) ==== @@ -239,15 +239,18 @@ static void hvcnputc(struct consdev *cp, int c) { - char cbuf; + + int error; - if (c == '\n') { - cbuf = '\r'; - hv_cnputchar(cbuf); - } + error = 0; - cbuf = c; - hv_cnputchar(cbuf); + do { + if (c == '\n') + error = hv_cnputchar('\r'); + } while (error == H_EWOULDBLOCK); + do { + error = hv_cnputchar(c); + } while (error == H_EWOULDBLOCK); } static int From owner-p4-projects@FreeBSD.ORG Tue May 30 05:49:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38B7116A421; Tue, 30 May 2006 05:49:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E171C16A41F for ; Tue, 30 May 2006 05:49:15 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F69F43D53 for ; Tue, 30 May 2006 05:49:15 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4U5lxqv085417 for ; Tue, 30 May 2006 05:47:59 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4U5lxlu085414 for perforce@freebsd.org; Tue, 30 May 2006 05:47:59 GMT (envelope-from gnn@neville-neil.com) Date: Tue, 30 May 2006 05:47:59 GMT Message-Id: <200605300547.k4U5lxlu085414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 98112 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 05:49:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=98112 Change 98112 by gnn@fast_ipsec_integ on 2006/05/30 05:47:35 Integrate from HEAD Affected files ... .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.c#9 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.h#10 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_debug.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_reg.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exit.c#8 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_extern.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_map.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_meter.c#2 integrate Differences ... ==== //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.c#9 (text+ko) ==== @@ -57,6 +57,10 @@ * * Support from Chris Ellsworth in order to make SAS adapters work * is gratefully acknowledged. + * + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. */ /*- * Copyright (c) 2004, Avid Technology, Inc. and its contributors. @@ -92,7 +96,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.29 2006/05/27 17:26:57 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.30 2006/05/29 20:34:28 mjacob Exp $"); #include #include /* XXX For static handler registration */ ==== //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.h#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.20 2006/05/27 17:26:57 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.22 2006/05/29 20:34:28 mjacob Exp $ */ /*- * Generic defines for LSI '909 FC adapters. * FreeBSD Version. @@ -58,6 +58,10 @@ * * Support from Chris Ellsworth in order to make SAS adapters work * is gratefully acknowledged. + * + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. */ /* * Copyright (c) 2004, Avid Technology, Inc. and its contributors. @@ -942,6 +946,7 @@ MPT_PRT_ERROR, MPT_PRT_WARN, MPT_PRT_INFO, + MPT_PRT_NEGOTIATION, MPT_PRT_DEBUG, MPT_PRT_DEBUG1, MPT_PRT_DEBUG2, ==== //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.c#10 (text+ko) ==== @@ -57,6 +57,9 @@ * * Support from Chris Ellsworth in order to make SAS adapters work * is gratefully acknowledged. + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. */ /*- * Copyright (c) 2004, Avid Technology, Inc. and its contributors. @@ -91,7 +94,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.19 2006/05/27 17:26:57 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.21 2006/05/29 20:34:28 mjacob Exp $"); #include #include @@ -647,7 +650,7 @@ static int mpt_set_initial_config_spi(struct mpt_softc *mpt) { - int i, pp1val = ((1 << mpt->mpt_ini_id) << 16) | mpt->mpt_ini_id; + int i, j, pp1val = ((1 << mpt->mpt_ini_id) << 16) | mpt->mpt_ini_id; int error; mpt->mpt_disc_enable = 0xff; @@ -682,12 +685,17 @@ * The purpose of this exercise is to get * all targets back to async/narrow. * - * We skip this if the BIOS has already negotiated speeds with targets. + * We skip this step if the BIOS has already negotiated + * speeds with the targets and does not require us to + * do Domain Validation. */ i = mpt->mpt_port_page2.PortSettings & MPI_SCSIPORTPAGE2_PORT_MASK_NEGO_MASTER_SETTINGS; - if (i == MPI_SCSIPORTPAGE2_PORT_ALL_MASTER_SETTINGS) { - mpt_lprt(mpt, /* MPT_PRT_INFO */ MPT_PRT_ALWAYS, + j = mpt->mpt_port_page2.PortFlags & + MPI_SCSIPORTPAGE2_PORT_FLAGS_DV_MASK; + if (i == MPI_SCSIPORTPAGE2_PORT_ALL_MASTER_SETTINGS && + j == MPI_SCSIPORTPAGE2_PORT_FLAGS_OFF_DV) { + mpt_lprt(mpt, MPT_PRT_NEGOTIATION, "honoring BIOS transfer negotiations\n"); return (0); } @@ -2782,7 +2790,7 @@ uint8_t dval; u_int period; u_int offset; - int m; + int i, j; cts = &ccb->cts; if (!IS_CURRENT_SETTINGS(cts)) { @@ -2790,27 +2798,37 @@ mpt_set_ccb_status(ccb, CAM_REQ_INVALID); break; } + if (mpt->is_fc || mpt->is_sas) { mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; } - if (mpt->ioc_page2 && mpt->ioc_page2->MaxPhysDisks != 0 && - raid_passthru == 0) { + /* + * Skip attempting settings on RAID volume disks. + * Other devices on the bus get the normal treatment. + */ + if (mpt->phydisk_sim && raid_passthru == 0 && + mpt_is_raid_volume(mpt, tgt) != 0) { + mpt_lprt(mpt, MPT_PRT_ALWAYS, + "skipping transfer settings for RAID volumes\n"); mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; } - m = mpt->mpt_port_page2.PortSettings; - if ((m & MPI_SCSIPORTPAGE2_PORT_MASK_NEGO_MASTER_SETTINGS) == - MPI_SCSIPORTPAGE2_PORT_ALL_MASTER_SETTINGS) { -mpt_prt(mpt, "master settings\n"); -if (raid_passthru == 0) { + i = mpt->mpt_port_page2.PortSettings & + MPI_SCSIPORTPAGE2_PORT_MASK_NEGO_MASTER_SETTINGS; + j = mpt->mpt_port_page2.PortFlags & + MPI_SCSIPORTPAGE2_PORT_FLAGS_DV_MASK; + if (i == MPI_SCSIPORTPAGE2_PORT_ALL_MASTER_SETTINGS && + j == MPI_SCSIPORTPAGE2_PORT_FLAGS_OFF_DV) { + mpt_lprt(mpt, MPT_PRT_ALWAYS, + "honoring BIOS transfer negotiations\n"); mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; -} } + dval = 0; period = 0; offset = 0; @@ -2846,24 +2864,27 @@ spi = &cts->xport_specific.spi; if ((spi->valid & CTS_SPI_VALID_DISC) != 0) { - if ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) != 0) + if ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) != 0) { dval |= DP_DISC_ENABLE; - else + } else { dval |= DP_DISC_DISABL; + } } if ((scsi->valid & CTS_SCSI_VALID_TQ) != 0) { - if ((scsi->flags & CTS_SCSI_FLAGS_TAG_ENB) != 0) + if ((scsi->flags & CTS_SCSI_FLAGS_TAG_ENB) != 0) { dval |= DP_TQING_ENABLE; - else + } else { dval |= DP_TQING_DISABL; + } } if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0) { - if (spi->bus_width == MSG_EXT_WDTR_BUS_16_BIT) + if (spi->bus_width == MSG_EXT_WDTR_BUS_16_BIT) { dval |= DP_WIDE; - else + } else { dval |= DP_NARROW; + } } if ((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) && @@ -2874,6 +2895,9 @@ offset = spi->sync_offset; } #endif + mpt_lprt(mpt, MPT_PRT_NEGOTIATION, + "mpt_action: SET tgt %d flags %x period %x off %x\n", + tgt, dval, period, offset); CAMLOCK_2_MPTLOCK(mpt); if (dval & DP_DISC_ENABLE) { mpt->mpt_disc_enable |= (1 << tgt); @@ -2891,10 +2915,12 @@ if (dval & DP_SYNC) { mpt_setsync(mpt, tgt, period, offset); } + if (mpt_update_spi_config(mpt, tgt)) { + MPTLOCK_2_CAMLOCK(mpt); + mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR); + break; + } MPTLOCK_2_CAMLOCK(mpt); - mpt_lprt(mpt, MPT_PRT_DEBUG, - "SET tgt %d flags %x period %x off %x\n", - tgt, dval, period, offset); mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; } @@ -2952,11 +2978,9 @@ sas->valid = CTS_SAS_VALID_SPEED; sas->bitrate = 300000; /* XXX: Default 3Gbps */ #endif - } else { - if (mpt_get_spi_settings(mpt, cts) != 0) { - mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR); - break; - } + } else if (mpt_get_spi_settings(mpt, cts) != 0) { + mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR); + break; } mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; @@ -3005,10 +3029,17 @@ cpi->base_transfer_speed = 3300; cpi->hba_inquiry = PI_SDTR_ABLE|PI_TAG_ABLE|PI_WIDE_16; } + + /* + * We give our fake RAID passhtru bus a width that is MaxVolumes + * wide, restrict it to one lun and have it *not* be a bus + * that can have a SCSI bus reset. + */ if (raid_passthru) { + cpi->max_target = mpt->ioc_page2->MaxPhysDisks - 1; + cpi->initiator_id = cpi->max_target+1; cpi->max_lun = 0; cpi->hba_misc = PIM_NOBUSRESET; - cpi->initiator_id = cpi->max_target+1; } if ((mpt->role & MPT_ROLE_INITIATOR) == 0) { @@ -3109,30 +3140,12 @@ uint8_t dval, pval, oval; int rv; - /* - * Check to see if this is an Integrated Raid card. - * - * If it is, and we're the RAID bus side, both current - * and goal settings are synthesized as we only look at - * or change actual settings for the physical disk side. - * - * NB: In the future we can just do this on the blacked out - * NB: portion that the RAID volume covers- there may be - * NB: other entities on this bus as well. - */ - - if (mpt->phydisk_sim) { - if (xpt_path_sim(cts->ccb_h.path) != mpt->phydisk_sim) { - dval = DP_WIDE|DP_DISC|DP_TQING; - oval = (mpt->mpt_port_page0.Capabilities >> 16); - pval = (mpt->mpt_port_page0.Capabilities >> 8); - tgt = cts->ccb_h.target_id; - goto skip; + if (xpt_path_sim(cts->ccb_h.path) == mpt->phydisk_sim) { + if (mpt_map_physdisk(mpt, (union ccb *)cts, &tgt)) { + return (-1); } - } - - if (mpt_map_physdisk(mpt, (union ccb *)cts, &tgt) != 0) { - return (-1); + } else { + tgt = cts->ccb_h.target_id; } /* @@ -3156,10 +3169,6 @@ return (rv); } MPTLOCK_2_CAMLOCK(mpt); - - mpt_lprt(mpt, MPT_PRT_DEBUG, - "mpt_get_spi: SPI Tgt %d Page 0: NParms %x Info %x\n", - tgt, tmp.NegotiatedParameters, tmp.Information); if (tmp.NegotiatedParameters & MPI_SCSIDEVPAGE0_NP_WIDE) { dval |= DP_WIDE; } @@ -3181,7 +3190,6 @@ oval = (mpt->mpt_port_page0.Capabilities >> 16); pval = (mpt->mpt_port_page0.Capabilities >> 8); } - skip: #ifndef CAM_NEW_TRAN_CODE cts->flags &= ~(CCB_TRANS_DISC_ENB|CCB_TRANS_TAG_ENB); if (dval & DP_DISC_ENABLE) { @@ -3236,9 +3244,9 @@ scsi->valid = 0; } #endif - mpt_lprt(mpt, MPT_PRT_DEBUG, - "mpt_get_spi: tgt %d %s settings flags %x period %x offset %x\n", - tgt, IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM", + mpt_lprt(mpt, MPT_PRT_NEGOTIATION, + "mpt_get_spi_settings: tgt %d %s settings flags 0x%x period 0x%x " + "offset %x\n", tgt, IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM ", dval, pval, oval); return (0); } @@ -3246,27 +3254,27 @@ static void mpt_setwidth(struct mpt_softc *mpt, int tgt, int onoff) { - PTR_CONFIG_PAGE_SCSI_DEVICE_1 tmp; + PTR_CONFIG_PAGE_SCSI_DEVICE_1 ptr; - tmp = &mpt->mpt_dev_page1[tgt]; + ptr = &mpt->mpt_dev_page1[tgt]; if (onoff) { - tmp->RequestedParameters |= MPI_SCSIDEVPAGE1_RP_WIDE; + ptr->RequestedParameters |= MPI_SCSIDEVPAGE1_RP_WIDE; } else { - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_WIDE; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_WIDE; } } static void mpt_setsync(struct mpt_softc *mpt, int tgt, int period, int offset) { - PTR_CONFIG_PAGE_SCSI_DEVICE_1 tmp; + PTR_CONFIG_PAGE_SCSI_DEVICE_1 ptr; - tmp = &mpt->mpt_dev_page1[tgt]; - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_MIN_SYNC_PERIOD_MASK; - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_MAX_SYNC_OFFSET_MASK; - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_DT; - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_QAS; - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_IU; + ptr = &mpt->mpt_dev_page1[tgt]; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_MIN_SYNC_PERIOD_MASK; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_MAX_SYNC_OFFSET_MASK; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_DT; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_QAS; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_IU; /* * XXX: For now, we're ignoring specific settings @@ -3284,7 +3292,7 @@ np |= MPI_SCSIDEVPAGE1_RP_DT; } np |= (factor << 8) | (offset << 16); - tmp->RequestedParameters |= np; + ptr->RequestedParameters |= np; } } @@ -3308,9 +3316,9 @@ return (-1); } mpt->mpt_dev_page1[tgt] = tmp; - mpt_lprt(mpt, MPT_PRT_DEBUG, - "mpt_update_spi_config[%d]: Page 1: RParams %x Config %x\n", tgt, - mpt->mpt_dev_page1[tgt].RequestedParameters, + mpt_lprt(mpt, MPT_PRT_NEGOTIATION, + "mpt_update_spi_config[%d].page1: RParams 0x%x Config 0x%x\n", + tgt, mpt->mpt_dev_page1[tgt].RequestedParameters, mpt->mpt_dev_page1[tgt].Configuration); return (0); } ==== //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt_cam.h,v 1.3 2006/02/25 07:45:54 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt_cam.h,v 1.4 2006/05/29 20:34:28 mjacob Exp $ */ /*- * LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version) * @@ -57,6 +57,9 @@ * * Support from Chris Ellsworth in order to make SAS adapters work * is gratefully acknowledged. + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. */ /*- * Copyright (c) 2004, Avid Technology, Inc. and its contributors. ==== //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_debug.c#5 (text+ko) ==== @@ -58,10 +58,13 @@ * * Support from Chris Ellsworth in order to make SAS adapters work * is gratefully acknowledged. + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.15 2006/05/26 05:54:21 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.16 2006/05/29 20:34:28 mjacob Exp $"); #include ==== //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_pci.c#7 (text+ko) ==== @@ -61,6 +61,9 @@ * * Support from Chris Ellsworth in order to make SAS adapters work * is gratefully acknowledged. + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. */ /* * Copyright (c) 2004, Avid Technology, Inc. and its contributors. @@ -96,7 +99,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.30 2006/05/29 16:59:38 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.31 2006/05/29 20:34:28 mjacob Exp $"); #include #include ==== //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_raid.c#7 (text+ko) ==== @@ -31,9 +31,17 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF THE COPYRIGHT * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/*- + * Some Breakage and Bug Fixing added later. + * Copyright (c) 2006, by Matthew Jacob + * All Rights Reserved + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. + */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_raid.c,v 1.8 2006/05/27 17:26:57 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_raid.c,v 1.10 2006/05/29 20:34:28 mjacob Exp $"); #include #include @@ -226,7 +234,7 @@ break; } - mpt_lprt(mpt, MPT_PRT_DEBUG, " Callback for %d\n", + mpt_lprt(mpt, MPT_PRT_DEBUG, "Callback for %d\n", cgd->ccb_h.target_id); RAID_VOL_FOREACH(mpt, mpt_vol) { @@ -779,11 +787,28 @@ *tgt = mpt_disk->config_page.PhysDiskID; return (0); } - mpt_lprt(mpt, MPT_PRT_DEBUG, "mpt_map_physdisk(%d) - Not Active\n", + mpt_lprt(mpt, MPT_PRT_DEBUG1, "mpt_map_physdisk(%d) - Not Active\n", ccb->ccb_h.target_id); return (-1); } +/* XXX Ignores that there may be multiple busses/IOCs involved. */ +int +mpt_is_raid_volume(struct mpt_softc *mpt, int tgt) +{ + CONFIG_PAGE_IOC_2_RAID_VOL *ioc_vol; + CONFIG_PAGE_IOC_2_RAID_VOL *ioc_last_vol; + + ioc_vol = mpt->ioc_page2->RaidVolume; + ioc_last_vol = ioc_vol + mpt->ioc_page2->NumActiveVolumes; + for (;ioc_vol != ioc_last_vol; ioc_vol++) { + if (ioc_vol->VolumeID == tgt) { + return (1); + } + } + return (0); +} + #if 0 static void mpt_enable_vol(struct mpt_softc *mpt, struct mpt_raid_volume *mpt_vol, ==== //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_raid.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt_raid.h,v 1.4 2006/05/27 17:26:57 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt_raid.h,v 1.6 2006/05/29 20:34:28 mjacob Exp $ */ /*- * Definitions for the integrated RAID features LSI MPT Fusion adapters. * @@ -32,6 +32,14 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF THE COPYRIGHT * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/*- + * Some Breakage and Bug Fixing added later. + * Copyright (c) 2006, by Matthew Jacob + * All Rights Reserved + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. + */ #ifndef _MPT_RAID_H_ #define _MPT_RAID_H_ @@ -60,6 +68,7 @@ cam_status mpt_map_physdisk(struct mpt_softc *, union ccb *, target_id_t *); +int mpt_is_raid_volume(struct mpt_softc *, int); cam_status mpt_raid_quiesce_disk(struct mpt_softc *, struct mpt_raid_disk *, request_t *); ==== //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_reg.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt_reg.h,v 1.3 2006/03/25 07:08:27 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt_reg.h,v 1.4 2006/05/29 20:34:28 mjacob Exp $ */ /*- * Generic defines for LSI '909 FC adapters. * FreeBSD Version. @@ -58,6 +58,9 @@ * * Support from Chris Ellsworth in order to make SAS adapters work * is gratefully acknowledged. + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. */ #ifndef _MPT_REG_H_ #define _MPT_REG_H_ ==== //depot/projects/fast_ipsec/src/sys/kern/kern_exit.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.288 2006/04/10 14:07:28 csjp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.289 2006/05/29 21:28:56 tegge Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -113,14 +113,13 @@ struct proc *p, *nq, *q; struct tty *tp; struct vnode *ttyvp; - struct vmspace *vm; struct vnode *vtmp; #ifdef KTRACE struct vnode *tracevp; struct ucred *tracecred; #endif struct plimit *plim; - int locked, refcnt; + int locked; /* * Drop Giant if caller has it. Eventually we should warn about @@ -300,33 +299,7 @@ } mtx_unlock(&ppeers_lock); - /* The next two chunks should probably be moved to vmspace_exit. */ - vm = p->p_vmspace; - /* - * Release user portion of address space. - * This releases references to vnodes, - * which could cause I/O if the file has been unlinked. - * Need to do this early enough that we can still sleep. - * Can't free the entire vmspace as the kernel stack - * may be mapped within that space also. - * - * Processes sharing the same vmspace may exit in one order, and - * get cleaned up by vmspace_exit() in a different order. The - * last exiting process to reach this point releases as much of - * the environment as it can, and the last process cleaned up - * by vmspace_exit() (which decrements exitingcnt) cleans up the - * remainder. - */ - atomic_add_int(&vm->vm_exitingcnt, 1); - do - refcnt = vm->vm_refcnt; - while (!atomic_cmpset_int(&vm->vm_refcnt, refcnt, refcnt - 1)); - if (refcnt == 1) { - shmexit(vm); - pmap_remove_pages(vmspace_pmap(vm)); - (void) vm_map_remove(&vm->vm_map, vm_map_min(&vm->vm_map), - vm_map_max(&vm->vm_map)); - } + vmspace_exit(td); sx_xlock(&proctree_lock); if (SESS_LEADER(p)) { ==== //depot/projects/fast_ipsec/src/sys/vm/vm_extern.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)vm_extern.h 8.2 (Berkeley) 1/12/94 - * $FreeBSD: src/sys/vm/vm_extern.h,v 1.77 2005/12/16 18:34:14 alc Exp $ + * $FreeBSD: src/sys/vm/vm_extern.h,v 1.78 2006/05/29 21:28:56 tegge Exp $ */ #ifndef _VM_EXTERN_H_ @@ -78,6 +78,8 @@ struct vmspace *vmspace_fork(struct vmspace *); void vmspace_exec(struct proc *, vm_offset_t, vm_offset_t); void vmspace_unshare(struct proc *); +void vmspace_exit(struct thread *); +struct vmspace *vmspace_acquire_ref(struct proc *); void vmspace_free(struct vmspace *); void vmspace_exitfree(struct proc *); void vnode_pager_setsize(struct vnode *, vm_ooffset_t); ==== //depot/projects/fast_ipsec/src/sys/vm/vm_glue.c#3 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.214 2005/12/16 18:34:14 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.215 2006/05/29 21:28:56 tegge Exp $"); #include "opt_vm.h" #include "opt_kstack_pages.h" @@ -852,12 +852,9 @@ * process may attempt to alter * the map. */ - PROC_LOCK(p); - vm = p->p_vmspace; - KASSERT(vm != NULL, - ("swapout_procs: a process has no address space")); - atomic_add_int(&vm->vm_refcnt, 1); - PROC_UNLOCK(p); + vm = vmspace_acquire_ref(p); + if (vm == NULL) + continue; if (!vm_map_trylock(&vm->vm_map)) goto nextproc1; ==== //depot/projects/fast_ipsec/src/sys/vm/vm_map.c#6 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.373 2006/03/08 06:31:46 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.374 2006/05/29 21:28:56 tegge Exp $"); #include #include @@ -148,6 +148,13 @@ static void vmspace_zdtor(void *mem, int size, void *arg); #endif +/* + * PROC_VMSPACE_{UN,}LOCK() can be a noop as long as vmspaces are type + * stable. + */ +#define PROC_VMSPACE_LOCK(p) do { } while (0) +#define PROC_VMSPACE_UNLOCK(p) do { } while (0) + void vm_map_startup(void) { @@ -261,7 +268,6 @@ vm->vm_taddr = 0; vm->vm_daddr = 0; vm->vm_maxsaddr = 0; - vm->vm_exitingcnt = 0; return (vm); } @@ -313,7 +319,7 @@ do refcnt = vm->vm_refcnt; while (!atomic_cmpset_int(&vm->vm_refcnt, refcnt, refcnt - 1)); - if (refcnt == 1 && vm->vm_exitingcnt == 0) + if (refcnt == 1) vmspace_dofree(vm); } @@ -321,28 +327,93 @@ vmspace_exitfree(struct proc *p) { struct vmspace *vm; - int exitingcnt; + PROC_VMSPACE_LOCK(p); vm = p->p_vmspace; p->p_vmspace = NULL; + PROC_VMSPACE_UNLOCK(p); + KASSERT(vm == &vmspace0, ("vmspace_exitfree: wrong vmspace")); + vmspace_free(vm); +} + +void +vmspace_exit(struct thread *td) +{ + int refcnt; + struct vmspace *vm; + struct proc *p; /* - * cleanup by parent process wait()ing on exiting child. vm_refcnt - * may not be 0 (e.g. fork() and child exits without exec()ing). - * exitingcnt may increment above 0 and drop back down to zero - * several times while vm_refcnt is held non-zero. vm_refcnt - * may also increment above 0 and drop back down to zero several - * times while vm_exitingcnt is held non-zero. + * Release user portion of address space. + * This releases references to vnodes, + * which could cause I/O if the file has been unlinked. + * Need to do this early enough that we can still sleep. * - * The last wait on the exiting child's vmspace will clean up - * the remainder of the vmspace. + * The last exiting process to reach this point releases as + * much of the environment as it can. vmspace_dofree() is the + * slower fallback in case another process had a temporary + * reference to the vmspace. */ - do - exitingcnt = vm->vm_exitingcnt; - while (!atomic_cmpset_int(&vm->vm_exitingcnt, exitingcnt, - exitingcnt - 1)); - if (vm->vm_refcnt == 0 && exitingcnt == 1) + + p = td->td_proc; + vm = p->p_vmspace; + atomic_add_int(&vmspace0.vm_refcnt, 1); + do { + refcnt = vm->vm_refcnt; + if (refcnt > 1 && p->p_vmspace != &vmspace0) { + /* Switch now since other proc might free vmspace */ + PROC_VMSPACE_LOCK(p); + p->p_vmspace = &vmspace0; + PROC_VMSPACE_UNLOCK(p); + pmap_activate(td); + } + } while (!atomic_cmpset_int(&vm->vm_refcnt, refcnt, refcnt - 1)); + if (refcnt == 1) { + if (p->p_vmspace != vm) { + /* vmspace not yet freed, switch back */ + PROC_VMSPACE_LOCK(p); + p->p_vmspace = vm; + PROC_VMSPACE_UNLOCK(p); + pmap_activate(td); + } + pmap_remove_pages(vmspace_pmap(vm)); + /* Switch now since this proc will free vmspace */ + PROC_VMSPACE_LOCK(p); + p->p_vmspace = &vmspace0; + PROC_VMSPACE_UNLOCK(p); + pmap_activate(td); vmspace_dofree(vm); + } +} + +/* Acquire reference to vmspace owned by another process. */ + +struct vmspace * +vmspace_acquire_ref(struct proc *p) +{ + struct vmspace *vm; + int refcnt; + + PROC_VMSPACE_LOCK(p); + vm = p->p_vmspace; + if (vm == NULL) { + PROC_VMSPACE_UNLOCK(p); + return (NULL); + } + do { + refcnt = vm->vm_refcnt; + if (refcnt <= 0) { /* Avoid 0->1 transition */ + PROC_VMSPACE_UNLOCK(p); + return (NULL); + } + } while (!atomic_cmpset_int(&vm->vm_refcnt, refcnt, refcnt + 1)); + if (vm != p->p_vmspace) { + PROC_VMSPACE_UNLOCK(p); + vmspace_free(vm); + return (NULL); + } + PROC_VMSPACE_UNLOCK(p); + return (vm); } void @@ -2923,7 +2994,9 @@ * run it down. Even though there is little or no chance of blocking * here, it is a good idea to keep this form for future mods. */ + PROC_VMSPACE_LOCK(p); p->p_vmspace = newvmspace; + PROC_VMSPACE_UNLOCK(p); if (p == curthread->td_proc) /* XXXKSE ? */ pmap_activate(curthread); vmspace_free(oldvmspace); @@ -2942,7 +3015,9 @@ if (oldvmspace->vm_refcnt == 1) return; newvmspace = vmspace_fork(oldvmspace); + PROC_VMSPACE_LOCK(p); p->p_vmspace = newvmspace; + PROC_VMSPACE_UNLOCK(p); if (p == curthread->td_proc) /* XXXKSE ? */ pmap_activate(curthread); vmspace_free(oldvmspace); ==== //depot/projects/fast_ipsec/src/sys/vm/vm_map.h#3 (text+ko) ==== @@ -57,7 +57,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.h,v 1.118 2005/12/03 22:41:15 alc Exp $ + * $FreeBSD: src/sys/vm/vm_map.h,v 1.119 2006/05/29 21:28:56 tegge Exp $ */ /* @@ -242,7 +242,6 @@ caddr_t vm_taddr; /* (c) user virtual address of text */ caddr_t vm_daddr; /* (c) user virtual address of data */ caddr_t vm_maxsaddr; /* user VA at max stack growth */ - int vm_exitingcnt; /* several processes zombied in exit1 */ int vm_refcnt; /* number of references */ }; ==== //depot/projects/fast_ipsec/src/sys/vm/vm_meter.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.85 2005/05/08 23:56:16 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.86 2006/05/29 21:28:56 tegge Exp $"); #include #include @@ -115,6 +115,7 @@ vm_map_t map; int paging; struct thread *td; + struct vmspace *vm; totalp = &total; bzero(totalp, sizeof *totalp); @@ -185,7 +186,10 @@ * Note active objects. */ paging = 0; - map = &p->p_vmspace->vm_map; + vm = vmspace_acquire_ref(p); + if (vm == NULL) + continue; + map = &vm->vm_map; vm_map_lock_read(map); for (entry = map->header.next; entry != &map->header; entry = entry->next) { @@ -198,6 +202,7 @@ VM_OBJECT_UNLOCK(object); } vm_map_unlock_read(map); + vmspace_free(vm); if (paging) totalp->t_pw++; } From owner-p4-projects@FreeBSD.ORG Tue May 30 08:20:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0269116A486; Tue, 30 May 2006 08:20:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5008016A4A1 for ; Tue, 30 May 2006 08:20:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9430C43D58 for ; Tue, 30 May 2006 08:20:29 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4U8JDud007356 for ; Tue, 30 May 2006 08:19:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4U8JCOW007353 for perforce@freebsd.org; Tue, 30 May 2006 08:19:12 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 May 2006 08:19:12 GMT Message-Id: <200605300819.k4U8JCOW007353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 08:20:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=98119 Change 98119 by kmacy@kmacy_storage:sun4v_work on 2006/05/30 08:19:01 remove nexus_intr_wrapper, set interrupt state in intr_execute_handlers Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#12 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#7 (text+ko) ==== @@ -295,6 +295,8 @@ ih->ih_handler(ih->ih_argument); } + hvio_intr_setstate(iv->iv_vec, HV_INTR_IDLE_STATE); + /* Schedule a heavyweight interrupt process. */ if (thread) error = intr_event_schedule_thread(ie); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#12 (text+ko) ==== @@ -81,15 +81,6 @@ struct rman sc_mem_rman; }; -typedef struct nexus_id { - devhandle_t dh; - uint32_t ino; - devhandle_t nid_ihdl; - driver_intr_t *nid_handler; - void *nid_arg; - -} nexus_id_t; - static device_probe_t nexus_probe; static device_attach_t nexus_attach; static bus_print_child_t nexus_print_child; @@ -310,48 +301,6 @@ #ifdef SUN4V -void nexus_intr_reset(void *arg); - -void -nexus_intr_reset(void *arg) -{ - nexus_id_t *nidp; - - nidp = (nexus_id_t *)arg; - - hvio_intr_setstate(nidp->nid_ihdl, HV_INTR_IDLE_STATE); - -} - - -static void -nexus_intr_wrapper(void *arg) -{ - nexus_id_t *nidp; - driver_intr_t *handler; - void *harg; - - nidp = (nexus_id_t *)arg; - handler = nidp->nid_handler; - harg = nidp->nid_arg; - - (*handler)(harg); - - hvio_intr_setstate(nidp->nid_ihdl, HV_INTR_IDLE_STATE); - -#ifdef DEBUG - if (nidp->dh == 0x7c0) { - int state, valid; - hvio_intr_getstate(nidp->nid_ihdl, &state); - hvio_intr_getvalid(nidp->nid_ihdl, &valid); - printf("i: %#lx, s: %d, v: %d\n", nidp->nid_ihdl, state, valid); - } -#endif -} - - - - static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, driver_intr_t *intr, void *arg, void **cookiep) @@ -360,7 +309,6 @@ uint64_t ihdl; uint64_t ino; int error, cpuid; - nexus_id_t *nidp; ndi = device_get_ivars(child); @@ -405,19 +353,8 @@ if ((error = rman_activate_resource(res))) goto fail; - if ((nidp = malloc(sizeof(nexus_id_t), M_DEVBUF, M_NOWAIT)) == NULL) { - printf("failed to allocate nexus_id\n"); - error = ENOMEM; - goto fail; - } - nidp->nid_ihdl = ihdl; - nidp->nid_handler = intr; - nidp->nid_arg = arg; - nidp->dh = ndi->ndi_devhandle; - nidp->ino = ino; - error = inthand_add(device_get_nameunit(child), ihdl, - nexus_intr_wrapper, nidp, flags, cookiep); + intr, arg, flags, cookiep); fail: From owner-p4-projects@FreeBSD.ORG Tue May 30 09:09:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9216116A486; Tue, 30 May 2006 09:09:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 39D7C16A46C for ; Tue, 30 May 2006 09:09:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC06243D53 for ; Tue, 30 May 2006 09:09:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4U98aGM020337 for ; Tue, 30 May 2006 09:08:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4U96iAe019108 for perforce@freebsd.org; Tue, 30 May 2006 09:06:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 30 May 2006 09:06:44 GMT Message-Id: <200605300906.k4U96iAe019108@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 98120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 09:09:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=98120 Change 98120 by rwatson@rwatson_zoo on 2006/05/30 09:05:17 Integrate TrustedBSD audit3 branch from TrustedBSD base branch; see change @98005 for a summar of feature changes. Affected files ... .. //depot/projects/trustedbsd/audit3/MAINTAINERS#7 integrate .. //depot/projects/trustedbsd/audit3/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#9 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#5 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#10 integrate .. //depot/projects/trustedbsd/audit3/bin/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/bin/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/bin/chflags/chflags.1#6 integrate .. //depot/projects/trustedbsd/audit3/bin/csh/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/bin/ed/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/bin/getfacl/getfacl.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/getfacl/getfacl.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/cmp.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/extern.h#3 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/ls.1#6 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/ls.c#6 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/ls.h#3 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/print.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/util.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/pax/pax.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/ps/keyword.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/rm/rm.c#6 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/TOUR#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/builtins.def#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/eval.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/exec.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/exec.h#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/input.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/mkbuiltins#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/options.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/show.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/trap.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/var.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/amd/fixmount/fixmount.8#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FREEBSD-Upgrade#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/TODO#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/config.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/config.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/csup.1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/fattr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/globtree.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/idcache.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/idcache.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/csup/lister.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/misc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/misc.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/proto.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/token.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/token.l#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/csup/updater.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/aes.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/config.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/config.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/config_types.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/defconfig#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/driver.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_pax.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_psk.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd_cli.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd_ctrl.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/hostapd/hostapd_ctrl.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/logwatch/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/logwatch/hostapd#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/md5.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/tls.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wired.conf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa_ctrl.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/hostapd/wpa_ctrl.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/CHANGELOG#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/CHANGES#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/INSTALL#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/MANIFEST#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/NEWS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/README#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/bind.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/callback.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/chardefs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/complete.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/config.h.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/configure#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/configure.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/display.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/readline.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/histexamp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlcat.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/ChangeLog#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/config.h.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/configure#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/configure.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/extern.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/os.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/pty.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/rlfe.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlfe/screen.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlptytest.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rltest.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/examples/rlversion.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/funmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/histexpand.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/history.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/input.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/macro.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/mbutil.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/misc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/readline.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/readline.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rldefs.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rlmbutil.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rlprivate.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/rltty.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/search.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/shell.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/shlib/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/signals.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/support/config.guess#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/support/shlib-install#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/support/shobj-conf#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/support/wcwidth.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/libreadline/terminal.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/text.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/tilde.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/tilde.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/undo.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/util.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/vi_keymap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/netcat/atomicio.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/netcat/atomicio.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/netcat/nc.1#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/netcat/netcat.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/netcat/socks.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/libngatm.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/uniaddr.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/unifunc.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/unimsg.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/unisap.3#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ngatm/man/unistruct.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_control#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#11 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_user#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_warn#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/opie/opiepasswd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/authpf/authpf.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/pf/pflogd/pflogd.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/PGPKEYS#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/README#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/RELEASE_NOTES#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/README#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/knecht.mc#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/cf/submit.cf#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/dnsbl.m4#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/feature/mtamark.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/proto.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/m4/version.m4#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/ostype/darwin.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/cf/sendmail.schema#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/contrib/dnsblaccess.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/doc/op/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/doc/op/op.me#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/libmilter/mfdef.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/conf.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/ldap.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/include/sm/time.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/README#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/docs/xxfi_helo.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/libmilter.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/listener.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/signal.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libmilter/smfi.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/b-strcmp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/b-strl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/clock.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/fclose.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/fflush.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/fopen.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/fpos.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/fseek.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/ldap.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/local.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/memstat.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/refill.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/shm.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/signal.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/stdio.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/strio.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-event.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-memstat.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/ungetc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/vfprintf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/libsm/vfscanf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/README#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/TRACEFLAGS#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/collect.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/conf.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/conf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/daemon.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/deliver.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/envelope.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/headers.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/helpfile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/map.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mci.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/milter.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/mime.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/parseaddr.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/queue.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/readcf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/savemail.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sendmail.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sfsasl.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/sfsasl.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/srvrsmtp.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/tls.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/udb.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/usersmtp.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/util.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/sendmail/src/version.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/top/top.X#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/top/top.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/traceroute/traceroute.8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/traceroute/traceroute.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/base64.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/base64.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config_file.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/config_types.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/crypto_gnutls.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/developer.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_hostap.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/driver_wired.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_pax.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/events.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/hostap_common.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/hostapd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/main.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/preauth.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/preauth.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_gnutls.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/tls_schannel.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_i.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ChangeLog#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/README#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/README.platform#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/README.tun#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/acconfig.h#4 delete .. //depot/projects/trustedbsd/audit3/crypto/openssh/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-krb5.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-options.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-options.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-pam.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth2-gss.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth2.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/bufaux.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/buildpkg.sh.in#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/canohost.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/channels.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/channels.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/cipher-ctr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/cipher.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/clientloop.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/config.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/configure.ac#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/defines.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/dns.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/dns.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/entropy.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/entropy.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/envpass.sh#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssh/gss-genr.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/gss-serv-krb5.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/gss-serv.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/hostfile.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/includes.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kex.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kex.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexdh.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexdhc.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexdhs.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexgex.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexgexc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/loginrec.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/misc.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/misc.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor_wrap.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/base64.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/basename.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bindresvport.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-asprintf.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-closefrom.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-misc.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/daemon.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/dirname.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/getcwd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/getgrouplist.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/getopt.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/getrrsetbyname.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/glob.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/glob.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/inet_aton.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/inet_ntoa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/inet_ntop.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/mktemp.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/openbsd-compat.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/port-tun.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/port-tun.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/readpassphrase.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/readpassphrase.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/realpath.c#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/rresvport.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/setenv.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/sigact.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/sigact.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strlcat.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strlcpy.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strmode.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strsep.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strtoll.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strtonum.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/strtoul.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/sys-queue.h#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/sys-tree.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/vis.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/vis.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/opensshd.init.in#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/packet.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/progressmeter.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/readconf.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/readconf.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/README.regress#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/agent-getpeereid.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/forwarding.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/multiplex.sh#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/reconfigure.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/scp-ssh-wrapper.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/scp.sh#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/test-exec.sh#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/try-ciphers.sh#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/yes-head.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/scp.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/scp.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/servconf.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/servconf.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/serverloop.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/session.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp-client.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp-common.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp-server.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-add.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-agent.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keygen.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keygen.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keyscan.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keyscan.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keysign.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh.1#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh_config#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh_config.5#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh_namespace.h#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect1.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect2.c#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd.8#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd.c#5 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd_config#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd_config.5#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/version.h#4 integrate .. //depot/projects/trustedbsd/audit3/etc/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/etc/bluetooth/hcsecd.conf#3 integrate .. //depot/projects/trustedbsd/audit3/etc/cached.conf#1 branch .. //depot/projects/trustedbsd/audit3/etc/defaults/devfs.rules#2 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/periodic.conf#7 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#11 integrate .. //depot/projects/trustedbsd/audit3/etc/devd.conf#6 integrate .. //depot/projects/trustedbsd/audit3/etc/etc.sparc64/ttys#6 integrate .. //depot/projects/trustedbsd/audit3/etc/gettytab#4 integrate .. //depot/projects/trustedbsd/audit3/etc/hosts.allow#4 integrate .. //depot/projects/trustedbsd/audit3/etc/isdn/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#8 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.root.dist#7 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.usr.dist#5 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.x11-4.dist#7 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/etc/network.subr#7 integrate .. //depot/projects/trustedbsd/audit3/etc/nsswitch.conf#1 branch .. //depot/projects/trustedbsd/audit3/etc/periodic/daily/440.status-mailq#3 integrate .. //depot/projects/trustedbsd/audit3/etc/periodic/security/600.ip6fwdenied#2 delete .. //depot/projects/trustedbsd/audit3/etc/periodic/security/650.ip6fwlimit#2 delete .. //depot/projects/trustedbsd/audit3/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/trustedbsd/audit3/etc/periodic/security/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.bsdextended#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/SERVERS#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/amd#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/cached#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/ike#4 delete .. //depot/projects/trustedbsd/audit3/etc/rc.d/ip6fw#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/isdnd#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/jail#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/kernel#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/mdconfig#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/mdconfig2#1 branch .. //depot/projects/trustedbsd/audit3/etc/rc.d/moused#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/named#6 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/nsswitch#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/ntpd#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pcvt#3 delete .. //depot/projects/trustedbsd/audit3/etc/rc.d/serial#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/sshd#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/syscons#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/sysctl#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.firewall6#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.subr#7 integrate .. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.mc#3 integrate .. //depot/projects/trustedbsd/audit3/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/trustedbsd/audit3/games/factor/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#11 integrate .. //depot/projects/trustedbsd/audit3/games/random/random.c#5 integrate .. //depot/projects/trustedbsd/audit3/games/random/randomize_fd.c#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libdialog/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libg2c/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libgcc/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libgcov/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libobjc/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libreadline/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libreadline/config.h#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/bc/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/gdbserver/Makefile#2 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/gdbserver/low-fbsd.c#2 delete .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cc_tools/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cvs/cvs/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/dialog/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/gdbserver/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/gdbserver/fbsd-i386-low.c#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/gdbserver/fbsd-low.c#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/gdbserver/fbsd-low.h#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/gdbserver/reg-i386.c#1 branch .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/libgdb/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/include/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/include/arpa/inet.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/arpa/nameser.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/glob.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/malloc_np.h#1 branch .. //depot/projects/trustedbsd/audit3/include/netdb.h#4 integrate .. //depot/projects/trustedbsd/audit3/include/nsswitch.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/res_update.h#1 branch .. //depot/projects/trustedbsd/audit3/include/resolv.h#5 integrate .. //depot/projects/trustedbsd/audit3/include/rpc/rpcent.h#2 integrate .. //depot/projects/trustedbsd/audit3/include/stdio.h#4 integrate .. //depot/projects/trustedbsd/audit3/include/stdlib.h#5 integrate .. //depot/projects/trustedbsd/audit3/include/time.h#4 integrate .. //depot/projects/trustedbsd/audit3/kerberos5/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/kerberos5/lib/libgssapi/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/kerberos5/lib/libroken/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/Makefile#11 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/bind/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/bind9/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/config.mk#5 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/dns/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/isc/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/isccc/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/isccfg/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/lwres/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/csu/common/crtbegin.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/csu/common/crtend.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libarchive/INSTALL#2 delete .. //depot/projects/trustedbsd/audit3/lib/libarchive/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/Makefile.am#4 delete .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive.h.in#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.h#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_extract.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_cpio.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tp.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_pax.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/configure.ac.in#5 delete .. //depot/projects/trustedbsd/audit3/lib/libarchive/tar.5#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libatm/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/Versions.def#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/arm/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/SYS.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/db/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/db/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/db/man/dbm.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gdtoa/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/gen/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/gen/_pthread_stubs.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/_spinlock_stub.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/gethostname.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/getpwent.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/glob.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/glob.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/signal.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/syslog.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/tls.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/vis.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/wordexp.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gmon/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gmon/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/i386/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/i386/sys/i386_set_watch.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/isc/eventlib.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/isc/list.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/libc_private.h#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/include/namespace.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/include/nscache.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/nscachedcli.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/port_after.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/port_before.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/resolv_mt.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/include/un-namespace.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/inet/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_addr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_cidr_pton.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_lnaof.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_makeaddr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_net_ntop.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_net_pton.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_neta.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_netof.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_network.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_ntoa.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_ntop.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/inet_pton.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/inet/nsap_addr.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/isc/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/isc/ev_streams.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/isc/ev_timers.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/isc/eventlib_p.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/locale/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/locale/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/locale/utf8.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_name.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_netint.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_parse.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_print.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_samedomain.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/nameser/ns_ttl.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/net/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/net/gai_strerror.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getaddrinfo.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gethostbydns.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gethostbyht.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gethostbyname.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gethostbynis.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/gethostnamadr.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getnameinfo.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getnetbydns.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getnetbyht.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getnetbynis.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getnetnamadr.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getproto.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getprotoent.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getprotoname.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/getservbyname.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/getservbyport.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/getservent.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/herror.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_addr.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_lnaof.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_makeaddr.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_net_ntop.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_net_pton.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_neta.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_netof.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_network.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_ntoa.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_ntop.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/inet_pton.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/name6.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/netdb_private.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/ns_name.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/ns_netint.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/ns_parse.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/ns_print.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/ns_ttl.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/nsap_addr.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/nscache.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/net/nscachedcli.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/nsparser.y#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_comp.c#4 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_config.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_data.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_debug.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_init.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_mkquery.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_mkupdate.c#3 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_query.c#4 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_send.c#4 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_send_private.h#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/net/res_update.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/nls/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/nls/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/posix1e/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/posix1e/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/quad/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/quad/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/regex/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/regex/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/h_errno.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/herror.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/mtctxres.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_comp.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_data.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_debug.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_debug.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_findzonecut.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_init.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_mkquery.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_mkupdate.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_private.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_query.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_send.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_state.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/resolv/res_update.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/softfloat/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/softfloat/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/fpu/fpu_qp.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/fclose.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/fcloseall.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/local.h#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/vfprintf.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/vfscanf.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/vfwprintf.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/vfwscanf.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdio/xprintf.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/a64l.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/strtol.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/strtonum.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/strtonum.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/strtoul.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdtime/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdtime/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/string/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/string/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/sys/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/sys/chflags.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/getsockopt.2#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mmap.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mq.c#2 delete .. //depot/projects/trustedbsd/audit3/lib/libc/sys/recv.2#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/wait.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/write.2#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/uuid/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/uuid/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/xdr/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/xdr/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc/yp/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/yp/Symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/lib/libc_r/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libcam/camlib.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libcrypt/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libdisk/disk.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libfetch/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libgpib/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libio/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libipsec/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_amd64.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_i386.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_minidump_amd64.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_minidump_i386.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_private.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libmilter/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libncp/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libncurses/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/modules.inc#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_login_access/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_login_access/login.access.5#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_login_access/pam_login_access.8#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_nologin/pam_nologin.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_ssh/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_unix/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpcap/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmc.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmclog.3#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/arch/i386/i386/thr_getcontext.S#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/pthread.map#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/sys/thr_error.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_accept.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_atfork.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_attr_destroy.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 30 11:31:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D9F616A438; Tue, 30 May 2006 11:31:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4C4A16A41F for ; Tue, 30 May 2006 11:31:49 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D80D43D48 for ; Tue, 30 May 2006 11:31:49 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UBUWa2057871 for ; Tue, 30 May 2006 11:30:32 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UBUWsR057868 for perforce@freebsd.org; Tue, 30 May 2006 11:30:32 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 30 May 2006 11:30:32 GMT Message-Id: <200605301130.k4UBUWsR057868@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 98122 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 11:31:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=98122 Change 98122 by soc-andrew@soc-andrew_serv on 2006/05/30 11:29:40 Fix a problem where DESTDIR was added to a directory twice Split a long line to be under 80 chars Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile.inc1#3 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/Makefile#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile.inc1#3 (text+ko) ==== @@ -1,3 +1,3 @@ BSD_INSTALLER_LUA_DIR=${.CURDIR}/../../../contrib/bsdinstaller/backend/lua -INST_DIR=${DESTDIR}/usr/libexec/bsdinstaller +INST_DIR=/usr/libexec/bsdinstaller ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ LANGUAGES= en -LOCALEDIR= ${INST_DIR}/locale +LOCALEDIR= ${DESTDIR}/${INST_DIR}/locale all: @true @@ -8,7 +8,8 @@ # This is not a problem for the release scripts as they can install gettext all-nls: for _language in ${LANGUAGES}; do \ - msgfmt -o ${.OBJDIR}/$${_language}.mo ${.CURDIR}/$${_language}.po; \ + msgfmt -o ${.OBJDIR}/$${_language}.mo \ + ${.CURDIR}/$${_language}.po; \ done clean-nls: From owner-p4-projects@FreeBSD.ORG Tue May 30 11:32:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA71A16A424; Tue, 30 May 2006 11:32:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A621D16A41F for ; Tue, 30 May 2006 11:32:51 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5348A43D48 for ; Tue, 30 May 2006 11:32:51 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UBVYED057934 for ; Tue, 30 May 2006 11:31:34 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UBVYsN057931 for perforce@freebsd.org; Tue, 30 May 2006 11:31:34 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 30 May 2006 11:31:34 GMT Message-Id: <200605301131.k4UBVYsN057931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 98123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 11:32:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=98123 Change 98123 by soc-andrew@soc-andrew_serv on 2006/05/30 11:30:56 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/pc98/fixit-small_crunch.conf#2 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.935 2006/05/22 20:18:04 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.936 2006/05/27 14:26:49 bmah Exp $ 2000 @@ -443,7 +443,7 @@ Support has been improved for so-called legacy-free hardware, in particular, i386 systems without AT-style keyboard controllers such as the - Macbook Pro. + Macbook Pro. &merged; Multimedia Support @@ -1043,8 +1043,8 @@ the jailid, path, hostname, IP and the command used to start the jail. &merged; - The &man.jail.8; program now support a - option to specify a jail's securelevel. + The &man.jail.8; program now supports a + option to specify a jail's securelevel. &merged; The &man.kdump.1; utility now supports a flag, which causes kdump to print an additional field holding @@ -1098,7 +1098,7 @@ The &man.ls.1; utility now supports an flag to use the file creation - time for sorting. + time for sorting. &merged; A new &man.malloc.3; implementation has been introduced. This implementation, sometimes referred to @@ -1566,7 +1566,7 @@ The manual pages for NTP have been updated to 4.2.0, to match the version of - code actually included in &os;. + code actually included in &os;. &merged; ==== //depot/projects/soc2005/bsdinstaller/src/release/pc98/fixit-small_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.7 2004/10/01 07:54:37 ru Exp $ +# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.8 2006/05/29 12:55:36 nyan Exp $ buildopts -DRELEASE_CRUNCH @@ -41,7 +41,6 @@ srcdirs /usr/src/usr.bin progs ee progs ftp -progs telnet ln ee edit srcdirs /usr/src/usr.sbin From owner-p4-projects@FreeBSD.ORG Tue May 30 11:33:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4A1516A424; Tue, 30 May 2006 11:33:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8166A16A421 for ; Tue, 30 May 2006 11:33:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3217043D46 for ; Tue, 30 May 2006 11:33:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UBWasu057976 for ; Tue, 30 May 2006 11:32:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UBWZKY057973 for perforce@freebsd.org; Tue, 30 May 2006 11:32:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 30 May 2006 11:32:35 GMT Message-Id: <200605301132.k4UBWZKY057973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 98124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 11:33:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=98124 Change 98124 by rwatson@rwatson_zoo on 2006/05/30 11:31:58 Re-merge. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#11 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#11 (text+ko) ==== @@ -8,7 +8,6 @@ CFLAGS+=-DLOGALL DPADD= ${LIBUTIL} ${LIBPAM} ${LIBBSM} LDADD= -lutil ${MINUSLPAM} -MAN= login.1 login.access.5 .if ${MK_SETUID_LOGIN} != "no" BINOWN= root From owner-p4-projects@FreeBSD.ORG Tue May 30 12:56:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B051316A606; Tue, 30 May 2006 12:56:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5723016A601 for ; Tue, 30 May 2006 12:56:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0870A43D53 for ; Tue, 30 May 2006 12:56:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UCtOnV072918 for ; Tue, 30 May 2006 12:55:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UCtO0S072915 for perforce@freebsd.org; Tue, 30 May 2006 12:55:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 30 May 2006 12:55:24 GMT Message-Id: <200605301255.k4UCtO0S072915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 98128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 12:56:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=98128 Change 98128 by rwatson@rwatson_zoo on 2006/05/30 12:55:14 Delete mismerge. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#8 (text+ko) ==== @@ -162,8 +162,6 @@ if (mask_p == NULL) return (-1); - ae_class = au_event_class(event); - /* * Perform the actual check of the masks against the event. */ From owner-p4-projects@FreeBSD.ORG Tue May 30 15:44:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E13AF16A4D5; Tue, 30 May 2006 15:44:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB22016A51C for ; Tue, 30 May 2006 15:44:14 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6113843D5C for ; Tue, 30 May 2006 15:44:14 +0000 (GMT) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UFguYK019359 for ; Tue, 30 May 2006 15:42:56 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UFguEe019356 for perforce@freebsd.org; Tue, 30 May 2006 15:42:56 GMT (envelope-from adamartin@FreeBSD.org) Date: Tue, 30 May 2006 15:42:56 GMT Message-Id: <200605301542.k4UFguEe019356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 98139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 15:44:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=98139 Change 98139 by adamartin@adamartin_tethys on 2006/05/30 15:42:28 First Perforce commit. Affected files ... .. //depot/projects/soc2006/adamartin_autofs/TODO#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 30 19:16:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E91FD16AC48; Tue, 30 May 2006 19:16:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 202E016AC03 for ; Tue, 30 May 2006 19:16:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B12EF43D64 for ; Tue, 30 May 2006 19:16:48 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UJFUC2054608 for ; Tue, 30 May 2006 19:15:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UJFTYC054605 for perforce@freebsd.org; Tue, 30 May 2006 19:15:29 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 May 2006 19:15:29 GMT Message-Id: <200605301915.k4UJFTYC054605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 19:17:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=98148 Change 98148 by kmacy@kmacy_storage:sun4v_work on 2006/05/30 19:15:21 don't register all 4 PCI interrupts for every device Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#41 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#41 (text+ko) ==== @@ -426,41 +426,38 @@ struct hvpci_softc *sc; int pciintr, rid; int error; - int i; + sc = device_get_softc(dev); - pciintr = rman_get_start(ires); + rid = rman_get_start(ires); + pciintr = rid - 1; + printf("pciintr=0x%x\n", pciintr); /* sun4v uses 1 through 4 interrupts */ KASSERT(pciintr >= 1 && pciintr <= 4, ("interrupt out of range")); - for (i = 1; i <= 4; i++) { - rid = pciintr = i; - pciintr--; if (sc->hs_intr[pciintr] == NULL) { if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(dev, - SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { + SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { device_printf(dev, "couldn't alloc interrupt\n"); - return (ENXIO); + return (ENXIO); } sc->hs_intrrefcnt[pciintr] = 1; } else sc->hs_intrrefcnt[pciintr]++; - + error = bus_setup_intr(dev, sc->hs_intr[pciintr], flags, intr, arg, - cookiep); + cookiep); if (error) { sc->hs_intrrefcnt[pciintr]--; if (sc->hs_intrrefcnt[pciintr] == 0) { bus_release_resource(dev, SYS_RES_IRQ, - rman_get_rid(sc->hs_intr[pciintr]), - sc->hs_intr[pciintr]); + rman_get_rid(sc->hs_intr[pciintr]), + sc->hs_intr[pciintr]); sc->hs_intr[pciintr] = NULL; } device_printf(dev, "bus_setup_intr: %d\n", error); - return (error); - } + return (error); } - return (0); } From owner-p4-projects@FreeBSD.ORG Tue May 30 19:20:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37DF716A890; Tue, 30 May 2006 19:20:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2357616A82A for ; Tue, 30 May 2006 19:19:59 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF10243D72 for ; Tue, 30 May 2006 19:19:52 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UJIY50054760 for ; Tue, 30 May 2006 19:18:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UJIYsM054757 for perforce@freebsd.org; Tue, 30 May 2006 19:18:34 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 May 2006 19:18:34 GMT Message-Id: <200605301918.k4UJIYsM054757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 19:20:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=98149 Change 98149 by kmacy@kmacy_storage:sun4v_work on 2006/05/30 19:17:39 reset interrupt state only after all work has been done Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#10 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#10 (text+ko) ==== @@ -84,6 +84,10 @@ call %o0 mov %o1, %o0 + + lduw [%l0 + IR_VEC], %o0 + call hvio_intr_setstate + mov HV_INTR_IDLE_STATE, %o1 ba,a %xcc, 1b nop END(intr_fast) From owner-p4-projects@FreeBSD.ORG Tue May 30 19:23:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5A5716AEA6; Tue, 30 May 2006 19:23:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BABFD16AEC8 for ; Tue, 30 May 2006 19:22:57 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8727543D53 for ; Tue, 30 May 2006 19:22:57 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UJLcFP055016 for ; Tue, 30 May 2006 19:21:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UJLcRm055013 for perforce@freebsd.org; Tue, 30 May 2006 19:21:38 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 May 2006 19:21:38 GMT Message-Id: <200605301921.k4UJLcRm055013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98151 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 19:23:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=98151 Change 98151 by kmacy@kmacy_storage:sun4v_work on 2006/05/30 19:20:59 fix KASSERT remove debug printf Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#42 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#42 (text+ko) ==== @@ -431,10 +431,9 @@ sc = device_get_softc(dev); rid = rman_get_start(ires); + KASSERT(rid >= 1 && rid <= 4, ("interrupt out of range")); + pciintr = rid - 1; - printf("pciintr=0x%x\n", pciintr); - /* sun4v uses 1 through 4 interrupts */ - KASSERT(pciintr >= 1 && pciintr <= 4, ("interrupt out of range")); if (sc->hs_intr[pciintr] == NULL) { if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) { From owner-p4-projects@FreeBSD.ORG Tue May 30 19:28:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FB8516ACC5; Tue, 30 May 2006 19:28:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A207C16ACCF for ; Tue, 30 May 2006 19:28:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3763643D72 for ; Tue, 30 May 2006 19:28:10 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UJQkFt055287 for ; Tue, 30 May 2006 19:26:46 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UJQkgt055284 for perforce@freebsd.org; Tue, 30 May 2006 19:26:46 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 May 2006 19:26:46 GMT Message-Id: <200605301926.k4UJQkgt055284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 98153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 19:28:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=98153 Change 98153 by kmacy@kmacy_storage:sun4v_work on 2006/05/30 19:25:49 for fast interrupts call fast interrupt handler directly if there are no collisions on a vector Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/intr_machdep.c#8 (text+ko) ==== @@ -205,9 +205,15 @@ ps = intr_disable(); if (vec != -1) { - intr_vectors[vec].iv_func = ivf; - intr_vectors[vec].iv_arg = iva; - intr_vectors[vec].iv_pri = pri; + if ((char *)intr_vectors[vec].iv_func == (char *)intr_stray_level) { + intr_vectors[vec].iv_func = ivf; + intr_vectors[vec].iv_arg = iva; + } else { + intr_vectors[vec].iv_func = intr_execute_handlers; + intr_vectors[vec].iv_arg = &intr_vectors[vec]; + } + if (pri > intr_vectors[vec].iv_pri) + intr_vectors[vec].iv_pri = pri; intr_vectors[vec].iv_vec = vec; } snprintf(pilname, MAXCOMLEN + 1, "pil%d: %s", pri, pil_names[pri]); @@ -315,8 +321,9 @@ struct intr_vector *iv; struct intr_event *ie; /* descriptor for the IRQ */ struct intr_event *orphan; - int errcode; - + int errcode, pil; + iv_func_t *ivf; + void *iva; /* * Work around a race where more than one CPU may be registering * handlers on the same IRQ at the same time. @@ -347,8 +354,11 @@ if (errcode) return (errcode); - intr_setup(flags & INTR_FAST ? PIL_FAST : PIL_ITHREAD, intr_fast, vec, - intr_execute_handlers, iv); + pil = (flags & INTR_FAST) ? PIL_FAST : PIL_ITHREAD; + ivf = (flags & INTR_FAST) ? handler : intr_execute_handlers; + iva = (flags & INTR_FAST) ? arg : iv; + + intr_setup(pil, intr_fast, vec, ivf, iva); intr_stray_count[vec] = 0; From owner-p4-projects@FreeBSD.ORG Tue May 30 20:44:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B94B616A9CD; Tue, 30 May 2006 20:44:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EFEF16A989 for ; Tue, 30 May 2006 20:44:44 +0000 (UTC) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA3E043D46 for ; Tue, 30 May 2006 20:44:43 +0000 (GMT) (envelope-from clem1@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UKhOgO060731 for ; Tue, 30 May 2006 20:43:24 GMT (envelope-from clem1@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UKhOp3060728 for perforce@freebsd.org; Tue, 30 May 2006 20:43:24 GMT (envelope-from clem1@FreeBSD.org) Date: Tue, 30 May 2006 20:43:24 GMT Message-Id: <200605302043.k4UKhOp3060728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to clem1@FreeBSD.org using -f From: Clément Lecigne To: Perforce Change Reviews Cc: Subject: PERFORCE change 98161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 20:44:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=98161 Change 98161 by clem1@clem1_ipv6vulns on 2006/05/30 20:43:15 First perforce commit. Submitted by: clem1 Affected files ... .. //depot/projects/soc2006/clem1_ipv6vulns/README#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 30 23:39:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8229F16A51A; Tue, 30 May 2006 23:39:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F1A916A4DF for ; Tue, 30 May 2006 23:39:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2848B43D55 for ; Tue, 30 May 2006 23:39:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UNc937089848 for ; Tue, 30 May 2006 23:38:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UNc95k089843 for perforce@freebsd.org; Tue, 30 May 2006 23:38:09 GMT (envelope-from jb@freebsd.org) Date: Tue, 30 May 2006 23:38:09 GMT Message-Id: <200605302338.k4UNc95k089843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98169 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 23:39:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=98169 Change 98169 by jb@jb_freebsd2 on 2006/05/30 23:37:13 Define a the OpenSolaris version that the FreeBSD headers are sort-of compatible with. We need something to use to determine if there are extra definitions required. The need for this becomes obvious when trying to upgrade a FreeBSD-6 system to -current with DTrace support in it. Since FreeBSD-6 has no OpenSolaris compatibility, we need to add it. However we don't want to have to keep adding it for everything that we want to import from OpenSolaris. Eventually we'll get to the point where we stabilise the compatibility definitions and adding stuff won't be necessary. Oh Single Unix Speciciation where art thou? And why aren't you sufficient to define a single Unix? Affected files ... .. //depot/projects/dtrace/src/sys/sys/param.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/param.h#5 (text+ko) ==== @@ -336,6 +336,15 @@ */ #ifdef _SOLARIS_C_SOURCE #define PAGESIZE PAGE_SIZE + +/* + * The OpenSolaris version is set according to the version last imported + * from http://dlc.sun.com/osol/on/downloads/current/. In FreeBSD header + * files it can be used to detemine the level of compatibility that the + * FreeBSD headers provide to OpenSolaris code. Perhaps one day there + * will be a really, really Single Unix Specification. + */ +#define __OpenSolaris_version 20060508 #endif #endif /* _SYS_PARAM_H_ */ From owner-p4-projects@FreeBSD.ORG Tue May 30 23:39:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 023C116A580; Tue, 30 May 2006 23:39:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1658216A4A5 for ; Tue, 30 May 2006 23:39:31 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2B1C43D55 for ; Tue, 30 May 2006 23:39:30 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UNcBRS089866 for ; Tue, 30 May 2006 23:38:11 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UNc9AX089851 for perforce@freebsd.org; Tue, 30 May 2006 23:38:09 GMT (envelope-from imp@freebsd.org) Date: Tue, 30 May 2006 23:38:09 GMT Message-Id: <200605302338.k4UNc9AX089851@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 98170 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2006 23:39:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=98170 Change 98170 by imp@imp_harmony on 2006/05/30 23:37:34 IFC @98168 Affected files ... .. //depot/projects/arm/src/sys/Makefile#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#8 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#6 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#16 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#4 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_var.h#3 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#11 integrate .. //depot/projects/arm/src/sys/conf/kern.mk#5 integrate .. //depot/projects/arm/src/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/arm/src/sys/dev/bfe/if_bfereg.h#4 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#13 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#12 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#15 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_debug.c#9 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#10 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.h#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_reg.h#4 integrate .. //depot/projects/arm/src/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/arm/src/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/arm/src/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/arm/src/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci.c#10 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci_pci.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/ohcireg.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ohcivar.h#6 integrate .. //depot/projects/arm/src/sys/dev/usb/sl811hs.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/uhcivar.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_mem.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdivar.h#3 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-cam#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-crypto#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-dev_pci#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-dev_sound#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-dev_usb#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-geom#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-i4b#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-kern#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-libkern#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-linux#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-net80211#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-netgraph#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-netinet#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-netinet6#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-netipsec#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-opencrypto#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Doxyfile-vm#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/Makefile#2 integrate .. //depot/projects/arm/src/sys/doc/subsys/notreviewed.dox#1 branch .. //depot/projects/arm/src/sys/fs/nullfs/null_vfsops.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#12 integrate .. //depot/projects/arm/src/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/arm/src/sys/i386/include/npx.h#3 integrate .. //depot/projects/arm/src/sys/i386/isa/npx.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#16 integrate .. //depot/projects/arm/src/sys/kern/subr_disk.c#4 integrate .. //depot/projects/arm/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/arm/src/sys/kern/vnode_if.src#5 integrate .. //depot/projects/arm/src/sys/modules/acpi/acpi/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/acpi/acpi_video/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/cpufreq/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/fdc/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/mfi/Makefile#3 integrate .. //depot/projects/arm/src/sys/net/bpf.c#7 integrate .. //depot/projects/arm/src/sys/net/bpf_filter.c#4 integrate .. //depot/projects/arm/src/sys/net/if_tap.c#5 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/arm/src/sys/pci/agp_amd64.c#5 integrate .. //depot/projects/arm/src/sys/pci/agp_sis.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/include/pmap.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/arm/src/sys/tools/vnode_if.awk#5 integrate .. //depot/projects/arm/src/sys/vm/vm_extern.h#4 integrate .. //depot/projects/arm/src/sys/vm/vm_glue.c#4 integrate .. //depot/projects/arm/src/sys/vm/vm_map.c#7 integrate .. //depot/projects/arm/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/arm/src/sys/vm/vm_meter.c#3 integrate Differences ... ==== //depot/projects/arm/src/sys/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.35 2006/03/17 18:54:34 ru Exp $ +# $FreeBSD: src/sys/Makefile,v 1.36 2006/05/29 19:29:41 maxim Exp $ .include @@ -11,10 +11,10 @@ # Directories to include in cscope name file and TAGS. CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ - isofs kern libkern modules net netatalk netatm netgraph \ - netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ - nfsclient nfs4client rpc pccard pci posix4 sys ufs vm \ - ${ARCHDIR} + isofs kern libkern modules net net80211 netatalk netatm \ + netgraph netinet netinet6 netipx netkey netnatm netncp \ + netsmb nfs nfsclient nfs4client rpc pccard pci posix4 sys \ + ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.74 2006/05/03 04:14:17 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.75 2006/05/28 18:31:32 silby Exp $"); #include #include @@ -492,7 +492,16 @@ } } + /* + * XXX: + * (dmat->alignment < dmat->maxsize) is just a quick hack; the exact + * alignment guarantees of malloc need to be nailed down, and the + * code below should be rewritten to take that into account. + * + * In the meantime, we'll panic if malloc gets it wrong. + */ if ((dmat->maxsize <= PAGE_SIZE) && + (dmat->alignment < dmat->maxsize) && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); } else { @@ -510,6 +519,8 @@ CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); + } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { + panic("bus_dmamem_alloc failed to align memory properly."); } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); @@ -529,8 +540,9 @@ */ if (map != NULL) panic("bus_dmamem_free: Invalid map freed\n"); - if ((dmat->maxsize <= PAGE_SIZE) - && dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) + if ((dmat->maxsize <= PAGE_SIZE) && + (dmat->alignment < dmat->maxsize) && + dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem)) free(vaddr, M_DEVBUF); else { contigfree(vaddr, dmat->maxsize, M_DEVBUF); ==== //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.5 2006/01/20 00:46:44 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.6 2006/05/30 21:13:47 cognet Exp $"); #include #include #include @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -44,6 +45,24 @@ #define GZ_HEAD 0xa +#ifdef CPU_ARM7TDMI +#define cpu_idcache_wbinv_all arm7tdmi_cache_flushID +#elif defined(CPU_ARM8) +#define cpu_idcache_wbinv_all arm8_cache_purgeID +#elif defined(CPU_ARM9) +#define cpu_idcache_wbinv_all arm9_dcache_wbinv_all +#elif defined(CPU_ARM10) +#define cpu_idcache_wbinv_all arm10_idcache_wbinv_all +#elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ + defined(CPU_IXP12X0) +#define cpu_idcache_wbinv_all sa1_cache_purgeID +#elif defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) +#define cpu_idcache_wbinv_all xscale_cache_purgeID +#endif +int arm_pdcache_line_size = 32; +int block_userspace_access = 0; + static __inline void * memcpy(void *dst, const void *src, int len) { @@ -160,7 +179,7 @@ static int input(void *dummy) { - if ((size_t)(i_input - orig_input) >= KERNSIZE) { + if ((size_t)(i_input - orig_input) >= KERNCOMPSIZE) { return (GZ_EOF); } return *i_input++; @@ -383,7 +402,7 @@ __start(void) { void *curaddr; - void *dst; + void *dst, *altdst; char *kernel = (char *)&kernel_start; __asm __volatile("mov %0, pc" : @@ -393,11 +412,22 @@ if (*kernel == 0x1f && kernel[1] == 0x8b) { int pt_addr = (((int)&_end + KERNSIZE + 0x100) & ~(L1_TABLE_SIZE - 1)) + L1_TABLE_SIZE; + setup_pagetables(pt_addr, (vm_paddr_t)curaddr, (vm_paddr_t)curaddr + 0x10000000); /* Gzipped kernel */ dst = inflate_kernel(kernel, &_end); kernel = (char *)&_end; + altdst = 4 + load_kernel((unsigned int)kernel, + (unsigned int)curaddr, + (unsigned int)&func_end , 0); + if (altdst > dst) + dst = altdst; + cpu_idcache_wbinv_all(); + __asm __volatile("mrc p15, 0, %0, c1, c0, 0\n" + "bic %0, %0, #1\n" /* MMU_ENABLE */ + "mcr p15, 0, %0, c1, c0, 0\n" + : "=r" (pt_addr)); } else #endif dst = 4 + load_kernel((unsigned int)&kernel_start, ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#16 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.47 2006/04/22 22:51:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.49 2006/05/30 16:55:38 cognet Exp $"); #include #include #include @@ -3073,6 +3073,7 @@ if (!pmap_get_pde_pte(pmap, addr, &pde, &pte)) return (FALSE); + KASSERT(pte != NULL, ("Valid mapping but no pte ?")); if (*pte == 0) return (TRUE); return (FALSE); @@ -4480,7 +4481,7 @@ pa += PAGE_SIZE; } - return ((void *)(va)); + return ((void *)(va + offset)); } #define BOOTSTRAP_DEBUG ==== //depot/projects/arm/src/sys/arm/sa11x0/assabet_machdep.c#4 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.13 2006/05/26 01:41:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.15 2006/05/30 15:47:55 cognet Exp $"); #include "opt_md.h" @@ -221,6 +221,7 @@ vm_size_t pt_size; int i = 0; uint32_t fake_preload[35]; + uint32_t memsize = 32 * 1024 * 1024; boothowto = RB_VERBOSE | RB_SINGLE; cninit(); @@ -257,7 +258,7 @@ fake_preload[i] = 0; preload_metadata = (void *)fake_preload; - physmem =( 16 * 1024 * 1024) / PAGE_SIZE; + physmem = memsize / PAGE_SIZE; pc = &__pcpu; pcpu_init(pc, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); @@ -405,7 +406,7 @@ * After booting there are no gross reloations of the kernel thus * this problem will not occur after initarm(). */ -/* cpu_idcache_wbinv_all();*/ + cpu_idcache_wbinv_all(); bootverbose = 1; @@ -444,7 +445,7 @@ init_param1(); init_param2(physmem); kdb_init(); - avail_end = 0xc0000000 + 0x02000000 - 1; + avail_end = 0xc0000000 + memsize - 1; return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } ==== //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_var.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/sa11x0/sa11x0_var.h,v 1.2 2005/09/25 21:06:50 cognet Exp $ + * $FreeBSD: src/sys/arm/sa11x0/sa11x0_var.h,v 1.3 2006/05/29 19:32:32 cognet Exp $ * */ @@ -64,15 +64,6 @@ typedef void *sa11x0_chipset_tag_t; extern struct bus_space sa11x0_bs_tag; -struct sa11x0_attach_args { - sa11x0_chipset_tag_t sa_sc; - bus_space_tag_t sa_iot; /* Bus tag */ - bus_addr_t sa_addr; /* i/o address */ - bus_size_t sa_size; - - int sa_intr; - int sa_gpio; -}; void *sa11x0_intr_establish(sa11x0_chipset_tag_t, int, int, int, int (*)(void *), void *); ==== //depot/projects/arm/src/sys/cam/cam_xpt.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.158 2006/01/20 19:21:38 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.159 2006/05/30 22:44:00 mjacob Exp $"); #include #include @@ -3502,8 +3502,7 @@ if ((crs->release_flags & RELSIM_ADJUST_OPENINGS) != 0) { - if ((dev->inq_data.flags & SID_CmdQue) != 0) { - + if (INQ_DATA_TQ_ENABLED(&dev->inq_data)) { /* Don't ever go below one opening */ if (crs->openings > 0) { xpt_dev_ccbq_resize(crs->ccb_h.path, @@ -5991,7 +5990,7 @@ #ifdef CAM_NEW_TRAN_CODE xpt_devise_transport(path); #endif /* CAM_NEW_TRAN_CODE */ - if ((inq_buf->flags & SID_CmdQue) != 0) + if (INQ_DATA_TQ_ENABLED(inq_buf)) softc->action = PROBE_MODE_SENSE; else softc->action = PROBE_SERIAL_NUM; @@ -6416,7 +6415,7 @@ /* SCSI specific sanity checking */ if ((cpi.hba_inquiry & PI_TAG_ABLE) == 0 - || (inq_data->flags & SID_CmdQue) == 0 + || (INQ_DATA_TQ_ENABLED(inq_data)) == 0 || (device->queue_flags & SCP_QUEUE_DQUE) != 0 || (device->quirk->mintags == 0)) { /* @@ -6712,7 +6711,7 @@ } if ((cpi.hba_inquiry & PI_TAG_ABLE) == 0 - || (inq_data->flags & SID_CmdQue) == 0 + || (INQ_DATA_TQ_ENABLED(inq_data)) == 0 || (device->queue_flags & SCP_QUEUE_DQUE) != 0 || (device->quirk->mintags == 0)) { /* ==== //depot/projects/arm/src/sys/cam/scsi/scsi_all.h#2 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.24 2005/01/05 22:34:34 imp Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.25 2006/05/30 22:44:00 mjacob Exp $ */ /* @@ -599,7 +599,19 @@ #define SID_AENC 0x80 #define SID_TrmIOP 0x40 u_int8_t additional_length; - u_int8_t reserved[2]; + u_int8_t reserved; + u_int8_t spc2_flags; +#define SPC2_SID_MChngr 0x08 +#define SPC2_SID_MultiP 0x10 +#define SPC2_SID_EncServ 0x40 +#define SPC2_SID_BQueue 0x80 + +#define INQ_DATA_TQ_ENABLED(iqd) \ + ((SID_ANSI_REV(iqd) < SCSI_REV_SPC2)? ((iqd)->flags & SID_CmdQue) : \ + (((iqd)->flags & SID_CmdQue) && !((iqd)->spc2_flags & SPC2_SID_BQueue)) || \ + (!((iqd)->flags & SID_CmdQue) && ((iqd)->spc2_flags & SPC2_SID_BQueue))) + + u_int8_t flags; #define SID_SftRe 0x01 #define SID_CmdQue 0x02 ==== //depot/projects/arm/src/sys/conf/Makefile.arm#11 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.26 2006/03/27 00:32:46 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.27 2006/05/30 21:13:47 cognet Exp $ # # Makefile for FreeBSD # @@ -59,6 +59,10 @@ ${KERNEL_KO}.bin; \ rm ${FULLKERNEL}.noheader +FILES_CPU_FUNC = $S/$M/$M/cpufunc_asm_arm7tdmi.S \ + $S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \ + $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ + $S/$M/$M/cpufunc_asm_xscale.S trampoline: ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp: ${KERNEL_KO} echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h @@ -85,10 +89,10 @@ ${CC} -O2 -DKZIP -I. -c $S/kern/inflate.c -o inflate-tramp.o ${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp \ -DKZIP $S/$M/$M/elf_trampoline.c inflate-tramp.o $S/$M/$M/inckern.S \ - -o ${KERNEL_KO}.gz.tramp + ${FILES_CPU_FUNC} -o ${KERNEL_KO}.gz.tramp ${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \ -DKZIP $S/$M/$M/elf_trampoline.c inflate-tramp.o $S/$M/$M/inckern.S \ - -o ${KERNEL_KO}.tramp.noheader + ${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp.noheader ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \ ${KERNEL_KO}.gz.tramp.bin rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \ ==== //depot/projects/arm/src/sys/conf/kern.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.47 2006/05/11 22:25:26 jhb Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.48 2006/05/30 19:18:01 ru Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -12,7 +12,10 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - -fformat-extensions -std=c99 + ${_wundef} -fformat-extensions -std=c99 +.if !defined(NO_UNDEF) +_wundef= -Wundef +.endif .endif # # The following flags are next up for working on: ==== //depot/projects/arm/src/sys/dev/bfe/if_bfe.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.38 2006/05/16 14:36:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.40 2006/05/28 20:35:39 silby Exp $"); #include #include @@ -201,7 +201,7 @@ * greater than 1GB. */ error = bus_dma_tag_create(NULL, /* parent */ - PAGE_SIZE, 0, /* alignment, boundary */ + 4096, 0, /* alignment, boundary */ 0x3FFFFFFF, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ @@ -214,7 +214,7 @@ /* tag for TX ring */ error = bus_dma_tag_create(sc->bfe_parent_tag, - 1, 0, + 4096, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, @@ -232,7 +232,7 @@ /* tag for RX ring */ error = bus_dma_tag_create(sc->bfe_parent_tag, - 1, 0, + 4096, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, @@ -1212,6 +1212,21 @@ } if(istat & BFE_ISTAT_ERRORS) { + + if (istat & BFE_ISTAT_DSCE) { + printf("if_bfe Descriptor Error\n"); + bfe_stop(sc); + BFE_UNLOCK(sc); + return; + } + + if (istat & BFE_ISTAT_DPE) { + printf("if_bfe Descriptor Protocol Error\n"); + bfe_stop(sc); + BFE_UNLOCK(sc); + return; + } + flag = CSR_READ_4(sc, BFE_DMATX_STAT); if(flag & BFE_STAT_EMASK) ifp->if_oerrors++; ==== //depot/projects/arm/src/sys/dev/bfe/if_bfereg.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/dev/bfe/if_bfereg.h,v 1.9 2006/05/11 17:39:06 silby Exp $ */ +/* $FreeBSD: src/sys/dev/bfe/if_bfereg.h,v 1.10 2006/05/28 18:44:39 silby Exp $ */ #ifndef _BFE_H #define _BFE_H @@ -427,8 +427,8 @@ #define BFE_RX_RING_SIZE 512 #define BFE_TX_RING_SIZE 512 #define BFE_LINK_DOWN 5 -#define BFE_TX_LIST_CNT 511 -#define BFE_RX_LIST_CNT 511 +#define BFE_TX_LIST_CNT 128 +#define BFE_RX_LIST_CNT 128 #define BFE_TX_LIST_SIZE BFE_TX_LIST_CNT * sizeof(struct bfe_desc) #define BFE_RX_LIST_SIZE BFE_RX_LIST_CNT * sizeof(struct bfe_desc) #define BFE_RX_OFFSET 30 ==== //depot/projects/arm/src/sys/dev/ciss/ciss.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.70 2006/05/16 14:36:23 phk Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.71 2006/05/30 06:42:02 ps Exp $ */ /* @@ -2261,8 +2261,8 @@ /* * Get a request. */ - if ((error = ciss_get_request(sc, &cr)) != 0) - goto out; + while (ciss_get_request(sc, &cr) != 0) + tsleep(sc, PPAUSE, "cissREQ", hz); cc = CISS_FIND_COMMAND(cr); /* ==== //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.116 2006/05/22 07:07:30 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.117 2006/05/30 17:43:04 mjacob Exp $"); #include #include @@ -1899,7 +1899,7 @@ inot->message_args[0] = MSG_ABORT_TAG; inot->message_args[1] = inp->in_seqid & 0xff; inot->message_args[2] = (inp->in_seqid >> 8) & 0xff; - inot->ccb_h.status = CAM_MESSAGE_RECV|CAM_DEV_QFRZN; + inot->ccb_h.status = CAM_MESSAGE_RECV; xpt_done((union ccb *)inot); } break; ==== //depot/projects/arm/src/sys/dev/mpt/mpt.c#13 (text+ko) ==== @@ -57,6 +57,10 @@ * * Support from Chris Ellsworth in order to make SAS adapters work * is gratefully acknowledged. + * + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. */ /*- * Copyright (c) 2004, Avid Technology, Inc. and its contributors. @@ -92,7 +96,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.29 2006/05/27 17:26:57 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.30 2006/05/29 20:34:28 mjacob Exp $"); #include #include /* XXX For static handler registration */ ==== //depot/projects/arm/src/sys/dev/mpt/mpt.h#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.20 2006/05/27 17:26:57 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.22 2006/05/29 20:34:28 mjacob Exp $ */ /*- * Generic defines for LSI '909 FC adapters. * FreeBSD Version. @@ -58,6 +58,10 @@ * * Support from Chris Ellsworth in order to make SAS adapters work * is gratefully acknowledged. + * + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. */ /* * Copyright (c) 2004, Avid Technology, Inc. and its contributors. @@ -942,6 +946,7 @@ MPT_PRT_ERROR, MPT_PRT_WARN, MPT_PRT_INFO, + MPT_PRT_NEGOTIATION, MPT_PRT_DEBUG, MPT_PRT_DEBUG1, MPT_PRT_DEBUG2, ==== //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#15 (text+ko) ==== @@ -57,6 +57,9 @@ * * Support from Chris Ellsworth in order to make SAS adapters work * is gratefully acknowledged. + * + * Support from LSI-Logic has also gone a great deal toward making this a + * workable subsystem and is gratefully acknowledged. */ /*- * Copyright (c) 2004, Avid Technology, Inc. and its contributors. @@ -91,7 +94,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.19 2006/05/27 17:26:57 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.21 2006/05/29 20:34:28 mjacob Exp $"); #include #include @@ -647,7 +650,7 @@ static int mpt_set_initial_config_spi(struct mpt_softc *mpt) { - int i, pp1val = ((1 << mpt->mpt_ini_id) << 16) | mpt->mpt_ini_id; + int i, j, pp1val = ((1 << mpt->mpt_ini_id) << 16) | mpt->mpt_ini_id; int error; mpt->mpt_disc_enable = 0xff; @@ -682,12 +685,17 @@ * The purpose of this exercise is to get * all targets back to async/narrow. * - * We skip this if the BIOS has already negotiated speeds with targets. + * We skip this step if the BIOS has already negotiated + * speeds with the targets and does not require us to + * do Domain Validation. */ i = mpt->mpt_port_page2.PortSettings & MPI_SCSIPORTPAGE2_PORT_MASK_NEGO_MASTER_SETTINGS; - if (i == MPI_SCSIPORTPAGE2_PORT_ALL_MASTER_SETTINGS) { - mpt_lprt(mpt, /* MPT_PRT_INFO */ MPT_PRT_ALWAYS, + j = mpt->mpt_port_page2.PortFlags & + MPI_SCSIPORTPAGE2_PORT_FLAGS_DV_MASK; + if (i == MPI_SCSIPORTPAGE2_PORT_ALL_MASTER_SETTINGS && + j == MPI_SCSIPORTPAGE2_PORT_FLAGS_OFF_DV) { + mpt_lprt(mpt, MPT_PRT_NEGOTIATION, "honoring BIOS transfer negotiations\n"); return (0); } @@ -2782,7 +2790,7 @@ uint8_t dval; u_int period; u_int offset; - int m; + int i, j; cts = &ccb->cts; if (!IS_CURRENT_SETTINGS(cts)) { @@ -2790,27 +2798,37 @@ mpt_set_ccb_status(ccb, CAM_REQ_INVALID); break; } + if (mpt->is_fc || mpt->is_sas) { mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; } - if (mpt->ioc_page2 && mpt->ioc_page2->MaxPhysDisks != 0 && - raid_passthru == 0) { + /* + * Skip attempting settings on RAID volume disks. + * Other devices on the bus get the normal treatment. + */ + if (mpt->phydisk_sim && raid_passthru == 0 && + mpt_is_raid_volume(mpt, tgt) != 0) { + mpt_lprt(mpt, MPT_PRT_ALWAYS, + "skipping transfer settings for RAID volumes\n"); mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; } - m = mpt->mpt_port_page2.PortSettings; - if ((m & MPI_SCSIPORTPAGE2_PORT_MASK_NEGO_MASTER_SETTINGS) == - MPI_SCSIPORTPAGE2_PORT_ALL_MASTER_SETTINGS) { -mpt_prt(mpt, "master settings\n"); -if (raid_passthru == 0) { + i = mpt->mpt_port_page2.PortSettings & + MPI_SCSIPORTPAGE2_PORT_MASK_NEGO_MASTER_SETTINGS; + j = mpt->mpt_port_page2.PortFlags & + MPI_SCSIPORTPAGE2_PORT_FLAGS_DV_MASK; + if (i == MPI_SCSIPORTPAGE2_PORT_ALL_MASTER_SETTINGS && + j == MPI_SCSIPORTPAGE2_PORT_FLAGS_OFF_DV) { + mpt_lprt(mpt, MPT_PRT_ALWAYS, + "honoring BIOS transfer negotiations\n"); mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; -} } + dval = 0; period = 0; offset = 0; @@ -2846,24 +2864,27 @@ spi = &cts->xport_specific.spi; if ((spi->valid & CTS_SPI_VALID_DISC) != 0) { - if ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) != 0) + if ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) != 0) { dval |= DP_DISC_ENABLE; - else + } else { dval |= DP_DISC_DISABL; + } } if ((scsi->valid & CTS_SCSI_VALID_TQ) != 0) { - if ((scsi->flags & CTS_SCSI_FLAGS_TAG_ENB) != 0) + if ((scsi->flags & CTS_SCSI_FLAGS_TAG_ENB) != 0) { dval |= DP_TQING_ENABLE; - else + } else { dval |= DP_TQING_DISABL; + } } if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0) { - if (spi->bus_width == MSG_EXT_WDTR_BUS_16_BIT) + if (spi->bus_width == MSG_EXT_WDTR_BUS_16_BIT) { dval |= DP_WIDE; - else + } else { dval |= DP_NARROW; + } } if ((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) && @@ -2874,6 +2895,9 @@ offset = spi->sync_offset; } #endif + mpt_lprt(mpt, MPT_PRT_NEGOTIATION, + "mpt_action: SET tgt %d flags %x period %x off %x\n", + tgt, dval, period, offset); CAMLOCK_2_MPTLOCK(mpt); if (dval & DP_DISC_ENABLE) { mpt->mpt_disc_enable |= (1 << tgt); @@ -2891,10 +2915,12 @@ if (dval & DP_SYNC) { mpt_setsync(mpt, tgt, period, offset); } + if (mpt_update_spi_config(mpt, tgt)) { + MPTLOCK_2_CAMLOCK(mpt); + mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR); + break; + } MPTLOCK_2_CAMLOCK(mpt); - mpt_lprt(mpt, MPT_PRT_DEBUG, - "SET tgt %d flags %x period %x off %x\n", - tgt, dval, period, offset); mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; } @@ -2952,11 +2978,9 @@ sas->valid = CTS_SAS_VALID_SPEED; sas->bitrate = 300000; /* XXX: Default 3Gbps */ #endif - } else { - if (mpt_get_spi_settings(mpt, cts) != 0) { - mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR); - break; - } + } else if (mpt_get_spi_settings(mpt, cts) != 0) { + mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR); + break; } mpt_set_ccb_status(ccb, CAM_REQ_CMP); break; @@ -3005,10 +3029,17 @@ cpi->base_transfer_speed = 3300; cpi->hba_inquiry = PI_SDTR_ABLE|PI_TAG_ABLE|PI_WIDE_16; } + + /* + * We give our fake RAID passhtru bus a width that is MaxVolumes + * wide, restrict it to one lun and have it *not* be a bus + * that can have a SCSI bus reset. + */ if (raid_passthru) { + cpi->max_target = mpt->ioc_page2->MaxPhysDisks - 1; + cpi->initiator_id = cpi->max_target+1; cpi->max_lun = 0; cpi->hba_misc = PIM_NOBUSRESET; - cpi->initiator_id = cpi->max_target+1; } if ((mpt->role & MPT_ROLE_INITIATOR) == 0) { @@ -3109,30 +3140,12 @@ uint8_t dval, pval, oval; int rv; - /* - * Check to see if this is an Integrated Raid card. - * - * If it is, and we're the RAID bus side, both current - * and goal settings are synthesized as we only look at - * or change actual settings for the physical disk side. - * - * NB: In the future we can just do this on the blacked out - * NB: portion that the RAID volume covers- there may be - * NB: other entities on this bus as well. - */ - - if (mpt->phydisk_sim) { - if (xpt_path_sim(cts->ccb_h.path) != mpt->phydisk_sim) { - dval = DP_WIDE|DP_DISC|DP_TQING; - oval = (mpt->mpt_port_page0.Capabilities >> 16); - pval = (mpt->mpt_port_page0.Capabilities >> 8); - tgt = cts->ccb_h.target_id; - goto skip; + if (xpt_path_sim(cts->ccb_h.path) == mpt->phydisk_sim) { + if (mpt_map_physdisk(mpt, (union ccb *)cts, &tgt)) { + return (-1); } - } - - if (mpt_map_physdisk(mpt, (union ccb *)cts, &tgt) != 0) { - return (-1); + } else { + tgt = cts->ccb_h.target_id; } /* @@ -3156,10 +3169,6 @@ return (rv); } MPTLOCK_2_CAMLOCK(mpt); - - mpt_lprt(mpt, MPT_PRT_DEBUG, - "mpt_get_spi: SPI Tgt %d Page 0: NParms %x Info %x\n", - tgt, tmp.NegotiatedParameters, tmp.Information); if (tmp.NegotiatedParameters & MPI_SCSIDEVPAGE0_NP_WIDE) { dval |= DP_WIDE; } @@ -3181,7 +3190,6 @@ oval = (mpt->mpt_port_page0.Capabilities >> 16); pval = (mpt->mpt_port_page0.Capabilities >> 8); } - skip: #ifndef CAM_NEW_TRAN_CODE cts->flags &= ~(CCB_TRANS_DISC_ENB|CCB_TRANS_TAG_ENB); if (dval & DP_DISC_ENABLE) { @@ -3236,9 +3244,9 @@ scsi->valid = 0; } #endif - mpt_lprt(mpt, MPT_PRT_DEBUG, - "mpt_get_spi: tgt %d %s settings flags %x period %x offset %x\n", - tgt, IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM", + mpt_lprt(mpt, MPT_PRT_NEGOTIATION, + "mpt_get_spi_settings: tgt %d %s settings flags 0x%x period 0x%x " + "offset %x\n", tgt, IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM ", dval, pval, oval); return (0); } @@ -3246,27 +3254,27 @@ static void mpt_setwidth(struct mpt_softc *mpt, int tgt, int onoff) { - PTR_CONFIG_PAGE_SCSI_DEVICE_1 tmp; + PTR_CONFIG_PAGE_SCSI_DEVICE_1 ptr; - tmp = &mpt->mpt_dev_page1[tgt]; + ptr = &mpt->mpt_dev_page1[tgt]; if (onoff) { - tmp->RequestedParameters |= MPI_SCSIDEVPAGE1_RP_WIDE; + ptr->RequestedParameters |= MPI_SCSIDEVPAGE1_RP_WIDE; } else { - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_WIDE; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_WIDE; } } static void mpt_setsync(struct mpt_softc *mpt, int tgt, int period, int offset) { - PTR_CONFIG_PAGE_SCSI_DEVICE_1 tmp; + PTR_CONFIG_PAGE_SCSI_DEVICE_1 ptr; - tmp = &mpt->mpt_dev_page1[tgt]; - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_MIN_SYNC_PERIOD_MASK; - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_MAX_SYNC_OFFSET_MASK; - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_DT; - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_QAS; - tmp->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_IU; + ptr = &mpt->mpt_dev_page1[tgt]; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_MIN_SYNC_PERIOD_MASK; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_MAX_SYNC_OFFSET_MASK; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_DT; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_QAS; + ptr->RequestedParameters &= ~MPI_SCSIDEVPAGE1_RP_IU; /* * XXX: For now, we're ignoring specific settings @@ -3284,7 +3292,7 @@ np |= MPI_SCSIDEVPAGE1_RP_DT; } np |= (factor << 8) | (offset << 16); - tmp->RequestedParameters |= np; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 31 00:04:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9F1816B267; Wed, 31 May 2006 00:04:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4996816B257 for ; Wed, 31 May 2006 00:04:11 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4740143D6D for ; Wed, 31 May 2006 00:04:03 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V02iS2092557 for ; Wed, 31 May 2006 00:02:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V02h4j092554 for perforce@freebsd.org; Wed, 31 May 2006 00:02:43 GMT (envelope-from imp@freebsd.org) Date: Wed, 31 May 2006 00:02:43 GMT Message-Id: <200605310002.k4V02h4j092554@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 98173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 00:04:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=98173 Change 98173 by imp@imp_lighthouse on 2006/05/31 00:02:15 Start to stub out the sdhc bridge driver. So far it is code I've written for FreeBSD + OpenBSD's register definitions. I'm unsure how much of their code I can use and how much I'll have to write on my own to make it a FreeBSD driver. At least there's no reason to use gratuitously different register definitions :-) Affected files ... .. //depot/projects/arm/src/sys/dev/sdhc/sdhc_pci.c#1 add .. //depot/projects/arm/src/sys/dev/sdhc/sdhcreg.h#1 add .. //depot/projects/arm/src/sys/dev/sdhc/sdhcvar.h#1 add .. //depot/projects/arm/src/sys/modules/sdhc/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 31 01:00:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 021E116A7AD; Wed, 31 May 2006 01:00:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 704CB16A768 for ; Wed, 31 May 2006 01:00:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11F7243D48 for ; Wed, 31 May 2006 01:00:16 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V0wuxF004924 for ; Wed, 31 May 2006 00:58:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V0wuV4004921 for perforce@freebsd.org; Wed, 31 May 2006 00:58:56 GMT (envelope-from jb@freebsd.org) Date: Wed, 31 May 2006 00:58:56 GMT Message-Id: <200605310058.k4V0wuV4004921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 01:00:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=98178 Change 98178 by jb@jb_freebsd2 on 2006/05/31 00:57:59 Ensure that building with NO_CDDL really does work (on FreeBSD-6). Affected files ... .. //depot/projects/dtrace/src/Makefile.inc1#9 edit Differences ... ==== //depot/projects/dtrace/src/Makefile.inc1#9 (text+ko) ==== @@ -199,7 +199,7 @@ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \ - -DNO_WARNS + -DNO_WARNS -DNO_CTF # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -211,6 +211,9 @@ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} +.if defined(NO_CDDL) || defined(NO_CTF) +WMAKEENV+= NO_CTF=1 +.endif WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" From owner-p4-projects@FreeBSD.ORG Wed May 31 02:37:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 436B116A8B5; Wed, 31 May 2006 02:37:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 026DC16A81E for ; Wed, 31 May 2006 02:37:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B17743D53 for ; Wed, 31 May 2006 02:37:15 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V2Ztbp013180 for ; Wed, 31 May 2006 02:35:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V2ZtNK013177 for perforce@freebsd.org; Wed, 31 May 2006 02:35:55 GMT (envelope-from jb@freebsd.org) Date: Wed, 31 May 2006 02:35:55 GMT Message-Id: <200605310235.k4V2ZtNK013177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98181 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 02:37:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=98181 Change 98181 by jb@jb_freebsd2 on 2006/05/31 02:35:25 Add the call site entry label. Affected files ... .. //depot/projects/dtrace/src/sys/i386/i386/exception.s#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/i386/i386/exception.s#4 (text+ko) ==== @@ -198,6 +198,7 @@ /* Call the registered function (dtrace_invop). */ call *dtrace_invop_func /* Call the registered function. */ +ALTENTRY(dtrace_invop_callsite) /* * Drop the arguments to dtrace_invop from the stack, leaving * the registers. From owner-p4-projects@FreeBSD.ORG Wed May 31 02:39:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B40316B138; Wed, 31 May 2006 02:39:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71A0716AE1D for ; Wed, 31 May 2006 02:39:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AA7B43D72 for ; Wed, 31 May 2006 02:39:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V2bwQN013238 for ; Wed, 31 May 2006 02:37:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V2bwv1013235 for perforce@freebsd.org; Wed, 31 May 2006 02:37:58 GMT (envelope-from jb@freebsd.org) Date: Wed, 31 May 2006 02:37:58 GMT Message-Id: <200605310237.k4V2bwv1013235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 02:39:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=98182 Change 98182 by jb@jb_freebsd2 on 2006/05/31 02:37:48 Comment out a couple off asserts on FreeBSD because the statements need non-standard functions that we can put in current's libpthread, but which cause problems upgrading from RELENG_6. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getdata.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getdata.c#3 (text) ==== @@ -127,8 +127,10 @@ Elf_Data src; unsigned work; +#if defined(sun) assert(!elf_threaded || RW_LOCK_HELD(&(scn->s_elf->ed_rwlock))); assert(!elf_threaded || MUTEX_HELD(&(scn->s_mutex))); +#endif elf = scn->s_elf; if ((scn->s_myflags & SF_READY) == 0) { From owner-p4-projects@FreeBSD.ORG Wed May 31 03:00:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AFB816A8C9; Wed, 31 May 2006 03:00:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54B5016A5F2 for ; Wed, 31 May 2006 03:00:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3A0643D5A for ; Wed, 31 May 2006 03:00:45 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V2xPT9014148 for ; Wed, 31 May 2006 02:59:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V2xPxW014145 for perforce@freebsd.org; Wed, 31 May 2006 02:59:25 GMT (envelope-from jb@freebsd.org) Date: Wed, 31 May 2006 02:59:25 GMT Message-Id: <200605310259.k4V2xPxW014145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 03:00:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=98183 Change 98183 by jb@jb_freebsd2 on 2006/05/31 02:59:21 Adjust some include paths. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#3 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#3 edit .. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#7 edit .. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#3 (text+ko) ==== @@ -27,8 +27,7 @@ WARNS?= 1 -CFLAGS+= -I${.CURDIR}/../../.. \ - -I${.CURDIR}/../../../contrib/libdwarf \ +CFLAGS+= -I${.CURDIR}/../../../contrib/libdwarf \ -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../../sys/contrib \ -I${OPENSOLARIS_USR_DISTDIR} \ ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#3 (text+ko) ==== @@ -24,8 +24,7 @@ WARNS?= 1 -CFLAGS+= -I${.CURDIR}/../../.. \ - -I${.CURDIR}/../../../contrib/libdwarf \ +CFLAGS+= -I${.CURDIR}/../../../contrib/libdwarf \ -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../../sys/contrib \ -I${OPENSOLARIS_USR_DISTDIR} \ ==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#7 (text+ko) ==== @@ -10,8 +10,7 @@ WARNS?= 1 -CFLAGS+= -I${.CURDIR}/../../.. \ - -I${.CURDIR}/../../../contrib \ +CFLAGS+= -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../../sys/contrib \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \ ==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#4 (text+ko) ==== @@ -12,7 +12,6 @@ CFLAGS+= -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../../sys/contrib \ - -I${.CURDIR}/../../../sys \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ From owner-p4-projects@FreeBSD.ORG Wed May 31 03:59:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCC4416A8D5; Wed, 31 May 2006 03:59:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A503816A8AE for ; Wed, 31 May 2006 03:59:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 763B143D69 for ; Wed, 31 May 2006 03:58:57 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V3vbo3019415 for ; Wed, 31 May 2006 03:57:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V3va5x019412 for perforce@freebsd.org; Wed, 31 May 2006 03:57:36 GMT (envelope-from jb@freebsd.org) Date: Wed, 31 May 2006 03:57:36 GMT Message-Id: <200605310357.k4V3va5x019412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98184 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 03:59:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=98184 Change 98184 by jb@jb_freebsd2 on 2006/05/31 03:57:04 This is the 'Function Boundary Tracing' (FBT) provider. There are currently a few issues here. There are a few kernel function being called from DTrace's probe context that DTrace needs it's own version of so that they won't be instrumented here causing a kernel kaboom (TM). I've also got the return probes commented out while I'm investigating an occasional problem with the return instrumentation taking execution off into outer space where the kaboom tribe lives. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/fbt/fbt.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 31 04:01:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B76C616A920; Wed, 31 May 2006 04:01:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D5E8216A873 for ; Wed, 31 May 2006 04:01:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86A6B43D46 for ; Wed, 31 May 2006 04:01:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V3xexc019530 for ; Wed, 31 May 2006 03:59:40 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V3xecw019527 for perforce@freebsd.org; Wed, 31 May 2006 03:59:40 GMT (envelope-from jb@freebsd.org) Date: Wed, 31 May 2006 03:59:40 GMT Message-Id: <200605310359.k4V3xecw019527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 04:01:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=98185 Change 98185 by jb@jb_freebsd2 on 2006/05/31 03:58:59 Some additional i386 specific code. This enables part of the toxic ranges - the bit the prevents DTrace loading from user space without a copyin. The other part of toxic ranges is a bit more difficult to do and I think I'll ask for help to do that. Stay tuned. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 31 04:56:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BCEC16A551; Wed, 31 May 2006 04:56:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 14BFD16A50E for ; Wed, 31 May 2006 04:56:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B019043D46 for ; Wed, 31 May 2006 04:56:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V4spI6030870 for ; Wed, 31 May 2006 04:54:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V4sm2D030867 for perforce@freebsd.org; Wed, 31 May 2006 04:54:48 GMT (envelope-from jb@freebsd.org) Date: Wed, 31 May 2006 04:54:48 GMT Message-Id: <200605310454.k4V4sm2D030867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 04:56:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=98186 Change 98186 by jb@jb_freebsd2 on 2006/05/31 04:54:13 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#6 integrate .. //depot/projects/dtrace/doc/release/Makefile#2 integrate .. //depot/projects/dtrace/doc/share/sgml/mirrors.xml#2 integrate .. //depot/projects/dtrace/doc/share/sgml/urls.ent#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/mk/doc.local.mk#3 integrate .. //depot/projects/dtrace/src/MAINTAINERS#4 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/dtrace/src/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#9 integrate .. //depot/projects/dtrace/src/etc/netstart#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/jail#3 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/dtrace/src/lib/libc/gen/signal.3#2 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 integrate .. //depot/projects/dtrace/src/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/dtrace/src/share/man/man4/sio.4#2 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/dtrace/src/sys/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/dtrace/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/dtrace/src/sys/conf/files#15 integrate .. //depot/projects/dtrace/src/sys/conf/kern.mk#3 integrate .. //depot/projects/dtrace/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/dtrace/src/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/sound/midi/midi.c#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/midi.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/midiq.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/mpu401.c#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/mpu401.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/mpu_if.m#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/mpufoi_if.m#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/sequencer.c#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/sequencer.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/midi/synth_if.m#1 branch .. //depot/projects/dtrace/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ohcireg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ohcivar.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/sl811hsvar.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhcivar.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-cam#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-crypto#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_pci#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_sound#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-dev_usb#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-geom#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-i4b#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-kern#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-libkern#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-linux#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-net80211#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netgraph#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netinet#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netinet6#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-netipsec#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-opencrypto#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Doxyfile-vm#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/doc/subsys/notreviewed.dox#1 branch .. //depot/projects/dtrace/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/include/md_var.h#3 integrate .. //depot/projects/dtrace/src/sys/i386/include/npx.h#2 integrate .. //depot/projects/dtrace/src/sys/i386/isa/npx.c#4 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/subr_disk.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/fdc/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/mfi/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/sound/driver/cmi/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/sound/driver/emu10k1/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/net/bpf.c#3 integrate .. //depot/projects/dtrace/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/dtrace/src/sys/net/if_tap.c#3 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/dtrace/src/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/dtrace/src/sys/pci/agp_sis.c#2 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/dtrace/src/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/dtrace/src/sys/vm/vm_extern.h#2 integrate .. //depot/projects/dtrace/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/dtrace/src/sys/vm/vm_map.c#2 integrate .. //depot/projects/dtrace/src/sys/vm/vm_map.h#2 integrate .. //depot/projects/dtrace/src/sys/vm/vm_meter.c#2 integrate .. //depot/projects/dtrace/src/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate .. //depot/projects/dtrace/src/tools/regression/sockets/unix_cmsg/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_cmsg/README#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_cmsg/unix_cmsg.c#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_cmsg/unix_cmsg.t#1 branch .. //depot/projects/dtrace/src/tools/tools/README#2 integrate .. //depot/projects/dtrace/src/tools/tools/recoverdisk/Makefile#3 integrate .. //depot/projects/dtrace/src/tools/tools/recoverdisk/recoverdisk.c#3 integrate .. //depot/projects/dtrace/src/tools/tools/tinderbox/.cvsignore#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/Makefile#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/Makefile#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/default.rc#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/head.rc#3 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/releng_4.rc#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/releng_5.rc#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/releng_6.rc#3 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/update_head.rc#3 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/update_releng_4.rc#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/update_releng_5.rc#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/etc/update_releng_6.rc#3 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/powerpc.diff#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/tbmaster.1#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/tbmaster.pl#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/tinderbox.1#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/tinderbox.pl#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/.cvsignore#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/Makefile#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/daemon.png.uu#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/index.cgi#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/tb.css#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/valid-css.png.uu#2 delete .. //depot/projects/dtrace/src/tools/tools/tinderbox/www/valid-xhtml10.png.uu#2 delete .. //depot/projects/dtrace/src/usr.bin/calendar/day.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/file/magic.5#2 integrate .. //depot/projects/dtrace/src/usr.bin/find/find.1#2 integrate .. //depot/projects/dtrace/src/usr.bin/find/function.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/id/id.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/sed/process.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/jail/jail.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/portsnap/portsnap/portsnap.sh#4 integrate .. //depot/projects/dtrace/src/usr.sbin/wpa/hostapd/driver_freebsd.c#2 integrate .. //depot/projects/dtrace/www/en/docproj/todo.sgml#4 integrate .. //depot/projects/dtrace/www/en/docs/books.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/example-Makefile.sgml#3 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq214.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/gnome1_porting.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/gnome2_porting.sgml#3 integrate .. //depot/projects/dtrace/www/en/gnome/docs/gnome_porting.sgml#4 integrate .. //depot/projects/dtrace/www/en/gnome/docs/porting.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/gnomelogalyzer.sh#2 integrate .. //depot/projects/dtrace/www/en/gnome/includes.navgnome.sgml#3 integrate .. //depot/projects/dtrace/www/en/internal/Makefile#2 integrate .. //depot/projects/dtrace/www/en/internal/bylaws.sgml#2 integrate .. //depot/projects/dtrace/www/en/internal/machines.sgml#2 integrate .. //depot/projects/dtrace/www/en/internal/policies.sgml#2 integrate .. //depot/projects/dtrace/www/en/news/news.xml#10 integrate .. //depot/projects/dtrace/www/en/news/press.xml#4 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/errata.html#2 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#6 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#2 (text+ko) ==== @@ -19,7 +19,7 @@ The &os; Release Engineering Team - $FreeBSD: doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml,v 1.26 2005/01/22 09:47:47 simon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml,v 1.27 2006/05/30 16:41:19 bmah Exp $ 2003 @@ -36,6 +36,24 @@ &tm-attrib.opengroup; &tm-attrib.general; + + + This document is now mostly of historical value. It + presented a roadmap for the development of &os;'s &t.releng.5; + branch. It was originally written in February 2003 (between + the 5.0 and 5.1 releases), and was intended to provide a plan + for making the &t.releng.5; branch stable, both + in terms of code quality and finalization of various + APIs/ABIs. For a different perspective, the article + + Choosing the &os; Version That Is Right For You + + may be of interest. It was written in August 2005 (two and a + half years later), and contains a section discussing how these + plans and events actually unfolded, as well as some lessons + learned. + + ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#9 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + + &a.adrian; (2000 - 2006) + + + &a.vkashyap; (2004 - 2006) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/articles/nanobsd/Makefile,v 1.1 2006/05/16 13:58:44 keramida Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/articles/nanobsd/Makefile,v 1.2 2006/05/27 10:14:56 simon Exp $ # # Article: Introduction to NanoBSD @@ -11,6 +11,12 @@ INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +# Images from the cross-document image library +IMAGES_LIB= callouts/1.png +IMAGES_LIB+= callouts/2.png +IMAGES_LIB+= callouts/3.png +IMAGES_LIB+= callouts/4.png + SRCS= article.sgml URL_RELPREFIX?= ../../../.. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.28 2006/02/10 15:15:49 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ --> 2003 2004 2005 + 2006 DocEng - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.28 2006/02/10 15:15:49 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.28 2006/02/10 15:15:49 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.29 2006/05/28 17:08:45 blackend Exp $ &bookinfo.legalnotice; ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1242,8 +1242,7 @@ supported by the &man.ng.bt3c.4; driver. Serial and UART based Bluetooth devices are supported via &man.sio.4;, &man.ng.h4.4; and &man.hcseriald.8;. This section describes the use of the USB - Bluetooth dongle. Bluetooth support is available in &os; 5.0 and newer - systems. + Bluetooth dongle. @@ -1882,7 +1881,7 @@ Network Interface Card Selection A bridge requires at least two network cards to function. - Unfortunately, not all network interface cards as of FreeBSD 4.0 + Unfortunately, not all network interface cards support bridging. Read &man.bridge.4; for details on the cards that are supported. @@ -2067,7 +2066,7 @@ configuration files overridden by ones specific to diskless operation or, possibly, to the workstation they belong to. The parts of the root which have to be - writable are overlaid with &man.mfs.8; (&os; 4.X) or &man.md.4; (&os; 5.X) file systems. Any changes + writable are overlaid with &man.md.4; file systems. Any changes will be lost when the system reboots. @@ -2083,9 +2082,7 @@ All the information in this section has been tested - using &os; releases 4.9-RELEASE and 5.2.1-RELEASE. The text is - primarily structured for 4.X usage. Notes have been inserted where - appropriate to indicate 5.X changes. + using &os; 5.2.1-RELEASE. Background Information @@ -2169,14 +2166,12 @@ PXE and Etherboot - work equally well with 4.X systems. Because 5.X kernels + work equally well; however, because kernels normally let the &man.loader.8; do more work for them, - PXE is preferred for 5.X systems. + PXE is the preferred method. If your BIOS and network cards support - PXE, you should probably use it. However, - it is still possible to start a 5.X system with - Etherboot. + PXE, you should probably use it. @@ -2201,7 +2196,7 @@ The ISC DHCP server can answer both BOOTP and DHCP requests. - As of release 4.9, ISC DHCP + ISC DHCP 3.0 is not part of the base system. You will first need to install the net/isc-dhcp3-server port or the @@ -2382,15 +2377,13 @@ TFTP instead by specifying the LOADER_TFTP_SUPPORT option in /etc/make.conf. See the comments in - /etc/defaults/make.conf (or - /usr/share/examples/etc/make.conf for 5.X - systems) for instructions. + /usr/share/examples/etc/make.conf + for instructions. There are two other undocumented make.conf options which may be useful for setting up a serial console diskless machine: BOOT_PXELDR_PROBE_KEYBOARD, and - BOOT_PXELDR_ALWAYS_SERIAL (the latter only exists - on &os; 5.X). + BOOT_PXELDR_ALWAYS_SERIAL. To use PXE when the machine starts, you will usually need to select the Boot from network @@ -2434,8 +2427,10 @@ Tell inetd to reread its configuration - file: - &prompt.root; kill -HUP `cat /var/run/inetd.pid` + file. The must be in + the /etc/rc.conf file for this + command to execute correctly: + &prompt.root; /etc/rc.d/inetd restart @@ -2467,7 +2462,7 @@ file. If you actually needed to enable NFS in /etc/rc.conf at the first step, you probably want to reboot instead. - &prompt.root; kill -HUP `cat /var/run/mountd.pid` + &prompt.root; /etc/rc.d/mountd restart @@ -2492,8 +2487,7 @@ You may also want to use BOOTP_NFSV3, BOOT_COMPAT and BOOTP_WIRED_TO - (refer to LINT in 4.X or - NOTES on 5.X). + (refer to NOTES). These option names are historical and slightly misleading as they actually enable indifferent use of DHCP and @@ -2518,7 +2512,7 @@ In order to be loadable with - Etherboot, a 5.X kernel needs to have + Etherboot, a kernel needs to have the device hints compiled in. You would typically set the following option in the configuration file (see the NOTES configuration comments file): @@ -2539,46 +2533,12 @@ You need to create a root file system for the diskless workstations, in the location listed as root-path in - dhcpd.conf. The following sections describe - two ways to do it. + dhcpd.conf. - Using the <filename>clone_root</filename> Script + Using <command>make world</command> to populate root - This is the quickest way to create a root file system, but - currently it is only supported on &os; 4.X. This shell script - is located at - /usr/share/examples/diskless/clone_root - and needs customization, at least to adjust - the place where the file system will be created (the - DEST variable). - - Refer to the comments at the top of the script for - instructions. They explain how the base file system is built, - and how files may be selectively overridden by versions specific - to diskless operation, to a subnetwork, or to an individual - workstation. They also give examples for the diskless - /etc/fstab and - /etc/rc.conf files. - - The README files in - /usr/share/examples/diskless contain a lot - of interesting background information, but, together with the - other examples in the diskless directory, - they actually document a configuration method which is distinct - from the one used by clone_root and - the system startup scripts in - /etc, which is a little - confusing. Use them for reference only, except if you prefer - the method that they describe, in which case you will need - customized rc scripts. - - - - Using the Standard <command>make world</command> - Procedure - - This method can be applied to either &os; 4.X or 5.X and + This method is quick and will install a complete virgin system (not only the root file system) into DESTDIR. All you have to do is simply execute the following script: @@ -2586,7 +2546,7 @@ #!/bin/sh export DESTDIR=/data/misc/diskless mkdir -p ${DESTDIR} -cd /usr/src; make world && make kernel +cd /usr/src; make buildworld && make buildkernel cd /usr/src/etc; make distribution Once done, you may need to customize your @@ -2600,77 +2560,11 @@ Configuring Swap If needed, a swap file located on the server can be - accessed via NFS. One of the methods commonly - used to do this has been discontinued in release 5.X. + accessed via NFS. - <acronym>NFS</acronym> Swap with &os; 4.X - - The swap file location and size can be specified with - BOOTP/DHCP &os;-specific options 128 and 129. - Examples of configuration files for - ISC DHCP 3.0 or - bootpd follow: - - - Add the following lines to - dhcpd.conf: - -# Global section -option swap-path code 128 = string; -option swap-size code 129 = integer 32; - -host margaux { - ... # Standard lines, see above - option swap-path "192.168.4.4:/netswapvolume/netswap"; - option swap-size 64000; -} - - - swap-path is the path to a directory - where swap files will be located. Each file will be named - swap.client-ip. - - Older versions of dhcpd used a syntax of - option option-128 "..., which is no - longer supported. - /etc/bootptab would use the - following syntax instead: - - T128="192.168.4.4:/netswapvolume/netswap":T129=0000fa00 - - In /etc/bootptab, the swap - size must be expressed in hexadecimal format. - - - - On the NFS swap file server, create the swap - file(s): - -&prompt.root; mkdir /netswapvolume/netswap -&prompt.root; cd /netswapvolume/netswap -&prompt.root; dd if=/dev/zero bs=1024 count=64000 of=swap.192.168.4.6 -&prompt.root; chmod 0600 swap.192.168.4.6 - - 192.168.4.6 is the IP address - for the diskless client. - + <acronym>NFS</acronym> Swap - - On the NFS swap file server, add the following line to - /etc/exports: - -/netswapvolume -maproot=0:10 -alldirs margaux corbieres - - Then tell mountd to reread the - exports file, as above. - - - - - - <acronym>NFS</acronym> Swap with &os 5.X - The kernel does not support enabling NFS swap at boot time. Swap must be enabled by the startup scripts, by mounting a writable file system and creating and enabling a @@ -2713,12 +2607,9 @@ problems with the special files in /dev, due to differing major/minor integer sizes. A solution to this problem is to export a directory from the non-FreeBSD server, - mount this directory onto a FreeBSD machine, and run - MAKEDEV on the FreeBSD machine - to create the correct device entries (FreeBSD 5.0 and later + mount this directory onto a FreeBSD machine, and use &man.devfs.5; to allocate device nodes transparently for - the user, running MAKEDEV on these - versions is pointless). + the user. @@ -2783,8 +2674,8 @@ FreeBSD's ISDN implementation supports only the DSS1/Q.931 - (or Euro-ISDN) standard using passive cards. Starting with - FreeBSD 4.4, some active cards are supported where the firmware + (or Euro-ISDN) standard using passive cards. Some active cards + are supported where the firmware also supports other signaling protocols; this also includes the first supported Primary Rate (PRI) ISDN card. @@ -3483,15 +3374,10 @@ lpt0: <Printer> on ppbus0 lpt0: Interrupt-driven port - The parallel port must be an interrupt driven port, under - &os; 4.X, you should have a line similar to the - following in your kernel configuration file: - - device ppc0 at isa? irq 7 - - Under &os; 5.X, the - /boot/device.hints file should contain the - following lines: + The parallel port must be an interrupt driven port, + you should have a line similar to the + following in your in the + /boot/device.hints file: hint.ppc.0.at="isa" hint.ppc.0.irq="7" ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -772,8 +772,7 @@ /tmp. This can be automated using the tmpmfs-related variables of &man.rc.conf.5; (or with an entry in - /etc/fstab; see &man.mdmfs.8;, - or for FreeBSD 4.X, &man.mfs.8;). + /etc/fstab; see &man.mdmfs.8;). @@ -866,8 +865,7 @@ /var. This can be automated using the varmfs-related variables of &man.rc.conf.5 (or with an entry in - /etc/fstab; see &man.mdmfs.8;, - or for FreeBSD 4.X, &man.mfs.8;). + /etc/fstab; see &man.mdmfs.8;). @@ -1144,7 +1142,7 @@ with the new size, and then restoring the backed up data. - FreeBSD 4.4 and later versions feature the &man.growfs.8; + FreeBSD features the &man.growfs.8; command, which makes it possible to increase the size of file system on the fly, removing this limitation. @@ -2268,23 +2266,10 @@ Creating Device Nodes When adding a new device to your system, or compiling - in support for additional devices, you may need to create one or - more device nodes for the new devices. + in support for additional devices, new device nodes must + be created. - MAKEDEV Script - On systems without DEVFS (this concerns all FreeBSD versions before 5.0), device nodes are created - using the &man.MAKEDEV.8; script as shown below: - - &prompt.root; cd /dev -&prompt.root; sh MAKEDEV ad1 - - - This example would make the proper device nodes - for the second IDE drive when installed. - - - <literal>DEVFS</literal> (DEVice File System) The device file system, or DEVFS, provides access to @@ -2294,8 +2279,6 @@ See the &man.devfs.5; manual page for more information. - - DEVFS is used by default in FreeBSD 5.0 and above. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -360,9 +360,18 @@ - Stevens, W. Richard. Advanced Programming in the UNIX - Environment. Reading, Mass. : Addison-Wesley, 1992. - ISBN 0-201-56317-7 + Spinellis, Diomidis. Code + Quality: The Open Source Perspective. + Addison-Wesley, 2006. ISBN 0-321-16607-8 + + + + Stevens, W. Richard and Stephen A. Rago. + Advanced Programming in the UNIX + Environment. 2nd Ed. + Reading, Mass. : Addison-Wesley, 2005. + ISBN 0-201-43307-9 ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -218,7 +218,7 @@ they have been split into two, but you would always install them together. They are copied from the combined file /boot/boot by the installer or - disklabel (see below). + bsdlabel (see below). They are located outside file systems, in the first track of the boot slice, starting with the first sector. This is where boot1 is very simple, since it can only be 512 bytes in size, and knows just enough about the FreeBSD - disklabel, which stores information + bsdlabel, which stores information about the slice, to find and execute boot2. boot2 is slightly more sophisticated, and understands @@ -254,9 +254,9 @@ If you ever need to replace the installed boot1 and boot2 use - &man.disklabel.8;: + &man.bsdlabel.8;: - &prompt.root; disklabel -B diskslice + &prompt.root; bsdlabel -B diskslice where diskslice is the disk and slice you boot from, such as ad0s1 for the first @@ -266,10 +266,10 @@ Dangerously Dedicated Mode If you use just the disk name, such as - ad0, in the &man.disklabel.8; command you + ad0, in the &man.bsdlabel.8; command you will create a dangerously dedicated disk, without slices. This is almost certainly not what you want to do, so make sure you double - check the &man.disklabel.8; command before you press + check the &man.bsdlabel.8; command before you press Return. @@ -801,8 +801,7 @@ Power management requires &man.acpi.4; support in the kernel - or loaded as module for FreeBSD 5.X and &man.apm.4; - support for FreeBSD 4.X. + or loaded as module for. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -109,7 +109,7 @@ Base Partitions - When laying out file systems with &man.disklabel.8; + When laying out file systems with &man.bsdlabel.8; or &man.sysinstall.8;, remember that hard drives transfer data faster from the outer tracks to the inner. @@ -865,15 +865,6 @@ the supported hardware and even the possible problems that could occur. - - NOTES does not exist on - &os; 4.X. Instead, check the LINT - file for information about various network interfaces. See - for a more detailed - summary of NOTES versus - LINT. - - If you own a common card, most of the time you will not have to look very hard for a driver. Drivers for common network cards are present in the GENERIC @@ -1733,8 +1724,8 @@ There are various other buffer-cache and VM page cache - related sysctls. We do not recommend modifying these values. As - of &os; 4.3, the VM system does an extremely good job of + related sysctls. We do not recommend modifying these values, + the VM system does an extremely good job of automatically tuning itself. @@ -1836,10 +1827,6 @@ it is mounted. A good time to enable Soft Updates is before any partitions have been mounted, in single-user mode. - As of &os; 4.5, it is possible to enable Soft Updates - at filesystem creation time, through use of the -U - option to &man.newfs.8;. - Soft Updates drastically improves meta-data performance, mainly file creation and deletion, through the use of a memory cache. We recommend to use Soft Updates on all of your file systems. There @@ -2046,16 +2033,13 @@ connected at once, the resources needed may be similar to a high-scale web server. - Starting with &os; 4.5, the system will auto-tune + The system will auto-tune maxusers for you if you explicitly set it to 0 The auto-tuning algorithm sets maxusers equal to the amount of memory in the system, with a minimum of 32, and a maximum of 384. - . In &os; 5.X and above, maxusers - will default to 0 if not specified. If you - are using an version of &os; earlier than 4.5, or you want to - manage it yourself you will want to set + . When setting this option, you will want to set maxusers to at least 4, especially if you are using the X Window System or compiling software. The reason is that the most important table set by maxusers is the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 31 05:29:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA20716A537; Wed, 31 May 2006 05:29:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4D9816A51E for ; Wed, 31 May 2006 05:29:53 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9844743D5A for ; Wed, 31 May 2006 05:29:53 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V5SX1u033651 for ; Wed, 31 May 2006 05:28:33 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V5SXdf033648 for perforce@freebsd.org; Wed, 31 May 2006 05:28:33 GMT (envelope-from kevlo@freebsd.org) Date: Wed, 31 May 2006 05:28:33 GMT Message-Id: <200605310528.k4V5SXdf033648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 98187 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 05:29:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=98187 Change 98187 by kevlo@kevlo_rtsl on 2006/05/31 05:28:18 Nuke s3c2xx0_attach_args, we have no use for it. Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#2 (text+ko) ==== @@ -58,16 +58,6 @@ typedef void *s3c2xx0_chipset_tag_t; -struct s3c2xx0_attach_args { - s3c2xx0_chipset_tag_t sa_sc; - bus_space_tag_t sa_iot; - bus_addr_t sa_addr; - bus_size_t sa_size; - int sa_intr; - int sa_index; - bus_dma_tag_t sa_dmat; -}; - extern struct bus_space s3c2xx0_bs_tag; extern struct s3c2xx0_softc *s3c2xx0_softc; extern struct arm32_bus_dma_tag s3c2xx0_bus_dma; From owner-p4-projects@FreeBSD.ORG Wed May 31 05:42:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A00616A537; Wed, 31 May 2006 05:42:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0C5516A47A for ; Wed, 31 May 2006 05:42:09 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C1DA43D46 for ; Wed, 31 May 2006 05:42:09 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V5enh8034176 for ; Wed, 31 May 2006 05:40:49 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V5em2j034173 for perforce@freebsd.org; Wed, 31 May 2006 05:40:48 GMT (envelope-from kevlo@freebsd.org) Date: Wed, 31 May 2006 05:40:48 GMT Message-Id: <200605310540.k4V5em2j034173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 98189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 05:42:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=98189 Change 98189 by kevlo@kevlo_rtsl on 2006/05/31 05:40:26 Initial import support for the ARM9-FS2410 eval board. It's not working yet! Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/files.fs2410#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#2 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/fs2410_machdep.c#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/std.fs2410#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/std.s3c2410#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#2 (text+ko) ==== @@ -1,9 +1,9 @@ +# $FreeBSD$ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard -arm/s3c2xx0/s3c2410.c optional ssio -arm/s3c2xx0/s3c2xx0_space.c optional ssio -arm/s3c2xx0/s3c2410_machdep.c optional ssio -arm/s3c2xx0/s3c24x0_clk.c optional ssio +arm/s3c2xx0/s3c2410.c standard +arm/s3c2xx0/s3c2xx0_space.c standard +arm/s3c2xx0/s3c24x0_clk.c standard arm/s3c2xx0/uart_bus_s3c2410.c optional uart arm/s3c2xx0/uart_cpu_s3c2410.c optional uart arm/s3c2xx0/uart_dev_s3c2410.c optional uart ==== //depot/projects/arm/src/sys/arm/s3c2xx0/std.s3c2410#2 (text+ko) ==== @@ -1,4 +1,4 @@ # $FreeBSD$ + +file "../s3c2xx0/files.s3c2xx0" cpu CPU_ARM9 -makeoptions KERNPHYSADDR=0x30000000 -makeoptions KERNVIRTADDR=0xc0000000 From owner-p4-projects@FreeBSD.ORG Wed May 31 05:44:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34DD916A4FD; Wed, 31 May 2006 05:44:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E904E16A473 for ; Wed, 31 May 2006 05:44:12 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B509C43D46 for ; Wed, 31 May 2006 05:44:12 +0000 (GMT) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V5gqtg034228 for ; Wed, 31 May 2006 05:42:52 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V5gqCv034225 for perforce@freebsd.org; Wed, 31 May 2006 05:42:52 GMT (envelope-from kevlo@freebsd.org) Date: Wed, 31 May 2006 05:42:52 GMT Message-Id: <200605310542.k4V5gqCv034225@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 98190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 05:44:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=98190 Change 98190 by kevlo@kevlo_rtsl on 2006/05/31 05:42:16 Implement s3c24x0_clock_freq and s3c24x0_clock_freq2. Obtained from: NetBSD Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#3 (text+ko) ==== @@ -158,18 +158,59 @@ S3C24X0_TIMER_SIZE, 0, &sc->sc_timer_ioh)) panic("cannot map TIMER"); -#if 0 /* calculate current clock frequency */ s3c24x0_clock_freq(&sc->sc_sx); printf(": fclk %d MHz hclk %d MHz pclk %d MHz", sc->sc_sx.sc_fclk / 1000000, sc->sc_sx.sc_hclk / 1000000, sc->sc_sx.sc_pclk / 1000000); -#endif printf("\n"); /* get busdma tag for the platform */ } +/* + * fill sc_pclk, sc_hclk, sc_fclk from values of clock controller register. + * + * s3c24x0_clock_freq2() is meant to be called from kernel startup routines. + * s3c24x0_clock_freq() is for after kernel initialization is done. + */ +void +s3c24x0_clock_freq2(vm_offset_t clkman_base, int *fclk, int *hclk, int *pclk) +{ + uint32_t pllcon, divn; + int mdiv, pdiv, sdiv; + int f, h, p; + + pllcon = *(volatile uint32_t *)(clkman_base + CLKMAN_MPLLCON); + divn = *(volatile uint32_t *)(clkman_base + CLKMAN_CLKDIVN); + + mdiv = (pllcon & PLLCON_MDIV_MASK) >> PLLCON_MDIV_SHIFT; + pdiv = (pllcon & PLLCON_PDIV_MASK) >> PLLCON_PDIV_SHIFT; + sdiv = (pllcon & PLLCON_SDIV_MASK) >> PLLCON_SDIV_SHIFT; + + f = ((mdiv + 8) * S3C2XX0_XTAL_CLK) / ((pdiv + 2) * (1 << sdiv)); + h = f; + if (divn & CLKDIVN_HDIVN) + h /= 2; + p = h; + if (divn & CLKDIVN_PDIVN) + p /= 2; + + if (fclk) *fclk = f; + if (hclk) *hclk = h; + if (pclk) *pclk = p; + +} + +void +s3c24x0_clock_freq(struct s3c2xx0_softc *sc) +{ + vm_offset_t va; + + va = sc->sc_clkman_ioh; + s3c24x0_clock_freq2(va, &sc->sc_fclk, &sc->sc_hclk, &sc->sc_pclk); +} + void cpu_reset(void) { From owner-p4-projects@FreeBSD.ORG Wed May 31 08:24:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E08716A428; Wed, 31 May 2006 08:24:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C3F7916A427 for ; Wed, 31 May 2006 08:24:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2A0143D53 for ; Wed, 31 May 2006 08:24:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4V8NBXe044488 for ; Wed, 31 May 2006 08:23:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4V8NBMQ044485 for perforce@freebsd.org; Wed, 31 May 2006 08:23:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 31 May 2006 08:23:11 GMT Message-Id: <200605310823.k4V8NBMQ044485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 98193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 08:24:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=98193 Change 98193 by rwatson@rwatson_zoo on 2006/05/31 08:23:09 Create audit_pipe_preselect_flush() from audit_pipe_preselect_flush_locked(), as we call the preselect flush routine both with and without the audit pipe mutex; with when closing the pipe, and without when the flush ioctl is called. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#24 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#24 (text+ko) ==== @@ -295,15 +295,24 @@ * Delete all per-auid masks on an audit pipe. */ static void -audit_pipe_preselect_flush(struct audit_pipe *ap) +audit_pipe_preselect_flush_locked(struct audit_pipe *ap) { struct audit_pipe_preselect *app; - mtx_lock(&audit_pipe_mtx); + mtx_assert(&audit_pipe_mtx, MA_OWNED); + while ((app = TAILQ_FIRST(&ap->ap_preselect_list)) != NULL) { TAILQ_REMOVE(&ap->ap_preselect_list, app, app_list); free(app, M_AUDIT_PIPE_PRESELECT); } +} + +static void +audit_pipe_preselect_flush(struct audit_pipe *ap) +{ + + mtx_lock(&audit_pipe_mtx); + audit_pipe_preselect_flush_locked(ap); mtx_unlock(&audit_pipe_mtx); } @@ -561,7 +570,7 @@ mtx_assert(&audit_pipe_mtx, MA_OWNED); - audit_pipe_preselect_flush(ap); + audit_pipe_preselect_flush_locked(ap); audit_pipe_flush(ap); TAILQ_REMOVE(&audit_pipe_list, ap, ap_list); free(ap, M_AUDIT_PIPE); From owner-p4-projects@FreeBSD.ORG Wed May 31 10:37:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35F1316A44C; Wed, 31 May 2006 10:37:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A580F16A457 for ; Wed, 31 May 2006 10:37:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A3BA43D53 for ; Wed, 31 May 2006 10:37:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4VAZvjo060345 for ; Wed, 31 May 2006 10:35:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4VAZvFh060342 for perforce@freebsd.org; Wed, 31 May 2006 10:35:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 31 May 2006 10:35:57 GMT Message-Id: <200605311035.k4VAZvFh060342@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 98196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 10:37:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=98196 Change 98196 by rwatson@rwatson_peppercorn on 2006/05/31 10:34:58 Add two entry points, mac_ipfw_tcpreflect() and mac_ipfw_tcpkeepalive(), intended to allow ipfw to label packets it generates. Note yet fully implemented. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#40 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_inet.c#4 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#285 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#246 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#40 (text+ko) ==== @@ -1524,9 +1524,12 @@ * When flags & TH_RST, we are sending a RST packet, because of a * "reset" action matched the packet. * Otherwise we are sending a keepalive, and flags & TH_ + * The 'replyto' mbuf is the mbuf being replied to, if any, and is required + * so that MAC can label the reply appropriately. */ static struct mbuf * -send_pkt(struct ipfw_flow_id *id, u_int32_t seq, u_int32_t ack, int flags) +send_pkt(struct mbuf *replyto, struct ipfw_flow_id *id, u_int32_t seq, + u_int32_t ack, int flags) { struct mbuf *m; struct ip *ip; @@ -1536,6 +1539,13 @@ if (m == 0) return (NULL); m->m_pkthdr.rcvif = (struct ifnet *)0; + +#ifdef MAC + if (replyto != NULL) + + +#endif + m->m_pkthdr.len = m->m_len = sizeof(struct ip) + sizeof(struct tcphdr); m->m_data += max_linkhdr; @@ -1620,8 +1630,8 @@ L3HDR(struct tcphdr, mtod(args->m, struct ip *)); if ( (tcp->th_flags & TH_RST) == 0) { struct mbuf *m; - m = send_pkt(&(args->f_id), ntohl(tcp->th_seq), - ntohl(tcp->th_ack), + m = send_pkt(args->m, &(args->f_id), + ntohl(tcp->th_seq), ntohl(tcp->th_ack), tcp->th_flags | TH_RST); if (m != NULL) ip_output(m, NULL, NULL, 0, NULL, NULL); @@ -4082,7 +4092,7 @@ if (TIME_LEQ(q->expire, time_uptime)) continue; /* too late, rule expired */ - *mtailp = send_pkt(&(q->id), q->ack_rev - 1, + *mtailp = send_pkt(NULL, &(q->id), q->ack_rev - 1, q->ack_fwd, TH_SYN); if (*mtailp != NULL) mtailp = &(*mtailp)->m_nextpkt; ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_inet.c#4 (text+ko) ==== @@ -309,3 +309,29 @@ INP_LOCK_ASSERT(inp); MAC_PERFORM(inpcb_sosetlabel, so, so->so_label, inp, inp->inp_label); } + +void +mac_ipfw_tcpreflect(struct mbuf *from, struct mbuf *to) +{ + struct label *fromlabel, *tolabel; + + M_ASSERTPKTHDR(from); + M_ASSERTPKTHDR(to); + + fromlabel = mac_mbuf_to_label(from); + tolabel = mac_mbuf_to_label(to); + + MAC_PERFORM(ipfw_tcpreflect, from, fromlabel, to, tolabel); +} + +void +mac_ipfw_tcpkeepalive(struct mbuf *m) +{ + struct label *label; + + M_ASSERTPKTHDR(m); + + label = mac_mbuf_to_label(m); + + MAC_PERFORM(ipfw_tcpkeepalive, m, label); +} ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#285 (text+ko) ==== @@ -283,6 +283,8 @@ void mac_update_ipq(struct mbuf *fragment, struct ipq *ipq); int mac_update_mbuf_from_cipso(struct mbuf *m, char *cp, int *code); void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp); +void mac_ipfw_tcpreflect(struct mbuf *from, struct mbuf *to); +void mac_ipfw_tcpkeepalive(struct mbuf *m); /* * Labeling event operations: processes. ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#246 (text+ko) ==== @@ -328,6 +328,11 @@ typedef void (*mpo_inpcb_sosetlabel_t)(struct socket *so, struct label *label, struct inpcb *inp, struct label *inplabel); +typedef void (*mpo_ipfw_tcpreflect_t)(struct mbuf *from, + struct label *fromlabel, struct mbuf *to, + struct label *tolabel); +typedef void (*mpo_ipfw_tcpkeepalive_t)(struct mbuf *m, + struct label *label); /* * Labeling event operations: processes. @@ -748,6 +753,8 @@ mpo_update_ipq_t mpo_update_ipq; mpo_update_mbuf_from_cipso_t mpo_update_mbuf_from_cipso; mpo_inpcb_sosetlabel_t mpo_inpcb_sosetlabel; + mpo_ipfw_tcpreflect_t mpo_ipfw_tcpreflect; + mpo_ipfw_tcpkeepalive_t mpo_ipfw_tcpkeepalive; /* * Labeling event operations: processes. From owner-p4-projects@FreeBSD.ORG Wed May 31 11:37:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37F2916A621; Wed, 31 May 2006 11:37:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1CBA16A61E for ; Wed, 31 May 2006 11:37:36 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BD7743D53 for ; Wed, 31 May 2006 11:37:36 +0000 (GMT) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4VBaE9X072503 for ; Wed, 31 May 2006 11:36:14 GMT (envelope-from dongmei@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4VBaE4b072500 for perforce@freebsd.org; Wed, 31 May 2006 11:36:14 GMT (envelope-from dongmei@FreeBSD.org) Date: Wed, 31 May 2006 11:36:14 GMT Message-Id: <200605311136.k4VBaE4b072500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dongmei@FreeBSD.org using -f From: dongmei To: Perforce Change Reviews Cc: Subject: PERFORCE change 98200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 11:37:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=98200 Change 98200 by dongmei@soc-dongmei on 2006/05/31 11:35:57 Policy analysis tools for Freebsd and Sebsd Reference Policy project Affected files ... .. //depot/projects/soc2006/TODO#1 add .. //depot/projects/soc2006/dongmei_sebsd/README#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 31 11:39:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BBE116A43D; Wed, 31 May 2006 11:39:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A056D16A421 for ; Wed, 31 May 2006 11:39:39 +0000 (UTC) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A36C43D48 for ; Wed, 31 May 2006 11:39:39 +0000 (GMT) (envelope-from dongmei@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4VBcH8u072954 for ; Wed, 31 May 2006 11:38:17 GMT (envelope-from dongmei@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4VBcHD0072951 for perforce@freebsd.org; Wed, 31 May 2006 11:38:17 GMT (envelope-from dongmei@FreeBSD.org) Date: Wed, 31 May 2006 11:38:17 GMT Message-Id: <200605311138.k4VBcHD0072951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to dongmei@FreeBSD.org using -f From: dongmei To: Perforce Change Reviews Cc: Subject: PERFORCE change 98201 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 11:39:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=98201 Change 98201 by dongmei@soc-dongmei on 2006/05/31 11:37:18 for test Affected files ... .. //depot/projects/soc2006/TODO#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 31 12:35:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C89B16A6A7; Wed, 31 May 2006 12:35:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0FAC16A605 for ; Wed, 31 May 2006 12:35:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D66343D58 for ; Wed, 31 May 2006 12:35:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4VCYSYX082259 for ; Wed, 31 May 2006 12:34:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4VCYSHo082256 for perforce@freebsd.org; Wed, 31 May 2006 12:34:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 31 May 2006 12:34:28 GMT Message-Id: <200605311234.k4VCYSHo082256@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 98204 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 12:35:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=98204 Change 98204 by rwatson@rwatson_zoo on 2006/05/31 12:33:49 More ipfw MAC support. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#41 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#41 (text+ko) ==== @@ -43,6 +43,7 @@ #endif #include "opt_inet6.h" #include "opt_ipsec.h" +#include "opt_mac.h" #include #include @@ -52,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -1542,8 +1544,9 @@ #ifdef MAC if (replyto != NULL) - - + mac_ipfw_tcpreflect(replyto, m); + else + mac_ipfw_tcpkeepalive(m); #endif m->m_pkthdr.len = m->m_len = sizeof(struct ip) + sizeof(struct tcphdr); From owner-p4-projects@FreeBSD.ORG Wed May 31 16:14:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8118616AB62; Wed, 31 May 2006 16:14:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 42A5916AB0E for ; Wed, 31 May 2006 16:14:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6D1943D48 for ; Wed, 31 May 2006 16:14:30 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4VGD8CK008479 for ; Wed, 31 May 2006 16:13:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4VGD8CI008476 for perforce@freebsd.org; Wed, 31 May 2006 16:13:08 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 31 May 2006 16:13:08 GMT Message-Id: <200605311613.k4VGD8CI008476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 16:14:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=98218 Change 98218 by hselasky@hselasky_mini_itx on 2006/05/31 16:12:59 Finished reworking "ums.c". "ums" should now be so called MP-safe. Added "usb_hid.c" from "usb.old/hid.c". USB API change: "hid_get_data()" now takes three arguments. Please test "ums"! Affected files ... .. //depot/projects/usb/src/sys/conf/files#3 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#1 add .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#6 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#3 (text+ko) ==== @@ -988,10 +988,12 @@ dev/usb/usb_ethersubr.c optional usb dev/usb/usb_if.m optional usb dev/usb/usb_quirks.c optional usb +dev/usb/usb_hid.c optional usb dev/usb/ugen.c optional ugen +dev/usb/ulpt.c optional ulpt +dev/usb/ums.c optional ums # # USB support (not merged) -dev/usb/hid.c optional usb dev/usb/if_aue.c optional aue dev/usb/if_axe.c optional axe dev/usb/if_cdce.c optional cdce @@ -1012,11 +1014,9 @@ dev/usb/uftdi.c optional uftdi ucom dev/usb/uhid.c optional uhid dev/usb/ukbd.c optional ukbd -dev/usb/ulpt.c optional ulpt dev/usb/umass.c optional umass dev/usb/umct.c optional umct dev/usb/umodem.c optional umodem -dev/usb/ums.c optional ums dev/usb/uplcom.c optional uplcom ucom dev/usb/urio.c optional urio dev/usb/uscanner.c optional uscanner ==== //depot/projects/usb/src/sys/dev/usb/ums.c#4 (text+ko) ==== @@ -1,0 +1,1127 @@ +/*- + * Copyright (c) 1998 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Lennart Augustsson (lennart@augustsson.net) at + * Carlstedt Research & Technology. + * + * 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 the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 THE FOUNDATION OR CONTRIBUTORS + * 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. + */ + +/* + * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.80 2005/12/29 18:35:28 netchild Exp $"); + +#ifdef USB_DEBUG +#define DPRINTF(n,fmt,...) \ + do { if (ums_debug > (n)) { \ + printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0) + +static int ums_debug = 0; +SYSCTL_NODE(_hw_usb, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums"); +SYSCTL_INT(_hw_usb_ums, OID_AUTO, debug, CTLFLAG_RW, + &ums_debug, 0, "ums debug level"); +#else +#define DPRINTF(...) +#endif + +#define DEV2SC(dev) (dev)->si_drv1 + +#define MOUSE_FLAGS_MASK (HIO_CONST|HIO_RELATIVE) +#define MOUSE_FLAGS (HIO_RELATIVE) + +#define UMS_INT_SIZE 64 /* bytes */ +#define UMS_BUF_SIZE 8 /* bytes */ +#define UMS_IFQ_MAXLEN 50 /* units */ +#define UMS_N_TRANSFER 2 /* units */ +#define UMS_BUTTON_MAX 31 /* exclusive, must be less than 32 */ +#define UMS_BUT(i) ((i) < 3 ? (((i) + 2) % 3) : (i)) + +struct ums_softc { + struct mtx sc_mtx; + struct usbd_ifqueue sc_rdq_free; + struct usbd_ifqueue sc_rdq_used; + struct __callout sc_callout; + struct selinfo sc_read_sel; + struct hid_location sc_loc_x; + struct hid_location sc_loc_y; + struct hid_location sc_loc_z; + struct hid_location sc_loc_t; + struct hid_location sc_loc_btn[UMS_BUTTON_MAX]; + mousehw_t sc_hw; + mousemode_t sc_mode; + mousestatus_t sc_status; + + struct usbd_xfer * sc_xfer[UMS_N_TRANSFER]; + void * sc_mem_ptr_1; + struct cdev * sc_cdev_1; + + u_int32_t sc_flags; +#define UMS_FLAG_X_AXIS 0x0001 +#define UMS_FLAG_Y_AXIS 0x0002 +#define UMS_FLAG_Z_AXIS 0x0004 +#define UMS_FLAG_T_AXIS 0x0008 +#define UMS_FLAG_SBU 0x0010 /* spurious button up events */ +#define UMS_FLAG_SELECT 0x0020 /* select is waiting */ +#define UMS_FLAG_PIPE_ERROR 0x0040 /* set if transfer error */ +#define UMS_FLAG_WAIT_USB 0x0080 /* device is waiting for callbacks */ +#define UMS_FLAG_WAIT_CO 0x0100 /* device is waiting for callbacks */ +#define UMS_FLAG_GONE 0x0200 /* device is gone */ +#define UMS_FLAG_RD_WUP 0x0400 /* device is waiting for wakeup */ +#define UMS_FLAG_RD_SLP 0x0800 /* device is sleeping */ +#define UMS_FLAG_CLOSING 0x1000 /* device is closing */ +#define UMS_FLAG_DEV_OPEN 0x2000 /* device is open */ + + u_int8_t sc_buttons; + u_int8_t sc_iid; + u_int8_t sc_wakeup_detach; /* dummy */ + u_int8_t sc_wakeup_read; /* dummy */ + u_int8_t sc_wakeup_sync_1; /* dummy */ +}; + +static device_probe_t ums_probe; +static device_attach_t ums_attach; +static device_detach_t ums_detach; +static d_close_t ums_close; + +static void +ums_put_queue(struct ums_softc *sc, int32_t dx, int32_t dy, + int32_t dz, int32_t dt, int32_t buttons); + +extern cdevsw_t ums_cdevsw; + +static void +ums_put_queue_timeout(void *__sc) +{ + struct ums_softc *sc = __sc; + + mtx_assert(&(sc->sc_mtx), MA_OWNED); + + ums_put_queue(sc, 0, 0, 0, 0, 0); + + mtx_unlock(&(sc->sc_mtx)); + + return; +} + +static void +ums_clear_stall_callback(struct usbd_xfer *xfer1) +{ + usb_device_request_t *req = xfer1->buffer; + struct ums_softc *sc = xfer1->priv_sc; + struct usbd_xfer *xfer0 = sc->sc_xfer[0]; + + USBD_CHECK_STATUS(xfer1); + + tr_setup: + + /* setup a CLEAR STALL packet */ + + req->bmRequestType = UT_WRITE_ENDPOINT; + req->bRequest = UR_CLEAR_FEATURE; + USETW(req->wValue, UF_ENDPOINT_HALT); + req->wIndex[0] = xfer0->pipe->edesc->bEndpointAddress; + req->wIndex[1] = 0; + USETW(req->wLength, 0); + + usbd_start_hardware(xfer1); + return; + + tr_error: + tr_transferred: + + sc->sc_flags &= ~UMS_FLAG_PIPE_ERROR; + + if (xfer1->error != USBD_CANCELLED) { + + xfer0->pipe->clearstall = 0; + xfer0->pipe->toggle_next = 0; + + usbd_transfer_start(xfer0); + } + return; +} + +static void +ums_intr_callback(struct usbd_xfer *xfer) +{ + struct ums_softc *sc = xfer->priv_sc; + struct usbd_mbuf *m; + u_int8_t *buf = xfer->buffer; + u_int16_t len = xfer->actlen; + int32_t buttons = 0; + int32_t dx; + int32_t dy; + int32_t dz; + int32_t dt; + u_int8_t i; + + USBD_CHECK_STATUS(xfer); + + tr_transferred: + DPRINTF(5, "sc=%p actlen=%d\n", sc, len); + DPRINTF(5, "data = %02x %02x %02x %02x " + "%02x %02x %02x %02x\n", + buf[0], buf[1], buf[2], buf[3], + buf[4], buf[5], buf[6], buf[7]); + + /* + * The M$ Wireless Intellimouse 2.0 sends 1 extra leading byte of + * data compared to most USB mice. This byte frequently switches + * from 0x01 (usual state) to 0x02. I assume it is to allow + * extra, non-standard, reporting (say battery-life). However + * at the same time it generates a left-click message on the button + * byte which causes spurious left-click's where there shouldn't be. + * This should sort that. + * Currently it's the only user of UMS_FLAG_T_AXIS so use it as an identifier. + * We probably should switch to some more official quirk. + */ + if (sc->sc_iid) { + if (sc->sc_flags & UMS_FLAG_T_AXIS) { + if (*buf == 0x02) { + goto tr_setup; + } + } else { + if (*buf != sc->sc_iid) { + goto tr_setup; + } + } + + if (len) { + len--; + buf++; + } else { + goto tr_setup; + } + } + + dx = (sc->sc_flags & UMS_FLAG_X_AXIS) ? + hid_get_data(buf, len, &sc->sc_loc_x) : 0; + + dy = (sc->sc_flags & UMS_FLAG_Y_AXIS) ? + -hid_get_data(buf, len, &sc->sc_loc_y) : 0; + + dz = (sc->sc_flags & UMS_FLAG_Z_AXIS) ? + -hid_get_data(buf, len, &sc->sc_loc_z) : 0; + + dt = (sc->sc_flags & UMS_FLAG_T_AXIS) ? + -hid_get_data(buf, len, &sc->sc_loc_t) : 0; + + for (i = 0; i < sc->sc_buttons; i++) { + if (hid_get_data(buf, len, &sc->sc_loc_btn[i])) { + buttons |= (1 << UMS_BUT(i)); + } + } + + if (dx || dy || dz || dt || (buttons != sc->sc_status.button)) { + + DPRINTF(5, "x:%d y:%d z:%d t:%d buttons:0x%08x\n", + dx, dy, dz, dt, buttons); + + sc->sc_status.button = buttons; + sc->sc_status.dx += dx; + sc->sc_status.dy += dy; + sc->sc_status.dz += dz; + /* sc->sc_status.dt += dt;*/ /* no way to export this yet */ + + /* + * The Qtronix keyboard has a built in PS/2 port for a mouse. + * The firmware once in a while posts a spurious button up + * event. This event we ignore by doing a timeout for 50 msecs. + * If we receive dx=dy=dz=buttons=0 before we add the event to + * the queue. + * In any other case we delete the timeout event. + */ + if ((sc->sc_flags & UMS_FLAG_SBU) && + (dx == 0) && (dy == 0) && (dz == 0) && (dt == 0) && + (buttons == 0)) { + + __callout_reset(&(sc->sc_callout), hz / 20, + &ums_put_queue_timeout, sc); + } else { + + __callout_stop(&(sc->sc_callout)); + + ums_put_queue(sc, dx, dy, dz, dt, buttons); + } + } + + tr_setup: + USBD_IF_POLL(&sc->sc_rdq_free, m); + + if (m && (!(sc->sc_flags & UMS_FLAG_PIPE_ERROR))) { + usbd_start_hardware(xfer); + } + return; + + tr_error: + if (xfer->error != USBD_CANCELLED) { + /* start clear stall */ + sc->sc_flags |= UMS_FLAG_PIPE_ERROR; + + usbd_transfer_start(sc->sc_xfer[1]); + } + return; +} + +static const struct usbd_config ums_config[UMS_N_TRANSFER] = { + + [0] = { + .type = UE_INTERRUPT, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .flags = USBD_SHORT_XFER_OK, + .bufsize = UMS_INT_SIZE, /* bytes */ + .callback = &ums_intr_callback, + }, + + [1] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &ums_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, +}; + +static void +ums_detach_complete(struct usbd_memory_info *info) +{ + struct ums_softc *sc = info->priv_sc; + + mtx_lock(&(sc->sc_mtx)); + + if (sc->sc_flags & UMS_FLAG_WAIT_USB) { + sc->sc_flags &= ~UMS_FLAG_WAIT_USB; + wakeup(&(sc->sc_wakeup_detach)); + } + + mtx_unlock(&(sc->sc_mtx)); + + return; +} + +static int +ums_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + usb_interface_descriptor_t *id; + void *d_ptr; + int32_t d_len; + int32_t error = 0; + + DPRINTF(10, "\n"); + + if (uaa->iface == NULL) { + return UMATCH_NONE; + } + + id = usbd_get_interface_descriptor(uaa->iface); + + if ((id == NULL) || + (id->bInterfaceClass != UICLASS_HID)) { + return UMATCH_NONE; + } + + error = usbreq_read_report_desc(uaa->device, uaa->iface_index, + &d_ptr, &d_len, M_TEMP); + if (error) { + return UMATCH_NONE; + } + + if (hid_is_collection(d_ptr, d_len, + HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_MOUSE))) + error = UMATCH_IFACECLASS; + else + error = UMATCH_NONE; + + free(d_ptr, M_TEMP); + + return error; +} + +static int +ums_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct ums_softc *sc = device_get_softc(dev); + void *d_ptr = NULL; + int32_t unit = device_get_unit(dev); + int32_t d_len; + int32_t isize; + u_int32_t flags; + usbd_status err; + u_int8_t i; + + DPRINTF(10, "sc=%p\n", sc); + + sc->sc_rdq_free.ifq_maxlen = UMS_IFQ_MAXLEN; + sc->sc_rdq_used.ifq_maxlen = UMS_IFQ_MAXLEN; + + usbd_set_desc(dev, uaa->device); + + mtx_init(&(sc->sc_mtx), "ums lock", NULL, MTX_DEF|MTX_RECURSE); + + __callout_init_mtx(&(sc->sc_callout), + &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); +#if 0 + /* TODO: "__callout_init_mtx()" does not support this: */ + + sc->sc_flags |= UMS_FLAG_WAIT_CO; +#endif + + sc->sc_mem_ptr_1 = + usbd_alloc_mbufs(M_DEVBUF, &(sc->sc_rdq_free), + UMS_BUF_SIZE, UMS_IFQ_MAXLEN); + + if (sc->sc_mem_ptr_1 == NULL) { + goto detach; + } + + err = usbd_transfer_setup(uaa->device, uaa->iface_index, sc->sc_xfer, + ums_config, UMS_N_TRANSFER, sc, + &(sc->sc_mtx), &ums_detach_complete); + if (err) { + DPRINTF(0, "error=%s\n", usbd_errstr(err)) ; + goto detach; + } + + sc->sc_flags |= UMS_FLAG_WAIT_USB; + + err = usbreq_read_report_desc(uaa->device, uaa->iface_index, + &d_ptr, &d_len, M_TEMP); + if (err) { + device_printf(dev, "error reading report description\n"); + goto detach; + } + + if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), + hid_input, &sc->sc_loc_x, &flags)) { + + if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { + sc->sc_flags |= UMS_FLAG_X_AXIS; + } + } + + if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), + hid_input, &sc->sc_loc_y, &flags)) { + + if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { + sc->sc_flags |= UMS_FLAG_Y_AXIS; + } + } + + /* try to guess the Z activator: first check Z, then WHEEL */ + + if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Z), + hid_input, &sc->sc_loc_z, &flags) || + hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL), + hid_input, &sc->sc_loc_z, &flags) || + hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_TWHEEL), + hid_input, &sc->sc_loc_z, &flags)) { + + if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { + sc->sc_flags |= UMS_FLAG_Z_AXIS; + } + } + + /* The Microsoft Wireless Intellimouse 2.0 reports it's wheel + * using 0x0048, which is HUG_TWHEEL, and seems to expect you + * to know that the byte after the wheel is the tilt axis. + * There are no other HID axis descriptors other than X,Y and + * TWHEEL + */ + if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_TWHEEL), + hid_input, &sc->sc_loc_t, &flags)) { + + sc->sc_loc_t.pos += 8; + + if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { + sc->sc_flags |= UMS_FLAG_T_AXIS; + } + } + + /* figure out the number of buttons */ + + for (i = 0; i < UMS_BUTTON_MAX; i++) { + if (!hid_locate(d_ptr, d_len, HID_USAGE2(HUP_BUTTON, (i+1)), + hid_input, &(sc->sc_loc_btn[i]), NULL)) { + break; + } + } + + sc->sc_buttons = i; + + device_printf(dev, "%d buttons and [%s%s%s%s] coordinates\n", + (sc->sc_buttons), + (sc->sc_flags & UMS_FLAG_X_AXIS) ? "X" : "", + (sc->sc_flags & UMS_FLAG_Y_AXIS) ? "Y" : "", + (sc->sc_flags & UMS_FLAG_Z_AXIS) ? "Z" : "", + (sc->sc_flags & UMS_FLAG_T_AXIS) ? "T" : ""); + + isize = hid_report_size(d_ptr, d_len, hid_input, &sc->sc_iid); + + if (isize > UMS_INT_SIZE) { + DPRINTF(0, "cannot handle a report " + "size of %d bytes\n", isize); + goto detach; + } + + sc->sc_xfer[0]->length = isize; + + free(d_ptr, M_TEMP); + +#ifdef USB_DEBUG + DPRINTF(0, "sc=%p\n", sc); + DPRINTF(0, "X\t%d/%d\n", sc->sc_loc_x.pos, sc->sc_loc_x.size); + DPRINTF(0, "Y\t%d/%d\n", sc->sc_loc_y.pos, sc->sc_loc_y.size); + DPRINTF(0, "Z\t%d/%d\n", sc->sc_loc_z.pos, sc->sc_loc_z.size); + DPRINTF(0, "T\t%d/%d\n", sc->sc_loc_t.pos, sc->sc_loc_t.size); + + for (i = 0; i < sc->sc_buttons; i++) { + DPRINTF(0, "B%d\t%d/%d\n", + i+1 , sc->sc_loc_btn[i].pos, sc->sc_loc_btn[i].size); + } + DPRINTF(0, "size=%d, id=%d\n", isize, sc->sc_iid); +#endif + + if (sc->sc_buttons > MOUSE_MSC_MAXBUTTON) + sc->sc_hw.buttons = MOUSE_MSC_MAXBUTTON; + else + sc->sc_hw.buttons = sc->sc_buttons; + + sc->sc_hw.iftype = MOUSE_IF_USB; + sc->sc_hw.type = MOUSE_MOUSE; + sc->sc_hw.model = MOUSE_MODEL_GENERIC; + sc->sc_hw.hwid = 0; + + sc->sc_mode.protocol = MOUSE_PROTO_MSC; + sc->sc_mode.rate = -1; + sc->sc_mode.resolution = MOUSE_RES_UNKNOWN; + sc->sc_mode.accelfactor = 0; + sc->sc_mode.level = 0; + sc->sc_mode.packetsize = MOUSE_MSC_PACKETSIZE; + sc->sc_mode.syncmask[0] = MOUSE_MSC_SYNCMASK; + sc->sc_mode.syncmask[1] = MOUSE_MSC_SYNC; + + sc->sc_status.flags = 0; + sc->sc_status.button = 0; + sc->sc_status.obutton = 0; + sc->sc_status.dx = 0; + sc->sc_status.dy = 0; + sc->sc_status.dz = 0; + + sc->sc_cdev_1 = make_dev + (&ums_cdevsw, unit, UID_ROOT, GID_OPERATOR, 0644, "ums%d", unit); + + if (sc->sc_cdev_1) { + DEV2SC(sc->sc_cdev_1) = sc; + } + + return 0; + + detach: + if (d_ptr) { + free(d_ptr, M_TEMP); + } + ums_detach(dev); + return ENOMEM; +} + +static int +ums_detach(device_t self) +{ + struct ums_softc *sc = device_get_softc(self); + + int error; + + DPRINTF(0, "sc=%p\n", sc); + + mtx_lock(&(sc->sc_mtx)); + sc->sc_flags |= UMS_FLAG_GONE; + mtx_unlock(&(sc->sc_mtx)); + + if (sc->sc_cdev_1) { + + ums_close(sc->sc_cdev_1, 0, 0, 0); + + DEV2SC(sc->sc_cdev_1) = NULL; + + destroy_dev(sc->sc_cdev_1); + } + + mtx_lock(&(sc->sc_mtx)); + + __callout_stop(&(sc->sc_callout)); + + mtx_unlock(&(sc->sc_mtx)); + + usbd_transfer_unsetup(sc->sc_xfer, UMS_N_TRANSFER); + + if (sc->sc_mem_ptr_1) { + free(sc->sc_mem_ptr_1, M_DEVBUF); + } + + /* wait for callbacks to be aborted */ + + mtx_lock(&(sc->sc_mtx)); + while (sc->sc_flags & (UMS_FLAG_WAIT_USB|UMS_FLAG_WAIT_CO)) { + + error = msleep(&(sc->sc_wakeup_detach), &(sc->sc_mtx), + PRIBIO, "ums_sync_2", 0); + } + mtx_unlock(&(sc->sc_mtx)); + + mtx_destroy(&(sc->sc_mtx)); + + return 0; +} + +#if ((MOUSE_SYS_PACKETSIZE != 8) || \ + (MOUSE_MSC_PACKETSIZE != 5)) +#error "Software assumptions are not met. Please update code." +#endif + +static void +ums_put_queue(struct ums_softc *sc, int32_t dx, int32_t dy, + int32_t dz, int32_t dt, int32_t buttons) +{ + struct usbd_mbuf *m; + u_int8_t *buf; + + USBD_IF_DEQUEUE(&sc->sc_rdq_free, m); + + if (m) { + USBD_MBUF_RESET(m); + + if (dx > 254) dx = 254; + if (dx < -256) dx = -256; + if (dy > 254) dy = 254; + if (dy < -256) dy = -256; + if (dz > 126) dz = 126; + if (dz < -128) dz = -128; + if (dt > 126) dt = 126; + if (dt < -128) dt = -128; + + buf = m->cur_data_ptr; + m->cur_data_len = sc->sc_mode.packetsize; + + buf[0] = sc->sc_mode.syncmask[1]; + buf[0] |= ~buttons & MOUSE_MSC_BUTTONS; + buf[1] = dx >> 1; + buf[2] = dy >> 1; + buf[3] = dx - (dx >> 1); + buf[4] = dy - (dy >> 1); + + if (sc->sc_mode.level == 1) { + buf[5] = dz >> 1; + buf[6] = dz - (dz >> 1); + buf[7] = ((~buttons >> 3) & MOUSE_SYS_EXTBUTTONS); + } + + USBD_IF_ENQUEUE(&(sc->sc_rdq_used), m); + + if (sc->sc_flags & UMS_FLAG_RD_WUP) { + sc->sc_flags &= ~UMS_FLAG_RD_WUP; + wakeup(&(sc->sc_wakeup_read)); + } + + if (sc->sc_flags & UMS_FLAG_SELECT) { + sc->sc_flags &= ~UMS_FLAG_SELECT; + selwakeup(&(sc->sc_read_sel)); + } + + } else { + DPRINTF(0, "Buffer full, discarded packet\n"); + } + + return; +} + +static int +ums_uiomove(struct ums_softc *sc, u_int32_t context_bit, + void *cp, int n, struct uio *uio) +{ + int error; + + sc->sc_flags |= context_bit; + + mtx_unlock(&(sc->sc_mtx)); + + error = uiomove(cp, n, uio); + + mtx_lock(&(sc->sc_mtx)); + + sc->sc_flags &= ~context_bit; + + if (sc->sc_flags & UMS_FLAG_CLOSING) { + wakeup(&(sc->sc_wakeup_sync_1)); + error = EINTR; + } + return error; +} + +static int +ums_msleep(struct ums_softc *sc, u_int32_t context_bit, void *ident) +{ + int error; + + sc->sc_flags |= context_bit; + + error = msleep(ident, &(sc->sc_mtx), PRIBIO|PCATCH, "ums_sleep", 0); + + sc->sc_flags &= ~context_bit; + + if (sc->sc_flags & UMS_FLAG_CLOSING) { + wakeup(&(sc->sc_wakeup_sync_1)); + error = EINTR; + } + return error; +} + +static void +ums_reset_buf(struct ums_softc *sc) +{ + struct usbd_mbuf *m; + + /* reset read queue */ + + while(1) { + USBD_IF_DEQUEUE(&(sc->sc_rdq_used), m); + + if (m) { + USBD_IF_ENQUEUE(&(sc->sc_rdq_free), m); + } else { + break; + } + } + return; +} + +static int +ums_open(struct cdev *dev, int flag, int fmt, struct thread *td) +{ + struct ums_softc *sc = DEV2SC(dev); + int error = 0; + + DPRINTF(1, "\n"); + + if (sc == NULL) { + return EIO; + } + + mtx_lock(&(sc->sc_mtx)); + + /* check flags */ + + if (sc->sc_flags & + (UMS_FLAG_DEV_OPEN|UMS_FLAG_GONE)) { + error = EBUSY; + goto done; + } + + /* reset buffer */ + + ums_reset_buf(sc); + + /* reset status */ + + sc->sc_status.flags = 0; + sc->sc_status.button = 0; + sc->sc_status.obutton = 0; + sc->sc_status.dx = 0; + sc->sc_status.dy = 0; + sc->sc_status.dz = 0; + /* sc->sc_status.dt = 0; */ + + /* start interrupt transfer */ + + usbd_transfer_start(sc->sc_xfer[0]); + + sc->sc_flags |= UMS_FLAG_DEV_OPEN; + + done: + mtx_unlock(&(sc->sc_mtx)); + + return error; +} + +static int +ums_close(struct cdev *dev, int flag, int fmt, struct thread *td) +{ + struct ums_softc *sc = DEV2SC(dev); + int error; + + DPRINTF(1, "\n"); + + if (sc == NULL) { + return EIO; + } + + mtx_lock(&(sc->sc_mtx)); + + if (sc->sc_flags & UMS_FLAG_CLOSING) { + goto done; + } + + if (sc->sc_flags & UMS_FLAG_DEV_OPEN) { + + sc->sc_flags |= UMS_FLAG_CLOSING; + + /* stop transfers */ + + if (sc->sc_xfer[0]) { + usbd_transfer_stop(sc->sc_xfer[0]); + } + + if (sc->sc_xfer[1]) { + usbd_transfer_stop(sc->sc_xfer[1]); + } + + /* stop callout */ + + __callout_stop(&(sc->sc_callout)); + + while (sc->sc_flags & + (UMS_FLAG_RD_SLP|UMS_FLAG_RD_WUP)) { + + if (sc->sc_flags & UMS_FLAG_RD_WUP) { + sc->sc_flags &= ~UMS_FLAG_RD_WUP; + wakeup(&(sc->sc_wakeup_read)); + } + + error = msleep(&(sc->sc_wakeup_sync_1), &(sc->sc_mtx), + PRIBIO, "ums_sync_1", 0); + } + + if (sc->sc_flags & UMS_FLAG_SELECT) { + sc->sc_flags &= ~UMS_FLAG_SELECT; + selwakeup(&(sc->sc_read_sel)); + } + + sc->sc_flags &= ~(UMS_FLAG_DEV_OPEN| + UMS_FLAG_CLOSING); + } + + done: + mtx_unlock(&(sc->sc_mtx)); + + DPRINTF(0, "closed\n"); + + return 0; +} + +static int +ums_read(struct cdev *dev, struct uio *uio, int flag) +{ + struct ums_softc *sc = DEV2SC(dev); + struct usbd_mbuf *m; + int error = 0; + int io_len; + + if (sc == NULL) { + return EIO; + } + + DPRINTF(1, "\n"); + + mtx_lock(&(sc->sc_mtx)); + + if (sc->sc_flags & (UMS_FLAG_CLOSING|UMS_FLAG_GONE| + UMS_FLAG_RD_SLP)) { + error = EIO; + goto done; + } + + while (uio->uio_resid) { + + USBD_IF_DEQUEUE(&(sc->sc_rdq_used), m); + + if (m == NULL) { + + /* start reader thread */ + + usbd_transfer_start(sc->sc_xfer[0]); + + if (flag & O_NONBLOCK) { + error = EWOULDBLOCK; + goto done; + } + + error = ums_msleep(sc, (UMS_FLAG_RD_SLP|UMS_FLAG_RD_WUP), + &(sc->sc_wakeup_read)); + if (error) { + break; + } else { + continue; + } + } + + io_len = min(m->cur_data_len, uio->uio_resid); + + DPRINTF(1, "transfer %d bytes from %p\n", + io_len, m->cur_data_ptr); + + error = ums_uiomove(sc, UMS_FLAG_RD_SLP, m->cur_data_ptr, + io_len, uio); + + m->cur_data_len -= io_len; + m->cur_data_ptr += io_len; + + if (m->cur_data_len == 0) { + USBD_IF_ENQUEUE(&sc->sc_rdq_free, m); + } else { + USBD_IF_PREPEND(&sc->sc_rdq_used, m); + } + + if (error) { + break; + } + } + + done: + mtx_unlock(&(sc->sc_mtx)); + + return error; +} + +static int +ums_poll(struct cdev *dev, int events, struct thread *td) +{ + struct ums_softc *sc = DEV2SC(dev); + struct usbd_mbuf *m; + int32_t revents = 0; + + if (sc == NULL) { + return POLLNVAL; + } + + DPRINTF(1, "\n"); + + mtx_lock(&(sc->sc_mtx)); + + if (sc->sc_flags & (UMS_FLAG_CLOSING|UMS_FLAG_GONE)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 31 18:51:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65B8716A496; Wed, 31 May 2006 18:51:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 34A4F16B917 for ; Wed, 31 May 2006 18:51:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0037F43D48 for ; Wed, 31 May 2006 18:51:48 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4VIoQv7040688 for ; Wed, 31 May 2006 18:50:26 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4VIoP44040685 for perforce@freebsd.org; Wed, 31 May 2006 18:50:25 GMT (envelope-from jhb@freebsd.org) Date: Wed, 31 May 2006 18:50:25 GMT Message-Id: <200605311850.k4VIoP44040685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 98223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 18:51:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=98223 Change 98223 by jhb@jhb_mutex on 2006/05/31 18:50:19 Grab Giant around sysctl_{un,}register_oid() since sysctl still needs Giant. Submitted by: csjp Affected files ... .. //depot/projects/smpng/sys/kern/kern_linker.c#65 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_linker.c#65 (text+ko) ==== @@ -277,8 +277,10 @@ if (linker_file_lookup_set(lf, "sysctl_set", &start, &stop, NULL) != 0) return; + mtx_lock(&Giant); for (oidp = start; oidp < stop; oidp++) sysctl_register_oid(*oidp); + mtx_unlock(&Giant); } static void @@ -292,8 +294,10 @@ if (linker_file_lookup_set(lf, "sysctl_set", &start, &stop, NULL) != 0) return; + mtx_lock(&Giant); for (oidp = start; oidp < stop; oidp++) sysctl_unregister_oid(*oidp); + mtx_unlock(&Giant); } static int From owner-p4-projects@FreeBSD.ORG Wed May 31 20:38:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AACD816AA81; Wed, 31 May 2006 20:38:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2FFA316B65F for ; Wed, 31 May 2006 20:38:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 041FE43D6B for ; Wed, 31 May 2006 20:38:01 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4VKacvo068497 for ; Wed, 31 May 2006 20:36:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4VKach4068494 for perforce@freebsd.org; Wed, 31 May 2006 20:36:38 GMT (envelope-from jb@freebsd.org) Date: Wed, 31 May 2006 20:36:38 GMT Message-Id: <200605312036.k4VKach4068494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 98226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 May 2006 20:38:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=98226 Change 98226 by jb@jb_freebsd2 on 2006/05/31 20:35:48 IFC Fixes the ahb.c breakage from yesterday. Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#10 integrate .. //depot/projects/dtrace/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/dtrace/src/sys/arm/include/pmap.h#4 integrate .. //depot/projects/dtrace/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/dtrace/src/sys/kern/vnode_if.src#3 integrate .. //depot/projects/dtrace/src/sys/sys/elf_common.h#3 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/dtrace/src/tools/regression/execve/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/execve/doexec.c#1 branch .. //depot/projects/dtrace/src/tools/regression/execve/execve.t#1 branch .. //depot/projects/dtrace/src/tools/regression/execve/tests/badinterplen#1 branch .. //depot/projects/dtrace/src/tools/regression/execve/tests/devnullscript#1 branch .. //depot/projects/dtrace/src/tools/regression/execve/tests/goodaout.c#1 branch .. //depot/projects/dtrace/src/tools/regression/execve/tests/goodscript#1 branch .. //depot/projects/dtrace/src/tools/regression/execve/tests/nonexistshell#1 branch .. //depot/projects/dtrace/src/tools/regression/execve/tests/scriptarg#1 branch .. //depot/projects/dtrace/src/tools/regression/execve/tests/scriptarg-nospace#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_cmsg/unix_cmsg.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/installUpgrade.c#3 integrate .. //depot/projects/dtrace/www/en/commercial/isp.xml#5 integrate .. //depot/projects/dtrace/www/en/releases/5.5R/errata.html#2 integrate .. //depot/projects/dtrace/www/en/releases/5.5R/schedule.sgml#4 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#7 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#10 (text+ko) ==== @@ -1,4 +1,4 @@ - +