From owner-p4-projects@FreeBSD.ORG Sun Dec 21 10:33:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 887941065673; Sun, 21 Dec 2008 10:33:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C33C106564A for ; Sun, 21 Dec 2008 10:33:14 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3AC7E8FC17 for ; Sun, 21 Dec 2008 10:33:14 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBLAXED0010746 for ; Sun, 21 Dec 2008 10:33:14 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBLAXE1O010744 for perforce@freebsd.org; Sun, 21 Dec 2008 10:33:14 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 21 Dec 2008 10:33:14 GMT Message-Id: <200812211033.mBLAXE1O010744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155076 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, 21 Dec 2008 10:33:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=155076 Change 155076 by pgj@kolbasz on 2008/12/21 10:32:19 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/Makefile#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/Makefile#2 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#5 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/chapter.decl#2 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/chapters.ent#2 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/doc-build/chapter.sgml#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml#4 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml#4 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#5 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.sgml#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml#4 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.sgml#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#9 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/Makefile#7 (text+ko) ==== @@ -2,12 +2,13 @@ # The FreeBSD Documentation Project # The FreeBSD Hungarian Documentation Project # -# $FreeBSD: doc/hu_HU.ISO8859-2/books/Makefile,v 1.3 2008/08/20 16:34:19 pgj Exp $ +# $FreeBSD: doc/hu_HU.ISO8859-2/books/Makefile,v 1.4 2008/12/20 22:39:38 pgj Exp $ # %SOURCE% en_US.ISO8859-1/books/Makefile # %SRCID% 1.14 # SUBDIR = faq +SUBDIR+= fdp-primer SUBDIR+= handbook ROOT_SYMLINKS= faq handbook ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/Makefile#2 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#5 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/chapter.decl#2 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/chapters.ent#2 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/doc-build/chapter.sgml#3 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml#3 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml#4 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml#3 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml#4 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#3 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#5 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#3 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.sgml#3 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml#3 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml#4 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.sgml#3 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml#4 (text+ko) ==== @@ -27,12 +27,12 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD$ + $FreeBSD: doc/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml,v 1.2 2008/12/21 00:07:21 pgj Exp $ --> ==== //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -68,8 +68,8 @@ Announce doc/ tree slush - TBD -- + 2 September 2008 Notification of the impending doc/ tree slush should be sent to doc@. @@ -110,6 +110,12 @@ Begin BETA1 builds. + + BETA2 builds + -- + 19 October 2008 + Begin BETA2 builds. + RELENG_7_1 branch From owner-p4-projects@FreeBSD.ORG Sun Dec 21 10:38:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2AAE1065674; Sun, 21 Dec 2008 10:38:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96ED61065670 for ; Sun, 21 Dec 2008 10:38:19 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 851828FC1B for ; Sun, 21 Dec 2008 10:38:19 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBLAcJ9h011123 for ; Sun, 21 Dec 2008 10:38:19 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBLAcJl5011121 for perforce@freebsd.org; Sun, 21 Dec 2008 10:38:19 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 21 Dec 2008 10:38:19 GMT Message-Id: <200812211038.mBLAcJl5011121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155077 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, 21 Dec 2008 10:38:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=155077 Change 155077 by pgj@kolbasz on 2008/12/21 10:38:06 MFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/Makefile#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/chapter.decl#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/chapters.ent#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/doc-build/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/see-also/chapter.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/writing-style/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $FreeBSD: doc/hu_HU.ISO8859-2/books/fdp-primer/Makefile,v 1.1 2008/12/20 22:39:38 pgj Exp $ # # %SOURCE% en_US.ISO8859-1/books/fdp-primer/Makefile # %SRCID% 1.14 @@ -9,7 +9,7 @@ NO_TIDY=yes -MAINTAINER=doc@FreeBSD.org +MAINTAINER=pgj@FreeBSD.org DOC?= book ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#6 (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$ + $FreeBSD: doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml,v 1.1 2008/12/20 22:39:38 pgj Exp $ --> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/chapters.ent#3 (text+ko) ==== @@ -6,7 +6,7 @@ Chapters should be listed in the order in which they are referenced. - $FreeBSD$ + $FreeBSD: doc/hu_HU.ISO8859-2/books/fdp-primer/chapters.ent,v 1.1 2008/12/20 22:39:38 pgj Exp $ --> - + From owner-p4-projects@FreeBSD.ORG Mon Dec 22 12:15:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13A87106568D; Mon, 22 Dec 2008 12:15:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B53621065680 for ; Mon, 22 Dec 2008 12:15:38 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A427B8FC12 for ; Mon, 22 Dec 2008 12:15:38 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBMCFcZ3051249 for ; Mon, 22 Dec 2008 12:15:38 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBMCFcK7051247 for perforce@freebsd.org; Mon, 22 Dec 2008 12:15:38 GMT (envelope-from weongyo@FreeBSD.org) Date: Mon, 22 Dec 2008 12:15:38 GMT Message-Id: <200812221215.mBMCFcK7051247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155115 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, 22 Dec 2008 12:15:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=155115 Change 155115 by weongyo@weongyo_ws on 2008/12/22 12:15:29 record history of timers which are allocated by USB NDIS driver; then try to cancel all of it because some NDIS USB drivers are buggy that it doesn't cancel timers so the ndisulator encounter a page fault after halting or detaching. I don't like this kind of approach to solve the problem but it looks no ways to fix this problem if NDIS drivers have bugs. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_ndis.c#5 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_ndis.c#5 (text+ko) ==== @@ -304,6 +304,15 @@ */ #define NDIS_POOL_EXTRA 16 +struct ktimer_list { + ktimer *kl_timer; + list_entry kl_next; +}; + +static struct list_entry ndis_timerlist; +static kspin_lock ndis_timerlock; +static int ndis_isusbdev; + int ndis_libinit() { @@ -319,6 +328,9 @@ patch++; } + KeInitializeSpinLock(&ndis_timerlock); + InitializeListHead(&ndis_timerlist); + return(0); } @@ -1217,6 +1229,16 @@ ndis_timer_function func; void *ctx; { + ndis_miniport_block *block; + struct ktimer_list *kl; + struct ndis_softc *sc; + uint8_t irql; + + block = (ndis_miniport_block *)handle; + sc = device_get_softc(block->nmb_physdeviceobj->do_devext); + if (sc->ndis_iftype == PNPBus && ndis_isusbdev == 0) + ndis_isusbdev = 1; + /* Save the driver's funcptr and context */ timer->nmt_timerfunc = func; @@ -1234,7 +1256,38 @@ ndis_findwrap((funcptr)ndis_timercall), timer); timer->nmt_ktimer.k_dpc = &timer->nmt_kdpc; - return; + if (ndis_isusbdev == 1) { + kl = (struct ktimer_list *)malloc(sizeof(*kl), M_DEVBUF, + M_NOWAIT | M_ZERO); + if (kl == NULL) + panic("out of memory"); /* no way to report errors */ + + kl->kl_timer = &timer->nmt_ktimer; + KeAcquireSpinLock(&ndis_timerlock, &irql); + InsertHeadList((&ndis_timerlist), (&kl->kl_next)); + KeReleaseSpinLock(&ndis_timerlock, irql); + } +} + +void +ndis_cancel_timerlist(void) +{ + list_entry *l; + struct ktimer_list *kl; + uint8_t cancelled, irql; + + KeAcquireSpinLock(&ndis_timerlock, &irql); + + while(!IsListEmpty(&ndis_timerlist)) { + l = RemoveHeadList(&ndis_timerlist); + kl = CONTAINING_RECORD(l, struct ktimer_list, kl_next); + KeReleaseSpinLock(&ndis_timerlock, irql); + cancelled = KeCancelTimer(kl->kl_timer); + free(kl, M_DEVBUF); + KeAcquireSpinLock(&ndis_timerlock, &irql); + } + + KeReleaseSpinLock(&ndis_timerlock, irql); } /* @@ -1279,6 +1332,26 @@ ndis_timer *timer; uint8_t *cancelled; { + list_entry *l; + struct ktimer_list *kl; + uint8_t irql; + + if (ndis_isusbdev == 1) { + KeAcquireSpinLock(&ndis_timerlock, &irql); + l = ndis_timerlist.nle_flink; + while(l != &ndis_timerlist) { + kl = CONTAINING_RECORD(l, struct ktimer_list, kl_next); + if (kl->kl_timer == &timer->nt_ktimer) { + RemoveEntryList((&kl->kl_next)); + l = l->nle_flink; + free(kl, M_DEVBUF); + continue; + } + l = l->nle_flink; + } + KeReleaseSpinLock(&ndis_timerlock, irql); + } + *cancelled = KeCancelTimer(&timer->nt_ktimer); return; } From owner-p4-projects@FreeBSD.ORG Mon Dec 22 12:27:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A13B1065675; Mon, 22 Dec 2008 12:27:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F29481065673 for ; Mon, 22 Dec 2008 12:27:50 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E16E18FC2A for ; Mon, 22 Dec 2008 12:27:50 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBMCRouM052144 for ; Mon, 22 Dec 2008 12:27:50 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBMCRoQZ052142 for perforce@freebsd.org; Mon, 22 Dec 2008 12:27:50 GMT (envelope-from weongyo@FreeBSD.org) Date: Mon, 22 Dec 2008 12:27:50 GMT Message-Id: <200812221227.mBMCRoQZ052142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155116 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, 22 Dec 2008 12:27:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=155116 Change 155116 by weongyo@weongyo_ws on 2008/12/22 12:27:13 implement ndis_pnpevent_nic() function to support MiniportPnpEventNotify() method. Currently it'd be used at USB detaching by NDIS_PNP_EVENT_SURPRISE_REMOVED. While I'm here add a missed prototype. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/kern_ndis.c#8 edit .. //depot/projects/ndisusb/sys/compat/ndis/ndis_var.h#3 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/kern_ndis.c#8 (text+ko) ==== @@ -1225,6 +1225,31 @@ } int +ndis_pnpevent_nic(arg, type) + void *arg; + int type; +{ + struct ndis_softc *sc; + ndis_handle adapter; + ndis_pnpevent_handler pnpeventfunc; + + sc = arg; + NDIS_LOCK(sc); + adapter = sc->ndis_block->nmb_miniportadapterctx; + pnpeventfunc = sc->ndis_chars->nmc_pnpevent_handler; + NDIS_UNLOCK(sc); + if (adapter == NULL || pnpeventfunc == NULL) + return(EIO); + + if (sc->ndis_chars->nmc_rsvd0 == NULL) + MSCALL4(pnpeventfunc, adapter, type, NULL, 0); + else + MSCALL4(pnpeventfunc, sc->ndis_chars->nmc_rsvd0, type, NULL, 0); + + return (0); +} + +int ndis_init_nic(arg) void *arg; { ==== //depot/projects/ndisusb/sys/compat/ndis/ndis_var.h#3 (text+ko) ==== @@ -1658,6 +1658,7 @@ typedef void (*ndis_enable_interrupts_handler)(ndis_handle); typedef void (*ndis_disable_interrupts_handler)(ndis_handle); typedef void (*ndis_shutdown_handler)(void *); +typedef void (*ndis_pnpevent_handler)(void *, int, void *, uint32_t); typedef void (*ndis_allocdone_handler)(ndis_handle, void *, ndis_physaddr *, uint32_t, void *); typedef uint8_t (*ndis_checkforhang_handler)(ndis_handle); @@ -1739,6 +1740,7 @@ extern int ndis_reset_nic(void *); extern int ndis_halt_nic(void *); extern int ndis_shutdown_nic(void *); +extern int ndis_pnpevent_nic(void *, int); extern int ndis_init_nic(void *); extern void ndis_return_packet(void *, void *); extern int ndis_init_dma(void *); @@ -1759,6 +1761,7 @@ extern void NdisFreePacket(ndis_packet *); extern ndis_status NdisScheduleWorkItem(ndis_work_item *); extern void NdisMSleep(uint32_t); +extern void ndis_cancel_timerlist(void); __END_DECLS #endif /* _NDIS_VAR_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Dec 22 12:42:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A531065674; Mon, 22 Dec 2008 12:42:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8AA71065673 for ; Mon, 22 Dec 2008 12:42:05 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A77B78FC0C for ; Mon, 22 Dec 2008 12:42:05 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBMCg5jY053247 for ; Mon, 22 Dec 2008 12:42:05 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBMCg5M2053245 for perforce@freebsd.org; Mon, 22 Dec 2008 12:42:05 GMT (envelope-from weongyo@FreeBSD.org) Date: Mon, 22 Dec 2008 12:42:05 GMT Message-Id: <200812221242.mBMCg5M2053245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155117 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, 22 Dec 2008 12:42:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=155117 Change 155117 by weongyo@weongyo_ws on 2008/12/22 12:41:27 change our tactics to detach USB NDIS driver already attached and working to send a `SURPRISE REMOVED' PNP event to the NDIS driver's handler if they have then try to cacel timers for buggy NDIS driver. As last, it try to halt the device using ndis_halt_nic(). Until the previous version, most drivers I've tested worked to attach the device but there were problems to detach, for example, panics, page faults or unknown system hang (serial-console didn't work to enter DDB). Now it looks it becomes more stable to detach USB adapters. Affected files ... .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis_usb.c#5 edit Differences ... ==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis_usb.c#5 (text+ko) ==== @@ -65,6 +65,7 @@ #include #include #include +#include #include SYSCTL_NODE(_hw, OID_AUTO, ndisusb, CTLFLAG_RD, 0, "NDIS USB driver parameters"); @@ -233,6 +234,9 @@ sc->ndisusb_iin_buf = NULL; } + ndis_pnpevent_nic(self, NDIS_PNP_EVENT_SURPRISE_REMOVED); + ndis_cancel_timerlist(); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, uaa->device, self); return ndis_detach(self); From owner-p4-projects@FreeBSD.ORG Mon Dec 22 14:59:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D3CA1065676; Mon, 22 Dec 2008 14:59:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC9EB1065674 for ; Mon, 22 Dec 2008 14:59:25 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B9AB68FC17 for ; Mon, 22 Dec 2008 14:59:25 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBMExPFt076398 for ; Mon, 22 Dec 2008 14:59:25 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBMExPGN076396 for perforce@freebsd.org; Mon, 22 Dec 2008 14:59:25 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 22 Dec 2008 14:59:25 GMT Message-Id: <200812221459.mBMExPGN076396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155123 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, 22 Dec 2008 14:59:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=155123 Change 155123 by pgj@kolbasz on 2008/12/22 14:59:13 Fix unencoded literal characters (www) Submitted by: gabor Affected files ... .. //depot/projects/docproj_hu/www/hu/about.sgml#8 edit .. //depot/projects/docproj_hu/www/hu/advocacy/index.sgml#9 edit .. //depot/projects/docproj_hu/www/hu/advocacy/myths.sgml#9 edit .. //depot/projects/docproj_hu/www/hu/art.sgml#6 edit .. //depot/projects/docproj_hu/www/hu/docs.sgml#6 edit .. //depot/projects/docproj_hu/www/hu/docs/books.sgml#19 edit .. //depot/projects/docproj_hu/www/hu/index.xsl#13 edit .. //depot/projects/docproj_hu/www/hu/news/news.sgml#11 edit .. //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#9 edit .. //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#7 edit .. //depot/projects/docproj_hu/www/hu/platforms/ia64/refs.sgml#6 edit .. //depot/projects/docproj_hu/www/hu/platforms/mips.sgml#7 edit .. //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#9 edit .. //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#7 edit .. //depot/projects/docproj_hu/www/hu/projects/projects.sgml#7 edit .. //depot/projects/docproj_hu/www/hu/search/search.sgml#16 edit .. //depot/projects/docproj_hu/www/hu/search/web.atoz#13 edit .. //depot/projects/docproj_hu/www/hu/send-pr.sgml#8 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#7 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#16 edit .. //depot/projects/docproj_hu/www/hu/where.sgml#10 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/about.sgml#8 (text+ko) ==== @@ -92,7 +92,7 @@

A &os; ingyenes

- A BSD Démon + A BSD Démon

Nyilván azt gondolnánk, hogy egy ilyen adottságokkal rendelkezõ operációs rendszer ==== //depot/projects/docproj_hu/www/hu/advocacy/index.sgml#9 (text+ko) ==== @@ -33,7 +33,7 @@ -

Webes források

+

Webes források

  • ==== //depot/projects/docproj_hu/www/hu/advocacy/myths.sgml#9 (text+ko) ==== @@ -83,7 +83,7 @@ *BSD a rendszerek
-

Mítoszok

+

Mítoszok

A *BSD rendszerek zárt fejlesztési modellel rendelkeznek, sokkal inkább ==== //depot/projects/docproj_hu/www/hu/art.sgml#6 (text+ko) ==== @@ -40,7 +40,7 @@ BSD - Démon  + Démon" width="191" height="208" border="0">  Készítette: &a.phk;
Forrás: @@ -50,17 +50,17 @@ BSD Démon kalapáccsal - BSD Démon felszolgálBSD Démon felszolgál - BSD Démon híreket szerkesztBSD Démon híreket szerkeszt - BSD Démon dokumentációt olvasBSD Démon dokumentációt olvas - BSD Démon az új kiadást terjesztiBSD Démon az új kiadást terjeszti ==== //depot/projects/docproj_hu/www/hu/docs.sgml#6 (text+ko) ==== @@ -14,8 +14,8 @@ &header; - BSD Démon - dokumentációt olvas

A &os;-hez számos dokumentáció létezik, ==== //depot/projects/docproj_hu/www/hu/docs/books.sgml#19 (text+ko) ==== @@ -288,14 +288,14 @@ környezetben bemutató leírás.

Munka kitüntetett szerepekkel + href="&url.articles;/hats/index.html">Munka kitüntetett szerepekkel (hats)
A committerek útmutatója, hogyan dolgozzanak kitüntetett szerepekben, fennhatósággal a &os; bizonyos területei felett.

A &os; tükrözése + href="&url.articles;/hubs/index.html">A &os; tükrözése (hubs)
Útmutató a &os; honlapjának, CVSup szerverének, FTP szerverének, stb. @@ -488,7 +488,7 @@ vezérlõkártyát.

Solid state eszközök és a &os; + href="&url.articles;/solid-state/index.html">Solid state eszközök és a &os; (solid-state)
Solid state lemezeszközök használata a &os;-ben.

@@ -513,7 +513,7 @@ fejlesztési ütemezését.

Rendszerindítás Vinummal: A megbízható szerverek alapja + href="&url.articles;/vinum/index.html">Rendszerindítás Vinummal: A megbízható szerverek alapja (vinum)
Egy remek bevezetés a hibatûrõ szerverekrõl és egy lépésrõl-lépésre @@ -528,7 +528,7 @@ alrendszerérõl.

Zip meghajtók és a &os; + href="&url.articles;/zip-drive/index.html">Zip meghajtók és a &os; (zip-drive)
Hogyan formázzunk, csatlakoztassunk és használjunk Iomega Zip (SCSI, IDE, vagy párhuzamos) @@ -593,12 +593,12 @@

  • ==== //depot/projects/docproj_hu/www/hu/index.xsl#13 (text+ko) ==== @@ -44,9 +44,9 @@ + title="FreeBSD Projekt Hírek" href="&base;/news/rss.xml" /> + title="FreeBSD Biztonsági Bejelentések" href="&enbase;/security/rss.xml" /> @@ -141,7 +141,7 @@
    @@ -344,7 +344,7 @@ href="&base;/security/" title="Még több sajtóhiba mutatása">Bõvebben
  • - Sajtóhibák RSS feedben + Sajtóhibák RSS feedben
    • ==== //depot/projects/docproj_hu/www/hu/news/news.sgml#11 (text+ko) ==== @@ -82,7 +82,7 @@ ==== //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#9 (text+ko) ==== @@ -16,7 +16,7 @@ &header; - BSD Démon egy kalapácsot lenget + BSD Démon egy kalapácsot lenget

    Ez az oldal az AMD64 és az &header; -

    Bevezetés

    +

    Bevezetés

    Ezen az oldalon találhatunk információkat a &os; ARM architektúrán és -hardveren ==== //depot/projects/docproj_hu/www/hu/platforms/ia64/refs.sgml#6 (text+ko) ==== @@ -25,7 +25,7 @@ Google - + ==== //depot/projects/docproj_hu/www/hu/platforms/mips.sgml#7 (text+ko) ==== @@ -100,7 +100,7 @@ küldünk egy levelet a e-mail címre, vagy használjuk a mailman webes felületét.

    + href="http://lists.FreeBSD.org/mailman/listinfo/freebsd-mips">mailman webes felületét.

    &footer; ==== //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#9 (text+ko) ==== @@ -73,7 +73,7 @@

    Tudunk letölteni új típusú Macekhez használható &os; &rel.current; ISO image-eket, amelyekrõl részletesebben a kiadás bejelentésében + href="&base;/releases/&rel.current;R/announce.html">kiadás bejelentésében olvashatunk. Ezután kövessük az itt található utasításokat.

    ==== //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#7 (text+ko) ==== @@ -90,7 +90,7 @@ rendszerek esetleg mûködésre bírhatóak egy NetBSD-rõl portolt esp - meghajtóval.

    + meghajtóval.

    • Enterprise 3500
      • ==== //depot/projects/docproj_hu/www/hu/projects/projects.sgml#7 (text+ko) ==== @@ -57,7 +57,7 @@
    -

    Dokumentáció

    +

    Dokumentáció

    • A &os; C99 és &posix; Megfelelési Projekt: + href="&enbase;/projects/c99/index.html">A &os; C99 és &posix; Megfelelési Projekt: Ez a projekt az ISO 9899:1999 (C99) és az IEEE 1003.1-2001 (POSIX) szabványok összes követelményét igyekszik @@ -615,7 +615,7 @@ naplóbejegyzéseket.
    • A &os; Laptop Kompatibilitási Lista: + href="http://laptop.bsdgroup.de/freebsd/">A &os; laptop kompatibilitási lista: Egy átfogó adatbázis olyan laptopokról és PCMCIA kártyákról, amelyek mûködnek &os;-vel. Az oldal az ismert hardveres ==== //depot/projects/docproj_hu/www/hu/search/search.sgml#16 (text+ko) ==== @@ -95,7 +95,7 @@

      A levelek olvasásához alternatívaként használható a Mailman/Pipermail listaarchívum + href="http://lists.FreeBSD.org/mailman/listinfo">Mailman/Pipermail listaarchívum (ez az archívum azonban csak 2003 márciusától tartalmazza a leveleket).

      @@ -711,7 +711,7 @@ -

      +

      &footer; ==== //depot/projects/docproj_hu/www/hu/search/web.atoz#13 (text+ko) ==== @@ -236,7 +236,7 @@ # kse/index.sgml KSE|&enbase;/kse/index.html Szálak, KSE|&enbase;/kse/index.html -POSIX szálak|&enbase;/kse/index.html +POSIX szálak|&enbase;/kse/index.html # mailto.sgml Kapcsolat|&base;/mailto.html @@ -334,7 +334,7 @@ GLOBAL common source code tag system|&enbase;/projects/projects.html#global Kiskereskedelmi egységek, &os;|&enbase;/doc/hu/books/handbook/mirrors.html Tinderbox|&enbase;/projects/projects.html#tinderbox -Laptop Kompatibilitási Lista|&enbase;/projects/projects.html#flcl +Laptop kompatibilitási lista|&enbase;/projects/projects.html#flcl Projektötletek|&enbase;/projects/ideas/index.html # projects/busdma/index.sgml ==== //depot/projects/docproj_hu/www/hu/send-pr.sgml#8 (text+ko) ==== @@ -199,13 +199,13 @@ ellenõrizzük, hogy nem robot töltötte ki az ûrlapot:

      Véletlen szöveg; ha nem látja a képet, - kérjük írjon a &bugbusters; csapatnak

      - - + + &footer; ==== //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#7 (text+ko) ==== @@ -48,7 +48,7 @@ - Az oldalak közti navigáció átlépése (1) A fejezetek közti navigáció átlépése (2) ==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#16 (text+ko) ==== @@ -99,7 +99,7 @@

      Fejezetek közti navigáció

        -
      • A &os; Letöltése
        • +
      • A &os; letöltése
      • Kiadási információk
        • Stabil kiadás: &rel.current;
          • @@ -157,7 +157,7 @@
        • Telepítés
        • Fissítés
        • Keresés
          • -
        •    Kategóriák +
        •    Kategóriák
          • Ábécé szerint
          • Csoportok szerint
            • ==== //depot/projects/docproj_hu/www/hu/where.sgml#10 (text+ko) ==== @@ -61,7 +61,7 @@ Verzió és platform Disztribúció - ISO + ISO Kiadási
            jegyzetek Hardverjegyzék Telepítési
            jegyzetek @@ -373,9 +373,12 @@

          • A FreeSBIE egy - &os;-alapú LiveCD. Közvetlenül CD-rõl mûködik, a merevlemez - használata nélkül. A beágyazott változatok elkészítéséhez - szintén tartalmaz egy könnyen kiterjeszthetõ segédeszközt.

            + &os;-alapú LiveCD. Közvetlenül CD-rõl + mûködik, a merevlemez használata + nélkül. A beágyazott változatok + elkészítéséhez szintén + tartalmaz egy könnyen kiterjeszthetõ + segédeszközt.

          From owner-p4-projects@FreeBSD.ORG Mon Dec 22 21:09:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A06B01065677; Mon, 22 Dec 2008 21:09:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4AA961065745 for ; Mon, 22 Dec 2008 21:09:42 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36B218FC0C for ; Mon, 22 Dec 2008 21:09:42 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBML9gTJ043239 for ; Mon, 22 Dec 2008 21:09:42 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBML9fFL043235 for perforce@freebsd.org; Mon, 22 Dec 2008 21:09:41 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 22 Dec 2008 21:09:41 GMT Message-Id: <200812222109.mBML9fFL043235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155129 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, 22 Dec 2008 21:09:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=155129 Change 155129 by ed@ed_dull on 2008/12/22 21:09:25 IFC. Affected files ... .. //depot/projects/mpsafetty/UPDATING#17 integrate .. //depot/projects/mpsafetty/contrib/netcat/FREEBSD-vendor#2 integrate .. //depot/projects/mpsafetty/contrib/netcat/nc.1#2 integrate .. //depot/projects/mpsafetty/contrib/netcat/netcat.c#2 integrate .. //depot/projects/mpsafetty/etc/Makefile#6 integrate .. //depot/projects/mpsafetty/etc/devd.conf#4 integrate .. //depot/projects/mpsafetty/etc/devd/Makefile#1 branch .. //depot/projects/mpsafetty/etc/devd/asus.conf#1 branch .. //depot/projects/mpsafetty/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/mpsafetty/etc/rc.d/defaultroute#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_ar.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/main.c#4 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gtar.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_compress.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_ar.c#3 integrate .. //depot/projects/mpsafetty/lib/libfetch/fetch.c#2 integrate .. //depot/projects/mpsafetty/lib/libutil/kinfo_getfile.c#2 integrate .. //depot/projects/mpsafetty/lib/libutil/kinfo_getvmmap.c#2 integrate .. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate .. //depot/projects/mpsafetty/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/mpsafetty/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/mpsafetty/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/mpsafetty/sbin/mount/mount.c#3 integrate .. //depot/projects/mpsafetty/sbin/mount/mount_fs.c#2 integrate .. //depot/projects/mpsafetty/share/man/man4/acpi_asus.4#4 integrate .. //depot/projects/mpsafetty/share/man/man9/VOP_STRATEGY.9#2 integrate .. //depot/projects/mpsafetty/share/man/man9/style.9#6 integrate .. //depot/projects/mpsafetty/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/mpsafetty/sys/amd64/include/elf.h#2 integrate .. //depot/projects/mpsafetty/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/mpsafetty/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/conf/AVILA#7 integrate .. //depot/projects/mpsafetty/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/mpsafetty/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/mpsafetty/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/mpsafetty/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/mpsafetty/sys/arm/conf/EP80219#5 integrate .. //depot/projects/mpsafetty/sys/arm/include/armreg.h#3 integrate .. //depot/projects/mpsafetty/sys/arm/include/elf.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/include/intr.h#4 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_iic.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp435_ehci.c#1 branch .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/mpsafetty/sys/boot/i386/gptzfsboot/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/devicename.c#3 integrate .. //depot/projects/mpsafetty/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/mpsafetty/sys/cam/cam_periph.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/cam_periph.h#2 integrate .. //depot/projects/mpsafetty/sys/cam/cam_sim.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/cam_sim.h#2 integrate .. //depot/projects/mpsafetty/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/svr4/svr4_sysvec.c#5 integrate .. //depot/projects/mpsafetty/sys/conf/files#36 integrate .. //depot/projects/mpsafetty/sys/conf/files.powerpc#11 integrate .. //depot/projects/mpsafetty/sys/conf/files.sparc64#11 integrate .. //depot/projects/mpsafetty/sys/conf/files.sun4v#4 integrate .. //depot/projects/mpsafetty/sys/conf/options#18 integrate .. //depot/projects/mpsafetty/sys/conf/options.arm#4 integrate .. //depot/projects/mpsafetty/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate .. //depot/projects/mpsafetty/sys/crypto/rc4/rc4.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/agp/agppriv.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.h#11 integrate .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#15 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_core.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/isp/isp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/md/md.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ofw/ofw_if.m#1 branch .. //depot/projects/mpsafetty/sys/dev/ofw/ofw_standard.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ofw/ofwvar.h#1 branch .. //depot/projects/mpsafetty/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/re/if_re.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#11 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehci_ddb.c#1 branch .. //depot/projects/mpsafetty/sys/dev/usb/ehci_mbus.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehci_pci.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehcivar.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ucom.c#12 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdi.h#3 integrate .. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/mpsafetty/sys/i386/include/elf.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/mpsafetty/sys/ia64/include/elf.h#2 integrate .. //depot/projects/mpsafetty/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_param.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/subr_prf.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#68 integrate .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#26 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_lookup.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/mpsafetty/sys/mips/conf/DEFAULTS#2 integrate .. //depot/projects/mpsafetty/sys/mips/include/elf.h#2 integrate .. //depot/projects/mpsafetty/sys/mips/mips/elf_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if.c#14 integrate .. //depot/projects/mpsafetty/sys/net/if_arcsubr.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/mpsafetty/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/mpsafetty/sys/net/if_fwsubr.c#6 integrate .. //depot/projects/mpsafetty/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/mpsafetty/sys/net/if_lagg.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_llatbl.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_llatbl.h#2 integrate .. //depot/projects/mpsafetty/sys/net/if_media.h#3 integrate .. //depot/projects/mpsafetty/sys/net/if_tun.c#9 integrate .. //depot/projects/mpsafetty/sys/net/if_var.h#8 integrate .. //depot/projects/mpsafetty/sys/net/pfil.c#2 integrate .. //depot/projects/mpsafetty/sys/net/radix.c#3 integrate .. //depot/projects/mpsafetty/sys/net/route.c#13 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_acl.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_tkip.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_crypto_wep.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_freebsd.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#9 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ioctl.c#7 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_power.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_scan.c#3 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_scan_sta.c#6 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_sta.c#7 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_mppc.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#13 integrate .. //depot/projects/mpsafetty/sys/netinet/in.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.h#12 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#18 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#13 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_hostcache.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#15 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#15 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_timewait.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_pcb.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_rmx.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_src.c#12 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_input.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.h#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_nbr.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_rtr.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet6/raw_ip6.c#11 integrate .. //depot/projects/mpsafetty/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/mpsafetty/sys/netipsec/key.c#7 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#10 integrate .. //depot/projects/mpsafetty/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/mpsafetty/sys/pc98/conf/GENERIC#9 integrate .. //depot/projects/mpsafetty/sys/pci/if_rl.c#6 integrate .. //depot/projects/mpsafetty/sys/pci/if_rlreg.h#10 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/locore.S#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/ofw_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/booke/interrupt.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/booke/locore.S#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/lbc.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/lbc.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/mpc85xx.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/mpc85xx.h#1 branch .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/nexus.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/mpc85xx/ocpbus.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/mpsafetty/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/ofw_machdep.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/schizo.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/machdep.c#6 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/mp_machdep.c#8 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/support.S#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/conf/DEFAULTS#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/include/elf.h#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/include/ofw_machdep.h#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/mpsafetty/sys/sys/buf_ring.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/elf_common.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/kobj.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/mount.h#8 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#24 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vfsops.c#4 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/mpsafetty/sys/vm/vm_object.c#5 integrate .. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#13 integrate .. //depot/projects/mpsafetty/tools/tools/tionxcl/Makefile#1 branch .. //depot/projects/mpsafetty/tools/tools/tionxcl/tionxcl.c#1 branch .. //depot/projects/mpsafetty/usr.bin/fetch/fetch.c#5 integrate .. //depot/projects/mpsafetty/usr.bin/ipcs/ipcs.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/make/globals.h#2 integrate .. //depot/projects/mpsafetty/usr.bin/make/job.c#4 integrate .. //depot/projects/mpsafetty/usr.bin/make/job.h#2 integrate .. //depot/projects/mpsafetty/usr.bin/make/main.c#3 integrate .. //depot/projects/mpsafetty/usr.bin/make/make.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/procstat/procstat.1#5 integrate .. //depot/projects/mpsafetty/usr.bin/procstat/procstat_files.c#5 integrate .. //depot/projects/mpsafetty/usr.bin/procstat/procstat_vm.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/Makefile#15 integrate .. //depot/projects/mpsafetty/usr.sbin/burncd/Makefile#2 integrate .. //depot/projects/mpsafetty/usr.sbin/burncd/burncd.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/makefs/Makefile#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/compat/pwcache.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/compat/pwcache.h#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/compat/strsuftoll.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/buf.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/buf.h#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ffs_alloc.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ffs_balloc.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ffs_bswap.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ffs_extern.h#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ffs_subr.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/mkfs.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/newfs_extern.h#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ufs_bmap.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ufs_bswap.h#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/ffs/ufs_inode.h#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/getid.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/makefs.8#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/makefs.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/makefs.h#1 branch .. //depot/projects/mpsafetty/usr.sbin/makefs/walk.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/nscd/nscd.conf.5#2 integrate .. //depot/projects/mpsafetty/usr.sbin/ppp/route.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/Makefile#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/config.c#4 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/devices.c#5 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/dispatch.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/media.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/menus.c#4 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/options.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/sysinstall.h#6 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/system.c#4 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/tape.c#3 delete .. //depot/projects/mpsafetty/usr.sbin/sysinstall/user.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/syslogd/Makefile#2 integrate .. //depot/projects/mpsafetty/usr.sbin/syslogd/syslogd.c#5 integrate Differences ... ==== //depot/projects/mpsafetty/UPDATING#17 (text+ko) ==== @@ -22,6 +22,14 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081219: + With __FreeBSD_version 800060 the makefs tool is part of + the base system (it was a port). + +20081216: + The afdata and ifnet locks have been changed from mutexes to + rwlocks, network modules will need to be re-compiled. + 20081214: __FreeBSD_version 800059 incorporates the new arp-v2 rewrite. RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated. @@ -1187,4 +1195,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.553 2008/12/15 06:10:57 qingli Exp $ +$FreeBSD: src/UPDATING,v 1.556 2008/12/19 23:12:14 sam Exp $ ==== //depot/projects/mpsafetty/contrib/netcat/FREEBSD-vendor#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.1 2008/04/21 18:36:52 delphij Exp $ +# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.2 2008/12/19 23:00:23 delphij Exp $ Project: netcat (aka src/usr.bin/nc in OpenBSD) ProjectURL: http://www.openbsd.org/ -Version: 4.3 +Version: 4.4 VendorTag: OPENBSD -VersionTag: OPENBSD_4_3 +VersionTag: OPENBSD_4_4 License: BSD ==== //depot/projects/mpsafetty/contrib/netcat/nc.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $OpenBSD: nc.1,v 1.45 2007/05/31 19:20:13 jmc Exp $ +.\" $OpenBSD: nc.1,v 1.47 2008/05/06 16:21:03 jmc Exp $ .\" .\" Copyright (c) 1996 David Sacerdote .\" All rights reserved. @@ -25,9 +25,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.10 2008/05/10 18:50:45 antoine Exp $ +.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.11 2008/12/19 23:00:23 delphij Exp $ .\" -.Dd $Mdocdate$ +.Dd $Mdocdate: May 6 2008 $ .Dt NC 1 .Os .Sh NAME @@ -36,9 +36,12 @@ .Sh SYNOPSIS .Nm nc .Bk -words -.Op Fl 46DdEhklnOorStUuvz +.Op Fl 46DdEhklnorStUuvz .Op Fl e Ar IPsec_policy +.Op Fl I Ar length .Op Fl i Ar interval +.Op Fl -no-tcpopt +.Op Fl O Ar length .Op Fl P Ar proxy_username .Op Fl p Ar source_port .Op Fl s Ar source_ip_address @@ -118,6 +121,8 @@ Prints out .Nm help. +.It Fl I Ar length +Specifies the size of the TCP receive buffer. .It Fl i Ar interval Specifies a delay time interval between lines of text sent and received. Also causes a delay time between connections to multiple ports. @@ -146,10 +151,13 @@ .It Fl n Do not do any DNS or service lookups on any specified addresses, hostnames or ports. -.It Fl O +.It Fl -no-tcpopt Disables the use of TCP options on the socket, by setting the boolean TCP_NOOPT socket option. +.It Fl O Ar length +Specifies the size of the TCP send buffer. +When .It Fl o .Dq Once-only mode . By default, ==== //depot/projects/mpsafetty/contrib/netcat/netcat.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.89 2007/02/20 14:11:17 jmc Exp $ */ +/* $OpenBSD: netcat.c,v 1.91 2008/05/09 09:00:11 markus Exp $ */ /* * Copyright (c) 2001 Eric Jackson * @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/contrib/netcat/netcat.c,v 1.8 2008/05/10 18:50:45 antoine Exp $ + * $FreeBSD: src/contrib/netcat/netcat.c,v 1.9 2008/12/19 23:00:23 delphij Exp $ */ /* @@ -50,6 +50,7 @@ #include #include +#include #include #include #include @@ -78,7 +79,7 @@ int lflag; /* Bind to local port */ int nflag; /* Don't do name look up */ int oflag; /* Once only: stop on EOF */ -int Oflag; /* Do not use TCP options */ +int FreeBSD_Oflag; /* Do not use TCP options */ char *Pflag; /* Proxy username */ char *pflag; /* Localport flag */ int rflag; /* Random ports flag */ @@ -89,6 +90,8 @@ int xflag; /* Socks proxy */ int zflag; /* Port Scan Flag */ int Dflag; /* sodebug */ +int Iflag; /* TCP receive buffer size */ +int Oflag; /* TCP send buffer size */ int Sflag; /* TCP MD5 signature option */ int Tflag = -1; /* IP Type of Service */ @@ -129,6 +132,10 @@ char *proxy; const char *errstr, *proxyhost = "", *proxyport = NULL; struct addrinfo proxyhints; + struct option longopts[] = { + { "no-tcpopt", no_argument, &FreeBSD_Oflag, 1 }, + { NULL, 0, NULL, 0 } + }; ret = 1; ipsec_count = 0; @@ -138,8 +145,9 @@ uport = NULL; sv = NULL; - while ((ch = getopt(argc, argv, - "46e:DEdhi:jklnoOP:p:rSs:tT:Uuvw:X:x:z")) != -1) { + while ((ch = getopt_long(argc, argv, + "46e:DEdhi:jklnoI:O:P:p:rSs:tT:Uuvw:X:x:z", + longopts, NULL)) != -1) { switch (ch) { case '4': family = AF_INET; @@ -203,9 +211,6 @@ case 'o': oflag = 1; break; - case 'O': - Oflag = 1; - break; case 'P': Pflag = optarg; break; @@ -244,12 +249,28 @@ case 'D': Dflag = 1; break; + case 'I': + Iflag = strtonum(optarg, 1, 65536 << 14, &errstr); + if (errstr != NULL) + errx(1, "TCP receive window %s: %s", + errstr, optarg); + break; + case 'O': + Oflag = strtonum(optarg, 1, 65536 << 14, &errstr); + if (errstr != NULL) { + if (strcmp(errstr, "invalid") != 0) + errx(1, "TCP send window %s: %s", + errstr, optarg); + } + break; case 'S': Sflag = 1; break; case 'T': Tflag = parse_iptos(optarg); break; + case 0: + break; default: usage(1); } @@ -512,7 +533,7 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) { struct addrinfo *res, *res0; - int s, error; + int s, error, on = 1; if ((error = getaddrinfo(host, port, &hints, &res))) errx(1, "getaddrinfo: %s", gai_strerror(error)); @@ -533,6 +554,10 @@ if (sflag || pflag) { struct addrinfo ahints, *ares; +#ifdef SO_BINDANY + /* try SO_BINDANY, but don't insist */ + setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on)); +#endif memset(&ahints, 0, sizeof(struct addrinfo)); ahints.ai_family = res0->ai_family; ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; @@ -604,9 +629,9 @@ if (ipsec_policy[1] != NULL) add_ipsec_policy(s, ipsec_policy[1]); #endif - if (Oflag) { + if (FreeBSD_Oflag) { if (setsockopt(s, IPPROTO_TCP, TCP_NOOPT, - &Oflag, sizeof(Oflag)) == -1) + &FreeBSD_Oflag, sizeof(FreeBSD_Oflag)) == -1) err(1, "disable TCP options"); } @@ -838,9 +863,19 @@ &Tflag, sizeof(Tflag)) == -1) err(1, "set IP ToS"); } + if (Iflag) { + if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, + &Iflag, sizeof(Iflag)) == -1) + err(1, "set TCP receive buffer size"); + } if (Oflag) { + if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, + &Oflag, sizeof(Oflag)) == -1) + err(1, "set TCP send buffer size"); + } + if (FreeBSD_Oflag) { if (setsockopt(s, IPPROTO_TCP, TCP_NOOPT, - &Oflag, sizeof(Oflag)) == -1) + &FreeBSD_Oflag, sizeof(FreeBSD_Oflag)) == -1) err(1, "disable TCP options"); } } @@ -878,11 +913,13 @@ #endif fprintf(stderr, "\ \t-h This help text\n\ + \t-I length TCP receive buffer length\n\ \t-i secs\t Delay interval for lines sent, ports scanned\n\ \t-k Keep inbound sockets open for multiple connects\n\ \t-l Listen mode, for inbound connects\n\ \t-n Suppress name/port resolutions\n\ - \t-O Disable TCP options\n\ + \t--no-tcpopt Disable TCP options\n\ + \t-O length TCP send buffer length\n\ \t-o Terminate on EOF on input\n\ \t-P proxyuser\tUsername for proxy authentication\n\ \t-p port\t Specify local port for remote connects\n\ @@ -931,10 +968,11 @@ usage(int ret) { #ifdef IPSEC - fprintf(stderr, "usage: nc [-46DdEhklnOorStUuvz] [-e policy] [-i interval] [-P proxy_username] [-p source_port]\n"); + fprintf(stderr, "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I receive_buffer_len] [-i interval]\n"); #else - fprintf(stderr, "usage: nc [-46DdhklnOorStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n"); + fprintf(stderr, "usage: nc [-46DdhklnorStUuvz] [-I receive_buffer_len] [-i interval]\n"); #endif + fprintf(stderr, "\t [-O send_buffer_len] [-P proxy_username] [-p source_port]\n"); fprintf(stderr, "\t [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n"); fprintf(stderr, "\t [-x proxy_address[:port]] [hostname] [port[s]]\n"); if (ret) ==== //depot/projects/mpsafetty/etc/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.373 2008/10/29 18:46:47 mp Exp $ +# $FreeBSD: src/etc/Makefile,v 1.374 2008/12/17 19:12:30 thompsa Exp $ .include @@ -162,6 +162,7 @@ ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install .endif ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install + ${_+_}cd ${.CURDIR}/devd; ${MAKE} install ${_+_}cd ${.CURDIR}/gss; ${MAKE} install ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install ==== //depot/projects/mpsafetty/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.45 2008/11/04 23:03:36 delphij Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.46 2008/12/17 19:12:30 thompsa Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -277,29 +277,6 @@ action "mixer vol +10"; }; -# The next blocks enable volume hotkeys that can be found on the Asus EeePC -# The four keys above the keyboard notify 0x1a through to 0x1d respectively -notify 0 { - match "system" "ACPI"; - match "subsystem" "ASUS-Eee"; - match "notify" "0x13"; - action "mixer 0"; -}; - -notify 0 { - match "system" "ACPI"; - match "subsystem" "ASUS-Eee"; - match "notify" "0x14"; - action "mixer vol -10"; -}; - -notify 0 { - match "system" "ACPI"; - match "subsystem" "ASUS-Eee"; - match "notify" "0x15"; - action "mixer vol +10"; -}; - /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might ==== //depot/projects/mpsafetty/etc/mtree/BSD.root.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.80 2008/05/26 10:39:46 bz Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.81 2008/12/17 19:12:30 thompsa Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -28,6 +28,8 @@ .. defaults .. + devd + .. gnats .. gss ==== //depot/projects/mpsafetty/etc/rc.d/defaultroute#2 (text+ko) ==== @@ -2,7 +2,7 @@ # # Wait for the default route to be up # -# $FreeBSD: src/etc/rc.d/defaultroute,v 1.1 2008/06/05 17:26:47 brooks Exp $ +# $FreeBSD: src/etc/rc.d/defaultroute,v 1.2 2008/12/17 17:35:26 svn Exp $ # # PROVIDE: defaultroute @@ -30,7 +30,7 @@ defif=`get_default_if -inet` if [ -n "${defif}" ]; then if [ ${delay} -ne ${if_up_delay} ]; then - echo "($defif)" + echo -n "($defif)" fi break fi @@ -42,6 +42,8 @@ sleep 1 delay=`expr $delay - 1` done + + echo } load_rc_config $name ==== //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_ar.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.11 2008/12/06 06:45:15 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.12 2008/12/17 19:02:42 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -192,7 +192,7 @@ /* Verify the magic signature on the file header. */ if (strncmp(h + AR_fmag_offset, "`\n", 2) != 0) { archive_set_error(&a->archive, EINVAL, - "Consistency check failed"); + "Incorrect file header signature"); return (ARCHIVE_WARN); } ==== //depot/projects/mpsafetty/lib/libarchive/test/main.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ #define EXTRA_DUMP(x) archive_error_string((struct archive *)(x)) #define EXTRA_VERSION archive_version() #define KNOWNREF "test_compat_gtar_1.tgz.uu" -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.15 2008/12/08 17:22:44 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.17 2008/12/21 00:13:50 kientzle Exp $"); /* * "list.h" is simply created by "grep DEFINE_TEST"; it has @@ -846,48 +846,59 @@ static char * get_refdir(const char *tmpdir) { - char *ref, *p; + char tried[512] = { '\0' }; + char buff[128]; + char *pwd, *p; /* Get the current dir. */ systemf("/bin/pwd > %s/refdir", tmpdir); - ref = slurpfile(NULL, "%s/refdir", tmpdir); - p = ref + strlen(ref); - while (p[-1] == '\n') { - --p; - *p = '\0'; - } + pwd = slurpfile(NULL, "%s/refdir", tmpdir); + while (pwd[strlen(pwd) - 1] == '\n') + pwd[strlen(pwd) - 1] = '\0'; + printf("PWD: %s\n", pwd); systemf("rm %s/refdir", tmpdir); + /* Look for a known file. */ - p = slurpfile(NULL, "%s/%s", ref, KNOWNREF); - if (p != NULL) { - free(p); - return (ref); + snprintf(buff, sizeof(buff), "%s", pwd); + p = slurpfile(NULL, "%s/%s", buff, KNOWNREF); + if (p != NULL) goto success; + strncat(tried, buff, sizeof(tried) - strlen(tried) - 1); + strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1); + + snprintf(buff, sizeof(buff), "%s/test", pwd); + p = slurpfile(NULL, "%s/%s", buff, KNOWNREF); + if (p != NULL) goto success; + strncat(tried, buff, sizeof(tried) - strlen(tried) - 1); + strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1); + + snprintf(buff, sizeof(buff), "%s/%s/test", pwd, LIBRARY); + p = slurpfile(NULL, "%s/%s", buff, KNOWNREF); + if (p != NULL) goto success; + strncat(tried, buff, sizeof(tried) - strlen(tried) - 1); + strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1); + + if (memcmp(pwd, "/usr/obj", 8) == 0) { + snprintf(buff, sizeof(buff), "%s", pwd + 8); + p = slurpfile(NULL, "%s/%s", buff, KNOWNREF); + if (p != NULL) goto success; + strncat(tried, buff, sizeof(tried) - strlen(tried) - 1); + strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1); + + snprintf(buff, sizeof(buff), "%s/test", pwd + 8); + p = slurpfile(NULL, "%s/%s", buff, KNOWNREF); + if (p != NULL) goto success; + strncat(tried, buff, sizeof(tried) - strlen(tried) - 1); + strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1); } - p = slurpfile(NULL, "%s/test/%s", ref, KNOWNREF); - if (p != NULL) { - free(p); - p = malloc(strlen(ref) + strlen("/test") + 1); - strcpy(p, ref); - strcat(p, "/test"); - free(ref); - return (p); - } - p = slurpfile(NULL, "%s/%s/test/%s", ref, LIBRARY, KNOWNREF); - if (p != NULL) { - free(p); - p = malloc(strlen(ref) + 1 + strlen(LIBRARY) + strlen("/test") + 1); - strcpy(p, ref); - strcat(p, "/"); - strcat(p, LIBRARY); - strcat(p, "/test"); - free(ref); - return (p); - } + printf("Unable to locate known reference file %s\n", KNOWNREF); - printf(" Checked directory %s\n", ref); - printf(" Checked directory %s/test\n", ref); - printf(" Checked directory %s/%s/test\n", ref, LIBRARY); + printf(" Checked following directories:\n%s\n", tried); exit(1); + +success: + free(p); + free(pwd); + return strdup(buff); } int main(int argc, char **argv) @@ -897,7 +908,7 @@ time_t now; char *refdir_alloc = NULL; char *progname, *p; - char *tmp; + const char *tmp; char tmpdir[256]; char tmpdir_timestamp[256]; ==== //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gtar.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_gtar.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_gtar.c,v 1.4 2008/12/17 19:05:00 kientzle Exp $"); /* * Verify our ability to read sample files created by GNU tar. @@ -43,6 +43,7 @@ char name[] = "test_compat_gtar_1.tgz"; struct archive_entry *ae; struct archive *a; + int r; assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); @@ -51,7 +52,11 @@ assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240)); /* Read first entry. */ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae)); + if (r != ARCHIVE_OK) { + archive_read_finish(a); + return; + } assertEqualString( "12345678901234567890123456789012345678901234567890" "12345678901234567890123456789012345678901234567890" @@ -66,7 +71,11 @@ assertEqualInt(0100644, archive_entry_mode(ae)); /* Read second entry. */ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae)); + if (r != ARCHIVE_OK) { + archive_read_finish(a); + return; + } assertEqualString( "abcdefghijabcdefghijabcdefghijabcdefghijabcdefghij" "abcdefghijabcdefghijabcdefghijabcdefghijabcdefghij" ==== //depot/projects/mpsafetty/lib/libarchive/test/test_write_compress.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_compress.c,v 1.4 2008/12/17 19:05:25 kientzle Exp $"); /* * A basic exercise of compress reading and writing. @@ -85,11 +85,11 @@ for (i = 0; i < 100; i++) { sprintf(path, "file%03d", i); - assertEqualInt(0, archive_read_next_header(a, &ae)); + if (!assertEqualInt(0, archive_read_next_header(a, &ae))) + break; assertEqualString(path, archive_entry_pathname(ae)); assertEqualInt(datasize, archive_entry_size(ae)); } - assert(0 == archive_read_close(a)); #if ARCHIVE_VERSION_NUMBER < 2000000 archive_read_finish(a); ==== //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_ar.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_ar.c,v 1.8 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_ar.c,v 1.9 2008/12/17 19:03:44 kientzle Exp $"); char buff[4096]; char buff2[64]; @@ -73,8 +73,8 @@ archive_entry_copy_pathname(ae, "ggghhhjjjrrrttt.o"); archive_entry_set_filetype(ae, AE_IFREG); archive_entry_set_size(ae, 7); - assertA(0 == archive_write_header(a, ae)); - assertA(7 == archive_write_data(a, "7777777", 7)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae)); + assertEqualIntA(a, 7, archive_write_data(a, "7777777", 7)); archive_entry_free(ae); /* test full pathname */ @@ -82,8 +82,8 @@ archive_entry_copy_pathname(ae, "/usr/home/xx/iiijjjdddsssppp.o"); archive_entry_set_mode(ae, S_IFREG | 0755); archive_entry_set_size(ae, 8); - assertA(0 == archive_write_header(a, ae)); - assertA(8 == archive_write_data(a, "88877766", 8)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae)); + assertEqualIntA(a, 8, archive_write_data(a, "88877766", 8)); archive_entry_free(ae); /* trailing "/" should be rejected */ @@ -105,46 +105,46 @@ #if ARCHIVE_VERSION_NUMBER < 2000000 archive_write_finish(a); #else - assert(0 == archive_write_finish(a)); + assertEqualInt(0, archive_write_finish(a)); #endif /* * Now, read the data back. */ assert((a = archive_read_new()) != NULL); - assertA(0 == archive_read_support_format_all(a)); - assertA(0 == archive_read_support_compression_all(a)); - assertA(0 == archive_read_open_memory(a, buff, used)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_compression_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); - assertA(0 == archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt(0, archive_entry_mtime(ae)); assertEqualString("//", archive_entry_pathname(ae)); assertEqualInt(0, archive_entry_size(ae)); - assertA(0 == archive_read_next_header(a, &ae)); - assert(1 == archive_entry_mtime(ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualInt(1, archive_entry_mtime(ae)); assertEqualString("abcdefghijklmn.o", archive_entry_pathname(ae)); - assert(8 == archive_entry_size(ae)); - assertA(8 == archive_read_data(a, buff2, 10)); - assert(0 == memcmp(buff2, "87654321", 8)); + assertEqualInt(8, archive_entry_size(ae)); + assertEqualIntA(a, 8, archive_read_data(a, buff2, 10)); + assertEqualMem(buff2, "87654321", 8); - assert(0 == archive_read_next_header(a, &ae)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 22 23:57:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57B061065679; Mon, 22 Dec 2008 23:57:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C0751065678 for ; Mon, 22 Dec 2008 23:57:33 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 096838FC23 for ; Mon, 22 Dec 2008 23:57:33 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBMNvW9K059318 for ; Mon, 22 Dec 2008 23:57:32 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBMNvWSR059315 for perforce@freebsd.org; Mon, 22 Dec 2008 23:57:32 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 22 Dec 2008 23:57:32 GMT Message-Id: <200812222357.mBMNvWSR059315@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155135 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, 22 Dec 2008 23:57:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=155135 Change 155135 by ed@ed_dull on 2008/12/22 23:57:18 Some upstream changes to libteken. The important fix being: - Don't print characters that have a width of zero columns. Eventually we should do some special character processing with it, but especially for a basic UTF-8 implementation, just ignoring the characters is good enough. Libteken already does a better job than the Linux console driver (which also speaks UTF-8). The Linux console driver seems to assume all characters have a width of 1 column. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#8 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#13 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#8 (text+ko) ==== @@ -178,7 +178,7 @@ teken_pos_t tp = { .tp_row = 24, .tp_col = 80 }; #if !(defined(__FreeBSD__) && defined(_KERNEL)) - df = fopen("debuglog", "w"); + df = fopen("teken.log", "w"); if (df != NULL) setvbuf(df, NULL, _IOLBF, BUFSIZ); #endif /* !(__FreeBSD__ && _KERNEL) */ ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#13 (text+ko) ==== @@ -511,15 +511,13 @@ teken_rect_t tr; tr.tr_begin = t->t_cursor; + teken_subr_cursor_forward_tabulation(t, 1); tr.tr_end.tp_row = tr.tr_begin.tp_row + 1; - - teken_subr_cursor_forward_tabulation(t, 1); + tr.tr_end.tp_col = t->t_cursor.tp_col; /* Blank region that we skipped. */ - if (t->t_cursor.tp_col > tr.tr_begin.tp_col) { - tr.tr_end.tp_col = t->t_cursor.tp_col; + if (tr.tr_end.tp_col > tr.tr_begin.tp_col) teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); - } } static void @@ -669,8 +667,9 @@ { int width; + /* XXX: Don't process zero-width characters yet. */ width = teken_wcwidth(c); - if (width < 0) + if (width <= 0) return; if (t->t_stateflags & TS_INSERT) { From owner-p4-projects@FreeBSD.ORG Tue Dec 23 00:03:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBC081065670; Tue, 23 Dec 2008 00:03:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E8121065678 for ; Tue, 23 Dec 2008 00:03:39 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B09D8FC1A for ; Tue, 23 Dec 2008 00:03:39 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBN03dKJ060740 for ; Tue, 23 Dec 2008 00:03:39 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBN03dmb060738 for perforce@freebsd.org; Tue, 23 Dec 2008 00:03:39 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 23 Dec 2008 00:03:39 GMT Message-Id: <200812230003.mBN03dmb060738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155136 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, 23 Dec 2008 00:03:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=155136 Change 155136 by rene@rene_self on 2008/12/23 00:03:22 Translated 53% of problem-reports. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#6 (text+ko) ==== @@ -259,12 +259,12 @@ url="&url.books.handbook;/eresources.html#ERESOURCES-MAIL">mailinglijsten —als u niet geabonneerd bent, gebruik dan de - doorzoekbare archieven op de &os;-website. Als uw - probleem niet op de lijsten bediscussieerd is, kunt u proberen - om er een bericht over te posten en enkele dagen wachten om te - zien of iemand iets kan zien wat u misschien over het hoofd - heeft gezien. + url="http://www.FreeBSD.org/search/search.html#mailinglists"> + de doorzoekbare archieven op de &os;-website. Als + uw probleem niet op de lijsten bediscussieerd is, kunt u + proberen om er een bericht over te posten en enkele dagen + wachten om te zien of iemand iets kan zien wat u misschien + over het hoofd heeft gezien. @@ -464,9 +464,6 @@ - any environment variables that override the - defaults in bsd.port.mk, such - as PORTSDIR alle omgevingsvariabelen die de standaardwaarden in bsd.port.mk overschrijven, zoals PORTSDIR @@ -574,114 +571,126 @@
          - Attaching patches or files + Patches of bestanden bijvoegen - The following applies to submitting PRs via email: + Het volgende geldt voor het versturen van PR's via + email: - The &man.send-pr.1; program has provisions for attaching - files to a problem report. You can attach as many files as - you want provided that each has a unique base name (i.e. the - name of the file proper, without the path). Just use the - command-line option to specify the names - of the files you wish to attach: + Het programma &man.send-pr.1; heeft voorzieningen voor het + bijvoegen van bestanden aan een probleemrapport. U kunt zoveel + bestanden bijvoegen als u wilt op voorwaarde dat elk bestand een + unieke basisnaam (i.e. de naam van het bestand zelf, zonder het + pad) heeft. Gebruik de opdrachtregeloptie + om de namen van de bij te voegen bestanden te + specificeren: &prompt.user; send-pr -a /var/run/dmesg -a /tmp/errors - Do not worry about binary files, they will be automatically - encoded so as not to upset your mail agent. + Maakt u zich geen zorgen over binaire bestanden, deze worden + automatisch gecodeerd zodat ze de mailagent niet + verontrusten. - If you attach a patch, make sure you use the - or option to - &man.diff.1; to create a context or unified diff (unified is - preferred), and make - sure to specify the exact CVS revision numbers of the files - you modified so the developers who read your report will be - able to apply them easily. For problems with the kernel or the - base utilities, a patch against &os.current; (the HEAD - CVS branch) is preferred since all new code should be applied - and tested there first. After appropriate or substantial testing - has been done, the code will be merged/migrated to the &os.stable; - branch. + Als u een patch bijvoegt, gebruik dan de optie + of met &man.diff.1; om + een context- of verenigde diff (verenigd is geprefereerd) aan te + maken, en zorg ervoor dat u de exactie revisienummers uit CVS + specificeert vna de bestanden die u heeft gewijzigd zodat de + ontwikkelaars die uw rapport lezen ze gemakkelijk kunnen + toepassen. Voor problemen met de kernel of de + basisgereedschappen is een patch tegen &os.current; (de CVS-tak + HEAD) geprefereerd aangezien alle nieuwe code eerst daar + toegepast en getest dient te worden. Nadat het juist of + substantiële is getest, wordt de code samengevoegd of + gemigreerd naar de tak &os.stable;. - If you attach a patch inline, instead of as an attachment, - note that the most common problem by far is the tendency of some - email programs to render tabs as spaces, which will completely - ruin anything intended to be part of a Makefile. + Als u een patch inline in plaats van als bijlage bijvoegt, + merk dan op dat het meest voorkomende probleem de neiging is van + sommige emailprogramma's om tabs als spaties weer te geven, wat + alles dat bedoeld was als deel van een Makefile volledig + ruineert. - Do not send patches as attachments using + Stuur geen patches als bijlagen door gebruik te maken van Content-Transfer-Encoding: quoted-printable. - These will perform character escaping and the entire patch - will be useless. + Dit zal karakter-escaping uitvoeren en de gehele patch + waardeloos maken. - Also note that while including small patches in a PR is - generally all right—particularly when they fix the problem - described in the PR—large patches and especially new code - which may require substantial review before committing should - be placed on a web or ftp server, and the URL should be - included in the PR instead of the patch. Patches in email - tend to get mangled, especially when GNATS is involved, and - the larger the patch, the harder it will be for interested - parties to unmangle it. Also, posting a patch on the web - allows you to modify it without having to resubmit the entire - patch in a followup to the original PR. Finally, large - patches simply increase the size of the database, since - closed PRs are not actually deleted but instead kept and - simply marked as closed. + Merk ook op dat hoewel het over het algemeen goed is om + kleine patches in een PR op te nemen—in het bijzonder als + ze het probleem dat in het PR beschreven is oplossen—grote + patches en in het bijzonder nieuwe code waarvoor + substantiële review nodig kan zijn voordat het gecommit + wordt op een web- of FTP-server geplaatst dient te worden, en de + URL in plaats van de patch dient bij het PR gevoegd te worden. + Patches in email hebben de neiging om gemangeld te worden, in + het bijzonder wanneer GNATS er betrokken in is, en hoe groter + de patch, des te moeilijker het is voor geïnteresseerde + partijen om het te ontrafelen. Ook stelt het posten van een + patch op het web u in staat om het te wijzigen zonder dat nodig + is om de gehele patch opnieuw in te zenden als een opvolgbericht + op het originele PR. Ten slotte vergroten grote patches + simpelweg de omvang van de database, aangezien gesloten PR's + niet worden verwijderd maar in plaats daarvan worden bewaard en + simpelweg als closed worden + gemarkeerd. - You should also take note that unless you explicitly - specify otherwise in your PR or in the patch itself, any - patches you submit will be assumed to be licensed under the - same terms as the original file you modified. + U dient ook te weten dat tenzij u het expliciet vermeld in + uw PR of in de patch zelf, dat van alle patches die u instuurt + wordt aangenomen dat ze onder dezelfde licentietermen vallen als + het origninele bestand dat u heeft gewijzigd.
          - Filling out the template + Het sjabloon invullen - The next section applies to the email method only: + De volgende sectie heeft alleen betrekking op de + emailmethode: - When you run &man.send-pr.1;, you are presented with a - template. The template consists of a list of fields, some of - which are pre-filled, and some of which have comments explaining - their purpose or listing acceptable values. Do not worry - about the comments; they will be removed automatically if you - do not modify them or remove them yourself. + Wanneer u &man.send-pr.1; draait, wordt er een sjabloon aan + u gepresenteerd. Het sjabloon bestaat uit een lijst met velden, + waarvan sommige al zijn ingevuld, en waarvan bij anderen staat + uitgelegd wat de bedoeling is of wat acceptabele waarden zijn. + Maakt u zich geeen zorgen over het commentaar, deze worden + automatisch verwijderds wanneer u ze niet wijzigt of ze zelf + verwijdert. - At the top of the template, below the - SEND-PR: lines, are the email headers. You - do not normally need to modify these, unless you are sending - the problem report from a machine or account that can send but - not receive mail, in which case you will want to set the - From: and Reply-To: to - your real email address. You may also want to send yourself - (or someone else) a carbon copy of the problem report by - adding one or more email addresses to the - Cc: header. + Bovenaan het sjabloon, onder de regels met + SEND-PR:, staan de emailkoppen. U hoeft + deze normaalgesproken niet te wijzigen, tenzij u het + probleemrapport vanaf een machine of account verstuurt die wel + mail kan versturen maar niet kan ontvangen; in dat geval wilt u + waarschijnlijk de velden From: en + Reply-To: op uw echte emailadres instellen. + U kunt uzelf (of iemand anders) een carbonkopie van het + probleemrapport versturen door één of meer + emailadressen aan de kop Cc: toe te + voegen. - In the email template you will find the following two - single-line fields: + In het emailsjabloon vindt u de volgende twee velden van + één regel: - Submitter-Id: Do not change this. - The default value of current-users is - correct, even if you run &os.stable;. + Submitter-Id: Verander dit niet. + De standaardwaarde current-users is + juist, zelfs als u &os.stable; draait. - Confidential: This is prefilled - to no. Changing it makes no sense as - there is no such thing as a confidential &os; problem - report—the PR database is distributed worldwide by + Confidential: Dit is vooraf + ingevuld met no. Het heeft geen zin om + dit te veranderen aangezien er geen vertrouwelijk &os; + probleemrapport bestaat— de PR-database wordt + wereldwijd gedistribueerd door CVSup. - - The next section describes fields that are common to both - the email interface and the web interface: + De volgende sectie beschrijft velden die zowel in de + emailinterface als in de webinterface + voorkomen: - Originator: Please specify your real name, optionally followed @@ -1167,7 +1176,6 @@ the inconvenience and email your problem report to the bugbuster team at freebsd-bugbusters@FreeBSD.org.
          -
          @@ -1221,7 +1229,6 @@ Subject: Re: ports/12345: compilation problem with foo/bar - If the problem report remains open after the problem has From owner-p4-projects@FreeBSD.ORG Tue Dec 23 04:10:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D8BD1065679; Tue, 23 Dec 2008 04:10:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FF64106564A for ; Tue, 23 Dec 2008 04:10:52 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0ECBB8FC1A for ; Tue, 23 Dec 2008 04:10:52 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBN4ApZf097602 for ; Tue, 23 Dec 2008 04:10:51 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBN4ApQl097600 for perforce@freebsd.org; Tue, 23 Dec 2008 04:10:51 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 23 Dec 2008 04:10:51 GMT Message-Id: <200812230410.mBN4ApQl097600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155146 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, 23 Dec 2008 04:10:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=155146 Change 155146 by weongyo@weongyo_ws on 2008/12/23 04:10:13 style(9) Affected files ... .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#9 edit Differences ... ==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#9 (text+ko) ==== @@ -113,10 +113,10 @@ }; #define NDIS_VAP(vap) ((struct ndis_vap *)(vap)) -#define NDISUSB_CONFIG_NO 1 +#define NDISUSB_CONFIG_NO 1 #define NDISUSB_IFACE_INDEX 0 -#define NDISUSB_INTR_TIMEOUT 1000 -#define NDISUSB_TX_TIMEOUT 10000 +#define NDISUSB_INTR_TIMEOUT 1000 +#define NDISUSB_TX_TIMEOUT 10000 struct ndisusb_xfer { usbd_xfer_handle nx_xfer; usbd_private_handle nx_priv; @@ -204,27 +204,27 @@ io_workitem *ndisusb_xferitem; list_entry ndisusb_xferlist; kspin_lock ndisusb_xferlock; -#define NDISUSB_ENDPT_BOUT 0 -#define NDISUSB_ENDPT_BIN 1 -#define NDISUSB_ENDPT_IIN 2 -#define NDISUSB_ENDPT_IOUT 3 -#define NDISUSB_ENDPT_MAX 4 +#define NDISUSB_ENDPT_BOUT 0 +#define NDISUSB_ENDPT_BIN 1 +#define NDISUSB_ENDPT_IIN 2 +#define NDISUSB_ENDPT_IOUT 3 +#define NDISUSB_ENDPT_MAX 4 usbd_pipe_handle ndisusb_ep[NDISUSB_ENDPT_MAX]; char *ndisusb_iin_buf; int ndisusb_status; #define NDISUSB_STATUS_DETACH 0x1 }; -#define NDISMTX_LOCK(_sc) mtx_lock(&(_sc)->ndis_mtx) -#define NDISMTX_UNLOCK(_sc) mtx_unlock(&(_sc)->ndis_mtx) -#define NDISUSB_LOCK(_sc) mtx_lock(&Giant) -#define NDISUSB_UNLOCK(_sc) mtx_unlock(&Giant) -#define NDIS_LOCK(_sc) do { \ +#define NDISMTX_LOCK(_sc) mtx_lock(&(_sc)->ndis_mtx) +#define NDISMTX_UNLOCK(_sc) mtx_unlock(&(_sc)->ndis_mtx) +#define NDISUSB_LOCK(_sc) mtx_lock(&Giant) +#define NDISUSB_UNLOCK(_sc) mtx_unlock(&Giant) +#define NDIS_LOCK(_sc) do { \ if ((_sc)->ndis_iftype == PNPBus) \ NDISUSB_LOCK(_sc); \ NDISMTX_LOCK(_sc); \ } while (0) -#define NDIS_UNLOCK(_sc) do { \ +#define NDIS_UNLOCK(_sc) do { \ if ((_sc)->ndis_iftype == PNPBus) \ NDISUSB_UNLOCK(_sc); \ NDISMTX_UNLOCK(_sc); \ From owner-p4-projects@FreeBSD.ORG Tue Dec 23 04:23:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A336F1065677; Tue, 23 Dec 2008 04:23:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6763E1065670 for ; Tue, 23 Dec 2008 04:23:04 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5521D8FC13 for ; Tue, 23 Dec 2008 04:23:04 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBN4N4e6099330 for ; Tue, 23 Dec 2008 04:23:04 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBN4N4Rm099328 for perforce@freebsd.org; Tue, 23 Dec 2008 04:23:04 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 23 Dec 2008 04:23:04 GMT Message-Id: <200812230423.mBN4N4Rm099328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155147 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, 23 Dec 2008 04:23:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=155147 Change 155147 by weongyo@weongyo_ws on 2008/12/23 04:22:30 revert r154981 to implement a PnP Manager; it looks unnecessary. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/kern_ndis.c#9 edit .. //depot/projects/ndisusb/sys/compat/ndis/ntoskrnl_var.h#7 edit .. //depot/projects/ndisusb/sys/compat/ndis/subr_ntoskrnl.c#8 edit .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#34 edit .. //depot/projects/ndisusb/sys/compat/ndis/usbd_var.h#7 edit .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#15 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/kern_ndis.c#9 (text+ko) ==== @@ -88,10 +88,6 @@ static void ndis_intrsetup(kdpc *, device_object *, irp *, struct ndis_softc *); static void ndis_return(device_object *, void *); -static int32_t ndis_iodispatch(device_object *, irp *); -static int32_t ndis_ioinvalid(device_object *, irp *); -static int32_t ndis_pnp(device_object *, irp *); -static int32_t ndis_power(device_object *, irp *); static image_patch_table kernndis_functbl[] = { IMPORT_SFUNC(ndis_status_func, 4), @@ -108,11 +104,6 @@ static struct nd_head ndis_devhead; -static funcptr ndis_iodispatch_wrap; -static funcptr ndis_ioinvalid_wrap; -static funcptr ndis_pnp_wrap; -static funcptr ndis_power_wrap; - /* * This allows us to export our symbols to other modules. * Note that we call ourselves 'ndisapi' to avoid a namespace @@ -156,16 +147,6 @@ } TAILQ_INIT(&ndis_devhead); - - windrv_wrap((funcptr)ndis_ioinvalid, - (funcptr *)&ndis_ioinvalid_wrap, 2, WINDRV_WRAP_STDCALL); - windrv_wrap((funcptr)ndis_iodispatch, - (funcptr *)&ndis_iodispatch_wrap, 2, WINDRV_WRAP_STDCALL); - windrv_wrap((funcptr)ndis_pnp, - (funcptr *)&ndis_pnp_wrap, 2, WINDRV_WRAP_STDCALL); - windrv_wrap((funcptr)ndis_power, - (funcptr *)&ndis_power_wrap, 2, WINDRV_WRAP_STDCALL); - break; case MOD_SHUTDOWN: if (TAILQ_FIRST(&ndis_devhead) == NULL) { @@ -181,11 +162,6 @@ windrv_unwrap(patch->ipt_wrap); patch++; } - - windrv_unwrap(ndis_ioinvalid_wrap); - windrv_unwrap(ndis_iodispatch_wrap); - windrv_unwrap(ndis_pnp_wrap); - windrv_unwrap(ndis_power_wrap); } break; case MOD_UNLOAD: @@ -1418,7 +1394,7 @@ ndis_miniport_block *block; struct ndis_softc *sc; uint32_t status; - int error, i; + int error; sc = device_get_softc(pdo->do_devext); @@ -1492,96 +1468,9 @@ TAILQ_INSERT_TAIL(&ndis_devhead, block, link); - for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - drv->dro_dispatch[i] = (driver_dispatch)ndis_ioinvalid_wrap; - drv->dro_dispatch[IRP_MJ_INTERNAL_DEVICE_CONTROL] = - (driver_dispatch)ndis_iodispatch_wrap; - drv->dro_dispatch[IRP_MJ_POWER] = (driver_dispatch)ndis_power_wrap; - drv->dro_dispatch[IRP_MJ_PNP] = (driver_dispatch)ndis_pnp_wrap; - return (STATUS_SUCCESS); } -static int32_t -ndis_ioinvalid(dobj, ip) - device_object *dobj; - irp *ip; -{ - device_t dev = IRP_NDIS_DEV(ip); - struct io_stack_location *irp_sl; - - irp_sl = IoGetCurrentIrpStackLocation(ip); - device_printf(dev, "%s: unsupported I/O dispatch %d:%d\n", - __func__, irp_sl->isl_major, irp_sl->isl_minor); - - ip->irp_iostat.isb_status = STATUS_FAILURE; - ip->irp_iostat.isb_info = 0; - - IoCompleteRequest(ip, IO_NO_INCREMENT); - - return (STATUS_FAILURE); -} - -static int32_t -ndis_iodispatch(dobj, ip) - device_object *dobj; - irp *ip; -{ - device_t dev = IRP_NDIS_DEV(ip); - struct io_stack_location *irp_sl; - - irp_sl = IoGetCurrentIrpStackLocation(ip); - device_printf(dev, "%s: unsupported I/O dispatch %d:%d\n", - __func__, irp_sl->isl_major, irp_sl->isl_minor); - - ip->irp_iostat.isb_status = STATUS_FAILURE; - ip->irp_iostat.isb_info = 0; - - IoCompleteRequest(ip, IO_NO_INCREMENT); - - return (STATUS_FAILURE); -} - -static int32_t -ndis_power(dobj, ip) - device_object *dobj; - irp *ip; -{ - device_t dev = IRP_NDIS_DEV(ip); - struct io_stack_location *irp_sl; - - irp_sl = IoGetCurrentIrpStackLocation(ip); - device_printf(dev, "%s: unsupported I/O dispatch %d:%d\n", - __func__, irp_sl->isl_major, irp_sl->isl_minor); - - ip->irp_iostat.isb_status = STATUS_FAILURE; - ip->irp_iostat.isb_info = 0; - - IoCompleteRequest(ip, IO_NO_INCREMENT); - - return (STATUS_FAILURE); -} - -static int32_t -ndis_pnp(dobj, ip) - device_object *dobj; - irp *ip; -{ - device_t dev = IRP_NDIS_DEV(ip); - struct io_stack_location *irp_sl; - - irp_sl = IoGetCurrentIrpStackLocation(ip); - device_printf(dev, "%s: unsupported I/O dispatch %d:%d\n", - __func__, irp_sl->isl_major, irp_sl->isl_minor); - - ip->irp_iostat.isb_status = STATUS_FAILURE; - ip->irp_iostat.isb_info = 0; - - IoCompleteRequest(ip, IO_NO_INCREMENT); - - return (STATUS_FAILURE); -} - int ndis_unload_driver(arg) void *arg; ==== //depot/projects/ndisusb/sys/compat/ndis/ntoskrnl_var.h#7 (text+ko) ==== @@ -924,10 +924,6 @@ void *isl_arg3; void *isl_arg4; } isl_others; - struct { - void *isl_res; - void *isl_restran; - } isl_startdev; } isl_parameters __attribute__((packed)); void *isl_devobj; @@ -1423,8 +1419,6 @@ extern void IoFreeWorkItem(io_workitem *); extern void IoQueueWorkItem(io_workitem *, io_workitem_func, uint32_t, void *); -extern irp *IoBuildSynchronousFsdRequest(uint32_t, device_object *, - void *, uint32_t, uint64_t *, nt_kevent *, io_status_block *); #define IoCallDriver(a, b) IofCallDriver(a, b) #define IoCompleteRequest(a, b) IofCompleteRequest(a, b) ==== //depot/projects/ndisusb/sys/compat/ndis/subr_ntoskrnl.c#8 (text+ko) ==== @@ -130,6 +130,8 @@ unicode_string *, uint8_t); static void RtlCopyUnicodeString(unicode_string *, unicode_string *); +static irp *IoBuildSynchronousFsdRequest(uint32_t, device_object *, + void *, uint32_t, uint64_t *, nt_kevent *, io_status_block *); static irp *IoBuildAsynchronousFsdRequest(uint32_t, device_object *, void *, uint32_t, uint64_t *, io_status_block *); static irp *IoBuildDeviceIoControlRequest(uint32_t, @@ -858,7 +860,7 @@ return (d); } -irp * +static irp * IoBuildSynchronousFsdRequest(func, dobj, buf, len, off, event, status) uint32_t func; device_object *dobj; ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#34 (text+ko) ==== @@ -88,8 +88,6 @@ static int32_t usbd_ioinvalid(device_object *, irp *); static int32_t usbd_pnp(device_object *, irp *); static int32_t usbd_power(device_object *, irp *); -static uint32_t usbd_sendirp(device_t, device_object *, uint32_t, - uint32_t, io_stack_location *); static void usbd_irpcancel(device_object *, irp *); static void usbd_irpcancel_cb(void *); static int32_t usbd_submit_urb(irp *); @@ -288,55 +286,6 @@ return (STATUS_FAILURE); } -static uint32_t -usbd_sendirp(dev, pdo, major, minor, sl) - device_t dev; - device_object *pdo; - uint32_t major; - uint32_t minor; - io_stack_location *sl; -{ - device_object *top = IoGetAttachedDevice(pdo); - io_stack_location *irp_sl; - irp *ip; - nt_kevent evt; - uint32_t status; - - KeInitializeEvent(&evt, EVENT_TYPE_NOTIFY, FALSE); - ip = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, top, NULL, 0, NULL, &evt, - NULL); - if (ip == NULL) - return (STATUS_NO_MEMORY); - ip->irp_iostat.isb_info = 0; - ip->irp_iostat.isb_status = STATUS_NOT_IMPLEMENTED; - IRP_NDIS_DEV(ip) = dev; - irp_sl = IoGetNextIrpStackLocation(ip); - if (sl != NULL) - bcopy(sl, irp_sl, sizeof(*sl)); - irp_sl->isl_major = major; - irp_sl->isl_minor = minor; - status = IoCallDriver(top, ip); - if (status == STATUS_PENDING) { - KeWaitForSingleObject(&evt, 0, 0, FALSE, NULL); - status = ip->irp_iostat.isb_status; - } - return (status); -} - -uint32_t -usbd_pnp_startdev(dev, pdo) - device_t dev; - device_object *pdo; -{ - io_stack_location sl; - - bzero(&sl, sizeof(sl)); - sl.isl_parameters.isl_startdev.isl_res = NULL; - sl.isl_parameters.isl_startdev.isl_restran = NULL; - - return usbd_sendirp(dev, pdo, IRP_MJ_PNP, IRP_MN_START_DEVICE, &sl); -} - /* Convert USBD_STATUS to NTSTATUS */ static int32_t usbd_urb2nt(status) ==== //depot/projects/ndisusb/sys/compat/ndis/usbd_var.h#7 (text+ko) ==== @@ -217,7 +217,6 @@ __BEGIN_DECLS extern int usbd_libinit(void); extern int usbd_libfini(void); -extern uint32_t usbd_pnp_startdev(device_t, device_object *); __END_DECLS #endif /* _USBD_VAR_H_ */ ==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#15 (text+ko) ==== @@ -583,9 +583,6 @@ goto fail; } - if (sc->ndis_iftype == PNPBus) - usbd_pnp_startdev(dev, pdo); - /* Tell the user what version of the API the driver is using. */ device_printf(dev, "NDIS API version: %d.%d\n", sc->ndis_chars->nmc_version_major, From owner-p4-projects@FreeBSD.ORG Tue Dec 23 04:47:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABCF71065678; Tue, 23 Dec 2008 04:47:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 578B61065675 for ; Tue, 23 Dec 2008 04:47:29 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 468108FC1C for ; Tue, 23 Dec 2008 04:47:29 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBN4lT2K011161 for ; Tue, 23 Dec 2008 04:47:29 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBN4lTtq011159 for perforce@freebsd.org; Tue, 23 Dec 2008 04:47:29 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 23 Dec 2008 04:47:29 GMT Message-Id: <200812230447.mBN4lTtq011159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155149 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, 23 Dec 2008 04:47:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=155149 Change 155149 by weongyo@weongyo_ws on 2008/12/23 04:46:38 style(9) Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/usbd_var.h#8 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/usbd_var.h#8 (text+ko) ==== @@ -35,27 +35,27 @@ #ifndef _USBD_VAR_H_ #define _USBD_VAR_H_ -#define IOCTL_INTERNAL_USB_SUBMIT_URB 0x00220003 +#define IOCTL_INTERNAL_USB_SUBMIT_URB 0x00220003 -#define URB_FUNCTION_SELECT_CONFIGURATION 0x0000 -#define URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER 0x0009 -#define URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE 0x000B -#define URB_FUNCTION_VENDOR_DEVICE 0x0017 -#define URB_FUNCTION_VENDOR_INTERFACE 0x0018 -#define URB_FUNCTION_VENDOR_ENDPOINT 0x0019 -#define URB_FUNCTION_CLASS_DEVICE 0x001A -#define URB_FUNCTION_CLASS_INTERFACE 0x001B -#define URB_FUNCTION_CLASS_ENDPOINT 0x001C -#define URB_FUNCTION_CLASS_OTHER 0x001F -#define URB_FUNCTION_VENDOR_OTHER 0x0020 +#define URB_FUNCTION_SELECT_CONFIGURATION 0x0000 +#define URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER 0x0009 +#define URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE 0x000B +#define URB_FUNCTION_VENDOR_DEVICE 0x0017 +#define URB_FUNCTION_VENDOR_INTERFACE 0x0018 +#define URB_FUNCTION_VENDOR_ENDPOINT 0x0019 +#define URB_FUNCTION_CLASS_DEVICE 0x001A +#define URB_FUNCTION_CLASS_INTERFACE 0x001B +#define URB_FUNCTION_CLASS_ENDPOINT 0x001C +#define URB_FUNCTION_CLASS_OTHER 0x001F +#define URB_FUNCTION_VENDOR_OTHER 0x0020 -#define USBD_STATUS_SUCCESS 0x00000000 -#define USBD_STATUS_CANCELED 0x00010000 -#define USBD_STATUS_PENDING 0x40000000 -#define USBD_STATUS_NO_MEMORY 0x80000100 -#define USBD_STATUS_REQUEST_FAILED 0x80000500 -#define USBD_STATUS_INVALID_PIPE_HANDLE 0x80000600 -#define USBD_STATUS_ERROR_SHORT_TRANSFER 0x80000900 +#define USBD_STATUS_SUCCESS 0x00000000 +#define USBD_STATUS_CANCELED 0x00010000 +#define USBD_STATUS_PENDING 0x40000000 +#define USBD_STATUS_NO_MEMORY 0x80000100 +#define USBD_STATUS_REQUEST_FAILED 0x80000500 +#define USBD_STATUS_INVALID_PIPE_HANDLE 0x80000600 +#define USBD_STATUS_ERROR_SHORT_TRANSFER 0x80000900 #define USBD_STATUS_CRC 0xC0000001 #define USBD_STATUS_BTSTUFF 0xC0000002 #define USBD_STATUS_DATA_TOGGLE_MISMATCH 0xC0000003 @@ -74,9 +74,9 @@ #define USBD_STATUS_XACT_ERROR 0xC0000011 #define USBD_STATUS_BABBLE_DETECTED 0xC0000012 #define USBD_STATUS_DATA_BUFFER_ERROR 0xC0000013 -#define USBD_STATUS_NOT_SUPPORTED 0xC0000E00 -#define USBD_STATUS_TIMEOUT 0xC0006000 -#define USBD_STATUS_DEVICE_GONE 0xC0007000 +#define USBD_STATUS_NOT_SUPPORTED 0xC0000E00 +#define USBD_STATUS_TIMEOUT 0xC0006000 +#define USBD_STATUS_DEVICE_GONE 0xC0007000 struct usbd_urb_header { uint16_t uuh_len; @@ -95,26 +95,26 @@ struct usbd_pipe_information { uint16_t upi_maxpktsize; - uint8_t upi_epaddr; - uint8_t upi_interval; - enum usbd_pipe_type upi_type; - usb_endpoint_descriptor_t *upi_handle; - uint32_t upi_maxtxsize; -#define USBD_DEFAULT_MAXIMUM_TRANSFER_SIZE PAGE_SIZE - uint32_t upi_flags; + uint8_t upi_epaddr; + uint8_t upi_interval; + enum usbd_pipe_type upi_type; + usb_endpoint_descriptor_t *upi_handle; + uint32_t upi_maxtxsize; +#define USBD_DEFAULT_MAXIMUM_TRANSFER_SIZE PAGE_SIZE + uint32_t upi_flags; }; struct usbd_interface_information { - uint16_t uii_len; - uint8_t uii_intfnum; - uint8_t uii_altset; - uint8_t uii_intfclass; - uint8_t uii_intfsubclass; - uint8_t uii_intfproto; - uint8_t uii_reserved; - void *uii_handle; - uint32_t uii_numeps; - struct usbd_pipe_information uii_pipes[1]; + uint16_t uii_len; + uint8_t uii_intfnum; + uint8_t uii_altset; + uint8_t uii_intfclass; + uint8_t uii_intfsubclass; + uint8_t uii_intfproto; + uint8_t uii_reserved; + void *uii_handle; + uint32_t uii_numeps; + struct usbd_pipe_information uii_pipes[1]; }; struct usbd_urb_select_interface { @@ -138,7 +138,7 @@ struct usbd_urb_header ubi_hdr; usb_endpoint_descriptor_t *ubi_epdesc; uint32_t ubi_trans_flags; -#define USBD_SHORT_TRANSFER_OK 0x00000002 +#define USBD_SHORT_TRANSFER_OK 0x00000002 uint32_t ubi_trans_buflen; void *ubi_trans_buf; struct mdl *ubi_mdl; @@ -166,7 +166,7 @@ struct usbd_urb_header uvc_hdr; void *uvc_reserved0; uint32_t uvc_trans_flags; -#define USBD_TRANSFER_DIRECTION_IN 1 +#define USBD_TRANSFER_DIRECTION_IN 1 uint32_t uvc_trans_buflen; void *uvc_trans_buf; struct mdl *uvc_mdl; @@ -192,11 +192,11 @@ struct usbd_urb_vendor_or_class_request uu_vcreq; }; -#define USBD_URB_STATUS(urb) ((urb)->uu_hdr.uuh_status) +#define USBD_URB_STATUS(urb) ((urb)->uu_hdr.uuh_status) -#define USBDI_VERSION 0x00000500 -#define USB_VER_1_1 0x00000110 -#define USB_VER_2_0 0x00000200 +#define USBDI_VERSION 0x00000500 +#define USB_VER_1_1 0x00000110 +#define USB_VER_2_0 0x00000200 struct usbd_version_info { uint32_t uvi_usbdi_vers; From owner-p4-projects@FreeBSD.ORG Tue Dec 23 04:49:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3A111065678; Tue, 23 Dec 2008 04:49:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 874FE1065670 for ; Tue, 23 Dec 2008 04:49:31 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 760F68FC0C for ; Tue, 23 Dec 2008 04:49:31 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBN4nV7B011335 for ; Tue, 23 Dec 2008 04:49:31 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBN4nVFs011333 for perforce@freebsd.org; Tue, 23 Dec 2008 04:49:31 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 23 Dec 2008 04:49:31 GMT Message-Id: <200812230449.mBN4nVFs011333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155150 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, 23 Dec 2008 04:49:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=155150 Change 155150 by weongyo@weongyo_ws on 2008/12/23 04:48:55 style(9) Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/ntoskrnl_var.h#8 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/ntoskrnl_var.h#8 (text+ko) ==== @@ -537,9 +537,9 @@ #define WAITKEY_VALID 0x8000 /* kthread priority */ -#define LOW_PRIORITY 0 -#define LOW_REALTIME_PRIORITY 16 -#define HIGH_PRIORITY 31 +#define LOW_PRIORITY 0 +#define LOW_REALTIME_PRIORITY 16 +#define HIGH_PRIORITY 31 struct thread_context { void *tc_thrctx; @@ -1008,8 +1008,8 @@ #define irp_csl s2.u2.irp_csl #define irp_pkttype s2.u2.irp_pkttype -#define IRP_NDIS_DEV(irp) (irp)->irp_tail.irp_misc.irp_usb.irp_dev -#define IRP_NDISUSB_XFER(irp) (irp)->irp_tail.irp_misc.irp_usb.irp_xfer +#define IRP_NDIS_DEV(irp) (irp)->irp_tail.irp_misc.irp_usb.irp_dev +#define IRP_NDISUSB_XFER(irp) (irp)->irp_tail.irp_misc.irp_usb.irp_xfer typedef struct irp irp; @@ -1023,7 +1023,7 @@ (cancel_func)InterlockedExchangePointer( \ (void *)&(ip)->irp_cancelfunc, (void *)(func)) -#define IoSetCancelValue(irp, val) \ +#define IoSetCancelValue(irp, val) \ (uint32_t)InterlockedExchangePointer( \ (void *)&(ip)->irp_cancel, (void *)(val)) @@ -1053,7 +1053,7 @@ #define IoMarkIrpPending(irp) \ IoGetCurrentIrpStackLocation(irp)->isl_ctl |= SL_PENDING_RETURNED -#define IoUnmarkIrpPending(irp) \ +#define IoUnmarkIrpPending(irp) \ IoGetCurrentIrpStackLocation(irp)->isl_ctl &= ~SL_PENDING_RETURNED #define IoCopyCurrentIrpStackLocationToNext(irp) \ @@ -1211,21 +1211,21 @@ #define STATUS_ALERTED 0x00000101 #define STATUS_TIMEOUT 0x00000102 #define STATUS_PENDING 0x00000103 -#define STATUS_FAILURE 0xC0000001 -#define STATUS_NOT_IMPLEMENTED 0xC0000002 +#define STATUS_FAILURE 0xC0000001 +#define STATUS_NOT_IMPLEMENTED 0xC0000002 #define STATUS_INVALID_PARAMETER 0xC000000D #define STATUS_INVALID_DEVICE_REQUEST 0xC0000010 #define STATUS_MORE_PROCESSING_REQUIRED 0xC0000016 -#define STATUS_NO_MEMORY 0xC0000017 +#define STATUS_NO_MEMORY 0xC0000017 #define STATUS_BUFFER_TOO_SMALL 0xC0000023 #define STATUS_MUTANT_NOT_OWNED 0xC0000046 -#define STATUS_NOT_SUPPORTED 0xC00000BB +#define STATUS_NOT_SUPPORTED 0xC00000BB #define STATUS_INVALID_PARAMETER_2 0xC00000F0 #define STATUS_INSUFFICIENT_RESOURCES 0xC000009A #define STATUS_DEVICE_NOT_CONNECTED 0xC000009D -#define STATUS_CANCELLED 0xC0000120 +#define STATUS_CANCELLED 0xC0000120 #define STATUS_NOT_FOUND 0xC0000225 -#define STATUS_DEVICE_REMOVED 0xC00002B6 +#define STATUS_DEVICE_REMOVED 0xC00002B6 #define STATUS_WAIT_0 0x00000000 From owner-p4-projects@FreeBSD.ORG Tue Dec 23 05:30:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B2F31065673; Tue, 23 Dec 2008 05:30:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAAFF1065675 for ; Tue, 23 Dec 2008 05:30:18 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B77078FC16 for ; Tue, 23 Dec 2008 05:30:18 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBN5UI7k015322 for ; Tue, 23 Dec 2008 05:30:18 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBN5UFqe015318 for perforce@freebsd.org; Tue, 23 Dec 2008 05:30:15 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 23 Dec 2008 05:30:15 GMT Message-Id: <200812230530.mBN5UFqe015318@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155154 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, 23 Dec 2008 05:30:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=155154 Change 155154 by weongyo@weongyo_ws on 2008/12/23 05:29:58 IFC Affected files ... .. //depot/projects/ndisusb/COPYRIGHT#2 integrate .. //depot/projects/ndisusb/Makefile#4 integrate .. //depot/projects/ndisusb/ObsoleteFiles.inc#5 integrate .. //depot/projects/ndisusb/UPDATING#5 integrate .. //depot/projects/ndisusb/bin/sh/exec.c#2 integrate .. //depot/projects/ndisusb/contrib/binutils/bfd/config.bfd#2 integrate .. //depot/projects/ndisusb/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/ndisusb/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh#1 branch .. //depot/projects/ndisusb/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/ndisusb/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/ndisusb/contrib/ipfilter/ipsend/44arp.c#2 integrate .. //depot/projects/ndisusb/contrib/netcat/FREEBSD-vendor#2 integrate .. //depot/projects/ndisusb/contrib/netcat/nc.1#2 integrate .. //depot/projects/ndisusb/contrib/netcat/netcat.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/CREDITS#1 branch .. //depot/projects/ndisusb/contrib/openbsm/HISTORY#2 delete .. //depot/projects/ndisusb/contrib/openbsm/INSTALL#1 branch .. //depot/projects/ndisusb/contrib/openbsm/LICENSE#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/NEWS#1 branch .. //depot/projects/ndisusb/contrib/openbsm/README#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/TODO#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/VERSION#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/audit_triggers.defs#1 branch .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditd/auditd_control.defs#1 branch .. //depot/projects/ndisusb/contrib/openbsm/bin/auditfilterd/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/praudit/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/audit_uevents.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/compat/clock_gettime.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/compat/strlcat.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/compat/strlcpy.h#1 branch .. //depot/projects/ndisusb/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/configure#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_class.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_flags.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/sys/Makefile.am#1 branch .. //depot/projects/ndisusb/contrib/openbsm/sys/Makefile.in#1 branch .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/Makefile.am#1 branch .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/Makefile.in#1 branch .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit.h#1 branch .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit_internal.h#1 branch .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/ndisusb/contrib/openbsm/sys/bsm/audit_record.h#1 branch .. //depot/projects/ndisusb/contrib/openbsm/test/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/bsm/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/ndisusb/etc/Makefile#3 integrate .. //depot/projects/ndisusb/etc/devd.conf#4 integrate .. //depot/projects/ndisusb/etc/devd/Makefile#1 branch .. //depot/projects/ndisusb/etc/devd/asus.conf#1 branch .. //depot/projects/ndisusb/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/ndisusb/etc/newsyslog.conf#2 integrate .. //depot/projects/ndisusb/etc/rc.d/defaultroute#2 integrate .. //depot/projects/ndisusb/etc/regdomain.xml#2 integrate .. //depot/projects/ndisusb/etc/syslog.conf#2 integrate .. //depot/projects/ndisusb/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/ndisusb/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#1 branch .. //depot/projects/ndisusb/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h#1 branch .. //depot/projects/ndisusb/gnu/usr.bin/binutils/ld/Makefile.mips#1 branch .. //depot/projects/ndisusb/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh#1 branch .. //depot/projects/ndisusb/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh#1 branch .. //depot/projects/ndisusb/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh#1 branch .. //depot/projects/ndisusb/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh#1 branch .. //depot/projects/ndisusb/gnu/usr.bin/binutils/libbfd/Makefile.mips#1 branch .. //depot/projects/ndisusb/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/ndisusb/gnu/usr.bin/binutils/libopcodes/Makefile.mips#1 branch .. //depot/projects/ndisusb/gnu/usr.bin/cc/libiberty/config.h#2 integrate .. //depot/projects/ndisusb/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/ndisusb/gnu/usr.bin/sort/config.h#2 integrate .. //depot/projects/ndisusb/include/arpa/nameser.h#2 integrate .. //depot/projects/ndisusb/include/resolv.h#2 integrate .. //depot/projects/ndisusb/include/string.h#2 integrate .. //depot/projects/ndisusb/kerberos5/include/config.h#2 integrate .. //depot/projects/ndisusb/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive.h#3 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_compression_compress.c#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_compression_program.c#4 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_format_mtree.c#5 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_string.c#3 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/ndisusb/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/ndisusb/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/ndisusb/lib/libarchive/test/main.c#4 integrate .. //depot/projects/ndisusb/lib/libarchive/test/test_compat_bzip2.c#1 branch .. //depot/projects/ndisusb/lib/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch .. //depot/projects/ndisusb/lib/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch .. //depot/projects/ndisusb/lib/libarchive/test/test_compat_gtar.c#3 integrate .. //depot/projects/ndisusb/lib/libarchive/test/test_compat_gzip.c#1 branch .. //depot/projects/ndisusb/lib/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch .. //depot/projects/ndisusb/lib/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch .. //depot/projects/ndisusb/lib/libarchive/test/test_fuzz.c#1 branch .. //depot/projects/ndisusb/lib/libarchive/test/test_fuzz_1.iso.uu#1 branch .. //depot/projects/ndisusb/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate .. //depot/projects/ndisusb/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/ndisusb/lib/libarchive/test/test_read_pax_truncated.c#3 integrate .. //depot/projects/ndisusb/lib/libarchive/test/test_write_compress.c#3 integrate .. //depot/projects/ndisusb/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/ndisusb/lib/libarchive/test/test_write_format_ar.c#3 integrate .. //depot/projects/ndisusb/lib/libarchive/test/test_write_format_cpio.c#3 integrate .. //depot/projects/ndisusb/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/ndisusb/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/ndisusb/lib/libc/gen/times.3#2 integrate .. //depot/projects/ndisusb/lib/libc/include/isc/eventlib.h#2 integrate .. //depot/projects/ndisusb/lib/libc/include/isc/platform.h#1 branch .. //depot/projects/ndisusb/lib/libc/inet/inet_net_pton.c#2 integrate .. //depot/projects/ndisusb/lib/libc/net/rcmd.3#2 integrate .. //depot/projects/ndisusb/lib/libc/resolv/res_debug.c#2 integrate .. //depot/projects/ndisusb/lib/libc/resolv/res_mkquery.c#2 integrate .. //depot/projects/ndisusb/lib/libc/resolv/res_query.c#2 integrate .. //depot/projects/ndisusb/lib/libc/resolv/res_send.c#2 integrate .. //depot/projects/ndisusb/lib/libc/stdio/fread.c#2 integrate .. //depot/projects/ndisusb/lib/libc/stdio/vfprintf.c#3 integrate .. //depot/projects/ndisusb/lib/libc/stdio/vfwprintf.c#4 integrate .. //depot/projects/ndisusb/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/ndisusb/lib/libc/string/Makefile.inc#3 integrate .. //depot/projects/ndisusb/lib/libc/string/Symbol.map#3 integrate .. //depot/projects/ndisusb/lib/libc/string/strdup.3#2 integrate .. //depot/projects/ndisusb/lib/libc/string/strndup.c#1 branch .. //depot/projects/ndisusb/lib/libc/string/strsep.3#2 integrate .. //depot/projects/ndisusb/lib/libc/sys/cpuset_getaffinity.2#3 integrate .. //depot/projects/ndisusb/lib/libc/sys/jail.2#3 integrate .. //depot/projects/ndisusb/lib/libc/sys/recv.2#2 integrate .. //depot/projects/ndisusb/lib/libfetch/fetch.3#2 integrate .. //depot/projects/ndisusb/lib/libfetch/fetch.c#2 integrate .. //depot/projects/ndisusb/lib/libfetch/fetch.h#2 integrate .. //depot/projects/ndisusb/lib/libfetch/http.c#3 integrate .. //depot/projects/ndisusb/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/ndisusb/lib/libmagic/config.h#2 integrate .. //depot/projects/ndisusb/lib/libmd/Makefile#2 integrate .. //depot/projects/ndisusb/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/ndisusb/lib/libpmc/libpmcinternal.h#1 branch .. //depot/projects/ndisusb/lib/libpmc/pmc.atom.3#2 integrate .. //depot/projects/ndisusb/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/ndisusb/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/ndisusb/lib/libstand/bootp.c#2 integrate .. //depot/projects/ndisusb/lib/libstand/if_ether.h#2 integrate .. //depot/projects/ndisusb/lib/libthr/thread/thr_fork.c#2 integrate .. //depot/projects/ndisusb/lib/libthr/thread/thr_rtld.c#2 integrate .. //depot/projects/ndisusb/lib/libutil/Makefile#4 integrate .. //depot/projects/ndisusb/lib/libutil/kinfo_getfile.3#1 branch .. //depot/projects/ndisusb/lib/libutil/kinfo_getfile.c#1 branch .. //depot/projects/ndisusb/lib/libutil/kinfo_getvmmap.3#1 branch .. //depot/projects/ndisusb/lib/libutil/kinfo_getvmmap.c#1 branch .. //depot/projects/ndisusb/lib/libutil/libutil.h#3 integrate .. //depot/projects/ndisusb/libexec/bootpd/rtmsg.c#2 integrate .. //depot/projects/ndisusb/libexec/ftpd/extern.h#2 integrate .. //depot/projects/ndisusb/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/ndisusb/libexec/ftpd/ftpd.c#2 integrate .. //depot/projects/ndisusb/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/ndisusb/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/ndisusb/libexec/rtld-elf/rtld_lock.c#3 integrate .. //depot/projects/ndisusb/libexec/rtld-elf/rtld_lock.h#2 integrate .. //depot/projects/ndisusb/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate .. //depot/projects/ndisusb/release/picobsd/tinyware/ns/ns.c#2 integrate .. //depot/projects/ndisusb/sbin/atacontrol/atacontrol.8#3 integrate .. //depot/projects/ndisusb/sbin/devd/devd.cc#2 integrate .. //depot/projects/ndisusb/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/ndisusb/sbin/geom/class/part/geom_part.c#5 integrate .. //depot/projects/ndisusb/sbin/geom/misc/subr.c#3 integrate .. //depot/projects/ndisusb/sbin/ifconfig/ifieee80211.c#4 integrate .. //depot/projects/ndisusb/sbin/ifconfig/ifvlan.c#3 integrate .. //depot/projects/ndisusb/sbin/ifconfig/regdomain.c#3 integrate .. //depot/projects/ndisusb/sbin/ifconfig/regdomain.h#2 integrate .. //depot/projects/ndisusb/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/ndisusb/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/ndisusb/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/ndisusb/sbin/mount/mount.c#3 integrate .. //depot/projects/ndisusb/sbin/mount/mount_fs.c#2 integrate .. //depot/projects/ndisusb/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/ndisusb/sbin/newfs/Makefile#2 integrate .. //depot/projects/ndisusb/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/ndisusb/sbin/newfs/newfs.8#2 integrate .. //depot/projects/ndisusb/sbin/newfs/newfs.c#2 integrate .. //depot/projects/ndisusb/sbin/newfs/newfs.h#2 integrate .. //depot/projects/ndisusb/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/projects/ndisusb/sbin/newfs_msdos/newfs_msdos.c#3 integrate .. //depot/projects/ndisusb/sbin/route/route.c#2 integrate .. //depot/projects/ndisusb/sbin/routed/table.c#2 integrate .. //depot/projects/ndisusb/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/ndisusb/share/man/man4/Makefile#4 integrate .. //depot/projects/ndisusb/share/man/man4/acpi_aiboost.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/acpi_asus.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/ale.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/bce.4#3 integrate .. //depot/projects/ndisusb/share/man/man4/cxgb.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/ddb.4#5 integrate .. //depot/projects/ndisusb/share/man/man4/fxp.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/man4.arm/Makefile#2 integrate .. //depot/projects/ndisusb/share/man/man4/man4.arm/mge.4#1 branch .. //depot/projects/ndisusb/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/ndisusb/share/man/man4/man4.powerpc/pmu.4#1 branch .. //depot/projects/ndisusb/share/man/man4/route.4#2 integrate .. //depot/projects/ndisusb/share/man/man4/upgt.4#2 integrate .. //depot/projects/ndisusb/share/man/man7/ports.7#2 integrate .. //depot/projects/ndisusb/share/man/man9/Makefile#4 integrate .. //depot/projects/ndisusb/share/man/man9/VOP_STRATEGY.9#2 integrate .. //depot/projects/ndisusb/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/ndisusb/share/man/man9/ifnet.9#2 integrate .. //depot/projects/ndisusb/share/man/man9/ktr.9#2 integrate .. //depot/projects/ndisusb/share/man/man9/rtalloc.9#2 integrate .. //depot/projects/ndisusb/share/man/man9/rtentry.9#2 integrate .. //depot/projects/ndisusb/share/man/man9/style.9#4 integrate .. //depot/projects/ndisusb/share/misc/bsd-family-tree#4 integrate .. //depot/projects/ndisusb/sys/amd64/Makefile#2 integrate .. //depot/projects/ndisusb/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/ndisusb/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/ndisusb/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/ndisusb/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/ndisusb/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/ndisusb/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/ndisusb/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/ndisusb/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/ndisusb/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/ndisusb/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/ndisusb/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/ndisusb/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/ndisusb/sys/amd64/include/elf.h#2 integrate .. //depot/projects/ndisusb/sys/amd64/include/pmc_mdep.h#4 integrate .. //depot/projects/ndisusb/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/ndisusb/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/ndisusb/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/ndisusb/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/ndisusb/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/ndisusb/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/ndisusb/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/ndisusb/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/ndisusb/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/ndisusb/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/ndisusb/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/ndisusb/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/ndisusb/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/ndisusb/sys/arm/conf/AVILA#3 integrate .. //depot/projects/ndisusb/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/ndisusb/sys/arm/conf/BWCT#3 integrate .. //depot/projects/ndisusb/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/ndisusb/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/ndisusb/sys/arm/conf/CRB#3 integrate .. //depot/projects/ndisusb/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/ndisusb/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/ndisusb/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/ndisusb/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/ndisusb/sys/arm/conf/EP80219#3 integrate .. //depot/projects/ndisusb/sys/arm/conf/GUMSTIX#3 integrate .. //depot/projects/ndisusb/sys/arm/conf/KB920X#3 integrate .. //depot/projects/ndisusb/sys/arm/conf/NSLU#2 integrate .. //depot/projects/ndisusb/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/ndisusb/sys/arm/conf/SKYEYE#3 integrate .. //depot/projects/ndisusb/sys/arm/include/armreg.h#3 integrate .. //depot/projects/ndisusb/sys/arm/include/elf.h#2 integrate .. //depot/projects/ndisusb/sys/arm/include/intr.h#4 integrate .. //depot/projects/ndisusb/sys/arm/mv/mv_machdep.c#2 integrate .. //depot/projects/ndisusb/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/ndisusb/sys/arm/mv/orion/std.db88f5xxx#2 integrate .. //depot/projects/ndisusb/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_iic.c#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/ixp435_ehci.c#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/ndisusb/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/ndisusb/sys/arm/xscale/pxa/pxa_machdep.c#3 integrate .. //depot/projects/ndisusb/sys/boot/Makefile#4 integrate .. //depot/projects/ndisusb/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/ndisusb/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/ndisusb/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/ndisusb/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/ndisusb/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/ndisusb/sys/boot/common/loader.8#2 integrate .. //depot/projects/ndisusb/sys/boot/forth/support.4th#2 integrate .. //depot/projects/ndisusb/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/ndisusb/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/ndisusb/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/ndisusb/sys/boot/i386/gptzfsboot/Makefile#2 integrate .. //depot/projects/ndisusb/sys/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/ndisusb/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/ndisusb/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/ndisusb/sys/boot/uboot/lib/devicename.c#3 integrate .. //depot/projects/ndisusb/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/ndisusb/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/ndisusb/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/ndisusb/sys/bsm/audit.h#3 integrate .. //depot/projects/ndisusb/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/ndisusb/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/ndisusb/sys/bsm/audit_record.h#3 integrate .. //depot/projects/ndisusb/sys/cam/cam_periph.c#2 integrate .. //depot/projects/ndisusb/sys/cam/cam_periph.h#2 integrate .. //depot/projects/ndisusb/sys/cam/cam_sim.c#2 integrate .. //depot/projects/ndisusb/sys/cam/cam_sim.h#2 integrate .. //depot/projects/ndisusb/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/ndisusb/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/ndisusb/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/ndisusb/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/ndisusb/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/ndisusb/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/ndisusb/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/ndisusb/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/ndisusb/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/ndisusb/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/ndisusb/sys/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/ndisusb/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/ndisusb/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/ndisusb/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/ndisusb/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/ndisusb/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/ndisusb/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/ndisusb/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/ndisusb/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/ndisusb/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/ndisusb/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/ndisusb/sys/conf/Makefile.arm#3 integrate .. //depot/projects/ndisusb/sys/conf/NOTES#5 integrate .. //depot/projects/ndisusb/sys/conf/files#5 integrate .. //depot/projects/ndisusb/sys/conf/files.amd64#3 integrate .. //depot/projects/ndisusb/sys/conf/files.arm#3 integrate .. //depot/projects/ndisusb/sys/conf/files.i386#4 integrate .. //depot/projects/ndisusb/sys/conf/files.mips#3 integrate .. //depot/projects/ndisusb/sys/conf/files.pc98#4 integrate .. //depot/projects/ndisusb/sys/conf/files.powerpc#4 integrate .. //depot/projects/ndisusb/sys/conf/files.sparc64#3 integrate .. //depot/projects/ndisusb/sys/conf/files.sun4v#3 integrate .. //depot/projects/ndisusb/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/ndisusb/sys/conf/options#4 integrate .. //depot/projects/ndisusb/sys/conf/options.arm#4 integrate .. //depot/projects/ndisusb/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/ndisusb/sys/contrib/dev/ath/COPYRIGHT#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/README#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/ah_desc.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/ah_devid.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/ah_soc.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/alpha-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap30.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap30.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap30.opt_ah.h#2 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap43.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap43.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap43.opt_ah.h#2 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap51.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap51.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap51.opt_ah.h#2 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap61.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap61.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/ap61.opt_ah.h#2 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/i386-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips-be-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips-le-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/powerpc-be-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/sparc-be-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/sparc64-be-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/wackelf.c#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/wisoc.inc#2 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/x86_64-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/ath/version.h#3 delete .. //depot/projects/ndisusb/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate .. //depot/projects/ndisusb/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/ndisusb/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/ndisusb/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/ndisusb/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/ndisusb/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/ndisusb/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/ndisusb/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/ndisusb/sys/contrib/rdma/rdma_addr.c#2 integrate .. //depot/projects/ndisusb/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/ndisusb/sys/crypto/rc4/rc4.c#2 integrate .. //depot/projects/ndisusb/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/ndisusb/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/ndisusb/sys/dev/adb/adb.h#2 integrate .. //depot/projects/ndisusb/sys/dev/adb/adb_bus.c#2 integrate .. //depot/projects/ndisusb/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/ndisusb/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/ndisusb/sys/dev/adb/adbvar.h#2 integrate .. //depot/projects/ndisusb/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/ndisusb/sys/dev/agp/agppriv.h#2 integrate .. //depot/projects/ndisusb/sys/dev/ale/if_ale.c#2 integrate .. //depot/projects/ndisusb/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/ndisusb/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/ndisusb/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/ndisusb/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/ndisusb/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/ndisusb/sys/dev/ath/ah_osdep.h#3 integrate .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_debug.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_decode.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_desc.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_devid.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_eeprom.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_internal.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_regdomain.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ah_soc.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5211/boss.ini#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar2316.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar2317.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar2413.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar2425.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5111.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5112.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5212/ar5413.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5312/ar5312.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar2133.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch .. //depot/projects/ndisusb/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/ndisusb/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/ndisusb/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/ndisusb/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/ndisusb/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/ndisusb/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/ndisusb/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/ndisusb/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/ndisusb/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/ndisusb/sys/dev/cardbus/cardbus_device.c#3 integrate .. //depot/projects/ndisusb/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/ndisusb/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/ndisusb/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/ndisusb/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/ndisusb/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/ndisusb/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/ndisusb/sys/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/ndisusb/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/ndisusb/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/ndisusb/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate .. //depot/projects/ndisusb/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/ndisusb/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 integrate .. //depot/projects/ndisusb/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/ndisusb/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/ndisusb/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/ndisusb/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/ndisusb/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/ndisusb/sys/dev/e1000/if_em.c#2 integrate .. //depot/projects/ndisusb/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/ndisusb/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/ndisusb/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/ndisusb/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/ndisusb/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/ndisusb/sys/dev/hwpmc/hwpmc_core.c#1 branch .. //depot/projects/ndisusb/sys/dev/hwpmc/hwpmc_core.h#1 branch .. //depot/projects/ndisusb/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/ndisusb/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/ndisusb/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/ndisusb/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/ndisusb/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#16 integrate .. //depot/projects/ndisusb/sys/dev/isp/isp.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/ndisusb/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/ndisusb/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/ndisusb/sys/dev/jme/if_jmevar.h#2 integrate .. //depot/projects/ndisusb/sys/dev/k8temp/k8temp.c#4 integrate .. //depot/projects/ndisusb/sys/dev/md/md.c#4 integrate .. //depot/projects/ndisusb/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/ndisusb/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/ndisusb/sys/dev/mii/truephy.c#2 integrate .. //depot/projects/ndisusb/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/ndisusb/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/ndisusb/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/ndisusb/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/ndisusb/sys/dev/ofw/ofw_if.m#1 branch .. //depot/projects/ndisusb/sys/dev/ofw/ofw_standard.c#1 branch .. //depot/projects/ndisusb/sys/dev/ofw/ofwvar.h#1 branch .. //depot/projects/ndisusb/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/ndisusb/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/ndisusb/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/ndisusb/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/ndisusb/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/ndisusb/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/ndisusb/sys/dev/re/if_re.c#4 integrate .. //depot/projects/ndisusb/sys/dev/sdhci/sdhci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/ndisusb/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/ndisusb/sys/dev/snp/snp.c#4 integrate .. //depot/projects/ndisusb/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/ndisusb/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/ndisusb/sys/dev/usb/ehci_ddb.c#1 branch .. //depot/projects/ndisusb/sys/dev/usb/ehci_mbus.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb/ehcireg.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb/ehcivar.h#4 integrate .. //depot/projects/ndisusb/sys/dev/usb/if_upgt.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/ndisusb/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/ndisusb/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/ndisusb/sys/dev/usb/usbdi.h#3 integrate .. //depot/projects/ndisusb/sys/dev/usb2/bluetooth/ng_ubt2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/at91dci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ehci2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ehci2_pci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/musb2_otg.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/musb2_otg_atmelarm.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/ohci2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uhci2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/usb2_controller.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/controller/uss820dci.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_busdma.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_busdma.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_compat_linux.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_config_td.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_config_td.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_core.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_debug.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_dev.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_dev.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_device.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_device.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_dynamic.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_dynamic.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_error.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_generic.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_handle_request.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_hid.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_hub.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_hub.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_lookup.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_mbuf.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_msctest.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_msctest.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_parse.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_process.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_process.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_request.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_request.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_sw_transfer.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_sw_transfer.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_transfer.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_transfer.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/core/usb2_util.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_axe2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_cue2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_kue2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_rue2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/if_udav2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/usb2_ethernet.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/ethernet/usb2_ethernet.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/image/uscanner2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/include/usb2_devid.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/include/usb2_devtable.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/input/uhid2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/input/ukbd2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/input/ums2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/misc/udbp2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/misc/ufm2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uark2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/ubsa2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/ubser2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uchcom2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/ucycom2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/ufoma2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uftdi2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/ugensa2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uipaq2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/ulpt2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/umct2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/umodem2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/umoscom2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uplcom2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/usb2_serial.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/usb2_serial.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uvisor2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/serial/uvscom2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/sound/uaudio2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/sound/uaudio2.h#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/storage/ata-usb2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/storage/umass2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/storage/urio2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/storage/ustorage2_fs.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/template/usb2_template.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/wlan/if_rum2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/wlan/if_ural2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/usb2/wlan/if_zyd2.c#2 integrate .. //depot/projects/ndisusb/sys/dev/vr/if_vr.c#4 integrate .. //depot/projects/ndisusb/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/ndisusb/sys/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/ndisusb/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/ndisusb/sys/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/ndisusb/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/ndisusb/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/ndisusb/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/ndisusb/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/ndisusb/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/ndisusb/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/ndisusb/sys/fs/procfs/procfs_map.c#3 integrate .. //depot/projects/ndisusb/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/ndisusb/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/ndisusb/sys/geom/geom_subr.c#3 integrate .. //depot/projects/ndisusb/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/ndisusb/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/ndisusb/sys/geom/journal/g_journal.h#2 integrate .. //depot/projects/ndisusb/sys/geom/part/g_part.c#4 integrate .. //depot/projects/ndisusb/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/ndisusb/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/ndisusb/sys/geom/part/g_part_pc98.c#4 integrate .. //depot/projects/ndisusb/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/ndisusb/sys/gnu/fs/reiserfs/reiserfs_vnops.c#3 integrate .. //depot/projects/ndisusb/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate .. //depot/projects/ndisusb/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/ndisusb/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/ndisusb/sys/i386/conf/NOTES#4 integrate .. //depot/projects/ndisusb/sys/i386/conf/PAE#2 integrate .. //depot/projects/ndisusb/sys/i386/conf/XEN#2 integrate .. //depot/projects/ndisusb/sys/i386/i386/exception.s#2 integrate .. //depot/projects/ndisusb/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/ndisusb/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/ndisusb/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/ndisusb/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/ndisusb/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/ndisusb/sys/i386/include/atomic.h#3 integrate .. //depot/projects/ndisusb/sys/i386/include/elf.h#2 integrate .. //depot/projects/ndisusb/sys/i386/include/pmc_mdep.h#3 integrate .. //depot/projects/ndisusb/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/ndisusb/sys/i386/include/xen/xenbus.h#2 delete .. //depot/projects/ndisusb/sys/i386/linux/linux.h#3 integrate .. //depot/projects/ndisusb/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/ndisusb/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/ndisusb/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/ndisusb/sys/ia64/include/elf.h#2 integrate .. //depot/projects/ndisusb/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/ndisusb/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_conf.c#5 integrate .. //depot/projects/ndisusb/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/ndisusb/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/ndisusb/sys/kern/kern_exec.c#4 integrate .. //depot/projects/ndisusb/sys/kern/kern_exit.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_fork.c#5 integrate .. //depot/projects/ndisusb/sys/kern/kern_jail.c#4 integrate .. //depot/projects/ndisusb/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/ndisusb/sys/kern/kern_linker.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/ndisusb/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_module.c#2 integrate .. //depot/projects/ndisusb/sys/kern/kern_poll.c#4 integrate .. //depot/projects/ndisusb/sys/kern/kern_proc.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_prot.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/ndisusb/sys/kern/kern_vimage.c#1 branch .. //depot/projects/ndisusb/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/ndisusb/sys/kern/subr_param.c#4 integrate .. //depot/projects/ndisusb/sys/kern/subr_prf.c#3 integrate .. //depot/projects/ndisusb/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/ndisusb/sys/kern/subr_trap.c#3 integrate .. //depot/projects/ndisusb/sys/kern/subr_witness.c#4 integrate .. //depot/projects/ndisusb/sys/kern/tty.c#3 integrate .. //depot/projects/ndisusb/sys/kern/tty_pts.c#3 integrate .. //depot/projects/ndisusb/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/ndisusb/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/ndisusb/sys/kern/uipc_shm.c#4 integrate .. //depot/projects/ndisusb/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/ndisusb/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/ndisusb/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/ndisusb/sys/kern/vfs_default.c#3 integrate .. //depot/projects/ndisusb/sys/kern/vfs_export.c#4 integrate .. //depot/projects/ndisusb/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/ndisusb/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/ndisusb/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/ndisusb/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/ndisusb/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/ndisusb/sys/kern/vnode_if.src#3 integrate .. //depot/projects/ndisusb/sys/libkern/iconv.c#2 integrate .. //depot/projects/ndisusb/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/ndisusb/sys/mips/conf/DEFAULTS#2 integrate .. //depot/projects/ndisusb/sys/mips/conf/IDT#3 integrate .. //depot/projects/ndisusb/sys/mips/conf/SENTRY5#3 integrate .. //depot/projects/ndisusb/sys/mips/include/atomic.h#2 integrate .. //depot/projects/ndisusb/sys/mips/include/elf.h#2 integrate .. //depot/projects/ndisusb/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/ndisusb/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/ndisusb/sys/modules/Makefile#5 integrate .. //depot/projects/ndisusb/sys/modules/ae/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/aio/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/ath/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/ath_hal/Makefile#2 delete .. //depot/projects/ndisusb/sys/modules/ath_rate_amrr/Makefile#4 delete .. //depot/projects/ndisusb/sys/modules/ath_rate_onoe/Makefile#4 delete .. //depot/projects/ndisusb/sys/modules/ath_rate_sample/Makefile#4 delete .. //depot/projects/ndisusb/sys/modules/bridgestp/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/ndisusb/sys/modules/cxgb/iw_cxgb/Makefile#3 integrate .. //depot/projects/ndisusb/sys/modules/hwpmc/Makefile#3 integrate .. //depot/projects/ndisusb/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/if_vlan/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/linux/Makefile#3 integrate .. //depot/projects/ndisusb/sys/modules/netgraph/atm/atm/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/netgraph/ether/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/netgraph/gif/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/ndisusb/sys/modules/pf/Makefile#3 integrate .. //depot/projects/ndisusb/sys/modules/powermac_nvram/Makefile#2 integrate .. //depot/projects/ndisusb/sys/modules/wlan/Makefile#3 integrate .. //depot/projects/ndisusb/sys/net/bridgestp.c#3 integrate .. //depot/projects/ndisusb/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/ndisusb/sys/net/if.c#4 integrate .. //depot/projects/ndisusb/sys/net/if_arcsubr.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_bridge.c#4 integrate .. //depot/projects/ndisusb/sys/net/if_ef.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_faith.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_gif.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_gif.h#3 integrate .. //depot/projects/ndisusb/sys/net/if_gre.c#4 integrate .. //depot/projects/ndisusb/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_lagg.c#4 integrate .. //depot/projects/ndisusb/sys/net/if_llatbl.c#1 branch .. //depot/projects/ndisusb/sys/net/if_llatbl.h#1 branch .. //depot/projects/ndisusb/sys/net/if_loop.c#4 integrate .. //depot/projects/ndisusb/sys/net/if_media.h#3 integrate .. //depot/projects/ndisusb/sys/net/if_mib.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_stf.c#3 integrate .. //depot/projects/ndisusb/sys/net/if_tun.c#4 integrate .. //depot/projects/ndisusb/sys/net/if_var.h#4 integrate .. //depot/projects/ndisusb/sys/net/if_vlan.c#4 integrate .. //depot/projects/ndisusb/sys/net/pfil.c#2 integrate .. //depot/projects/ndisusb/sys/net/pfil.h#2 integrate .. //depot/projects/ndisusb/sys/net/radix.c#2 integrate .. //depot/projects/ndisusb/sys/net/radix.h#2 integrate .. //depot/projects/ndisusb/sys/net/radix_mpath.c#4 integrate .. //depot/projects/ndisusb/sys/net/raw_cb.c#4 integrate .. //depot/projects/ndisusb/sys/net/raw_cb.h#3 integrate .. //depot/projects/ndisusb/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/ndisusb/sys/net/route.c#3 integrate .. //depot/projects/ndisusb/sys/net/route.h#3 integrate .. //depot/projects/ndisusb/sys/net/rtsock.c#4 integrate .. //depot/projects/ndisusb/sys/net/vnet.h#2 integrate .. //depot/projects/ndisusb/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_acl.c#3 integrate .. //depot/projects/ndisusb/sys/net80211/ieee80211_crypto.h#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 23 05:49:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D39901065674; Tue, 23 Dec 2008 05:49:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 961111065670 for ; Tue, 23 Dec 2008 05:49:38 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 84EF78FC1D for ; Tue, 23 Dec 2008 05:49:38 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBN5ncic016839 for ; Tue, 23 Dec 2008 05:49:38 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBN5nckd016837 for perforce@freebsd.org; Tue, 23 Dec 2008 05:49:38 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 23 Dec 2008 05:49:38 GMT Message-Id: <200812230549.mBN5nckd016837@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155156 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, 23 Dec 2008 05:49:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=155156 Change 155156 by weongyo@weongyo_ws on 2008/12/23 05:48:43 style(9) Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#35 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#35 (text+ko) ==== @@ -234,16 +234,16 @@ device_t dev = dobj->do_devext; struct io_stack_location *irp_sl; - irp_sl = IoGetCurrentIrpStackLocation(ip); - device_printf(dev, "invalid I/O dispatch %d:%d\n", irp_sl->isl_major, + irp_sl = IoGetCurrentIrpStackLocation(ip); + device_printf(dev, "invalid I/O dispatch %d:%d\n", irp_sl->isl_major, irp_sl->isl_minor); - ip->irp_iostat.isb_status = STATUS_FAILURE; - ip->irp_iostat.isb_info = 0; + ip->irp_iostat.isb_status = STATUS_FAILURE; + ip->irp_iostat.isb_info = 0; - IoCompleteRequest(ip, IO_NO_INCREMENT); + IoCompleteRequest(ip, IO_NO_INCREMENT); - return (STATUS_FAILURE); + return (STATUS_FAILURE); } static int32_t @@ -254,16 +254,16 @@ device_t dev = dobj->do_devext; struct io_stack_location *irp_sl; - irp_sl = IoGetCurrentIrpStackLocation(ip); - device_printf(dev, "%s: unsupported I/O dispatch %d:%d\n", + irp_sl = IoGetCurrentIrpStackLocation(ip); + device_printf(dev, "%s: unsupported I/O dispatch %d:%d\n", __func__, irp_sl->isl_major, irp_sl->isl_minor); - ip->irp_iostat.isb_status = STATUS_FAILURE; - ip->irp_iostat.isb_info = 0; + ip->irp_iostat.isb_status = STATUS_FAILURE; + ip->irp_iostat.isb_info = 0; - IoCompleteRequest(ip, IO_NO_INCREMENT); + IoCompleteRequest(ip, IO_NO_INCREMENT); - return (STATUS_FAILURE); + return (STATUS_FAILURE); } static int32_t @@ -274,16 +274,16 @@ device_t dev = dobj->do_devext; struct io_stack_location *irp_sl; - irp_sl = IoGetCurrentIrpStackLocation(ip); - device_printf(dev, "%s: unsupported I/O dispatch %d:%d\n", + irp_sl = IoGetCurrentIrpStackLocation(ip); + device_printf(dev, "%s: unsupported I/O dispatch %d:%d\n", __func__, irp_sl->isl_major, irp_sl->isl_minor); - ip->irp_iostat.isb_status = STATUS_FAILURE; - ip->irp_iostat.isb_info = 0; + ip->irp_iostat.isb_status = STATUS_FAILURE; + ip->irp_iostat.isb_info = 0; - IoCompleteRequest(ip, IO_NO_INCREMENT); + IoCompleteRequest(ip, IO_NO_INCREMENT); - return (STATUS_FAILURE); + return (STATUS_FAILURE); } /* Convert USBD_STATUS to NTSTATUS */ From owner-p4-projects@FreeBSD.ORG Tue Dec 23 09:43:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EB581065670; Tue, 23 Dec 2008 09:43:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E42691065675 for ; Tue, 23 Dec 2008 09:43:37 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B926E8FC16 for ; Tue, 23 Dec 2008 09:43:37 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBN9hbDX048680 for ; Tue, 23 Dec 2008 09:43:37 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBN9hbEZ048678 for perforce@freebsd.org; Tue, 23 Dec 2008 09:43:37 GMT (envelope-from zec@icir.org) Date: Tue, 23 Dec 2008 09:43:37 GMT Message-Id: <200812230943.mBN9hbEZ048678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 155159 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, 23 Dec 2008 09:43:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=155159 Change 155159 by zec@zec_tca51 on 2008/12/23 09:42:41 Misintegration - unbreak options VIMAGE_GLOBALS build. Affected files ... .. //depot/projects/vimage/src/sys/net/if.c#60 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if.c#60 (text+ko) ==== @@ -402,10 +402,6 @@ { INIT_VNET_NET(curvnet); -#ifndef VIMAGE - vnet_mod_register(&vnet_net_modinfo); -#endif - V_if_index = 0; V_ifindex_table = NULL; V_if_indexlim = 8; From owner-p4-projects@FreeBSD.ORG Tue Dec 23 12:30:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4747A1065674; Tue, 23 Dec 2008 12:30:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05F85106564A for ; Tue, 23 Dec 2008 12:30:01 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27]) by mx1.freebsd.org (Postfix) with ESMTP id B40D08FC1D for ; Tue, 23 Dec 2008 12:30:00 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from localhost (amavis.str.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id 1D27D41C64C; Tue, 23 Dec 2008 13:10:06 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([62.111.66.27]) by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id dskM6SWNa3My; Tue, 23 Dec 2008 13:10:05 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id BE80441C64A; Tue, 23 Dec 2008 13:10:05 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 9A7D24448D5; Tue, 23 Dec 2008 12:05:26 +0000 (UTC) Date: Tue, 23 Dec 2008 12:05:26 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Marko Zec In-Reply-To: <200812230943.mBN9hbEZ048678@repoman.freebsd.org> Message-ID: <20081223115423.W97918@maildrop.int.zabbadoz.net> References: <200812230943.mBN9hbEZ048678@repoman.freebsd.org> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 155159 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, 23 Dec 2008 12:30:01 -0000 On Tue, 23 Dec 2008, Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=155159 > > Change 155159 by zec@zec_tca51 on 2008/12/23 09:42:41 > > Misintegration - unbreak options VIMAGE_GLOBALS build. > > Affected files ... > > .. //depot/projects/vimage/src/sys/net/if.c#60 edit > > Differences ... > > ==== //depot/projects/vimage/src/sys/net/if.c#60 (text+ko) ==== > > @@ -402,10 +402,6 @@ > { > INIT_VNET_NET(curvnet); > > -#ifndef VIMAGE > - vnet_mod_register(&vnet_net_modinfo); > -#endif > - > V_if_index = 0; > V_ifindex_table = NULL; > V_if_indexlim = 8; This is sounds wrong as well. In case of VIMAGE vnet_mod_register is called in if_init(). Then vnet_net_iattach will be called as well from vnet_mod_constructor() and thus we are going to call vnet_mod_register() twice resulting in a panic. See p4 describe -du 154705 . So the proper check would be.. ? #if !defined(VIMAGE_GLOBALS) && !defined(VIMAGE) Three tries, must be right now;-) /bz -- Bjoern A. Zeeb The greatest risk is not taking one. From owner-p4-projects@FreeBSD.ORG Tue Dec 23 13:06:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 497631065676; Tue, 23 Dec 2008 13:06:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D2241065674 for ; Tue, 23 Dec 2008 13:06:34 +0000 (UTC) (envelope-from zec@freebsd.org) Received: from labs4.cc.fer.hr (labs4.cc.fer.hr [161.53.72.24]) by mx1.freebsd.org (Postfix) with ESMTP id 925578FC21 for ; Tue, 23 Dec 2008 13:06:33 +0000 (UTC) (envelope-from zec@freebsd.org) Received: from sluga.fer.hr (sluga.cc.fer.hr [161.53.72.14]) by labs4.cc.fer.hr (8.14.2/8.14.2) with ESMTP id mBNCnhQ5029707; Tue, 23 Dec 2008 13:49:43 +0100 (CET) Received: from [192.168.200.110] ([161.53.19.79]) by sluga.fer.hr with Microsoft SMTPSVC(6.0.3790.3959); Tue, 23 Dec 2008 13:49:10 +0100 From: Marko Zec To: "Bjoern A. Zeeb" Date: Tue, 23 Dec 2008 13:49:07 +0100 User-Agent: KMail/1.9.7 References: <200812230943.mBN9hbEZ048678@repoman.freebsd.org> <20081223115423.W97918@maildrop.int.zabbadoz.net> In-Reply-To: <20081223115423.W97918@maildrop.int.zabbadoz.net> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200812231349.07820.zec@freebsd.org> X-OriginalArrivalTime: 23 Dec 2008 12:49:10.0906 (UTC) FILETIME=[DA04E5A0:01C964FC] X-Scanned-By: MIMEDefang 2.64 on 161.53.72.24 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 155159 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, 23 Dec 2008 13:06:34 -0000 On Tuesday 23 December 2008 13:05:26 Bjoern A. Zeeb wrote: > On Tue, 23 Dec 2008, Marko Zec wrote: > > http://perforce.freebsd.org/chv.cgi?CH=155159 > > > > Change 155159 by zec@zec_tca51 on 2008/12/23 09:42:41 > > > > Misintegration - unbreak options VIMAGE_GLOBALS build. > > > > Affected files ... > > > > .. //depot/projects/vimage/src/sys/net/if.c#60 edit > > > > Differences ... > > > > ==== //depot/projects/vimage/src/sys/net/if.c#60 (text+ko) ==== > > > > @@ -402,10 +402,6 @@ > > { > > INIT_VNET_NET(curvnet); > > > > -#ifndef VIMAGE > > - vnet_mod_register(&vnet_net_modinfo); > > -#endif > > - > > V_if_index = 0; > > V_ifindex_table = NULL; > > V_if_indexlim = 8; > > This is sounds wrong as well. > > In case of VIMAGE vnet_mod_register is called in if_init(). > Then vnet_net_iattach will be called as well from > vnet_mod_constructor() and thus we are going to call > vnet_mod_register() twice resulting in a panic. See p4 describe -du > 154705 . > > So the proper check would be.. ? > > #if !defined(VIMAGE_GLOBALS) && !defined(VIMAGE) Yes, or to perhaps a in a slightly simpler form, I think the correct way of calling the initializer fn and / or registering the vnet module should be #ifdef VIMAGE_GLOBALS vnet_inet_iattach(NULL) #else vnet_mod_register(&vnet_net_modinfo); #endif in this case in if_init(), definitely not in vnet_net_iattach() Good point, I think I should revisit all the vnet module registrations in the vimage branch now, as well as possibly put in some #ifdefs inside vnet_mod_register()... Thanks, Marko > Three tries, must be right now;-) From owner-p4-projects@FreeBSD.ORG Tue Dec 23 13:30:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E99F1065678; Tue, 23 Dec 2008 13:30:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6D4C1065674; Tue, 23 Dec 2008 13:30:07 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27]) by mx1.freebsd.org (Postfix) with ESMTP id 802938FC24; Tue, 23 Dec 2008 13:30:07 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from localhost (amavis.str.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id 30C9A41C616; Tue, 23 Dec 2008 14:30:06 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([62.111.66.27]) by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id MBhVQVKaB5TQ; Tue, 23 Dec 2008 14:30:05 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id 9A91D41C5D9; Tue, 23 Dec 2008 14:30:05 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 8B54E4448D5; Tue, 23 Dec 2008 13:25:42 +0000 (UTC) Date: Tue, 23 Dec 2008 13:25:42 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Marko Zec In-Reply-To: <200812231349.07820.zec@freebsd.org> Message-ID: <20081223132508.M97918@maildrop.int.zabbadoz.net> References: <200812230943.mBN9hbEZ048678@repoman.freebsd.org> <20081223115423.W97918@maildrop.int.zabbadoz.net> <200812231349.07820.zec@freebsd.org> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 155159 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, 23 Dec 2008 13:30:08 -0000 On Tue, 23 Dec 2008, Marko Zec wrote: Hey, > On Tuesday 23 December 2008 13:05:26 Bjoern A. Zeeb wrote: >> On Tue, 23 Dec 2008, Marko Zec wrote: >>> http://perforce.freebsd.org/chv.cgi?CH=155159 >>> >>> Change 155159 by zec@zec_tca51 on 2008/12/23 09:42:41 >>> >>> Misintegration - unbreak options VIMAGE_GLOBALS build. >>> >>> Affected files ... >>> >>> .. //depot/projects/vimage/src/sys/net/if.c#60 edit >>> >>> Differences ... >>> >>> ==== //depot/projects/vimage/src/sys/net/if.c#60 (text+ko) ==== >>> >>> @@ -402,10 +402,6 @@ >>> { >>> INIT_VNET_NET(curvnet); >>> >>> -#ifndef VIMAGE >>> - vnet_mod_register(&vnet_net_modinfo); >>> -#endif >>> - >>> V_if_index = 0; >>> V_ifindex_table = NULL; >>> V_if_indexlim = 8; >> >> This is sounds wrong as well. >> >> In case of VIMAGE vnet_mod_register is called in if_init(). >> Then vnet_net_iattach will be called as well from >> vnet_mod_constructor() and thus we are going to call >> vnet_mod_register() twice resulting in a panic. See p4 describe -du >> 154705 . >> >> So the proper check would be.. ? >> >> #if !defined(VIMAGE_GLOBALS) && !defined(VIMAGE) > > Yes, or to perhaps a in a slightly simpler form, I think the correct way > of calling the initializer fn and / or registering the vnet module > should be > > #ifdef VIMAGE_GLOBALS > vnet_inet_iattach(NULL) > #else > vnet_mod_register(&vnet_net_modinfo); > #endif > > in this case in if_init(), definitely not in vnet_net_iattach() Yes, that sounds good. > Good point, I think I should revisit all the vnet module registrations > in the vimage branch now, as well as possibly put in some #ifdefs > inside vnet_mod_register()... Thanks:) -- Bjoern A. Zeeb The greatest risk is not taking one. From owner-p4-projects@FreeBSD.ORG Tue Dec 23 13:40:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E7F4106567F; Tue, 23 Dec 2008 13:40:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32B3E1065675 for ; Tue, 23 Dec 2008 13:40:39 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 215038FC22 for ; Tue, 23 Dec 2008 13:40:39 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNDed0n080639 for ; Tue, 23 Dec 2008 13:40:39 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNDecYT080637 for perforce@freebsd.org; Tue, 23 Dec 2008 13:40:38 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 23 Dec 2008 13:40:38 GMT Message-Id: <200812231340.mBNDecYT080637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155168 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, 23 Dec 2008 13:40:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=155168 Change 155168 by ed@ed_flippo on 2008/12/23 13:39:50 - Add $FreeBSD$ tags to new files. - Also add Makefile and demo application to the tree. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/Makefile#1 add .. //depot/projects/mpsafetty/sys/dev/syscons/teken/gensequences#3 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/sequences#6 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#9 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#11 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_demo.c#1 add .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#14 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr_compat.h#2 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_wcwidth.h#2 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/gensequences#3 (text+ko) ==== @@ -24,6 +24,8 @@ # 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. +# +# $FreeBSD$ function die(msg) { print msg; ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/sequences#6 (text+ko) ==== @@ -22,6 +22,8 @@ # 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. +# +# $FreeBSD$ # File format is as follows: # Abbr Abbreviation of sequence name ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#9 (text+ko) ==== @@ -22,6 +22,8 @@ * 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. + * + * $FreeBSD$ */ #if defined(__FreeBSD__) && defined(_KERNEL) ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#11 (text+ko) ==== @@ -22,6 +22,8 @@ * 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. + * + * $FreeBSD$ */ #ifndef _TEKEN_H_ ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#14 (text+ko) ==== @@ -22,6 +22,8 @@ * 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. + * + * $FreeBSD$ */ static void teken_subr_cursor_up(teken_t *, unsigned int); ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr_compat.h#2 (text+ko) ==== @@ -22,6 +22,8 @@ * 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. + * + * $FreeBSD$ */ static void ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_wcwidth.h#2 (text+ko) ==== @@ -1,55 +1,4 @@ /* - * This is an implementation of wcwidth() and wcswidth() (defined in - * IEEE Std 1002.1-2001) for Unicode. - * - * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html - * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html - * - * In fixed-width output devices, Latin characters all occupy a single - * "cell" position of equal width, whereas ideographic CJK characters - * occupy two such cells. Interoperability between terminal-line - * applications and (teletype-style) character terminals using the - * UTF-8 encoding requires agreement on which character should advance - * the cursor by how many cell positions. No established formal - * standards exist at present on which Unicode character shall occupy - * how many cell positions on character terminals. These routines are - * a first attempt of defining such behavior based on simple rules - * applied to data provided by the Unicode Consortium. - * - * For some graphical characters, the Unicode standard explicitly - * defines a character-cell width via the definition of the East Asian - * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes. - * In all these cases, there is no ambiguity about which width a - * terminal shall use. For characters in the East Asian Ambiguous (A) - * class, the width choice depends purely on a preference of backward - * compatibility with either historic CJK or Western practice. - * Choosing single-width for these characters is easy to justify as - * the appropriate long-term solution, as the CJK practice of - * displaying these characters as double-width comes from historic - * implementation simplicity (8-bit encoded characters were displayed - * single-width and 16-bit ones double-width, even for Greek, - * Cyrillic, etc.) and not any typographic considerations. - * - * Much less clear is the choice of width for the Not East Asian - * (Neutral) class. Existing practice does not dictate a width for any - * of these characters. It would nevertheless make sense - * typographically to allocate two character cells to characters such - * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be - * represented adequately with a single-width glyph. The following - * routines at present merely assign a single-cell width to all - * neutral characters, in the interest of simplicity. This is not - * entirely satisfactory and should be reconsidered before - * establishing a formal standard in this area. At the moment, the - * decision which Not East Asian (Neutral) characters should be - * represented by double-width glyphs cannot yet be answered by - * applying a simple rule from the Unicode database content. Setting - * up a proper standard for the behavior of UTF-8 character terminals - * will require a careful analysis not only of each Unicode character, - * but also of each presentation form, something the author of these - * routines has avoided to do so far. - * - * http://www.unicode.org/unicode/reports/tr11/ - * * Markus Kuhn -- 2007-05-26 (Unicode 5.0) * * Permission to use, copy, modify, and distribute this software @@ -57,6 +6,8 @@ * disclaims all warranties with regard to this software. * * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c + * + * $FreeBSD$ */ struct interval { From owner-p4-projects@FreeBSD.ORG Tue Dec 23 14:44:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BD69106567A; Tue, 23 Dec 2008 14:44:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B97D81065677 for ; Tue, 23 Dec 2008 14:44:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A65498FC0C for ; Tue, 23 Dec 2008 14:44:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNEikL1086537 for ; Tue, 23 Dec 2008 14:44:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNEiiJf086534 for perforce@freebsd.org; Tue, 23 Dec 2008 14:44:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 23 Dec 2008 14:44:44 GMT Message-Id: <200812231444.mBNEiiJf086534@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 155170 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, 23 Dec 2008 14:44:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=155170 Change 155170 by hselasky@hselasky_laptop001 on 2008/12/23 14:44:30 IFC @ 155167 - first step Affected files ... .. //depot/projects/usb/src/sys/amd64/Makefile#2 integrate .. //depot/projects/usb/src/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/db_trace.c#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/exception.S#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/genassym.c#10 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#10 integrate .. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/intr_machdep.c#9 integrate .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#14 integrate .. //depot/projects/usb/src/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#13 integrate .. //depot/projects/usb/src/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/usb/src/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/usb/src/sys/amd64/include/elf.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/md_var.h#6 integrate .. //depot/projects/usb/src/sys/amd64/include/pmc_mdep.h#6 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#10 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux.h#9 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#11 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#9 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#9 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#9 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#9 integrate .. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#11 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#7 integrate .. //depot/projects/usb/src/sys/arm/arm/identcpu.c#7 integrate .. //depot/projects/usb/src/sys/arm/at91/at91.c#12 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91_mci.c#8 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_mcireg.h#3 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pio.c#10 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pioreg.h#3 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_piovar.h#9 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pmc.c#8 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_rtc.c#4 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_rtcreg.h#3 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_spi.c#6 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_spireg.h#4 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_ssc.c#6 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_sscreg.h#3 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_st.c#5 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_twi.c#7 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_twireg.h#3 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91board.h#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91rm92reg.h#4 integrate .. //depot/projects/usb/src/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/files.at91#6 integrate .. //depot/projects/usb/src/sys/arm/at91/files.kb920x#2 delete .. //depot/projects/usb/src/sys/arm/at91/if_ate.c#11 integrate .. //depot/projects/usb/src/sys/arm/at91/if_atereg.h#4 integrate .. //depot/projects/usb/src/sys/arm/at91/kb920x_machdep.c#9 delete .. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#18 integrate .. //depot/projects/usb/src/sys/arm/at91/std.at91#5 integrate .. //depot/projects/usb/src/sys/arm/at91/std.bwct#1 branch .. //depot/projects/usb/src/sys/arm/at91/std.hl200#1 branch .. //depot/projects/usb/src/sys/arm/at91/std.kb920x#5 integrate .. //depot/projects/usb/src/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/usb/src/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#5 integrate .. //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#10 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#9 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA.hints#3 integrate .. //depot/projects/usb/src/sys/arm/conf/BWCT#6 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/usb/src/sys/arm/conf/CRB#5 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-78XXX#3 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-88F5XXX#3 integrate .. //depot/projects/usb/src/sys/arm/conf/DB-88F6XXX#3 integrate .. //depot/projects/usb/src/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/usb/src/sys/arm/conf/EP80219#8 integrate .. //depot/projects/usb/src/sys/arm/conf/GUMSTIX#3 integrate .. //depot/projects/usb/src/sys/arm/conf/HL200#5 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#16 integrate .. //depot/projects/usb/src/sys/arm/conf/NSLU#4 integrate .. //depot/projects/usb/src/sys/arm/conf/SIMICS#9 integrate .. //depot/projects/usb/src/sys/arm/conf/SKYEYE#8 integrate .. //depot/projects/usb/src/sys/arm/include/armreg.h#6 integrate .. //depot/projects/usb/src/sys/arm/include/elf.h#4 integrate .. //depot/projects/usb/src/sys/arm/include/intr.h#8 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_machdep.c#3 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_pci.c#3 integrate .. //depot/projects/usb/src/sys/arm/mv/orion/std.db88f5xxx#2 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/ep80219_machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq31244_machdep.c#9 integrate .. //depot/projects/usb/src/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_ata.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#9 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.avila#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/if_npe.c#7 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425.c#6 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_iic.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_npe.c#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_npevar.h#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_pci.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_timer.c#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_wdog.c#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp435_ehci.c#1 branch .. //depot/projects/usb/src/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/usb/src/sys/arm/xscale/pxa/pxa_machdep.c#4 integrate .. //depot/projects/usb/src/sys/boot/Makefile#9 integrate .. //depot/projects/usb/src/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/usb/src/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/usb/src/sys/boot/arm/uboot/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/common/loader.8#7 integrate .. //depot/projects/usb/src/sys/boot/forth/support.4th#4 integrate .. //depot/projects/usb/src/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/usb/src/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/usb/src/sys/boot/i386/gptzfsboot/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/devicename.c#3 integrate .. //depot/projects/usb/src/sys/boot/zfs/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfs.c#3 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/usb/src/sys/bsm/audit.h#7 integrate .. //depot/projects/usb/src/sys/bsm/audit_internal.h#8 integrate .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#8 integrate .. //depot/projects/usb/src/sys/bsm/audit_record.h#8 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.c#6 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/usb/src/sys/cam/cam_sim.c#3 integrate .. //depot/projects/usb/src/sys/cam/cam_sim.h#3 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#7 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#11 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_pass.c#7 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#5 integrate .. //depot/projects/usb/src/sys/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/usb/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32.h#5 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#12 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sockio.c#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysvec.c#6 integrate .. //depot/projects/usb/src/sys/conf/Makefile.arm#8 integrate .. //depot/projects/usb/src/sys/conf/NOTES#23 integrate .. //depot/projects/usb/src/sys/conf/files#43 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#12 integrate .. //depot/projects/usb/src/sys/conf/files.arm#9 integrate .. //depot/projects/usb/src/sys/conf/files.i386#15 integrate .. //depot/projects/usb/src/sys/conf/files.mips#5 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#13 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#12 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#10 integrate .. //depot/projects/usb/src/sys/conf/files.sun4v#7 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#12 integrate .. //depot/projects/usb/src/sys/conf/options#14 integrate .. //depot/projects/usb/src/sys/conf/options.arm#9 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_subr.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/ath/COPYRIGHT#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/README#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/ah.h#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/ah_desc.h#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/ah_devid.h#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/ah_soc.h#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/alpha-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap30.inc#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#2 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap43.inc#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#2 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap51.inc#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#2 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap61.inc#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#2 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/i386-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-be-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-le-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/wackelf.c#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/wisoc.inc#2 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/x86_64-elf.inc#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#3 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#5 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#4 delete .. //depot/projects/usb/src/sys/contrib/dev/ath/version.h#5 delete .. //depot/projects/usb/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#10 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_if.c#7 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#11 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_subr.c#5 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_table.c#4 integrate .. //depot/projects/usb/src/sys/contrib/rdma/rdma_addr.c#2 integrate .. //depot/projects/usb/src/sys/contrib/rdma/rdma_cma.c#4 integrate .. //depot/projects/usb/src/sys/crypto/rc4/rc4.c#2 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_pci.c#8 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/usb/src/sys/dev/adb/adb.h#2 integrate .. //depot/projects/usb/src/sys/dev/adb/adb_bus.c#3 integrate .. //depot/projects/usb/src/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/usb/src/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/usb/src/sys/dev/adb/adbvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/usb/src/sys/dev/agp/agppriv.h#2 integrate .. //depot/projects/usb/src/sys/dev/ale/if_ale.c#2 integrate .. //depot/projects/usb/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#14 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ah_osdep.c#6 integrate .. //depot/projects/usb/src/sys/dev/ath/ah_osdep.h#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_debug.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_decode.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_desc.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_devid.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_internal.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_regdomain.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_soc.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/boss.ini#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar2316.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar2317.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar2413.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5112.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_rate/amrr/amrr.c#7 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/onoe/onoe.c#7 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/sample/sample.c#7 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_rate/sample/sample.h#5 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#12 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath_pci.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/psm.c#9 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#13 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus_device.c#5 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbusvar.h#4 integrate .. //depot/projects/usb/src/sys/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#8 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#10 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#8 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#12 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_multiq.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#8 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#9 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dcreg.h#7 integrate .. //depot/projects/usb/src/sys/dev/drm/drmP.h#7 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_scatter.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82542.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/usb/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_amd.c#7 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_core.c#1 branch .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_core.h#1 branch .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_intel.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_logging.c#7 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#11 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_piv.c#7 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_x86.c#7 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#12 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_cam.c#3 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_soc.c#3 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_subr.c#2 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi.c#4 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi.h#2 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi_subr.c#2 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsivar.h#2 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82598.c#5 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.c#5 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.h#5 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.c#5 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.h#5 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_osdep.h#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.c#5 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.h#5 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_type.h#5 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jme.c#6 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jmereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jmevar.h#2 integrate .. //depot/projects/usb/src/sys/dev/k8temp/k8temp.c#5 integrate .. //depot/projects/usb/src/sys/dev/md/md.c#8 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi.c#13 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi_pci.c#8 integrate .. //depot/projects/usb/src/sys/dev/mii/truephy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mmc/mmc.c#5 integrate .. //depot/projects/usb/src/sys/dev/mmc/mmcsd.c#6 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#8 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#9 integrate .. //depot/projects/usb/src/sys/dev/nfe/if_nfe.c#8 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_if.m#1 branch .. //depot/projects/usb/src/sys/dev/ofw/ofw_standard.c#1 branch .. //depot/projects/usb/src/sys/dev/ofw/ofwvar.h#1 branch .. //depot/projects/usb/src/sys/dev/ofw/openfirm.c#4 integrate .. //depot/projects/usb/src/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/usb/src/sys/dev/ofw/openfirmio.c#3 integrate .. //depot/projects/usb/src/sys/dev/ofw/openpromio.c#3 integrate .. //depot/projects/usb/src/sys/dev/patm/if_patm_intr.c#3 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#9 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbbvar.h#6 integrate .. //depot/projects/usb/src/sys/dev/random/randomdev.c#3 integrate .. //depot/projects/usb/src/sys/dev/random/randomdev_soft.c#5 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#12 integrate .. //depot/projects/usb/src/sys/dev/sdhci/sdhci.c#2 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sis.c#3 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/snp/snp.c#9 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac_private.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci.c#84 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci_ddb.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/ehci_mbus.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#40 integrate .. //depot/projects/usb/src/sys/dev/usb/ehcireg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/ehcivar.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/if_upgt.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#62 integrate .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#46 integrate .. //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#19 integrate .. //depot/projects/usb/src/sys/dev/usb/u3g.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/ucom.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#19 integrate .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#40 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#30 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#29 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#40 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_error.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#37 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#33 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#16 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#16 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#22 edit .. //depot/projects/usb/src/sys/dev/vr/if_vr.c#4 integrate .. //depot/projects/usb/src/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/usb/src/sys/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_node.c#4 integrate .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/usb/src/sys/fs/deadfs/dead_vnops.c#3 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/usb/src/sys/fs/hpfs/hpfs_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vnops.c#7 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vnops.c#10 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_vnops.c#5 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_map.c#6 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union.h#6 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_subr.c#10 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vnops.c#12 integrate .. //depot/projects/usb/src/sys/geom/geom_bsd.c#3 integrate .. //depot/projects/usb/src/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/usb/src/sys/geom/geom_subr.c#7 integrate .. //depot/projects/usb/src/sys/geom/geom_vfs.c#4 integrate .. //depot/projects/usb/src/sys/geom/journal/g_journal.c#8 integrate .. //depot/projects/usb/src/sys/geom/journal/g_journal.h#2 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#11 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#10 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_mbr.c#5 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_list.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rm.c#4 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_vnops.c#4 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#8 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#8 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#15 integrate .. //depot/projects/usb/src/sys/i386/conf/PAE#8 integrate .. //depot/projects/usb/src/sys/i386/conf/XEN#4 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/est.c#5 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/p4tcc.c#4 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/powernow.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/exception.s#5 integrate .. //depot/projects/usb/src/sys/i386/i386/genassym.c#7 integrate .. //depot/projects/usb/src/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/usb/src/sys/i386/i386/initcpu.c#6 integrate .. //depot/projects/usb/src/sys/i386/i386/intr_machdep.c#10 integrate .. //depot/projects/usb/src/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/local_apic.c#11 integrate .. //depot/projects/usb/src/sys/i386/i386/longrun.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#12 integrate .. //depot/projects/usb/src/sys/i386/i386/msi.c#5 integrate .. //depot/projects/usb/src/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/usb/src/sys/i386/include/atomic.h#5 integrate .. //depot/projects/usb/src/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/usb/src/sys/i386/include/elf.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/md_var.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/pmc_mdep.h#6 integrate .. //depot/projects/usb/src/sys/i386/include/specialreg.h#11 integrate .. //depot/projects/usb/src/sys/i386/include/xen/xenbus.h#2 delete .. //depot/projects/usb/src/sys/i386/linux/linux.h#9 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/usb/src/sys/i386/xen/xen_machdep.c#5 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#10 integrate .. //depot/projects/usb/src/sys/ia64/include/elf.h#3 integrate .. //depot/projects/usb/src/sys/kern/Make.tags.inc#7 integrate .. //depot/projects/usb/src/sys/kern/imgact_elf.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_conf.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_cpu.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_cpuset.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_ktrace.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_lockf.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_module.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_poll.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_rwlock.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_shutdown.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_sysctl.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_uuid.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_vimage.c#1 branch .. //depot/projects/usb/src/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_param.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_prf.c#7 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#12 integrate .. //depot/projects/usb/src/sys/kern/subr_trap.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#14 integrate .. //depot/projects/usb/src/sys/kern/tty.c#13 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#9 integrate .. //depot/projects/usb/src/sys/kern/uipc_domain.c#6 integrate .. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/usb/src/sys/kern/uipc_shm.c#4 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/usb/src/sys/kern/vfs_aio.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#11 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_export.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#16 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#13 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#14 integrate .. //depot/projects/usb/src/sys/kern/vnode_if.src#10 integrate .. //depot/projects/usb/src/sys/libkern/iconv.c#2 integrate .. //depot/projects/usb/src/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/conf/DEFAULTS#2 integrate .. //depot/projects/usb/src/sys/mips/conf/IDT#6 integrate .. //depot/projects/usb/src/sys/mips/conf/SENTRY5#5 integrate .. //depot/projects/usb/src/sys/mips/include/atomic.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/elf.h#2 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#5 integrate .. //depot/projects/usb/src/sys/modules/Makefile#24 integrate .. //depot/projects/usb/src/sys/modules/ae/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/aio/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/ath/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/ath_hal/Makefile#4 delete .. //depot/projects/usb/src/sys/modules/ath_rate_amrr/Makefile#7 delete .. //depot/projects/usb/src/sys/modules/ath_rate_onoe/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/ath_rate_sample/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/bridgestp/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/cxgb/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/cxgb/iw_cxgb/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/hwpmc/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/if_ef/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/if_vlan/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/ip_mroute_mod/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/ipfw/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/linprocfs/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/linux/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/netgraph/atm/atm/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/netgraph/ether/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/netgraph/gif/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/nfsserver/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/pf/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/powermac_nvram/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/wlan/Makefile#7 integrate .. //depot/projects/usb/src/sys/net/bpf.c#13 integrate .. //depot/projects/usb/src/sys/net/bridgestp.c#10 integrate .. //depot/projects/usb/src/sys/net/ieee8023ad_lacp.c#7 integrate .. //depot/projects/usb/src/sys/net/if.c#15 integrate .. //depot/projects/usb/src/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/usb/src/sys/net/if_atmsubr.c#7 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#11 integrate .. //depot/projects/usb/src/sys/net/if_ef.c#5 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/usb/src/sys/net/if_faith.c#5 integrate .. //depot/projects/usb/src/sys/net/if_fddisubr.c#8 integrate .. //depot/projects/usb/src/sys/net/if_fwsubr.c#11 integrate .. //depot/projects/usb/src/sys/net/if_gif.c#11 integrate .. //depot/projects/usb/src/sys/net/if_gif.h#4 integrate .. //depot/projects/usb/src/sys/net/if_gre.c#10 integrate .. //depot/projects/usb/src/sys/net/if_iso88025subr.c#9 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#11 integrate .. //depot/projects/usb/src/sys/net/if_llatbl.c#1 branch .. //depot/projects/usb/src/sys/net/if_llatbl.h#1 branch .. //depot/projects/usb/src/sys/net/if_loop.c#13 integrate .. //depot/projects/usb/src/sys/net/if_media.h#9 integrate .. //depot/projects/usb/src/sys/net/if_mib.c#4 integrate .. //depot/projects/usb/src/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/usb/src/sys/net/if_stf.c#9 integrate .. //depot/projects/usb/src/sys/net/if_tun.c#10 integrate .. //depot/projects/usb/src/sys/net/if_var.h#11 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#10 integrate .. //depot/projects/usb/src/sys/net/pfil.c#3 integrate .. //depot/projects/usb/src/sys/net/pfil.h#4 integrate .. //depot/projects/usb/src/sys/net/radix.c#3 integrate .. //depot/projects/usb/src/sys/net/radix.h#3 integrate .. //depot/projects/usb/src/sys/net/radix_mpath.c#4 integrate .. //depot/projects/usb/src/sys/net/raw_cb.c#9 integrate .. //depot/projects/usb/src/sys/net/raw_cb.h#4 integrate .. //depot/projects/usb/src/sys/net/raw_usrreq.c#8 integrate .. //depot/projects/usb/src/sys/net/route.c#13 integrate .. //depot/projects/usb/src/sys/net/route.h#6 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#12 integrate .. //depot/projects/usb/src/sys/net/vnet.h#2 integrate .. //depot/projects/usb/src/sys/net80211/_ieee80211.h#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#11 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_acl.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_crypto.h#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_crypto_ccmp.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_crypto_tkip.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_crypto_wep.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_dfs.h#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_input.c#11 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#13 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_power.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.c#11 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_regdomain.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_sta.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#12 integrate .. //depot/projects/usb/src/sys/netgraph/atm/ng_atm.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/netflow/netflow.c#7 integrate .. //depot/projects/usb/src/sys/netgraph/netgraph.h#9 integrate .. //depot/projects/usb/src/sys/netgraph/ng_base.c#14 integrate .. //depot/projects/usb/src/sys/netgraph/ng_bridge.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#7 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/usb/src/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/ng_iface.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_mppc.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/ng_tty.c#5 integrate .. //depot/projects/usb/src/sys/netinet/icmp6.h#3 integrate .. //depot/projects/usb/src/sys/netinet/icmp_var.h#3 integrate .. //depot/projects/usb/src/sys/netinet/if_atm.c#3 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#14 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.h#3 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#7 integrate .. //depot/projects/usb/src/sys/netinet/in.c#12 integrate .. //depot/projects/usb/src/sys/netinet/in.h#7 integrate .. //depot/projects/usb/src/sys/netinet/in_gif.c#9 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#7 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#15 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#13 integrate .. //depot/projects/usb/src/sys/netinet/in_proto.c#8 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#11 integrate .. //depot/projects/usb/src/sys/netinet/in_var.h#9 integrate .. //depot/projects/usb/src/sys/netinet/ip6.h#4 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#10 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw_nat.c#5 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/usb/src/sys/netinet/ip_icmp.c#11 integrate .. //depot/projects/usb/src/sys/netinet/ip_id.c#5 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#15 integrate .. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#11 integrate .. //depot/projects/usb/src/sys/netinet/ip_var.h#7 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_db.c#8 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp.h#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.h#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_auth.c#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_auth.h#5 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_header.h#7 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.h#6 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.h#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.h#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.h#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.c#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_var.h#12 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#14 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.h#9 integrate .. //depot/projects/usb/src/sys/netinet/tcp_hostcache.c#9 integrate .. //depot/projects/usb/src/sys/netinet/tcp_hostcache.h#1 branch .. //depot/projects/usb/src/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/usb/src/sys/netinet/tcp_offload.c#5 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/usb/src/sys/netinet/tcp_reass.c#7 integrate .. //depot/projects/usb/src/sys/netinet/tcp_sack.c#8 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#17 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.h#5 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#11 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#8 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#13 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#15 integrate .. //depot/projects/usb/src/sys/netinet/udp_var.h#4 integrate .. //depot/projects/usb/src/sys/netinet/vinet.h#3 integrate .. //depot/projects/usb/src/sys/netinet6/dest6.c#6 integrate .. //depot/projects/usb/src/sys/netinet6/frag6.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/in6_gif.c#8 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#13 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.h#5 integrate .. //depot/projects/usb/src/sys/netinet6/in6_proto.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/in6_src.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/in6_var.h#6 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_forward.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_ipsec.c#7 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#9 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_var.h#9 integrate .. //depot/projects/usb/src/sys/netinet6/mld6.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#12 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.h#5 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.h#3 integrate .. //depot/projects/usb/src/sys/netinet6/route6.c#7 integrate .. //depot/projects/usb/src/sys/netinet6/scope6.c#8 integrate .. //depot/projects/usb/src/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/tcp6_var.h#3 integrate .. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#14 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 23 14:52:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B22F1065674; Tue, 23 Dec 2008 14:52:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1ED3A106564A for ; Tue, 23 Dec 2008 14:52:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E1C38FC1A for ; Tue, 23 Dec 2008 14:52:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNEqshO087172 for ; Tue, 23 Dec 2008 14:52:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNEqshw087170 for perforce@freebsd.org; Tue, 23 Dec 2008 14:52:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 23 Dec 2008 14:52:54 GMT Message-Id: <200812231452.mBNEqshw087170@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 155171 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, 23 Dec 2008 14:52:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=155171 Change 155171 by hselasky@hselasky_laptop001 on 2008/12/23 14:52:39 IFC @155167 - step two - fix compilation Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#31 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#17 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#31 (text+ko) ==== @@ -205,7 +205,7 @@ vendor NEWNEX 0x04f7 Newnex vendor BROTHER 0x04f9 Brother Industries vendor DALLAS 0x04fa Dallas Semiconductor -vendor AIPTEK2 0x04fc AIPTEK International +vendor SUNPLUS 0x04fc AIPTEK International vendor PFU 0x04fe PFU vendor FUJIKURA 0x0501 Fujikura/DDK vendor ACER 0x0502 Acer @@ -503,7 +503,7 @@ vendor FSC 0x0bf8 Fujitsu Siemens Computers vendor AGATE 0x0c08 Agate Technologies vendor DMI 0x0c0b DMI -vendor CHICONY2 0x0c45 Chicony +vendor MICRODIA 0x0c45 Chicony vendor SEALEVEL 0x0c52 Sealevel System vendor LUWEN 0x0c76 Luwen vendor KYOCERA2 0x0c88 Kyocera Wireless Corp. ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#17 (text+ko) ==== @@ -212,7 +212,7 @@ #define USB_VENDOR_NEWNEX 0x04f7 /* Newnex */ #define USB_VENDOR_BROTHER 0x04f9 /* Brother Industries */ #define USB_VENDOR_DALLAS 0x04fa /* Dallas Semiconductor */ -#define USB_VENDOR_AIPTEK2 0x04fc /* AIPTEK International */ +#define USB_VENDOR_SUNPLUS 0x04fc /* AIPTEK International */ #define USB_VENDOR_PFU 0x04fe /* PFU */ #define USB_VENDOR_FUJIKURA 0x0501 /* Fujikura/DDK */ #define USB_VENDOR_ACER 0x0502 /* Acer */ @@ -510,7 +510,7 @@ #define USB_VENDOR_FSC 0x0bf8 /* Fujitsu Siemens Computers */ #define USB_VENDOR_AGATE 0x0c08 /* Agate Technologies */ #define USB_VENDOR_DMI 0x0c0b /* DMI */ -#define USB_VENDOR_CHICONY2 0x0c45 /* Chicony */ +#define USB_VENDOR_MICRODIA 0x0c45 /* Chicony */ #define USB_VENDOR_SEALEVEL 0x0c52 /* Sealevel System */ #define USB_VENDOR_LUWEN 0x0c76 /* Luwen */ #define USB_VENDOR_KYOCERA2 0x0c88 /* Kyocera Wireless Corp. */ ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#17 (text+ko) ==== @@ -601,7 +601,7 @@ { USB_VENDOR_SUNPLUS, USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3, 0, - "", + "AIPTEK International", "PenCam Mega 1.3", }, { @@ -1405,7 +1405,7 @@ { USB_VENDOR_MICRODIA, USB_PRODUCT_MICRODIA_TWINKLECAM, 0, - "", + "Chicony", "TwinkleCam USB camera", }, { @@ -8165,7 +8165,7 @@ NULL, }, { - USB_VENDOR_AIPTEK2, 0, + USB_VENDOR_SUNPLUS, 0, USB_KNOWNDEV_NOPROD, "AIPTEK International", NULL, @@ -9953,7 +9953,7 @@ NULL, }, { - USB_VENDOR_CHICONY2, 0, + USB_VENDOR_MICRODIA, 0, USB_KNOWNDEV_NOPROD, "Chicony", NULL, From owner-p4-projects@FreeBSD.ORG Tue Dec 23 16:14:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D10E1065679; Tue, 23 Dec 2008 16:14:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17795106564A for ; Tue, 23 Dec 2008 16:14:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 04E798FC20 for ; Tue, 23 Dec 2008 16:14:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNGEHSI095432 for ; Tue, 23 Dec 2008 16:14:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNGEHYt095430 for perforce@freebsd.org; Tue, 23 Dec 2008 16:14:17 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 23 Dec 2008 16:14:17 GMT Message-Id: <200812231614.mBNGEHYt095430@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 155177 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, 23 Dec 2008 16:14:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=155177 Change 155177 by hselasky@hselasky_laptop001 on 2008/12/23 16:13:49 IFC @155167 step three. Import Sam's byte order patches for the EHCI. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#23 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#9 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#23 (text+ko) ==== @@ -84,7 +84,7 @@ &ehcinohighspeed, 0, "Disable High Speed USB"); static void ehci_dump_regs(ehci_softc_t *sc); -static void ehci_dump_sqh(ehci_qh_t *sqh); +static void ehci_dump_sqh(ehci_softc_t *sc, ehci_qh_t *sqh); #endif @@ -101,7 +101,7 @@ static usb2_config_td_command_t ehci_root_ctrl_task; static void ehci_do_poll(struct usb2_bus *bus); -static void ehci_root_ctrl_poll(struct ehci_softc *sc); +static void ehci_root_ctrl_poll(ehci_softc_t *sc); static void ehci_device_done(struct usb2_xfer *xfer, usb2_error_t error); static uint8_t ehci_check_transfer(struct usb2_xfer *xfer); static void ehci_timeout(void *arg); @@ -110,6 +110,7 @@ static usb2_sw_transfer_func_t ehci_root_ctrl_done; struct ehci_std_temp { + ehci_softc_t *sc; struct usb2_page_cache *pc; ehci_qtd_t *td; ehci_qtd_t *td_next; @@ -123,10 +124,27 @@ uint8_t short_frames_ok; }; +/* + * Byte-order conversion functions. + */ +static uint32_t +htoehci32(ehci_softc_t *sc, const uint32_t v) +{ + return ((sc->sc_flags & EHCI_SCFLG_BIGEDESC) ? + htobe32(v) : htole32(v)); +} + +static uint32_t +ehci32toh(ehci_softc_t *sc, const uint32_t v) +{ + return ((sc->sc_flags & EHCI_SCFLG_BIGEDESC) ? + be32toh(v) : le32toh(v)); +} + void ehci_iterate_hw_softc(struct usb2_bus *bus, usb2_bus_mem_sub_cb_t *cb) { - struct ehci_softc *sc = EHCI_BUS2SC(bus); + ehci_softc_t *sc = EHCI_BUS2SC(bus); uint32_t i; cb(bus, &sc->sc_hw.pframes_pc, &sc->sc_hw.pframes_pg, @@ -281,21 +299,21 @@ sc->sc_intr_p_last[i] = qh; qh->qh_self = - htole32(buf_res.physaddr) | - htole32(EHCI_LINK_QH); + htoehci32(sc, buf_res.physaddr) | + htoehci32(sc, EHCI_LINK_QH); qh->qh_endp = - htole32(EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH)); + htoehci32(sc, EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH)); qh->qh_endphub = - htole32(EHCI_QH_SET_MULT(1)); + htoehci32(sc, EHCI_QH_SET_MULT(1)); qh->qh_curqtd = 0; qh->qh_qtd.qtd_next = - htole32(EHCI_LINK_TERMINATE); + htoehci32(sc, EHCI_LINK_TERMINATE); qh->qh_qtd.qtd_altnext = - htole32(EHCI_LINK_TERMINATE); + htoehci32(sc, EHCI_LINK_TERMINATE); qh->qh_qtd.qtd_status = - htole32(EHCI_QTD_HALTED); + htoehci32(sc, EHCI_QTD_HALTED); } /* @@ -330,7 +348,7 @@ qh = sc->sc_intr_p_last[0]; /* the last (1ms) QH terminates */ - qh->qh_link = htole32(EHCI_LINK_TERMINATE); + qh->qh_link = htoehci32(sc, EHCI_LINK_TERMINATE); } for (i = 0; i < EHCI_VIRTUAL_FRAMELIST_COUNT; i++) { ehci_sitd_t *sitd; @@ -351,11 +369,11 @@ /* initialize full speed isochronous */ sitd->sitd_self = - htole32(buf_res.physaddr) | - htole32(EHCI_LINK_SITD); + htoehci32(sc, buf_res.physaddr) | + htoehci32(sc, EHCI_LINK_SITD); sitd->sitd_back = - htole32(EHCI_LINK_TERMINATE); + htoehci32(sc, EHCI_LINK_TERMINATE); sitd->sitd_next = sc->sc_intr_p_last[i | (EHCI_VIRTUAL_FRAMELIST_COUNT / 2)]->qh_self; @@ -376,8 +394,8 @@ /* initialize high speed isochronous */ itd->itd_self = - htole32(buf_res.physaddr) | - htole32(EHCI_LINK_ITD); + htoehci32(sc, buf_res.physaddr) | + htoehci32(sc, EHCI_LINK_ITD); itd->itd_next = sitd->sitd_self; @@ -422,20 +440,20 @@ /* init dummy QH that starts the async list */ qh->qh_self = - htole32(buf_res.physaddr) | - htole32(EHCI_LINK_QH); + htoehci32(sc, buf_res.physaddr) | + htoehci32(sc, EHCI_LINK_QH); /* fill the QH */ qh->qh_endp = - htole32(EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | EHCI_QH_HRECL); - qh->qh_endphub = htole32(EHCI_QH_SET_MULT(1)); + htoehci32(sc, EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | EHCI_QH_HRECL); + qh->qh_endphub = htoehci32(sc, EHCI_QH_SET_MULT(1)); qh->qh_link = qh->qh_self; qh->qh_curqtd = 0; /* fill the overlay qTD */ - qh->qh_qtd.qtd_next = htole32(EHCI_LINK_TERMINATE); - qh->qh_qtd.qtd_altnext = htole32(EHCI_LINK_TERMINATE); - qh->qh_qtd.qtd_status = htole32(EHCI_QTD_HALTED); + qh->qh_qtd.qtd_next = htoehci32(sc, EHCI_LINK_TERMINATE); + qh->qh_qtd.qtd_altnext = htoehci32(sc, EHCI_LINK_TERMINATE); + qh->qh_qtd.qtd_status = htoehci32(sc, EHCI_QTD_HALTED); } /* flush all cache into memory */ @@ -443,7 +461,7 @@ #if USB_DEBUG if (ehcidebug) { - ehci_dump_sqh(sc->sc_async_p_last); + ehci_dump_sqh(sc, sc->sc_async_p_last); } #endif @@ -491,7 +509,7 @@ * shut down the controller when the system is going down */ void -ehci_detach(struct ehci_softc *sc) +ehci_detach(ehci_softc_t *sc) { USB_BUS_LOCK(&sc->sc_bus); @@ -511,7 +529,7 @@ } void -ehci_suspend(struct ehci_softc *sc) +ehci_suspend(ehci_softc_t *sc) { uint32_t cmd; uint32_t hcr; @@ -565,7 +583,7 @@ } void -ehci_resume(struct ehci_softc *sc) +ehci_resume(ehci_softc_t *sc) { struct usb2_page_search buf_res; uint32_t cmd; @@ -724,9 +742,9 @@ } static void -ehci_dump_link(uint32_t link, int type) +ehci_dump_link(ehci_softc_t *sc, uint32_t link, int type) { - link = le32toh(link); + link = ehci32toh(sc, link); printf("0x%08x", link); if (link & EHCI_LINK_TERMINATE) printf(""); @@ -753,16 +771,16 @@ } static void -ehci_dump_qtd(ehci_qtd_t *qtd) +ehci_dump_qtd(ehci_softc_t *sc, ehci_qtd_t *qtd) { uint32_t s; printf(" next="); - ehci_dump_link(qtd->qtd_next, 0); + ehci_dump_link(sc, qtd->qtd_next, 0); printf(" altnext="); - ehci_dump_link(qtd->qtd_altnext, 0); + ehci_dump_link(sc, qtd->qtd_altnext, 0); printf("\n"); - s = le32toh(qtd->qtd_status); + s = ehci32toh(sc, qtd->qtd_status); printf(" status=0x%08x: toggle=%d bytes=0x%x ioc=%d c_page=0x%x\n", s, EHCI_QTD_GET_TOGGLE(s), EHCI_QTD_GET_BYTES(s), EHCI_QTD_GET_IOC(s), EHCI_QTD_GET_C_PAGE(s)); @@ -779,35 +797,35 @@ for (s = 0; s < 5; s++) { printf(" buffer[%d]=0x%08x\n", s, - le32toh(qtd->qtd_buffer[s])); + ehci32toh(sc, qtd->qtd_buffer[s])); } for (s = 0; s < 5; s++) { printf(" buffer_hi[%d]=0x%08x\n", s, - le32toh(qtd->qtd_buffer_hi[s])); + ehci32toh(sc, qtd->qtd_buffer_hi[s])); } } static uint8_t -ehci_dump_sqtd(ehci_qtd_t *sqtd) +ehci_dump_sqtd(ehci_softc_t *sc, ehci_qtd_t *sqtd) { uint8_t temp; usb2_pc_cpu_invalidate(sqtd->page_cache); - printf("QTD(%p) at 0x%08x:\n", sqtd, le32toh(sqtd->qtd_self)); - ehci_dump_qtd(sqtd); - temp = (sqtd->qtd_next & htole32(EHCI_LINK_TERMINATE)) ? 1 : 0; + printf("QTD(%p) at 0x%08x:\n", sqtd, ehci32toh(sc, sqtd->qtd_self)); + ehci_dump_qtd(sc, sqtd); + temp = (sqtd->qtd_next & htoehci32(sc, EHCI_LINK_TERMINATE)) ? 1 : 0; return (temp); } static void -ehci_dump_sqtds(ehci_qtd_t *sqtd) +ehci_dump_sqtds(ehci_softc_t *sc, ehci_qtd_t *sqtd) { uint16_t i; uint8_t stop; stop = 0; for (i = 0; sqtd && (i < 20) && !stop; sqtd = sqtd->obj_next, i++) { - stop = ehci_dump_sqtd(sqtd); + stop = ehci_dump_sqtd(sc, sqtd); } if (sqtd) { printf("dump aborted, too many TDs\n"); @@ -815,16 +833,17 @@ } static void -ehci_dump_sqh(ehci_qh_t *qh) +ehci_dump_sqh(ehci_softc_t *sc, ehci_qh_t *qh) { - uint32_t endp, endphub; + uint32_t endp; + uint32_t endphub; usb2_pc_cpu_invalidate(qh->page_cache); - printf("QH(%p) at 0x%08x:\n", qh, le32toh(qh->qh_self) & ~0x1F); + printf("QH(%p) at 0x%08x:\n", qh, ehci32toh(sc, qh->qh_self) & ~0x1F); printf(" link="); - ehci_dump_link(qh->qh_link, 1); + ehci_dump_link(sc, qh->qh_link, 1); printf("\n"); - endp = le32toh(qh->qh_endp); + endp = ehci32toh(sc, qh->qh_endp); printf(" endp=0x%08x\n", endp); printf(" addr=0x%02x inact=%d endpt=%d eps=%d dtc=%d hrecl=%d\n", EHCI_QH_GET_ADDR(endp), EHCI_QH_GET_INACT(endp), @@ -833,90 +852,90 @@ printf(" mpl=0x%x ctl=%d nrl=%d\n", EHCI_QH_GET_MPL(endp), EHCI_QH_GET_CTL(endp), EHCI_QH_GET_NRL(endp)); - endphub = le32toh(qh->qh_endphub); + endphub = ehci32toh(sc, qh->qh_endphub); printf(" endphub=0x%08x\n", endphub); printf(" smask=0x%02x cmask=0x%02x huba=0x%02x port=%d mult=%d\n", EHCI_QH_GET_SMASK(endphub), EHCI_QH_GET_CMASK(endphub), EHCI_QH_GET_HUBA(endphub), EHCI_QH_GET_PORT(endphub), EHCI_QH_GET_MULT(endphub)); printf(" curqtd="); - ehci_dump_link(qh->qh_curqtd, 0); + ehci_dump_link(sc, qh->qh_curqtd, 0); printf("\n"); printf("Overlay qTD:\n"); - ehci_dump_qtd((void *)&qh->qh_qtd); + ehci_dump_qtd(sc, (void *)&qh->qh_qtd); } static void -ehci_dump_sitd(ehci_sitd_t *sitd) +ehci_dump_sitd(ehci_softc_t *sc, ehci_sitd_t *sitd) { usb2_pc_cpu_invalidate(sitd->page_cache); - printf("SITD(%p) at 0x%08x\n", sitd, le32toh(sitd->sitd_self) & ~0x1F); - printf(" next=0x%08x\n", le32toh(sitd->sitd_next)); + printf("SITD(%p) at 0x%08x\n", sitd, ehci32toh(sc, sitd->sitd_self) & ~0x1F); + printf(" next=0x%08x\n", ehci32toh(sc, sitd->sitd_next)); printf(" portaddr=0x%08x dir=%s addr=%d endpt=0x%x port=0x%x huba=0x%x\n", - le32toh(sitd->sitd_portaddr), - (sitd->sitd_portaddr & htole32(EHCI_SITD_SET_DIR_IN)) + ehci32toh(sc, sitd->sitd_portaddr), + (sitd->sitd_portaddr & htoehci32(sc, EHCI_SITD_SET_DIR_IN)) ? "in" : "out", - EHCI_SITD_GET_ADDR(le32toh(sitd->sitd_portaddr)), - EHCI_SITD_GET_ENDPT(le32toh(sitd->sitd_portaddr)), - EHCI_SITD_GET_PORT(le32toh(sitd->sitd_portaddr)), - EHCI_SITD_GET_HUBA(le32toh(sitd->sitd_portaddr))); - printf(" mask=0x%08x\n", le32toh(sitd->sitd_mask)); - printf(" status=0x%08x <%s> len=0x%x\n", le32toh(sitd->sitd_status), - (sitd->sitd_status & htole32(EHCI_SITD_ACTIVE)) ? "ACTIVE" : "", - EHCI_SITD_GET_LEN(le32toh(sitd->sitd_status))); + EHCI_SITD_GET_ADDR(ehci32toh(sc, sitd->sitd_portaddr)), + EHCI_SITD_GET_ENDPT(ehci32toh(sc, sitd->sitd_portaddr)), + EHCI_SITD_GET_PORT(ehci32toh(sc, sitd->sitd_portaddr)), + EHCI_SITD_GET_HUBA(ehci32toh(sc, sitd->sitd_portaddr))); + printf(" mask=0x%08x\n", ehci32toh(sc, sitd->sitd_mask)); + printf(" status=0x%08x <%s> len=0x%x\n", ehci32toh(sc, sitd->sitd_status), + (sitd->sitd_status & htoehci32(sc, EHCI_SITD_ACTIVE)) ? "ACTIVE" : "", + EHCI_SITD_GET_LEN(ehci32toh(sc, sitd->sitd_status))); printf(" back=0x%08x, bp=0x%08x,0x%08x,0x%08x,0x%08x\n", - le32toh(sitd->sitd_back), - le32toh(sitd->sitd_bp[0]), - le32toh(sitd->sitd_bp[1]), - le32toh(sitd->sitd_bp_hi[0]), - le32toh(sitd->sitd_bp_hi[1])); + ehci32toh(sc, sitd->sitd_back), + ehci32toh(sc, sitd->sitd_bp[0]), + ehci32toh(sc, sitd->sitd_bp[1]), + ehci32toh(sc, sitd->sitd_bp_hi[0]), + ehci32toh(sc, sitd->sitd_bp_hi[1])); } static void -ehci_dump_itd(ehci_itd_t *itd) +ehci_dump_itd(ehci_softc_t *sc, ehci_itd_t *itd) { usb2_pc_cpu_invalidate(itd->page_cache); - printf("ITD(%p) at 0x%08x\n", itd, le32toh(itd->itd_self) & ~0x1F); - printf(" next=0x%08x\n", le32toh(itd->itd_next)); - printf(" status[0]=0x%08x; <%s>\n", le32toh(itd->itd_status[0]), - (itd->itd_status[0] & htole32(EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); - printf(" status[1]=0x%08x; <%s>\n", le32toh(itd->itd_status[1]), - (itd->itd_status[1] & htole32(EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); - printf(" status[2]=0x%08x; <%s>\n", le32toh(itd->itd_status[2]), - (itd->itd_status[2] & htole32(EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); - printf(" status[3]=0x%08x; <%s>\n", le32toh(itd->itd_status[3]), - (itd->itd_status[3] & htole32(EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); - printf(" status[4]=0x%08x; <%s>\n", le32toh(itd->itd_status[4]), - (itd->itd_status[4] & htole32(EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); - printf(" status[5]=0x%08x; <%s>\n", le32toh(itd->itd_status[5]), - (itd->itd_status[5] & htole32(EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); - printf(" status[6]=0x%08x; <%s>\n", le32toh(itd->itd_status[6]), - (itd->itd_status[6] & htole32(EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); - printf(" status[7]=0x%08x; <%s>\n", le32toh(itd->itd_status[7]), - (itd->itd_status[7] & htole32(EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); - printf(" bp[0]=0x%08x\n", le32toh(itd->itd_bp[0])); + printf("ITD(%p) at 0x%08x\n", itd, ehci32toh(sc, itd->itd_self) & ~0x1F); + printf(" next=0x%08x\n", ehci32toh(sc, itd->itd_next)); + printf(" status[0]=0x%08x; <%s>\n", ehci32toh(sc, itd->itd_status[0]), + (itd->itd_status[0] & htoehci32(sc, EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); + printf(" status[1]=0x%08x; <%s>\n", ehci32toh(sc, itd->itd_status[1]), + (itd->itd_status[1] & htoehci32(sc, EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); + printf(" status[2]=0x%08x; <%s>\n", ehci32toh(sc, itd->itd_status[2]), + (itd->itd_status[2] & htoehci32(sc, EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); + printf(" status[3]=0x%08x; <%s>\n", ehci32toh(sc, itd->itd_status[3]), + (itd->itd_status[3] & htoehci32(sc, EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); + printf(" status[4]=0x%08x; <%s>\n", ehci32toh(sc, itd->itd_status[4]), + (itd->itd_status[4] & htoehci32(sc, EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); + printf(" status[5]=0x%08x; <%s>\n", ehci32toh(sc, itd->itd_status[5]), + (itd->itd_status[5] & htoehci32(sc, EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); + printf(" status[6]=0x%08x; <%s>\n", ehci32toh(sc, itd->itd_status[6]), + (itd->itd_status[6] & htoehci32(sc, EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); + printf(" status[7]=0x%08x; <%s>\n", ehci32toh(sc, itd->itd_status[7]), + (itd->itd_status[7] & htoehci32(sc, EHCI_ITD_ACTIVE)) ? "ACTIVE" : ""); + printf(" bp[0]=0x%08x\n", ehci32toh(sc, itd->itd_bp[0])); printf(" addr=0x%02x; endpt=0x%01x\n", - EHCI_ITD_GET_ADDR(le32toh(itd->itd_bp[0])), - EHCI_ITD_GET_ENDPT(le32toh(itd->itd_bp[0]))); - printf(" bp[1]=0x%08x\n", le32toh(itd->itd_bp[1])); + EHCI_ITD_GET_ADDR(ehci32toh(sc, itd->itd_bp[0])), + EHCI_ITD_GET_ENDPT(ehci32toh(sc, itd->itd_bp[0]))); + printf(" bp[1]=0x%08x\n", ehci32toh(sc, itd->itd_bp[1])); printf(" dir=%s; mpl=0x%02x\n", - (le32toh(itd->itd_bp[1]) & EHCI_ITD_SET_DIR_IN) ? "in" : "out", - EHCI_ITD_GET_MPL(le32toh(itd->itd_bp[1]))); + (ehci32toh(sc, itd->itd_bp[1]) & EHCI_ITD_SET_DIR_IN) ? "in" : "out", + EHCI_ITD_GET_MPL(ehci32toh(sc, itd->itd_bp[1]))); printf(" bp[2..6]=0x%08x,0x%08x,0x%08x,0x%08x,0x%08x\n", - le32toh(itd->itd_bp[2]), - le32toh(itd->itd_bp[3]), - le32toh(itd->itd_bp[4]), - le32toh(itd->itd_bp[5]), - le32toh(itd->itd_bp[6])); + ehci32toh(sc, itd->itd_bp[2]), + ehci32toh(sc, itd->itd_bp[3]), + ehci32toh(sc, itd->itd_bp[4]), + ehci32toh(sc, itd->itd_bp[5]), + ehci32toh(sc, itd->itd_bp[6])); printf(" bp_hi=0x%08x,0x%08x,0x%08x,0x%08x,\n" " 0x%08x,0x%08x,0x%08x\n", - le32toh(itd->itd_bp_hi[0]), - le32toh(itd->itd_bp_hi[1]), - le32toh(itd->itd_bp_hi[2]), - le32toh(itd->itd_bp_hi[3]), - le32toh(itd->itd_bp_hi[4]), - le32toh(itd->itd_bp_hi[5]), - le32toh(itd->itd_bp_hi[6])); + ehci32toh(sc, itd->itd_bp_hi[0]), + ehci32toh(sc, itd->itd_bp_hi[1]), + ehci32toh(sc, itd->itd_bp_hi[2]), + ehci32toh(sc, itd->itd_bp_hi[3]), + ehci32toh(sc, itd->itd_bp_hi[4]), + ehci32toh(sc, itd->itd_bp_hi[5]), + ehci32toh(sc, itd->itd_bp_hi[6])); } static void @@ -937,12 +956,12 @@ sitd = sc->sc_isoc_fs_p_last[pos]; while (itd && max && max--) { - ehci_dump_itd(itd); + ehci_dump_itd(sc, itd); itd = itd->prev; } while (sitd && max && max--) { - ehci_dump_sitd(sitd); + ehci_dump_sitd(sc, sitd); sitd = sitd->prev; } } @@ -1046,12 +1065,6 @@ usb2_pc_cpu_flush(last->page_cache); -#if USB_DEBUG - if (ehcidebug > 5) { - printf("%s:\n", __FUNCTION__); - ehci_dump_sqh(sqh); - } -#endif return (sqh); } @@ -1127,6 +1140,7 @@ static usb2_error_t ehci_non_isoc_done_sub(struct usb2_xfer *xfer) { + ehci_softc_t *sc = xfer->usb2_sc; ehci_qtd_t *td; ehci_qtd_t *td_alt_next; uint32_t status; @@ -1138,7 +1152,7 @@ while (1) { usb2_pc_cpu_invalidate(td->page_cache); - status = le32toh(td->qtd_status); + status = ehci32toh(sc, td->qtd_status); len = EHCI_QTD_GET_BYTES(status); @@ -1230,7 +1244,9 @@ #if USB_DEBUG if (ehcidebug > 10) { - ehci_dump_sqtds(xfer->td_transfer_first); + ehci_softc_t *sc = xfer->usb2_sc; + + ehci_dump_sqtds(sc, xfer->td_transfer_first); } #endif @@ -1280,6 +1296,7 @@ ehci_check_transfer(struct usb2_xfer *xfer) { struct usb2_pipe_methods *methods = xfer->pipe->methods; + ehci_softc_t *sc = xfer->usb2_sc; uint32_t status; @@ -1292,13 +1309,13 @@ td = xfer->td_transfer_last; usb2_pc_cpu_invalidate(td->page_cache); - status = le32toh(td->sitd_status); + status = ehci32toh(sc, td->sitd_status); /* also check if first is complete */ td = xfer->td_transfer_first; usb2_pc_cpu_invalidate(td->page_cache); - status |= le32toh(td->sitd_status); + status |= ehci32toh(sc, td->sitd_status); if (!(status & EHCI_SITD_ACTIVE)) { ehci_device_done(xfer, USB_ERR_NORMAL_COMPLETION); @@ -1327,7 +1344,7 @@ td->itd_status[6] | td->itd_status[7]; /* if no transactions are active we continue */ - if (!(status & htole32(EHCI_ITD_ACTIVE))) { + if (!(status & htoehci32(sc, EHCI_ITD_ACTIVE))) { ehci_device_done(xfer, USB_ERR_NORMAL_COMPLETION); goto transferred; } @@ -1344,7 +1361,7 @@ while (1) { usb2_pc_cpu_invalidate(td->page_cache); - status = le32toh(td->qtd_status); + status = ehci32toh(sc, td->qtd_status); /* * if there is an active TD the transfer isn't done @@ -1523,7 +1540,7 @@ static void ehci_do_poll(struct usb2_bus *bus) { - struct ehci_softc *sc = EHCI_BUS2SC(bus); + ehci_softc_t *sc = EHCI_BUS2SC(bus); USB_BUS_LOCK(&sc->sc_bus); ehci_interrupt_poll(sc); @@ -1545,7 +1562,7 @@ uint8_t shortpkt_old; uint8_t precompute; - qtd_altnext = htole32(EHCI_LINK_TERMINATE); + qtd_altnext = htoehci32(temp->sc, EHCI_LINK_TERMINATE); td_alt_next = NULL; buf_offset = 0; shortpkt_old = temp->shortpkt; @@ -1602,7 +1619,8 @@ /* fill out current TD */ td->qtd_status = - temp->qtd_status | htole32(EHCI_QTD_SET_BYTES(average)); + temp->qtd_status | + htoehci32(temp->sc, EHCI_QTD_SET_BYTES(average)); if (average == 0) { @@ -1610,7 +1628,8 @@ /* update data toggle, ZLP case */ - temp->qtd_status ^= htole32(EHCI_QTD_TOGGLE_MASK); + temp->qtd_status ^= + htoehci32(temp->sc, EHCI_QTD_TOGGLE_MASK); } td->len = 0; @@ -1630,7 +1649,8 @@ if (((average + temp->max_frame_size - 1) / temp->max_frame_size) & 1) { - temp->qtd_status ^= htole32(EHCI_QTD_TOGGLE_MASK); + temp->qtd_status ^= + htoehci32(temp->sc, EHCI_QTD_TOGGLE_MASK); } } td->len = average; @@ -1642,7 +1662,8 @@ /* fill out buffer pointers */ usb2_get_page(temp->pc, buf_offset, &buf_res); - td->qtd_buffer[0] = htole32(buf_res.physaddr); + td->qtd_buffer[0] = + htoehci32(temp->sc, buf_res.physaddr); td->qtd_buffer_hi[0] = 0; x = 1; @@ -1651,7 +1672,9 @@ average -= EHCI_PAGE_SIZE; buf_offset += EHCI_PAGE_SIZE; usb2_get_page(temp->pc, buf_offset, &buf_res); - td->qtd_buffer[x] = htole32(buf_res.physaddr & (~0xFFF)); + td->qtd_buffer[x] = + htoehci32(temp->sc, + buf_res.physaddr & (~0xFFF)); td->qtd_buffer_hi[x] = 0; x++; } @@ -1666,7 +1689,9 @@ */ buf_offset += average; usb2_get_page(temp->pc, buf_offset - 1, &buf_res); - td->qtd_buffer[x] = htole32(buf_res.physaddr & (~0xFFF)); + td->qtd_buffer[x] = + htoehci32(temp->sc, + buf_res.physaddr & (~0xFFF)); td->qtd_buffer_hi[x] = 0; } @@ -1720,6 +1745,7 @@ temp.average = xfer->max_usb2_frame_size; temp.max_frame_size = xfer->max_frame_size; + temp.sc = xfer->usb2_sc; /* toggle the DMA set we are using */ xfer->flags_int.curr_dma_set ^= 1; @@ -1739,7 +1765,8 @@ if (xfer->flags_int.control_xfr) { if (xfer->pipe->toggle_next) { /* DATA1 is next */ - temp.qtd_status |= htole32(EHCI_QTD_SET_TOGGLE(1)); + temp.qtd_status |= + htoehci32(temp.sc, EHCI_QTD_SET_TOGGLE(1)); } temp.auto_data_toggle = 0; } else { @@ -1748,14 +1775,16 @@ if (usb2_get_speed(xfer->udev) != USB_SPEED_HIGH) { /* max 3 retries */ - temp.qtd_status |= htole32(EHCI_QTD_SET_CERR(3)); + temp.qtd_status |= + htoehci32(temp.sc, EHCI_QTD_SET_CERR(3)); } /* check if we should prepend a setup message */ if (xfer->flags_int.control_xfr) { if (xfer->flags_int.control_hdr) { - temp.qtd_status &= htole32(EHCI_QTD_SET_CERR(3)); + temp.qtd_status &= + htoehci32(temp.sc, EHCI_QTD_SET_CERR(3)); temp.qtd_status |= htole32 (EHCI_QTD_ACTIVE | EHCI_QTD_SET_PID(EHCI_QTD_PID_SETUP) | @@ -1786,7 +1815,8 @@ } /* keep previous data toggle and error count */ - temp.qtd_status &= htole32(EHCI_QTD_SET_CERR(3) | + temp.qtd_status &= + htoehci32(temp.sc, EHCI_QTD_SET_CERR(3) | EHCI_QTD_SET_TOGGLE(1)); if (temp.len == 0) { @@ -1806,9 +1836,9 @@ temp.qtd_status |= (UE_GET_DIR(xfer->endpoint) == UE_DIR_IN) ? - htole32(EHCI_QTD_ACTIVE | + htoehci32(temp.sc, EHCI_QTD_ACTIVE | EHCI_QTD_SET_PID(EHCI_QTD_PID_IN)) : - htole32(EHCI_QTD_ACTIVE | + htoehci32(temp.sc, EHCI_QTD_ACTIVE | EHCI_QTD_SET_PID(EHCI_QTD_PID_OUT)); ehci_setup_standard_chain_sub(&temp); @@ -1824,14 +1854,14 @@ * direction. */ - temp.qtd_status &= htole32(EHCI_QTD_SET_CERR(3) | + temp.qtd_status &= htoehci32(temp.sc, EHCI_QTD_SET_CERR(3) | EHCI_QTD_SET_TOGGLE(1)); temp.qtd_status |= (UE_GET_DIR(xfer->endpoint) == UE_DIR_OUT) ? - htole32(EHCI_QTD_ACTIVE | + htoehci32(temp.sc, EHCI_QTD_ACTIVE | EHCI_QTD_SET_PID(EHCI_QTD_PID_IN) | EHCI_QTD_SET_TOGGLE(1)) : - htole32(EHCI_QTD_ACTIVE | + htoehci32(temp.sc, EHCI_QTD_ACTIVE | EHCI_QTD_SET_PID(EHCI_QTD_PID_OUT) | EHCI_QTD_SET_TOGGLE(1)); @@ -1844,9 +1874,9 @@ td = temp.td; /* the last TD terminates the transfer: */ - td->qtd_next = htole32(EHCI_LINK_TERMINATE); - td->qtd_altnext = htole32(EHCI_LINK_TERMINATE); - td->qtd_status |= htole32(EHCI_QTD_IOC); + td->qtd_next = htoehci32(temp.sc, EHCI_LINK_TERMINATE); + td->qtd_altnext = htoehci32(temp.sc, EHCI_LINK_TERMINATE); + td->qtd_status |= htoehci32(temp.sc, EHCI_QTD_IOC); usb2_pc_cpu_flush(td->page_cache); @@ -1858,7 +1888,8 @@ if (ehcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", xfer->pipe->toggle_next); - ehci_dump_sqtds(xfer->td_transfer_first); + ehci_dump_sqtds(temp.sc, + xfer->td_transfer_first); } #endif @@ -1895,7 +1926,7 @@ } } - qh->qh_endp = htole32(qh_endp); + qh->qh_endp = htoehci32(temp.sc, qh_endp); qh_endphub = (EHCI_QH_SET_MULT(xfer->max_packet_count & 3) | @@ -1904,27 +1935,29 @@ EHCI_QH_SET_HUBA(xfer->udev->hs_hub_addr) | EHCI_QH_SET_PORT(xfer->udev->hs_port_no)); - qh->qh_endphub = htole32(qh_endphub); - qh->qh_curqtd = htole32(0); + qh->qh_endphub = htoehci32(temp.sc, qh_endphub); + qh->qh_curqtd = htoehci32(temp.sc, 0); /* fill the overlay qTD */ - qh->qh_qtd.qtd_status = htole32(0); + qh->qh_qtd.qtd_status = htoehci32(temp.sc, 0); if (temp.auto_data_toggle) { /* let the hardware compute the data toggle */ - qh->qh_endp &= ~htole32(EHCI_QH_DTC); + qh->qh_endp &= htoehci32(temp.sc, ~EHCI_QH_DTC); if (xfer->pipe->toggle_next) { /* DATA1 is next */ - qh->qh_qtd.qtd_status |= htole32(EHCI_QTD_SET_TOGGLE(1)); + qh->qh_qtd.qtd_status |= + htoehci32(temp.sc, EHCI_QTD_SET_TOGGLE(1)); } } td = xfer->td_transfer_first; qh->qh_qtd.qtd_next = td->qtd_self; - qh->qh_qtd.qtd_altnext = htole32(EHCI_LINK_TERMINATE); + qh->qh_qtd.qtd_altnext = + htoehci32(temp.sc, EHCI_LINK_TERMINATE); usb2_pc_cpu_flush(qh->page_cache); @@ -1937,7 +1970,7 @@ ehci_root_intr_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - struct ehci_softc *sc = xfer->usb2_sc; + ehci_softc_t *sc = xfer->usb2_sc; uint16_t i; uint16_t m; @@ -1997,11 +2030,11 @@ #if USB_DEBUG if (ehcidebug > 15) { DPRINTF("isoc FS-TD\n"); - ehci_dump_sitd(td); + ehci_dump_sitd(sc, td); } #endif usb2_pc_cpu_invalidate(td->page_cache); - status = le32toh(td->sitd_status); + status = ehci32toh(sc, td->sitd_status); len = EHCI_SITD_GET_LEN(status); @@ -2049,12 +2082,12 @@ #if USB_DEBUG if (ehcidebug > 15) { DPRINTF("isoc HS-TD\n"); - ehci_dump_itd(td); + ehci_dump_itd(sc, td); } #endif usb2_pc_cpu_invalidate(td->page_cache); - status = le32toh(td->itd_status[td_no]); + status = ehci32toh(sc, td->itd_status[td_no]); len = EHCI_ITD_GET_LEN(status); @@ -2107,7 +2140,8 @@ if (ehcidebug > 8) { DPRINTF("nexttog=%d; data after transfer:\n", xfer->pipe->toggle_next); - ehci_dump_sqtds(xfer->td_transfer_first); + ehci_dump_sqtds(xfer->usb2_sc, + xfer->td_transfer_first); } #endif @@ -2327,6 +2361,7 @@ static void ehci_device_isoc_fs_open(struct usb2_xfer *xfer) { + ehci_softc_t *sc = xfer->usb2_sc; ehci_sitd_t *td; uint32_t sitd_portaddr; uint8_t ds; @@ -2340,7 +2375,7 @@ if (UE_GET_DIR(xfer->endpoint) == UE_DIR_IN) { sitd_portaddr |= EHCI_SITD_SET_DIR_IN; } - sitd_portaddr = htole32(sitd_portaddr); + sitd_portaddr = htoehci32(sc, sitd_portaddr); /* initialize all TD's */ @@ -2357,7 +2392,7 @@ * * micro-frame usage (8 microframes per 1ms) */ - td->sitd_back = htole32(EHCI_LINK_TERMINATE); + td->sitd_back = htoehci32(sc, EHCI_LINK_TERMINATE); usb2_pc_cpu_flush(td->page_cache); } @@ -2504,7 +2539,7 @@ * non-zero length */ usb2_get_page(xfer->frbuffers, buf_offset, &buf_res); - td->sitd_bp[0] = htole32(buf_res.physaddr); + td->sitd_bp[0] = htoehci32(sc, buf_res.physaddr); buf_offset += *plen; /* * NOTE: We need to subtract one from the offset so @@ -2549,9 +2584,9 @@ sitd_mask = (EHCI_SITD_SET_SMASK(sa) | EHCI_SITD_SET_CMASK(sb)); - td->sitd_bp[1] = htole32(temp); + td->sitd_bp[1] = htoehci32(sc, temp); - td->sitd_mask = htole32(sitd_mask); + td->sitd_mask = htoehci32(sc, sitd_mask); if (nframes == 0) { td->sitd_status = htole32 @@ -2568,7 +2603,7 @@ #if USB_DEBUG if (ehcidebug > 15) { DPRINTF("FS-TD %d\n", nframes); - ehci_dump_sitd(td); + ehci_dump_sitd(sc, td); } #endif /* insert TD into schedule */ @@ -2611,6 +2646,7 @@ static void ehci_device_isoc_hs_open(struct usb2_xfer *xfer) { + ehci_softc_t *sc = xfer->usb2_sc; ehci_itd_t *td; uint32_t temp; uint8_t ds; @@ -2644,10 +2680,10 @@ temp |= EHCI_ITD_SET_DIR_IN; } /* set maximum packet size */ - td->itd_bp[1] = htole32(temp); + td->itd_bp[1] = htoehci32(sc, temp); /* set transfer multiplier */ - td->itd_bp[2] = htole32(xfer->max_packet_count & 3); + td->itd_bp[2] = htoehci32(sc, xfer->max_packet_count & 3); usb2_pc_cpu_flush(td->page_cache); } @@ -2769,7 +2805,7 @@ status = (EHCI_ITD_SET_LEN(*plen) | EHCI_ITD_ACTIVE | EHCI_ITD_SET_PG(0)); - td->itd_status[td_no] = htole32(status); + td->itd_status[td_no] = htoehci32(sc, status); itd_offset[td_no] = buf_offset; buf_offset += *plen; plen++; @@ -2792,14 +2828,14 @@ /* get page address */ page_addr = buf_res.physaddr & ~0xFFF; /* update page address */ - td->itd_bp[0] &= htole32(0xFFF); - td->itd_bp[0] |= htole32(page_addr); + td->itd_bp[0] &= htoehci32(sc, 0xFFF); + td->itd_bp[0] |= htoehci32(sc, page_addr); for (x = 0; x != td_no; x++) { /* set page number and page offset */ status = (EHCI_ITD_SET_PG(page_no) | (buf_res.physaddr & 0xFFF)); - td->itd_status[x] |= htole32(status); + td->itd_status[x] |= htoehci32(sc, status); /* get next page offset */ if (itd_offset[x + 1] == buf_offset) { @@ -2822,20 +2858,20 @@ } page_no++; /* update page address */ - td->itd_bp[page_no] &= htole32(0xFFF); - td->itd_bp[page_no] |= htole32(page_addr); + td->itd_bp[page_no] &= htoehci32(sc, 0xFFF); + td->itd_bp[page_no] |= htoehci32(sc, page_addr); } } } /* set IOC bit if we are complete */ if (nframes == 0) { - td->itd_status[7] |= htole32(EHCI_ITD_IOC); + td->itd_status[7] |= htoehci32(sc, EHCI_ITD_IOC); } usb2_pc_cpu_flush(td->page_cache); #if USB_DEBUG if (ehcidebug > 15) { DPRINTF("HS-TD %d\n", nframes); - ehci_dump_itd(td); + ehci_dump_itd(sc, td); } #endif /* insert TD into schedule */ @@ -3006,7 +3042,7 @@ } static void -ehci_root_ctrl_task(struct ehci_softc *sc, +ehci_root_ctrl_task(ehci_softc_t *sc, struct usb2_config_td_cc *cc, uint16_t refcount) { ehci_root_ctrl_poll(sc); @@ -3016,7 +3052,7 @@ ehci_root_ctrl_done(struct usb2_xfer *xfer, struct usb2_sw_transfer *std) { - struct ehci_softc *sc = xfer->usb2_sc; + ehci_softc_t *sc = xfer->usb2_sc; char *ptr; uint32_t port; uint32_t v; @@ -3431,7 +3467,7 @@ } static void -ehci_root_ctrl_poll(struct ehci_softc *sc) +ehci_root_ctrl_poll(ehci_softc_t *sc) { usb2_sw_transfer(&sc->sc_root_ctrl, &ehci_root_ctrl_done); @@ -3654,7 +3690,7 @@ td = page_info.buffer; /* init TD */ - td->itd_self = htole32(page_info.physaddr | EHCI_LINK_ITD); + td->itd_self = htoehci32(sc, page_info.physaddr | EHCI_LINK_ITD); td->obj_next = last_obj; td->page_cache = pc + n; @@ -3678,7 +3714,7 @@ td = page_info.buffer; /* init TD */ - td->sitd_self = htole32(page_info.physaddr | EHCI_LINK_SITD); + td->sitd_self = htoehci32(sc, page_info.physaddr | EHCI_LINK_SITD); td->obj_next = last_obj; td->page_cache = pc + n; @@ -3702,7 +3738,7 @@ qtd = page_info.buffer; /* init TD */ - qtd->qtd_self = htole32(page_info.physaddr); + qtd->qtd_self = htoehci32(sc, page_info.physaddr); qtd->obj_next = last_obj; qtd->page_cache = pc + n; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 23 19:06:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBB94106567A; Tue, 23 Dec 2008 19:06:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F22F1065674 for ; Tue, 23 Dec 2008 19:06:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A9828FC1C for ; Tue, 23 Dec 2008 19:06:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNJ6X0O026105 for ; Tue, 23 Dec 2008 19:06:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNJ6XQR026103 for perforce@freebsd.org; Tue, 23 Dec 2008 19:06:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 23 Dec 2008 19:06:33 GMT Message-Id: <200812231906.mBNJ6XQR026103@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 155191 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, 23 Dec 2008 19:06:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=155191 Change 155191 by hselasky@hselasky_laptop001 on 2008/12/23 19:05:58 IFC @155167 - final step Integrate if_zyd . Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#23 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#23 (text+ko) ==== @@ -155,6 +155,7 @@ static void zyd_cfg_amrr_start(struct zyd_softc *); static void zyd_update_mcast_cb(struct ifnet *); static void zyd_update_promisc_cb(struct ifnet *); +static void zyd_cfg_get_macaddr(struct zyd_softc *sc); static const struct zyd_phy_pair zyd_def_phy[] = ZYD_DEF_PHY; static const struct zyd_phy_pair zyd_def_phyB[] = ZYD_DEF_PHYB; @@ -758,7 +759,18 @@ zyd_cfg_cmd(sc, ZYD_CMD_RFCFG, &req, 4 + (2 * rf->width), NULL, 0, 0); } +/*------------------------------------------------------------------------* + * zyd_cfg_rfwrite_cr + *------------------------------------------------------------------------*/ static void +zyd_cfg_rfwrite_cr(struct zyd_softc *sc, uint32_t val) +{ + zyd_cfg_write16(sc, ZYD_CR244, (val >> 16) & 0xff); + zyd_cfg_write16(sc, ZYD_CR243, (val >> 8) & 0xff); + zyd_cfg_write16(sc, ZYD_CR242, (val >> 0) & 0xff); +} + +static void zyd_bulk_read_clear_stall_callback(struct usb2_xfer *xfer) { struct zyd_softc *sc = xfer->priv_sc; @@ -1151,10 +1163,24 @@ static void zyd_cfg_set_beacon_interval(struct zyd_softc *sc, uint32_t bintval) { - /* XXX this is probably broken.. */ - zyd_cfg_write32(sc, ZYD_CR_ATIM_WND_PERIOD, bintval - 2); - zyd_cfg_write32(sc, ZYD_CR_PRE_TBTT, bintval - 1); - zyd_cfg_write32(sc, ZYD_CR_BCN_INTERVAL, bintval); + uint32_t val; + + zyd_cfg_read32(sc, ZYD_CR_ATIM_WND_PERIOD, &val); + sc->sc_atim_wnd = val; + zyd_cfg_read32(sc, ZYD_CR_PRE_TBTT, &val); + sc->sc_pre_tbtt = val; + sc->sc_bcn_int = bintval; + + if (sc->sc_bcn_int <= 5) + sc->sc_bcn_int = 5; + if (sc->sc_pre_tbtt < 4 || sc->sc_pre_tbtt >= sc->sc_bcn_int) + sc->sc_pre_tbtt = sc->sc_bcn_int - 1; + if (sc->sc_atim_wnd >= sc->sc_pre_tbtt) + sc->sc_atim_wnd = sc->sc_pre_tbtt - 1; + + zyd_cfg_write32(sc, ZYD_CR_ATIM_WND_PERIOD, sc->sc_atim_wnd); + zyd_cfg_write32(sc, ZYD_CR_PRE_TBTT, sc->sc_pre_tbtt); + zyd_cfg_write32(sc, ZYD_CR_BCN_INTERVAL, sc->sc_bcn_int); } /* @@ -1166,7 +1192,7 @@ static const char *const zyd_rfs[] = { "unknown", "unknown", "UW2451", "UCHIP", "AL2230", "AL7230B", "THETA", "AL2210", "MAXIM_NEW", "GCT", - "PV2000", "RALINK", "INTERSIL", "RFMD", "MAXIM_NEW2", + "AL2230S", "RALINK", "INTERSIL", "RFMD", "MAXIM_NEW2", "PHILIPS" }; @@ -1238,36 +1264,106 @@ zyd_cfg_rf_al2230_init(struct zyd_softc *sc, struct zyd_rf *rf) { static const struct zyd_phy_pair phyini[] = ZYD_AL2230_PHY; - static const uint32_t rfini[] = ZYD_AL2230_RF; + static const struct zyd_phy_pair phy2230s[] = ZYD_AL2230S_PHY_INIT; + static const struct zyd_phy_pair phypll[] = { + {ZYD_CR251, 0x2f}, {ZYD_CR251, 0x3f}, + {ZYD_CR138, 0x28}, {ZYD_CR203, 0x06} + }; + static const uint32_t rfini1[] = ZYD_AL2230_RF_PART1; + static const uint32_t rfini2[] = ZYD_AL2230_RF_PART2; + static const uint32_t rfini3[] = ZYD_AL2230_RF_PART3; uint32_t i; /* init RF-dependent PHY registers */ - for (i = 0; i != INDEXES(phyini); i++) { + for (i = 0; i != INDEXES(phyini); i++) zyd_cfg_write16(sc, phyini[i].reg, phyini[i].val); + + if ((sc->sc_rf_rev == ZYD_RF_AL2230S) || (sc->sc_al2230s != 0)) { + for (i = 0; i != INDEXES(phy2230s); i++) + zyd_cfg_write16(sc, phy2230s[i].reg, phy2230s[i].val); } + /* init AL2230 radio */ + for (i = 0; i != INDEXES(rfini1); i++) + zyd_cfg_rfwrite(sc, rfini1[i]); + + if ((sc->sc_rf_rev == ZYD_RF_AL2230S) || (sc->sc_al2230s != 0)) + zyd_cfg_rfwrite(sc, 0x000824); + else + zyd_cfg_rfwrite(sc, 0x0005a4); + + for (i = 0; i != INDEXES(rfini2); i++) + zyd_cfg_rfwrite(sc, rfini2[i]); + + for (i = 0; i != INDEXES(phypll); i++) + zyd_cfg_write16(sc, phypll[i].reg, phypll[i].val); + + for (i = 0; i != INDEXES(rfini3); i++) + zyd_cfg_rfwrite(sc, rfini3[i]); +} - /* init AL2230 radio */ - for (i = 0; i != INDEXES(rfini); i++) { - zyd_cfg_rfwrite(sc, rfini[i]); - } +static void +zyd_cfg_rf_al2230_fini(struct zyd_softc *sc, struct zyd_rf *rf) +{ + static const struct zyd_phy_pair phy[] = ZYD_AL2230_PHY_FINI_PART1; + uint32_t i; + + for (i = 0; i != INDEXES(phy); i++) + zyd_cfg_write16(sc, phy[i].reg, phy[i].val); + + if (sc->sc_newphy != 0) + zyd_cfg_write16(sc, ZYD_CR9, 0xe1); + zyd_cfg_write16(sc, ZYD_CR203, 0x6); } static void zyd_cfg_rf_al2230_init_b(struct zyd_softc *sc, struct zyd_rf *rf) { static const struct zyd_phy_pair phyini[] = ZYD_AL2230_PHY_B; - static const uint32_t rfini[] = ZYD_AL2230_RF_B; + static const struct zyd_phy_pair phy1[] = ZYD_AL2230_PHY_PART1; + static const struct zyd_phy_pair phy2[] = ZYD_AL2230_PHY_PART2; + static const struct zyd_phy_pair phy3[] = ZYD_AL2230_PHY_PART3; + static const struct zyd_phy_pair phy2230s[] = ZYD_AL2230S_PHY_INIT; + static const uint32_t rfini_part1[] = ZYD_AL2230_RF_B_PART1; + static const uint32_t rfini_part2[] = ZYD_AL2230_RF_B_PART2; + static const uint32_t rfini_part3[] = ZYD_AL2230_RF_B_PART3; + static const uint32_t zyd_al2230_chtable[][3] = ZYD_AL2230_CHANTABLE; uint32_t i; + for (i = 0; i != INDEXES(phy1); i++) + zyd_cfg_write16(sc, phy1[i].reg, phy1[i].val); + /* init RF-dependent PHY registers */ - for (i = 0; i != INDEXES(phyini); i++) { + for (i = 0; i != INDEXES(phyini); i++) zyd_cfg_write16(sc, phyini[i].reg, phyini[i].val); - } + + if ((sc->sc_rf_rev == ZYD_RF_AL2230S) || (sc->sc_al2230s != 0)) + for (i = 0; i != INDEXES(phy2230s); i++) + zyd_cfg_write16(sc, phy2230s[i].reg, phy2230s[i].val); + + for (i = 0; i != 3; i++) + zyd_cfg_rfwrite_cr(sc, zyd_al2230_chtable[0][i]); + + for (i = 0; i != INDEXES(rfini_part1); i++) + zyd_cfg_rfwrite_cr(sc, rfini_part1[i]); + + if ((sc->sc_rf_rev == ZYD_RF_AL2230S) || (sc->sc_al2230s != 0)) + zyd_cfg_rfwrite(sc, 0x241000); + else + zyd_cfg_rfwrite(sc, 0x25a000); + + for (i = 0; i != INDEXES(rfini_part2); i++) + zyd_cfg_rfwrite_cr(sc, rfini_part2[i]); + + for (i = 0; i != INDEXES(phy2); i++) + zyd_cfg_write16(sc, phy2[i].reg, phy2[i].val); + + for (i = 0; i != INDEXES(rfini_part3); i++) + zyd_cfg_rfwrite_cr(sc, rfini_part3[i]); + + for (i = 0; i < INDEXES(phy3); i++) + zyd_cfg_write16(sc, phy3[i].reg, phy3[i].val); - /* init AL2230 radio */ - for (i = 0; i != INDEXES(rfini); i++) { - zyd_cfg_rfwrite(sc, rfini[i]); - } + zyd_cfg_rf_al2230_fini(sc, rf); } /* @@ -1277,16 +1373,60 @@ zyd_cfg_rf_al2230_set_channel(struct zyd_softc *sc, struct zyd_rf *rf, uint8_t channel) { + static const struct zyd_phy_pair phy1[] = { + {ZYD_CR138, 0x28}, {ZYD_CR203, 0x06}, + }; static const struct { uint32_t r1, r2, r3; } rfprog[] = ZYD_AL2230_CHANTABLE; + uint32_t i; zyd_cfg_rfwrite(sc, rfprog[channel - 1].r1); zyd_cfg_rfwrite(sc, rfprog[channel - 1].r2); zyd_cfg_rfwrite(sc, rfprog[channel - 1].r3); - zyd_cfg_write16(sc, ZYD_CR138, 0x28); - zyd_cfg_write16(sc, ZYD_CR203, 0x06); + for (i = 0; i != INDEXES(phy1); i++) + zyd_cfg_write16(sc, phy1[i].reg, phy1[i].val); +} + +static void +zyd_cfg_rf_al2230_set_channel_b(struct zyd_softc *sc, + struct zyd_rf *rf, uint8_t chan) +{ + static const struct zyd_phy_pair phy1[] = ZYD_AL2230_PHY_PART1; + static const struct { + uint32_t r1, r2, r3; + } rfprog[] = ZYD_AL2230_CHANTABLE_B; + uint32_t i; + + for (i = 0; i != INDEXES(phy1); i++) + zyd_cfg_write16(sc, phy1[i].reg, phy1[i].val); + + zyd_cfg_rfwrite_cr(sc, rfprog[chan - 1].r1); + zyd_cfg_rfwrite_cr(sc, rfprog[chan - 1].r2); + zyd_cfg_rfwrite_cr(sc, rfprog[chan - 1].r3); + + zyd_cfg_rf_al2230_fini(sc, rf); +} + +#define ZYD_AL2230_PHY_BANDEDGE6 \ +{ \ + { ZYD_CR128, 0x14 }, { ZYD_CR129, 0x12 }, { ZYD_CR130, 0x10 }, \ + { ZYD_CR47, 0x1e } \ +} + +static void +zyd_cfg_rf_al2230_bandedge6(struct zyd_softc *sc, + struct zyd_rf *rf, uint8_t chan) +{ + struct zyd_phy_pair r[] = ZYD_AL2230_PHY_BANDEDGE6; + uint32_t i; + + if ((chan == 1) || (chan == 11)) + r[0].val = 0x12; + + for (i = 0; i < INDEXES(r); i++) + zyd_cfg_write16(sc, r[i].reg, r[i].val); } /* @@ -1416,7 +1556,6 @@ zyd_cfg_write32(sc, ZYD_CR_RADIO_PD, tmp & ~1); zyd_cfg_write32(sc, ZYD_CR_RADIO_PD, tmp | 1); zyd_cfg_write32(sc, ZYD_CR_RFCFG, 0x05); - zyd_cfg_write32(sc, ZYD_CR_RFCFG, 0x00); zyd_cfg_write16(sc, ZYD_CR47, 0x1e); @@ -1620,12 +1759,16 @@ rf->width = 24; /* 24-bit RF values */ break; case ZYD_RF_AL2230: - if (sc->sc_mac_rev == ZYD_ZD1211B) + case ZYD_RF_AL2230S: + if (sc->sc_mac_rev == ZYD_ZD1211B) { rf->cfg_init_hw = zyd_cfg_rf_al2230_init_b; - else + rf->cfg_set_channel = zyd_cfg_rf_al2230_set_channel_b; + } else { rf->cfg_init_hw = zyd_cfg_rf_al2230_init; + rf->cfg_set_channel = zyd_cfg_rf_al2230_set_channel; + } rf->cfg_switch_radio = zyd_cfg_rf_al2230_switch_radio; - rf->cfg_set_channel = zyd_cfg_rf_al2230_set_channel; + rf->cfg_bandedge6 = zyd_cfg_rf_al2230_bandedge6; rf->width = 24; /* 24-bit RF values */ break; case ZYD_RF_AL7230B: @@ -1692,6 +1835,9 @@ zyd_cfg_write32(sc, ZYD_CR_GPI_EN, 0); zyd_cfg_write32(sc, ZYD_MAC_CONT_WIN_LIMIT, 0x7f043f); + /* set mandatory rates - XXX assumes 802.11b/g */ + zyd_cfg_write32(sc, ZYD_MAC_MAN_RATE, 0x150f); + /* disable interrupts */ zyd_cfg_write32(sc, ZYD_CR_INTERRUPT, 0); @@ -1701,7 +1847,7 @@ for (; phyp->reg != 0; phyp++) { zyd_cfg_write16(sc, phyp->reg, phyp->val); } - if (sc->sc_fix_cr157) { + if ((sc->sc_mac_rev == ZYD_ZD1211) && sc->sc_fix_cr157) { zyd_cfg_read32(sc, ZYD_EEPROM_PHY_REG, &tmp); zyd_cfg_write32(sc, ZYD_CR157, tmp >> 8); } @@ -1710,20 +1856,6 @@ /* HMAC init */ zyd_cfg_write32(sc, ZYD_MAC_ACK_EXT, 0x00000020); zyd_cfg_write32(sc, ZYD_CR_ADDA_MBIAS_WT, 0x30000808); - - if (sc->sc_mac_rev == ZYD_ZD1211) { - zyd_cfg_write32(sc, ZYD_MAC_RETRY, 0x00000002); - } else { - zyd_cfg_write32(sc, ZYD_MACB_MAX_RETRY, 0x02020202); - zyd_cfg_write32(sc, ZYD_MACB_TXPWR_CTL4, 0x007f003f); - zyd_cfg_write32(sc, ZYD_MACB_TXPWR_CTL3, 0x007f003f); - zyd_cfg_write32(sc, ZYD_MACB_TXPWR_CTL2, 0x003f001f); - zyd_cfg_write32(sc, ZYD_MACB_TXPWR_CTL1, 0x001f000f); - zyd_cfg_write32(sc, ZYD_MACB_AIFS_CTL1, 0x00280028); - zyd_cfg_write32(sc, ZYD_MACB_AIFS_CTL2, 0x008C003C); - zyd_cfg_write32(sc, ZYD_MACB_TXOP, 0x01800824); - } - zyd_cfg_write32(sc, ZYD_MAC_SNIFFER, 0x00000000); zyd_cfg_write32(sc, ZYD_MAC_RXFILTER, 0x00000000); zyd_cfg_write32(sc, ZYD_MAC_GHTBL, 0x00000000); @@ -1735,12 +1867,28 @@ zyd_cfg_write32(sc, ZYD_MAC_ACK_EXT, 0x00000080); zyd_cfg_write32(sc, ZYD_CR_ADDA_PWR_DWN, 0x00000000); zyd_cfg_write32(sc, ZYD_MAC_SIFS_ACK_TIME, 0x00000100); - zyd_cfg_write32(sc, ZYD_MAC_DIFS_EIFS_SIFS, 0x0547c032); zyd_cfg_write32(sc, ZYD_CR_RX_PE_DELAY, 0x00000070); zyd_cfg_write32(sc, ZYD_CR_PS_CTRL, 0x10000000); zyd_cfg_write32(sc, ZYD_MAC_RTSCTSRATE, 0x02030203); - zyd_cfg_write32(sc, ZYD_MAC_RX_THRESHOLD, 0x000c0640); + zyd_cfg_write32(sc, ZYD_MAC_AFTER_PNP, 1); zyd_cfg_write32(sc, ZYD_MAC_BACKOFF_PROTECT, 0x00000114); + zyd_cfg_write32(sc, ZYD_MAC_DIFS_EIFS_SIFS, 0x0a47c032); + zyd_cfg_write32(sc, ZYD_MAC_CAM_MODE, 0x3); + + if (sc->sc_mac_rev == ZYD_ZD1211) { + zyd_cfg_write32(sc, ZYD_MAC_RETRY, 0x00000002); + zyd_cfg_write32(sc, ZYD_MAC_RX_THRESHOLD, 0x000c0640); + } else { + zyd_cfg_write32(sc, ZYD_MACB_MAX_RETRY, 0x02020202); + zyd_cfg_write32(sc, ZYD_MACB_TXPWR_CTL4, 0x007f003f); + zyd_cfg_write32(sc, ZYD_MACB_TXPWR_CTL3, 0x007f003f); + zyd_cfg_write32(sc, ZYD_MACB_TXPWR_CTL2, 0x003f001f); + zyd_cfg_write32(sc, ZYD_MACB_TXPWR_CTL1, 0x001f000f); + zyd_cfg_write32(sc, ZYD_MACB_AIFS_CTL1, 0x00280028); + zyd_cfg_write32(sc, ZYD_MACB_AIFS_CTL2, 0x008C003C); + zyd_cfg_write32(sc, ZYD_MACB_TXOP, 0x01800824); + zyd_cfg_write32(sc, ZYD_MAC_RX_THRESHOLD, 0x000c0eff); + } /* init beacon interval to 100ms */ zyd_cfg_set_beacon_interval(sc, 100); @@ -1759,20 +1907,19 @@ uint16_t val; /* read MAC address */ - zyd_cfg_read32(sc, ZYD_EEPROM_MAC_ADDR_P1, &tmp); - sc->sc_myaddr[0] = tmp & 0xff; - sc->sc_myaddr[1] = tmp >> 8; - sc->sc_myaddr[2] = tmp >> 16; - sc->sc_myaddr[3] = tmp >> 24; - zyd_cfg_read32(sc, ZYD_EEPROM_MAC_ADDR_P2, &tmp); - sc->sc_myaddr[4] = tmp & 0xff; - sc->sc_myaddr[5] = tmp >> 8; + zyd_cfg_get_macaddr(sc); + /* read product data */ zyd_cfg_read32(sc, ZYD_EEPROM_POD, &tmp); sc->sc_rf_rev = tmp & 0x0f; - sc->sc_fix_cr47 = (tmp >> 8) & 0x01; + sc->sc_ledtype = (tmp >> 4) & 0x01; + sc->sc_cckgain = (tmp >> 8) & 0x01; sc->sc_fix_cr157 = (tmp >> 13) & 0x01; sc->sc_pa_rev = (tmp >> 16) & 0x0f; + sc->sc_al2230s = (tmp >> 7) & 0x01; + sc->sc_bandedge6 = (tmp >> 21) & 0x01; + sc->sc_newphy = (tmp >> 31) & 0x01; + sc->sc_txled = ((tmp & (1 << 24)) && (tmp & (1 << 29))) ? 0 : 1; /* read regulatory domain (currently unused) */ zyd_cfg_read32(sc, ZYD_EEPROM_SUBID, &tmp); @@ -1804,6 +1951,21 @@ } static void +zyd_cfg_get_macaddr(struct zyd_softc *sc) +{ + struct usb2_device_request req; + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = ZYD_READFWDATAREQ; + USETW(req.wValue, ZYD_EEPROM_MAC_ADDR_P1); + USETW(req.wIndex, 0); + USETW(req.wLength, IEEE80211_ADDR_LEN); + + zyd_cfg_usbrequest(sc, &req, sc->sc_myaddr); + return; +} + +static void zyd_cfg_set_mac_addr(struct zyd_softc *sc, const uint8_t *addr) { uint32_t tmp; @@ -2273,17 +2435,18 @@ zyd_cfg_write16(sc, ZYD_CR67, sc->sc_ofdm36_cal[chan - 1]); zyd_cfg_write16(sc, ZYD_CR66, sc->sc_ofdm48_cal[chan - 1]); zyd_cfg_write16(sc, ZYD_CR65, sc->sc_ofdm54_cal[chan - 1]); - zyd_cfg_write16(sc, ZYD_CR68, sc->sc_pwr_cal[chan - 1]); - zyd_cfg_write16(sc, ZYD_CR69, 0x28); zyd_cfg_write16(sc, ZYD_CR69, 0x2a); } - if (sc->sc_fix_cr47) { + if (sc->sc_cckgain) { /* set CCK baseband gain from EEPROM */ zyd_cfg_read32(sc, ZYD_EEPROM_PHY_REG, &tmp); zyd_cfg_write16(sc, ZYD_CR47, tmp & 0xff); } + if (sc->sc_bandedge6 && (sc->sc_rf.cfg_bandedge6 != NULL)) { + (sc->sc_rf.cfg_bandedge6) (sc, &sc->sc_rf, chan); + } zyd_cfg_write32(sc, ZYD_CR_CONFIG_PHILIPS, 0); zyd_cfg_unlock_phy(sc); @@ -2352,7 +2515,7 @@ else if (cc->ic_curmode == IEEE80211_MODE_11A) zyd_cfg_write32(sc, ZYD_MAC_BAS_RATE, 0x1500); else /* assumes 802.11b/g */ - zyd_cfg_write32(sc, ZYD_MAC_BAS_RATE, 0x000f); + zyd_cfg_write32(sc, ZYD_MAC_BAS_RATE, 0xff0f); /* set mandatory rates */ if (cc->ic_curmode == IEEE80211_MODE_11B) ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#8 (text+ko) ==== @@ -101,6 +101,7 @@ #define ZYD_MAC_CONT_WIN_LIMIT 0x96f0 /* Contention window limit */ #define ZYD_MAC_TX_PKT 0x96f4 /* Tx total packet count read */ #define ZYD_MAC_DL_CTRL 0x96f8 /* Download control */ +#define ZYD_MAC_CAM_MODE 0x9700 /* CAM: Continuous Access Mode */ #define ZYD_MACB_TXPWR_CTL1 0x9b00 #define ZYD_MACB_TXPWR_CTL2 0x9b04 #define ZYD_MACB_TXPWR_CTL3 0x9b08 @@ -127,8 +128,8 @@ #define ZYD_EEPROM_PWR_CAL 0xf81f /* Calibration */ #define ZYD_EEPROM_PWR_INT 0xf827 /* Calibration */ #define ZYD_EEPROM_ALLOWEDCHAN 0xf82f /* Allowed CH mask, 1 bit each */ -#define ZYD_EEPROM_PHY_REG 0xf831 /* PHY registers */ #define ZYD_EEPROM_DEVICE_VER 0xf837 /* Device version */ +#define ZYD_EEPROM_PHY_REG 0xf83c /* PHY registers */ #define ZYD_EEPROM_36M_CAL 0xf83f /* Calibration */ #define ZYD_EEPROM_11A_INT 0xf847 /* Interpolation */ #define ZYD_EEPROM_48M_CAL 0xf84f /* Calibration */ @@ -161,7 +162,7 @@ #define ZYD_RF_AL2210 0x7 #define ZYD_RF_MAXIM_NEW 0x8 #define ZYD_RF_GCT 0x9 -#define ZYD_RF_PV2000 0xa /* not supported yet */ +#define ZYD_RF_AL2230S 0xa #define ZYD_RF_RALINK 0xb /* not supported yet */ #define ZYD_RF_INTERSIL 0xc /* not supported yet */ #define ZYD_RF_RFMD 0xd @@ -437,7 +438,7 @@ { ZYD_CR37, 0x00 }, { ZYD_CR38, 0x38 }, { ZYD_CR39, 0x0c }, \ { ZYD_CR40, 0x84 }, { ZYD_CR41, 0x2a }, { ZYD_CR42, 0x80 }, \ { ZYD_CR43, 0x10 }, { ZYD_CR44, 0x12 }, { ZYD_CR46, 0xff }, \ - { ZYD_CR47, 0x08 }, { ZYD_CR48, 0x26 }, { ZYD_CR49, 0x5b }, \ + { ZYD_CR47, 0x1e }, { ZYD_CR48, 0x26 }, { ZYD_CR49, 0x5b }, \ { ZYD_CR64, 0xd0 }, { ZYD_CR65, 0x04 }, { ZYD_CR66, 0x58 }, \ { ZYD_CR67, 0xc9 }, { ZYD_CR68, 0x88 }, { ZYD_CR69, 0x41 }, \ { ZYD_CR70, 0x23 }, { ZYD_CR71, 0x10 }, { ZYD_CR72, 0xff }, \ @@ -459,7 +460,7 @@ { ZYD_CR5, 0x00 }, { ZYD_CR6, 0x00 }, { ZYD_CR7, 0x00 }, \ { ZYD_CR8, 0x00 }, { ZYD_CR9, 0x20 }, { ZYD_CR12, 0xf0 }, \ { ZYD_CR20, 0x0e }, { ZYD_CR21, 0x0e }, { ZYD_CR27, 0x10 }, \ - { ZYD_CR44, 0x33 }, { ZYD_CR47, 0x30 }, { ZYD_CR83, 0x24 }, \ + { ZYD_CR44, 0x33 }, { ZYD_CR47, 0x1E }, { ZYD_CR83, 0x24 }, \ { ZYD_CR84, 0x04 }, { ZYD_CR85, 0x00 }, { ZYD_CR86, 0x0C }, \ { ZYD_CR87, 0x12 }, { ZYD_CR88, 0x0C }, { ZYD_CR89, 0x00 }, \ { ZYD_CR90, 0x10 }, { ZYD_CR91, 0x08 }, { ZYD_CR93, 0x00 }, \ @@ -470,19 +471,18 @@ { ZYD_CR111, 0x27 }, { ZYD_CR112, 0x27 }, { ZYD_CR113, 0x27 }, \ { ZYD_CR114, 0x27 }, { ZYD_CR115, 0x26 }, { ZYD_CR116, 0x24 }, \ { ZYD_CR117, 0xfc }, { ZYD_CR118, 0xfa }, { ZYD_CR120, 0x4f }, \ - { ZYD_CR123, 0x27 }, { ZYD_CR125, 0xaa }, { ZYD_CR127, 0x03 }, \ - { ZYD_CR128, 0x14 }, { ZYD_CR129, 0x12 }, { ZYD_CR130, 0x10 }, \ - { ZYD_CR131, 0x0C }, { ZYD_CR136, 0xdf }, { ZYD_CR137, 0x40 }, \ - { ZYD_CR138, 0xa0 }, { ZYD_CR139, 0xb0 }, { ZYD_CR140, 0x99 }, \ - { ZYD_CR141, 0x82 }, { ZYD_CR142, 0x54 }, { ZYD_CR143, 0x1c }, \ - { ZYD_CR144, 0x6c }, { ZYD_CR147, 0x07 }, { ZYD_CR148, 0x4c }, \ - { ZYD_CR149, 0x50 }, { ZYD_CR150, 0x0e }, { ZYD_CR151, 0x18 }, \ - { ZYD_CR160, 0xfe }, { ZYD_CR161, 0xee }, { ZYD_CR162, 0xaa }, \ - { ZYD_CR163, 0xfa }, { ZYD_CR164, 0xfa }, { ZYD_CR165, 0xea }, \ - { ZYD_CR166, 0xbe }, { ZYD_CR167, 0xbe }, { ZYD_CR168, 0x6a }, \ - { ZYD_CR169, 0xba }, { ZYD_CR170, 0xba }, { ZYD_CR171, 0xba }, \ - { ZYD_CR204, 0x7d }, { ZYD_CR203, 0x30 }, \ - { 0, 0 } \ + { ZYD_CR125, 0xaa }, { ZYD_CR127, 0x03 }, { ZYD_CR128, 0x14 }, \ + { ZYD_CR129, 0x12 }, { ZYD_CR130, 0x10 }, { ZYD_CR131, 0x0C }, \ + { ZYD_CR136, 0xdf }, { ZYD_CR137, 0x40 }, { ZYD_CR138, 0xa0 }, \ + { ZYD_CR139, 0xb0 }, { ZYD_CR140, 0x99 }, { ZYD_CR141, 0x82 }, \ + { ZYD_CR142, 0x54 }, { ZYD_CR143, 0x1c }, { ZYD_CR144, 0x6c }, \ + { ZYD_CR147, 0x07 }, { ZYD_CR148, 0x4c }, { ZYD_CR149, 0x50 }, \ + { ZYD_CR150, 0x0e }, { ZYD_CR151, 0x18 }, { ZYD_CR160, 0xfe }, \ + { ZYD_CR161, 0xee }, { ZYD_CR162, 0xaa }, { ZYD_CR163, 0xfa }, \ + { ZYD_CR164, 0xfa }, { ZYD_CR165, 0xea }, { ZYD_CR166, 0xbe }, \ + { ZYD_CR167, 0xbe }, { ZYD_CR168, 0x6a }, { ZYD_CR169, 0xba }, \ + { ZYD_CR170, 0xba }, { ZYD_CR171, 0xba }, { ZYD_CR204, 0x7d }, \ + { ZYD_CR203, 0x30 }, { 0, 0} \ } #define ZYD_DEF_PHYB \ @@ -590,8 +590,6 @@ { 0x181a60, 0x1c0000 } \ } - - #define ZYD_AL2230_PHY \ { \ { ZYD_CR15, 0x20 }, { ZYD_CR23, 0x40 }, { ZYD_CR24, 0x20 }, \ @@ -617,34 +615,73 @@ #define ZYD_AL2230_PHY_B \ { \ - { ZYD_CR10, 0x89 }, { ZYD_CR15, 0x20 }, { ZYD_CR17, 0x2b }, \ + { ZYD_CR10, 0x89 }, { ZYD_CR15, 0x20 }, { ZYD_CR17, 0x2B }, \ { ZYD_CR23, 0x40 }, { ZYD_CR24, 0x20 }, { ZYD_CR26, 0x93 }, \ { ZYD_CR28, 0x3e }, { ZYD_CR29, 0x00 }, { ZYD_CR33, 0x28 }, \ { ZYD_CR34, 0x30 }, { ZYD_CR35, 0x3e }, { ZYD_CR41, 0x24 }, \ { ZYD_CR44, 0x32 }, { ZYD_CR46, 0x99 }, { ZYD_CR47, 0x1e }, \ - { ZYD_CR48, 0x00 }, { ZYD_CR49, 0x00 }, { ZYD_CR51, 0x01 }, \ + { ZYD_CR48, 0x06 }, { ZYD_CR49, 0xf9 }, { ZYD_CR51, 0x01 }, \ { ZYD_CR52, 0x80 }, { ZYD_CR53, 0x7e }, { ZYD_CR65, 0x00 }, \ { ZYD_CR66, 0x00 }, { ZYD_CR67, 0x00 }, { ZYD_CR68, 0x00 }, \ { ZYD_CR69, 0x28 }, { ZYD_CR79, 0x58 }, { ZYD_CR80, 0x30 }, \ { ZYD_CR81, 0x30 }, { ZYD_CR87, 0x0a }, { ZYD_CR89, 0x04 }, \ { ZYD_CR91, 0x00 }, { ZYD_CR92, 0x0a }, { ZYD_CR98, 0x8d }, \ - { ZYD_CR99, 0x00 }, { ZYD_CR101, 0x13 }, { ZYD_CR106, 0x24 }, \ - { ZYD_CR107, 0x2a }, { ZYD_CR109, 0x13 }, { ZYD_CR110, 0x1f }, \ - { ZYD_CR111, 0x1f }, { ZYD_CR114, 0x27 }, { ZYD_CR115, 0x26 }, \ + { ZYD_CR99, 0x00 }, { ZYD_CR101, 0x13 }, { ZYD_CR102, 0x27 }, \ + { ZYD_CR106, 0x24 }, { ZYD_CR107, 0x2a }, { ZYD_CR109, 0x13 }, \ + { ZYD_CR110, 0x1f }, { ZYD_CR111, 0x1f }, { ZYD_CR112, 0x1f }, \ + { ZYD_CR113, 0x27 }, { ZYD_CR114, 0x27 }, { ZYD_CR115, 0x26 }, \ { ZYD_CR116, 0x24 }, { ZYD_CR117, 0xfa }, { ZYD_CR118, 0xfa }, \ { ZYD_CR119, 0x10 }, { ZYD_CR120, 0x4f }, { ZYD_CR121, 0x6c }, \ { ZYD_CR122, 0xfc }, { ZYD_CR123, 0x57 }, { ZYD_CR125, 0xad }, \ { ZYD_CR126, 0x6c }, { ZYD_CR127, 0x03 }, { ZYD_CR137, 0x50 }, \ { ZYD_CR138, 0xa8 }, { ZYD_CR144, 0xac }, { ZYD_CR150, 0x0d }, \ - { ZYD_CR252, 0x00 }, { ZYD_CR253, 0x00 } \ + { ZYD_CR252, 0x34 }, { ZYD_CR253, 0x34 } \ +} + +#define ZYD_AL2230_PHY_PART1 \ +{ \ + { ZYD_CR240, 0x57 }, { ZYD_CR9, 0xe0 } \ +} + +#define ZYD_AL2230_PHY_PART2 \ +{ \ + { ZYD_CR251, 0x2f }, { ZYD_CR251, 0x7f }, \ +} + +#define ZYD_AL2230_PHY_PART3 \ +{ \ + { ZYD_CR128, 0x14 }, { ZYD_CR129, 0x12 }, { ZYD_CR130, 0x10 }, \ +} + +#define ZYD_AL2230S_PHY_INIT \ +{ \ + { ZYD_CR47, 0x1e }, { ZYD_CR106, 0x22 }, { ZYD_CR107, 0x2a }, \ + { ZYD_CR109, 0x13 }, { ZYD_CR118, 0xf8 }, { ZYD_CR119, 0x12 }, \ + { ZYD_CR122, 0xe0 }, { ZYD_CR128, 0x10 }, { ZYD_CR129, 0x0e }, \ + { ZYD_CR130, 0x10 } \ +} + +#define ZYD_AL2230_PHY_FINI_PART1 \ +{ \ + { ZYD_CR80, 0x30 }, { ZYD_CR81, 0x30 }, { ZYD_CR79, 0x58 }, \ + { ZYD_CR12, 0xf0 }, { ZYD_CR77, 0x1b }, { ZYD_CR78, 0x58 }, \ + { ZYD_CR203, 0x06 }, { ZYD_CR240, 0x80 }, \ +} + +#define ZYD_AL2230_RF_PART1 \ +{ \ + 0x03f790, 0x033331, 0x00000d, 0x0b3331, 0x03b812, 0x00fff3 \ } -#define ZYD_AL2230_RF \ +#define ZYD_AL2230_RF_PART2 \ { \ - 0x03f790, 0x033331, 0x00000d, 0x0b3331, 0x03b812, 0x00fff3, \ 0x000da4, 0x0f4dc5, 0x0805b6, 0x011687, 0x000688, 0x0403b9, \ - 0x00dbba, 0x00099b, 0x0bdffc, 0x00000d, 0x00500f, 0x00d00f, \ - 0x004c0f, 0x00540f, 0x00700f, 0x00500f \ + 0x00dbba, 0x00099b, 0x0bdffc, 0x00000d, 0x00500f \ +} + +#define ZYD_AL2230_RF_PART3 \ +{ \ + 0x00d00f, 0x004c0f, 0x00540f, 0x00700f, 0x00500f \ } #define ZYD_AL2230_RF_B \ @@ -654,6 +691,22 @@ 0x00dbba, 0x00099b, 0x0bdffc, 0x00000d, 0x00580f \ } +#define ZYD_AL2230_RF_B_PART1 \ +{ \ + 0x8cccd0, 0x481dc0, 0xcfff00, 0x25a000 \ +} + +#define ZYD_AL2230_RF_B_PART2 \ +{ \ + 0x25a000, 0xa3b2f0, 0x6da010, 0xe36280, 0x116000, 0x9dc020, \ + 0x5ddb00, 0xd99000, 0x3ffbd0, 0xb00000, 0xf01a00 \ +} + +#define ZYD_AL2230_RF_B_PART3 \ +{ \ + 0xf01b00, 0xf01e00, 0xf01a00 \ +} + #define ZYD_AL2230_CHANTABLE \ { \ { 0x03f790, 0x033331, 0x00000d }, \ @@ -672,7 +725,23 @@ { 0x03e7c0, 0x066661, 0x00000d } \ } - +#define ZYD_AL2230_CHANTABLE_B \ +{ \ + { 0x09efc0, 0x8cccc0, 0xb00000 }, \ + { 0x09efc0, 0x8cccd0, 0xb00000 }, \ + { 0x09e7c0, 0x8cccc0, 0xb00000 }, \ + { 0x09e7c0, 0x8cccd0, 0xb00000 }, \ + { 0x05efc0, 0x8cccc0, 0xb00000 }, \ + { 0x05efc0, 0x8cccd0, 0xb00000 }, \ + { 0x05e7c0, 0x8cccc0, 0xb00000 }, \ + { 0x05e7c0, 0x8cccd0, 0xb00000 }, \ + { 0x0defc0, 0x8cccc0, 0xb00000 }, \ + { 0x0defc0, 0x8cccd0, 0xb00000 }, \ + { 0x0de7c0, 0x8cccc0, 0xb00000 }, \ + { 0x0de7c0, 0x8cccd0, 0xb00000 }, \ + { 0x03efc0, 0x8cccc0, 0xb00000 }, \ + { 0x03e7c0, 0x866660, 0xb00000 } \ +} #define ZYD_AL7230B_PHY_1 \ { \ @@ -744,8 +813,6 @@ { 0x03ec00, 0x866660 } \ } - - #define ZYD_AL2210_PHY \ { \ { ZYD_CR9, 0xe0 }, { ZYD_CR10, 0x91 }, { ZYD_CR12, 0x90 }, \ @@ -771,8 +838,6 @@ 0x019a80, 0x019b40 \ } - - #define ZYD_GCT_PHY \ { \ { ZYD_CR47, 0x1e }, { ZYD_CR15, 0xdc }, { ZYD_CR113, 0xc0 }, \ @@ -801,8 +866,6 @@ 0x1a3000, 0x1ab000 \ } - - #define ZYD_MAXIM_PHY \ { \ { ZYD_CR23, 0x40 }, { ZYD_CR15, 0x20 }, { ZYD_CR28, 0x3e }, \ @@ -855,8 +918,6 @@ { 0x199a4, 0x20a53 } \ } - - #define ZYD_MAXIM2_PHY \ { \ { ZYD_CR23, 0x40 }, { ZYD_CR15, 0x20 }, { ZYD_CR28, 0x3e }, \ @@ -919,6 +980,7 @@ */ #define ZYD_DOWNLOADREQ 0x30 #define ZYD_DOWNLOADSTS 0x31 +#define ZYD_READFWDATAREQ 0x32 /* possible values for register ZYD_CR_INTERRUPT */ #define ZYD_HWINT_MASK 0x004f0000 @@ -950,10 +1012,15 @@ /* helpers for register ZYD_MAC_RXFILTER */ #define ZYD_FILTER_MONITOR 0xffffffff -#define ZYD_FILTER_BSS \ - (ZYD_FILTER_ASS_RSP | ZYD_FILTER_REASS_RSP | \ - ZYD_FILTER_PRB_RSP | ZYD_FILTER_BCN | ZYD_FILTER_DEASS | \ - ZYD_FILTER_AUTH | ZYD_FILTER_DEAUTH) +#define ZYD_FILTER_BSS \ + (ZYD_FILTER_ASS_REQ | ZYD_FILTER_ASS_RSP | \ + ZYD_FILTER_REASS_REQ | ZYD_FILTER_REASS_RSP | \ + ZYD_FILTER_PRB_REQ | ZYD_FILTER_PRB_RSP | \ + (0x3 << 6) | \ + ZYD_FILTER_BCN | ZYD_FILTER_ATIM | ZYD_FILTER_DEASS | \ + ZYD_FILTER_AUTH | ZYD_FILTER_DEAUTH | \ + (0x7 << 13) | \ + ZYD_FILTER_PS_POLL | ZYD_FILTER_ACK) #define ZYD_FILTER_HOSTAP \ (ZYD_FILTER_ASS_REQ | ZYD_FILTER_REASS_REQ | \ ZYD_FILTER_PRB_REQ | ZYD_FILTER_DEASS | ZYD_FILTER_AUTH | \ @@ -1138,6 +1205,8 @@ void (*cfg_init_hw) (struct zyd_softc *, struct zyd_rf *); void (*cfg_switch_radio) (struct zyd_softc *, uint8_t on); void (*cfg_set_channel) (struct zyd_softc *, struct zyd_rf *, uint8_t); + void (*cfg_bandedge6) (struct zyd_softc *, struct zyd_rf *, uint8_t); + uint8_t width; }; @@ -1239,6 +1308,10 @@ uint32_t sc_rxtap_len; uint32_t sc_txtap_len; uint32_t sc_unit; + uint32_t sc_atim_wnd; + uint32_t sc_pre_tbtt; + uint32_t sc_bcn_int; + int sc_ns_arg; uint16_t sc_firmware_base; @@ -1254,7 +1327,12 @@ uint8_t sc_mac_rev; uint8_t sc_rf_rev; uint8_t sc_pa_rev; - uint8_t sc_fix_cr47; + uint8_t sc_al2230s; + uint8_t sc_cckgain; + uint8_t sc_bandedge6; + uint8_t sc_newphy; + uint8_t sc_ledtype; + uint8_t sc_txled; uint8_t sc_fix_cr157; uint8_t sc_pwr_cal[14]; uint8_t sc_pwr_int[14]; From owner-p4-projects@FreeBSD.ORG Tue Dec 23 19:16:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38A281065679; Tue, 23 Dec 2008 19:16:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2DA11065676 for ; Tue, 23 Dec 2008 19:16:43 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E04468FC21 for ; Tue, 23 Dec 2008 19:16:43 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNJGhAe026914 for ; Tue, 23 Dec 2008 19:16:43 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNJGh5m026912 for perforce@freebsd.org; Tue, 23 Dec 2008 19:16:43 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 23 Dec 2008 19:16:43 GMT Message-Id: <200812231916.mBNJGh5m026912@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 155193 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, 23 Dec 2008 19:16:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=155193 Change 155193 by hselasky@hselasky_laptop001 on 2008/12/23 19:16:34 Be more persistant towards set config failures. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#41 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#41 (text+ko) ==== @@ -1556,6 +1556,7 @@ if (udev->flags.usb2_mode == USB_MODE_HOST) { uint8_t config_index; uint8_t config_quirk; + uint8_t set_config_failed = 0; /* * Most USB devices should attach to config index 0 by @@ -1591,6 +1592,14 @@ sx_unlock(udev->default_sx + 1); if (err) { if (udev->ddesc.bNumConfigurations != 0) { + if (!set_config_failed) { + set_config_failed = 1; + /* XXX try to re-enumerate the device */ + err = usb2_req_re_enumerate( + udev, &Giant); + if (err == 0) + goto repeat_set_config; + } DPRINTFN(0, "Failure selecting " "configuration index %u: %s, port %u, " "addr %u (ignored)\n", @@ -1598,7 +1607,7 @@ udev->address); } /* - * Some USB devices does not have any + * Some USB devices do not have any * configurations. Ignore any set config * failures! */ From owner-p4-projects@FreeBSD.ORG Tue Dec 23 19:58:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A59FB1065674; Tue, 23 Dec 2008 19:58:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6857D1065670 for ; Tue, 23 Dec 2008 19:58:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 538FF8FC17 for ; Tue, 23 Dec 2008 19:58:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNJwQJk030242 for ; Tue, 23 Dec 2008 19:58:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNJwQQ2030240 for perforce@freebsd.org; Tue, 23 Dec 2008 19:58:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 23 Dec 2008 19:58:26 GMT Message-Id: <200812231958.mBNJwQQ2030240@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 155195 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, 23 Dec 2008 19:58:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=155195 Change 155195 by hselasky@hselasky_laptop001 on 2008/12/23 19:57:37 U3G cleanup - move Huawei ID's out of the USB core. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#42 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#15 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#42 (text+ko) ==== @@ -1635,7 +1635,7 @@ goto repeat_set_config; } } - } else if (usb2_test_huawei(udev, &uaa) == 0) { + } else if (usb2_test_huawei_autoinst_p(udev, &uaa) == 0) { DPRINTFN(0, "Found Huawei auto-install disk!\n"); err = USB_ERR_STALLED; /* fake an error */ } ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#7 (text+ko) ==== @@ -39,6 +39,7 @@ static usb2_temp_setup_by_index_t usb2_temp_setup_by_index_w; static usb2_temp_unsetup_t usb2_temp_unsetup_w; static usb2_test_quirk_t usb2_test_quirk_w; +static usb2_test_huawei_autoinst_t usb2_test_huawei_autoinst_w; static usb2_quirk_ioctl_t usb2_quirk_ioctl_w; /* global variables */ @@ -46,6 +47,7 @@ usb2_temp_setup_by_index_t *usb2_temp_setup_by_index_p = &usb2_temp_setup_by_index_w; usb2_temp_unsetup_t *usb2_temp_unsetup_p = &usb2_temp_unsetup_w; usb2_test_quirk_t *usb2_test_quirk_p = &usb2_test_quirk_w; +usb2_test_huawei_autoinst_t *usb2_test_huawei_autoinst_p = &usb2_test_huawei_autoinst_w; usb2_quirk_ioctl_t *usb2_quirk_ioctl_p = &usb2_quirk_ioctl_w; devclass_t usb2_devclass_ptr = NULL; @@ -86,6 +88,13 @@ } } +static uint8_t +usb2_test_huawei_autoinst_w(struct usb2_device *udev, + struct usb2_attach_arg *uaa) +{ + return (USB_ERR_INVAL); +} + void usb2_quirk_unload(void *arg) { @@ -130,3 +139,17 @@ pause("WAIT", hz); } + +void +usb2_test_huawei_unload(void *arg) +{ + /* reset function pointers */ + + usb2_test_huawei_autoinst_p = &usb2_test_huawei_autoinst_w; + + /* wait for CPU to exit the loaded functions, if any */ + + /* XXX this is a tradeoff */ + + pause("WAIT", 16*hz); +} ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#7 (text+ko) ==== @@ -37,6 +37,8 @@ typedef usb2_error_t (usb2_temp_setup_by_index_t)(struct usb2_device *udev, uint16_t index); +typedef usb2_error_t (usb2_test_huawei_autoinst_t)(struct usb2_device *udev, + struct usb2_attach_arg *uaa); typedef uint8_t (usb2_test_quirk_t)(const struct usb2_lookup_info *info, uint16_t quirk); typedef int (usb2_quirk_ioctl_t)(unsigned long cmd, caddr_t data, @@ -52,11 +54,13 @@ extern usb2_temp_setup_by_index_t *usb2_temp_setup_by_index_p; extern usb2_temp_unsetup_t *usb2_temp_unsetup_p; extern usb2_test_quirk_t *usb2_test_quirk_p; +extern usb2_test_huawei_autoinst_t *usb2_test_huawei_autoinst_p; extern usb2_quirk_ioctl_t *usb2_quirk_ioctl_p; extern devclass_t usb2_devclass_ptr; /* function prototypes */ +void usb2_test_huawei_unload(void *); void usb2_temp_unload(void *); void usb2_quirk_unload(void *); void usb2_bus_unload(void *); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#15 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include #include -#include #define USB_DEBUG_VAR usb2_debug @@ -577,164 +576,3 @@ free(sc, M_USB); return (err); } - -/* - * NOTE: The entries marked with XXX should be checked for the correct - * speed indication to set the buffer sizes. - */ -static const struct usb2_device_id u3g_devs[] = { - /* OEM: Option */ - {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3G, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, - {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, - {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GPLUS, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, - {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAX36, U3GINFO(U3GSP_HSDPA, U3GFL_NONE))}, - {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAXHSUPA, U3GINFO(U3GSP_HSDPA, U3GFL_NONE))}, - {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, - /* OEM: Qualcomm, Inc. */ - {USB_VPI(USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_ZTE_STOR, U3GINFO(U3GSP_CDMA, U3GFL_SCSI_EJECT))}, - {USB_VPI(USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM, U3GINFO(U3GSP_CDMA, U3GFL_SCSI_EJECT))}, - /* OEM: Huawei */ - {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE, U3GINFO(U3GSP_HSDPA, U3GFL_HUAWEI_INIT))}, - {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220, U3GINFO(U3GSP_HSPA, U3GFL_HUAWEI_INIT))}, - /* OEM: Novatel */ - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM, U3GINFO(U3GSP_CDMA, U3GFL_SCSI_EJECT))}, - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MC950D, U3GINFO(U3GSP_HSUPA, U3GFL_SCSI_EJECT))}, - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U720, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U727, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))}, - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740_2, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))}, - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U870, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V620, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V640, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V720, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V740, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))}, - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_X950D, U3GINFO(U3GSP_HSUPA, U3GFL_SCSI_EJECT))}, - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_XU870, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))}, - {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ZEROCD, U3GINFO(U3GSP_HSUPA, U3GFL_SCSI_EJECT))}, - {USB_VPI(USB_VENDOR_DELL, USB_PRODUCT_DELL_U740, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))}, - /* OEM: Merlin */ - {USB_VPI(USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - /* OEM: Sierra Wireless: */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD595, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC597E, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_C597, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880E, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881E, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720_2, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MINI5725, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD875, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_2, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_3, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8765, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC875U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775_2, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8780, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ - {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, U3GINFO(U3GSP_HSPA, U3GFL_NONE))}, /* XXX */ - /* Sierra TruInstaller device ID */ - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_TRUINSTALL, U3GINFO(U3GSP_UMTS, U3GFL_SIERRA_INIT))}, -}; - -static void -u3g_sierra_init(struct usb2_device *udev) -{ - struct usb2_device_request req; - - DPRINTFN(0, "\n"); - - req.bmRequestType = UT_VENDOR; - req.bRequest = UR_SET_INTERFACE; - USETW(req.wValue, UF_DEVICE_REMOTE_WAKEUP); - USETW(req.wIndex, UHF_PORT_CONNECTION); - USETW(req.wLength, 0); - - if (usb2_do_request_flags(udev, NULL, &req, - NULL, 0, NULL, USB_MS_HZ)) { - /* ignore any errors */ - } - return; -} - -static void -u3g_huawei_init(struct usb2_device *udev) -{ - struct usb2_device_request req; - - DPRINTFN(0, "\n"); - - req.bmRequestType = UT_WRITE_DEVICE; - req.bRequest = UR_SET_FEATURE; - USETW(req.wValue, UF_DEVICE_REMOTE_WAKEUP); - USETW(req.wIndex, UHF_PORT_SUSPEND); - USETW(req.wLength, 0); - - if (usb2_do_request_flags(udev, NULL, &req, - NULL, 0, NULL, USB_MS_HZ)) { - /* ignore any errors */ - } - return; -} - -int -usb2_lookup_huawei(struct usb2_attach_arg *uaa) -{ - /* Calling the lookup function will also set the driver info! */ - return (usb2_lookup_id_by_uaa(u3g_devs, sizeof(u3g_devs), uaa)); -} - -/* - * The following function handles 3G modem devices (E220, Mobile, - * etc.) with auto-install flash disks for Windows/MacOSX on the first - * interface. After some command or some delay they change appearance - * to a modem. - */ -usb2_error_t -usb2_test_huawei(struct usb2_device *udev, struct usb2_attach_arg *uaa) -{ - struct usb2_interface *iface; - struct usb2_interface_descriptor *id; - uint32_t flags; - - if (udev == NULL) { - return (USB_ERR_INVAL); - } - iface = usb2_get_iface(udev, 0); - if (iface == NULL) { - return (USB_ERR_INVAL); - } - id = iface->idesc; - if (id == NULL) { - return (USB_ERR_INVAL); - } - if (id->bInterfaceClass != UICLASS_MASS) { - return (USB_ERR_INVAL); - } - if (usb2_lookup_huawei(uaa)) { - /* no device match */ - return (USB_ERR_INVAL); - } - flags = USB_GET_DRIVER_INFO(uaa); - - if (flags & U3GFL_HUAWEI_INIT) { - u3g_huawei_init(udev); - } else if (flags & U3GFL_SCSI_EJECT) { - return (usb2_test_autoinstall(udev, 0, 1)); - } else if (flags & U3GFL_SIERRA_INIT) { - u3g_sierra_init(udev); - } else { - /* no quirks */ - return (USB_ERR_INVAL); - } - return (0); /* success */ -} ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#8 (text+ko) ==== @@ -29,30 +29,5 @@ usb2_error_t usb2_test_autoinstall(struct usb2_device *udev, uint8_t iface_index, uint8_t do_eject); -usb2_error_t usb2_test_huawei(struct usb2_device *udev, - struct usb2_attach_arg *uaa); -int usb2_lookup_huawei(struct usb2_attach_arg *uaa); - -/* Huawei specific defines */ - -#define U3GINFO(flag,speed) ((flag)|((speed) * 256)) -#define U3G_GET_SPEED(uaa) (USB_GET_DRIVER_INFO(uaa) / 256) - -#define U3GFL_NONE 0x00 -#define U3GFL_HUAWEI_INIT 0x01 /* Requires init command (Huawei - * cards) */ -#define U3GFL_SCSI_EJECT 0x02 /* Requires SCSI eject command - * (Novatel) */ -#define U3GFL_SIERRA_INIT 0x04 /* Requires init command (Sierra - * cards) */ - -#define U3GSP_GPRS 0 -#define U3GSP_EDGE 1 -#define U3GSP_CDMA 2 -#define U3GSP_UMTS 3 -#define U3GSP_HSDPA 4 -#define U3GSP_HSUPA 5 -#define U3GSP_HSPA 6 -#define U3GSP_MAX 7 #endif /* _USB2_MSCTEST_H_ */ ==== //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -#include +#include #define USB_DEBUG_VAR u3g_debug @@ -50,6 +50,8 @@ #include #include #include +#include +#include #include @@ -66,6 +68,20 @@ #define U3G_CONFIG_INDEX 0 #define U3G_BSIZE 2048 +#define U3GSP_GPRS 0 +#define U3GSP_EDGE 1 +#define U3GSP_CDMA 2 +#define U3GSP_UMTS 3 +#define U3GSP_HSDPA 4 +#define U3GSP_HSUPA 5 +#define U3GSP_HSPA 6 +#define U3GSP_MAX 7 + +#define U3GFL_NONE 0x00 /* No flags */ +#define U3GFL_HUAWEI_INIT 0x01 /* Init command required */ +#define U3GFL_SCSI_EJECT 0x02 /* SCSI eject command required */ +#define U3GFL_SIERRA_INIT 0x04 /* Init command required */ + struct u3g_speeds_s { uint32_t ispeed; uint32_t ospeed; @@ -98,6 +114,8 @@ static void u3g_start_write(struct usb2_com_softc *ucom); static void u3g_stop_write(struct usb2_com_softc *ucom); +static int u3g_driver_loaded(struct module *mod, int what, void *arg); + static const struct usb2_config u3g_config[U3G_N_TRANSFER] = { [0] = { @@ -151,10 +169,195 @@ .size = sizeof(struct u3g_softc), }; -DRIVER_MODULE(u3g, ushub, u3g_driver, u3g_devclass, NULL, 0); +DRIVER_MODULE(u3g, ushub, u3g_driver, u3g_devclass, u3g_driver_loaded, 0); MODULE_DEPEND(u3g, usb2_serial, 1, 1, 1); MODULE_DEPEND(u3g, usb2_core, 1, 1, 1); +/* Huawei specific defines */ + +#define U3GINFO(flag,speed) ((flag)|((speed) * 256)) +#define U3G_GET_SPEED(uaa) (USB_GET_DRIVER_INFO(uaa) / 256) + +/* + * NOTE: The entries marked with XXX should be checked for the correct + * speed indication to set the buffer sizes. + */ +static const struct usb2_device_id u3g_devs[] = { + /* OEM: Option */ + {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3G, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, + {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, + {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GPLUS, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, + {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAX36, U3GINFO(U3GSP_HSDPA, U3GFL_NONE))}, + {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAXHSUPA, U3GINFO(U3GSP_HSDPA, U3GFL_NONE))}, + {USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, + /* OEM: Qualcomm, Inc. */ + {USB_VPI(USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_ZTE_STOR, U3GINFO(U3GSP_CDMA, U3GFL_SCSI_EJECT))}, + {USB_VPI(USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM, U3GINFO(U3GSP_CDMA, U3GFL_SCSI_EJECT))}, + /* OEM: Huawei */ + {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE, U3GINFO(U3GSP_HSDPA, U3GFL_HUAWEI_INIT))}, + {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220, U3GINFO(U3GSP_HSPA, U3GFL_HUAWEI_INIT))}, + /* OEM: Novatel */ + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM, U3GINFO(U3GSP_CDMA, U3GFL_SCSI_EJECT))}, + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MC950D, U3GINFO(U3GSP_HSUPA, U3GFL_SCSI_EJECT))}, + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U720, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U727, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))}, + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740_2, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))}, + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U870, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V620, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V640, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V720, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */ + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V740, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))}, + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_X950D, U3GINFO(U3GSP_HSUPA, U3GFL_SCSI_EJECT))}, + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_XU870, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))}, + {USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ZEROCD, U3GINFO(U3GSP_HSUPA, U3GFL_SCSI_EJECT))}, + {USB_VPI(USB_VENDOR_DELL, USB_PRODUCT_DELL_U740, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))}, + /* OEM: Merlin */ + {USB_VPI(USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + /* OEM: Sierra Wireless: */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD595, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC597E, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_C597, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880E, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881E, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720_2, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MINI5725, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD875, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_2, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_3, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8765, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC875U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775_2, U3GINFO(U3GSP_HSDPA, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, U3GINFO(U3GSP_HSDPA, U3GFL_NONE))}, + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8780, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */ + {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, U3GINFO(U3GSP_HSPA, U3GFL_NONE))}, /* XXX */ + /* Sierra TruInstaller device ID */ + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_TRUINSTALL, U3GINFO(U3GSP_UMTS, U3GFL_SIERRA_INIT))}, +}; + +static void +u3g_sierra_init(struct usb2_device *udev) +{ + struct usb2_device_request req; + + DPRINTFN(0, "\n"); + + req.bmRequestType = UT_VENDOR; + req.bRequest = UR_SET_INTERFACE; + USETW(req.wValue, UF_DEVICE_REMOTE_WAKEUP); + USETW(req.wIndex, UHF_PORT_CONNECTION); + USETW(req.wLength, 0); + + if (usb2_do_request_flags(udev, NULL, &req, + NULL, 0, NULL, USB_MS_HZ)) { + /* ignore any errors */ + } + return; +} + +static void +u3g_huawei_init(struct usb2_device *udev) +{ + struct usb2_device_request req; + + DPRINTFN(0, "\n"); + + req.bmRequestType = UT_WRITE_DEVICE; + req.bRequest = UR_SET_FEATURE; + USETW(req.wValue, UF_DEVICE_REMOTE_WAKEUP); + USETW(req.wIndex, UHF_PORT_SUSPEND); + USETW(req.wLength, 0); + + if (usb2_do_request_flags(udev, NULL, &req, + NULL, 0, NULL, USB_MS_HZ)) { + /* ignore any errors */ + } + return; +} + +static int +u3g_lookup_huawei(struct usb2_attach_arg *uaa) +{ + /* Calling the lookup function will also set the driver info! */ + return (usb2_lookup_id_by_uaa(u3g_devs, sizeof(u3g_devs), uaa)); +} + +/* + * The following function handles 3G modem devices (E220, Mobile, + * etc.) with auto-install flash disks for Windows/MacOSX on the first + * interface. After some command or some delay they change appearance + * to a modem. + */ +static usb2_error_t +u3g_test_huawei_autoinst(struct usb2_device *udev, + struct usb2_attach_arg *uaa) +{ + struct usb2_interface *iface; + struct usb2_interface_descriptor *id; + uint32_t flags; + + if (udev == NULL) { + return (USB_ERR_INVAL); + } + iface = usb2_get_iface(udev, 0); + if (iface == NULL) { + return (USB_ERR_INVAL); + } + id = iface->idesc; + if (id == NULL) { + return (USB_ERR_INVAL); + } + if (id->bInterfaceClass != UICLASS_MASS) { + return (USB_ERR_INVAL); + } + if (u3g_lookup_huawei(uaa)) { + /* no device match */ + return (USB_ERR_INVAL); + } + flags = USB_GET_DRIVER_INFO(uaa); + + if (flags & U3GFL_HUAWEI_INIT) { + u3g_huawei_init(udev); + } else if (flags & U3GFL_SCSI_EJECT) { + return (usb2_test_autoinstall(udev, 0, 1)); + } else if (flags & U3GFL_SIERRA_INIT) { + u3g_sierra_init(udev); + } else { + /* no quirks */ + return (USB_ERR_INVAL); + } + return (0); /* success */ +} + +static int +u3g_driver_loaded(struct module *mod, int what, void *arg) +{ + switch (what) { + case MOD_LOAD: + /* register our autoinstall handler */ + usb2_test_huawei_autoinst_p = &u3g_test_huawei_autoinst; + break; + case MOD_UNLOAD: + usb2_test_huawei_unload(NULL); + break; + default: + return (EOPNOTSUPP); + } + return (0); +} + static int u3g_probe(device_t self) { @@ -169,7 +372,7 @@ if (uaa->info.bInterfaceClass != UICLASS_VENDOR) { return (ENXIO); } - return (usb2_lookup_huawei(uaa)); + return (u3g_lookup_huawei(uaa)); } static int From owner-p4-projects@FreeBSD.ORG Tue Dec 23 20:32:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFB391065676; Tue, 23 Dec 2008 20:32:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3BE91065670 for ; Tue, 23 Dec 2008 20:32:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A07C98FC21 for ; Tue, 23 Dec 2008 20:32:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNKW0HE034040 for ; Tue, 23 Dec 2008 20:32:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNKW0kA034038 for perforce@freebsd.org; Tue, 23 Dec 2008 20:32:00 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 23 Dec 2008 20:32:00 GMT Message-Id: <200812232032.mBNKW0kA034038@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 155198 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, 23 Dec 2008 20:32:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=155198 Change 155198 by hselasky@hselasky_laptop001 on 2008/12/23 20:31:04 Get fresh "usbdevs" from FreeBSD vendor branch. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#32 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#18 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#32 (text+ko) ==== @@ -205,7 +205,7 @@ vendor NEWNEX 0x04f7 Newnex vendor BROTHER 0x04f9 Brother Industries vendor DALLAS 0x04fa Dallas Semiconductor -vendor SUNPLUS 0x04fc AIPTEK International +vendor AIPTEK2 0x04fc AIPTEK International vendor PFU 0x04fe PFU vendor FUJIKURA 0x0501 Fujikura/DDK vendor ACER 0x0502 Acer @@ -503,7 +503,7 @@ vendor FSC 0x0bf8 Fujitsu Siemens Computers vendor AGATE 0x0c08 Agate Technologies vendor DMI 0x0c0b DMI -vendor MICRODIA 0x0c45 Chicony +vendor CHICONY2 0x0c45 Chicony vendor SEALEVEL 0x0c52 Sealevel System vendor LUWEN 0x0c76 Luwen vendor KYOCERA2 0x0c88 Kyocera Wireless Corp. @@ -797,7 +797,7 @@ /* AIPTEK products */ product AIPTEK POCKETCAM3M 0x2011 PocketCAM 3Mega -product SUNPLUS PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 +product AIPTEK2 PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 /* AirPrime products */ product AIRPRIME PC5220 0x0112 CDMA Wireless PC Card @@ -808,7 +808,6 @@ /* Alcor Micro, Inc. products */ product ALCOR2 KBD_HUB 0x2802 Kbd Hub -product ALCOR TRANSCEND 0x6387 Transcend JetFlash Drive product ALCOR MA_KBD_HUB 0x9213 MacAlly Kbd Hub product ALCOR AU9814 0x9215 AU9814 Hub product ALCOR UMCR_9361 0x9361 USB Multimedia Card Reader @@ -1010,7 +1009,7 @@ /* Chicony products */ product CHICONY KB8933 0x0001 KB-8933 keyboard -product MICRODIA TWINKLECAM 0x600d TwinkleCam USB camera +product CHICONY2 TWINKLECAM 0x600d TwinkleCam USB camera /* CH Products */ product CHPRODUCTS PROTHROTTLE 0x00f1 Pro Throttle @@ -1428,7 +1427,6 @@ product HP 568J 0x1116 Jornada 568 product HP 930C 0x1204 DeskJet 930c product HP P2000U 0x1801 Inkjet P-2000U -product HP HS2300 0x1e1d MC8775 product HP 640C 0x2004 DeskJet 640c product HP 4670V 0x3005 ScanJet 4670v product HP P1100 0x3102 Photosmart P1100 ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#18 (text+ko) ==== @@ -212,7 +212,7 @@ #define USB_VENDOR_NEWNEX 0x04f7 /* Newnex */ #define USB_VENDOR_BROTHER 0x04f9 /* Brother Industries */ #define USB_VENDOR_DALLAS 0x04fa /* Dallas Semiconductor */ -#define USB_VENDOR_SUNPLUS 0x04fc /* AIPTEK International */ +#define USB_VENDOR_AIPTEK2 0x04fc /* AIPTEK International */ #define USB_VENDOR_PFU 0x04fe /* PFU */ #define USB_VENDOR_FUJIKURA 0x0501 /* Fujikura/DDK */ #define USB_VENDOR_ACER 0x0502 /* Acer */ @@ -510,7 +510,7 @@ #define USB_VENDOR_FSC 0x0bf8 /* Fujitsu Siemens Computers */ #define USB_VENDOR_AGATE 0x0c08 /* Agate Technologies */ #define USB_VENDOR_DMI 0x0c0b /* DMI */ -#define USB_VENDOR_MICRODIA 0x0c45 /* Chicony */ +#define USB_VENDOR_CHICONY2 0x0c45 /* Chicony */ #define USB_VENDOR_SEALEVEL 0x0c52 /* Sealevel System */ #define USB_VENDOR_LUWEN 0x0c76 /* Luwen */ #define USB_VENDOR_KYOCERA2 0x0c88 /* Kyocera Wireless Corp. */ @@ -804,7 +804,7 @@ /* AIPTEK products */ #define USB_PRODUCT_AIPTEK_POCKETCAM3M 0x2011 /* PocketCAM 3Mega */ -#define USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3 0x504a /* PenCam Mega 1.3 */ +#define USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3 0x504a /* PenCam Mega 1.3 */ /* AirPrime products */ #define USB_PRODUCT_AIRPRIME_PC5220 0x0112 /* CDMA Wireless PC Card */ @@ -815,7 +815,6 @@ /* Alcor Micro, Inc. products */ #define USB_PRODUCT_ALCOR2_KBD_HUB 0x2802 /* Kbd Hub */ -#define USB_PRODUCT_ALCOR_TRANSCEND 0x6387 /* Transcend JetFlash Drive */ #define USB_PRODUCT_ALCOR_MA_KBD_HUB 0x9213 /* MacAlly Kbd Hub */ #define USB_PRODUCT_ALCOR_AU9814 0x9215 /* AU9814 Hub */ #define USB_PRODUCT_ALCOR_UMCR_9361 0x9361 /* USB Multimedia Card Reader */ @@ -1017,7 +1016,7 @@ /* Chicony products */ #define USB_PRODUCT_CHICONY_KB8933 0x0001 /* KB-8933 keyboard */ -#define USB_PRODUCT_MICRODIA_TWINKLECAM 0x600d /* TwinkleCam USB camera */ +#define USB_PRODUCT_CHICONY2_TWINKLECAM 0x600d /* TwinkleCam USB camera */ /* CH Products */ #define USB_PRODUCT_CHPRODUCTS_PROTHROTTLE 0x00f1 /* Pro Throttle */ @@ -1435,7 +1434,6 @@ #define USB_PRODUCT_HP_568J 0x1116 /* Jornada 568 */ #define USB_PRODUCT_HP_930C 0x1204 /* DeskJet 930c */ #define USB_PRODUCT_HP_P2000U 0x1801 /* Inkjet P-2000U */ -#define USB_PRODUCT_HP_HS2300 0x1e1d /* MC8775 */ #define USB_PRODUCT_HP_640C 0x2004 /* DeskJet 640c */ #define USB_PRODUCT_HP_4670V 0x3005 /* ScanJet 4670v */ #define USB_PRODUCT_HP_P1100 0x3102 /* Photosmart P1100 */ ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#18 (text+ko) ==== @@ -599,7 +599,7 @@ "PocketCAM 3Mega", }, { - USB_VENDOR_SUNPLUS, USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3, + USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3, 0, "AIPTEK International", "PenCam Mega 1.3", @@ -623,12 +623,6 @@ "Kbd Hub", }, { - USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_TRANSCEND, - 0, - "Alcor Micro", - "Transcend JetFlash Drive", - }, - { USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_MA_KBD_HUB, 0, "Alcor Micro", @@ -1403,7 +1397,7 @@ "KB-8933 keyboard", }, { - USB_VENDOR_MICRODIA, USB_PRODUCT_MICRODIA_TWINKLECAM, + USB_VENDOR_CHICONY2, USB_PRODUCT_CHICONY2_TWINKLECAM, 0, "Chicony", "TwinkleCam USB camera", @@ -3107,12 +3101,6 @@ "Inkjet P-2000U", }, { - USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, - 0, - "Hewlett Packard", - "MC8775", - }, - { USB_VENDOR_HP, USB_PRODUCT_HP_640C, 0, "Hewlett Packard", @@ -8165,7 +8153,7 @@ NULL, }, { - USB_VENDOR_SUNPLUS, 0, + USB_VENDOR_AIPTEK2, 0, USB_KNOWNDEV_NOPROD, "AIPTEK International", NULL, @@ -9953,7 +9941,7 @@ NULL, }, { - USB_VENDOR_MICRODIA, 0, + USB_VENDOR_CHICONY2, 0, USB_KNOWNDEV_NOPROD, "Chicony", NULL, From owner-p4-projects@FreeBSD.ORG Tue Dec 23 20:33:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22F281065673; Tue, 23 Dec 2008 20:33:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB3791065677 for ; Tue, 23 Dec 2008 20:33:01 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C8C328FC0C for ; Tue, 23 Dec 2008 20:33:01 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNKX1Dd034127 for ; Tue, 23 Dec 2008 20:33:01 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNKX141034125 for perforce@freebsd.org; Tue, 23 Dec 2008 20:33:01 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 23 Dec 2008 20:33:01 GMT Message-Id: <200812232033.mBNKX141034125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155199 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, 23 Dec 2008 20:33:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=155199 Change 155199 by pgj@kolbasz on 2008/12/23 20:32:59 MFen (www): 1.30 -> 1.31 hu/platforms/sparc.sgml Affected files ... .. //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#8 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#8 (text+ko) ==== @@ -1,4 +1,4 @@ - @@ -10,7 +10,7 @@ @@ -82,6 +82,7 @@
        • Ultra 30
        • Ultra 60
        • Ultra 80
          • +
        • Ultra 450

        A következõ rendszerek csak From owner-p4-projects@FreeBSD.ORG Tue Dec 23 20:45:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB19B1065677; Tue, 23 Dec 2008 20:45:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F0691065675 for ; Tue, 23 Dec 2008 20:45:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C5E78FC1E for ; Tue, 23 Dec 2008 20:45:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNKjEIi035165 for ; Tue, 23 Dec 2008 20:45:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNKjECN035163 for perforce@freebsd.org; Tue, 23 Dec 2008 20:45:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 23 Dec 2008 20:45:14 GMT Message-Id: <200812232045.mBNKjECN035163@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 155201 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, 23 Dec 2008 20:45:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=155201 Change 155201 by hselasky@hselasky_laptop001 on 2008/12/23 20:44:27 Re-add new device ID. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#33 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#19 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#19 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#33 (text+ko) ==== @@ -808,6 +808,7 @@ /* Alcor Micro, Inc. products */ product ALCOR2 KBD_HUB 0x2802 Kbd Hub +product ALCOR TRANSCEND 0x6387 Transcend JetFlash Drive product ALCOR MA_KBD_HUB 0x9213 MacAlly Kbd Hub product ALCOR AU9814 0x9215 AU9814 Hub product ALCOR UMCR_9361 0x9361 USB Multimedia Card Reader ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#19 (text+ko) ==== @@ -815,6 +815,7 @@ /* Alcor Micro, Inc. products */ #define USB_PRODUCT_ALCOR2_KBD_HUB 0x2802 /* Kbd Hub */ +#define USB_PRODUCT_ALCOR_TRANSCEND 0x6387 /* Transcend JetFlash Drive */ #define USB_PRODUCT_ALCOR_MA_KBD_HUB 0x9213 /* MacAlly Kbd Hub */ #define USB_PRODUCT_ALCOR_AU9814 0x9215 /* AU9814 Hub */ #define USB_PRODUCT_ALCOR_UMCR_9361 0x9361 /* USB Multimedia Card Reader */ ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#19 (text+ko) ==== @@ -623,6 +623,12 @@ "Kbd Hub", }, { + USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_TRANSCEND, + 0, + "Alcor Micro", + "Transcend JetFlash Drive", + }, + { USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_MA_KBD_HUB, 0, "Alcor Micro", From owner-p4-projects@FreeBSD.ORG Tue Dec 23 21:27:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37F4F1065677; Tue, 23 Dec 2008 21:27:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F00F41065670 for ; Tue, 23 Dec 2008 21:27:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DD44A8FC0C for ; Tue, 23 Dec 2008 21:27:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNLRwIf048920 for ; Tue, 23 Dec 2008 21:27:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNLRwsS048918 for perforce@freebsd.org; Tue, 23 Dec 2008 21:27:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 23 Dec 2008 21:27:58 GMT Message-Id: <200812232127.mBNLRwsS048918@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 155204 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, 23 Dec 2008 21:27:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=155204 Change 155204 by hselasky@hselasky_laptop001 on 2008/12/23 21:27:14 Fix a problem where the root HUB must be allowed to do an explore during initial attach. Improve bootup time significantly by parallell probing the USB root HUBs. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#7 (text+ko) ==== @@ -54,6 +54,7 @@ struct usb2_process explore_proc; struct usb2_bus_msg explore_msg[2]; struct usb2_bus_msg detach_msg[2]; + struct usb2_bus_msg attach_msg[2]; /* * This mutex protects the USB hardware: */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#18 (text+ko) ==== @@ -272,24 +272,24 @@ } /*------------------------------------------------------------------------* - * usb2_attach_sub + * usb2_bus_attach * - * This function is the real USB bus attach code. It is factored out, - * hence it can be called at two different places in time. During - * bootup this function is called from "usb2_post_init". During - * hot-plug it is called directly from the "usb2_attach()" method. + * This function attaches USB in context of the explore thread. *------------------------------------------------------------------------*/ static void -usb2_attach_sub(device_t dev, struct usb2_bus *bus) +usb2_bus_attach(struct usb2_proc_msg *pm) { + struct usb2_bus *bus; struct usb2_device *child; + device_t dev; usb2_error_t err; uint8_t speed; + bus = ((struct usb2_bus_msg *)pm)->bus; + dev = bus->bdev; + DPRINTF("\n"); - mtx_assert(&Giant, MA_OWNED); - switch (bus->usbrev) { case USB_REV_1_0: speed = USB_SPEED_FULL; @@ -316,6 +316,9 @@ return; } + USB_BUS_UNLOCK(bus); + mtx_lock(&Giant); /* XXX not required by USB */ + /* Allocate the Root USB device */ child = usb2_alloc_device(bus->bdev, bus, NULL, 0, 0, 1, @@ -332,10 +335,36 @@ err = USB_ERR_NOMEM; } + mtx_unlock(&Giant); + USB_BUS_LOCK(bus); + if (err) { device_printf(bus->bdev, "Root HUB problem, error=%s\n", usb2_errstr(err)); } + + /* set softc - we are ready */ + device_set_softc(dev, bus); + + /* start watchdog - this function will unlock the BUS lock ! */ + usb2_power_wdog(bus); + + /* need to return locked */ + USB_BUS_LOCK(bus); +} + +/*------------------------------------------------------------------------* + * usb2_attach_sub + * + * This function creates a thread which runs the USB attach code. It + * is factored out, hence it can be called at two different places in + * time. During bootup this function is called from + * "usb2_post_init". During hot-plug it is called directly from the + * "usb2_attach()" method. + *------------------------------------------------------------------------*/ +static void +usb2_attach_sub(device_t dev, struct usb2_bus *bus) +{ /* Initialise USB process messages */ bus->explore_msg[0].hdr.pm_callback = &usb2_bus_explore; bus->explore_msg[0].bus = bus; @@ -347,17 +376,24 @@ bus->detach_msg[1].hdr.pm_callback = &usb2_bus_detach; bus->detach_msg[1].bus = bus; + bus->attach_msg[0].hdr.pm_callback = &usb2_bus_attach; + bus->attach_msg[0].bus = bus; + bus->attach_msg[1].hdr.pm_callback = &usb2_bus_attach; + bus->attach_msg[1].bus = bus; + /* Create a new USB process */ if (usb2_proc_setup(&bus->explore_proc, &bus->bus_mtx, USB_PRI_MED)) { printf("WARNING: Creation of USB explore process failed.\n"); + } else { + /* Get final attach going */ + USB_BUS_LOCK(bus); + if (usb2_proc_msignal(&bus->explore_proc, + &bus->attach_msg[0], &bus->attach_msg[1])) { + /* ignore */ + } + USB_BUS_UNLOCK(bus); } - /* set softc - we are ready */ - device_set_softc(dev, bus); - /* start watchdog */ - USB_BUS_LOCK(bus); - /* this function will unlock the BUS lock ! */ - usb2_power_wdog(bus); } /*------------------------------------------------------------------------* From owner-p4-projects@FreeBSD.ORG Tue Dec 23 22:01:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4961E1065673; Tue, 23 Dec 2008 22:01:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7D61106564A for ; Tue, 23 Dec 2008 22:01:32 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D4A6C8FC13 for ; Tue, 23 Dec 2008 22:01:32 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNM1WDM051414 for ; Tue, 23 Dec 2008 22:01:32 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNM1WEs051412 for perforce@freebsd.org; Tue, 23 Dec 2008 22:01:32 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 23 Dec 2008 22:01:32 GMT Message-Id: <200812232201.mBNM1WEs051412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155205 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, 23 Dec 2008 22:01:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=155205 Change 155205 by rene@rene_self on 2008/12/23 22:01:22 Finished initial translation of the problem-reports article. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#7 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#7 (text+ko) ==== @@ -29,7 +29,7 @@ geformuleerd en naar het &os; Project verzonden kan worden. - Vertaald door door René Ladan. + Vertaald door René Ladan. @@ -598,7 +598,7 @@ ontwikkelaars die uw rapport lezen ze gemakkelijk kunnen toepassen. Voor problemen met de kernel of de basisgereedschappen is een patch tegen &os.current; (de CVS-tak - HEAD) geprefereerd aangezien alle nieuwe code eerst daar + HEAD) geprefereerd aangezien alle nieuwe code eerst daar toegepast en getest dient te worden. Nadat het juist of substantiële is getest, wordt de code samengevoegd of gemigreerd naar de tak &os.stable;. @@ -693,609 +693,641 @@ Originator: - Please specify your real name, optionally followed - by your email address in angle brackets. - In the email interface, this is normally - prefilled with the gecos field of the - currently logged-in - user. + Specificeer hier alstublieft uw echte naam, eventueel + gevolgd door uw emailadres in punthaken. In de + emailinterface wordt dit normaalgesproken vooraf ingevuld + met het gecos-veld van de huidige + aangemelde gebruiker. - The email address you use will become public information - and may become available to spammers. You should either - have spam handling procedures in place, or use a temporary - email account. However, please note that if you do not - use a valid email account at all, we will not be able to - ask you questions about your PR. + Het emailadres dat u gebruikt wordt publieke + informatie en kan in de handen van spammers vallen. U + dient ofwel maatregelen te treffen om spam af te handelen, + of een tijdelijk emailaccount te gebruiken. Merk op dat + als u een in het geheel ongeldig emailaccount gebruikt, + wij u geen vragen over uw PR kunnen stellen. - Organization: Whatever you feel - like. This field is not used for anything - significant. + Organization: Alles waarvan u + vrolijk wordt. Dit veld wordt niet voor iets significants + gebruikt. - Synopsis: Fill this out with a - short and accurate description of the problem. The - synopsis is used as the subject of the problem report - email, and is used in problem report listings and - summaries; problem reports with obscure synopses tend to - get ignored. + Synopsis: Vul hier een korte en + accurate beschrijving van het probleem in. De samenvatting + wordt gebruikt als het onderwerp van de email van het + probleemrapport, en wordt gebruikt in lijsten en + samenvattingen van probleemrapporten; probleemrapporten met + een vage samenvatting hebben de neiging om genegeerd te + worden. - As noted above, if your problem report includes a patch, - please have the synopsis start with [patch] (including the brackets); - if this is a ports PR and you are the - maintainer, you may consider adding - [maintainer update] (including the brackets) and set the - Class of your PR to - maintainer-update. + Zoals hierboven vermeld, als uw probleemrapport een + patch bevat, begin dan alstublieft de samenvatting met + [patch] (inclusief de haken); als het een + ports-PR is en u de port onderhoudt, overweeg dan om + [maintainer update] (inclusief de haken) + toe te voegen en de Class van uw PR op + maintainer-update te zetten. - Severity: One of + Severity: Eén van non-critical, - serious or - critical. Do not overreact; refrain - from labeling your problem critical - unless it really is (e.g. data corruption issues, serious - regression from previous functionality in -CURRENT) - or serious unless - it is something that will affect many users (kernel - panics or freezes; problems with - particular device drivers or system utilities). &os; - developers will not necessarily work on your problem faster - if you inflate its importance since there are so many other - people who have done exactly that — in fact, some - developers pay little attention to this field - because of this. + serious of + critical. Overdrijf niet, bestempel uw + probleem niet als critical tenzij het + dat echt is (bijvoorbeeld gevallen van gegevenscorruptie, + serieuze functionele regressie ten opzichte van een vorige + -CURRENT) of als serious tenzij het + iets is dat vele gebruikers aangaat (kernelpanics of + bevriezingen; problemen met bepaalde + apparaatstuurprogramma's of systeemgereedschappen). + &os;-ontwikkelaars zullen niet noodzakelijk sneller aan uw + probleem werken als u de belangrijkheid ervan opblaast + aangezien er vele anderen zijn die hetzelfde gedaan hebben + — in feite schenken sommige ontwikkelaars weinig + aandacht aan dit veld vanwege deze redenen. - Major security problems should not - be filed in GNATS, because all GNATS information is public - knowledge. Please send such problems in private email to + Grote beveiligingsproblemen dienen + niet naar GNATS gestuurd te worden, + omdat alle GNATS-informatie publieke kennis is. Stuur + zulke problemen alstublieft als privé-mail naar &a.security-officer;. - Priority: One of - low, medium or - high. high should - be reserved for problems that will affect practically - every user of &os; and medium for - something that will affect many users. + Priority: Eén van + low, medium of + high. high dient te + worden gereserveerd voor problemen die bijna iedere + gebruiker van &os; aangaan en medium voor + iets dat vele gebruikers aangaat. - This field has become so widely abused that it is - almost completely meaningless. + Dit veld is zo vaak misbruikt dat het bijna volledig + zinloos is geworden. - Category: Choose an appropriate - category. + Category: Kies een geschikte + categorie. - The first thing you need to do is to decide what part of - the system your problem lies in. Remember, &os; is a - complete operating system, which installs both a kernel, the - standard libraries, many peripheral drivers, and a large number - of utilities (the base system). - However, there are thousands of additional applications in the - Ports Collection. You'll first need to decide if the problem - is in the base system or something installed via the Ports - Collection. + Het eerste wat u moet doen is beslissen in welk gebied + van het systeem uw probleem ligt. Onthoud dat &os; een + compleet besturingssysteem is, dat zowel een kernel, de + standaardbibliotheken, vele hulpstuurprogramma's, en een + groot aantal gereedschappen (het + basissysteem) installeert. Er zijn echter + duizenden aanvullende applicaties in de Portscollectie. U + dient eerst te beslissen of het probleem in het basissysteem + zit of dat het in iets dat via de Portscollectie + geïnstalleerd is zit. - Here is a description of the major categories: + Hier volgt een beschrijving van de grote + categoriën: - If a problem is with the kernel, the libraries (such - as standard C library libc), or a - peripheral driver in the base system, in general you will - use the kern category. (There are a few - exceptions; see below). In general these are things that are - described in section 2, 3, or 4 of the manual pages. + Als er een probleem met de kernel, de bibliotheken + (zoals de standaard C-bibliotheek + libc), of met een hulpstuurprogramma + is, gebruikt u in het algemeen de categorie + kern. (Er zijn enkele uitzonderingen + die hieronder vermeld staan). In het algemeen zijn dat + dingen die in sectie 2, 3, of 4 van de + handleidingpagina's staan beschreven. - If a problem is with a binary program such as - &man.sh.1; or &man.mount.8;, you will first need to determine - whether these programs are in the base system or were added - via the Ports Collection. If you are unsure, you can do - whereis programname. - &os;'s convention for the Ports Collection is to install - everything underneath - /usr/local, - although this can be overridden by a system administrator. - For these, you will use the ports - category (yes, even if the port's category is - www; see below). If the location is + Als er een probleem is met een binair programma + zoals &man.sh.1; of &man.mount.8;, dient u eerst te + bepalen of deze programma's deel zijn van het + basissysteem of dat ze via de Portscollectie zijn + toegevoegd. Als u het niet zeker weet, kunt u + whereis programmanaam + uitvoeren. De conventie van &os; voor de Portscollectie + is om alles onder /usr/local te + installeren, alhoewel dit door een systeembeheerder + veranderd kan worden. Voor dezen gebruikt u de + categorie ports (zelfs als de + categorie van de port www is, zie + hieronder). Als de locatie /bin, /usr/bin, - /sbin, or - /usr/sbin, - it is part of the base system, and you should use the - bin category. (A few programs, such as - &man.gcc.1;, actually use the gnu category, - but do not worry about that for now.) These are all things - that are described in section 1 or 8 of the manual pages. + /sbin, of + /usr/sbin is, + dan is het een onderdeel van het basissysteem, en dient + u de categorie bin te gebruiken. + (Enkele programma's, zoals &man.gcc.1;, gebruiken + eigenlijk de categorie gnu, maar + daarover hoeft u zich nu geen zorgen te maken.) Dit + zijn allemaal programma's die in sectie 1 of 8 van de + handleidingpagina's worden beschreven. - If you believe that the error is in the startup - (rc) scripts, or in some kind of other - non-executable configuration file, then the right category is - conf (configuration). These are things - that are described in section 5 of the manual pages. + Als u denkt dat de fout in de opstartscripts + (rc) zit, of in een ander type + niet-uitvoerbaar configuratiebestand, dan is de juiste + categorie conf (configuratie). Deze + dingen worden in sectie 5 van de handleidingpagina's + beschreven. - If you have found a problem in the documentation set - (articles, books, man pages), the correct choice is - docs. + Als u een probleem in de documentatie (artikelen, + boeken, handleidingpagina's) heeft gevonden, dan is de + juiste keuze docs. - If you are having a problem with the - FreeBSD web pages, - the proper choice is www. + Als u een probleem heeft met de + &os; webpagina's, dan is + de juiste www. - if you are having a problem with something from a - port named - www/someportname, - this nevertheless goes in the ports - category. + Als u problemen heeft met iets dat van een port + genaamd www/portnaam + afkomt, dan hoort dit desalniettemin in de categorie + ports thuis. - There are a few more specialized categories. + Er zijn nog enkele gespecialiseerde + categoriën: - If the problem would otherwise be filed in - kern but has to do with the USB subsystem, - the correct choice is usb. + Als het probleem in kern gestopt + zou worden maar met het USB-subsysteem te maken heeft, + dan is de juiste keuze usb. - If the problem would otherwise be filed in - kern but has to do with the threading - libraries, the correct choice is + Als het probleem in kern gestopt + zou worden maar het met de threading-bibliotheken te + maken heeft, dan is de juiste keuze threads. - If the problem would otherwise be in the base system, - but has to do with our adherence to standards such as - &posix;, the correct choice is + Als het probleem in het basissysteem zit, maar het + met onze naleving van standaarden zoals &posix; te maken + heeft, dan is de juiste keuze standards. - If the problem has to do with errors internal to a - &java.virtual.machine; (&jvm;), even though &java; was - installed from the Ports Collection, you should select the - java category. More general problems with - &java; ports still go under ports. + Als het probleem te maken heeft met interne fouten + van de &java.virtual.machine; (&jvm;), dan dient u de + categorie java te kiezen, zelfs als + was &java; vanuit de Portscollectie geïnstalleerd. + Meer algemene problemen met &java;-ports horen nog + steeds onder ports thuis. - This leaves everything else. + Dit laat al het andere achter. - If you are convinced that the problem will only occur - under the processor architecture you are using, select - one of the architecture-specific categories: commonly - i386 for Intel-compatible machines in - 32-bit mode; amd64 for AMD machines - running in 64-bit mode (this also includes Intel-compatible - machines running in EMT64 mode); and less commonly - arm, ia64, - powerpc, and sparc64. - + Als u ervan overtuigd bent dat het probleem zich + alleen voordoet onder de processorarchitectuur die u + gebruikt, kies dan één van de + architectuurspecifieke categoriën: gewoonlijk + i386 voor Intel-compatibele machines + in 32-bit-modus; amd64 voor + AMD-machines die in 64-bit-modus draaien (dit omvat ook + Intel-compatibele machines die in EMT64-modus draaien); + en minder gewoonlijk arm, + ia64, powerpc, en + sparc64. - These categories are quite often misused for - I do not know problems. Rather than - guessing, please just use misc. + Deze categoriën worden vaak misbruikt voor + Ik weet het niet-problemen. Gebruik + alstublieft misc, in plaats van te + raden. - Correct use of arch-specific category + Correct gebruik van een arch-specifieke + categorie - You have a common PC-based machine, and think - you have encountered a problem specific to a particular - chipset or a particular motherboard: i386 - is the right category. + U heeft een gewone PC-gebaseerde machine, en denkt + dat u een probleem bent tegengekomen dat specifiek is + voor een bepaalde chipset of een bepaald moederbord: + i386 is de juiste categorie. - Incorrect use of arch-specific category + Onjuist gebruik van een arch-specifieke + categorie - You are having a problem with an add-in - peripheral card on a commonly seen bus, or a problem with - a particular type of hard disk drive: in this case, it - probably applies to more than one architecture, and - kern is the right category. + U heeft een probleem met een insteekkaart op een + veelvoorkomende bus, of een probleem met een bepaald + type harde schijfstation: in dit geval is het + waarschijnlijk op meer dan één + architectuur van toepassing, en is + kern de juiste categorie. - If you really do not know where the problem lies (or - the explanation does not seem to fit into the ones above), - use the misc category. Before you do so, - you may wish to ask for help on the &a.questions; first. - You may be advised that one of the existing categories - really is a better choice. + Als u echt niet weet waar het problem zich bevindt + (of als de uitleg niet bij een van de bovenstaanden + lijkt te passen), gebruik dan de categorie + misc. Voordat u dit doet, kunt u + eerst hulp vragen aan de &a.questions;. U krijgt dan + misschien het advies dat een bestaande categorie echt + een betere keuze is. - Here is the current list of categories (taken from + Hier is een actuele lijst van categoriën (van ): - advocacy: problems relating to - &os;'s public image. Obsolete. + advocacy: problemen gerelateerd + aan het publieke imago van &os;. Overbodig. - alpha: problems specific to the - Alpha platform. + alpha: problemen specifiek aan + het platform Alpha. - amd64: problems specific to the - AMD64 platform. + amd64: problemen specifiek aan + het platform AMD64. - arm: problems specific to the - ARM platform. + arm: problemen specifiek aan het + platform ARM. - bin: problems with userland - programs in the base system. + bin: problemen met + gebruikersprogramma's in het basissysteem. - conf: problems with - configuration files, default values, and so forth. + conf: problemen met + configuratiebestanden, standaardwaarden, + enzovoorts. - docs: problems with manual pages - or on-line documentation. + docs: problemen met + handleidingpagina's of online documentatie. - gnu: problems with imported GNU software - such as &man.gcc.1; or &man.grep.1;. + gnu: problemen met + geïmporteerde GNU-software zoals &man.gcc.1; of + &man.grep.1;. - i386: problems specific to the - &i386; platform. + i386: problemen specifiek aan het + &i386;-platform. - ia64: problems specific to the - ia64 platform. + ia64: problemen specifiek aan het + ia64-platform. - java: problems related to the &java; - Virtual Machine. - + java: problemen gerelateerd aan + de &java; Virtual Machine. - kern: problems with - the kernel, (non-platform-specific) device drivers, - or the base libraries. + kern: problemen met de kernel, + (niet-platformspecifieke) apparaatstuurprogramma's, of + de basisbibliotheken. - misc: anything that does not fit - in any of the other categories. (Note that there is - almost nothing that truly belongs in this category, - except for problems with the release and build - infrastructure. Temporary build failures on - HEAD do not belong here. Also note - that it is - easy for things to get lost in this category). + misc: alles wat niet in een van + de andere categoriën past. (Merk op dat er bijna + niets is wat echt in deze categorie past, behalve + problemen met de uitgave- en bouwinfrastructuur. + Tijdelijke bouwfouten op HEAD horen + hier niet thuis. Merk ook op dat dingen in deze + categorie gemakkelijk kwijtraken). - ports: problems relating to the - Ports Collection. + ports: problemen gerelateerd aan + de Portscollectie. - powerpc: problems specific to the - &powerpc; platform. + powerpc: problemen specifiek voor + het &powerpc;-platform. - sparc64: problems specific to the - &sparc64; platform. + sparc64: problemen specifiek voor + het &sparc64;-platform. - standards: Standards conformance - issues. + standards: Zaken met betrekking + tot conformatie aan standaarden. - threads: problems related to the - &os; threads implementation (especially on &os.current;). - + threads: problemen gerelateerd + aan de implementatie van threads op &os; (in het + bijzonder op &os.current;). + - usb: problems related to the - &os; USB implementation. - + usb: problemen gerelateerd aan de + implementatie van USB op &os;. + - - www: Changes or enhancements to - the &os; website. - + + www: Veranderingen of + verbeteringen aan de website van &os;. + - Class: Choose one of the - following: + Class: Kies één van + de volgenden: - sw-bug: software bugs. + sw-bug: softwarebugs. - doc-bug: errors in - documentation. + doc-bug: fouten in + documentatie. - change-request: requests for - additional features or changes in existing - features. + change-request: verzoeken voor + aanvullende mogelijkheden of veranderingen in bestaande + mogelijkheden. - update: updates to ports or - other contributed software. + update: updates aan ports of + andere bijgedragen software. - maintainer-update: updates to - ports for which you are the maintainer. + maintainer-update: updates aan + ports die u onderhoudt. - Release: The version of &os; - that you are running. This is filled out automatically if - you are using - &man.send-pr.1; and need only be changed if you are - sending a problem report from a different system than the - one that exhibits the problem. + Release: De versie van &os; die u + draait. Dit wordt automatisch ingevuld als u + &man.send-pr.1; gebruikt en hoeft alleen veranderd te worden + als u een probleemrapport verstuurt van een ander systeem + dan van hetgene waarop het probleem zich voordoet. - Finally, there is a series of multi-line fields: + Tenslote zijn er een aantal meerregelige velden: - Environment: This should - describe, as accurately as possible, the environment in - which the problem has been observed. This includes the - operating system version, the version of the specific - program or file that contains the problem, and any other - relevant items such as system configuration, other - installed software that influences the problem, - etc.—quite simply everything a developer needs to - know to reconstruct the environment in which the problem - occurs. + Environment: Dit dient zou + nauwkeurig mogelijk de omgeving te beschrijven waarin het + probleem is waargenomen. Dit omvat de versie van het + besturingssysteem, de versie van het specifieke programma of + bestand dat het probleem bevat, en alle andere relevante + zaken zoals systeemconfiguratie, andere geïnstalleerde + software dat het probleem beïnvloed, enzovoorts— + eigenlijk alles wat een ontwikkelaar moet weten om de + omgeving te reconstrueren waarin het probleem + optreedt. - Description: A complete and - accurate description of the problem you are experiencing. - Try to avoid speculating about the causes of the problem - unless you are certain that you are on the right track, as - it may mislead a developer into making incorrect - assumptions about the problem. + Description: Een complete en + nauwkeurige beschrijving van het probleem dat u ondervindt. + Probeer te speculaties over de oorzaken van het probleem te + vermijden tenzij u zeker dat u op het juiste spoor zit, + aangezien het een ontwikkelaar kan misleiden om onjuiste + aannames over het probleem te maken. - How-To-Repeat: A summary of the - actions you need to take to reproduce the problem. + How-To-Repeat: Een samenvatting van + de acties die voor u nodig waren om het probleem te + reproduceren. - Fix: Preferably a patch, or at - least a workaround (which not only helps other people with - the same problem work around it, but may also help a - developer understand the cause for the problem), but if - you do not have any firm ideas for either, it is better to - leave this field blank than to speculate. + Fix: Bij voorkeur een patch, of op + zijn minst een tijdelijke oplossing (wat niet alleen andere + mensen helpt om om het probleem heen te werken, maar + mogelijk ook een ontwikkelaar de oorzaak van het probleem + helpt te begrijpen), maar als u hier ook geen echte + ideëen over heeft is het beter om dit veld open te + laten dan om te speculeren.

        - Sending off the problem report + Het probleemrapport versturen - If you are using &man.send-pr.1;: + Als u &man.send-pr.1; gebruikt: - Once you are done filling out the template, have saved it, - and exit your editor, &man.send-pr.1; will prompt you with - s)end, e)dit or a)bort?. You can then hit - s to go ahead and submit the problem report, - e to restart the editor and make - further modifications, or a to abort. - If you choose the latter, your problem report will remain on - disk (&man.send-pr.1; will tell you the filename before it - terminates), so you can edit it at your leisure, or maybe - transfer it to a system with better net connectivity, before - sending it with the to - &man.send-pr.1;: + Als u klaar bent met het invullen van het sjabloon, het + heeft opgeslagen, en uw tekstverwerker verlaten heeft, zal + &man.send-pr.1; u de prompt s)end, e)dit or + a)bort? geven. U kunt dan s + aanslaan om het probleemrapport in te sturen, + e aanslaan om de tekstverwerker te + herstarten en verdere wijzigingen te maken, of + a aanslaan om te stoppen. Als u het + laatste keist, blijft uw probleemrapport bewaard op schijf + (&man.send-pr.1; vertelt u de bestandsnaam voordat het eindigt), + zodat u het rustig kunt bewerken, of het misschien over kunt + plaatsen naar een systeem met een betere netverbinding, voordat + u het met de optie van &man.send-pr.1; + verstuurt: -&prompt.user; send-pr -f ~/my-problem-report +&prompt.user; send-pr -f ~/mijn-probleemrapport - This will read the specified file, validate the contents, - strip comments and send it off. + Dit leest het gespecificeerde bestand, controleert de + geldigheid van de inhoud, verwijderd commentaar en verstuurt + het. - If you are using the web form: + Als u het webformulier + gebruikt: - Before you hit submit, you will need to - fill in a field containing text that is represented in image - form on the page. This unfortunate measure has had to be - adopted due to misuse by automated systems and a few misguided - individuals. It is a necessary evil that no one likes; please - do not ask us to remove it. + Voordat u op submit drukt, moet u een + veld invullen waarin tekst staat dat als afbeelding op de pagina + wordt weergegeven. Deze ongelukkige maatregel moest worden + genomen vanwege het misbruik door geautomatiseerde systemen en + enkele kwaadwillende gebruikers. Het is noodzakelijk kwaad dat + niemand wil; vraag ons alstublieft niet om het te + verwijderen. - Note that you are strongly advised to - save your work somewhere before hitting submit. - A common problem for users is to have their web browser displaying - a stale image from its cache. If this happens to you, your - submission will be rejected and you may lose your work. + Merk op dat u ten zeerste wordt + aangeraden om uw werk ergens op te slaan voordat u + op submit drukt. Een veelvoorkomed probleem + voor gebruikers is dat hun webbrowser een verouderde afbeelding + uit de cache laat zien. Als u dit overkomt, wordt uw inzending + geweigerd en kan u uw werk verliezen. - If you are unable to view images for any reason, and are also - unable to use &man.send-pr.1;, please accept our apologies for - the inconvenience and email your problem report to the bugbuster - team at freebsd-bugbusters@FreeBSD.org. + Als u om een bepaalde reden geen afbeeldingen kunt bekijken, + en u ook &man.send-pr.1; niet kan gebruiken, accepteer dan + alstublieft onze verontschuldigingen voor het ongemak en email + uw probleemrapport naar het bugbuster-team op + freebsd-bugbusters@FreeBSD.org.
        - Follow-up + Vervolg - Once your problem report has been filed, you will receive a - confirmation by email which will include the tracking number - that was assigned to your problem report and a URL you can use - to check its status. With a little luck, someone will take an - interest in your problem and try to address it, or, as the case - may be, explain why it is not a problem. You will be - automatically notified of any change of status, and you will - receive copies of any comments or patches someone may attach to - your problem report's audit trail. + Als uw probleemprapport eenmaal is ingestuurd, ontvangt u een + bevestiging per email waarin het volgnummer dat aan uw + probleemrapport was toegewezen en een URL dat u kunt gebruiken om + de status te controleren zijn opgenomen. Met een beetje geluk zal + iemand interesse in uw probleem tonen en proberen het op te + lossen, of, wat het geval kan zijn, uitleggen waarom het geen + probleem is. U wordt automatisch op de hoogte gehouden van alle + toestandsveranderingen, en u ontvangt kopiën van al het + commentaar en patches die iemand aan het controletraject van uw + probleemrapport kan koppelen. - If someone requests additional information from you, or you - remember or discover something you did not mention in the - initial report, please use one of two methods to submit your - followup: + Als iemand aanvullende informatie van u vraagt, of als u zich + iets herinnert of iets ontdekt dat u niet in het initiële + rapport noemde, gebruik dan alstublieft een van de twee methoden + om uw vervolg in te sturen: - The easiest way is to use the followup link on - the individual PR's web page, which you can reach from the - - PR search page. Clicking on this link will bring up an - an email window with the correct To: and Subject: lines filled in - (if your browser is configured to do this). + De gemakkelijkste manier is om de vervolgkoppeling op de + webpagina van het individuele PR te gebruiken, welke u kunt + bereiken vanuit de + PR-zoekpagina. Het klikken op deze koppeling brengt + een emailvenster naar voren met daarin de juiste regels voor + Aan: en Onderwerp: ingevuld (als uw browser is ingesteld om + dit te doen). - Alternatively, you can just mail it to - &a.bugfollowup;, making sure that the - tracking number is included in the subject so the bug tracking - system will know what problem report to attach it to. + Als alternatief kunt u het naar &a.bugfollowup; mailen, + waar het volgnummer in het onderwerp is opgenomen zodat het + foutenvolgsysteem weet aan welk probleemrapport het het moet + koppelen. - If you do not include the tracking - number, GNATS will become confused and create an entirely - new PR which it then assigns to the GNATS administrator, - and then your followup will become lost until someone - comes in to clean up the mess, which could be days or - weeks afterwards. + Als u niet het volgnummer opgeeft, + raakt GNATS in de war en maakt het een geheel nieuw PR aan + welke het dan aan de GNATS-beheerder toekent, en vervolgens + raakt uw PR kwijt totdat iemand de rommel opruimt, wat dagen + of weken later kan zijn. - Wrong way: + Verkeerde manier: - Subject: that PR I sent + Onderwerp: dat PR dat ik stuurde - Right way: + Juiste manier: - Subject: Re: ports/12345: compilation problem with foo/bar + Onderwerp: Re: ports/12345: compilatieprobleem met foo/bar - If the problem report remains open after the problem has - gone away, just send a follow-up (in the manner prescribed - above) saying that the problem report can be closed, and, if - possible, explaining how or when the problem was fixed. + Als het probleemrapport open blijft nadat het probleem is + opgelost, stuur dan een vervolg (op de bovenstaande manier) waarin + u vertelt dat het probleemrapport gesloten kan worden, en indien + mogelijk, uitlegt hoe of wanneer het probleem was opgelost.
        - If you are having problems + Als u problemen heeft - Most PRs go through the system and are accepted quickly; - however, at times GNATS runs behind and you may not get your - email confirmation for 10 minutes or even longer. Please try to - be patient. + De meeste PR's gaan door het systeem en worden snel + geaccepteerd, soms loopt GNATS echter achter en kan het zijn dat u + uw emailbevestiging pas na 10 minuten of zelfs later ontvangt. + Wees alstublieft geduldig. - In addition, because GNATS receives all its input via email, - it is absolutely vital that &os; runs all its submissions through - spam filters. If you do not get a response within an hour or - two, you may have fallen afoul of them; if so, please contact - the GNATS administrators at bugmeister@FreeBSD.org - and ask for help. + Tevens geldt, omdat GNATS alle invoer via email ontvangt, dat + het absoluut noodzakelijk is dat &os; alle inzendingen door + spamfilters haalt. Als u binnen een uur of twee geen antwoord + krijgt, kan uw PR misschien zijn opeslokt; als dit zo is, neem dan + alstublieft contact op met de GNATS-beheerders op + bugmeister@FreeBSD.org en vraag om hulp. - Among the anti-spam measures is one that weighs against - many common abuses seen in HTML-based email (although not necessarily - the mere inclusion of HTML in a PR). We strongly recommend - against the use of HTML-based email when sending PRs: not - only is it more likely to fall afoul of the filters, it also - tends to merely clutter up the database. Plain old email is - strongly preferred. + Een veelvoorkomende anti-spam-maatregel is het vergelijken + met vele vormen van misbruik die in HTML-gebaseerde email + voorkomt (alhoewel niet slechts het opnemen van HTML in een PR). + We raden het gebruik van HTML-gebaseerde email voor het + versturen van PR's sterk af: niet alleen is het waarschijnlijker + dat het niet door de filters komt, het heeft ook de neiging om + de database te verstoppen. Oude platte email wordt sterk + geprefereerd. - On rare occasions you will encounter a GNATS bug where a - PR is accepted and assigned a tracking number but it does not - show up on the list of PRs on any of the web query pages. What - may have happened is that the database index has gotten out of - synchronization with the database itself. The way that you - can test whether this has happened is to pull up the - - view a single PR page and see whether the PR shows up. - If it does, please notify the GNATS administrators at - bugmeister@FreeBSD.org. Note that there is a - cron job that periodically rebuilds the database, - so unless you are in a hurry, no action needs to be taken. + In zeldzame gevallen zult een bug in GNATS tegenkomen waarbij + een PR geaccepteerd is een een volgnummer toegewezen heeft + gekregen maar waar het niet op de lijst van PR's van een van de + opvraag-webpagina's staat. Het kan zijn gebeurd dat de index van + database niet meer met de databsae zelf is gesynchroniseerd. De + manier waarop u dit kunt testen is door de bekijk een enkel + PR webpagina op te roepen en te kijken of de PR wordt + vermeld. Als dat zo is, stel dan alstublieft de GNATS-beheerders + op bugmeister@FreeBSD.org op de hoogte. Merk op + dat er een cron-taak is die de database + periodiek herbouwt, dus u hoeft geen actie te ondernemen tenzij u + haast heeft.
        - Further Reading >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 23 22:32:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 666691065676; Tue, 23 Dec 2008 22:32:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28FB5106564A for ; Tue, 23 Dec 2008 22:32:04 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15D478FC0C for ; Tue, 23 Dec 2008 22:32:04 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNMW4Aw054572 for ; Tue, 23 Dec 2008 22:32:04 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNMW3nE054570 for perforce@freebsd.org; Tue, 23 Dec 2008 22:32:03 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 23 Dec 2008 22:32:03 GMT Message-Id: <200812232232.mBNMW3nE054570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155207 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, 23 Dec 2008 22:32:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=155207 Change 155207 by rene@rene_self on 2008/12/23 22:31:24 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/Makefile#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/book.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/chapters.ent#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/updating/Makefile#2 delete .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/updating/chapter.sgml#4 delete .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#16 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#4 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#10 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#6 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#11 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#8 integrate .. //depot/projects/docproj_nl/www/en/platforms/sparc.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releases/6.4R/errata.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#10 integrate .. //depot/projects/docproj_nl/www/en/releases/7.0R/errata.html#3 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#9 integrate .. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#6 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.111 2008/11/14 22:19:18 manolis Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.112 2008/12/23 18:59:03 trhodes Exp $ # # Build the FreeBSD Handbook. # @@ -237,7 +237,6 @@ SRCS+= printing/chapter.sgml SRCS+= security/chapter.sgml SRCS+= serialcomms/chapter.sgml -SRCS+= updating/chapter.sgml SRCS+= users/chapter.sgml SRCS+= vinum/chapter.sgml SRCS+= virtualization/chapter.sgml ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3593,7 +3593,7 @@ 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 + net/isc-dhcp30-server port or the corresponding package. Once ISC DHCP is installed, it ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2400,6 +2400,12 @@ editing, learning a more powerful editor such as vim or Emacs will save you much more time in the long run. + + Many applications which modify files or require typed input + will automatically open a text editor. To alter the default + editor used, set the EDITOR environment + variable. See shells + section for more details. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/book.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ - %pgpkeys; ]> @@ -321,7 +320,6 @@ can begin using FreeBSD in a network environment. - ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/chapters.ent#3 (text+ko) ==== @@ -6,7 +6,7 @@ Chapters should be listed in the order in which they are referenced. - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.38 2008/09/28 12:54:12 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/chapters.ent,v 1.39 2008/12/23 18:59:03 trhodes Exp $ --> @@ -43,7 +43,6 @@ - ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#5 (text+ko) ==== @@ -1,10 +1,10 @@ - + @@ -40,35 +40,50 @@ - The Cutting Edge + Updating and Upgrading &os; - + Synopsis - &os; is under constant development between releases. For - people who want to be on the cutting edge, there are several easy - mechanisms for keeping your system in sync with the latest - developments. Be warned—the cutting edge is not for everyone! + &os; is under constant development between releases. Some people + prefer to use the officially released versions, while others prefer + to keep in sync with the latest developments. However, even official + releases are often updated with security and other critical fixes. + Regardless of the version used, &os; provides all necessary tools + to keep your system updated, and also allows for easy upgrades between + versions. This chapter will help you decide if you want to track the development system, or stick with one of the released - versions. + versions. The basic tools for keeping your system up to date are + also presented. After reading this chapter, you will know: - The difference between the two development - branches: &os.stable; and &os.current;. + What utilities may be used to update the system and + the Ports Collection. How to keep your system up to date with + freebsd-update, CVSup, CVS, or CTM. + How to compare the state of an installed system against + a known pristine copy. + + + + The difference between the two development + branches: &os.stable; and &os.current;. + + + How to rebuild and reinstall the entire base system with make buildworld (etc). @@ -98,8 +113,470 @@ + + + + + Tom + Rhodes + Written by + + + + + Colin + Percival + Based on notes provided by + + + + FreeBSD Update + + Updating and Upgrading + + freebsd-update + updating-upgrading + + + Applying security patches is an important part of maintaining + computer software, especially the operating system. For the + longest time on &os; this process was not an easy one. Patches + had to be applied to the source code, the code rebuilt into + binaries, and then the binaries had to be re-installed. + + This is no longer the case as &os; now includes a utility + simply called freebsd-update. This utility + provides two separate functions. First, it allows for binary + security and errata updates to be applied to the &os; base system + without the build and install requirements. Second, the utility + supports minor and major release upgrades. + + + Binary updates are available for all architectures and + releases currently supported by the security team; however, + some features, such as the &os; operating system upgrades, + require the latest release of &man.freebsd-update.8; and + &os; 6.3 or greater. Before updating to a new release, the current + release announcements should be reviewed as they may contain + important information pertinent to the desired release. These + announcements may be viewed at the following link: + . + + + If a crontab utilizing the features + of freebsd-update exists, it must be + disabled before the following operation is started. + + + The Configuration File + + Some users may wish to tweak the configuration file, + allowing better control of the process. The options are + very well documented, but the following few may require a + bit more explanation: + + # Components of the base system which should be kept updated. +Components src world kernel + + This parameter controls what parts of &os; will be kept + up to date. The default is to update the source code, the + entire base system, and the kernel. Components are the + same as those available during the install, for instance, + adding "world/games" here would allow game patches to be + applied. Using "src/bin" would allow the source code in + src/bin to be + updated. + + The best option is to leave this at the default as + changing it to include specific items will require the user + to list every item they prefer to be updated. This could + have disastrous consequences as source code and binaries may + become out of sync. + + # Paths which start with anything matching an entry in an IgnorePaths +# statement will be ignored. +IgnorePaths + + Add paths, such as + /bin or + /sbin to leave these + specific directories untouched during the update + process. This option may be used to prevent + freebsd-update from overwriting local + modifications. + + # Paths which start with anything matching an entry in an UpdateIfUnmodified +# statement will only be updated if the contents of the file have not been +# modified by the user (unless changes are merged; see below). +UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile + + Update configuration files in the specified directories + only if they have not been modified. Any changes made by the + user will invalidate the automatic updating of these files. + There is another option, + KeepModifiedMetadata, which will instruct + freebsd-update to save the changes during + the merge. + + # When upgrading to a new &os; release, files which match MergeChanges +# will have any local changes merged into the version from the new release. +MergeChanges /etc/ /var/named/etc/ + + List of directories with configuration files that + freebsd-update should attempt merges in. + The file merge process is a series of &man.diff.1; patches + similar to &man.mergemaster.8; with fewer options, the merges + are either accepted, open an editor, or + freebsd-update will abort. When in doubt, + backup /etc and just + accept the merges. See for more + information about the mergemaster + command. + + # Directory in which to store downloaded updates and temporary +# files used by &os; Update. +# WorkDir /var/db/freebsd-update + + This directory is where all patches and temporary + files will be placed. In cases where the user is doing + a version upgrade, this location should have a least a + gigabyte of disk space available. + + # When upgrading between releases, should the list of Components be +# read strictly (StrictComponents yes) or merely as a list of components +# which *might* be installed of which &os; Update should figure out +# which actually are installed and upgrade those (StrictComponents no)? +# StrictComponents no + + When set to yes, + freebsd-update will assume that the + Components list is complete and will not + attempt to make changes outside of the list. Effectively, + freebsd-update will attempt to update + every file which belongs to the Components + list. + + + + Security Patches + + Security patches are stored on a remote machine and + may be downloaded and installed using the following + command: + + &prompt.root; freebsd-update fetch +&prompt.root; freebsd-update install + + If any kernel patches have been applied the system will + need a reboot. If all went well the system should be patched + and freebsd-update may be ran as a nightly + &man.cron.8; job. An entry in /etc/crontab + would be sufficient to accomplish this task: + + @daily root freebsd-update cron + + This entry states that once every day, the + freebsd-update will be ran. In this way, + using the argument, + freebsd-update will only check if updates + exist. If patches exist, they will automatically be downloaded + to the local disk but not applied. The + root user will be sent an email so they + may install them manually. + + If anything went wrong, freebsd-update + has the ability to roll back the last set of changes with + the following command: + + &prompt.root; freebsd-update rollback + + Once complete, the system should be restarted if the kernel + or any kernel modules were modified. This will allow &os; to + load the new binaries into memory. + + + The freebsd-update only works with + the GENERIC kernel. If any changes have + been made to GENERIC or a custom kernel + has been installed, freebsd-update will + not complete — failing in the former case and + producing an error in the latter. + + + + + Major and Minor Upgrades + + This process will remove old object files and + libraries which will break most third party applications. + It is recommended that all installed ports either be removed + and re-installed or upgraded later using the + ports-mgmt/portupgrade + utility. Most users will want to run a test build using + the following command: + + &prompt.root; portupgrade -af + + This will ensure everything will be re-installed + correctly. Note that setting the + BATCH environment variable to + yes will answer yes to + any prompts during this process, removing the need for + manual intervention during the build process. + + Major and minor version updates may be performed by + providing freebsd-update with a release + version target, for example, the following command will + update to &os; 6.3: + + &prompt.root; freebsd-update -r 6.3-RELEASE upgrade + + After the command has been received, + freebsd-update will evaluate the + configuration file and current system in an attempt to gather + the information necessary to update the system. A screen + listing will display what components have been detected and + what components have not been detected. For example: + + Looking up update.FreeBSD.org mirrors... 1 mirrors found. +Fetching metadata signature for 6.3-BETA1 from update1.FreeBSD.org... done. +Fetching metadata index... done. +Inspecting system... done. + +The following components of FreeBSD seem to be installed: +kernel/smp src/base src/bin src/contrib src/crypto src/etc src/games +src/gnu src/include src/krb5 src/lib src/libexec src/release src/rescue +src/sbin src/secure src/share src/sys src/tools src/ubin src/usbin +world/base world/info world/lib32 world/manpages + +The following components of FreeBSD do not seem to be installed: +kernel/generic world/catpages world/dict world/doc world/games +world/proflibs + +Does this look reasonable (y/n)? y + + At this point, freebsd-update will + attempt to download all files required for the upgrade. In + some cases, the user may be prompted with questions regarding + what to install or how to proceed. + + After all patches have been downloaded to the local + system, they will then be applied. This process may take + a while depending on the speed and workload of the machine. + Configuration files will then be merged — this part + of the process requires some user intervention as a file may be + merged or an editor may appear on screen for a manual merge. + The results of every successful merge will be shown to the user + as the process continues. A failed or ignored merge will cause + the process to abort. Users may wish to make a backup of + /etc and manually merge + important files, such as master.passwd + or group at a later time. + + + The system is not being altered yet, all patching and + merging is happening in another directory. When all + patches have been applied successfully, all configuration + files have been merged and it seems the process will go + smoothly, the changes will need to be committed by the + user. + + + Once this process is complete, the upgrade may be committed + to disk using the following command. + + &prompt.root; freebsd-update install + + The kernel and kernel modules will be patched first. At + this point the machine must be rebooted. The following + command may be issued to restart the machine so the new + kernel will be loaded into memory: + + &prompt.root; shutdown -r now + + Once the system has come back online, + freebsd-update will need to be started + again. The state of the process has been saved and thus, + freebsd-update will not start from the + beginning, but will remove all old shared libraries and object + files. To continue to this stage, issue the following + command: + + &prompt.root; freebsd-update install + + + Depending on whether any libraries version numbers got + bumped, there may only be two install phases instead of + three. + + + All third party software will now need to be rebuilt and + re-installed. This is required as installed software may + depend on libraries which have been removed during the upgrade + process. The + ports-mgmt/portupgrade + command may be used to automate this process. The following + commands may be used to begin this process: + + &prompt.root; portupgrade -f ruby +&prompt.root; rm /var/db/pkg/pkgdb.db +&prompt.root; portupgrade -f ruby18-bdb +&prompt.root; rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db +&prompt.root; portupgrade -af + + Once this has completed, finish the upgrade process with a + final call to freebsd-update. Issue the + following command to tie up all loose ends in the upgrade + process: + + &prompt.root; freebsd-update install + + Reboot the machine into the new &os; version. The process + is complete. + + + + System State Comparison + + The freebsd-update utility may be used + to test the state of the installed &os; version against a + known good copy. This option evaluates the current version + of system utilities, libraries, and configuration files. + To begin the comparison, issue the following command: + + &prompt.root; freebsd-update IDS >> outfile.ids + + + While the command name is IDS it should + in no way be a replacement for an intrusion detection system + such as security/snort. + As freebsd-update stores data on disk, the + possibility of tampering is evident. While this possibility + may be reduced by using the + kern.securelevel setting and storing the + freebsd-update data on a read only file + system when not in use, a better solution would be to + compare the system against a secure disk, such as a + DVD or securely stored external + USB disk device. + + + The system will now be inspected, and a list of files + along with their &man.sha256.1; hash values, both the known value + in the release and the current installed value, will be printed. This is why + the output has been sent to the + outfile.ids file. It scrolls by too + quickly for eye comparisons, and soon it fills up the console + buffer. + + These lines are also extremely long, but the output format + may be parsed quite easily. For instance, to obtain a list of + all files different from those in the release, issue the + following command: + + &prompt.root; cat outfile.ids | awk '{ print $1 }' | more +/etc/master.passwd +/etc/motd +/etc/passwd +/etc/pf.conf + + This output has been truncated, many more files exist. + Some of these files have natural modifications, the + /etc/passwd has been modified because + users have been added to the system. In some cases, there + may be other files, such as kernel modules, which differ + as freebsd-update may have updated them. + To exclude specific files or directories, add them to the + IDSIgnorePaths option in + /etc/freebsd-update.conf. + + This system may be used as part of an elaborate upgrade + method, aside from the previously discussed version. + + + + + + + + Tom + Rhodes + Written by + + + + + Colin + Percival + Based on notes provided by + + + + Portsnap: A Ports Collection Update Tool + + Updating and Upgrading + + Portsnap + Updating and Upgrading + + + The base system of &os; includes a utility for updating + the Ports Collection too: the &man.portsnap.8; utility. Upon + execution, it will connect to a remote site, verify the secure + key, and download a new copy of the Ports Collection. The key + is used to verify the integrity of all downloaded files, ensuring + they have not been modified in-flight. To download the latest + Ports Collection files, issue the following command: + + &prompt.root; portsnap fetch +Looking up portsnap.FreeBSD.org mirrors... 3 mirrors found. +Fetching snapshot tag from portsnap1.FreeBSD.org... done. +Fetching snapshot metadata... done. +Updating from Wed Aug 6 18:00:22 EDT 2008 to Sat Aug 30 20:24:11 EDT 2008. +Fetching 3 metadata patches.. done. +Applying metadata patches... done. +Fetching 3 metadata files... done. +Fetching 90 patches.....10....20....30....40....50....60....70....80....90. done. +Applying patches... done. +Fetching 133 new ports or files... done. + + What this example shows is that &man.portsnap.8; + has found and verified + several patches to the current ports data. This also indicates + that the utility was run previously, if it was a first time + run, the collection would have simply been downloaded. + + When &man.portsnap.8; successfully completes + a fetch operation, the Ports Collection and + subsequent patches exist on the local system that have passed + verification. The updated files may be installed by + typing: + + &prompt.root; portsnap extract +/usr/ports/.cvsignore +/usr/ports/CHANGES +/usr/ports/COPYRIGHT +/usr/ports/GIDs +/usr/ports/KNOBS +/usr/ports/LEGAL +/usr/ports/MOVED +/usr/ports/Makefile +/usr/ports/Mk/bsd.apache.mk +/usr/ports/Mk/bsd.autotools.mk +/usr/ports/Mk/bsd.cmake.mk +... + + The process is now complete, and applications may be + installed or upgraded using the updated Ports Collection. + + To run both processes consecutively, issue the following + command: + + &prompt.root; portsnap fetch update + + - &os.current; vs. &os.stable; + Tracking a Development Branch -CURRENT -STABLE @@ -862,7 +1339,7 @@ &prompt.root; rm -rf * - + Recompile the Base System @@ -1219,7 +1696,7 @@ If you are using &man.mergemaster.8; (as recommended), you can skip forward to the next section. + linkend="updating-upgrading-rebooting">next section. The simplest way to do this by hand is to install the files into a new directory, and then work through them looking @@ -1367,7 +1844,7 @@ - + Rebooting You are now done. After you have verified that everything appears ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#6 (text+ko) ==== @@ -8,7 +8,7 @@ @@ -84,7 +84,7 @@ Understand how to obtain and rebuild the &os; sources - (). + (). ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -264,6 +264,13 @@ /dev/mirror/gm device using the following command: + + Creating a mirror out of the boot drive may result in + data loss if any data has been stored on the last sector of + the disk. This risk is reduced if creating the mirror is + done promptly after a fresh install of &os;. + + &prompt.root; gmirror label -vb round-robin gm0 /dev/da0 The system should respond with: ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -336,7 +336,7 @@ you to realize that you have deleted your custom kernel configuration file. Also, do not edit GENERIC directly, as it may get overwritten the next time you - update your source tree, and + update your source tree, and your kernel modifications will be lost. You might want to keep your kernel configuration file @@ -374,7 +374,7 @@ If you sync your source tree with the + linkend="updating-upgrading">sync your source tree with the latest sources of the &os; project, be sure to always check the file /usr/src/UPDATING before you perform any update @@ -1366,13 +1366,6 @@ - KLD modules cannot be loaded into - a PAE enabled kernel, due to the - differences in the build framework of a module and the - kernel. - - - Device drivers that do not use the &man.bus.dma.9; interface will cause data corruption in a PAE enabled kernel and are not ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -120,7 +120,7 @@ In order to localize a FreeBSD system to a specific language (or any other I18N-supporting &unix; like systems), the user needs to find out - the codes for the specify country and language (country + the codes for the specific country and language (country codes tell applications what variation of given language to use). In addition, web browsers, SMTP/POP servers, web servers, etc. make decisions based on ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -720,7 +720,7 @@ &prompt.root; pkg_add -r portsnap - Please refer to Using Portsnap + Please refer to Using Portsnap for a detailed description of all Portsnap features. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#5 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -35,8 +35,8 @@ - , DTrace, has been added with - information about the powerful DTrace performance analysis + , &dtrace;, has been added with + information about the powerful &dtrace; performance analysis tool. @@ -47,6 +47,12 @@ + , Security Event Auditing, has + been added to cover the new auditing capabilities in &os; + and explain its use. + + + , Virtualization, has been added with information about installing &os; on virtualization software. @@ -448,12 +454,13 @@ - , The Cutting Edge + , Updating and Upgrading &os; Explains the differences between FreeBSD-STABLE, FreeBSD-CURRENT, and FreeBSD releases. Describes which users would benefit from tracking a development system and outlines - that process. + that process. Covers the methods users may take to update their + system to the latest security release. @@ -468,15 +475,6 @@ - , Updating &os; - - Describes the latest system utilities that may be used to - update a &os; system. These are &man.freebsd-update.8; for - the base system, and &man.portsnap.8; for the - Ports Collection. - - - , Serial Communications Explains how to connect terminals and modems to your ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2688,7 +2688,7 @@ Get the kernel source. (See ) + linkend="updating-upgrading">) ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#3 (text+ko) ==== @@ -6,7 +6,7 @@ and Tom Rhodes For the FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml,v 1.45 2008/06/01 09:42:12 remko Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml,v 1.46 2008/12/22 21:51:29 trhodes Exp $ --> @@ -946,7 +946,10 @@ This information only relates to the historic Vinum implementation. Gvinum always features an automatic startup once the kernel module is - loaded. + loaded, via &man.loader.conf.5;. To load the + Gvinum module at boot time, add + geom_vinum_load="YES" to + /boot/loader.conf. In order to start Vinum automatically when you boot the system, ensure that you have the following line in your ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ If that PR is approved, a committer will need to follow the rest of the procedure that is - + outlined in the Committer's Guide. @@ -12268,6 +12268,10 @@ new arp-v2 rewrite. 800059 + + 8.0-CURRENT after the addition of makefs. + 800060 + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#4 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 23 22:59:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75B0A1065677; Tue, 23 Dec 2008 22:59:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 206321065675 for ; Tue, 23 Dec 2008 22:59:33 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D1D38FC17 for ; Tue, 23 Dec 2008 22:59:33 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNMxWOU058498 for ; Tue, 23 Dec 2008 22:59:32 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNMxW1N058496 for perforce@freebsd.org; Tue, 23 Dec 2008 22:59:32 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 23 Dec 2008 22:59:32 GMT Message-Id: <200812232259.mBNMxW1N058496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155210 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, 23 Dec 2008 22:59:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=155210 Change 155210 by pgj@kolbasz on 2008/12/23 22:59:08 MFen (doc): 1.111 -> 1.112 hu_HU.ISO8859-2/books/handbook/Makefile 1.173 -> 1.174 hu_HU.ISO8859-2/books/handbook/book.sgml 1.38 -> 1.39 hu_HU.ISO8859-2/books/handbook/chapters.ent 1.417 -> 1.419 hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml 1.155 -> 1.156 hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml 1.231 -> 1.232 hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml 1.46 -> 1.47 hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml 1.126 -> 1.130 hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml 1.187 -> 1.190 hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml 1.124 -> 1.125 hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml 1.453 -> 1.455 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml 1.110 -> 1.111 hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml 1.285 -> 1.286 hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml 1.44 -> 1.46 hu_HU.ISO8859-2/books/handbook/preface/preface.sgml 1.130 -> 1.133 hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml 1.45 -> 1.46 hu_HU.ISO8859-2/books/handbook/vinum/chapter.sgml 1.6 -> 1.7 hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml 1.31 -> 1.32 hu_HU.ISO8859-2/books/fdp-primer/book.sgml 1.23 -> 1.24 hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml 1.74 -> 1.77 hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml 1.48 -> 1.49 hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml 1.17 -> 1.18 hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml 1.13 -> 1.14 hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.sgml 1.33 -> 1.34 hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml 1.32 -> 1.34 hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#9 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml#7 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.sgml#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/Makefile#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#23 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#9 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/chapters.ent#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#10 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#11 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#10 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#18 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#16 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#14 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml#10 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/Makefile#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/chapter.sgml#7 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#11 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#9 (text+ko) ==== @@ -33,7 +33,7 @@ %SOURCE% en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml - %SRCID% 1.23 + %SRCID% 1.24 --> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#6 (text+ko) ==== @@ -33,7 +33,7 @@ @@ -88,7 +88,7 @@ A HTML, más néven HyperText Markup Language, a Világháló jelölõnyelve. Ezzel kapcsolatban részlesebb leírásokat a címen + url="http://www.w3.org/"> címen találhatunk. A HTML használata a &os; honlapján ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#8 (text+ko) ==== @@ -33,7 +33,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#5 (text+ko) ==== @@ -33,7 +33,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.sgml#5 (text+ko) ==== @@ -33,7 +33,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml#6 (text+ko) ==== @@ -33,7 +33,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/Makefile#8 (text+ko) ==== @@ -4,7 +4,7 @@ # $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/Makefile,v 1.4 2008/11/17 09:29:31 pgj Exp $ # %SOURCE% en_US.ISO8859-1/books/handbook/Makefile -# %SRCID% 1.111 +# %SRCID% 1.112 # # Build the FreeBSD Handbook. # @@ -248,7 +248,6 @@ SRCS+= printing/chapter.sgml SRCS+= security/chapter.sgml SRCS+= serialcomms/chapter.sgml -SRCS+= updating/chapter.sgml SRCS+= users/chapter.sgml SRCS+= vinum/chapter.sgml SRCS+= virtualization/chapter.sgml ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#23 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -5063,7 +5063,7 @@ alaprendszer része, ezért a használatához elõször telepítenünk kell a net/isc-dhcp3-server portot vagy a + role="package">net/isc-dhcp30-server portot vagy a neki megfelelõ csomagot. Ahogy feltelepítettük, le kell futtatnunk az ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml#8 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -3295,6 +3295,15 @@ megismerésével sok idõt megspórolhatunk. + Számos alkalmazás, amely + állományokat akar módosítani vagy + szöveges bemenetre van szüksége, automatikusan + szövegszerkesztõt nyit meg. Ezt az + EDITOR környezeti változó + beállításával tudjuk + meghatározni. Errõl részletesebben a parancsértelmezõknél + olvashatunk. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#9 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/book.sgml - %SRCID% 1.173 + %SRCID% 1.174 --> - %pgpkeys; ]> @@ -375,7 +374,6 @@ tudjuk. - ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/chapters.ent#6 (text+ko) ==== @@ -11,7 +11,7 @@ $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/chapters.ent,v 1.3 2008/10/05 01:34:24 pgj Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/chapters.ent - %SRCID% 1.38 + %SRCID% 1.39 --> @@ -48,7 +48,6 @@ - ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#10 (text+ko) ==== @@ -7,10 +7,10 @@ - + @@ -41,45 +41,69 @@ - Az élvonal + A &os; frissítése és frissen + tartása - + Áttekintés A &os; a kiadások közt is állandó - fejlõdésben van. A legfrissebb fejlesztések - elérésének számos egyszerû - eszköze áll rendelkezésre mindazok - számára, akik az élvonalban - kívánnak lenni. Azonban vigyázzunk — - ez az élvonal nem való ám mindenkinek! Ebben - a fejezetben segítünk dönteni a fejlesztõi - változat és a kiadások használata - között. + fejlõdésben van. Vannak felhasználók, + akik a hivatalosan kiadott változatokat + használják, és vannak, akik szeretik + folyamatosan nyomonkövetni a fejlesztéseket. Emellett + viszont a hivatalos kiadások esetében + szükség lehet bizonyos biztonsági + frissítések és kritikus + javítások alkalmazására. + Függetlenül a pillanatnyilag használt + változattól, a &os; alaprendszerében + megtalálható minden olyan eszköz, amellyel + könnyedén frissíteni tudunk a + különbözõ verziók között. + Ebben a fejezetben segítünk dönteni a + fejlesztõi változat és a kiadások + használata között. Továbbá + megismerhetjük a rendszer frissítéséhez + használható alapvetõ + eszközöket. A fejezet elolvasása során megismerjük: - a két fejlesztõi ág, a &os.stable; - és a &os.current; közti - különbséget; + milyen segédprogramokkal tudjuk frissíteni + az alaprendszert és a Portgyûjteményt; + hogyan tartsuk naprakészen rendszerünket a + freebsd-update, CVSup, - CVS, vagy + CVS vagy CTM használatával; + + hogyan vessük össze a telepített + rendszerünk aktuális állapotát egy + ismert eredeti változattal; + + + + a két fejlesztõi ág, a &os.stable; + és a &os.current; közti + különbséget; + + + a make buildworld (stb.) segítségével hogyan fordítsuk és telepítsük újra az egész alaprendszert. - A fejezet elolvasásához ajánlott: @@ -111,8 +135,675 @@ + + + + + Tom + Rhodes + Írta: + + + + + + Colin + Percival + A megíráshoz felhasznált + jegyzeteket készítette: + + + + + A &os; frissítése + + frissítés és frissen tartás + + + freebsd-update + frissítés és frissen tartás + + + A biztonsági javítások + telepítése minden + számítógépes szoftver, + különösen az operációs rendszerek + számára lényeges mozzanat. Nagyon + hosszú ideig ez a &os; esetében nem volt + könnyen megoldható: a javításokat + közvetlenül a forráskódon kellett + elvégezni, ezekbõl újrafordítani a + rendszert, majd telepíteni. + + Ez a nehézség mostanra viszont már + elhárult, mivel a &os; legfrissebb verziói már + tartalmaznak egy freebsd-update nevû + segédprogramot, amellyel mindez leegyszerûsödik. + Ez a program két külön funkciót lát + el. Elõször is, lehetõvé teszi, hogy a &os; + alaprendszer újrafordítása és + -telepítése nélkül javítsunk + biztonsági és egyéb apró + hibákat, valamint másodsorban támogatja a + kisebb és nagyobb verziójú kiadások + közti váltást. + + + Ezek a bináris frissítések azonban csak + a &os; biztonsági csapata által is felügyelt + architektúrák és kiadások + esetén érhetõek el. Emellett bizonyos + lehetõségek használatához, + például a &os; verziói közti + átállás támogatásához + a &man.freebsd-update.8; legújabb változata, + valamint minimum a &os; 6.3 kiadása + szükségeltetik. Ezért ne felejtsük el + alaposan átolvasni a legújabb + kiadásokról szóló + bejelentéseket mielõtt frissítenénk + rájuk, mivel ezzel kapcsolatban fontos + információkat tartalmazhatnak. Az említett + bejelentések a címen + érhetõek el. + + + Ha a crontab már hivatkozik a + freebsd-update programra, akkor a most + következõ mûvelet elkezdése elõtt + tiltsuk le. + + + A konfigurációs állományok + + Elõfordulhat, hogy változtatni akarunk valamin + a frissítési folyamatban és ezért + szeretnénk módosítani a programhoz + tartozó konfigurációs + állományt. Az opciók részletes + ismertetéssel rendelkeznek, habár + némelyiknél még további + magyarázat kellhet: + + # Az alaprendszerben frissíteni kívánt komponensek +Components src world kernel + + Ezzel a paraméterrel határozhatjuk meg, hogy a + &os; mely részei kerüljenek frissítésre. + Alapértelmezés szerint a program frissíti a + forrásokat, a teljes alaprendszert és a + rendszermagot. Komponensként a + telepítésnél választható + elemeket adhatjuk meg, például "world/games" + hozzáadásakor a games kategória elemei is + folyamatosan frissülni fognak. Az "src/bin" + megadásakor pedig az src/bin könyvtár + tartalma frissül. + + Ezt a beállítást a legjobb meghagyni az + alapértelmezett értéken, mivel a + további elemek megadásánál + egyenként fel kell sorolni a frissítendõ + komponenseket. Ha itt viszont kifelejtünk valamit, akkor + könnyen megeshet, hogy a források és a + binárisok verziója elcsúszik + egymástól. + + # Az IgnorePaths beállítás után megadott szövegre illeszkedõ összes +# bejegyzés frissítése kimarad +IgnorePaths + + Ennél a beállításnál + azokat a könyvtárakat kell megadnunk, amelyeket + (és tartalmukat) ki szeretnénk hagyni a + frissítés során. Ezek lehetnek + például a /bin vagy az /sbin. Így meg tudjuk + akadályozni, hogy freebsd-update + esetleg felülírjon valamilyen helyi + változtatást a rendszerünkben. + + # Az UpdateIfUnmodified beállítás után megadott elérési útvonalakon csak +# a felhasználó által még nem módosított állományok fognak frissülni +# (hacsak a módosításokat össze nem fésüljük, lásd lentebb) +UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile + + A megadott könyvtárakban csak azokat a + konfigurációs állományokat fogja + frissíteni, amelyeket nem változtattuk meg. + Amennyiben bármelyikük eltér az eredetileg + frissítendõ változattól, azt a program + nem módosítja. Létezik egy másik + hasonló beállítás, a + KeepModifiedMetadata, amely + hatására a freebsd-update az + összefésülés során elmenti a + változtatásokat. + + # A MergeChanges beállításnál szereplõ állományok helyi módosításait +# automatikusan összefésüljük a &os; újabb verziójára frissítése közben +MergeChanges /etc/ /var/named/etc/ + + Itt azokat a könyvtárakat adhatjuk meg, + amelyekben a freebsd-update + számára engedélyezzük a + konfigurációs állományok új + verziójának + összefésülését a jelenlegi + állapottal. Az összefésülés + lényegében a &man.mergemaster.8; + használatánál már megszokott + módon, &man.diff.1; formátumban érkezõ + módosítások sorozata alapján + történik. Ekkor egy szövegszerkesztõ + segítségével felügyelhetjük az + összefésülés menetét vagy + megállíthatjuk a freebsd-update + futását. Ha kétségeink + adódnak, akkor egyszerûen mentsük le az + /etc + könyvtárat és fogadjuk el mindegyik + összefésülés eredményét. + A mergemaster + mûködésérõl a ad részletesebb + tájékoztatást. + + # A &os; frissítésekor ezt a könyvtárat fogja a program használni a +# letöltött módosítások és az egyéb ideiglenes állományok tárolására +# WorkDir /var/db/freebsd-update + + Az itt megadott könyvtárba fognak kerülni + az elvégzendõ módosítások + és az egyéb ideiglenesen keletkezõ + állományok. A verziók közti + váltás során ebben a + könyvtárban ajánlott legalább + 1 GB szabad tárterületnek lennie. + + # A kiadások közti váltás során a Components beállításnál megadott +# elemek kerüljenek csak frissítésre (StrictComponents yes), vagy a +# program próbálja meg magától kitalálni, hogy milyen komponesek +# *lehetnek* fenn a rendszeren és azokat frissítse (StrictComponents +# no)? +# StrictComponents no + + Ha ennél a beállításnál a + yes értéket adjuk meg, akkor a + freebsd-update feltételezni fogja, + hogy a Components opciónál + felsoroltunk minden frissítendõ komponenst és + nem próbál meg mást is + megváltoztatni. Ilyenkor tehát a + freebsd-update tulajdonképpen + egyedül csak a Components által + meghatározott elemekhez tartozó + állományokat fogja frissíteni. + + + + Biztonsági javítások + + A biztonsági javítások mindig egy + távoli gépen tárolódnak, a + következõ parancsok használatával + tölthetõek le és + telepíthetõek: + + &prompt.root; freebsd-update fetch +&prompt.root; freebsd-update install + + Amennyiben a rendszermagot is érintik + javítások, úgy a rendszert a mûvelet + befejezõdésével újra kell + indítanunk. Ha minden a megfelelõ módon + történt, akkor a rendszerünk már + tartalmazni fogja a korábban letöltött + és telepített javításokat, és + a freebsd-update akár + beállítható egy naponta + végrehajtandó &man.cron.8; feladatnak. Ehhez + mindössze a következõ bejegyzést kell + elhelyeznünk az /etc/crontab + állományban: + + @daily root freebsd-update cron + + A bejegyzés szerint naponta egyszer le fog futni a + freebsd-update. Ilyenkor, vagyis a + paraméter megadásakor a + freebsd-update csak ellenõrzi, hogy + vannak-e telepítendõ frissítések. Ha + talál, akkor automatikusan letölti ezeket a lemezre, + de nem telepíti. Helyette levélben + értesíti a root + felhasználót, aki ezután bármikor + manuálisan kérheti a + telepítést. + + Probléma esetén az alábbi paranccsal + megkérhetjük a freebsd-update + programot a legutóbb telepített + módosítások + visszavonására: + + &prompt.root; freebsd-update rollback + + Ha ez a visszavonás a rendszermagra vagy annak + moduljaira is vonatkozott, akkor a rendszert újra kell + indítanunk a parancs futásának + befejezõdésével. A &os; csak ilyenkor + képes betölteni az új binárisokat + betölteni a memóriába. + + + A freebsd-update + kizárólag csak a GENERIC + konfigurációjú rendszermagok + esetén alkalmazható. Amennyiben a + GENERIC típusú + rendszermagot módosítottuk, vagy egy + saját rendszermagot telepítettünk, a + freebsd-update nem fog rendesen + mûködni — az elõbbi esetben + megáll, az utóbbiban pedig hibát fog + jelezni. + + + + + Váltás kisebb és nagyobb + verziók között + + Verziók közti váltás során + a külsõ alkalmazások + mûkõdését akadályozó + régi tárgykódok és + függvénykönyvtárak törlõdni + fognak. Ezért javasoljuk, hogy vagy + töröljük le az összes portot és + telepítsük újra, vagy az alaprendszer + frissítése után hozzuk ezeket is + naprakész állapotba a ports-mgmt/portupgrade + segédprogram segítségével. + Elõször minden bizonnyal szeretnék + kipróbálni a frissítést, ezt a + következõ paranccsal tehetjük meg: + + &prompt.root; portupgrade -af + + Ezzel gondoskodunk róla, hogy a minden a + megfelelõen telepítõdjön újra. Ha a + BATCH környezeti változót a + yes értékre + állítjuk, akkor a folyamat során + megjelenõ összes kérdésre automatikusan + a yes választ adjuk, ezáltal + önállósítani tudjuk. + + A freebsd-update képes + frissíteni rendszerünket egy adott kiadásra. + Például a következõ paraméterek + megadásával válthatunk a &os; 6.3 + használatára: + + &prompt.root; freebsd-update -r 6.3-RELEASE upgrade + + A parancs elindulása után nem sokkal, a + váltáshoz szükséges + információk + összegyûjtéséhez a + freebsd-update elemzi a + konfigurációs állományában + megadott beállításokat és a rendszer + jelenleg használt verzióját. A + képernyõn ekkor sorban megjelennek a program + részérõl érzékelt és nem + érzékelt komponensek. Mint például + ahogy itt látható: + + Looking up update.FreeBSD.org mirrors... 1 mirrors found. +Fetching metadata signature for 6.3-BETA1 from update1.FreeBSD.org... done. +Fetching metadata index... done. +Inspecting system... done. + +The following components of FreeBSD seem to be installed: +kernel/smp src/base src/bin src/contrib src/crypto src/etc src/games +src/gnu src/include src/krb5 src/lib src/libexec src/release src/rescue +src/sbin src/secure src/share src/sys src/tools src/ubin src/usbin +world/base world/info world/lib32 world/manpages + +The following components of FreeBSD do not seem to be installed: +kernel/generic world/catpages world/dict world/doc world/games +world/proflibs + +Does this look reasonable (y/n)? y + + Ekkor a freebsd-update + megpróbálja letölteni a verziók + közti váltáshoz szükséges + összes állományt. Bizonyos esetekben + kérdésekkel fordul a felhasználó + felé arra vonatkozóan, hogy miket + telepítsen fel vagy mit csináljon. + + A javítások letöltését + követõen megkezdõdik a + telepítésük. A váltás ezen + lépése az adott gép aktuális + terhelésétõl és + sebességétõl függõen + változó hosszúságú lehet. + Ezután a konfigurációs + állományok összefésülése + zajlik le — itt általában a emberi + felügyeletre is szükség van az + állományok + összefésülésének + irányításához, amelynek folyamatosan + láthatóak az eredményei. A + meghiúsult vagy kihagyott + összefésülések a teljes + frissítési folyamat leállását + vonják maguk után. Az /etc könyvtárban + tárolt fontosabb állományokról, mint + például a master.passwd vagy + group javasolt elõzetesen + biztonsági mentést készíteni + és késõbb kézzel hozzájuk adni + a változtatásaikat. + + + A rendszerben ekkor még nem lesz jelen semmilyen + konkrét változás, az összes + említett javítás és + összefésülés egy külön + könyvtárban történik. A + telepített javításokat és az + összefésült konfigurációs + állományokat a folyamat végén + magának a felhasználónak kell + véglegesíteni. + + + A frissítési eljárás + végén a következõ parancs + kiadásával tudjuk ténylegesen + érvényesíteni az eddig elvégzett + módosításokat: + + &prompt.root; freebsd-update install + + Elõször mindig a rendszermag és a + hozzátartozó modulok cserélõdnek le. + Ahogy ez végrehajtódott, újra kell + indítanunk a rendszert. Az új rendszermagot + tehát a következõ parancs + futtatásával tudjuk a rendszer + újraindításán keresztül a + memóriába juttatni: + + &prompt.root; shutdown -r now + + A rendszer sikeres újraindulása után + ismét el kell indítanunk a + freebsd-update programot, amely + korábban már elmentette a frissítés + állapotát, emiatt a legutóbbi + pontról fog folytatódni, illetve törli az + osztott könyvtárak és + tárgykódok régebbi változatait. + Innen az alábbi paranccsal léphetünk + tovább: + + &prompt.root; freebsd-update install + + + A függvénykönyvtárak + verziói közti eltérések + mértékétõl függõen + elképzelhetõ, hogy a telepítés az + említett három fázis helyett + kettõben történik. + + + Most pedig újra kell fordítanunk vagy + telepítenünk az összes általunk + korábban használt külsõ + alkalmazást. Erre azért van + szükségünk, mert bizonyos alkalmazások a + verziók közti váltás során + törölt programkönyvtáraktól + függtek. Ennek automatizálásában a + ports-mgmt/portupgrade lesz + segítségünkre. Az alkalmazások + frissítésének + elindításához a következõ + parancsokat használjuk: + + &prompt.root; portupgrade -f ruby +&prompt.root; rm /var/db/pkg/pkgdb.db +&prompt.root; portupgrade -f ruby18-bdb +&prompt.root; rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db +&prompt.root; portupgrade -af + + A parancsok lefutását követõen a + freebsd-update utolsó + hívásával zárjuk le a + frissítést. Ezzel a paranccsal tudunk + tehát pontot tenni a frissítési + procedúra végére: + + &prompt.root; freebsd-update install + + Indítsuk újra a rendszert a &os; + frissített változatával. A folyamat ezzel + véget ért. + + + + Rendszerek állapotainak + összehasonlítása + + A freebsd-update ragyogóan + felhasználható a &os; egy telepített + változatának és egy általunk + garantáltan megbízható + példányának + összevetésére. Ilyenkor a rendszerhez + tartozó segédprogramokat, + programkönyvtárakat és + konfigurációs állományokat + ellenõriztethetjük le. Az + összehasonlítást ezzel a paranccsal + kezdhetjük meg: + + &prompt.root; freebsd-update IDS >> eredmeny.idk + + + Habár a parancs neve IDS + (intrusion detection system), nem helyettesít semmilyen + olyan behatolásjelzõ megoldást, mint + amilyen például a security/snort. Mivel a + freebsd-update adatokat tárol a + lemezen, teljesen kézenfekvõ a + hamisítás lehetõsége. Míg + ennek eshetõsége adott mértékben + visszaszorítható a + kern.securelevel + csökkentésével és a + freebsd-update által használt + adatok írásvédett + állományrendszerre helyezésével, + erre a problémára az ideális + megoldást mégis egy teljes biztonságban + tudható referencia rendszer jelentheti. Ennek + tárolására alkalmas lehet + például egy DVD vagy egy + külsõ USB-egység. + + + A parancs kiadása után megkezdõdik a + rendszer vizsgálata, és az ellenõrzés + során folyamatosan jelennek meg az + átvizsgált állományok a + hozzájuk tartozó ismert és + kiszámított &man.sha256.1;-kódjukkal + együtt. Mivel a képernyõn + túlságosan gyorsan elúsznának az + eredmények, ezért ezeket egy + eredmeny.idk nevû + állományba mentjük a késõbbi + elemzésekhez. + + Az így keletkezõ állomány sorai + ugyan meglehetõsen hosszúak, de szerencsére + viszonylag könnyen értelmezhetõek. + Például az adott kiadásban szereplõ + állományoktól eltérõeket ezzel + a paranccsal kérdezhetjük le: + + &prompt.root; cat eredmeny.idk | awk '{ print $1 }' | more +/etc/master.passwd +/etc/motd +/etc/passwd +/etc/pf.conf + + A példában most csak az elsõ + néhány állományt hagytuk meg, gyakran + tapasztalhatunk viszont ennél többet. Ezek + közül bizonyos állományok + értelemszerûen eltérnek, mint itt + például az /etc/passwd, mert + idõközben új felhasználókat + adtunk a rendszerhez. Máskor egyéb + állományok, például modulok nevei is + felbukkanhatnak, mert tegyük fel, hogy a + freebsd-update már frissítette + ezeket. Ha ki szeretnénk zárni valamilyen + állományokat vagy könyvtárakat az + ellenõrzésbõl, egyszerûen csak soroljuk + fel ezeket az /etc/freebsd-update.conf + állományban megjelenõ + IDSIgnorePaths + beállításnál. + + A korábban tárgyaltaktól + függetlenül ez a rendszer alkalmas bonyolultabb + frissítési folyamatok + kisegítésére is. + + + + + + + + Tom + Rhodes + Írta: + + + + + + Colin + Percival + A megíráshoz felhasznált + jegyzeteket készítette: + + + + + A Portgyûjtemény frissítése a + Portsnap használatával + + frissítés és frissen tartás + + + Portsnap + frissítés és frissen tartás + + + A &os; alaprendszer a Portgyûjtemény + frissítéséhez is tartalmaz egy &man.portsnap.8; + elnevezésû segédprogramot. Ez a program + elindítása után csatlakozik egy távoli + géphez, ellenõrzi a biztonsági kulcsát + és letölti a portok legfrissebb változatait. A + biztonsági kulcs feladata a frissítés + közben letöltött állományok + sértetlenségének szavatolása, ezzel + gondoskodik róla, hogy az adatok átvitelük + közben nem változtak meg. A + Portgyûjtemény legújabb + változatát így érhetjük + el: + + &prompt.root; portsnap fetch +Looking up portsnap.FreeBSD.org mirrors... 3 mirrors found. +Fetching snapshot tag from portsnap1.FreeBSD.org... done. +Fetching snapshot metadata... done. +Updating from Wed Aug 6 18:00:22 EDT 2008 to Sat Aug 30 20:24:11 EDT 2008. +Fetching 3 metadata patches.. done. +Applying metadata patches... done. +Fetching 3 metadata files... done. +Fetching 90 patches.....10....20....30....40....50....60....70....80....90. done. +Applying patches... done. +Fetching 133 new ports or files... done. + + A példában látható, hogy a >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 23 23:03:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 983901065679; Tue, 23 Dec 2008 23:03:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5CA1E1065676 for ; Tue, 23 Dec 2008 23:03:37 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4BAA98FC1A for ; Tue, 23 Dec 2008 23:03:37 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNN3bsc059847 for ; Tue, 23 Dec 2008 23:03:37 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNN3b0v059845 for perforce@freebsd.org; Tue, 23 Dec 2008 23:03:37 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 23 Dec 2008 23:03:37 GMT Message-Id: <200812232303.mBNN3b0v059845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155211 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, 23 Dec 2008 23:03:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=155211 Change 155211 by rene@rene_self on 2008/12/23 23:03:26 MFen handbook/advanced-networking 1.418 -> 1.419 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#23 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#23 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.8 2008/12/21 12:18:55 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.418 + %SRCID% 1.419 --> @@ -3921,7 +3921,7 @@ ISC DHCP 3.0 maakt geen deel uit van het basissysteem. Eerst dient de poort net/isc-dhcp3-server of het + role="package">net/isc-dhcp30-server of het corresponderende pakket geïnstalleerd te worden. Wanneer ISC DHCP is From owner-p4-projects@FreeBSD.ORG Tue Dec 23 23:03:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B8161065748; Tue, 23 Dec 2008 23:03:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 970221065677 for ; Tue, 23 Dec 2008 23:03:37 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D34A8FC1B for ; Tue, 23 Dec 2008 23:03:37 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNN3bkb059852 for ; Tue, 23 Dec 2008 23:03:37 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNN3bHG059850 for perforce@freebsd.org; Tue, 23 Dec 2008 23:03:37 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 23 Dec 2008 23:03:37 GMT Message-Id: <200812232303.mBNN3bHG059850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155212 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, 23 Dec 2008 23:03:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=155212 Change 155212 by pgj@kolbasz on 2008/12/23 23:03:35 Remove updating chapter from the handbook translation Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/Makefile#5 delete .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/chapter.sgml#8 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Dec 23 23:16:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AF3F1065675; Tue, 23 Dec 2008 23:16:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E4A21065673 for ; Tue, 23 Dec 2008 23:16:51 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F10F98FC0C for ; Tue, 23 Dec 2008 23:16:50 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNNGoKH060887 for ; Tue, 23 Dec 2008 23:16:50 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNNGo0c060885 for perforce@freebsd.org; Tue, 23 Dec 2008 23:16:50 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 23 Dec 2008 23:16:50 GMT Message-Id: <200812232316.mBNNGo0c060885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155213 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, 23 Dec 2008 23:16:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=155213 Change 155213 by rene@rene_self on 2008/12/23 23:16:13 MFen handbook/basics 1.155 -> 1.156 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#10 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.19 2008/12/21 12:18:55 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/basics/chapter.sgml - %SRCID% 1.155 + %SRCID% 1.156 --> @@ -2679,6 +2679,12 @@ vim of Emacs verstandig omdat deze uiteindelijk veel tijd kan besparen. + + Veel applicaties die bestanden wijzigen of getypte invoer + nodig hebben zullen automatisch een tekstverwerker openen. Om de + tekstverwerker te wijzigen die standaard wordt gebruikt, stelt u + de omgevingsvariabele EDITOR in. Zie de sectie + shells voor meer details. From owner-p4-projects@FreeBSD.ORG Tue Dec 23 23:19:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 149681065676; Tue, 23 Dec 2008 23:19:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAFFE1065670 for ; Tue, 23 Dec 2008 23:19:54 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B83148FC17 for ; Tue, 23 Dec 2008 23:19:54 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNNJspE061123 for ; Tue, 23 Dec 2008 23:19:54 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBNNJsRO061121 for perforce@freebsd.org; Tue, 23 Dec 2008 23:19:54 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 23 Dec 2008 23:19:54 GMT Message-Id: <200812232319.mBNNJsRO061121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155214 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, 23 Dec 2008 23:19:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=155214 Change 155214 by pgj@kolbasz on 2008/12/23 23:19:30 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#5 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#10 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#33 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/doc-build/chapter.sgml#6 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml#8 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.sgml#6 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#12 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#18 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml#9 integrate .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#12 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#10 integrate .. //depot/projects/docproj_hu/www/en/platforms/sparc.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/errata.html#2 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#11 integrate .. //depot/projects/docproj_hu/www/en/releases/7.0R/errata.html#3 integrate .. //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#10 integrate .. //depot/projects/docproj_hu/www/hu/about.sgml#9 integrate .. //depot/projects/docproj_hu/www/hu/advocacy/index.sgml#10 integrate .. //depot/projects/docproj_hu/www/hu/advocacy/myths.sgml#10 integrate .. //depot/projects/docproj_hu/www/hu/art.sgml#7 integrate .. //depot/projects/docproj_hu/www/hu/docproj/doc-set.sgml#9 integrate .. //depot/projects/docproj_hu/www/hu/docproj/docproj.sgml#9 integrate .. //depot/projects/docproj_hu/www/hu/docproj/submitting.sgml#8 integrate .. //depot/projects/docproj_hu/www/hu/docs.sgml#7 integrate .. //depot/projects/docproj_hu/www/hu/docs/books.sgml#20 integrate .. //depot/projects/docproj_hu/www/hu/index.xsl#14 integrate .. //depot/projects/docproj_hu/www/hu/news/news.sgml#12 integrate .. //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#10 integrate .. //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#8 integrate .. //depot/projects/docproj_hu/www/hu/platforms/ia64/refs.sgml#7 integrate .. //depot/projects/docproj_hu/www/hu/platforms/mips.sgml#8 integrate .. //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#10 integrate .. //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#9 integrate .. //depot/projects/docproj_hu/www/hu/projects/projects.sgml#8 integrate .. //depot/projects/docproj_hu/www/hu/search/search.sgml#17 integrate .. //depot/projects/docproj_hu/www/hu/search/web.atoz#14 integrate .. //depot/projects/docproj_hu/www/hu/send-pr.sgml#9 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#8 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#17 integrate .. //depot/projects/docproj_hu/www/hu/where.sgml#11 integrate .. //depot/projects/docproj_hu/www/share/sgml/advisories.xml#6 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#5 (text+ko) ==== @@ -1,5 +1,5 @@ + @@ -863,6 +863,7 @@ + ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#3 (text+ko) ==== @@ -37,7 +37,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.5 2008/08/17 12:58:32 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.6 2008/12/23 17:55:07 hrs Exp $ 2008 @@ -160,6 +160,48 @@ 13 July 2008 DNS cache poisoning + + SA-08:07.amd64 + 3 September 2008 + amd64 swapgs local privilege escalation + + + SA-08:08.nmount + 3 September 2008 + &man.nmount.2; local arbitrary code execution + + + SA-08:09.icmp6 + 3 September 2008 + Remote kernel panics on IPv6 connections + + + SA-08:10.nd6 + 1 October 2008 + IPv6 Neighbor Discovery Protocol routing vulnerability + + + SA-08:11.arc4random + 24 November 2008 + &man.arc4random.9; predictable sequence vulnerability + + + SA-08:12.ftpd + 23 December 2008 + Cross-site request forgery in &man.ftpd.8; + + + SA-08:13.protosw + 23 December 2008 + netgraph / bluetooth privilege escalation + ==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#10 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2524,6 +2524,13 @@ Received + + Dax Kelson (Guru Labs) + Nvidia Geforce 6800 GT + rnoland + Received + + &footer; ==== //depot/projects/docproj_hu/www/en/platforms/sparc.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -72,6 +72,7 @@
      • Ultra 30
      • Ultra 60
      • Ultra 80
        • +
      • Ultra 450

      The following systems are supported, but can only be netbooted due to ==== //depot/projects/docproj_hu/www/en/releases/6.4R/errata.html#2 (text+ko) ==== @@ -19,8 +19,8 @@

      Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The FreeBSD Documentation Project

      -

      $FreeBSD: releng/6.4/release/doc/en_US.ISO8859-1/errata/article.sgml -184448 2008-10-29 19:22:00Z hrs $
      +

      $FreeBSD: stable/6/release/doc/en_US.ISO8859-1/errata/article.sgml +186443 2008-12-23 17:55:37Z hrs $

      @@ -74,8 +74,8 @@ target="_top">http://www.FreeBSD.org/releases/, plus any sites which keep up-to-date mirrors of this location.

      -

      Source and binary snapshots of FreeBSD 6.4-STABLE also contain up-to-date copies of -this document (as of the time of the snapshot).

      +

      Source and binary snapshots of FreeBSD 6-STABLE also contain up-to-date copies of this +document (as of the time of the snapshot).

      For a list of all FreeBSD CERT security advisories, see http://security.FreeBSD.org/ or http://security.FreeBSD.org/.

      -

      No advisories.

      +
      + ++++ + + + + + + + + + + + + + + + + + + + + +
      AdvisoryDateTopic
      SA-08:12.ftpd23 December 2008 +

      Cross-site request forgery in +ftpd(8)

      +
      SA-08:13.protosw23 December 2008 +

      netgraph / bluetooth privilege escalation

      +
      +
      @@ -113,12 +148,16 @@

      This file, and other release-related documents, can be -downloaded from ftp://ftp.FreeBSD.org/.

      +downloaded from http://www.FreeBSD.org/snapshots/.

      For questions about FreeBSD, read the documentation before contacting <questions@FreeBSD.org>.

      +

      All users of FreeBSD 6-STABLE should subscribe to the <stable@FreeBSD.org> mailing list.

      +

      For questions about this documentation, e-mail <doc@FreeBSD.org>.

      ==== //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -180,7 +180,7 @@ Turn over to the secteam TBD - -- + 12 December 2008 RELENG_&local.rel.tag; branch is handed over to the FreeBSD Security Officer Team in one or two weeks after the announcement. ==== //depot/projects/docproj_hu/www/en/releases/7.0R/errata.html#3 (text+ko) ==== @@ -19,7 +19,7 @@

      Copyright © 2008 The FreeBSD Documentation Project

      $FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml -181796 2008-08-17 12:58:32Z bmah $
      +186442 2008-12-23 17:55:07Z hrs $

      @@ -122,6 +122,77 @@

      DNS cache poisoning

      + + +SA-08:07.amd64 +3 September 2008 + +

      amd64 swapgs local privilege escalation

      + + + + +SA-08:08.nmount +3 September 2008 + +

      +nmount(2) local +arbitrary code execution

      + + + + +SA-08:09.icmp6 +3 September 2008 + +

      Remote kernel panics on IPv6 connections

      + + + + +SA-08:10.nd6 +1 October 2008 + +

      IPv6 Neighbor Discovery Protocol routing vulnerability

      + + + + +SA-08:11.arc4random +24 November 2008 + +

      +arc4random(9) +predictable sequence vulnerability

      + + + + +SA-08:12.ftpd +23 December 2008 + +

      Cross-site request forgery in +ftpd(8)

      + + + + +SA-08:13.protosw +23 December 2008 + +

      netgraph / bluetooth privilege escalation

      + +
      ==== //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -163,7 +163,7 @@ RC2 builds 29 September 2008 - -- + 22 December 2008 Begin RC2 builds. ==== //depot/projects/docproj_hu/www/hu/about.sgml#9 (text+ko) ==== @@ -1,5 +1,5 @@ + ]> ==== //depot/projects/docproj_hu/www/hu/advocacy/index.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ - + ]> ==== //depot/projects/docproj_hu/www/hu/advocacy/myths.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ - + %developers; ==== //depot/projects/docproj_hu/www/hu/art.sgml#7 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; ==== //depot/projects/docproj_hu/www/hu/docproj/doc-set.sgml#9 (text+ko) ==== @@ -1,6 +1,6 @@ - + ==== //depot/projects/docproj_hu/www/hu/docproj/docproj.sgml#9 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> ==== //depot/projects/docproj_hu/www/hu/docproj/submitting.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ - + ==== //depot/projects/docproj_hu/www/hu/docs.sgml#7 (text+ko) ==== @@ -1,5 +1,5 @@ + ]> ==== //depot/projects/docproj_hu/www/hu/docs/books.sgml#20 (text+ko) ==== @@ -1,7 +1,7 @@ - + ==== //depot/projects/docproj_hu/www/hu/index.xsl#14 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + + + @@ -281,9 +281,17 @@ Maak nu de mirror aan. Begin het proces door informatie over metagegevens op het primaire schijfapparaat op te slaan, waardoor effectief het apparaat /dev/mirror/geom aangemaakt + class="devicefile">/dev/mirror/gm aangemaakt wordt met het volgende commando: + + Het creëeren van een mirror buiten de opstartschijf + kan resulteren in gegevensverlies als er enige gegevens zijn + opgeslagen op de laatste sector van de schijf. Dit gevaar + wordt verminderd als het creëeren van de mirror direct na + een verse installatie van &os; wordt gedaan. + + &prompt.root; gmirror label -vb round-robin gm0 /dev/da0 Het systeem hoort te antwoorden met: From owner-p4-projects@FreeBSD.ORG Wed Dec 24 09:29:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 797581065676; Wed, 24 Dec 2008 09:29:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D9FF1065673 for ; Wed, 24 Dec 2008 09:29:14 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2DDF38FC17 for ; Wed, 24 Dec 2008 09:29:14 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBO9TEVH056669 for ; Wed, 24 Dec 2008 09:29:14 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBO9TE31056667 for perforce@freebsd.org; Wed, 24 Dec 2008 09:29:14 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 24 Dec 2008 09:29:14 GMT Message-Id: <200812240929.mBO9TE31056667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155226 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, 24 Dec 2008 09:29:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=155226 Change 155226 by pgj@kolbasz on 2008/12/24 09:28:51 MFen (doc): 1.85 -> 1.86 hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#14 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#14 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -2798,11 +2798,6 @@ IPFW - - Ez a szakasz fejlesztés alatt áll. Ennek - megfelelõen a tartalma nem minden esetben pontos. - - Az IPFIREWALL (IPFW) a &os; által támogatott tûzfalazó alkalmazás, melyet a &os; Projektben résztvevõ önkéntesek fejlesztettek ki @@ -2815,7 +2810,8 @@ Az IPFW szabvány &os;-ben levõ, mintaként szolgáló szabályrendszere (ez az - /etc/rc.firewall állományban + /etc/rc.firewall és + /etc/rc.firewall6 állományokban található meg) annyira egyszerû, hogy komolyabb módosítások nélkül nem ajánlatos használni. Ez a példa nem @@ -2855,7 +2851,9 @@ korlátozásáért felelõs dummynet, a továbbküldésre alkalmas fwd szabály, a hálózati hidak - támogatása, illetve az ipstealth. + támogatása, illetve az ipstealth. Az IPFW + egyaránt használható IPv4 és IPv6 + esetén. Az IPFW engedélyezése @@ -2977,18 +2975,6 @@ jól, amikor még csak ismerkedünk a tûzfallal. - options IPV6FIREWALL -options IPV6FIREWALL_VERBOSE -options IPV6FIREWALL_VERBOSE_LIMIT -options IPV6FIREWALL_DEFAULT_TO_ACCEPT - - Ezek a beállítások teljesen megegyeznek - az IPv4 alapú társaikkal, csak ezek az IPv6-ra - vonatkoznak. Ha nem akarunk IPV6-ot használni, akkor ne - adjunk meg az IPV6FIREWALL beállításhoz - szabályokat, és így az összes IPv6 - csomag blokkolásra kerül. - a rendszermag beállításai From owner-p4-projects@FreeBSD.ORG Wed Dec 24 09:49:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D53A1065676; Wed, 24 Dec 2008 09:49:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61B95106564A for ; Wed, 24 Dec 2008 09:49:35 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 38C948FC17 for ; Wed, 24 Dec 2008 09:49:35 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBO9nYl0058291 for ; Wed, 24 Dec 2008 09:49:34 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBO9nYGH058289 for perforce@freebsd.org; Wed, 24 Dec 2008 09:49:34 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 24 Dec 2008 09:49:34 GMT Message-Id: <200812240949.mBO9nYGH058289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155228 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, 24 Dec 2008 09:49:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=155228 Change 155228 by pgj@kolbasz on 2008/12/24 09:49:23 Fix a typo Affected files ... .. //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#10 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#10 (text+ko) ==== @@ -1,4 +1,4 @@ - From owner-p4-projects@FreeBSD.ORG Wed Dec 24 09:53:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A38B41065676; Wed, 24 Dec 2008 09:53:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4ED7C1065673 for ; Wed, 24 Dec 2008 09:53:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E2EA8FC1B for ; Wed, 24 Dec 2008 09:53:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBO9rdGE058612 for ; Wed, 24 Dec 2008 09:53:39 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBO9rdwP058610 for perforce@freebsd.org; Wed, 24 Dec 2008 09:53:39 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 24 Dec 2008 09:53:39 GMT Message-Id: <200812240953.mBO9rdwP058610@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 155229 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, 24 Dec 2008 09:53:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=155229 Change 155229 by hselasky@hselasky_laptop001 on 2008/12/24 09:52:59 USB serial drivers must report ENOIOCTL when the IOCTL is not handled, else MPSAFETTY will forward the error code to the application! The USB serial layer will return ENOIOCTL when there is no ioctl callback present. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#14 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#13 (text+ko) ==== @@ -74,7 +74,6 @@ #include #include #include -#include #define USB_DEBUG_VAR uchcom_debug @@ -196,8 +195,6 @@ /* protypes */ -static int uchcom_ioctl(struct usb2_com_softc *, uint32_t, caddr_t, int, - struct thread *); static int uchcom_pre_param(struct usb2_com_softc *, struct termios *); static void uchcom_cfg_get_status(struct usb2_com_softc *, uint8_t *, uint8_t *); @@ -297,7 +294,6 @@ .usb2_com_cfg_set_break = &uchcom_cfg_set_break, .usb2_com_cfg_param = &uchcom_cfg_param, .usb2_com_pre_param = &uchcom_pre_param, - .usb2_com_ioctl = &uchcom_ioctl, .usb2_com_start_read = &uchcom_start_read, .usb2_com_stop_read = &uchcom_stop_read, .usb2_com_start_write = &uchcom_start_write, @@ -738,13 +734,6 @@ *msr = sc->sc_msr; } -static int -uchcom_ioctl(struct usb2_com_softc *ucom, uint32_t cmd, caddr_t data, int flag, - struct thread *td) -{ - return (ENOTTY); -} - static void uchcom_cfg_set_dtr(struct usb2_com_softc *ucom, uint8_t onoff) { ==== //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#14 (text+ko) ==== @@ -171,8 +171,6 @@ static void uplcom_stop_write(struct usb2_com_softc *); static void uplcom_cfg_get_status(struct usb2_com_softc *, uint8_t *, uint8_t *); -static int uplcom_ioctl(struct usb2_com_softc *, uint32_t, caddr_t, int, - struct thread *); static void uplcom_cfg_do_request(struct uplcom_softc *, struct usb2_device_request *, void *); @@ -260,7 +258,6 @@ .usb2_com_cfg_set_break = &uplcom_cfg_set_break, .usb2_com_cfg_param = &uplcom_cfg_param, .usb2_com_pre_param = &uplcom_pre_param, - .usb2_com_ioctl = &uplcom_ioctl, .usb2_com_start_read = &uplcom_start_read, .usb2_com_stop_read = &uplcom_stop_read, .usb2_com_start_write = &uplcom_start_write, @@ -768,13 +765,6 @@ *msr = sc->sc_msr; } -static int -uplcom_ioctl(struct usb2_com_softc *ucom, uint32_t cmd, caddr_t data, int flag, - struct thread *td) -{ - return (ENOTTY); -} - static void uplcom_intr_callback(struct usb2_xfer *xfer) { ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#13 (text+ko) ==== @@ -172,8 +172,6 @@ static void uvscom_stop_write(struct usb2_com_softc *); static void uvscom_cfg_get_status(struct usb2_com_softc *, uint8_t *, uint8_t *); -static int uvscom_ioctl(struct usb2_com_softc *, uint32_t, caddr_t, int, - struct thread *); static void uvscom_cfg_write(struct uvscom_softc *, uint8_t, uint16_t); static uint16_t uvscom_cfg_read_status(struct uvscom_softc *); @@ -247,7 +245,6 @@ .usb2_com_cfg_close = &uvscom_cfg_close, .usb2_com_pre_open = &uvscom_pre_open, .usb2_com_pre_param = &uvscom_pre_param, - .usb2_com_ioctl = &uvscom_ioctl, .usb2_com_start_read = &uvscom_start_read, .usb2_com_stop_read = &uvscom_stop_read, .usb2_com_start_write = &uvscom_start_write, @@ -753,13 +750,6 @@ *msr = sc->sc_msr; } -static int -uvscom_ioctl(struct usb2_com_softc *ucom, uint32_t cmd, caddr_t data, int fflag, - struct thread *td) -{ - return (ENOTTY); -} - static void uvscom_cfg_write(struct uvscom_softc *sc, uint8_t index, uint16_t value) { From owner-p4-projects@FreeBSD.ORG Wed Dec 24 11:00:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF04E1065670; Wed, 24 Dec 2008 11:00:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 836E81065677 for ; Wed, 24 Dec 2008 11:00:47 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 72BC48FC19 for ; Wed, 24 Dec 2008 11:00:47 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBOB0l3o070054 for ; Wed, 24 Dec 2008 11:00:47 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBOB0lUA070052 for perforce@freebsd.org; Wed, 24 Dec 2008 11:00:47 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 24 Dec 2008 11:00:47 GMT Message-Id: <200812241100.mBOB0lUA070052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155232 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, 24 Dec 2008 11:00:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=155232 Change 155232 by pgj@kolbasz on 2008/12/24 10:59:50 MFen (doc): 1.6 -> 1.7 hu_HU.ISO8859-2/articles/linux-users/article.sgml 1.1103 -> 1.1104 hu_HU.ISO8859-2/books/faq/book.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-users/article.sgml#10 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#34 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-users/article.sgml#10 (text+ko) ==== @@ -3,7 +3,7 @@ 23. fejezetét. + url="&url.base;/doc/hu_HU.ISO8859-2/books/handbook/updating-upgrading.html">frissítésrõl + szóló fejezetét. A bináris frissítés a &linux; típusú rendszereken elérhetõ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#34 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -476,7 +476,7 @@ A &os.current; + url="&url.books.handbook;/current-stable.html#CURRENT">&os.current; az operációs rendszer aktív fejlesztés alatt álló változata, amely idõvel az új &os.stable; @@ -487,7 +487,7 @@ érdekes. A kézikönyv erre vonatkozó szakaszában + url="&url.books.handbook;/current-stable.html#CURRENT">erre vonatkozó szakaszában olvashatunk részletesebben a -CURRENT használatáról. From owner-p4-projects@FreeBSD.ORG Wed Dec 24 11:13:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A072B1065678; Wed, 24 Dec 2008 11:13:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64831106564A for ; Wed, 24 Dec 2008 11:13:00 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 543F28FC27 for ; Wed, 24 Dec 2008 11:13:00 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBOBD0YD071846 for ; Wed, 24 Dec 2008 11:13:00 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBOBD0AB071844 for perforce@freebsd.org; Wed, 24 Dec 2008 11:13:00 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 24 Dec 2008 11:13:00 GMT Message-Id: <200812241113.mBOBD0AB071844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155234 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, 24 Dec 2008 11:13:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=155234 Change 155234 by ed@ed_dull on 2008/12/24 11:12:52 Make insert mode work properly. The cursor should progress, even in insert mode. Reported by: swell k gmail com Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#15 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#15 (text+ko) ==== @@ -676,8 +676,8 @@ if (t->t_stateflags & TS_INSERT) { /* - * Insert mode. Keep cursor at the same place, but move - * all existing characters to the right. + * Insert mode. Move all existing characters to the + * right. */ if (t->t_cursor.tp_col < t->t_winsize.tp_col - width) { teken_rect_t tr; @@ -692,7 +692,6 @@ } teken_funcs_putchar(t, &t->t_cursor, c, &t->t_curattr); - return; } if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1 && From owner-p4-projects@FreeBSD.ORG Wed Dec 24 11:19:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A841065676; Wed, 24 Dec 2008 11:19:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B93FF106564A for ; Wed, 24 Dec 2008 11:19:06 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A87408FC16 for ; Wed, 24 Dec 2008 11:19:06 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBOBJ62Z072296 for ; Wed, 24 Dec 2008 11:19:06 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBOBJ63V072294 for perforce@freebsd.org; Wed, 24 Dec 2008 11:19:06 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 24 Dec 2008 11:19:06 GMT Message-Id: <200812241119.mBOBJ63V072294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155235 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, 24 Dec 2008 11:19:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=155235 Change 155235 by pgj@kolbasz on 2008/12/24 11:19:04 MFen (doc): 1.288 -> 1.289 hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#10 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -3313,8 +3313,10 @@ összeségeként kezelik, az állományrendszerek által létrehozott állományok, linkek és - könyvtárak szintje alatt. A dump - az adott eszközön egy egész + könyvtárak szintje alatt. Eltérõen + más, biztonsági mentést végzõ + szoftverektõl, a dump az adott + eszközön egy egész állományrendszert képes lementeni. Nem képes csak az állományrendszer vagy egy több állományrendszerre kiterjedõ @@ -3323,7 +3325,18 @@ állományokat és könyvtárakat ír a szalagra, hanem nyers adatblokkokat, amelyek állományokat és könyvtárakat - formáznak. + formáznak. A restore parancs az + adatokat alapértelmezés szerint a /tmp könyvtárba + tömöríti ki. Ha nem lenne elegendõ + helyünk a /tmp + könyvtárban, akkor a TMPDIR + környezeti változó + átállításával ehelyett + megadhatunk egy olyat, ahol már kellõ + mennyiségû terület áll + rendelkezésre a restore + akadálytalan lefutásához. Ha a dump parancsot a From owner-p4-projects@FreeBSD.ORG Wed Dec 24 11:22:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B1FF1065674; Wed, 24 Dec 2008 11:22:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E93981065690 for ; Wed, 24 Dec 2008 11:22:16 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D5B298FC46 for ; Wed, 24 Dec 2008 11:22:16 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBOBMGXe072584 for ; Wed, 24 Dec 2008 11:22:16 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBOBMEfk072578 for perforce@freebsd.org; Wed, 24 Dec 2008 11:22:14 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 24 Dec 2008 11:22:14 GMT Message-Id: <200812241122.mBOBMEfk072578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155236 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, 24 Dec 2008 11:22:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=155236 Change 155236 by ed@ed_dull on 2008/12/24 11:22:10 IFC. Affected files ... .. //depot/projects/mpsafetty/ObsoleteFiles.inc#19 integrate .. //depot/projects/mpsafetty/contrib/bind9/CHANGES#4 integrate .. //depot/projects/mpsafetty/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/FAQ#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/README#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/aclocal.m4#1 branch .. //depot/projects/mpsafetty/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/nsupdate/nsupdate.1#1 branch .. //depot/projects/mpsafetty/contrib/bind9/bin/nsupdate/nsupdate.8#2 delete .. //depot/projects/mpsafetty/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/config.h.in#1 branch .. //depot/projects/mpsafetty/contrib/bind9/configure.in#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/misc/sort-options.pl#1 branch .. //depot/projects/mpsafetty/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/doc/rfc/rfc4648.txt#1 branch .. //depot/projects/mpsafetty/contrib/bind9/doc/rfc/rfc4701.txt#1 branch .. //depot/projects/mpsafetty/contrib/bind9/doc/rfc/rfc5155.txt#1 branch .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/aclocal.m4#3 branch .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/config.h.in#3 branch .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/include/isc/platform.h.in#1 branch .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/portset.h#1 branch .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/portset.c#1 branch .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/mpsafetty/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/mpsafetty/contrib/bind9/version#4 integrate .. //depot/projects/mpsafetty/etc/devd.conf#5 integrate .. //depot/projects/mpsafetty/etc/devd/asus.conf#2 integrate .. //depot/projects/mpsafetty/lib/bind/bind/config.h#2 integrate .. //depot/projects/mpsafetty/lib/bind/bind/port_after.h#3 integrate .. //depot/projects/mpsafetty/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/mpsafetty/lib/bind/config.h#3 integrate .. //depot/projects/mpsafetty/lib/bind/dns/code.h#2 integrate .. //depot/projects/mpsafetty/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/mpsafetty/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/mpsafetty/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/mpsafetty/lib/bind/isc/Makefile#2 integrate .. //depot/projects/mpsafetty/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/mpsafetty/lib/libc/arm/_fpmath.h#2 integrate .. //depot/projects/mpsafetty/lib/libc/arm/arith.h#2 integrate .. //depot/projects/mpsafetty/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/mpsafetty/lib/msun/src/math_private.h#2 integrate .. //depot/projects/mpsafetty/libexec/ftpd/extern.h#2 integrate .. //depot/projects/mpsafetty/libexec/ftpd/ftpcmd.y#2 integrate .. //depot/projects/mpsafetty/libexec/ftpd/ftpd.c#2 integrate .. //depot/projects/mpsafetty/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/mpsafetty/sbin/mount_msdosfs/mount_msdosfs.8#2 integrate .. //depot/projects/mpsafetty/sbin/shutdown/shutdown.8#2 integrate .. //depot/projects/mpsafetty/share/doc/bind9/Makefile#2 integrate .. //depot/projects/mpsafetty/share/man/man4/uscanner.4#2 integrate .. //depot/projects/mpsafetty/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/mpsafetty/share/man/man9/domain.9#2 integrate .. //depot/projects/mpsafetty/sys/arm/include/armreg.h#4 integrate .. //depot/projects/mpsafetty/sys/arm/include/ieee.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/if_npereg.h#3 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/ixp435_ehci.c#2 delete .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/mpsafetty/sys/conf/files#37 integrate .. //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/agp/agp.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#16 edit .. //depot/projects/mpsafetty/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/mpsafetty/sys/dev/usb/ehcivar.h#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uftdi.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/usb/umass.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/at91dci.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/at91dci_atmelarm.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/ehci2.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/ehci2_pci.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/musb2_otg.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/musb2_otg_atmelarm.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/ohci2.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/ohci2_atmelarm.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/ohci2_pci.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/uhci2.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/uhci2_pci.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/usb2_bus.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/usb2_controller.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/uss820dci.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_transfer.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_aue2.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_axe2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_cue2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_kue2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_rue2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_udav2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/input/ukbd2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/input/ums2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/ulpt2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_rum2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_ural2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_zyd2.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/sched_ule.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#14 integrate .. //depot/projects/mpsafetty/sys/netinet/ipprotosw.h#2 delete .. //depot/projects/mpsafetty/sys/netinet6/nd6_nbr.c#10 integrate .. //depot/projects/mpsafetty/sys/netipsec/vipsec.h#4 integrate .. //depot/projects/mpsafetty/tools/tools/README#2 integrate .. //depot/projects/mpsafetty/tools/tools/ether_reflect/Makefile#1 branch .. //depot/projects/mpsafetty/tools/tools/ether_reflect/ether_reflect.1#1 branch .. //depot/projects/mpsafetty/tools/tools/ether_reflect/ether_reflect.c#1 branch .. //depot/projects/mpsafetty/tools/tools/mctest/mctest.1#2 integrate .. //depot/projects/mpsafetty/usr.bin/csplit/csplit.1#2 integrate .. //depot/projects/mpsafetty/usr.bin/elf2aout/Makefile#2 integrate .. //depot/projects/mpsafetty/usr.bin/elf2aout/elf2aout.1#1 branch .. //depot/projects/mpsafetty/usr.bin/ncal/ncal.1#2 integrate .. //depot/projects/mpsafetty/usr.bin/ncal/ncal.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/nsupdate/Makefile#2 integrate .. //depot/projects/mpsafetty/usr.sbin/burncd/burncd.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/pmcstat/pmcstat.c#6 integrate .. //depot/projects/mpsafetty/usr.sbin/powerd/powerd.8#3 integrate .. //depot/projects/mpsafetty/usr.sbin/syslogd/syslog.conf.5#3 integrate Differences ... ==== //depot/projects/mpsafetty/ObsoleteFiles.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.164 2008/11/30 11:03:16 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.165 2008/12/23 16:52:03 bz Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20081223: ipprotosw.h removed +OLD_FILES+=usr/include/netinet/ipprotosw.h # 20081123: vfs_mountedon.9 removed OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz # 20081023: FREE.9 and MALLOC.9 removed ==== //depot/projects/mpsafetty/contrib/bind9/CHANGES#4 (text+ko) ==== @@ -1,14 +1,158 @@ - --- 9.4.2-P2 released --- + + --- 9.4.3 released --- + +2490. [port] aix: work around a kernel bug where IPV6_RECVPKTINFO + is cleared when IPV6_V6ONLY is set. [RT #18785] + +2489. [port] solaris: Workaround Solaris's kernel bug about + /dev/poll: + http://bugs.opensolaris.org/view_bug.do?bug_id=6724237 + Define ISC_SOCKET_USE_POLLWATCH at build time to enable + this workaround. [RT #18870] + + --- 9.4.3rc1 released --- + +2473. [port] linux: raise the limit on open files to the possible + maximum value before spawning threads; 'files' + specified in named.conf doesn't seem to work with + threads as expected. [RT #18784] + +2472. [port] linux: check the number of available cpu's before + calling chroot as it depends on "/proc". [RT #16923] + +2471. [bug] named-checkzone was not reporting missing manditory + glue when sibling checks were disabled. [RT #18768] + +2469. [port] solaris: Work around Solaris's select() limitations. + [RT #18769] + +2468. [bug] Resolver could try unreachable servers multiple times. + [RT #18739] + +2467. [bug] Failure of fcntl(F_DUPFD) wasn't logged. [RT #18740] + +2466. [doc] ARM: explain max-cache-ttl 0 SERVFAIL issue. + [RT #18302] + +2465. [bug] Adb's handling of lame addresses was different + for IPv4 and IPv6. [RT #18738] + +2463. [port] linux: POSIX doesn't include the IPv6 Advanced Socket + API and glibc hides parts of the IPv6 Advanced Socket + API as a result. This is stupid as it breaks how the + two halves (Basic and Advanced) of the IPv6 Socket API were designed to be used but we have to live with it. + Define _GNU_SOURCE to pull in the IPv6 Advanced Socket + API. [RT #18388] + +2462. [doc] Document -m (enable memory usage debugging) + option for dig. [RT #18757] + +2461. [port] sunos: Change #2363 was not complete. [RT #17513] + +2458. [doc] ARM: update and correction for max-cache-size. + [RT #18294] + +2455. [bug] Stop metadata being transfered via axfr/ixfr. + [RT #18639] + +2453. [bug] Remove NULL pointer dereference in dns_journal_print(). + [RT #18316] + +2449. [bug] libbind: Out of bounds reference in dns_ho.c:addrsort. + [RT #18044] + +2445. [doc] ARM out-of-date on empty reverse zones (list includes + RFC1918 address, but these are not yet compiled in). + [RT #18578] + +2444. [port] Linux, FreeBSD, AIX: Turn off path mtu discovery + (clear DF) for UDP responses and requests. + + --- 9.4.3b3 released --- + +2443. [bug] win32: UDP connect() would not generate an event, + and so connected UDP sockets would never clean up. + Fix this by doing an immediate WSAConnect() rather + than an io completion port type for UDP. + +2438. [bug] Timeouts could be logged incorrectly under win32. + [RT #18617] + +2437. [bug] Sockets could be closed too early, leading to + inconsistent states in the socket module. [RT #18298] + +2436. [security] win32: UDP client handler can be shutdown. [RT #18576] + +2433. [tuning] Set initial timeout to 800ms. + +2432. [bug] More Windows socket handling improvements. Stop + using I/O events and use IO Completion Ports + throughout. Rewrite the receive path logic to make + it easier to support multiple simultaneous + requestrs in the future. Add stricter consistency + checking as a compile-time option (define + ISC_SOCKET_CONSISTENCY_CHECKS; defaults to off). + +2430. [bug] win32: isc_interval_set() could round down to + zero if the input was less than NS_INTERVAL + nanoseconds. Round up instead. [RT #18549] + +2429. [doc] nsupdate should be in section 1 of the man pages. + [RT #18283] + +2426. [bug] libbind: inet_net_pton() can sometimes return the + wrong value if excessively large netmasks are + supplied. [RT #18512] + +2425. [bug] named didn't detect unavailable query source addresses + at load time. [RT #18536] + +2424. [port] configure now probes for a working epoll + implementation. Allow the use of kqueue, + epoll and /dev/poll to be selected at compile + time. [RT #18277] + +2422. [bug] Handle the special return value of a empty node as + if it was a NXRRSET in the validator. [RT #18447] + +2421. [func] Add new command line option '-S' for named to specify + the max number of sockets. [RT #18493] + Use caution: this option may not work for some + operating systems without rebuilding named. + +2420. [bug] Windows socket handling cleanup. Let the io + completion event send out cancelled read/write + done events, which keeps us from writing to memeory + we no longer have ownership of. Add debugging + socket_log() function. Rework TCP socket handling + to not leak sockets. + +2417. [bug] Connecting UDP sockets for outgoing queries could + unexpectedly fail with an 'address already in use' + error. [RT #18411] + +2416. [func] Log file descriptors that cause exceeding the + internal maximum. [RT #18460] + +2414. [bug] A masterdump context held the database lock too long, + causing various troubles such as dead lock and + recursive lock acquisition. [RT #18311, #18456] + +2413. [bug] Fixed an unreachable code path in socket.c. [RT #18442] + +2412. [bug] win32: address a resourse leak. [RT #18374] + +2411. [bug] Allow using a larger number of sockets than FD_SETSIZE + for select(). To enable this, set ISC_SOCKET_MAXSOCKETS + at compilation time. [RT #18433] + +2410. [bug] Correctly delete m_versionInfo. [RT #18432] + +2408. [bug] A duplicate TCP dispatch event could be sent, which + could then trigger an assertion failure in + resquery_response(). [RT #18275] -2406. [bug] Some operating systems have FD_SETSIZE set to a - low value by default, which can cause resource - exhaustion when many simultaneous connections are - open. Linux in particular makes it difficult to - increase this value. To use more sockets with - select(), set ISC_SOCKET_FDSETSIZE. Example: - STD_CDEFINES="-DISC_SOCKET_FDSETSIZE=4096" ./configure - (This should not be necessary in most cases, and - never for an authoritative-only server.) [RT #18328] +2407. [port] hpux: test for sys/dyntune.h. [RT #18421] 2404. [port] hpux: files unlimited support. @@ -39,15 +183,271 @@ 2392. [bug] remove 'grep -q' from acl test script, some platforms don't support it. [RT #18253] +2391 [port] hpux: cover additional recvmsg() error codes. + [RT #18301] + +2390 [bug] dispatch.c could make a false warning on 'odd socket'. + [RT #18301]. + +2389 [bug] Move the "working directory writable" check to after + the ns_os_changeuser() call. [RT #18326] + +2386. [func] Add warning about too small 'open files' limit. + [RT #18269] + + --- 9.4.3b2 released --- + +2385. [bug] A condition variable in socket.c could leak in + rare error handling [RT #17968]. + +2384. [security] Additional support for query port randomization (change + #2375) including performance improvement and port range + specification. [RT #17949, #18098] + +2383. [bug] named could double queries when they resulted in + SERVFAIL due to overkilling EDNS0 failure detection. + [RT #18182] + +2382. [doc] Add descriptions of IPSECKEY, SPF and SSHFP to ARM. + +2381. [port] dlz/mysql: support multiple install layouts for + mysql. /include/{,mysql/}mysql.h and + /lib/{,mysql/}. [RT #18152] + +2380. [bug] dns_view_find() was not returning NXDOMAIN/NXRRSET + proofs which, in turn, caused validation failures + for insecure zones immediately below a secure zone + the server was authoritative for. [RT #18112] + +2379. [contrib] queryperf/gen-data-queryperf.py: removed redundant + TLDs and supported RRs with TTLs [RT #17972] + +2377. [bug] Address race condition in dnssec-signzone. [RT #18142] + +2376. [bug] Change #2144 was not complete. + +2375. [security] Fully randomize UDP query ports to improve + forgery resilience. [RT #17949] + +2372. [bug] fixed incorrect TAG_HMACSHA256_BITS value [RT #18047] + +2369. [bug] libbind: Array bounds overrun on read in bitncmp(). + [RT #18054] + +2364. [bug] named could trigger a assertion when serving a + malformed signed zone. [RT #17828] + +2363. [port] sunos: pre-set "lt_cv_sys_max_cmd_len=4096;". + [RT #17513] + +2361. [bug] "recursion" statistics counter could be counted + multiple times for a single query. [RT #17990] + + --- 9.4.3b1 released --- + +2358. [doc] Update host's default query description. [RT #17934] + +2356. [bug] Built in mutex profiler was not scalable enough. + [RT #17436] + +2353. [func] libbind: nsid support. [RT #17091] + +2350. [port] win32: IPv6 support. [RT #17797] + +2347. [bug] Delete now traverses the RB tree in the canonical + order. [RT #17451] + +2345. [bug] named-checkconf failed to detect when forwarders + were set at both the options/view level and in + a root zone. [RT #17671] + +2344. [bug] Improve "logging{ file ...; };" documentation. + [RT #17888] + +2343. [bug] (Seemingly) duplicate IPv6 entries could be + created in ADB. [RT #17837] + +2341. [bug] libbind: add missing -I../include for off source + tree builds. [RT #17606] + +2340. [port] openbsd: interface configuration. [RT #17700] + +2339. [port] tru64: support for libbind. [RT #17589] + +2338. [bug] check_ds() could be called with a non DS rdataset. + [RT #17598] + +2337. [bug] BUILD_LDFLAGS was not being correctly set. [RT #17614] + +2335. [port] sunos: libbind and *printf() support for long long. + [RT #17513] + +2334. [bug] Bad REQUIRES in fromstruct_in_naptr(), off by one + bug in fromstruct_txt(). [RT #17609] + +2333. [bug] Fix off by one error in isc_time_nowplusinterval(). + [RT #17608] + +2332. [contrib] query-loc-0.4.0. [RT #17602] + +2331. [bug] Failure to regenerate any signatures was not being + reported nor being past back to the UPDATE client. + [RT #17570] + +2330. [bug] Remove potential race condition when handling + over memory events. [RT #17572] + + WARNING: API CHANGE: over memory callback + function now needs to call isc_mem_waterack(). + See for details. + +2329. [bug] Clearer help text for dig's '-x' and '-i' options. + +2328. [maint] Add AAAA addresses for A.ROOT-SERVERS.NET, + F.ROOT-SERVERS.NET, H.ROOT-SERVERS.NET, + J.ROOT-SERVERS.NET, K.ROOT-SERVERS.NET and + M.ROOT-SERVERS.NET. + +2326. [bug] It was possible to trigger a INSIST in the acache + processing. + +2325. [port] Linux: use capset() function if available. [RT #17557] + +2323. [port] tru64: namespace clash. [RT #17547] + 2322. [port] MacOS: work around the limitation of setrlimit() for RLIMIT_NOFILE. [RT #17526] - --- 9.4.2-P1 released --- +2319. [bug] Silence Coverity warnings in + lib/dns/rdata/in_1/apl_42.c. [RT #17469] + +2318. [port] sunos fixes for libbind. [RT #17514] + +2314. [bug] Uninitialized memory use on error path in + bin/named/lwdnoop.c. [RT #17476] + +2313. [cleanup] Silence Coverity warnings. Handle private stacks. + [RT #17447] [RT #17478] + +2312. [cleanup] Silence Coverity warning in lib/isc/unix/socket.c. + [RT #17458] + +2311. [func] Update ACL regression test. [RT #17462] + +2310. [bug] dig, host, nslookup: flush stdout before emitting + debug/fatal messages. [RT #17501] + +2308. [cleanup] Silence Coverity warning in bin/named/controlconf.c. + [RT #17495] + +2307. [bug] Remove infinite loop from lib/dns/sdb.c. [RT #17496] + +2306. [bug] Remove potential race from lib/dns/resolver.c. + [RT #17470] + +2305. [security] inet_network() buffer overflow. CVE-2008-0122. + +2304. [bug] Check returns from all dns_rdata_tostruct() calls. + [RT #17460] + +2303. [bug] Remove unnecessary code from bin/named/lwdgnba.c. + [RT #17471] + +2302. [bug] Fix memset() calls in lib/tests/t_api.c. [RT #17472] + +2301. [bug] Remove resource leak and fix error messages in + bin/tests/system/lwresd/lwtest.c. [RT #17474] + +2300. [bug] Fixed failure to close open file in + bin/tests/names/t_names.c. [RT #17473] + +2299. [bug] Remove unnecessary NULL check in + bin/nsupdate/nsupdate.c. [RT #17475] + +2298. [bug] isc_mutex_lock() failure not caught in + bin/tests/timers/t_timers.c. [RT #17468] + +2297. [bug] isc_entropy_createfilesource() failure not caught in + bin/tests/dst/t_dst.c. [RT #17467] + +2296. [port] Allow docbook stylesheet location to be specified to + configure. [RT #17457] + +2295. [bug] Silence static overrun error in bin/named/lwaddr.c. + [RT #17459] + +2293. [func] Add ACL regression test. [RT #17375] + +2292. [bug] Log if the working directory is not writable. + [RT #17312] + +2291. [bug] PR_SET_DUMPABLE may be set too late. Also report + failure to set PR_SET_DUMPABLE. [RT #17312] + +2290. [bug] Let AD in the query signal that the client wants AD + set in the response. [RT #17301] + +2288. [port] win32: mark service as running when we have finished + loading. [RT #17441] + +2287. [bug] Use 'volatile' if the compiler supports it. [RT #17413] + +2284. [bug] Memory leak in UPDATE prerequisite processing. + [RT #17377] + +2283. [bug] TSIG keys were not attaching to the memory + context. TSIG keys should use the rings + memory context rather than the clients memory + context. [RT #17377] + +2279. [bug] Use setsockopt(SO_NOSIGPIPE), when available, + to protect applications from receiving spurious + SIGPIPE signals when using the resolver. + +2278. [bug] win32: handle the case where Windows returns no + search list or DNS suffix. [RT #17354] + +2277. [bug] Empty zone names were not correctly being caught at + in the post parse checks. [RT #17357] + +2273. [bug] Adjust log level to WARNING when saving inconsistent + stub/slave master and journal files. [RT# 17279] + +2272. [bug] Handle illegal dnssec-lookaside trust-anchor names. + [RT #17262] + +2270. [bug] dns_db_closeversion() version->writer could be reset + before it is tested. [RT #17290] + +2269. [contrib] dbus memory leaks and missing va_end calls. [RT #17232] + +2268. [bug] 0.IN-ADDR.ARPA was missing from the empty zones + list. + +2266. [bug] client.c:get_clientmctx() returned the same mctx + once the pool of mctx's was filled. [RT #17218] + +2265. [bug] Test that the memory context's basic_table is non NULL + before freeing. [RT #17265] + +2264. [bug] Server prefix length was being ignored. [RT #17308] + +2263. [bug] "named-checkconf -z" failed to set default value + for "check-integrity". [RT #17306] + +2262. [bug] Error status from all but the last view could be + lost. [RT #17292] + +2260. [bug] Reported wrong clients-per-query when increasing the + value. [RT #17236] + +2247. [doc] Sort doc/misc/options. [RT #17067] -2375. [security] Fully randomize UDP query ports to improve - forgery resilience. [RT #17949] +2246. [bug] Make the startup of test servers (ans.pl) more + robust. [RT #17147] --- 9.4.2 released --- + --- 9.4.2rc2 released --- 2259. [bug] Reverse incorrect LIBINTERFACE bump of libisc @@ -63,7 +463,7 @@ 2256. [bug] win32: Correctly register the installation location of bindevt.dll. [RT #17159] -2255. [bug] L.ROOT-SERVERS.NET is now 199.7.83.42. +2255. [maint] L.ROOT-SERVERS.NET is now 199.7.83.42. 2254. [bug] timer.c:dispatch() failed to lock timer->lock when reading timer->idle allowing it to see @@ -76,16 +476,16 @@ reality. Note there is behaviour change for BIND 9.5. [RT #17113] -2249. [bug] Only set Authentic Data bit if client requested +2249. [bug] Only set Authentic Data bit if client requested DNSSEC, per RFC 3655 [RT #17175] -2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] +2248. [cleanup] Fix several errors reported by Coverity. [RT #17160] 2245. [bug] Validating lack of DS records at trust anchors wasn't working. [RT #17151] 2238. [bug] It was possible to trigger a REQUIRE when a - validation was cancelled. [RT #17106] + validation was canceled. [RT #17106] 2237. [bug] libbind: res_init() was not thread aware. [RT #17123] @@ -94,8 +494,8 @@ 2235. [bug] was not being installed. [RT #17135] -2234. [port] Correct some compiler warnings on SCO OSr5 [RT #17134] - +2234. [port] Correct some compiler warnings on SCO OSr5 [RT #17134] + 2232. [bug] dns_adb_findaddrinfo() could fail and return ISC_R_SUCCESS. [RT #17137] @@ -110,7 +510,7 @@ 2227. [cleanup] Tidied up the FAQ. [RT #17121] 2225. [bug] More support for systems with no IPv4 addresses. - [RT #17111] + [RT #17111] 2224. [bug] Defer journal compaction if a xfrin is in progress. [RT #17119] @@ -124,15 +524,15 @@ 2220. [bug] win32: Address a race condition in final shutdown of the Windows socket code. [RT #17028] - -2219. [bug] Apply zone consistancy checks to additions, not + +2219. [bug] Apply zone consistency checks to additions, not removals, when updating. [RT #17049] 2218. [bug] Remove unnecessary REQUIRE from dns_validator_create(). [RT #16976] 2216. [cleanup] Fix a number of errors reported by Coverity. - [RT #17094] + [RT #17094] 2215. [bug] Bad REQUIRE check isc_hmacsha1_verify(). [RT #17094] @@ -175,13 +575,13 @@ localhost;) is used. [RT #16987] - + 2205. [bug] libbind: change #2119 broke thread support. [RT #16982] 2203. [security] Query id generation was cryptographically weak. [RT # 16915] -2202. [security] The default acls for allow-query-cache and +2202. [security] The default acls for allow-query-cache and allow-recursion were not being applied. [RT #16960] 2200. [bug] The search for cached NSEC records was stopping to @@ -216,7 +616,7 @@ 2187. [bug] query_addds(), query_addwildcardproof() and query_addnxrrsetnsec() should take a version - arguement. [RT #16368] + argument. [RT #16368] 2186. [port] cygwin: libbind: check for struct sockaddr_storage independently of IPv6. [RT #16482] @@ -243,7 +643,7 @@ debug level 10+. [RT #16798] 2176. [contrib] dbus update to handle race condition during - initialisation (Bugzilla 235809). [RT #16842] + initialization (Bugzilla 235809). [RT #16842] 2175. [bug] win32: windows broadcast condition variable support was broken. [RT #16592] @@ -274,7 +674,7 @@ a server address as a name to be looked up, causing unexpected output. [RT #16743] -2164. [bug] The code to determine how named-checkzone / +2164. [bug] The code to determine how named-checkzone / named-compilezone was called failed under windows. [RT #16764] @@ -288,7 +688,7 @@ 2159. [bug] Array bounds overrun in acache processing. [RT #16710] -2158. [bug] ns_client_isself() failed to initialise key +2158. [bug] ns_client_isself() failed to initialize key leading to a REQUIRE failure. [RT #16688] 2156. [bug] Fix node reference leaks in lookup.c:lookup_find(), @@ -363,7 +763,7 @@ 2136. [bug] nslookup/host looped if there was no search list and the host didn't exist. [RT #16657] -2135. [bug] Uninitialised rdataset in sdlz.c. [RT# 16656] +2135. [bug] Uninitialized rdataset in sdlz.c. [RT# 16656] 2133. [port] powerpc: Support both IBM and MacOS Power PC assembler syntaxes. [RT #16647] @@ -379,7 +779,7 @@ 2127. [port] Improved OpenSSL 0.9.8 support. [RT #16563] -2126. [security] Serialise validation of type ANY responses. [RT #16555] +2126. [security] Serialize validation of type ANY responses. [RT #16555] 2125. [bug] dns_zone_getzeronosoattl() REQUIRE failure if DLZ was defined. [RT #16574] @@ -419,7 +819,7 @@ 2111. [bug] Fix a number of errors reported by Coverity. [RT #16507] -2110. [bug] "minimal-response yes;" interacted badly with BIND 8 +2110. [bug] "minimal-responses yes;" interacted badly with BIND 8 priming queries. [RT #16491] 2109. [port] libbind: silence aix 5.3 compiler warnings. [RT #16502] @@ -431,7 +831,7 @@ 2103. [port] Add /usr/sfw to list of locations for OpenSSL under Solaris. -2102. [port] Silence solaris 10 warnings. +2102. [port] Silence Solaris 10 warnings. --- 9.4.0b4 released --- @@ -441,7 +841,7 @@ 2100. [port] win32: copy libeay32.dll to Build\Debug. Copy Debug\named-checkzone to Debug\named-compilezone. -2099. [port] win32: more manifiest issues. +2099. [port] win32: more manifest issues. 2098. [bug] Race in rbtdb.c:no_references(), which occasionally triggered an INSIST failure about the node lock @@ -457,14 +857,14 @@ 2095. [port] libbind: alway prototype inet_cidr_ntop_ipv6() and net_cidr_ntop_ipv6(). [RT #16388] - + 2094. [contrib] Update named-bootconf. [RT# 16404] 2093. [bug] named-checkzone -s was broken. 2092. [bug] win32: dig, host, nslookup. Use registry config if resolv.conf does not exist or no nameservers - listed. [RT #15877] + listed. [RT #15877] 2091. [port] dighost.c: race condition on cleanup. [RT #16417] @@ -507,7 +907,7 @@ 2078. [bug] dnssec-checkzone output style "default" was badly named. It is now called "relative". [RT #16326] -2077. [bug] 'dnssec-signzone -O raw' wasn't outputing the +2077. [bug] 'dnssec-signzone -O raw' wasn't outputting the complete signed zone. [RT #16326] 2076. [bug] Several files were missing #include @@ -592,7 +992,7 @@ [RT #16287] 2049. [bug] Restore SOA before AXFR when falling back from - a attempted IXFR when transfering in a zone. + a attempted IXFR when transferring in a zone. Allow a initial SOA query before attempting a AXFR to be requested. [RT #16156] @@ -601,7 +1001,7 @@ the OS always returned the same local port. [RT #16182] -2047. [bug] Failed to initialise the interface flags to zero. +2047. [bug] Failed to initialize the interface flags to zero. [RT #16245] 2046. [bug] rbtdb.c:rdataset_setadditional() could cause duplicate @@ -641,7 +1041,7 @@ 2034. [bug] gcc: set -fno-strict-aliasing. [RT #16124] -2033. [bug] We wern't creating multiple client memory contexts +2033. [bug] We weren't creating multiple client memory contexts on demand as expected. [RT #16095] --- 9.4.0a6 released --- @@ -657,7 +1057,7 @@ 2029. [bug] host printed out the server multiple times when specified on the command line. [RT #15992] -2028. [port] linux: socket.c compatability for old systems. +2028. [port] linux: socket.c compatibility for old systems. [RT #16015] >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 24 11:39:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D554510656A9; Wed, 24 Dec 2008 11:39:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98AF41065693 for ; Wed, 24 Dec 2008 11:39:34 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 881538FC1C for ; Wed, 24 Dec 2008 11:39:34 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBOBdYAK073917 for ; Wed, 24 Dec 2008 11:39:34 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBOBdY3A073915 for perforce@freebsd.org; Wed, 24 Dec 2008 11:39:34 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 24 Dec 2008 11:39:34 GMT Message-Id: <200812241139.mBOBdY3A073915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155238 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, 24 Dec 2008 11:39:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=155238 Change 155238 by pgj@kolbasz on 2008/12/24 11:38:40 Fix another typo Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#11 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#11 (text+ko) ==== @@ -1281,7 +1281,7 @@ vagy ötletünk van. Iratkozzunk fel a követni kívánt - /ághoz tartozó SVN + ághoz tartozó SVN levelezési listára. Például ha a 7-STABLE ág változásait követjük, akkor az &a.svn-src-stable-7.name; From owner-p4-projects@FreeBSD.ORG Wed Dec 24 14:00:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5218A106567C; Wed, 24 Dec 2008 14:00:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15E2A1065678 for ; Wed, 24 Dec 2008 14:00:58 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 04AB28FC1D for ; Wed, 24 Dec 2008 14:00:58 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBOE0vI2004541 for ; Wed, 24 Dec 2008 14:00:57 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBOE0vc5004539 for perforce@freebsd.org; Wed, 24 Dec 2008 14:00:57 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 24 Dec 2008 14:00:57 GMT Message-Id: <200812241400.mBOE0vc5004539@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155240 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, 24 Dec 2008 14:00:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=155240 Change 155240 by ed@ed_dull on 2008/12/24 14:00:22 Tidy up this code a little. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#17 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#17 (text+ko) ==== @@ -674,22 +674,18 @@ if (width <= 0) return; - if (t->t_stateflags & TS_INSERT) { - /* - * Insert mode. Move all existing characters to the - * right. - */ - if (t->t_cursor.tp_col < t->t_winsize.tp_col - width) { - teken_rect_t tr; - teken_pos_t tp; + if (t->t_stateflags & TS_INSERT && + t->t_cursor.tp_col < t->t_winsize.tp_col - width) { + teken_rect_t tr; + teken_pos_t tp; - tr.tr_begin = t->t_cursor; - tr.tr_end.tp_row = t->t_cursor.tp_row + 1; - tr.tr_end.tp_col = t->t_winsize.tp_col - width; - tp.tp_row = t->t_cursor.tp_row; - tp.tp_col = t->t_cursor.tp_col + width; - teken_funcs_copy(t, &tr, &tp); - } + /* Insert mode. Move existing characters to the right. */ + tr.tr_begin = t->t_cursor; + tr.tr_end.tp_row = t->t_cursor.tp_row + 1; + tr.tr_end.tp_col = t->t_winsize.tp_col - width; + tp.tp_row = t->t_cursor.tp_row; + tp.tp_col = t->t_cursor.tp_col + width; + teken_funcs_copy(t, &tr, &tp); } if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1 && From owner-p4-projects@FreeBSD.ORG Wed Dec 24 14:06:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26EE81065676; Wed, 24 Dec 2008 14:06:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6EE110656AB for ; Wed, 24 Dec 2008 14:06:03 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A10B18FC27 for ; Wed, 24 Dec 2008 14:06:03 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBOE630I005953 for ; Wed, 24 Dec 2008 14:06:03 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBOE63hN005951 for perforce@freebsd.org; Wed, 24 Dec 2008 14:06:03 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 24 Dec 2008 14:06:03 GMT Message-Id: <200812241406.mBOE63hN005951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155242 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, 24 Dec 2008 14:06:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=155242 Change 155242 by rene@rene_self on 2008/12/24 14:05:21 Finalize translation. Checked build, language, spelling, whitespace. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#8 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#8 (text+ko) ==== @@ -51,31 +51,31 @@
      Introductie - Eén van de meest frusterende ervaringen die een + Eén van de meest frustrerende ervaringen die een gebruiker van software kan hebben is om een probleemrapport in te - versturen om het vervolgens afgehandeld te zien met een korte en + sturen om het vervolgens afgehandeld te zien met een korte en onbehulpzame uitleg als geen bug of fout PR. Evenzo is één van de meest - frusterende ervaringen als ontwikkelaar van software om overspoeld - te worden met probleemrapporten die niet echt een probleemrapport - zijn maar ondersteuningsverzoeken, of die weinig tot geen - informatie bevatten over wat het probleem is en hoe het te - reproduceren. + frustrerende ervaringen als ontwikkelaar van software om + overspoeld te worden met probleemrapporten die niet echt een + probleemrapport zijn maar ondersteuningsverzoeken, of die weinig + tot geen informatie bevatten over wat het probleem is en hoe het + te reproduceren. Dit document poogt te beschrijven hoe goede probleemrapporten te schrijven. Wat is een goed probleemrapport? Kort door de bocht is een goed probleemrapport een rapport dat geanalyseerd kan - worden en waar snel mee kan wordne omgegaan, voor het wederzijdse - plezier van zowel de gebruiker als de ontwikkelaar. + worden en waar snel mee kan worden omgegaan, voor de wederzijdse + voldoening van zowel de gebruiker als de ontwikkelaar. Hoewel de nadruk van dit artikel ligt op probleemrapporten - voor &os;, zou het meeste ook op andere softwareprojecten van - toepassing moeten zijn. + voor &os;, zou het meeste ook in sterke mate op andere + softwareprojecten van toepassing moeten zijn. Merk op dat dit artikel thematisch in plaats van chronologisch is ingedeeld, dus u dient het hele document te lezen alvorens een - probleemrapport op te sturen, in plaats van het als een - stapsgewijze tutorial te behandelen. + probleemrapport in te sturen, en het niet als een stapsgewijze + tutorial te behandelen.
      @@ -85,12 +85,12 @@ zijn voor een probleemrapport. Natuurlijk is niemand perfect dus zal het soms voorkomen dat u overtuigd bent dat u een bug in een programma heeft gevonden terwijl u in feite de syntaxis voor een - commando verkeerd begrepen of een typfout in een + commando verkeerd begrepen heeft of een typefout in een instellingenbestand gemaakt heeft (hoewel dat soms zelf al op slechte documentatie of slechte foutafhandeling in de applicatie kan wijzen). Er zijn nog steeds veel gevallen waarin het insturen van een probleemrapport duidelijk niet de - juiste handeling is, en het alleen tot frustatie bij uzelf en de + juiste handeling is, en het alleen tot frustratie bij uzelf en de ontwikkelaars leidt. Omgekeerd zijn er gevallen waarin het juist kan zijn om een probleemrapport in te sturen over iets anders dan een bug—bijvoorbeeld voor een verbetering of een @@ -98,7 +98,7 @@ Dus hoe wordt bepaald of iets wel of niet een bug is? Een eenvoudige vuistregel is dat uw probleem geen - bug is als het als een vraag kan worden uitgedrukt (meestal in de + bug is als het als een vraag kan worden uitgedrukt (meestal van de vorm Hoe doe ik X? of Waar kan ik Y vinden?). Het is niet altijd zo zwart-wit, maar de vraagregel gaat in de meeste gevallen op. Overweeg, als u een @@ -122,14 +122,14 @@ gereedschappen van GNU). Voor onbeheerde ports (MAINTAINER bevat - ports@FreeBSD.org kan zo'n updatemelding + ports@FreeBSD.org) kan zo'n updatemelding opgepakt worden door een geïnteresseerde committer, of u kunt gevraagd worden om een patch aan te leveren om de port bij te werken; door dit van te voren aan te bieden verhoogt u in sterke mate de kans dat de port binnen een redelijk tijdsbestek wordt bijgewerkt. - Als de port beheerd wordt, zijn PRs die nieuwe + Als de port beheerd wordt, zijn PR's die nieuwe stroomopwaartse uitgaven aankondigen niet erg nuttig aangezien ze aanvullend werk voor de committers genereren, en waarschijnlijk weet de beheerder al dat er een nieuwe versie @@ -139,29 +139,29 @@ In beide gevallen zal het volgen van het proces zoals beschreven in het Porters - Handboek tot de beste resultaten leiden. (U bent - misschien ook geïnteresseerd in + Porters Handboek tot de beste resultaten leiden. (U + bent misschien ook geïnteresseerd in Bijdragen aan de &os; Portscollectie.) - Een bug die niet reproduceerbaar is kan zelden gemaakt worden. - Als een bug slechts eenmalig voorkwam en u deze niet kunt - reproduceren, en het bijna niemand anders lijkt voor te komen, dan + Een bug die niet reproduceerbaar is kan zelden gerepareerd + worden. Als een bug slechts eenmalig voorkwam en u deze niet kunt + reproduceren, en het bij niemand anders lijkt voor te komen, dan bestaat de kans dat geen van de ontwikkelaars het kan reproduceren of kan uitzoeken wat er mis is. Dit betekent niet dat het niet - gebeurde, maar wel dat de kansen dat uw probleemrapport ooit tot - een reparatie leidt erg klein zijn. Om het allemaal erger te - maken, worden dit soort bugs vaak veroorzaakt door falende harde - schijven of oververhitte processoren — u dient altijd te - proberen om deze problemen, indien mogelijk, uit te sluiten - voordat u een PR instuurt. + gebeurde, maar wel dat de kans dat uw probleemrapport ooit tot een + reparatie leidt erg klein is. Om het allemaal erger te maken, + worden dit soort bugs vaak veroorzaakt door falende harde schijven + of oververhitte processoren — u dient altijd te proberen om + deze oorzaken, indien mogelijk, uit te sluiten voordat u een PR + instuurt. - Vervolgens, voordat u besluit aan wie u uw probleemrapport - dient te sturen, moet u weten dat de software waaruit &os; bestaat - uit verschillende elementen is opgebouwd: + Vervolgens, om te besluiten aan wie u uw probleemrapport dient + te sturen, moet u weten dat de software waaruit &os; bestaat uit + verschillende elementen is opgebouwd: @@ -177,15 +177,15 @@ Code in het basissysteem die geschreven is en onderhouden - wordt door anderen, en geïmporteerd is in &os; en is + wordt door anderen, en in &os; is geïmporteerd en aangepast. Voorbeelden zijn bind, &man.gcc.1;, en &man.sendmail.8;. De meeste bugs in deze gebieden dienen aan de &os;-ontwikkelaars gerapporteerd te worden; maar in sommige gevallen kan het zijn dat ze aan de originele auteurs gerapporteerd moeten worden als de problemen - niet specifiek voor &os; zijn. Gewoonlijk vallen deze bugs - ofwel in de categorie bin ofwel in de - categorie gnu. + niet specifiek voor &os; zijn. Gewoonlijk vallen deze bugs in + ofwel de categorie bin ofwel de categorie + gnu. @@ -196,12 +196,12 @@ wat &os; biedt is slechts een raamwerk om de applicatie te installeren. Daarom dient u alleen een probleem aan de &os;-ontwikkelaars te rapporteren als u gelooft dat het - probleem &os;-specifiek is; anders dient u het aan de auteurs - van de software te rapporteren. + probleem specifiek voor &os; is; anders dient u het aan de + auteurs van de software te rapporteren. - Daarna dient u vast te stellen of het probleem tijdig is. Er + Daarna dient u vast te stellen of het probleem actueel is. Er zijn maar weinig dingen die een ontwikkelaar meer irriteren dan het ontvangen van een probleemrapport over een bug die reeds gerepareerd is. @@ -209,21 +209,21 @@ Als het probleem in het basissysteem zit, dient u eerst het FAQ-gedeelte over - &os;-versies te lezen, als u niet reeds bekend bent met - het onderwerp. Het is niet mogelijk voor &os;om problemen in iets - anders dan bepaalde recente takken van het basissysteem op te - lossen, dus leidt het insturen van een bugrapport over een oudere + &os;-versies te lezen als u niet reeds bekend bent met + het onderwerp. Het is niet mogelijk voor &os; om problemen in + iets anders dan bepaalde recente takken van het basissysteem op te + lossen, dus leidt het insturen van een bug-rapport over een oudere versie waarschijnlijk alleen tot het advies van een ontwikkelaar - die u adviseert om naar een ondersteunde versie bij te werken om - te kijken of het probleem nog steeds voorkomt. Het Security - Officer Team onderhoudt de lijst - van ondersteunde versies. + om naar een ondersteunde versie bij te werken om te kijken of het + probleem nog steeds voorkomt. Het Security Officer Team + onderhoudt de lijst van + ondersteunde versies. Als het probleem in een port zit, moet u uw Portscollectie eerst naar de laatste versie bijwerken en kijken of het probleem nog steeds van toepassing is. Wegens de hoge snelheid waarmee - deze applicaties veranderen, is het onhaalbaar voor &os; om andere - dan de allernieuwste versies te ondersteunen, en problemen met + deze applicaties veranderen, is het onhaalbaar voor &os; om iets + anders dan de allernieuwste versies te ondersteunen, problemen met oudere versies van applicaties kunnen simpelweg niet worden opgelost.
      @@ -232,13 +232,12 @@ Voorbereidingen Een goede regel is om altijd een vooronderzoek te doen voordat - er een probleemrapport wordt ingestuurd. Misschien is uw probleem - reeds gerapporteerd; misshien wordt het besproken op de - mailinglijsten, of gebeurde dat recentelijk; misschien is het al - gerepareerd in een nieuwere versie dan die u draait. Om deze - redenen dient u alle voor de hand liggende plaatsen te controleren - voordat u uw probleemrapport instuurt. Voor &os; betekent - dit: + u een probleemrapport ingestuurd. Misschien is uw probleem reeds + gerapporteerd; misschien wordt het besproken op de mailinglijsten, + of gebeurde dat recentelijk; misschien is het al gerepareerd in + een nieuwere versie dan die u draait. Om deze redenen dient u + alle voor de hand liggende plaatsen te controleren voordat u uw + probleemrapport instuurt. Voor &os; betekent dit:       @@ -250,15 +249,16 @@ hardware, gebruikersapplicaties, en - kernelconfiguratie. + + kernelconfiguratie. De mailinglijsten - —als u niet geabonneerd bent, gebruik dan - + mailinglijsten—als u niet geabonneerd bent, + gebruik dan de doorzoekbare archieven op de &os;-website. Als uw probleem niet op de lijsten bediscussieerd is, kunt u @@ -269,8 +269,8 @@ Optioneel, het gehele web—gebruik uw favoriete - zoekmachine om enige referenties naar uw probleem te vinden. U - kunt zelfs hits krijgen van gearchiveerde mailinglijsten of + zoekmachine om referenties naar uw probleem te vinden. U kunt + zelfs hits krijgen van gearchiveerde mailinglijsten of nieuwsgroepen die u niet kende of waarvan u er niet aan had gedacht om die te doorzoeken. @@ -294,7 +294,7 @@ url="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/UPDATING"> te bestuderen. (Dit is essentiële informatie als u van de ene naar een andere versie bijwerkt—in het bijzonder - als u naar de &os.current;-tak bijwerkt.) + als u naar de tak &os.current; bijwerkt.) Als het probleem echter zit in iets wat als deel van de &os; Portscollectie was geïnstalleerd, dan dient u @@ -306,7 +306,6 @@ en zijn ook beschikbaar via CVSweb. - @@ -317,7 +316,7 @@ Nu u besloten heeft dat uw probleem een probleemrapport verdiend, en het een probleem met &os; is, is het tijd om het eigenlijke probleemrapport te schrijven. Voordat het mechanisme - van het programma dat gebruikt wordt om PRs aan te maken en in te + van het programma dat gebruikt wordt om PR's aan te maken en in te sturen wordt behandeld, zijn hier wat tips en trucs die ervoor zorgen dat uw PR het meest effectief is. @@ -328,28 +327,28 @@ Laat de regel Synopsis niet - leeg. De PRs gaan zowel naar een mailinglijst + leeg. De PR's gaan zowel naar een mailinglijst die over de gehele wereld wordt verspreid (waar de Synopsis wordt gebruikt voor de Onderwerp:-regel), als in een database. - Iedereen die later de database op onderwerp doorzoekt, en + Iedereen die later de database op samenvatting doorzoekt, en een PR met een lege onderwerpsregel aantreft, zal het - waarschijnlijk gewoon overslaan. Onthoud dat PRs in deze + waarschijnlijk gewoon overslaan. Onthoud dat PR's in deze database blijven staan totdat iemand ze sluit; een anoniem PR zal slechts in de massa opgaan. Voorkom het gebruik van een zwakke - Synopsis-regel. U mag niet - aannemen dat iemand die uw PR leest enige context van uw - inzending heeft, dus hoe meer u biedt, des te beter. Op - welk deel van het systeem heeft het probleem betrekking? + Synopsis-regel. U mag niet + aannemen dat iemand die uw PR leest enige achtergrondkennis + van uw inzending heeft, dus des meer u biedt, des te beter. + Op welk deel van het systeem heeft het probleem betrekking? Ziet u het probleem alleen tijdens het installeren, of tijdens het draaien? Ter illustratie, in plaats van - Synopsis: portupgrade is kapot, zie + Synopsis: portupgrade is broken, zie hoeveel informatiever dit lijkt: Synopsis: port - pors-mgmt/portupgrade dumpt core op -current. + pors-mgmt/portupgrade coredumps on -current. (In het geval van ports is het bijzonder behulpzaam om zowel de categorie als de portnaam in de Synopsis-regel te vermelden.) @@ -362,13 +361,13 @@ bijsluit, plaats dan de tekst [patch] (inclusief de haken) aan het begin van de Synopsis. (Alhoewel het niet verplicht is om - die exacte tekst te gebruiken, is dat per conventie diegene + die exacte tekst te gebruiken, is dat per conventie degene die gebruikt wordt.) Als u een onderhouder bent, zeg dat - dan. Als u een deel van de broncode onderhoudt + dan. Als u een deel van de broncode onderhoudt (bijvoorbeeld een port), kunt u overwegen om de tekst [maintainer update] (inclusief de haken) aan het begin van de onderwerpsregel te plaatsen, en dient u @@ -379,7 +378,7 @@ - Ben specifiek. Des te meer + Ben specifiek. Des te meer informatie u aanlevert over wat voor probleem u heeft, des te groter is de kans dat u een antwoord krijgt. @@ -387,11 +386,11 @@ Vermeld de versie van &os; die u draait (hier is een plaats voor, zie hieronder) en op welke architectuur dat - is. U dient aan te geven of u van een uitgave draait - (bijvoorbeeld een CD-ROM of een download), of van een + is. U dient aan te geven of u een uitgave draait + (bijvoorbeeld een CD-ROM of een download), of een systeem dat met &man.cvsup.1; wordt onderhouden (en - zoja, hoe recentelijk u heeft bijgewerkt). Als u de - &os.current;-tak volgt, is dat het allereerste wat + zoja, hoe recentelijk u dat heeft bijgewerkt). Als u de + tak &os.current; volgt, is dat het allereerste wat iemand zal vragen, omdat reparaties (in het bijzonder voor opvallende problemen) de neiging hebben om snel gecommit te worden, en gebruikers van &os.current; @@ -403,25 +402,26 @@ make.conf heeft gespecificeerd. Noot: het specificeren van -O2 en hoger aan &man.gcc.1; staat in veel situaties als - buggevoelig bekend. Hoewel de &os;-ontwikkelaar patches - zullen accepteren, zijn ze over het algemeen niet bereid - om zulke gevallen te onderzoeken vanwege een simpel - gebrek aan tijd en vrijwilligers, en zullen ze in plaats - hiervan antwoorden met dat dit gewoon niet ondersteund - is. + bug-gevoelig bekend. Hoewel de &os;-ontwikkelaars + patches zullen accepteren, zijn ze over het algemeen + niet bereid om zulke gevallen te onderzoeken vanwege een + simpel gebrek aan tijd en vrijwilligers, en zullen ze in + plaats hiervan antwoorden met dat dit gewoon niet + ondersteund is. Als het een probleem met de kernel betreft, reken er dan op om de volgende informatie aan te leveren. (U hoeft deze niet standaard bij te sluiten, wat alleen de - database opvult, maar u dient uitreksels bij te sluiten + database opvult, maar u dient uittreksel bij te sluiten die u relevant acht): uw kernelconfiguratie (inclusief welke - hardware-apparaten u heeft geïnstalleerd) + hardware-apparaten u heeft + geïnstalleerd) of u wel of niet debug-opties aan heeft staan @@ -455,7 +455,7 @@ Als het een probleem met de ports betreft, reken er dan op om de volgende informatie aan te leveren. (U hoeft deze niet standaard bij te sluiten, wat alleen de - database opvult, maar u dient uitreksels bij te sluiten + database opvult, maar u dient uittreksels bij te sluiten die u relevant acht): @@ -482,7 +482,7 @@ Voorkom vage verzoeken voor - mogelijkheden. PR's van de vorm iemand + mogelijkheden. PR's van de vorm iemand moet echt iets dat zus-en-zo doet implementeren leveren minder waarschijnlijk resultaat op dan zeer specifieke verzoeken. Onthoud dat de broncode voor iedereen @@ -496,7 +496,7 @@ Verzeker u ervan dat niemand anders reeds een - soortgelijk PR heeft ingestuurd. Alhoewel dit al + soortgelijk PR heeft ingestuurd. Alhoewel dit al hierboven genoemd is, is het het herhalen hier waard. Het duurt slechts een minuut of twee om de webgebaseerde zoekmachine op Voorkom controversiële - verzoeken. Als uw PR een gebied behandelt dat in + verzoeken. Als uw PR een gebied behandelt dat in het verleden controversieel was, dient u waarschijnlijk - bereid te zijn om niet alleen patches aan te leveren, maar - ook een verklaring waarom de patches Het Juiste Ding - Om Te Doen zijn. Zoals hierboven vermeld, is het - zorgvuldig doorzoeken van de mailinglijsten door gebruik te - maken van de archieven op Het Juiste Ding Om Te + Doen zijn aan te leveren. Zoals hierboven + vermeld, is het zorgvuldig doorzoeken van de mailinglijsten + door gebruik te maken van de archieven op altijd een goede voorbereiding. - Ben beleefd. Bijna iedereen die - aan uw PR zal werken is een vrijwilliger. Niemand houdt - ervan om te horen dat ze iets moeten doen wat ze al aan het - doen zijn voor een andere motivatie dan geld. Dit is iets - goeds om altijd in de gaten te houden bij Open Source + Ben beleefd. Bijna iedereen die aan + uw PR zal werken is een vrijwilliger. Niemand houdt ervan + om te horen dat ze iets moeten doen wat ze al aan het doen + zijn voor een andere motivatie dan geld. Dit is iets goeds + om altijd in de gaten te houden bij Open Source projecten. @@ -539,20 +539,20 @@ U dient er ook zeker van te zijn dat het afleveren van mail goed werkt. &man.send-pr.1; gebruikt mailberichten voor het - insturen en volgen van probleemrapporten. ALs u geen + insturen en volgen van probleemrapporten. Als u geen mailberichten kunt posten op de machine waarop u &man.send-pr.1; draait, zal uw probleemrapport de GNATS-database niet bereiken. Zie voor details over het opzetten van mail op &os; het - hoofdstuk Electronische post van het &os; + hoofdstuk Elektronische post van het &os; Handboek op . Verzeker u ervan dat uw mailprogramma het bericht onderweg - naar GNATS niet vermangelt. In het bijzonder, als uw mailer - automatisch regels afbreekt, tabs in spaties verandert, of - nieuwe-regel-tekens ontvlucht, zal elke patch die u instuurt - onbruikbaar worden. Voor de tekstgedeelten vragen wij u echer - om handmatig regels rond de 70 tekens af te breken, zodat de + naar GNATS niet vermangelt. In het bijzonder zal elke patch die + u instuurt onbruikbaar worden, als uw mailer automatisch regels + afbreekt, tabs in spaties verandert, of nieuwe-regel-tekens + escapet. Voor de tekstgedeelten vragen wij u echter om + handmatig regels rond de 70 tekens af te breken, zodat de webversie van het PR leesbaar is. Dezelfde soort overwegingen gelden als u het -&prompt.user; send-pr -a /var/run/dmesg -a /tmp/errors +&prompt.user; send-pr -a /var/run/dmesg -a /tmp/fouten Maakt u zich geen zorgen over binaire bestanden, deze worden - automatisch gecodeerd zodat ze de mailagent niet + automatisch gecodeerd zodat ze de mail-agent niet verontrusten. Als u een patch bijvoegt, gebruik dan de optie - of met &man.diff.1; om + of van &man.diff.1; om een context- of verenigde diff (verenigd is geprefereerd) aan te - maken, en zorg ervoor dat u de exactie revisienummers uit CVS - specificeert vna de bestanden die u heeft gewijzigd zodat de + maken, en zorg ervoor dat u de exacte revisienummers uit CVS + specificeert van de bestanden die u heeft gewijzigd zodat de ontwikkelaars die uw rapport lezen ze gemakkelijk kunnen toepassen. Voor problemen met de kernel of de basisgereedschappen is een patch tegen &os.current; (de CVS-tak HEAD) geprefereerd aangezien alle nieuwe code eerst daar - toegepast en getest dient te worden. Nadat het juist of - substantiële is getest, wordt de code samengevoegd of - gemigreerd naar de tak &os.stable;. + toegepast en getest dient te worden. Nadat het voldoende of + substantieel is getest, wordt de code samengevoegd of gemigreerd + naar de tak &os.stable;. Als u een patch inline in plaats van als bijlage bijvoegt, merk dan op dat het meest voorkomende probleem de neiging is van - sommige emailprogramma's om tabs als spaties weer te geven, wat + sommige email-programma's om tabs als spaties weer te geven, wat alles dat bedoeld was als deel van een Makefile volledig ruineert. @@ -620,41 +620,41 @@ patches en in het bijzonder nieuwe code waarvoor substantiële review nodig kan zijn voordat het gecommit wordt op een web- of FTP-server geplaatst dient te worden, en de - URL in plaats van de patch dient bij het PR gevoegd te worden. + URL in plaats van de patch bij het PR gevoegd dient te worden. Patches in email hebben de neiging om gemangeld te worden, in - het bijzonder wanneer GNATS er betrokken in is, en hoe groter - de patch, des te moeilijker het is voor geïnteresseerde + het bijzonder wanneer GNATS erbij betrokken is, en hoe groter de + patch, des te moeilijker het is voor geïnteresseerde partijen om het te ontrafelen. Ook stelt het posten van een - patch op het web u in staat om het te wijzigen zonder dat nodig - is om de gehele patch opnieuw in te zenden als een opvolgbericht - op het originele PR. Ten slotte vergroten grote patches - simpelweg de omvang van de database, aangezien gesloten PR's - niet worden verwijderd maar in plaats daarvan worden bewaard en - simpelweg als closed worden + patch op het web u in staat om het te wijzigen zonder dat het + nodig is om de gehele patch opnieuw in te zenden als een + vervolgbericht op het originele PR. Ten slotte vergroten grote + patches simpelweg de omvang van de database, aangezien gesloten + PR's niet worden verwijderd maar in plaats daarvan worden + bewaard en simpelweg als closed worden gemarkeerd. - U dient ook te weten dat tenzij u het expliciet vermeld in - uw PR of in de patch zelf, dat van alle patches die u instuurt + U dient ook te weten dat tenzij u het expliciet in uw PR of + in de patch zelf vermeld, dat van alle patches die u instuurt wordt aangenomen dat ze onder dezelfde licentietermen vallen als - het origninele bestand dat u heeft gewijzigd. + het originele bestand dat u heeft gewijzigd.
      Het sjabloon invullen De volgende sectie heeft alleen betrekking op de - emailmethode: + email-methode: Wanneer u &man.send-pr.1; draait, wordt er een sjabloon aan u gepresenteerd. Het sjabloon bestaat uit een lijst met velden, waarvan sommige al zijn ingevuld, en waarvan bij anderen staat uitgelegd wat de bedoeling is of wat acceptabele waarden zijn. - Maakt u zich geeen zorgen over het commentaar, deze worden - automatisch verwijderds wanneer u ze niet wijzigt of ze zelf + Maakt u zich geen zorgen over het commentaar, deze worden + automatisch verwijderd wanneer u ze niet wijzigt of ze zelf verwijdert. Bovenaan het sjabloon, onder de regels met - SEND-PR:, staan de emailkoppen. U hoeft + SEND-PR:, staan de email-koppen. U hoeft deze normaalgesproken niet te wijzigen, tenzij u het probleemrapport vanaf een machine of account verstuurt die wel mail kan versturen maar niet kan ontvangen; in dat geval wilt u @@ -665,7 +665,7 @@ emailadressen aan de kop Cc: toe te voegen. - In het emailsjabloon vindt u de volgende twee velden van + In het email-sjabloon vindt u de volgende twee velden van één regel: @@ -679,14 +679,14 @@ Confidential: Dit is vooraf ingevuld met no. Het heeft geen zin om dit te veranderen aangezien er geen vertrouwelijk &os; - probleemrapport bestaat— de PR-database wordt + probleemrapport bestaat—de PR-database wordt wereldwijd gedistribueerd door CVSup. De volgende sectie beschrijft velden die zowel in de - emailinterface als in de webinterface voorkomen: @@ -695,34 +695,35 @@ Originator: Specificeer hier alstublieft uw echte naam, eventueel gevolgd door uw emailadres in punthaken. In de - emailinterface wordt dit normaalgesproken vooraf ingevuld + email-interface wordt dit normaalgesproken vooraf ingevuld met het gecos-veld van de huidige aangemelde gebruiker. Het emailadres dat u gebruikt wordt publieke informatie en kan in de handen van spammers vallen. U - dient ofwel maatregelen te treffen om spam af te handelen, - of een tijdelijk emailaccount te gebruiken. Merk op dat - als u een in het geheel ongeldig emailaccount gebruikt, - wij u geen vragen over uw PR kunnen stellen. + dient òfwel maatregelen te treffen om spam af te + handelen, òf een tijdelijk emailaccount te + gebruiken. Merk op dat als u een in het geheel ongeldig + emailaccount gebruikt, wij u geen vragen over uw PR kunnen + stellen. - Organization: Alles waarvan u + Organization: Alles waarvan u vrolijk wordt. Dit veld wordt niet voor iets significants gebruikt. - Synopsis: Vul hier een korte en + Synopsis: Vul hier een korte en accurate beschrijving van het probleem in. De samenvatting wordt gebruikt als het onderwerp van de email van het probleemrapport, en wordt gebruikt in lijsten en samenvattingen van probleemrapporten; probleemrapporten met - een vage samenvatting hebben de neiging om genegeerd te + een obscure samenvatting hebben de neiging om genegeerd te worden. Zoals hierboven vermeld, als uw probleemrapport een @@ -735,7 +736,7 @@ - Severity: Eén van + Severity: Eén van non-critical, serious of critical. Overdrijf niet, bestempel uw @@ -748,21 +749,22 @@ apparaatstuurprogramma's of systeemgereedschappen). &os;-ontwikkelaars zullen niet noodzakelijk sneller aan uw probleem werken als u de belangrijkheid ervan opblaast - aangezien er vele anderen zijn die hetzelfde gedaan hebben - — in feite schenken sommige ontwikkelaars weinig - aandacht aan dit veld vanwege deze redenen. + aangezien er vele anderen zijn die precies hetzelfde + gedaan hebben — in feite schenken sommige + ontwikkelaars weinig aandacht aan dit veld vanwege deze + redenen. Grote beveiligingsproblemen dienen niet naar GNATS gestuurd te worden, omdat alle GNATS-informatie publieke kennis is. Stuur - zulke problemen alstublieft als privé-mail naar + zulke problemen alstublieft per privé-mail naar &a.security-officer;. - Priority: Eén van + Priority: Eén van low, medium of high. high dient te worden gereserveerd voor problemen die bijna iedere @@ -776,7 +778,7 @@ - Category: Kies een geschikte + Category: Kies een geschikte categorie. Het eerste wat u moet doen is beslissen in welk gebied @@ -797,8 +799,8 @@ Als er een probleem met de kernel, de bibliotheken (zoals de standaard C-bibliotheek - libc), of met een hulpstuurprogramma - is, gebruikt u in het algemeen de categorie + libc), of een hulpstuurprogramma is, + gebruikt u in het algemeen de categorie kern. (Er zijn enkele uitzonderingen die hieronder vermeld staan). In het algemeen zijn dat dingen die in sectie 2, 3, of 4 van de @@ -806,19 +808,19 @@ - Als er een probleem is met een binair programma - zoals &man.sh.1; of &man.mount.8;, dient u eerst te - bepalen of deze programma's deel zijn van het - basissysteem of dat ze via de Portscollectie zijn - toegevoegd. Als u het niet zeker weet, kunt u - whereis programmanaam + Als er een probleem met een binair programma zoals + &man.sh.1; of &man.mount.8; is, dient u eerst te bepalen + of deze programma's deel zijn van het basissysteem of + dat ze via de Portscollectie zijn toegevoegd. Als u het + niet zeker weet, kunt u whereis + programmanaam uitvoeren. De conventie van &os; voor de Portscollectie is om alles onder /usr/local te installeren, alhoewel dit door een systeembeheerder veranderd kan worden. Voor dezen gebruikt u de categorie ports (zelfs als de - categorie van de port www is, zie + categorie van de port www is; zie hieronder). Als de locatie /bin, /usr/bin, @@ -836,7 +838,7 @@ Als u denkt dat de fout in de opstartscripts (rc) zit, of in een ander type - niet-uitvoerbaar configuratiebestand, dan is de juiste + onuitvoerbaar configuratiebestand, dan is de juiste categorie conf (configuratie). Deze dingen worden in sectie 5 van de handleidingpagina's beschreven. @@ -943,7 +945,7 @@ - Als u echt niet weet waar het problem zich bevindt + Als u echt niet weet waar het probleem zich bevindt (of als de uitleg niet bij een van de bovenstaanden lijkt te passen), gebruik dan de categorie misc. Voordat u dit doet, kunt u @@ -1016,7 +1018,7 @@ kern: problemen met de kernel, - (niet-platformspecifieke) apparaatstuurprogramma's, of + (platforminspecifieke) apparaatstuurprogramma's, of de basisbibliotheken. @@ -1104,12 +1106,12 @@ Release: De versie van &os; die u draait. Dit wordt automatisch ingevuld als u &man.send-pr.1; gebruikt en hoeft alleen veranderd te worden - als u een probleemrapport verstuurt van een ander systeem + als u een probleemrapport verstuurt vanaf een ander systeem dan van hetgene waarop het probleem zich voordoet. - Tenslote zijn er een aantal meerregelige velden: + Ten slotte zijn er een aantal meerregelige velden: @@ -1119,7 +1121,7 @@ besturingssysteem, de versie van het specifieke programma of bestand dat het probleem bevat, en alle andere relevante zaken zoals systeemconfiguratie, andere geïnstalleerde - software dat het probleem beïnvloed, enzovoorts— + software dat het probleem beïnvloedt, enzovoorts— eigenlijk alles wat een ontwikkelaar moet weten om de omgeving te reconstrueren waarin het probleem optreedt. @@ -1128,15 +1130,15 @@ Description: Een complete en nauwkeurige beschrijving van het probleem dat u ondervindt. - Probeer te speculaties over de oorzaken van het probleem te - vermijden tenzij u zeker dat u op het juiste spoor zit, - aangezien het een ontwikkelaar kan misleiden om onjuiste - aannames over het probleem te maken. + Probeer speculaties over de oorzaken van het probleem te + vermijden tenzij u zeker weet dat u op het juiste spoor zit, + aangezien een ontwikkelaar hierdoor onjuiste aannames over + het probleem kan maken. How-To-Repeat: Een samenvatting van - de acties die voor u nodig waren om het probleem te + de acties die nodig waren om het probleem te reproduceren. @@ -1160,12 +1162,12 @@ Als u klaar bent met het invullen van het sjabloon, het heeft opgeslagen, en uw tekstverwerker verlaten heeft, zal &man.send-pr.1; u de prompt s)end, e)dit or - a)bort? geven. U kunt dan s + a)bort? tonen. U kunt dan s aanslaan om het probleemrapport in te sturen, e aanslaan om de tekstverwerker te herstarten en verdere wijzigingen te maken, of a aanslaan om te stoppen. Als u het - laatste keist, blijft uw probleemrapport bewaard op schijf + laatste kiest, blijft uw probleemrapport bewaard op schijf (&man.send-pr.1; vertelt u de bestandsnaam voordat het eindigt), zodat u het rustig kunt bewerken, of het misschien over kunt plaatsen naar een systeem met een betere netverbinding, voordat @@ -1175,7 +1177,7 @@ &prompt.user; send-pr -f ~/mijn-probleemrapport Dit leest het gespecificeerde bestand, controleert de - geldigheid van de inhoud, verwijderd commentaar en verstuurt + geldigheid van de inhoud, verwijdert commentaar en verstuurt het. Als u het Merk op dat u ten zeerste wordt aangeraden om uw werk ergens op te slaan voordat u - op submit drukt. Een veelvoorkomed probleem + op submit drukt. Een veelvoorkomend probleem voor gebruikers is dat hun webbrowser een verouderde afbeelding uit de cache laat zien. Als u dit overkomt, wordt uw inzending geweigerd en kan u uw werk verliezen. Als u om een bepaalde reden geen afbeeldingen kunt bekijken, - en u ook &man.send-pr.1; niet kan gebruiken, accepteer dan + en u ook &man.send-pr.1; niet kunt gebruiken, accepteer dan alstublieft onze verontschuldigingen voor het ongemak en email uw probleemrapport naar het bugbuster-team op freebsd-bugbusters@FreeBSD.org. @@ -1208,7 +1210,7 @@
      Vervolg - Als uw probleemprapport eenmaal is ingestuurd, ontvangt u een + Als uw probleemrapport eenmaal is ingestuurd, ontvangt u een bevestiging per email waarin het volgnummer dat aan uw probleemrapport was toegewezen en een URL dat u kunt gebruiken om de status te controleren zijn opgenomen. Met een beetje geluk zal @@ -1221,8 +1223,8 @@ Als iemand aanvullende informatie van u vraagt, of als u zich iets herinnert of iets ontdekt dat u niet in het initiële - rapport noemde, gebruik dan alstublieft een van de twee methoden - om uw vervolg in te sturen: + rapport noemde, gebruik dan alstublieft één van de + twee methoden om uw vervolg in te sturen: @@ -1231,31 +1233,31 @@ bereiken vanuit de PR-zoekpagina. Het klikken op deze koppeling brengt - een emailvenster naar voren met daarin de juiste regels voor + een email-venster naar voren met daarin de juiste regels voor Aan: en Onderwerp: ingevuld (als uw browser is ingesteld om dit te doen). Als alternatief kunt u het naar &a.bugfollowup; mailen, - waar het volgnummer in het onderwerp is opgenomen zodat het + waarbij het volgnummer in het onderwerp is opgenomen zodat het foutenvolgsysteem weet aan welk probleemrapport het het moet koppelen. - Als u niet het volgnummer opgeeft, + Als u het volgnummer niet opgeeft, raakt GNATS in de war en maakt het een geheel nieuw PR aan - welke het dan aan de GNATS-beheerder toekent, en vervolgens - raakt uw PR kwijt totdat iemand de rommel opruimt, wat dagen - of weken later kan zijn. + welke het vervolgens aan de GNATS-beheerder toekent, en + vervolgens raakt uw PR kwijt totdat iemand de rommel + opruimt, wat dagen of weken later kan zijn. Verkeerde manier: - Onderwerp: dat PR dat ik stuurde + Onderwerp: that PR I sent Juiste manier: - Onderwerp: Re: ports/12345: compilatieprobleem met foo/bar + Onderwerp: Re: ports/12345: compilation problem with foo/bar @@ -1270,48 +1272,48 @@ Als u problemen heeft De meeste PR's gaan door het systeem en worden snel - geaccepteerd, soms loopt GNATS echter achter en kan het zijn dat u - uw emailbevestiging pas na 10 minuten of zelfs later ontvangt. + geaccepteerd; soms loopt GNATS echter achter en kan het zijn dat u + uw email-bevestiging pas na 10 minuten of zelfs later ontvangt. Wees alstublieft geduldig. Tevens geldt, omdat GNATS alle invoer via email ontvangt, dat het absoluut noodzakelijk is dat &os; alle inzendingen door - spamfilters haalt. Als u binnen een uur of twee geen antwoord - krijgt, kan uw PR misschien zijn opeslokt; als dit zo is, neem dan - alstublieft contact op met de GNATS-beheerders op + spam-filters haalt. Als u binnen een uur of twee geen antwoord + krijgt, kan uw PR misschien zijn opgeslokt; als dit zo is, neem + dan alstublieft contact op met de GNATS-beheerders op bugmeister@FreeBSD.org en vraag om hulp. Een veelvoorkomende anti-spam-maatregel is het vergelijken met vele vormen van misbruik die in HTML-gebaseerde email - voorkomt (alhoewel niet slechts het opnemen van HTML in een PR). - We raden het gebruik van HTML-gebaseerde email voor het - versturen van PR's sterk af: niet alleen is het waarschijnlijker - dat het niet door de filters komt, het heeft ook de neiging om - de database te verstoppen. Oude platte email wordt sterk - geprefereerd. + voorkomen (alhoewel niet noodzakelijk het slechts opnemen van + HTML in een PR). We raden het gebruik van HTML-gebaseerde email + voor het versturen van PR's sterk af: niet alleen is het + waarschijnlijker dat het niet door de filters komt, het heeft + ook de neiging om de database te verstoppen. Oude platte email + wordt sterk geprefereerd. In zeldzame gevallen zult een bug in GNATS tegenkomen waarbij - een PR geaccepteerd is een een volgnummer toegewezen heeft - gekregen maar waar het niet op de lijst van PR's van een van de + een PR geaccepteerd is en een volgnummer toegewezen heeft gekregen + maar waarbij het niet op de lijst van PR's van een van de opvraag-webpagina's staat. Het kan zijn gebeurd dat de index van - database niet meer met de databsae zelf is gesynchroniseerd. De - manier waarop u dit kunt testen is door de bekijk een enkel - PR webpagina op te roepen en te kijken of de PR wordt - vermeld. Als dat zo is, stel dan alstublieft de GNATS-beheerders - op bugmeister@FreeBSD.org op de hoogte. Merk op - dat er een cron-taak is die de database - periodiek herbouwt, dus u hoeft geen actie te ondernemen tenzij u - haast heeft. + PR op te roepen en te kijken of het PR wordt vermeld. + Als dat zo is, stel dan alstublieft de GNATS-beheerders op + bugmeister@FreeBSD.org op de hoogte. Merk op dat + er een cron-taak is die de database periodiek + herbouwt, dus u hoeft geen actie te ondernemen tenzij u haast + heeft.
      Verdere literatuur Er is een lijst met bronnen die relevant is voor het juist - scrhijven en verwerken van probleemrapporten. Het is in geen + schrijven en verwerken van probleemrapporten. Het is in geen geval compleet. @@ -1319,7 +1321,7 @@ How to Report Bugs Effectively—een uitstekend - essay door Simon G. Tatham over het samenstellen van >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 24 20:00:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 111671065673; Wed, 24 Dec 2008 20:00:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C88AA1065677 for ; Wed, 24 Dec 2008 20:00:17 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B3D528FC0C for ; Wed, 24 Dec 2008 20:00:17 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBOK0HEI069874 for ; Wed, 24 Dec 2008 20:00:17 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBOK0HdS069858 for perforce@freebsd.org; Wed, 24 Dec 2008 20:00:17 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 24 Dec 2008 20:00:17 GMT Message-Id: <200812242000.mBOK0HdS069858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 155250 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, 24 Dec 2008 20:00:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=155250 Change 155250 by pgj@kolbasz on 2008/12/24 19:59:17 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-users/article.sgml#11 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#35 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/book.sgml#10 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#8 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#10 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#6 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/stylesheets/chapter.sgml#6 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/Makefile#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#24 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#10 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/chapters.ent#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#12 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#11 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#15 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#11 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#5 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#19 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#17 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#15 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml#11 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#14 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#12 integrate .. //depot/projects/docproj_hu/doc/share/sgml/catalog#2 integrate .. //depot/projects/docproj_hu/doc/share/sgml/default.dsl#2 integrate .. //depot/projects/docproj_hu/doc/share/sgml/freebsd-common.dsl#1 branch .. //depot/projects/docproj_hu/doc/share/sgml/freebsd-html.dsl#1 branch .. //depot/projects/docproj_hu/doc/share/sgml/freebsd-print.dsl#1 branch .. //depot/projects/docproj_hu/doc/share/sgml/freebsd.dsl#3 integrate .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#13 integrate .. //depot/projects/docproj_hu/www/hu/platforms/sparc.sgml#11 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-users/article.sgml#11 (text+ko) ==== @@ -1,4 +1,4 @@ - + ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ + ]> - + - + ==== //depot/projects/docproj_hu/doc/share/sgml/freebsd.dsl#3 (text+ko) ==== @@ -1,13 +1,8 @@ - + - - - - - %freebsd.l10n; @@ -16,1099 +11,27 @@ + ]]> + +]]> -]]> + ]> - + (declare-flow-object-class formatting-instruction "UNREGISTERED::James Clark//Flow Object Class::formatting-instruction") - - - - - (define %hyphenation% #f) - - (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") - ("CONTENT" "text/html; charset=&doc.html.charset;")))) - - (define %gentext-nav-use-tables% - ;; Use tables to build the navigation headers and footers? - #t) - - (define %html-ext% - ;; Default extension for HTML output files - ".html") - - (define %shade-verbatim% - ;; Should verbatim environments be shaded? - #f) - - (define %use-id-as-filename% - ;; Use ID attributes as name for component HTML files? - #t) - - (define %root-filename% - ;; Name for the root HTML document - "index") - - (define html-manifest - ;; Write a manifest? - #f) - - (define %generate-legalnotice-link% - ;; Should legal notices be a link to a separate file? - ;; - ;; Naturally, this has no effect if you're building one big - ;; HTML file. - #f) - - (define %generate-docformat-navi-link% - ;; Create docformat navi link for HTML output? - #f) - -;; Taken from Norm's stylesheets; modified to add support for TITLE so -;; that we get a mouse over definition for acronyms in HTML output. - - (define ($acronym-seq$ #!optional (sosofo (process-children))) - ;; FIXME: html4 only - (let ((title (attribute-string (normalize "role") (current-node)))) - (if title - (make element gi: "ACRONYM" - attributes: (list - (list "TITLE" title) - (list "CLASS" (gi))) - sosofo) - (make element gi: "ACRONYM" - attributes: (list - (list "CLASS" (gi))) - sosofo)))) - - (define (book-titlepage-recto-elements) - (list (normalize "title") - (normalize "subtitle") - (normalize "graphic") - (normalize "mediaobject") - (normalize "corpauthor") - (normalize "authorgroup") - (normalize "author") - (normalize "editor") - (normalize "copyright") - (normalize "abstract") - (normalize "legalnotice") - (normalize "isbn"))) - - ;; Create a simple navigation link - ;; if %generate-docformat-navi-link% defined. - (define (make-docformat-navi tlist) - (let ((rootgi (gi (sgml-root-element)))) - (make element gi: "DIV" - attributes: '(("CLASS" "DOCFORAMTNAVI")) - (literal "[ ") - (make-docformat-navi-link rootgi tlist) - (literal " ]")))) - - (define (make-docformat-navi-link rootgi tlist) - (make sequence - (cond - ((null? tlist) (empty-sosofo)) - ((null? (car tlist)) (empty-sosofo)) - ((not (symbol? (car tlist))) (empty-sosofo)) - ((equal? (car tlist) 'html-split) - (make sequence - (create-link (list (list "href" "./index.html")) - (literal "&docnavi.split-html;")) - (if (not (null? (cdr tlist))) - (make sequence - (literal " / ") - (make-docformat-navi-link rootgi (cdr tlist))) - (empty-sosofo)))) - ((equal? (car tlist) 'html-single) - (make sequence - (create-link (list (list "href" - (string-append "./" (case-fold-down rootgi) ".html"))) - (literal "&docnavi.single-html;")) - (if (not (null? (cdr tlist))) - (make sequence - (literal " / ") - (make-docformat-navi-link rootgi (cdr tlist))) - (empty-sosofo)))) - (else (empty-sosofo))))) - - (define (article-titlepage-separator side) - (make sequence - (if %generate-docformat-navi-link% - (make-docformat-navi '(html-split html-single)) - (empty-sosofo)) - (make empty-element gi: "HR"))) - - (define (book-titlepage-separator side) - (if (equal? side 'recto) - (make sequence - (if %generate-docformat-navi-link% - (make-docformat-navi '(html-split html-single)) - (empty-sosofo)) - (make empty-element gi: "HR")) - (empty-sosofo))) - - - (define ($email-footer$) - (empty-sosofo)) - - (define html-index-filename - (if nochunks - "html.index" - "html-split.index")) - - (define %stylesheet% - "docbook.css") - - - (define ($html-body-end$) - (if (equal? $email-footer$ (normalize "")) - (empty-sosofo) - (make sequence - (if nochunks - (make empty-element gi: "hr") - (empty-sosofo)) - ($email-footer$)))) - - (define %refentry-xref-link% - ;; REFENTRY refentry-xref-link - ;; PURP Generate URL links when cross-referencing RefEntrys? - ;; DESC - ;; If true, a web link will be generated, presumably - ;; to an online man->HTML gateway. The text of the link is - ;; generated by the $create-refentry-xref-link$ function. - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - #f) - - - (define ($create-refentry-xref-link$ #!optional (n (current-node))) - (let* ((r (select-elements (children n) (normalize "refentrytitle"))) - (m (select-elements (children n) (normalize "manvolnum"))) - (v (attribute-string (normalize "vendor") n)) - (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - (data r) "&" "amp;" "sektion=" (data m)))) - (case v - (("current") (string-append u "&" "amp;" "manpath=FreeBSD+8-current")) - (("xfree86") (string-append u "&" "amp;" "manpath=XFree86+4.5.0")) - (("xorg") (string-append u "&" "amp;" "manpath=X11R7.2")) - (("netbsd") (string-append u "&" "amp;" "manpath=NetBSD+3.0")) - (("openbsd") (string-append u "&" "amp;" "manpath=OpenBSD+4.1")) - (("ports") (string-append u "&" "amp;" "manpath=FreeBSD+7.0-RELEASE+and+Ports")) - (else u)))) - - (element application ($bold-seq$)) - - (element citerefentry - (let ((href ($create-refentry-xref-link$))) - (if %refentry-xref-link% - (create-link (list (list "HREF" href)) - (if %refentry-xref-italic% - ($italic-seq$) - ($charseq$))) - (if %refentry-xref-italic% - ($italic-seq$) - ($charseq$))))) - - (element filename - (let* ((class (attribute-string (normalize "role")))) - (cond - ((equal? class "package") - (let* ((urlurl "http://www.FreeBSD.org/cgi/url.cgi") - (href (string-append urlurl "?ports/" - (data (current-node)) - "/pkg-descr"))) - (create-link (list (list "HREF" href)) ($mono-seq$)))) - (else ($mono-seq$))))) - - ;; Do not render email with mailto: when nolink role attribute - ;; is used or when the email address matches - ;; @example.{com|net|org} - (element email - (let* ((class (attribute-string (normalize "role")))) - (cond - ((or (equal? class "nolink") - (and (> (string-length (data (current-node))) - 11) - (string=? - (substring (data (current-node)) - (- (string-length (data (current-node))) 11) - (- (string-length (data (current-node))) 4)) - "example"))) - ($code-seq$ - (make sequence - (literal "<") - (process-children) - (literal ">")))) - (else - (next-match))))) - - ;; Ensure that we start with no preferred mediaobject notations, - ;; so that in the text-only case we don't choose any of the - ;; possible images, and fallback to the most appropriate - ;; textobject - (define preferred-mediaobject-notations - '()) - - - (element quote - (make sequence - (literal "“") - (process-children) - (literal "”"))) - - ;; The special FreeBSD version of the trademark tag handling. - ;; This function was more or less taken from the DocBook DSSSL - ;; stylesheets by Norman Walsh. - (element trademark - (if (show-tm-symbol? (current-node)) - (make sequence - ($charseq$) - (cond - ((equal? (attribute-string "class") (normalize "copyright")) - (make entity-ref name: "copy")) - ((equal? (attribute-string "class") (normalize "registered")) - (make entity-ref name: "reg")) - ((equal? (attribute-string "class") (normalize "service")) - (make element gi: "SUP" - (literal "SM"))) - (else - (make entity-ref name: "#8482")))) - ($charseq$))) - - ;; multiple copyright holders should be separated. - (element (copyright holder) - (make sequence - ($charseq$) - (if (not (last-sibling? (current-node))) - (literal ", ") - (empty-sosofo)))) - ]]> - - - - - - - - - - - >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 25 04:52:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C96E1065674; Thu, 25 Dec 2008 04:52:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2A221065670 for ; Thu, 25 Dec 2008 04:52:24 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E05B78FC1A for ; Thu, 25 Dec 2008 04:52:24 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBP4qOEW055870 for ; Thu, 25 Dec 2008 04:52:24 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBP4qOUI055868 for perforce@freebsd.org; Thu, 25 Dec 2008 04:52:24 GMT (envelope-from gabor@freebsd.org) Date: Thu, 25 Dec 2008 04:52:24 GMT Message-Id: <200812250452.mBP4qOUI055868@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155260 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: Thu, 25 Dec 2008 04:52:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=155260 Change 155260 by gabor@gabor_server on 2008/12/25 04:51:32 - Fix file handling bugs Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#34 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#77 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#34 (text+ko) ==== @@ -118,7 +118,7 @@ grep_fgetln(struct file *f, size_t *len) { int i = 0; - char ch; + int ch = 0; /* Fill in the buffer if it is empty. */ if (binbufptr == NULL) { @@ -149,11 +149,16 @@ lnbuflen *= 2; lnbuf = grep_realloc(lnbuf, ++lnbuflen); } - if (ch == '\n') + if (ch == '\n') { + lnbuf[i] = '\0'; + break; + } + if (ch != EOF) + lnbuf[i] = ch; + else break; - lnbuf[i] = ch; } - if (grep_feof(f) && (i == 0)) + if (grep_feof(f) && (i == 0) && (ch != '\n')) return (NULL); *len = i; return (lnbuf); @@ -228,4 +233,8 @@ break; } free(f); + + /* Reset read buffer for the file we are closing */ + binbufptr = NULL; + } ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#77 (text+ko) ==== @@ -114,8 +114,6 @@ } else ok = 1; if (ok) - /* Reset read buffer before reading other file */ - binbufptr = NULL; c += procfile(p->fts_path); break; } From owner-p4-projects@FreeBSD.ORG Thu Dec 25 04:54:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F8BB1065677; Thu, 25 Dec 2008 04:54:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63FB61065673 for ; Thu, 25 Dec 2008 04:54:27 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 51F3D8FC17 for ; Thu, 25 Dec 2008 04:54:27 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBP4sR89056007 for ; Thu, 25 Dec 2008 04:54:27 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBP4sQ6J056005 for perforce@freebsd.org; Thu, 25 Dec 2008 04:54:26 GMT (envelope-from gabor@freebsd.org) Date: Thu, 25 Dec 2008 04:54:26 GMT Message-Id: <200812250454.mBP4sQ6J056005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155261 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: Thu, 25 Dec 2008 04:54:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=155261 Change 155261 by gabor@gabor_server on 2008/12/25 04:54:25 - Some simplifications Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#35 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#35 (text+ko) ==== @@ -124,13 +124,8 @@ if (binbufptr == NULL) { /* Only pre-read to the buffer if we need the binary check. */ if (binbehave != BINFILE_TEXT) { - for (; i < sizeof(binbuf) && !grep_feof(f); i++) { - ch = grep_fgetc(f); - if (ch != EOF) - binbuf[i] = ch; - else - break; - } + for (; i < sizeof(binbuf) && !grep_feof(f); i++) + binbuf[i] = grep_fgetc(f); f->binary = memchr(binbuf, (filebehave != FILE_GZIP) ? '\0' : '\200', i - 1) != 0; } binbufsiz = i; @@ -149,14 +144,11 @@ lnbuflen *= 2; lnbuf = grep_realloc(lnbuf, ++lnbuflen); } - if (ch == '\n') { + if ((ch == '\n') || (ch == EOF)) { lnbuf[i] = '\0'; break; - } - if (ch != EOF) + } else lnbuf[i] = ch; - else - break; } if (grep_feof(f) && (i == 0) && (ch != '\n')) return (NULL); From owner-p4-projects@FreeBSD.ORG Thu Dec 25 10:28:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B20B81065674; Thu, 25 Dec 2008 10:28:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 768C31065673 for ; Thu, 25 Dec 2008 10:28:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 672788FC17 for ; Thu, 25 Dec 2008 10:28:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBPASLfa097440 for ; Thu, 25 Dec 2008 10:28:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBPASLee097438 for perforce@freebsd.org; Thu, 25 Dec 2008 10:28:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 25 Dec 2008 10:28:21 GMT Message-Id: <200812251028.mBPASLee097438@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 155270 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: Thu, 25 Dec 2008 10:28:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=155270 Change 155270 by hselasky@hselasky_laptop001 on 2008/12/25 10:27:42 Improve readability of "libusb20_desc_foreach()". Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#5 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#5 (text+ko) ==== @@ -238,23 +238,37 @@ libusb20_desc_foreach(const struct libusb20_me_struct *pdesc, const uint8_t *psubdesc) { - const void *end; + const uint8_t *start; + const uint8_t *end; + const uint8_t *desc_next; - if (pdesc == NULL) { + /* be NULL safe */ + if (pdesc == NULL) return (NULL); - } - end = LIBUSB20_ADD_BYTES(pdesc->ptr, pdesc->len); + + start = (const uint8_t *)pdesc->ptr; + end = LIBUSB20_ADD_BYTES(start, pdesc->len); + + /* get start of next descriptor */ + if (psubdesc == NULL) + psubdesc = start; + else + psubdesc = psubdesc + psubdesc[0]; + + /* check that the next USB descriptor is within the range */ + if ((psubdesc < start) || (psubdesc >= end)) + return (NULL); /* out of range, or EOD */ + + /* check start of the second next USB descriptor, if any */ + desc_next = psubdesc + psubdesc[0]; + if ((desc_next < start) || (desc_next > end)) + return (NULL); /* out of range */ + + /* check minimum descriptor length */ + if (psubdesc[0] < 3) + return (NULL); /* too short descriptor */ - if (psubdesc == NULL) { - psubdesc = LIBUSB20_ADD_BYTES(pdesc->ptr, 0); - } else { - psubdesc = LIBUSB20_ADD_BYTES(psubdesc, psubdesc[0]); - } - return (((((const void *)psubdesc) >= ((void *)(pdesc->ptr))) && - (((const void *)psubdesc) < end) && - (LIBUSB20_ADD_BYTES(psubdesc, psubdesc[0]) >= ((void *)(pdesc->ptr))) && - (LIBUSB20_ADD_BYTES(psubdesc, psubdesc[0]) <= end) && - (psubdesc[0] >= 3)) ? psubdesc : NULL); + return (psubdesc); /* return start of next descriptor */ } /*------------------------------------------------------------------------* From owner-p4-projects@FreeBSD.ORG Thu Dec 25 10:41:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF1501065674; Thu, 25 Dec 2008 10:41:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 835461065670 for ; Thu, 25 Dec 2008 10:41:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5AC8D8FC19 for ; Thu, 25 Dec 2008 10:41:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBPAfYGC098576 for ; Thu, 25 Dec 2008 10:41:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBPAfYw2098574 for perforce@freebsd.org; Thu, 25 Dec 2008 10:41:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 25 Dec 2008 10:41:34 GMT Message-Id: <200812251041.mBPAfYw2098574@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 155272 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: Thu, 25 Dec 2008 10:41:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=155272 Change 155272 by hselasky@hselasky_laptop001 on 2008/12/25 10:40:56 Re-add removed include. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#14 (text+ko) ==== @@ -74,6 +74,7 @@ #include #include #include +#include #define USB_DEBUG_VAR uchcom_debug From owner-p4-projects@FreeBSD.ORG Thu Dec 25 11:54:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 350591065678; Thu, 25 Dec 2008 11:54:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECBBD1065674 for ; Thu, 25 Dec 2008 11:54:52 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DBAF18FC2B for ; Thu, 25 Dec 2008 11:54:52 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBPBsqn8005050 for ; Thu, 25 Dec 2008 11:54:52 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBPBsquw005048 for perforce@freebsd.org; Thu, 25 Dec 2008 11:54:52 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 25 Dec 2008 11:54:52 GMT Message-Id: <200812251154.mBPBsquw005048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155274 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: Thu, 25 Dec 2008 11:54:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=155274 Change 155274 by rene@rene_self on 2008/12/25 11:54:03 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/linux-users/article.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#12 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#7 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/Makefile#3 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/problem-reports/article.sgml#9 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#24 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#10 integrate .. //depot/projects/docproj_nl/share/sgml/catalog#2 integrate .. //depot/projects/docproj_nl/share/sgml/default.dsl#2 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd-common.dsl#1 branch .. //depot/projects/docproj_nl/share/sgml/freebsd-html.dsl#1 branch .. //depot/projects/docproj_nl/share/sgml/freebsd-print.dsl#1 branch .. //depot/projects/docproj_nl/share/sgml/freebsd.dsl#3 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#11 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/linux-users/article.sgml#3 (text+ko) ==== @@ -19,7 +19,7 @@ The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.6 2008/05/26 16:44:05 gabor Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.7 2008/12/24 10:43:29 pgj Exp $ &tm-attrib.freebsd; @@ -410,8 +410,8 @@ CVS (Concurrent Versioning System) servers. Once the local source code is up to date you can build new versions of the kernel and userland. For more information on source updates see - chapter 23 - of the &os; Handbook. + the chapter on updating + in the &os; Handbook. Binary updates are similar to using yum or apt-get to update a &linux; system. The command ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#12 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1103 2008/12/07 20:44:01 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1104 2008/12/24 10:32:40 pgj Exp $ 1995 @@ -354,12 +354,12 @@ &os.current; + url="&url.books.handbook;/current-stable.html#CURRENT">&os.current; is the development version of the operating system, which will in due course become the new &os.stable; branch. As such, it is really only of interest to developers working on the system and die-hard hobbyists. See the relevant section + url="&url.books.handbook;/current-stable.html#CURRENT">relevant section in the Handbook for details on running -CURRENT. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -229,7 +229,7 @@ are either accepted, open an editor, or freebsd-update will abort. When in doubt, backup /etc and just - accept the merges. See for more + accept the merges. See for more information about the mergemaster command. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2381,12 +2381,19 @@ dump and restore. They operate on the drive as a collection of disk blocks, below the abstractions of files, links and directories that are created by - the file systems. dump backs up an entire + the file systems. Unlike other backup software, + dump backs up an entire file system on a device. It is unable to backup only part of a file system or a directory tree that spans more than one - file system. dump does not write files and + file system. The dump command does not write files and directories to tape, but rather writes the raw data blocks that - comprise files and directories. + comprise files and directories. When being used to extract + data, restore stores temporary files + in /tmp/ by default — if you are + operating from a recovery disk with a small + /tmp directory, you may need to set the + TMPDIR environment variable to a directory + with more free space for the restore to be successful. If you use dump on your root directory, you would not back up /home, ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2124,11 +2124,6 @@ IPFW - - This section is work in progress. The contents might - not be accurate at all times. - - The IPFIREWALL (IPFW) is a &os; sponsored firewall software application authored and maintained by &os; volunteer staff members. It uses the legacy stateless rules and a legacy rule @@ -2136,7 +2131,8 @@ Stateful logic. The IPFW sample rule set (found in - /etc/rc.firewall) in the standard &os; + /etc/rc.firewall and + /etc/rc.firewall6) in the standard &os; install is rather simple and it is not expected that it used directly without modifications. The example does not use stateful filtering, which is beneficial in most setups, so it @@ -2159,7 +2155,8 @@ rule which triggers the NAT facility, and the advanced special purpose facilities, the dummynet traffic shaper facilities, the 'fwd rule' forward facility, the bridge - facility, and the ipstealth facility. + facility, and the ipstealth facility. IPFW supports both IPv4 + and IPv6. Enabling IPFW @@ -2256,15 +2253,6 @@ firewall by default, which is a good idea when you are first setting up your firewall. - options IPV6FIREWALL -options IPV6FIREWALL_VERBOSE -options IPV6FIREWALL_VERBOSE_LIMIT -options IPV6FIREWALL_DEFAULT_TO_ACCEPT - - These options are exactly the same as the IPv4 options but - they are for IPv6. If you do not use IPv6 you might want to - use IPV6FIREWALL without any rules to block all IPv6 - kernel options ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4301,14 +4301,14 @@ When sysinstall is used - in an xterm, the yellow font is difficult to read + in an X11 terminal, the yellow font is difficult to read against the light gray background. Is there a way to provide higher contrast for this application? If you already have X11 installed and the default colors chosen by sysinstall - make text illegible while using xterm or rxvt, add the + make text illegible while using &man.xterm.1; or &man.rxvt.1;, add the following to your ~/.Xdefaults to get a darker background gray: XTerm*color7: #c0c0c0 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -71,6 +71,12 @@ time server, with the NTP protocol. + + How to configure the standard logging daemon, + syslogd, to accept logs from remote + hosts. + + Before reading this chapter, you should: @@ -4948,6 +4954,280 @@ + + + + + Tom + Rhodes + Contributed by + + + + + Remote Host Logging with <command>syslogd</command> + + Interacting with system logs is a crucial aspect of both + security and system administration. Monitoring the log files of + multiple hosts can get very unwieldy when these hosts are + distributed across medium or large networks, or when they are + parts of various different types of networks. In these cases, + configuring remote logging may make the whole process a lot more + comfortable. + + Centralized logging to a specific logging host can reduce + some of the administrative burden of log file administration. Log + file aggregation, merging and rotation can be configured in one + location, using the native tools of &os;, such as &man.syslogd.8; + and &man.newsyslog.8;. In the + following example configuration, host A, named + logserv.example.com, will collect + logging information for the local network. + Host B, named + logclient.example.com will pass + logging information to the server system. In live + configurations, both hosts require proper forward and reverse + DNS or entries in + /etc/hosts. Otherwise, data will be + rejected by the server. + + + Log Server Configuration + + Log servers are machines configured to accept logging + information from remote hosts. In most cases this is to ease + configuration, in other cases it may just be a better + administration move. Regardless of reason, there are a few + requirements before continuing. + + A properly configured logging server has met the following + minimal requirements: + + + + The firewall ruleset allows for UDP + to be passed on port 514 on both the client and + server; + + + + syslogd has been configured to accept remote messages + from client machines; + + + + The syslogd server and all client machines must have + valid entries for both forward and reverse + DNS, or be properly configured in + /etc/hosts. + + + + To configure the log server, the client must be listed + in /etc/syslog.conf, and the logging + facility must be specified: + + +logclient.example.com +*.* /var/log/logclient.log + + + More information on various supported and available + facilities may be found in the + &man.syslog.conf.5; manual page. + + + Once added, all facility messages will + be logged to the file specified previously, + /var/log/logclient.log. + + Finally, the log file should be created. The method used + does not matter, but &man.touch.1; works great for situations + such as this: + + &prompt.root; touch /var/log/logclient.log + + At this point, the syslogd daemon should + be restarted and verified: + + &prompt.root; /etc/rc.d/syslogd restart +&prompt.root; pgrep syslog + + If a PID is returned, the server has been + restarted successfully, and client configuration may begin. If + the server has not restarted, consult the + /var/log/messages log for any + output. + + + + Log Client Configuration + + A logging client is a machine which sends log information + to a logging server in addition to keeping local copies. + + Similar to log servers, clients must also meet a few minimum + requirements. + + + + &man.syslogd.8; must be configured to send messages of + specific types to a log server, which must accept + them; + + + + The firewall must allow UDP packets + through on port 512; + + + + Both forward and reverse DNS must + be configured or have proper entries in the + /etc/hosts. + + + + Client configuration is a bit more relaxed when compared + to that of the servers. The client machine must also have the + following listing placed inside + /etc/rc.conf: + + syslogd_enable="YES" +syslogd_flags="-a logclient.example.com -vv" + + The first option will enable the syslogd + daemon on boot up, and the second line allows data from the + client to be accepted on this server. The latter part, using + , will increase the verbosity of logged + messages. This is extremely useful for tweaking facilities as + administrators are able to see what type of messages are being + logged under which facility. + + Facilities describe the system part for which a message + is generated. For an example, ftp and + ipfw are both facilities. When log messages + are generated for those two services, they will normally include + those two utilities in any log messages. Facilities are + accompanied with a priority or level, which is used to mark how + important a log message is. The most common will be the + warning and info. Please + refer to the &man.syslog.3; manual page for a full list of + available facilities and priorities. + + The logging server must be defined in the client's + /etc/syslog.conf. In this instance, + the @ symbol is used to send logging + data to a remote server and would look similar to the + following entry: + + *.* @logserv.example.com + + Once added, syslogd must be restarted + for the changes to take effect: + + &prompt.root; /etc/rc.d/syslogd restart + + To test that log messages are being sent across the network, + use &man.logger.1; to send a message to + syslogd: + + &prompt.root; logger "Test message from logclient" + + This message should now exist in + /var/log/messages on both the client + and the server. + + + + Debugging Log Servers + + In certain cases, debugging may be required if messages are + not being received on the log server. There are several reasons + this may occur; however, the most common two are network + connection issues and DNS issues. To test + these cases, ensure both hosts are able to reach other + using the hostname specified in + /etc/rc.conf. If this appears to be + working properly, an alternation to the + syslogd_flags option in + /etc/rc.conf will be required. + + In the following example, + /var/log/logclient.log is empty, and the + /var/log/messages files indicate no reason + for the failure. To increase debugging output, change the + syslogd_flags option to look like the + following example, and issue a restart: + + syslogd_flags="-d -a logclien.example.com -vv" + + &prompt.root; /etc/rc.d/syslogd restart + + Debugging data similar to the following will flash on the + screen immediately after the restart: + + logmsg: pri 56, flags 4, from logserv.example.com, msg syslogd: restart +syslogd: restarted +logmsg: pri 6, flags 4, from logserv.example.com, msg syslogd: kernel boot file is /boot/kernel/kernel +Logging to FILE /var/log/messages +syslogd: kernel boot file is /boot/kernel/kernel +cvthname(192.168.1.10) +validate: dgram from IP 192.168.1.10, port 514, name logclient.example.com; +rejected in rule 0 due to name mismatch. + + It appears obvious the messages are being rejected due + to a name mismatch. After reviewing the configuration bit + by bit, it appears a typo in the following + /etc/rc.conf line has an issue: + + syslogd_flags="-d -a logclien.example.com -vv" + + The line should contain logclient, not + logclien. After the proper alterations + are made, a restart is issued with expected results: + + &prompt.root; /etc/rc.d/syslogd restart +logmsg: pri 56, flags 4, from logserv.example.com, msg syslogd: restart +syslogd: restarted +logmsg: pri 6, flags 4, from logserv.example.com, msg syslogd: kernel boot file is /boot/kernel/kernel +syslogd: kernel boot file is /boot/kernel/kernel +logmsg: pri 166, flags 17, from logserv.example.com, +msg Dec 10 20:55:02 <syslog.err> logserv.example.com syslogd: exiting on signal 2 +cvthname(192.168.1.10) +validate: dgram from IP 192.168.1.10, port 514, name logclient.example.com; +accepted in rule 0. +logmsg: pri 15, flags 0, from logclient.example.com, msg Dec 11 02:01:28 trhodes: Test message 2 +Logging to FILE /var/log/logclient.log +Logging to FILE /var/log/messages + + At this point, the messages are being properly received + and placed in the correct file. + + + + Security Considerations + + As with any network service, security requirements should + be considered before implementing this configuration. At times, + log files may contain sensitive data about services enabled on + the local host, user accounts, and configuration data. Network + data sent from the client to the server will not be encrypted + nor password protected. If a need for encryption exists, it + might be possible to use + security/stunnel, which + will transmit data over an encrypted tunnel. + + Local security is also an issue. Log files are not + encrypted during use or after log rotation. Local users may + access these files to gain additional insight on system + configuration. In those cases, setting proper permissions + on these files will be critical. The &man.newsyslog.8; + utility supports setting permissions on newly created and + rotated log files. Setting log files to mode + 600 should prevent any unwanted snooping + by local users. + + + ]> - + - + ==== //depot/projects/docproj_nl/share/sgml/freebsd.dsl#3 (text+ko) ==== @@ -1,13 +1,8 @@ - + - - - - - %freebsd.l10n; @@ -16,1099 +11,27 @@ + ]]> + +]]> -]]> + ]> - + (declare-flow-object-class formatting-instruction "UNREGISTERED::James Clark//Flow Object Class::formatting-instruction") - - - - - (define %hyphenation% #f) - - (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") - ("CONTENT" "text/html; charset=&doc.html.charset;")))) - - (define %gentext-nav-use-tables% - ;; Use tables to build the navigation headers and footers? - #t) - - (define %html-ext% - ;; Default extension for HTML output files - ".html") - - (define %shade-verbatim% - ;; Should verbatim environments be shaded? - #f) - - (define %use-id-as-filename% - ;; Use ID attributes as name for component HTML files? - #t) - - (define %root-filename% - ;; Name for the root HTML document - "index") - - (define html-manifest - ;; Write a manifest? - #f) - - (define %generate-legalnotice-link% - ;; Should legal notices be a link to a separate file? - ;; - ;; Naturally, this has no effect if you're building one big - ;; HTML file. - #f) - - (define %generate-docformat-navi-link% - ;; Create docformat navi link for HTML output? - #f) - -;; Taken from Norm's stylesheets; modified to add support for TITLE so -;; that we get a mouse over definition for acronyms in HTML output. - - (define ($acronym-seq$ #!optional (sosofo (process-children))) - ;; FIXME: html4 only - (let ((title (attribute-string (normalize "role") (current-node)))) - (if title - (make element gi: "ACRONYM" - attributes: (list - (list "TITLE" title) - (list "CLASS" (gi))) - sosofo) - (make element gi: "ACRONYM" - attributes: (list - (list "CLASS" (gi))) - sosofo)))) - - (define (book-titlepage-recto-elements) - (list (normalize "title") - (normalize "subtitle") - (normalize "graphic") - (normalize "mediaobject") - (normalize "corpauthor") - (normalize "authorgroup") - (normalize "author") - (normalize "editor") - (normalize "copyright") - (normalize "abstract") - (normalize "legalnotice") - (normalize "isbn"))) - - ;; Create a simple navigation link - ;; if %generate-docformat-navi-link% defined. - (define (make-docformat-navi tlist) - (let ((rootgi (gi (sgml-root-element)))) - (make element gi: "DIV" - attributes: '(("CLASS" "DOCFORAMTNAVI")) - (literal "[ ") - (make-docformat-navi-link rootgi tlist) - (literal " ]")))) - - (define (make-docformat-navi-link rootgi tlist) - (make sequence - (cond - ((null? tlist) (empty-sosofo)) - ((null? (car tlist)) (empty-sosofo)) - ((not (symbol? (car tlist))) (empty-sosofo)) - ((equal? (car tlist) 'html-split) - (make sequence - (create-link (list (list "href" "./index.html")) - (literal "&docnavi.split-html;")) - (if (not (null? (cdr tlist))) - (make sequence - (literal " / ") - (make-docformat-navi-link rootgi (cdr tlist))) - (empty-sosofo)))) - ((equal? (car tlist) 'html-single) - (make sequence - (create-link (list (list "href" - (string-append "./" (case-fold-down rootgi) ".html"))) - (literal "&docnavi.single-html;")) - (if (not (null? (cdr tlist))) - (make sequence - (literal " / ") - (make-docformat-navi-link rootgi (cdr tlist))) - (empty-sosofo)))) - (else (empty-sosofo))))) - - (define (article-titlepage-separator side) - (make sequence - (if %generate-docformat-navi-link% - (make-docformat-navi '(html-split html-single)) - (empty-sosofo)) - (make empty-element gi: "HR"))) - - (define (book-titlepage-separator side) - (if (equal? side 'recto) - (make sequence - (if %generate-docformat-navi-link% - (make-docformat-navi '(html-split html-single)) - (empty-sosofo)) - (make empty-element gi: "HR")) - (empty-sosofo))) - - - (define ($email-footer$) - (empty-sosofo)) - - (define html-index-filename - (if nochunks - "html.index" - "html-split.index")) - - (define %stylesheet% - "docbook.css") - - - (define ($html-body-end$) - (if (equal? $email-footer$ (normalize "")) - (empty-sosofo) - (make sequence - (if nochunks - (make empty-element gi: "hr") - (empty-sosofo)) - ($email-footer$)))) - - (define %refentry-xref-link% - ;; REFENTRY refentry-xref-link - ;; PURP Generate URL links when cross-referencing RefEntrys? - ;; DESC - ;; If true, a web link will be generated, presumably - ;; to an online man->HTML gateway. The text of the link is - ;; generated by the $create-refentry-xref-link$ function. - ;; /DESC - ;; AUTHOR N/A - ;; /REFENTRY - #f) - - - (define ($create-refentry-xref-link$ #!optional (n (current-node))) - (let* ((r (select-elements (children n) (normalize "refentrytitle"))) - (m (select-elements (children n) (normalize "manvolnum"))) - (v (attribute-string (normalize "vendor") n)) - (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - (data r) "&" "amp;" "sektion=" (data m)))) - (case v - (("current") (string-append u "&" "amp;" "manpath=FreeBSD+8-current")) - (("xfree86") (string-append u "&" "amp;" "manpath=XFree86+4.5.0")) - (("xorg") (string-append u "&" "amp;" "manpath=X11R7.2")) - (("netbsd") (string-append u "&" "amp;" "manpath=NetBSD+3.0")) - (("openbsd") (string-append u "&" "amp;" "manpath=OpenBSD+4.1")) - (("ports") (string-append u "&" "amp;" "manpath=FreeBSD+7.0-RELEASE+and+Ports")) - (else u)))) - - (element application ($bold-seq$)) - - (element citerefentry - (let ((href ($create-refentry-xref-link$))) - (if %refentry-xref-link% - (create-link (list (list "HREF" href)) - (if %refentry-xref-italic% - ($italic-seq$) - ($charseq$))) - (if %refentry-xref-italic% - ($italic-seq$) - ($charseq$))))) - - (element filename - (let* ((class (attribute-string (normalize "role")))) - (cond - ((equal? class "package") - (let* ((urlurl "http://www.FreeBSD.org/cgi/url.cgi") - (href (string-append urlurl "?ports/" - (data (current-node)) - "/pkg-descr"))) - (create-link (list (list "HREF" href)) ($mono-seq$)))) - (else ($mono-seq$))))) - - ;; Do not render email with mailto: when nolink role attribute - ;; is used or when the email address matches - ;; @example.{com|net|org} - (element email - (let* ((class (attribute-string (normalize "role")))) - (cond - ((or (equal? class "nolink") - (and (> (string-length (data (current-node))) - 11) - (string=? - (substring (data (current-node)) - (- (string-length (data (current-node))) 11) - (- (string-length (data (current-node))) 4)) - "example"))) - ($code-seq$ - (make sequence - (literal "<") - (process-children) - (literal ">")))) - (else - (next-match))))) - - ;; Ensure that we start with no preferred mediaobject notations, - ;; so that in the text-only case we don't choose any of the - ;; possible images, and fallback to the most appropriate - ;; textobject - (define preferred-mediaobject-notations - '()) - - - (element quote - (make sequence - (literal "“") - (process-children) - (literal "”"))) - - ;; The special FreeBSD version of the trademark tag handling. - ;; This function was more or less taken from the DocBook DSSSL - ;; stylesheets by Norman Walsh. - (element trademark - (if (show-tm-symbol? (current-node)) - (make sequence - ($charseq$) - (cond - ((equal? (attribute-string "class") (normalize "copyright")) - (make entity-ref name: "copy")) - ((equal? (attribute-string "class") (normalize "registered")) - (make entity-ref name: "reg")) - ((equal? (attribute-string "class") (normalize "service")) - (make element gi: "SUP" - (literal "SM"))) - (else - (make entity-ref name: "#8482")))) - ($charseq$))) - - ;; multiple copyright holders should be separated. - (element (copyright holder) - (make sequence - ($charseq$) - (if (not (last-sibling? (current-node))) - (literal ", ") - (empty-sosofo)))) - ]]> - - - - >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 25 13:42:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E35A11065675; Thu, 25 Dec 2008 13:42:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6532106564A for ; Thu, 25 Dec 2008 13:42:51 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 958278FC1D for ; Thu, 25 Dec 2008 13:42:51 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBPDgp7v026822 for ; Thu, 25 Dec 2008 13:42:51 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBPDgp6V026820 for perforce@freebsd.org; Thu, 25 Dec 2008 13:42:51 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 25 Dec 2008 13:42:51 GMT Message-Id: <200812251342.mBPDgp6V026820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155275 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: Thu, 25 Dec 2008 13:42:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=155275 Change 155275 by ed@ed_dull on 2008/12/25 13:41:52 Make SC_TE_WARM_INIT work. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#19 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#19 (text+ko) ==== @@ -120,8 +120,9 @@ switch (code) { case SC_TE_COLD_INIT: ++sc_term_scteken.te_refcount; - ts->ts_busy = 1; + /* FALLTHROUGH */ + case SC_TE_WARM_INIT: teken_init(&ts->ts_teken, &scteken_funcs, scp); tp.tp_row = scp->ysize; @@ -131,10 +132,6 @@ tp.tp_row = scp->cursor_pos / scp->xsize; tp.tp_col = scp->cursor_pos % scp->xsize; teken_set_cursor(&ts->ts_teken, &tp); - - break; - case SC_TE_WARM_INIT: - /* XXX */ break; } From owner-p4-projects@FreeBSD.ORG Thu Dec 25 13:43:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C8471065673; Thu, 25 Dec 2008 13:43:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2DA01065670 for ; Thu, 25 Dec 2008 13:43:52 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B048F8FC0C for ; Thu, 25 Dec 2008 13:43:52 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBPDhqvx026892 for ; Thu, 25 Dec 2008 13:43:52 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBPDhqhu026890 for perforce@freebsd.org; Thu, 25 Dec 2008 13:43:52 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 25 Dec 2008 13:43:52 GMT Message-Id: <200812251343.mBPDhqhu026890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155276 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: Thu, 25 Dec 2008 13:43:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=155276 Change 155276 by ed@ed_dull on 2008/12/25 13:43:08 IFC. Also integrate libteken sources. Affected files ... .. //depot/projects/mpsafetty/UPDATING#18 integrate .. //depot/projects/mpsafetty/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/mpsafetty/sbin/ddb/ddb.8#3 integrate .. //depot/projects/mpsafetty/sbin/savecore/savecore.8#2 integrate .. //depot/projects/mpsafetty/share/man/man4/Makefile#17 integrate .. //depot/projects/mpsafetty/share/man/man4/ng_ether_echo.4#1 branch .. //depot/projects/mpsafetty/share/man/man4/ng_tty.4#3 integrate .. //depot/projects/mpsafetty/share/man/man4/textdump.4#3 integrate .. //depot/projects/mpsafetty/sys/conf/files#38 integrate .. //depot/projects/mpsafetty/sys/conf/options#19 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_wcwidth.h#3 edit .. //depot/projects/mpsafetty/sys/dev/usb/if_zyd.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/mpsafetty/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/modules/netgraph/ether_echo/Makefile#1 branch .. //depot/projects/mpsafetty/sys/net/if_tun.c#10 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ether.c#5 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ether_echo.c#1 branch .. //depot/projects/mpsafetty/sys/netgraph/ng_ether_echo.h#1 branch .. //depot/projects/mpsafetty/sys/sys/tree.h#2 integrate .. //depot/projects/mpsafetty/usr.bin/gprof/gprof.1#2 integrate .. //depot/projects/mpsafetty/usr.sbin/arp/arp.8#2 integrate .. //depot/projects/mpsafetty/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/ugidfw/ugidfw.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/UPDATING#18 (text+ko) ==== @@ -22,6 +22,12 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081225: + ng_tty(4) module updated to match the new TTY subsystem. + Due to API change, user-level applications must be updated. + New API support added to mpd5 CVS and expected to be present + in next mpd5.3 release. + 20081219: With __FreeBSD_version 800060 the makefs tool is part of the base system (it was a port). @@ -1195,4 +1201,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.556 2008/12/19 23:12:14 sam Exp $ +$FreeBSD: src/UPDATING,v 1.557 2008/12/25 10:05:00 mav Exp $ ==== //depot/projects/mpsafetty/lib/libc/sys/kldunload.2#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kldunload.2,v 1.20 2008/03/13 10:33:24 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kldunload.2,v 1.21 2008/12/25 09:15:31 trhodes Exp $ .\" -.Dd March 10, 2008 +.Dd December 25, 2008 .Dt KLDUNLOAD 2 .Os .Sh NAME @@ -69,6 +69,10 @@ The file was not found. .It Bq Er EBUSY You attempted to unload a file linked by the kernel. +.It Bq Er EINVAL +The +.Fn kldunloadf +system call was passed invalid flags. .El .Sh SEE ALSO .Xr kldfind 2 , ==== //depot/projects/mpsafetty/sbin/ddb/ddb.8#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.6 2008/08/03 14:27:06 rwatson Exp $ +.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.7 2008/12/24 11:12:21 trhodes Exp $ .\" -.Dd April 24, 2008 +.Dd December 24, 2008 .Dt DDB 8 .Os .Sh NAME @@ -87,7 +87,7 @@ The following debugger commands are available from the command line: .Bl -tag -width indent .It Xo -.Ic Cm capture +.Cm capture .Op Fl M Ar core .Op Fl N Ar system .Cm print @@ -96,7 +96,7 @@ .Xr ddb 4 output capture buffer. .It Xo -.Ic Cm capture +.Cm capture .Op Fl M Ar core .Op Fl N Ar system .Cm status @@ -104,6 +104,7 @@ Print the current status of the .Xr ddb 4 output capture buffer. +.El .Sh SCRIPTING The .Nm ==== //depot/projects/mpsafetty/sbin/savecore/savecore.8#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)savecore.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.26 2007/12/26 11:42:10 rwatson Exp $ +.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.27 2008/12/24 11:12:21 trhodes Exp $ .\" -.Dd February 24, 2005 +.Dd December 24, 2008 .Dt SAVECORE 8 .Os .Sh NAME @@ -144,7 +144,7 @@ .Xr gzip 1 , .Xr getbootfile 3 , .Xr textdump 4 , -.Xr tar 4 , +.Xr tar 5 , .Xr dumpon 8 , .Xr syslogd 8 .Sh HISTORY ==== //depot/projects/mpsafetty/share/man/man4/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.438 2008/12/15 13:19:11 bz Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.439 2008/12/25 07:34:14 julian Exp $ MAN= aac.4 \ acpi.4 \ @@ -228,6 +228,7 @@ ng_eiface.4 \ ng_etf.4 \ ng_ether.4 \ + ng_ether_echo.4 \ ng_fec.4 \ ng_frame_relay.4 \ ng_gif.4 \ ==== //depot/projects/mpsafetty/share/man/man4/ng_tty.4#3 (text+ko) ==== @@ -32,10 +32,10 @@ .\" .\" Author: Archie Cobbs .\" -.\" $FreeBSD: src/share/man/man4/ng_tty.4,v 1.18 2008/10/03 05:14:54 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/ng_tty.4,v 1.19 2008/12/25 10:18:35 mav Exp $ .\" $Whistle: ng_tty.8,v 1.5 1999/01/25 23:46:28 archie Exp $ .\" -.Dd October 2, 2008 +.Dd December 25, 2008 .Dt NG_TTY 4 .Os .Sh NAME @@ -78,18 +78,6 @@ .Xr ng_async 4 type node. The hot character has no effect on the transmission of data. -.Pp -The node will attempt to give itself the same netgraph name as the name -of the tty device. -In any case, information about the node is available via the netgraph -.Xr ioctl 2 -command -.Dv NGIOCGINFO . -This command returns a -.Dv "struct nodeinfo" -similar to the -.Dv NGM_NODEINFO -netgraph control message. .Sh HOOKS This node type supports the following hooks: .Pp @@ -112,7 +100,7 @@ Returns an integer containing the current hot character in the lower eight bits. .It Dv NGM_TTY_SET_TTY -This command takes an integer pointer to the open file descriptor of the tty +This command takes integer process ID and file descriptor of open tty and registers the tty hooks. .El .Sh SHUTDOWN ==== //depot/projects/mpsafetty/share/man/man4/textdump.4#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.5 2008/08/03 14:14:43 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.6 2008/12/24 11:12:21 trhodes Exp $ .\" -.Dd December 26, 2007 +.Dd December 24, 2008 .Dt textdump 4 .Os .Sh NAME @@ -148,10 +148,15 @@ .Bd -literal -offset indent script kdb.enter.witness=show locks .Ed +.Pp +These scripts may also be configured using the +.Xr ddb 8 +utility. .Sh SEE ALSO .Xr bsdtar 1 , .Xr ddb 4 , .Xr tar 5 , +.Xr ddb 8 , .Xr dumpon 8 , .Xr savecore 8 , .Xr sysctl 8 ==== //depot/projects/mpsafetty/sys/conf/files#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1358 2008/12/22 21:37:06 alfred Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1359 2008/12/25 07:34:14 julian Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2291,6 +2291,7 @@ netgraph/ng_echo.c optional netgraph_echo netgraph/ng_eiface.c optional netgraph_eiface netgraph/ng_ether.c optional netgraph_ether +netgraph/ng_ether_echo.c optional netgraph_ether_echo netgraph/ng_fec.c optional netgraph_fec netgraph/ng_frame_relay.c optional netgraph_frame_relay netgraph/ng_gif.c optional netgraph_gif ==== //depot/projects/mpsafetty/sys/conf/options#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.652 2008/12/20 03:02:32 sam Exp $ +# $FreeBSD: src/sys/conf/options,v 1.653 2008/12/25 07:34:14 julian Exp $ # # On the handling of kernel options # @@ -459,6 +459,7 @@ NETGRAPH_ECHO opt_netgraph.h NETGRAPH_EIFACE opt_netgraph.h NETGRAPH_ETHER opt_netgraph.h +NETGRAPH_ETHER_ECHO opt_netgraph.h NETGRAPH_FEC opt_netgraph.h NETGRAPH_FRAME_RELAY opt_netgraph.h NETGRAPH_GIF opt_netgraph.h ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_wcwidth.h#3 (text+ko) ==== @@ -35,39 +35,6 @@ return 0; } - -/* The following two functions define the column width of an ISO 10646 - * character as follows: - * - * - The null character (U+0000) has a column width of 0. - * - * - Other C0/C1 control characters and DEL will lead to a return - * value of -1. - * - * - Non-spacing and enclosing combining characters (general - * category code Mn or Me in the Unicode database) have a - * column width of 0. - * - * - SOFT HYPHEN (U+00AD) has a column width of 1. - * - * - Other format characters (general category code Cf in the Unicode - * database) and ZERO WIDTH SPACE (U+200B) have a column width of 0. - * - * - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF) - * have a column width of 0. - * - * - Spacing characters in the East Asian Wide (W) or East Asian - * Full-width (F) category as defined in Unicode Technical - * Report #11 have a column width of 2. - * - * - All remaining characters (including all printable - * ISO 8859-1 and WGL4 characters, Unicode control characters, - * etc.) have a column width of 1. - * - * This implementation assumes that wchar_t characters are encoded - * in ISO 10646. - */ - static int teken_wcwidth(teken_char_t ucs) { /* sorted list of non-overlapping intervals of non-spacing characters */ ==== //depot/projects/mpsafetty/sys/dev/usb/if_zyd.c#7 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ /* $NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.24 2008/11/25 02:19:02 weongyo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.25 2008/12/25 04:29:40 weongyo Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -1061,8 +1061,10 @@ for (i = 0; i < N(phyini); i++) zyd_write16_m(sc, phyini[i].reg, phyini[i].val); - if (sc->sc_rfrev == ZYD_RF_AL2230S || sc->sc_al2230s != 0) - zyd_write16_m(sc, phy2230s[i].reg, phy2230s[i].val); + if (sc->sc_rfrev == ZYD_RF_AL2230S || sc->sc_al2230s != 0) { + for (i = 0; i < N(phy2230s); i++) + zyd_write16_m(sc, phy2230s[i].reg, phy2230s[i].val); + } for (i = 0; i < 3; i++) { error = zyd_rfwrite_cr(sc, zyd_al2230_chtable[0][i]); ==== //depot/projects/mpsafetty/sys/kern/uipc_domain.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.53 2008/12/23 01:23:09 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.54 2008/12/25 11:32:38 rwatson Exp $"); #include #include @@ -110,6 +110,28 @@ pr->pr_domain->dom_name, (int)(pr - pr->pr_domain->dom_protosw))); + /* + * Protocol switch methods fall into three categories: mandatory, + * mandatory but protosw_init() provides a default, and optional. + * + * For true protocols (i.e., pru_attach != NULL), KASSERT truly + * mandatory methods with no defaults, and initialize defaults for + * other mandatory methods if the protocol hasn't defined an + * implementation (NULL function pointer). + */ +#if 0 + if (pu->pru_attach != NULL) { + KASSERT(pu->pru_abort != NULL, + ("protosw_init: %ssw[%d] pru_abort NULL", + pr->pr_domain->dom_name, + (int)(pr - pr->pr_domain->dom_protosw))); + KASSERT(pu->pru_send != NULL, + ("protosw_init: %ssw[%d] pru_send NULL", + pr->pr_domain->dom_name, + (int)(pr - pr->pr_domain->dom_protosw))); + } +#endif + #define DEFAULT(foo, bar) if ((foo) == NULL) (foo) = (bar) DEFAULT(pu->pru_accept, pru_accept_notsupp); DEFAULT(pu->pru_bind, pru_bind_notsupp); ==== //depot/projects/mpsafetty/sys/modules/netgraph/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $ -# $FreeBSD: src/sys/modules/netgraph/Makefile,v 1.50 2008/08/03 10:32:17 ed Exp $ +# $FreeBSD: src/sys/modules/netgraph/Makefile,v 1.52 2008/12/25 09:32:20 mav Exp $ .include @@ -17,6 +17,7 @@ eiface \ etf \ ether \ + ether_echo \ fec \ frame_relay \ gif \ @@ -48,6 +49,7 @@ tag \ tcpmss \ tee \ + tty \ UI \ vjc \ vlan ==== //depot/projects/mpsafetty/sys/net/if_tun.c#10 (text+ko) ==== @@ -13,7 +13,7 @@ * UCL. This driver is based much more on read/write/poll mode of * operation though. * - * $FreeBSD: src/sys/net/if_tun.c,v 1.173 2008/12/22 01:56:56 qingli Exp $ + * $FreeBSD: src/sys/net/if_tun.c,v 1.174 2008/12/25 02:14:25 kmacy Exp $ */ #include "opt_atalk.h" @@ -79,6 +79,7 @@ #define TUN_RWAIT 0x0040 #define TUN_ASYNC 0x0080 #define TUN_IFHEAD 0x0100 +#define TUN_CLOSED 0x0200 #define TUN_READY (TUN_OPEN | TUN_INITED) @@ -256,9 +257,11 @@ /* Unlocked read. */ mtx_lock(&tp->tun_mtx); - if ((tp->tun_flags & TUN_OPEN) != 0) + if ((tp->tun_flags & (TUN_OPEN|TUN_CLOSED)) != TUN_CLOSED) cv_wait_unlock(&tp->tun_cv, &tp->tun_mtx); - + else + mtx_unlock(&tp->tun_mtx); + CURVNET_SET(TUN2IFP(tp)->if_vnet); dev = tp->tun_dev; bpfdetach(TUN2IFP(tp)); @@ -497,6 +500,7 @@ KNOTE_UNLOCKED(&tp->tun_rsel.si_note, 0); TUNDEBUG (ifp, "closed\n"); + tp->tun_flags |= TUN_CLOSED; cv_broadcast(&tp->tun_cv); mtx_unlock(&tp->tun_mtx); return (0); ==== //depot/projects/mpsafetty/sys/netgraph/ng_ether.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ * Authors: Archie Cobbs * Julian Elischer * - * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.65 2008/12/02 21:37:28 bz Exp $ + * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.66 2008/12/25 09:02:55 julian Exp $ */ /* @@ -102,8 +102,8 @@ static void ng_ether_link_state(struct ifnet *ifp, int state); /* Other functions */ -static int ng_ether_rcv_lower(node_p node, struct mbuf *m); -static int ng_ether_rcv_upper(node_p node, struct mbuf *m); +static int ng_ether_rcv_lower(hook_p node, item_p item); +static int ng_ether_rcv_upper(hook_p node, item_p item); /* Netgraph node methods */ static ng_constructor_t ng_ether_constructor; @@ -389,13 +389,16 @@ name = NG_ETHER_HOOK_LOWER; /* Which hook? */ - if (strcmp(name, NG_ETHER_HOOK_UPPER) == 0) + if (strcmp(name, NG_ETHER_HOOK_UPPER) == 0) { hookptr = &priv->upper; - else if (strcmp(name, NG_ETHER_HOOK_LOWER) == 0) + NG_HOOK_SET_RCVDATA(hook, ng_ether_rcv_upper); + } else if (strcmp(name, NG_ETHER_HOOK_LOWER) == 0) { hookptr = &priv->lower; - else if (strcmp(name, NG_ETHER_HOOK_ORPHAN) == 0) + NG_HOOK_SET_RCVDATA(hook, ng_ether_rcv_lower); + } else if (strcmp(name, NG_ETHER_HOOK_ORPHAN) == 0) { hookptr = &priv->orphan; - else + NG_HOOK_SET_RCVDATA(hook, ng_ether_rcv_lower); + } else return (EINVAL); /* Check if already connected (shouldn't be, but doesn't hurt) */ @@ -571,21 +574,13 @@ /* * Receive data on a hook. + * Since we use per-hook recveive methods this should never be called. */ static int ng_ether_rcvdata(hook_p hook, item_p item) { - const node_p node = NG_HOOK_NODE(hook); - const priv_p priv = NG_NODE_PRIVATE(node); - struct mbuf *m; - - NGI_GET_M(item, m); NG_FREE_ITEM(item); - if (hook == priv->lower || hook == priv->orphan) - return ng_ether_rcv_lower(node, m); - if (hook == priv->upper) - return ng_ether_rcv_upper(node, m); panic("%s: weird hook", __func__); #ifdef RESTARTABLE_PANICS /* so we don't get an error msg in LINT */ return (0); @@ -596,12 +591,18 @@ * Handle an mbuf received on the "lower" or "orphan" hook. */ static int -ng_ether_rcv_lower(node_p node, struct mbuf *m) +ng_ether_rcv_lower(hook_p hook, item_p item) { + struct mbuf *m; + const node_p node = NG_HOOK_NODE(hook); const priv_p priv = NG_NODE_PRIVATE(node); struct ifnet *const ifp = priv->ifp; + NGI_GET_M(item, m); + NG_FREE_ITEM(item); + /* Check whether interface is ready for packets */ + if (!((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING))) { NG_FREE_M(m); @@ -639,11 +640,16 @@ * Handle an mbuf received on the "upper" hook. */ static int -ng_ether_rcv_upper(node_p node, struct mbuf *m) +ng_ether_rcv_upper(hook_p hook, item_p item) { + struct mbuf *m; + const node_p node = NG_HOOK_NODE(hook); const priv_p priv = NG_NODE_PRIVATE(node); struct ifnet *ifp = priv->ifp; + NGI_GET_M(item, m); + NG_FREE_ITEM(item); + /* Check length and pull off header */ if (m->m_pkthdr.len < sizeof(struct ether_header)) { NG_FREE_M(m); ==== //depot/projects/mpsafetty/sys/sys/tree.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: tree.h,v 1.8 2004/03/28 19:38:30 provos Exp $ */ /* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */ -/* $FreeBSD: src/sys/sys/tree.h,v 1.7 2007/12/28 07:03:26 jasone Exp $ */ +/* $FreeBSD: src/sys/sys/tree.h,v 1.8 2008/12/24 19:57:22 bms Exp $ */ /*- * Copyright 2002 Niels Provos @@ -737,6 +737,11 @@ (x) != NULL; \ (x) = name##_RB_NEXT(x)) +#define RB_FOREACH_SAFE(x, name, head, y) \ + for ((x) = RB_MIN(name, head); \ + (x) != NULL && ((y) = name##_RB_NEXT(x)); \ + (x) = (y)) + #define RB_FOREACH_REVERSE(x, name, head) \ for ((x) = RB_MAX(name, head); \ (x) != NULL; \ ==== //depot/projects/mpsafetty/usr.bin/gprof/gprof.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)gprof.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/gprof/gprof.1,v 1.29 2005/10/07 11:58:46 bde Exp $ +.\" $FreeBSD: src/usr.bin/gprof/gprof.1,v 1.30 2008/12/25 08:48:08 trhodes Exp $ .\" -.Dd October 7, 2005 +.Dd December 25, 2008 .Dt GPROF 1 .Os .Sh NAME @@ -263,9 +263,6 @@ .It Fl z Display routines that have zero usage (as shown by call counts and accumulated time). -This is useful with the -.Fl c -option for discovering which routines were never called. .El .Sh FILES .Bl -tag -width a.out.gmon -compact ==== //depot/projects/mpsafetty/usr.sbin/arp/arp.8#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)arp.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.sbin/arp/arp.8,v 1.27 2008/03/24 22:57:55 ru Exp $ +.\" $FreeBSD: src/usr.sbin/arp/arp.8,v 1.28 2008/12/25 06:44:19 trhodes Exp $ .\" -.Dd March 18, 2008 +.Dd December 25, 2008 .Dt ARP 8 .Os .Sh NAME @@ -53,14 +53,12 @@ .Nm .Fl s Ar hostname ether_addr .Op Cm temp -.Op Cm reject -.Op Cm blackhole +.Op Cm blackhole No \&| Cm reject .Op Cm pub Op Cm only .Nm .Fl S Ar hostname ether_addr .Op Cm temp -.Op Cm reject -.Op Cm blackhole +.Op Cm blackhole No \&| Cm reject .Op Cm pub Op Cm only .Nm .Fl f Ar filename @@ -182,7 +180,8 @@ .Bd -ragged -offset indent -compact .Ar hostname ether_addr .Op Cm temp -.Op Cm pub +.Op Cm blackhole No \&| Cm reject +.Op Cm pub Op Cm only .Ed .Pp with argument meanings as given above. ==== //depot/projects/mpsafetty/usr.sbin/arp/arp.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/arp/arp.c,v 1.68 2008/12/15 06:10:57 qingli Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/arp/arp.c,v 1.69 2008/12/25 06:44:19 trhodes Exp $"); /* * arp - display, set, and delete arp table entries @@ -330,8 +330,14 @@ argc--; argv++; } } else if (strncmp(argv[0], "blackhole", 9) == 0) { + if (flags & RTF_REJECT) { + printf("Choose one of blackhole or reject, not both.\n"); + } flags |= RTF_BLACKHOLE; } else if (strncmp(argv[0], "reject", 6) == 0) { + if (flags & RTF_BLACKHOLE) { + printf("Choose one of blackhole or reject, not both.\n"); + } flags |= RTF_REJECT; } else if (strncmp(argv[0], "trail", 5) == 0) { /* XXX deprecated and undocumented feature */ @@ -648,8 +654,8 @@ " arp [-n] [-i interface] -a", " arp -d hostname [pub]", " arp -d [-i interface] -a", - " arp -s hostname ether_addr [temp] [reject] [blackhole] [pub [only]]", - " arp -S hostname ether_addr [temp] [reject] [blackhole] [pub [only]]", + " arp -s hostname ether_addr [temp] [reject | blackhole] [pub [only]]", + " arp -S hostname ether_addr [temp] [reject | blackhole] [pub [only]]", " arp -f filename"); exit(1); } ==== //depot/projects/mpsafetty/usr.sbin/ugidfw/ugidfw.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/ugidfw/ugidfw.c,v 1.6 2006/04/23 17:06:18 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/ugidfw/ugidfw.c,v 1.7 2008/12/24 22:40:13 rwatson Exp $"); #include #include @@ -71,7 +71,7 @@ void add_rule(int argc, char *argv[]) { - char errstr[BUFSIZ]; + char errstr[BUFSIZ], charstr[BUFSIZ]; struct mac_bsdextended_rule rule; int error, rulenum; @@ -86,7 +86,10 @@ warnx("%s", errstr); return; } - printf("Added rule %d\n", rulenum); + if (bsde_rule_to_string(&rule, charstr, BUFSIZ) == -1) + warnx("Added rule, but unable to print string."); + else + printf("%d %s\n", rulenum, charstr); } void From owner-p4-projects@FreeBSD.ORG Thu Dec 25 15:20:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65BCC106568B; Thu, 25 Dec 2008 15:20:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 247041065689 for ; Thu, 25 Dec 2008 15:20:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 131698FC14 for ; Thu, 25 Dec 2008 15:20:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBPFKUPJ036884 for ; Thu, 25 Dec 2008 15:20:30 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBPFKUft036882 for perforce@freebsd.org; Thu, 25 Dec 2008 15:20:30 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 25 Dec 2008 15:20:30 GMT Message-Id: <200812251520.mBPFKUft036882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155277 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: Thu, 25 Dec 2008 15:20:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=155277 Change 155277 by ed@ed_dull on 2008/12/25 15:19:56 It seems my insert mode fixes were not sufficient. If line wrapping occurs, it overwrites the first character on the next line, while it should move the entire line one character. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#18 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#18 (text+ko) ==== @@ -665,6 +665,28 @@ } static void +teken_subr_do_putchar(teken_t *t, const teken_pos_t *tp, teken_char_t c, + int width) +{ + + if (t->t_stateflags & TS_INSERT && + tp->tp_col < t->t_winsize.tp_col - width) { + teken_rect_t ctr; + teken_pos_t ctp; + + /* Insert mode. Move existing characters to the right. */ + ctr.tr_begin = *tp; + ctr.tr_end.tp_row = tp->tp_row + 1; + ctr.tr_end.tp_col = t->t_winsize.tp_col - width; + ctp.tp_row = tp->tp_row; + ctp.tp_col = tp->tp_col + width; + teken_funcs_copy(t, &ctr, &ctp); + } + + teken_funcs_putchar(t, tp, c, &t->t_curattr); +} + +static void teken_subr_regular_character(teken_t *t, teken_char_t c) { int width; @@ -674,25 +696,13 @@ if (width <= 0) return; - if (t->t_stateflags & TS_INSERT && - t->t_cursor.tp_col < t->t_winsize.tp_col - width) { - teken_rect_t tr; - teken_pos_t tp; - - /* Insert mode. Move existing characters to the right. */ - tr.tr_begin = t->t_cursor; - tr.tr_end.tp_row = t->t_cursor.tp_row + 1; - tr.tr_end.tp_col = t->t_winsize.tp_col - width; - tp.tp_row = t->t_cursor.tp_row; - tp.tp_col = t->t_cursor.tp_col + width; - teken_funcs_copy(t, &tr, &tp); - } - if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1 && (t->t_stateflags & (TS_WRAPPED|TS_AUTOWRAP)) == (TS_WRAPPED|TS_AUTOWRAP)) { teken_pos_t tp; + /* Perform line wrapping. */ + if (t->t_cursor.tp_row == t->t_scrollreg.ts_end - 1) { /* Perform scrolling. */ teken_subr_do_scroll(t, 1); @@ -701,25 +711,32 @@ /* No scrolling needed. */ tp.tp_row = t->t_cursor.tp_row + 1; if (tp.tp_row == t->t_winsize.tp_row) { - teken_funcs_putchar(t, &t->t_cursor, c, - &t->t_curattr); + /* + * Corner case: regular character + * outside scrolling region, but at the + * bottom of the screen. + */ + teken_subr_do_putchar(t, &t->t_cursor, + c, width); return; } } tp.tp_col = 0; - teken_funcs_putchar(t, &tp, c, &t->t_curattr); + teken_subr_do_putchar(t, &tp, c, width); t->t_cursor.tp_row = tp.tp_row; t->t_cursor.tp_col = width; t->t_stateflags &= ~TS_WRAPPED; } else { - /* No scrolling needed. */ - teken_funcs_putchar(t, &t->t_cursor, c, &t->t_curattr); - if (t->t_cursor.tp_col >= t->t_winsize.tp_col - width) { + /* No line wrapping needed. */ + teken_subr_do_putchar(t, &t->t_cursor, c, width); + t->t_cursor.tp_col += width; + + if (t->t_cursor.tp_col >= t->t_winsize.tp_col) { t->t_stateflags |= TS_WRAPPED; + t->t_cursor.tp_col = t->t_winsize.tp_col - 1; } else { - t->t_cursor.tp_col += width; t->t_stateflags &= ~TS_WRAPPED; } } From owner-p4-projects@FreeBSD.ORG Fri Dec 26 01:50:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEA411065692; Fri, 26 Dec 2008 01:50:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1B431065686 for ; Fri, 26 Dec 2008 01:50:20 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 769588FC3D for ; Fri, 26 Dec 2008 01:50:20 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBQ1oKFY039151 for ; Fri, 26 Dec 2008 01:50:20 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBQ1oKCE039149 for perforce@freebsd.org; Fri, 26 Dec 2008 01:50:20 GMT (envelope-from gabor@freebsd.org) Date: Fri, 26 Dec 2008 01:50:20 GMT Message-Id: <200812260150.mBQ1oKCE039149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155289 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: Fri, 26 Dec 2008 01:50:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=155289 Change 155289 by gabor@gabor_server on 2008/12/26 01:50:08 - Increase pre-read buffer to enhance accuracy of binary file detection Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#36 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#36 (text+ko) ==== @@ -55,7 +55,7 @@ /* Some global variable for the buffering and reading. */ static char *lnbuf; static size_t lnbuflen; -static char binbuf[BUFSIZ * 4]; +static char binbuf[BUFSIZ * 8]; static int binbufsiz; char *binbufptr; static int bzerr; From owner-p4-projects@FreeBSD.ORG Fri Dec 26 11:51:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 948451065677; Fri, 26 Dec 2008 11:51:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 591A7106564A for ; Fri, 26 Dec 2008 11:51:53 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 46D728FC1B for ; Fri, 26 Dec 2008 11:51:53 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBQBprg4014245 for ; Fri, 26 Dec 2008 11:51:53 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBQBpr6J014243 for perforce@freebsd.org; Fri, 26 Dec 2008 11:51:53 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 26 Dec 2008 11:51:53 GMT Message-Id: <200812261151.mBQBpr6J014243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155294 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: Fri, 26 Dec 2008 11:51:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=155294 Change 155294 by rene@rene_self on 2008/12/26 11:50:56 Add partial translation of contributing-ports article (37%, line 314/836) and connect it to the build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#8 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/Makefile#1 add .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#1 add Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#8 (text+ko) ==== @@ -5,6 +5,7 @@ SUBDIR = SUBDIR+= contributing +SUBDIR+= contributing-ports SUBDIR+= explaining-bsd SUBDIR+= problem-reports From owner-p4-projects@FreeBSD.ORG Fri Dec 26 14:41:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A0AD1065674; Fri, 26 Dec 2008 14:41:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E3221065670 for ; Fri, 26 Dec 2008 14:41:48 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C23F8FC18 for ; Fri, 26 Dec 2008 14:41:48 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBQEfmgr039100 for ; Fri, 26 Dec 2008 14:41:48 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBQEfmjU039098 for perforce@freebsd.org; Fri, 26 Dec 2008 14:41:48 GMT (envelope-from zec@icir.org) Date: Fri, 26 Dec 2008 14:41:48 GMT Message-Id: <200812261441.mBQEfmjU039098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 155295 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: Fri, 26 Dec 2008 14:41:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=155295 Change 155295 by zec@zec_tca51 on 2008/12/26 14:41:10 Use vnet_mod_register() and the accompanying infrastructure for invoking vnet_foo_iattach() initializer functions even in GENERIC kernel builds, not only for options VIMAGE ones. This change should unbreak network stack initialization for GENERIC builds. Note that with options VIMAGE_GLOBALS defined the initializer functions are still invoked directly from the traditional SYSINIT() / protosw / modevent handlers, instead of / without the initializer functions being first registered to the vimage framework and then (indirectly) invoked by the vimage framework. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#74 edit .. //depot/projects/vimage/src/sys/net/if.c#61 edit .. //depot/projects/vimage/src/sys/net/if_gif.c#23 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#35 edit .. //depot/projects/vimage/src/sys/net/route.c#39 edit .. //depot/projects/vimage/src/sys/netinet/accf_http.c#7 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#34 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#63 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#46 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#45 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#37 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#22 edit .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#21 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#17 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#22 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#77 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#74 (text+ko) ==== @@ -71,11 +71,14 @@ MALLOC_DEFINE(M_VPROCG, "vprocg", "process group control block"); MALLOC_DEFINE(M_VCPU, "vcpu", "cpu resource control block"); +#ifndef VIMAGE_GLOBALS +static int vnet_mod_constructor(struct vnet_modlink *); +static int vnet_mod_destructor(struct vnet_modlink *); +#endif + #ifdef VIMAGE static struct vimage *vi_alloc(struct vimage *, char *); static int vi_destroy(struct vimage *); -static int vnet_mod_constructor(struct vnet_modlink *); -static int vnet_mod_destructor(struct vnet_modlink *); #endif #ifndef VIMAGE @@ -182,13 +185,11 @@ TAILQ_INSERT_TAIL(&vnet_modlink_head, vml, vml_mod_le); -#ifdef VIMAGE VNET_FOREACH(vnet_iter) { CURVNET_SET_QUIET(vnet_iter); vnet_mod_constructor(vml); CURVNET_RESTORE(); } -#endif /* Check for pending modules depending on us */ do { @@ -209,33 +210,7 @@ } } while (vml_iter != NULL); } -#endif /* !VIMAGE_GLOBALS */ - -#ifdef VIMAGE -struct vimage_list_head vimage_head; -struct vnet_list_head vnet_head; -struct vprocg_list_head vprocg_head; -struct vcpu_list_head vcpu_head; - -struct cv vnet_list_condvar; -struct mtx vnet_list_refc_mtx; -int vnet_list_refc = 0; - -struct mtx vcpu_list_mtx; - -#define VNET_LIST_LOCK() \ - mtx_lock(&vnet_list_refc_mtx); \ - while (vnet_list_refc != 0) \ - cv_wait(&vnet_list_condvar, &vnet_list_refc_mtx); - -#define VNET_LIST_UNLOCK() \ - mtx_unlock(&vnet_list_refc_mtx); -static u_int last_vi_id = 0; -static u_int last_vnet_id = 0; -static u_int last_vprocg_id = 0; -static u_int last_vcpu_id = 0; - void vnet_mod_deregister(const struct vnet_modinfo *vmi) { @@ -266,6 +241,95 @@ vi_free(vml, M_VIMAGE); } +static int vnet_mod_constructor(struct vnet_modlink *vml) +{ + const struct vnet_modinfo *vmi = vml->vml_modinfo; + +#ifdef DEBUG_ORDERING + printf("instatiating vnet_%s", vmi->vmi_name); + if (vml->vml_iarg) + printf("/%s", vml->vml_iname); + printf(": "); + if (vmi->vmi_struct_size) + printf("malloc(%d); ", vmi->vmi_struct_size); + if (vmi->vmi_iattach != NULL) + printf("iattach()"); + printf("\n"); +#endif + +#ifdef VIMAGE + if (vmi->vmi_struct_size) { + void *mem = vi_malloc(vmi->vmi_struct_size, M_VNET, + M_NOWAIT | M_ZERO); + if (mem == NULL) /* XXX should return error, not panic */ + panic("vi_alloc: malloc for %s\n", vmi->vmi_name); + curvnet->mod_data[vmi->vmi_id] = mem; + } +#endif + + if (vmi->vmi_iattach != NULL) + vmi->vmi_iattach(vml->vml_iarg); + + return (0); +} + +static int vnet_mod_destructor(struct vnet_modlink *vml) +{ + const struct vnet_modinfo *vmi = vml->vml_modinfo; + +#ifdef DEBUG_ORDERING + printf("destroying vnet_%s", vmi->vmi_name); + if (vml->vml_iarg) + printf("/%s", vml->vml_iname); + printf(": "); + if (vmi->vmi_idetach != NULL) + printf("idetach(); "); + if (vmi->vmi_struct_size) + printf("free()"); + printf("\n"); +#endif + + if (vmi->vmi_idetach) + vmi->vmi_idetach(vml->vml_iarg); + +#ifdef VIMAGE + if (vmi->vmi_struct_size) { + if (curvnet->mod_data[vmi->vmi_id] == NULL) + panic("vi_destroy: %s\n", vmi->vmi_name); + vi_free(curvnet->mod_data[vmi->vmi_id], M_VNET); + curvnet->mod_data[vmi->vmi_id] = NULL; + } +#endif + + return (0); +} +#endif /* !VIMAGE_GLOBALS */ + +#ifdef VIMAGE +struct vimage_list_head vimage_head; +struct vnet_list_head vnet_head; +struct vprocg_list_head vprocg_head; +struct vcpu_list_head vcpu_head; + +struct cv vnet_list_condvar; +struct mtx vnet_list_refc_mtx; +int vnet_list_refc = 0; + +struct mtx vcpu_list_mtx; + +#define VNET_LIST_LOCK() \ + mtx_lock(&vnet_list_refc_mtx); \ + while (vnet_list_refc != 0) \ + cv_wait(&vnet_list_condvar, &vnet_list_refc_mtx); + +#define VNET_LIST_UNLOCK() \ + mtx_unlock(&vnet_list_refc_mtx); + +static u_int last_vi_id = 0; +static u_int last_vnet_id = 0; +static u_int last_vprocg_id = 0; +static u_int last_vcpu_id = 0; + struct vimage * vnet2vimage(struct vnet *vnet) { @@ -772,66 +836,8 @@ return (0); } - -static int vnet_mod_constructor(struct vnet_modlink *vml) -{ - const struct vnet_modinfo *vmi = vml->vml_modinfo; - -#ifdef DEBUG_ORDERING - printf("instatiating vnet_%s", vmi->vmi_name); - if (vml->vml_iarg) - printf("/%s", vml->vml_iname); - printf(": "); - if (vmi->vmi_struct_size) - printf("malloc(%d); ", vmi->vmi_struct_size); - if (vmi->vmi_iattach != NULL) - printf("iattach()"); - printf("\n"); -#endif +#endif /* VIMAGE */ - if (vmi->vmi_struct_size) { - void *mem = vi_malloc(vmi->vmi_struct_size, M_VNET, - M_NOWAIT | M_ZERO); - if (mem == NULL) /* XXX should return error, not panic */ - panic("vi_alloc: malloc for %s\n", vmi->vmi_name); - curvnet->mod_data[vmi->vmi_id] = mem; - } - - if (vmi->vmi_iattach != NULL) - vmi->vmi_iattach(vml->vml_iarg); - - return 0; -} - -static int vnet_mod_destructor(struct vnet_modlink *vml) -{ - const struct vnet_modinfo *vmi = vml->vml_modinfo; - -#ifdef DEBUG_ORDERING - printf("destroying vnet_%s", vmi->vmi_name); - if (vml->vml_iarg) - printf("/%s", vml->vml_iname); - printf(": "); - if (vmi->vmi_idetach != NULL) - printf("idetach(); "); - if (vmi->vmi_struct_size) - printf("free()"); - printf("\n"); -#endif - - if (vmi->vmi_idetach) - vmi->vmi_idetach(vml->vml_iarg); - - if (vmi->vmi_struct_size) { - if (curvnet->mod_data[vmi->vmi_id] == NULL) - panic("vi_destroy: %s\n", vmi->vmi_name); - vi_free(curvnet->mod_data[vmi->vmi_id], M_VNET); - curvnet->mod_data[vmi->vmi_id] = NULL; - } - - return 0; -} - static void vi_init(void *unused) { @@ -840,6 +846,7 @@ TAILQ_INIT(&vnet_modlink_head); TAILQ_INIT(&vnet_modpending_head); +#ifdef VIMAGE LIST_INIT(&vimage_head); LIST_INIT(&vnet_head); LIST_INIT(&vprocg_head); @@ -854,6 +861,7 @@ /* We MUST clear curvnet in vi_init_done before going SMP. */ curvnet = LIST_FIRST(&vnet_head); +#endif } static void @@ -861,7 +869,9 @@ { struct vnet_modlink *vml_iter; +#ifdef VIMAGE curvnet = NULL; +#endif if (TAILQ_EMPTY(&vnet_modpending_head)) return; @@ -877,6 +887,7 @@ SYSINIT(vimage, SI_SUB_VIMAGE, SI_ORDER_FIRST, vi_init, NULL); SYSINIT(vimage_done, SI_SUB_VIMAGE_DONE, SI_ORDER_FIRST, vi_init_done, NULL); +#ifdef VIMAGE #ifdef DDB static void db_vnet_ptr(void *arg) @@ -905,5 +916,4 @@ } } #endif - #endif /* VIMAGE */ ==== //depot/projects/vimage/src/sys/net/if.c#61 (text+ko) ==== @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -182,7 +183,24 @@ }; VNET_MOD_DECLARE(NET, net, vnet_net_iattach, vnet_net_idetach, - NONE, vnet_net_symmap) + NONE, vnet_net_symmap); + +static int foo_handler(module_t mod, int /*modeventtype_t*/ what, void *arg); + +static int +foo_handler(module_t mod, int /*modeventtype_t*/ what, void *arg) +{ + return (0); +} + +static moduledata_t mod_data= { + "vnet_net", + foo_handler, + 0 +}; + +MODULE_VERSION(vnet_net, 1); +DECLARE_MODULE(vnet_net, mod_data, SI_SUB_EXEC, SI_ORDER_ANY); #endif /* @@ -384,7 +402,7 @@ if_init(void *dummy __unused) { -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_net_modinfo); #else vnet_net_iattach(NULL); ==== //depot/projects/vimage/src/sys/net/if_gif.c#23 (text+ko) ==== @@ -158,7 +158,7 @@ SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, parallel_tunnels, CTLFLAG_RW, parallel_tunnels, 0, "Allow parallel tunnels?"); -VNET_MOD_DECLARE(GIF, gif, NULL, vnet_gif_iattach, NET, NULL) +VNET_MOD_DECLARE(GIF, gif, vnet_gif_iattach, NULL, NET, NULL) /* copy from src/sys/net/if_ethersubr.c */ static const u_char etherbroadcastaddr[ETHER_ADDR_LEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; @@ -284,7 +284,7 @@ case MOD_LOAD: mtx_init(&gif_mtx, "gif_mtx", NULL, MTX_DEF); -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_gif_modinfo); #else vnet_gif_iattach(NULL); ==== //depot/projects/vimage/src/sys/net/if_loop.c#35 (text+ko) ==== @@ -228,7 +228,7 @@ switch (type) { case MOD_LOAD: mtx_init(&lo_mtx, "lo_mtx", NULL, MTX_DEF); -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_loif_modinfo); #else vnet_loif_iattach(NULL); ==== //depot/projects/vimage/src/sys/net/route.c#39 (text+ko) ==== @@ -206,9 +206,9 @@ } return (0); } +#endif VNET_MOD_DECLARE_STATELESS(RTABLE, rtable, rtable_init, rtable_idetach, NET); -#endif static void route_init(void) @@ -223,7 +223,7 @@ NULL, NULL, UMA_ALIGN_PTR, 0); rn_init(); /* initialize all zeroes, all ones, mask table */ -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_rtable_modinfo); #else rtable_init(NULL); ==== //depot/projects/vimage/src/sys/netinet/accf_http.c#7 (text+ko) ==== @@ -399,7 +399,7 @@ switch (event) { case MOD_LOAD: -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_accf_http_modinfo); #else vnet_accf_http_iattach(NULL); ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#34 (text+ko) ==== @@ -811,7 +811,8 @@ static void arp_init(void) { -#ifdef VIMAGE + +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_arp_modinfo); #else arp_iattach(NULL); ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#63 (text+ko) ==== @@ -4627,7 +4627,7 @@ } #endif -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ipfw_modinfo); #else vnet_ipfw_iattach(NULL); ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#46 (text+ko) ==== @@ -223,13 +223,14 @@ static void ip_freef(struct ipqhead *, struct ipq *); -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS static void vnet_inet_register(void); VNET_MOD_DECLARE(INET, inet, NULL, NULL, NET, NULL) static void vnet_inet_register() { + vnet_mod_register(&vnet_inet_modinfo); } ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#45 (text+ko) ==== @@ -161,7 +161,7 @@ static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int); #endif -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS static void vnet_inet6_register(void); VNET_MOD_DECLARE(INET6, inet6, NULL, NULL, INET, NULL) @@ -173,7 +173,7 @@ } SYSINIT(inet6, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST, vnet_inet6_register, 0); -#endif /* VIMAGE */ +#endif /* * IP6 initialization: fill in IP6 protocol switch table. ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#37 (text+ko) ==== @@ -2001,7 +2001,8 @@ static void ipsec_attach(void) { -#ifdef VIMAGE + +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ipsec_modinfo); #else vnet_ipsec_iattach(NULL); ==== //depot/projects/vimage/src/sys/netipsec/xform_ah.c#22 (text+ko) ==== @@ -1236,7 +1236,7 @@ ah_attach(void) { -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ah_modinfo); #else ah_iattach(NULL); ==== //depot/projects/vimage/src/sys/netipsec/xform_esp.c#21 (text+ko) ==== @@ -1021,7 +1021,8 @@ static void esp_attach(void) { -#ifdef VIMAGE + +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_esp_modinfo); #else esp_iattach(NULL); ==== //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#17 (text+ko) ==== @@ -615,7 +615,7 @@ ipcomp_attach(void) { -#ifdef VIMAGE +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ipcomp_modinfo); #else ipcomp_iattach(NULL); ==== //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#22 (text+ko) ==== @@ -731,7 +731,8 @@ static void ipe4_attach(void) { -#ifdef VIMAGE + +#ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ipip_modinfo); #else ipip_iattach(NULL); ==== //depot/projects/vimage/src/sys/sys/vimage.h#77 (text+ko) ==== @@ -74,6 +74,9 @@ { #name, offsetof(struct vnet_##mod, _##name), \ sizeof(((struct vnet_##mod *) curthread)->_##name) } +#define VNET_MOD_NONE_VERSION 2008122301 + +#ifndef VIMAGE_GLOBALS #ifdef VIMAGE #define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ m_dependson, m_symmap) \ @@ -96,22 +99,33 @@ .vmi_iattach = m_iattach, \ .vmi_idetach = m_idetach \ }; -#else -#ifdef VIMAGE_GLOBALS +#else /* !VIMAGE */ #define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson, m_symmap) -#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ - m_dependson) -#else -#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ m_dependson, m_symmap) \ static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ + .vmi_id = VNET_MOD_##m_name_uc, \ + .vmi_dependson = VNET_MOD_##m_dependson, \ + .vmi_name = #m_name_lc, \ + .vmi_iattach = m_iattach, \ + .vmi_struct_size = \ + sizeof(struct vnet_##m_name_lc), \ .vmi_symmap = m_symmap \ }; #define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson) \ + static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ + .vmi_id = VNET_MOD_##m_name_uc, \ + .vmi_dependson = VNET_MOD_##m_dependson, \ + .vmi_name = #m_name_lc, \ + .vmi_iattach = m_iattach \ +}; +#endif +#else /* VIMAGE_GLOBALS */ +#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson, m_symmap) +#define VNET_MOD_DECLARE_STATELESS(m_name_uc, m_name_lc, m_iattach, m_idetach, \ m_dependson) #endif -#endif typedef int vnet_attach_fn(const void *); typedef int vnet_detach_fn(const void *); From owner-p4-projects@FreeBSD.ORG Fri Dec 26 23:54:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E8B21065675; Fri, 26 Dec 2008 23:54:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5E1F1065673 for ; Fri, 26 Dec 2008 23:54:11 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C40238FC12 for ; Fri, 26 Dec 2008 23:54:11 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBQNsBhX011846 for ; Fri, 26 Dec 2008 23:54:11 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBQNsBv4011844 for perforce@freebsd.org; Fri, 26 Dec 2008 23:54:11 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 26 Dec 2008 23:54:11 GMT Message-Id: <200812262354.mBQNsBv4011844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155302 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: Fri, 26 Dec 2008 23:54:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=155302 Change 155302 by rene@rene_self on 2008/12/26 23:53:12 Finish draft translation of contributing-ports article. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#2 (text+ko) ==== @@ -47,7 +47,7 @@ onze gebruikers een repository van software van derde partijen bieden dat gemakkelijk te gebruiken, bijgewerkt, en van hoge kwaliteit is. We hebben mensen nodig die wat tijd en moeite - investeren om ons dit doel te helpen bereiken. + investeren om ons dit doel te helpen bereiken. Iedereen kan erin betrokken raken, en er zijn vele manieren om dat te doen. Bijdragen aan ports is een uitstekende manier om te @@ -233,7 +233,7 @@ - Interaction with other users, maintainers and + <title>Interactie met andere gebruikers, onderhouders, en ontwikkelaars. Een gedeelte van een onderhouder zijn is het opnemen @@ -312,517 +312,544 @@ vraag ze dan om u te helpen door een update te versturen. - You may also receive automated email from the - &os; Ports Version Check informing - you that a newer version of your port's distfile is - available. More information about that system - (including how to stop future emails) will be provided - in the message. + U kunt ook geautomatiseerde email van de &os; + Ports Version Check ontvangen die u informeert + of er een nieuwe versie van het distributiebestand van uw + port beschikbaar is. Meer informatie ovre dat systeem + (inclusief hoe toekomstige emails te stoppen) staat in het + bericht. - Incorporate changes + Verwerk veranderingen - When they become available, incorporate the changes - into the port. You need to be able to generate a patch - between the original port and your updated port. + Verwerk veranderingen in de port wanneer ze + beschikbaar komen. U dient een patch aan te kunnen maken + tussen de originele port en uw bijgwerkte port. - Review and test + Review en test - Thoroughly review and test your changes: + Review en test uw veranderingen grondig: - Build, install and test your port on as many - platforms and architectures as you can. It is - common for a port to work on one branch or platform - and fail on another. + Bouw, installeer, en test uw port op zoveel + mogelijk platforms en architecturen. Het is + gebruikelijk dat een port op één tak of + platform werkt maar faalt op een ander. - Make sure your port's dependencies are complete. - The recommended way of doing this is by installing - your own ports tinderbox. - See resources - for more information. + Zorg dat de afhankelijkheden van uw port compleet + zijn. De aangeraden manier om dit te doen is door uw + eigen ports tinderbox te + installeren. Kijk in + bronnen voor meer informatie. - Check that the packing list is up to date. This - involves adding in any new files and directories and - removing unused entries. + Controleer of de pakketlijst actueel is. Dit + omvat het toevoegen van nieuwe bestanden en mappen en + het verwijderen van ongebruikte regels. - Verify your port using &man.portlint.1; as a - guide. See resources - for important information about using - portlint. + Verifieer uw port met &man.portlint.1; als gids. + Kijk in bronnen voor + belangrijke informatie over het gebruik van + portlint. + - Consider whether changes to your port might - cause any other ports to break. If this is the - case, coordinate the changes with the maintainers of - those ports. This is especially important if your - update changes the shared library version; in this - case, at the very least, the dependent ports will - need to get a PORTREVISION bump - so that they will automatically be upgraded by - automated tools such as &man.portupgrade.1;. + Overweeg of veranderingen aan uw port andere ports + zou kunnen kapotmaken. Bespreek de veranderingen met + de onderhouders van die ports als dit het geval is. + Dit is speciaal van belang als uw update de versie van + de gedeelde bibliotheek verandert; in dit geval dienen + tenminste de afhankelijke ports een verhoging van de + PORTREVISION te krijgen zodat ze + automatisch worden bijgewerkt door geautomatiseerde + gereedschappen als &man.portupgrade.1;. - Submit changes + Stuur de veranderingen in - Send your update by submitting a PR with an - explanation of the changes and a patch containing the - differences between the original port and the updated - one. Please refer to - Writing FreeBSD Problem Reports - for information on how to write a really good PR. + Verzend uw update door een PR met een uitleg van de + veranderingen en een patch die de verschillen tussen de + originele port en de bijgewerkte port bevat in te sturen. + Bekijk alstublieft in Probleemrapporten + voor &os; schrijven voor informatie over hoe + een echt goed PR te schrijven. - Please do not submit a &man.shar.1; archive of the - entire port; instead, use &man.diff.1; -r. - In this way, committers can much more easily see exactly - what changes are being made. The Porter's Handbook - section on - Upgrading - has more information. + Stuur alstublieft geen &man.shar.1;-archief van de + gehele port; gebruik in plaats daarvan &man.diff.1; + -r. Op deze manier kunnen committers + veel makkelijker zien welke veranderingen er precies + gemaakt worden. De sectie in het Porter's Handbook over + + Upgrading heeft meer informatie + hierover. - Wait + Wacht - At some stage a committer will deal with your PR. - It may take minutes, or it may take weeks - so please - be patient. + Op een gegeven moment zal een committer uw PR + behandelen. Dit kan minuten, maar ook weken duren - dus + ben alstublieft geduldig. - Give feedback + Geef feedback - If a committer finds a problem with your changes, - they will most likely refer it back to you. A prompt - response will help get your PR committed faster, and - is better for maintaining a thread of conversation - when trying to resolve any problems. + Als een committer een probleem vindt in uw + veranderingen zullen ze het waarchijnlijk aan u + terugkoppelen. Een snel antwoord helpt om uw PR sneller + gecommit te krijgen, en is beter voor het behouden van een + discussie wanneer er geprobeerd wordt om problemen op te + lossen. - And Finally + En ten slotte - Your changes will be committed and your port will - have been updated. The PR will then be closed by the - committer. That's it! + Uw veranderingen zullen gecommit worden en uw port zal + bijgewerkt zijn. Het PR wordt vervolgens door de + committer gesloten. Dat is alles! - Ensure your ports continue to build correctly + Zorg ervoor dat uw ports blijvend correct bouwen - This section is about discovering and fixing problems - that stop your ports from building correctly. + Deze sectie gaat over het ontdekken en oplossen van + problemen die tegenhouden dat uw ports correct bouwen. - &os; only guarantees that the Ports Collection works on - the -STABLE branches. You should be - running 5-STABLE or - 6-STABLE, preferably the latter. In - theory, you should be able to get by with running the latest - release of each stable branch (since the ABIs are not - supposed to change) but if you can run the branch, that is - even better. + &os; garandeert alleen dat de Portscollectie op de + -STABLE-takken werkt. U dient + 5-STABLE of 6-STABLE te + draaien, bij voorkeur de laatste. In theorie zou het + voldoende moeten zijn om de niewste uitgave van elke + STABLE-tak te draaien (aangezien de ABI's niet horen te + veranderen), maar als u die tak kunt draaien is dat + beter. - Since the majority of &os; installations run on - PC-compatible machines (what is termed the i386 - architecture), we expect you to keep the port working on that - architecture. However, as more and more people start using - the amd64 architecture running native, it is - going to be more and more important to make sure that ports run - there as well. It is completely fair to ask for help if you - do not have one of these machines. + Aangezien de meerderheid van &os;-installaties op + PC-compatibele machines draait (wat wordt aangeduid als de + i386-architectuur), verwachten wij van u + dat u de port op die architectuur werkend houdt. Omdat echter + steeds meer mensen de amd64-architectuur + als zodanig gaan draaien, wordt het steeds belangrijker om + er voor te zorgen dat ports daarop ook draaien. Het is prima + om om hulp te vragen als u een van deze machines niet + heeft. - The usual failure modes for non-i386 - machines are that the original programmers assumed that, for - instance, pointers are ints, or that the - relatively lax gcc 2.95 compiler - was being used. More and more, application authors are - reworking their code to remove these assumptions — - but if the author is not actively maintaining their code, - you may need to do this yourself. + De gebruikelijke manieren om te falen voor + niet-i386 machines zijn dat de originele + programmeurs aannamen dat, bijvoorbeeld, pointers + ints zijn of dat de relatief laxe + compiler gcc 2.95 werd + gebruikt. Steeds meer werken applicatie-auteurs aan het + verwijderen van deze aannames — maar als de auteur de + code niet actief onderhoudt, zult u dit zelf moeten + doen. - These are the tasks you need to perform to ensure your - port is able to be built: + Deze taken moet u uitvoeren om ervoor te zorgen dat uw + port gebouwd kan worden: - Watch for build failures + Kijk uit naar bouwfouten - Regularly check the automated ports building cluster, - pointyhat, - and the - distfiles survey - to see if any of the ports you maintain are failing to - build or fetch (see resources - for more information about these systems). Reports of - failures may also come to you from other users or - automated systems via email. + Controleer regelmatig het geautomatiseerde + portbouwcluster, pointyhat, + en de + overzicht van distributiebestanden om te zien + of er ports zijn die u onderhoudt die er niet in slagen om + te worden gebouwd of opgehaald (bekijk bronnen voor meer informatie + over deze systemen). Rapportages over mislukkingen kunnen + ook via email van andere gebruikers of geautomatiseerde + systemen tot u komen. - Collect information + Verzamel informatie - Once you are aware of a problem, collect information - to help you fix it. Build errors reported by - pointyhat are accompanied by logs - which will show you where the build failed. If the failure - was reported to you by a user, ask them to send you - information which may help in diagnosing the problem, - such as: + Als u op de hoogte bent van een probleem, verzamel dan + informatie die u helpt het op te lossen. Bouwfouten die + door pointyhat worden gerapporteerd + worden vergezeld door logs die aangeven waar het bouwen + mislukte. Als de mislukking door een gebruiker aan u werd + gerapporteerd, vraa ze dan om informatie te verzenden dat + u helpt om het probleem te diagnosticeren, zoals: - Build logs + Bouwlogs - The commands and options used to build the - port (including options set in - /etc/make.conf) + De commando's en opties die gebruikt werden om de + port te bouwen (inclusief opties die in + /etc/make.conf zijn + ingesteld) - A list of packages installed on their system - as shown by &man.pkg.info.1; + Een lijst met op hun systeem geïnstalleerde + pakketten als aangegeven door &man.pkg.info.1; - The version of &os; they are running as - shown by &man.uname.1; -a + De versie van &os; die ze draaien als aangegeven + door &man.uname.1; -a - When their ports collection was last updated - + Wanneer hun Portscollectie voor het laatst was + bijgewerkt - When their INDEX file - was last updated + Wanneer hun bestand INDEX + voor het laatst was bijgewerkt + - Investigate and find a solution + Onderzoek en zoek een oplossing - Unfortunately there is no straightforward process to - follow to do this. Remember, though: if you are stuck, - ask for help! The &a.ports; is a good place to start, and - the upstream developers are often very helpful. + Helaas is er geen rechttoe-rechtaan proces dat gevolgd + kan worden om dit te doen. Herinner: vraag om hulp als u + vast zit! De &a.ports; is een goede plaats om te starten, + en de stroomopwaartse ontwikkelaars zijn vaak zeer + behulpzaam. - Submit changes + Stuur veranderingen in - Just as with updating a port, you should now - incorporate changes, review and test, submit your - changes in a PR, and provide feedback if required. - + Net zoals bij het bijwerken van een port, dient u nu + de veranderingen te integreren, te reviewen en te testen, + uw veranderingen als een PR in te sturen, en feedback te + geven als dat nodig is. - Send patches to upstream authors + Stuur patches naar de stroomopwaartse auteurs - In some cases, you will have to make patches to - the port to make it run on FreeBSD. Some (but not all) - upstream authors will accept such patches back into - their code for the next release. If so, this may even - help their users on other BSD-based systems as well and - perhaps save duplicated effort. Please consider sending - any applicable patches to the authors as a courtesy. - + In sommige gevallen moet u patches maken om de port + op &os; te laten draaien. Sommige (maar niet alle) + stroomopwaartse auteurs zullen zulke patches in hun code + accepteren voor de volgende uitgave. Als dit zo is, kan + dit zelfs hun gebruikers op andere op BSD-gebaseerde + systemen helpen en misschien dubbel werk besparen. + Overweeg alstublieft om geschike patches naar de auteurs + te zenden als teken van goede wil. - Investigate bug reports and PRs related to your port - + Onderzoek foutrapporten en PR's die aan uw port + gerelateerd zijn - This section is about discovering and fixing bugs. - + Deze sectie gaat over het ontdekken en repareren van + bugs. - &os;-specific bugs are generally caused by assumptions - about the build and runtime environments that do not apply to - &os;. You are less likely to encounter a problem of this - type, but it can be more subtle and difficult to diagnose. - + &os;-specifieke bugs worden in het algemeen veroorzaakt + door aannames over de bouw- en draaiomgevingen die niet voor + &os; gelden. U zult zo'n soort fout minder snel aantreffen, + maar het kan subtieler en moelijker vast te stellen + zijn. - These are the tasks you need to perform to ensure your - port continues to work as intended: + De onderstaande taken moet u uitvoeren om ervoor te zorgen + dat uw port als bedoeld blijft werken: - Respond to bug reports + Reageer op bugrapporten - Bugs may be reported to you through email via the - - GNATS Problem Report database. Bugs may - also be reported directly to you by users. + Bugs kunnen per email via de + GNATS Probleemrapportendatabase aan u worden + gerapporteerd. Bugs kunnen ook direct door gebruikers aan + u gerapporteerd worden. - You should respond to PRs and other reports within - 14 days, but please try not to take that long. Try to respond - as soon as possible, even if it is just to say you need some - more time before you can work on the PR. + U dient binnen 14 dagen op PR's en andere rapporten te + reageren, probeer hier alstublieft niet zo lang over te + doen. Probeer zo snel mogelijk te reageren, zelfs als het + alleen maar is om te zeggen dat u wat meer tijd nodig + heeft voordat u aan het PR kan werken. - Collect information + Verzamel informatie - If the person reporting the bug has not also provided - a fix, you need to collect the information that will - allow you to generate one. + Als degene die de bug heeft gerapporteerd niet ook een + reparatie heeft aangeleverd, zult u informatie moeten + verzamelen die u in staat stelt om er een te + genereren. - If the bug is reproducible, you can collect most of - the required information yourself. If not, ask the - person who reported the bug to collect the information - for you, such as: - + Als de bug reproduceerbaar is, kunt u zelf de meeste + vereiste informatie verzamelen. Zo niet, vraag dan degene + die de bug rapporteerde om de informatie voor u te + verzamelen, zoals: - A detailed description of their actions, - expected program behavior and actual behavior - + Een gedetailleerde beschrijving van hun acties, + verwacht gedrag en eigenlijk gedrag van het + programma - Copies of input data used to trigger the bug - + Kopiën van invoergegevens die de bug + aanzwengelden - Information about their build and execution - environment - for example, a list of installed - packages and the output of &man.env.1; + Informatie over hun bouw- en uitvoeromgeving - + bijvoorbeeld een lijst van geïnstalleerde + pakketten en de uitvoer van &man.env.1; - Core dumps + Coredumps - Stack traces + Stacktraces - Eliminate incorrect reports + Elimineer onjuiste rapporten - Some bug reports may be incorrect. For example, - the user may have simply misused the program; or their - installed packages may be out of date and require - updating. Sometimes a reported bug is not specific to - &os;. In this case report the bug to the upstream - developers. If the bug is within your capabilities to - fix, you can also patch the port so that the fix is - applied before the next upstream release. + Sommige bugrapporten kunnen onjuist zijn. De + gebruiker kan het programma simpelweg verkeerd gebruikt + hebben; of hun geïnstalleerde pakketten kunnen + verouderd zijn en bijgewerkt moeten worden. Soms is een + gerapporteerde fout niet specifiek voor &os;. Rapporteer + in dit geval de bug naar de stroomopwaartse ontwikkelaars. + Als u de bug kunt repareren, kunt u de port ook patchen + zodat de reparatie is toegepast voor de volgende + stroomopwaartse uitgave. - Find a solution + Vind een oplossing - As with build errors, you will need to sort out a fix - to the problem. Again, remember to ask if you are - stuck! + Net als met bouwfouten dient u een oplossing voor het + probleem te vinden. Nogmaals, vraag om hulp als u + vastzit! - Submit or approve changes + Stuur veranderingen in of keur ze goed - Just as with updating a port, you should now - incorporate changes, review and test, and submit your - changes in a PR (or send a follow-up if a PR already - exists for the problem). If another user has submitted - changes in the PR, you can also send a follow-up saying - whether or not you approve the changes. + Net als bij het bijwerken van een port, dient u nu de + veranderingen te integreren, ze te herzien en te testen, + en ze in een PR op te sturen (of een vervolg te verzenden + als er al een PR voor het probleem bestaat). Als een + andere gebruiker veranderingen in het PR heeft ingezonden, + kunt u ook een vervolg sturen waarin u zegt of u de + veranderingen wel of niet goedkeurt. - Providing support + Ondersteuning bieden - Part of being a maintainer is providing support — not - for the software in general — but for the port and any - &os;-specific quirks and problems. Users may contact you with - questions, suggestions, problems and patches. Most of the - time their correspondence will be specific to &os;. + Deel van een onderhouder zijn is ondersteuning bieden + — niet noodzakelijk voor de software in het algemeen + — maar voor de port en alle &os;-specifieke wijzigingen + en problemen. Gebruikers kunnen contact met u opnemen met + vragen, suggesties, problemen, en patches. Meestal zal hun + correspondentie specifiek voor &os; zijn. - Occasionally you may have to invoke your skills in - diplomacy, and kindly point users seeking general support to - the appropriate resources. Less frequently you will encounter - a person asking why the RPMs are not up to date - or how can they get the software to run under Foo Linux. Take the - opportunity to tell them that your port is up to date (if it - is, of course!), and suggest that they try &os;. - + Af en toe zult u uw diplomatieke vaardigheden moeten + gebruiken, en gebruikers die algemene ondersteuning zoeken + vriendelijk naar de geschikte bronnen verwijzen. Minder vaak + zult u iemand tegenkomen die vraagt waarrom de + RPMs niet actueel zijn of hoe ze de + software onder Foo Linux kunnen draaien. Grijp deze kans om + ze te vertellen dat uw port actueel is (als het dat is, + uiteraard!) en stel voor dat ze &os; uitproberen. - Sometimes users and developers will decide that you are a - busy person whose time is valuable and do some of the work for - you. For example, they might: - + Soms zullen gebruikers en ontwikkelaars besluiten dat u + een druk persoon bent wiens tijd waardevol is en wat van het + werk voor u doen. Ze kunnen bijvoorbeeld: - submit a PR or send you patches to update your port, - + een PR insturen of u patches toesturen om uw port bij + te werken, - investigate and perhaps provide a fix to a PR, or - + een PR onderzoeken en er misschien een reparatie voor + aanleveren, of - otherwise submit changes to your port. + op andere wijze veranderen aan uw port + insturen. - In these cases your main obligation is to respond in a - timely manner. The timeout for non-responsive maintainers is - 14 days. After this period changes may be committed - unapproved. They have taken the trouble to do this for you; - so please try to at least respond promptly. Then review, - approve, modify or discuss their changes with them as soon as - possible. + In deze gevallen is uw hoofdplicht om op tijd te reageren. + De timeout voor niet-reagerende onderhouders is 14 dagen. Na + deze periode mogen niet-goedgekeurde veranderingen gecommit + worden. Ze hebben de moeite genomen om u voor dit te doen; + dus probeer tenminste op tijd te reageren. Review, keur, + wijzig, of bediscussieer daarna zo snel mogelijk hun + veranderingen met ze. - If you can make them feel that their contribution is - appreciated (and it should be) you will have a better chance - persuading them to do more things for you in the future - :-). + Als u ervoor kunt zorgen dat ze het gevoel hebben dat hun + bijdrage gewaardeerd wordt (wat zo hoort te zijn), dan heeft u + een grotere kans om ze te overtuigen om in de toekomst meer + voor u te doen :-). - Finding and fixing a broken port + Een kapotte port vinden en repareren - There are two really good places to find a port that needs - some attention. + Er zijn twee zeer goede plaatsen om een port te vinden die wat + aandacht nodig heeft. - You can use the - web interface - to the Problem Report database to search through and view unresolved - PRs. The majority of ports PRs are updates, but with a little - searching and skimming over synopses you should be able to find - something interesting to work on (the sw-bug - class is a good place to start). - + U kunt de web + interface voor de probleeemrapportendatabase gebruiken om + door onopgeloste PR's te zoeken en ze te bekijken. De meerderheid + van port-PR's zijn updates, maar met een beetje zoeken door en + uitkammen van de samenvattingen zou u iets moeten kunnen vinden + wat interessant is om aan te werken (de klasse + sw-bug is een goede plaats om te + beginnen). - The other place is the - &os; Ports Monitoring System. - In particular look for unmaintained ports with build errors and - ports that are marked BROKEN. It is OK to send - changes for a maintained port as well, but remember to ask the - maintainer in case they are already working on the problem. + De andere plaats is het &os; Ports Monitoring + System. Zoek in het bijzonder naar niet-onderhouden + ports met bouwfouten en ports die als BROKEN + zijn gemerkt. Het is ook goed om veranderingen voor een + onderhouden port te versturen, maar denk eraan om de onderhouder + te vragen in het geval dat ze al aan het probleem werken. - Once you have found a bug or problem, collect information, - investigate and fix! If there is an existing PR, follow up to - that. Otherwise create a new PR. Your changes will be reviewed - and, if everything checks out, committed. + Als u eenmaal een bug of probleem heeft gevonden, verzamel dan + informatie, onderzoek en repareer het! Als er een bestaand PR is, + ga dan daar mee verder. Maak anders een nieuw PR aan. Uw + veranderingen zullen worden herzien en, als alles goed is, + gecommit. - When to call it quits + Wanneer het tijd wordt om te stoppen - As your interests and commitments change, you may find that - you no longer have time to continue some (or all) of your ports - contributions. That is fine! Please let us know if you are no - longer using a port or have otherwise lost time or interest in - being a maintainer. In this way we can go ahead and allow other - people to try to work on existing problems with the port without - waiting for your response. Remember, &os; is a volunteer project, - so if maintaining a port is no fun anymore, it is probably time to - let someone else do it! + Wanneer uw interesses en toewijdingen veranderen, zult u + erachter komen dat u niet langer tijd heeft om sommige van (of al) + uw ports-bijdragen voort te zetten. Dat is prima! Laat ons weten + als u een port niet langer gebruikt of om andere redenen de tijd + of interesse heeft verloren om te onderhouden. Op deze manier + kunnen we verder gaan en andere mensen toestaan om te proberen om + aan bestaande problemen met de port te werken zonder op uw + antwoord te wachten. Herinner dat &os; een vrijwilligersproject + is, dus al het onderhouden van een port niet langer leuk is, is + het waarschijnlijk tijd om iemand anders het te laten doen! - In any case, the Ports Management Team (portmgr) - reserves the right to reset your maintainership if you have not - actively maintained your port in some time. (Currently, this is - set to 3 months.) By this, we mean that there are unresolved - problems or pending updates that have not been worked on during - that time. + In elk geval houdt het Ports Management Team + (portmgr) zich het recht voor om u als + onderhouder te wissen als u uw port voor enige tijd niet actief + heeft onderhouden. (Momenteel is dit 3 maanden). Hiermee + bedoelen we dat er onopgeloste problemen of wachtende updates zijn + waaraan binnen die tijd niet gewerkt is. - Resources for ports maintainers and contributors + Bronnen voor onderhouders en vrijwilligers voor ports - The - Porter's Handbook - is your hitchhiker's guide to the ports system. Keep it handy! - + Het Porter's Handbook is + uw overlevingsgids voor het ports-systeem. Hou het in de + buurt! - Writing FreeBSD Problem Reports - describes how to best formulate and submit a PR. In 2005 more - than eleven thousand ports PRs were submitted! Following this - article will greatly assist us in reducing the time needed to - handle your PRs. + Probleemrapporten + voor &os; schrijven beschrijft hoe het beste een PR + geformuleerd en ingezonden kan worden. In 2005 werden er meer dan + elfduizend port-PR's ingestuurd! Het volgen van dit artikel helpt + ons enorm om de tijd te verkorten die nodig is om uw PR's te + behandelen. - The - - Problem Report database. + De + Probleemrapportendatabase. Pointyhat - is the ports build cluster. You can use Pointyhat to check port - build logs across all architectures and major releases. + is het port-bouwcluster. U kunt Pointyhat gebruiken om buidlogs + van ports over alle architecturen en grote uitgaven te + controleren. + + Het &os; Ports Monitoring + System kan u kruislingse informatie over ports zoals + bouwfouten en probleemrapporten laten zien. Als u een onderhouder + bent kunt u het gebruiken om de bouwstatus van uw ports te + controleren. Als een vrijwilliger kunt u het gebruiken om kapotte + en niet-onderhouden ports te vinden die gerepareerd moeten + worden. - The - FreeBSD Ports Monitoring System - can show you cross-referenced information about ports such as - build errors and problem reports. If you are a maintainer you can - use it to check on the build status of your ports. As a - contributor you can use it to find broken and unmaintained ports - that need to be fixed. + Bill Fenners overzicht + van distributiebestanden kan u ports laten zien waarvoor + de distributiebestanden niet kunnen worden opgehaald. U kunt uw + eigen ports controleren of u kunt het gebruiken om ports te vinden + waarvan de MASTER_SITES moet worden + bijwerkt. - Bill Fenner's - distfile survey - can show you ports for which the distfiles are not fetchable. You - can check on your own ports or use it to find ports that need their - MASTER_SITES updated. - + De ports-tinderbox is de meest + grondige manier om een port door de gehele cyclus van installatie, + inpakken, en deïnstallatie te halen. Het biedt een + opdrachtregelinterface maar kan ook via een webinterface worden + beheerd. Meer informatie staat op de marcuscom tinderbox + homepage. - The ports tinderbox is the most - thorough way to test a port through the entire cycle of installation, - packaging, and deinstallation. It features a command-line - interface but also can be controlled via a web interface. - Please see ports/ports-mgmt/tinderbox. - More documentation is located at the - marcuscom tinderbox home page. - + &man.portlint.1; is een applicatie die gebruikt kan worden om + te verifiëren dat uw port zich aan vele belangrijke + stylistische en functionele richtlijnen houdt. + portlint is een eenvoudige heuristieke + applicatie, dus dient u het alleen als gids + te gebruiken. Als portlint + veranderingen voorstelt die onredelijk lijken, raadpleeg dan het + Porter's Handbook + of vraag om advies. - &man.portlint.1; is an application which can be used to verify - that your port conforms to many important stylistic and functional - guidelines. portlint is a simple - heuristic application, so you should use it only as a - guide. If portlint suggests - changes which seem unreasonable, consult the - Porter's Handbook or - ask for advice. - The &a.ports; is for general ports-related discussion. It is - a good place to ask for help. You can - subscribe, or - read and search the list archives. Reading the archives of - the &a.ports-bugs; and the &a.cvs-ports; may also be of interest. + De &a.ports; dient voor algemene ports-gerelateerde + discussies. Het is een goede plaats om om hulp te vragen. U kunt + zich + aanmelden, of de lijstarchieven lezen en doorzoeken. + Het lezen van de archieven van de &a.ports-bugs; en de + &a.cvs-ports; kan ook interessant zijn. From owner-p4-projects@FreeBSD.ORG Sat Dec 27 02:34:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D88191065677; Sat, 27 Dec 2008 02:34:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B38E106564A for ; Sat, 27 Dec 2008 02:34:55 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B2BE8FC1F for ; Sat, 27 Dec 2008 02:34:55 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBR2YtNA036540 for ; Sat, 27 Dec 2008 02:34:55 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBR2Yt01036538 for perforce@freebsd.org; Sat, 27 Dec 2008 02:34:55 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 27 Dec 2008 02:34:55 GMT Message-Id: <200812270234.mBR2Yt01036538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 155304 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: Sat, 27 Dec 2008 02:34:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=155304 Change 155304 by thompsa@thompsa_burger on 2008/12/27 02:34:35 IFC@155303 Affected files ... .. //depot/projects/usb/src/sys/arm/include/ieee.h#2 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp435_ehci.c#2 delete .. //depot/projects/usb/src/sys/conf/files#44 integrate .. //depot/projects/usb/src/sys/conf/options#15 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#9 integrate .. //depot/projects/usb/src/sys/dev/agp/agp.c#4 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#47 integrate .. //depot/projects/usb/src/sys/dev/usb/umass.c#53 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#24 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_bsd.c#7 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#12 integrate .. //depot/projects/usb/src/sys/kern/uipc_domain.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#12 integrate .. //depot/projects/usb/src/sys/modules/netgraph/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/netgraph/ether_echo/Makefile#1 branch .. //depot/projects/usb/src/sys/net/if_tun.c#11 integrate .. //depot/projects/usb/src/sys/net/route.h#7 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#13 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ether_echo.c#1 branch .. //depot/projects/usb/src/sys/netgraph/ng_ether_echo.h#1 branch .. //depot/projects/usb/src/sys/netinet/if_ether.c#15 integrate .. //depot/projects/usb/src/sys/netinet/in.c#13 integrate .. //depot/projects/usb/src/sys/netinet/ipprotosw.h#2 delete .. //depot/projects/usb/src/sys/netinet6/in6.c#12 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#11 integrate .. //depot/projects/usb/src/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/usb/src/sys/sys/tree.h#4 integrate Differences ... ==== //depot/projects/usb/src/sys/arm/include/ieee.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * * @(#)ieee.h 8.1 (Berkeley) 6/11/93 * - * $FreeBSD: src/sys/arm/include/ieee.h,v 1.2 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/ieee.h,v 1.3 2008/12/23 22:20:59 marcel Exp $ * */ @@ -91,6 +91,12 @@ #define DBL_EXPBITS 11 #define DBL_FRACBITS 52 +#if defined(__VFP_FP__) +#define _IEEE_WORD_ORDER _BYTE_ORDER +#else +#define _IEEE_WORD_ORDER _BIG_ENDIAN +#endif + struct ieee_single { #if _BYTE_ORDER == _BIG_ENDIAN u_int sng_sign:1; @@ -110,10 +116,15 @@ u_int dbl_frach:20; u_int dbl_fracl; #else +#if _IEEE_WORD_ORDER == _LITTLE_ENDIAN u_int dbl_fracl; +#endif u_int dbl_frach:20; u_int dbl_exp:11; u_int dbl_sign:1; +#if _IEEE_WORD_ORDER == _BIG_ENDIAN + u_int dbl_fracl; +#endif #endif }; ==== //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#5 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.6 2008/12/20 03:26:09 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.7 2008/12/23 17:40:02 sam Exp $ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard @@ -45,4 +45,4 @@ # arm/xscale/ixp425/ixp425_qmgr.c optional qmgr # -arm/xscale/ixp425/ixp435_ehci.c optional ehci +dev/usb/ehci_ixp4xx.c optional ehci ==== //depot/projects/usb/src/sys/conf/files#44 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1358 2008/12/22 21:37:06 alfred Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1359 2008/12/25 07:34:14 julian Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2288,6 +2288,7 @@ netgraph/ng_echo.c optional netgraph_echo netgraph/ng_eiface.c optional netgraph_eiface netgraph/ng_ether.c optional netgraph_ether +netgraph/ng_ether_echo.c optional netgraph_ether_echo netgraph/ng_fec.c optional netgraph_fec netgraph/ng_frame_relay.c optional netgraph_frame_relay netgraph/ng_gif.c optional netgraph_gif ==== //depot/projects/usb/src/sys/conf/options#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.652 2008/12/20 03:02:32 sam Exp $ +# $FreeBSD: src/sys/conf/options,v 1.653 2008/12/25 07:34:14 julian Exp $ # # On the handling of kernel options # @@ -459,6 +459,7 @@ NETGRAPH_ECHO opt_netgraph.h NETGRAPH_EIFACE opt_netgraph.h NETGRAPH_ETHER opt_netgraph.h +NETGRAPH_ETHER_ECHO opt_netgraph.h NETGRAPH_FEC opt_netgraph.h NETGRAPH_FRAME_RELAY opt_netgraph.h NETGRAPH_GIF opt_netgraph.h ==== //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.13 2008/12/02 21:37:28 bz Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.14 2008/12/23 16:49:07 bz Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -156,7 +156,9 @@ # include # if defined(NETBSD_PF) # include -# include +# if (__FreeBSD_version < 501108) +# include +# endif /* * We provide the fr_checkp name just to minimize changes later. */ ==== //depot/projects/usb/src/sys/dev/agp/agp.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.60 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.61 2008/12/23 16:04:33 kib Exp $"); #include "opt_bus.h" @@ -564,6 +564,7 @@ device_printf(dev, "memory already bound\n"); error = EINVAL; VM_OBJECT_LOCK(mem->am_obj); + i = 0; goto bad; } @@ -592,7 +593,6 @@ * Bail out. Reverse all the mappings * and unwire the pages. */ - vm_page_wakeup(m); for (k = 0; k < i + j; k += AGP_PAGE_SIZE) AGP_UNBIND_PAGE(dev, offset + k); goto bad; @@ -622,8 +622,10 @@ bad: mtx_unlock(&sc->as_lock); VM_OBJECT_LOCK_ASSERT(mem->am_obj, MA_OWNED); - for (i = 0; i < mem->am_size; i += PAGE_SIZE) { - m = vm_page_lookup(mem->am_obj, OFF_TO_IDX(i)); + for (k = 0; k < mem->am_size; k += PAGE_SIZE) { + m = vm_page_lookup(mem->am_obj, OFF_TO_IDX(k)); + if (k >= i) + vm_page_wakeup(m); vm_page_lock_queues(); vm_page_unwire(m, 0); vm_page_unlock_queues(); ==== //depot/projects/usb/src/sys/dev/agp/agp_i810.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.48 2008/10/02 20:29:45 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.49 2008/12/23 16:16:30 rnoland Exp $"); #include "opt_bus.h" @@ -167,7 +167,7 @@ "Intel GM965 SVGA controller"}, {0x2A128086, CHIP_I965, 0x00020000, "Intel GME965 SVGA controller"}, - {0x2A428086, CHIP_I965, 0x00020000, + {0x2A428086, CHIP_G4X, 0x00020000, "Intel GM45 SVGA controller"}, {0x2E028086, CHIP_G4X, 0x00020000, "Intel 4 Series SVGA controller"}, @@ -284,6 +284,7 @@ case CHIP_I915: case CHIP_I965: case CHIP_G33: + case CHIP_G4X: deven = pci_read_config(bdev, AGP_I915_DEVEN, 4); if ((deven & AGP_I915_DEVEN_D2F0) == AGP_I915_DEVEN_D2F0_DISABLED) { @@ -348,6 +349,7 @@ case CHIP_I915: case CHIP_I965: case CHIP_G33: + case CHIP_G4X: device_printf(dev, "AGP_I855_GCC1: 0x%02x\n", pci_read_config(sc->bdev, AGP_I855_GCC1, 1)); device_printf(dev, "AGP_I915_MSAC: 0x%02x\n", @@ -397,7 +399,7 @@ return error; if (sc->chiptype != CHIP_I965 && sc->chiptype != CHIP_G33 && - ptoa((vm_paddr_t)Maxmem) > 0xfffffffful) + sc->chiptype != CHIP_G4X && ptoa((vm_paddr_t)Maxmem) > 0xfffffffful) { device_printf(dev, "agp_i810.c does not support physical " "memory above 4GB.\n"); @@ -659,8 +661,7 @@ return EINVAL; } - if (sc->chiptype != CHIP_G4X) - gtt_size += 4; + gtt_size += 4; sc->stolen = (stolen - gtt_size) * 1024 / 4096; if (sc->stolen > 0) @@ -780,6 +781,7 @@ case CHIP_I915: case CHIP_I965: case CHIP_G33: + case CHIP_G4X: return agp_generic_set_aperture(dev, aperture); } @@ -798,7 +800,8 @@ u_int32_t pte; pte = (u_int32_t)physical | 1; - if (sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33) { + if (sc->chiptype == CHIP_I965 || sc->chiptype == CHIP_G33 || + sc->chiptype == CHIP_G4X) { pte |= (physical & 0x0000000f00000000ull) >> 28; } else { /* If we do actually have memory above 4GB on an older system, @@ -825,6 +828,10 @@ bus_write_4(sc->sc_res[0], (offset >> AGP_PAGE_SHIFT) * 4 + (512 * 1024), pte); break; + case CHIP_G4X: + bus_write_4(sc->sc_res[0], + (offset >> AGP_PAGE_SHIFT) * 4 + (2 * 1024 * 1024), pte); + break; } } ==== //depot/projects/usb/src/sys/dev/drm/radeon_irq.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_irq.c,v 1.8 2008/08/23 20:59:12 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/radeon_irq.c,v 1.9 2008/12/23 22:53:57 rnoland Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -47,7 +47,8 @@ else dev_priv->irq_enable_reg &= ~mask; - RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); + if (dev->irq_enabled) + RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg); } static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state) @@ -59,7 +60,8 @@ else dev_priv->r500_disp_irq_reg &= ~mask; - RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); + if (dev->irq_enabled) + RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg); } int radeon_enable_vblank(struct drm_device *dev, int crtc) ==== //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#15 (text+ko) ==== @@ -83,9 +83,9 @@ #include "mixer_if.h" -#define HDA_DRV_TEST_REV "20081223_0120" +#define HDA_DRV_TEST_REV "20081226_0122" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.82 2008/12/22 22:40:17 mav Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.84 2008/12/26 22:47:11 mav Exp $"); #define HDA_BOOTVERBOSE(stmt) do { \ if (bootverbose != 0 || snd_verbose > 3) { \ @@ -658,19 +658,11 @@ #define AGERE_VENDORID 0x11c1 #define HDA_CODEC_AGEREXXXX HDA_CODEC_CONSTRUCT(AGERE, 0xffff) -/* - * Conexant - * - * Ok, the truth is, I don't have any idea at all whether - * it is "Venice" or "Waikiki" or other unnamed CXyadayada. The only - * place that tell me it is "Venice" is from its Windows driver INF. - * - * Venice - CX????? - * Waikiki - CX20551-22 - */ +/* Conexant */ #define CONEXANT_VENDORID 0x14f1 -#define HDA_CODEC_CXVENICE HDA_CODEC_CONSTRUCT(CONEXANT, 0x5045) -#define HDA_CODEC_CXWAIKIKI HDA_CODEC_CONSTRUCT(CONEXANT, 0x5047) +#define HDA_CODEC_CX20549 HDA_CODEC_CONSTRUCT(CONEXANT, 0x5045) +#define HDA_CODEC_CX20551 HDA_CODEC_CONSTRUCT(CONEXANT, 0x5047) +#define HDA_CODEC_CX20561 HDA_CODEC_CONSTRUCT(CONEXANT, 0x5051) #define HDA_CODEC_CXXXXX HDA_CODEC_CONSTRUCT(CONEXANT, 0xffff) /* VIA */ @@ -798,8 +790,9 @@ { HDA_CODEC_IDT92HD81B1X, "IDT 92HD81B1X" }, { HDA_CODEC_IDT92HD83C1C, "IDT 92HD83C1C" }, { HDA_CODEC_IDT92HD83C1X, "IDT 92HD83C1X" }, - { HDA_CODEC_CXVENICE, "Conexant Venice" }, - { HDA_CODEC_CXWAIKIKI, "Conexant Waikiki" }, + { HDA_CODEC_CX20549, "Conexant CX20549 (Venice)" }, + { HDA_CODEC_CX20551, "Conexant CX20551 (Waikiki)" }, + { HDA_CODEC_CX20561, "Conexant CX20561 (Hermosa)" }, { HDA_CODEC_VT1708_8, "VIA VT1708_8" }, { HDA_CODEC_VT1708_9, "VIA VT1708_9" }, { HDA_CODEC_VT1708_A, "VIA VT1708_A" }, @@ -2269,7 +2262,7 @@ HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_FIXED); break; } - } else if (id == HDA_CODEC_CXVENICE && sc->pci_subvendor == + } else if (id == HDA_CODEC_CX20549 && sc->pci_subvendor == HP_V3000_SUBVENDOR) { switch (nid) { case 18: @@ -2289,7 +2282,7 @@ HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_FIXED); break; } - } else if (id == HDA_CODEC_CXWAIKIKI && sc->pci_subvendor == + } else if (id == HDA_CODEC_CX20551 && sc->pci_subvendor == HP_DV5000_SUBVENDOR) { switch (nid) { case 20: @@ -4494,7 +4487,7 @@ HDA_QUIRK_IVREF80, HDA_QUIRK_IVREF50 | HDA_QUIRK_IVREF100 }, { HDA_MATCH_ALL, HDA_CODEC_AD1988B, HDA_QUIRK_IVREF80, HDA_QUIRK_IVREF50 | HDA_QUIRK_IVREF100 }, - { HDA_MATCH_ALL, HDA_CODEC_CXVENICE, + { HDA_MATCH_ALL, HDA_CODEC_CX20549, 0, HDA_QUIRK_FORCESTEREO } }; #define HDAC_QUIRKS_LEN (sizeof(hdac_quirks) / sizeof(hdac_quirks[0])) @@ -4555,6 +4548,32 @@ */ break; case HDA_CODEC_AD1986A: + /* + * This codec has overcomplicated input mixing. + * Make some cleaning there. + */ + /* Disable input mono mixer. Not needed and not supported. */ + w = hdac_widget_get(devinfo, 43); + if (w != NULL) + w->enable = 0; + /* Disable any with any input mixing mesh. Use separately. */ + w = hdac_widget_get(devinfo, 39); + if (w != NULL) + w->enable = 0; + w = hdac_widget_get(devinfo, 40); + if (w != NULL) + w->enable = 0; + w = hdac_widget_get(devinfo, 41); + if (w != NULL) + w->enable = 0; + w = hdac_widget_get(devinfo, 42); + if (w != NULL) + w->enable = 0; + /* Disable duplicate mixer node connector. */ + w = hdac_widget_get(devinfo, 15); + if (w != NULL) + w->connsenable[3] = 0; + if (subvendor == ASUS_A8X_SUBVENDOR) { /* * This is just plain ridiculous.. There ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#47 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ /* $NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.24 2008/11/25 02:19:02 weongyo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.25 2008/12/25 04:29:40 weongyo Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -1061,8 +1061,10 @@ for (i = 0; i < N(phyini); i++) zyd_write16_m(sc, phyini[i].reg, phyini[i].val); - if (sc->sc_rfrev == ZYD_RF_AL2230S || sc->sc_al2230s != 0) - zyd_write16_m(sc, phy2230s[i].reg, phy2230s[i].val); + if (sc->sc_rfrev == ZYD_RF_AL2230S || sc->sc_al2230s != 0) { + for (i = 0; i < N(phy2230s); i++) + zyd_write16_m(sc, phy2230s[i].reg, phy2230s[i].val); + } for (i = 0; i < 3; i++) { error = zyd_rfwrite_cr(sc, zyd_al2230_chtable[0][i]); ==== //depot/projects/usb/src/sys/dev/usb/umass.c#53 (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/usb/umass.c,v 1.171 2008/10/14 08:41:54 n_hibma Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.172 2008/12/24 06:59:07 sam Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -197,7 +197,7 @@ uByte bCDBLength; # define CBWCDBLENGTH 16 uByte CBWCDB[CBWCDBLENGTH]; -} umass_bbb_cbw_t; +} __packed umass_bbb_cbw_t; #define UMASS_BBB_CBW_SIZE 31 /* Command Status Wrapper */ @@ -212,7 +212,7 @@ # define CSWSTATUS_GOOD 0x0 # define CSWSTATUS_FAILED 0x1 # define CSWSTATUS_PHASE 0x2 -} umass_bbb_csw_t; +} __packed umass_bbb_csw_t; #define UMASS_BBB_CSW_SIZE 13 /* CBI features */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#18 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. @@ -1029,16 +1029,13 @@ at91dci_timeout(void *arg) { struct usb2_xfer *xfer = arg; - struct at91dci_softc *sc = xfer->usb2_sc; DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); /* transfer is transferred */ at91dci_device_done(xfer, USB_ERR_TIMEOUT); - - USB_BUS_UNLOCK(&sc->sc_bus); } static void ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci_atmelarm.c,v 1.3 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci_atmelarm.c,v 1.4 2008/12/23 17:36:25 thompsa Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. @@ -147,6 +147,7 @@ /* get all DMA memory */ + sc->sc_dci.sc_bus.parent = dev; if (usb2_bus_mem_alloc_all(&sc->sc_dci.sc_bus, USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#24 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $"); #include #include @@ -231,8 +231,7 @@ DPRINTF("start\n"); - usb2_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.bus_mtx, - CALLOUT_RETURNUNLOCKED); + usb2_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.bus_mtx, 0); #if USB_DEBUG if (ehcidebug > 2) { @@ -1425,8 +1424,6 @@ usb2_sw_transfer(&sc->sc_root_intr, &ehci_root_intr_done); - - USB_BUS_UNLOCK(&sc->sc_bus); } static void @@ -1525,16 +1522,13 @@ ehci_timeout(void *arg) { struct usb2_xfer *xfer = arg; - ehci_softc_t *sc = xfer->usb2_sc; DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); /* transfer is transferred */ ehci_device_done(xfer, USB_ERR_TIMEOUT); - - USB_BUS_UNLOCK(&sc->sc_bus); } static void ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#16 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2_pci.c,v 1.3 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2_pci.c,v 1.4 2008/12/23 17:36:25 thompsa Exp $"); /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. @@ -234,6 +234,7 @@ } /* get all DMA memory */ + sc->sc_bus.parent = self; if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), &ehci_iterate_hw_softc)) { return ENOMEM; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg.c,v 1.5 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg.c,v 1.6 2008/12/23 19:59:21 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -1246,16 +1246,13 @@ musbotg_timeout(void *arg) { struct usb2_xfer *xfer = arg; - struct musbotg_softc *sc = xfer->usb2_sc; DPRINTFN(1, "xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); /* transfer is transferred */ musbotg_device_done(xfer, USB_ERR_TIMEOUT); - - USB_BUS_UNLOCK(&sc->sc_bus); } static void ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg_atmelarm.c,v 1.3 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg_atmelarm.c,v 1.4 2008/12/23 17:36:25 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -104,6 +104,7 @@ /* get all DMA memory */ + sc->sc_otg.sc_bus.parent = dev; if (usb2_bus_mem_alloc_all(&sc->sc_otg.sc_bus, USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2.c,v 1.3 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2.c,v 1.4 2008/12/23 19:59:21 thompsa Exp $"); /* * USB Open Host Controller driver. @@ -390,8 +390,7 @@ /* set up the bus struct */ sc->sc_bus.methods = &ohci_bus_methods; - usb2_callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.bus_mtx, - CALLOUT_RETURNUNLOCKED); + usb2_callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.bus_mtx, 0); #if USB_DEBUG if (ohcidebug > 15) { @@ -1092,8 +1091,6 @@ usb2_sw_transfer(&sc->sc_root_intr, &ohci_root_intr_done); - - USB_BUS_UNLOCK(&sc->sc_bus); } static void @@ -1237,16 +1234,13 @@ ohci_timeout(void *arg) { struct usb2_xfer *xfer = arg; - ohci_softc_t *sc = xfer->usb2_sc; DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); /* transfer is transferred */ ohci_device_done(xfer, USB_ERR_TIMEOUT); - - USB_BUS_UNLOCK(&sc->sc_bus); } static void @@ -2342,10 +2336,8 @@ case UHF_C_PORT_OVER_CURRENT: case UHF_C_PORT_RESET: /* enable RHSC interrupt if condition is cleared. */ - if ((OREAD4(sc, port) >> 16) == 0) { + if ((OREAD4(sc, port) >> 16) == 0) ohci_rhsc_enable(sc); - USB_BUS_LOCK(&sc->sc_bus); - } break; default: break; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#12 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2_atmelarm.c,v 1.2 2008/11/10 20:54:31 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2_atmelarm.c,v 1.3 2008/12/23 17:36:25 thompsa Exp $"); #include #include @@ -75,6 +75,7 @@ } /* get all DMA memory */ + sc->sc_ohci.sc_bus.parent = dev; if (usb2_bus_mem_alloc_all(&sc->sc_ohci.sc_bus, USB_GET_DMA_TAG(dev), &ohci_iterate_hw_softc)) { return ENOMEM; ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2_pci.c,v 1.2 2008/11/10 20:54:31 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2_pci.c,v 1.3 2008/12/23 17:36:25 thompsa Exp $"); /* * USB Open Host Controller driver. @@ -202,6 +202,7 @@ } /* get all DMA memory */ + sc->sc_bus.parent = self; if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), &ohci_iterate_hw_softc)) { return ENOMEM; ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#18 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $"); /* * USB Universal Host Controller driver. @@ -1491,16 +1491,13 @@ uhci_timeout(void *arg) { struct usb2_xfer *xfer = arg; - uhci_softc_t *sc = xfer->usb2_sc; DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); /* transfer is transferred */ uhci_device_done(xfer, USB_ERR_TIMEOUT); - - USB_BUS_UNLOCK(&sc->sc_bus); } static void @@ -2955,7 +2952,6 @@ usb2_sw_transfer(&sc->sc_root_intr, &uhci_root_intr_done); } - USB_BUS_UNLOCK(&sc->sc_bus); } struct usb2_pipe_methods uhci_root_intr_methods = ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2_pci.c,v 1.2 2008/11/10 20:54:31 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2_pci.c,v 1.3 2008/12/23 17:36:25 thompsa Exp $"); /* Universal Host Controller Interface * @@ -253,6 +253,7 @@ } /* get all DMA memory */ + sc->sc_bus.parent = self; if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(self), &uhci_iterate_hw_softc)) { return ENOMEM; ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/usb2_bus.h,v 1.2 2008/11/10 20:54:31 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/usb2_bus.h,v 1.3 2008/12/23 17:36:25 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -63,6 +63,7 @@ struct usb2_xfer_queue intr_q; struct usb2_callout power_wdog; /* power management */ + device_t parent; device_t bdev; /* filled by HC driver */ struct usb2_dma_parent_tag dma_parent_tag[1]; ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.c,v 1.5 2008/12/23 17:36:25 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -495,7 +495,7 @@ bus->devices_max = USB_MAX_DEVICES; - mtx_init(&bus->bus_mtx, "USB bus lock", + mtx_init(&bus->bus_mtx, device_get_nameunit(bus->parent), NULL, MTX_DEF | MTX_RECURSE); usb2_callout_init_mtx(&bus->power_wdog, ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/uss820dci.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/uss820dci.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky * All rights reserved. @@ -950,16 +950,13 @@ uss820dci_timeout(void *arg) { struct usb2_xfer *xfer = arg; - struct uss820dci_softc *sc = xfer->usb2_sc; DPRINTF("xfer=%p\n", xfer); - USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED); /* transfer is transferred */ uss820dci_device_done(xfer, USB_ERR_TIMEOUT); - - USB_BUS_UNLOCK(&sc->sc_bus); } static void ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uss820dci_atmelarm.c,v 1.2 2008/11/10 20:54:31 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uss820dci_atmelarm.c,v 1.3 2008/12/23 17:36:25 thompsa Exp $"); /*- * Copyright (c) 2008 Hans Petter Selasky @@ -140,6 +140,7 @@ } /* get all DMA memory */ + sc->sc_bus.parent = dev; if (usb2_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(dev), NULL)) { return (ENOMEM); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#34 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -879,7 +879,7 @@ info->setup_refcount++; usb2_callout_init_mtx(&xfer->timeout_handle, - &udev->bus->bus_mtx, CALLOUT_RETURNUNLOCKED); + &udev->bus->bus_mtx, 0); } else { /* * Setup a dummy xfer, hence we are @@ -1955,8 +1955,6 @@ /* queue callback for execution, again */ usb2_transfer_done(xfer, 0); - - USB_BUS_UNLOCK(xfer->udev->bus); } /*------------------------------------------------------------------------* @@ -2097,7 +2095,6 @@ } else { xfer->flags_int.can_cancel_immed = 0; } - USB_BUS_UNLOCK(xfer->udev->bus); } /*------------------------------------------------------------------------* @@ -2712,14 +2709,9 @@ usb2_callout_stop(co); (cb) (arg); - - /* the callback should drop the mutex */ - } else { - mtx_unlock(mtx); } - } else { - mtx_unlock(mtx); } + mtx_unlock(mtx); } ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/ethernet/if_aue2.c,v 1.4 2008/12/11 23:17:48 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/ethernet/if_aue2.c,v 1.5 2008/12/23 19:59:21 thompsa Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -770,8 +770,7 @@ mtx_init(&sc->sc_mtx, "aue lock", NULL, MTX_DEF | MTX_RECURSE); - usb2_callout_init_mtx(&sc->sc_watchdog, - &sc->sc_mtx, CALLOUT_RETURNUNLOCKED); + usb2_callout_init_mtx(&sc->sc_watchdog, &sc->sc_mtx, 0); iface_index = AUE_IFACE_IDX; error = usb2_transfer_setup(uaa->device, &iface_index, @@ -798,10 +797,8 @@ usb2_config_td_queue_command (&sc->sc_config_td, NULL, &aue_cfg_first_time_setup, 0, 0); - /* start watchdog (will exit mutex) */ - aue_watchdog(sc); - + mtx_unlock(&sc->sc_mtx); return (0); /* success */ detach: @@ -1475,8 +1472,6 @@ usb2_callout_reset(&sc->sc_watchdog, hz, &aue_watchdog, sc); - - mtx_unlock(&sc->sc_mtx); } /* ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 27 06:28:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BBE81065677; Sat, 27 Dec 2008 06:28:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D95271065670 for ; Sat, 27 Dec 2008 06:28:53 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B155C8FC14 for ; Sat, 27 Dec 2008 06:28:53 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBR6SrHl070952 for ; Sat, 27 Dec 2008 06:28:53 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBR6SrMj070950 for perforce@freebsd.org; Sat, 27 Dec 2008 06:28:53 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 27 Dec 2008 06:28:53 GMT Message-Id: <200812270628.mBR6SrMj070950@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155309 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: Sat, 27 Dec 2008 06:28:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=155309 Change 155309 by weongyo@weongyo_ws on 2008/12/27 06:28:26 fix a build break on amd64. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/ntoskrnl_var.h#9 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/ntoskrnl_var.h#9 (text+ko) ==== @@ -1024,7 +1024,7 @@ (void *)&(ip)->irp_cancelfunc, (void *)(func)) #define IoSetCancelValue(irp, val) \ - (uint32_t)InterlockedExchangePointer( \ + (u_long)InterlockedExchangePointer( \ (void *)&(ip)->irp_cancel, (void *)(val)) #define IoGetCurrentIrpStackLocation(irp) \ From owner-p4-projects@FreeBSD.ORG Sat Dec 27 09:44:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C20A1065675; Sat, 27 Dec 2008 09:44:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0090F106564A for ; Sat, 27 Dec 2008 09:44:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E28CA8FC08 for ; Sat, 27 Dec 2008 09:44:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBR9iBoX098809 for ; Sat, 27 Dec 2008 09:44:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBR9iBh4098807 for perforce@freebsd.org; Sat, 27 Dec 2008 09:44:11 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 27 Dec 2008 09:44:11 GMT Message-Id: <200812270944.mBR9iBh4098807@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 155314 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: Sat, 27 Dec 2008 09:44:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=155314 Change 155314 by hselasky@hselasky_laptop001 on 2008/12/27 09:43:56 Print out disconnection message. PR: usb/129964 Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#43 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#43 (text+ko) ==== @@ -1697,6 +1697,11 @@ bus = udev->bus; + printf("ugen%u.%u: <%s> at %s (disconnected)\n", + device_get_unit(bus->bdev), + udev->device_index, udev->manufacturer, + device_get_nameunit(bus->bdev)); + /* * Destroy UGEN symlink, if any */ From owner-p4-projects@FreeBSD.ORG Sat Dec 27 13:41:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FF0E1065670; Sat, 27 Dec 2008 13:41:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DBC4106567E for ; Sat, 27 Dec 2008 13:41:13 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 285BE8FC16 for ; Sat, 27 Dec 2008 13:41:13 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBRDfDS3040254 for ; Sat, 27 Dec 2008 13:41:13 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBRDfChN040252 for perforce@freebsd.org; Sat, 27 Dec 2008 13:41:13 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 27 Dec 2008 13:41:13 GMT Message-Id: <200812271341.mBRDfChN040252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155322 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: Sat, 27 Dec 2008 13:41:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=155322 Change 155322 by ed@ed_dull on 2008/12/27 13:40:50 Several improvements to libteken: - Change the Makefile to a BSD makefile, using - Make the source code build with WARNS set to 6. There were a lot of places where we did comparisons, which required signing (because of subtraction). I've converted the statements to work without this. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/Makefile#2 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#10 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_demo.c#2 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#19 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/Makefile#2 (text+ko) ==== @@ -1,20 +1,13 @@ -CFLAGS=-O2 -Wall -Werror -Wmissing-prototypes -Wstrict-prototypes -g -LDFLAGS=-lutil -lncurses -OBJS=teken.o teken_demo.o +# $FreeBSD$ -all: teken_demo +PROG= teken_demo +SRCS= teken_demo.c teken.c teken_state.h +CLEANFILES= teken_state.h +LDADD= -lncurses -lutil +NO_MAN= +WARNS?= 6 -teken_demo: $(OBJS) - $(CC) -o teken_demo $(LDFLAGS) $(OBJS) +teken_state.h: gensequences sequences + awk -f gensequences sequences > ${.TARGET} -teken_state.h: sequences gensequences - awk -f gensequences < sequences > teken_state.h - -teken.o: teken.c teken.h teken_state.h teken_subr.h teken_subr_compat.h - $(CC) $(CFLAGS) -c teken.c - -teken_demo.o: teken_demo.c teken.h - $(CC) $(CFLAGS) -c teken_demo.c - -clean: - -rm -f teken_demo *.o teken_state.h teken.log +.include ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#10 (text+ko) ==== @@ -26,6 +26,7 @@ * $FreeBSD$ */ +#include #if defined(__FreeBSD__) && defined(_KERNEL) #include #include @@ -208,7 +209,6 @@ switch (c) { case '\0': - teken_subr_null_character(t); break; case '\a': teken_subr_bell(t); ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_demo.c#2 (text+ko) ==== @@ -73,7 +73,7 @@ #define NROWS 24 struct pixel buffer[NCOLS][NROWS]; -static int pt; +static int ptfd; static void printchar(const teken_pos_t *p) @@ -111,21 +111,21 @@ } static void -test_bell(void *s) +test_bell(void *s __unused) { beep(); } static void -test_cursor(void *s, const teken_pos_t *p) +test_cursor(void *s __unused, const teken_pos_t *p) { move(p->tp_row, p->tp_col); } static void -test_putchar(void *s, const teken_pos_t *p, teken_char_t c, +test_putchar(void *s __unused, const teken_pos_t *p, teken_char_t c, const teken_attr_t *a) { @@ -147,7 +147,7 @@ } static void -test_copy(void *s, const teken_rect_t *r, const teken_pos_t *p) +test_copy(void *s __unused, const teken_rect_t *r, const teken_pos_t *p) { int nrow, ncol, x, y; /* Has to be signed - >= 0 comparison */ teken_pos_t d; @@ -214,7 +214,7 @@ } static void -test_param(void *s, int cmd, int value) +test_param(void *s __unused, int cmd, int value) { switch (cmd) { @@ -228,10 +228,10 @@ } static void -test_respond(void *s, const void *buf, size_t len) +test_respond(void *s __unused, const void *buf, size_t len) { - write(pt, buf, len); + write(ptfd, buf, len); } static void @@ -260,7 +260,7 @@ } int -main(int argc, char *argv[]) +main(int argc __unused, char *argv[] __unused) { struct winsize ws; teken_t t; @@ -274,7 +274,7 @@ tp.tp_row = ws.ws_row = NROWS; tp.tp_col = ws.ws_col = NCOLS; - switch (forkpty(&pt, NULL, NULL, &ws)) { + switch (forkpty(&ptfd, NULL, NULL, &ws)) { case -1: perror("forkpty"); exit(1); @@ -300,14 +300,12 @@ redraw_border(); FD_ZERO(&rfds); - FD_SET(STDIN_FILENO, &rfds); - FD_SET(pt, &rfds); for (;;) { FD_SET(STDIN_FILENO, &rfds); - FD_SET(pt, &rfds); + FD_SET(ptfd, &rfds); - if (select(pt + 1, &rfds, NULL, NULL, NULL) < 0) { + if (select(ptfd + 1, &rfds, NULL, NULL, NULL) < 0) { if (errno == EINTR) { redraw_all(); refresh(); @@ -320,11 +318,11 @@ bl = read(STDIN_FILENO, b, sizeof b); if (bl <= 0) break; - write(pt, b, bl); + write(ptfd, b, bl); } - if (FD_ISSET(pt, &rfds)) { - bl = read(pt, b, sizeof b); + if (FD_ISSET(ptfd, &rfds)) { + bl = read(ptfd, b, sizeof b); if (bl <= 0) break; teken_input(&t, b, bl); ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#19 (text+ko) ==== @@ -251,7 +251,7 @@ { teken_assert(t->t_cursor.tp_row < t->t_scrollreg.ts_end); - if (nrows >= t->t_scrollreg.ts_end - t->t_cursor.tp_row) + if (t->t_cursor.tp_row + nrows >= t->t_scrollreg.ts_end) t->t_cursor.tp_row = t->t_scrollreg.ts_end - 1; else t->t_cursor.tp_row += nrows; @@ -263,7 +263,7 @@ teken_subr_cursor_forward(teken_t *t, unsigned int ncols) { - if (ncols >= t->t_winsize.tp_col - t->t_cursor.tp_col) + if (t->t_cursor.tp_col + ncols >= t->t_winsize.tp_col) t->t_cursor.tp_col = t->t_winsize.tp_col - 1; else t->t_cursor.tp_col += ncols; @@ -332,7 +332,7 @@ teken_subr_cursor_up(teken_t *t, unsigned int nrows) { - if (nrows > ((int)t->t_cursor.tp_row - t->t_scrollreg.ts_begin)) + if (t->t_scrollreg.ts_begin + nrows >= t->t_cursor.tp_row) t->t_cursor.tp_row = t->t_scrollreg.ts_begin; else t->t_cursor.tp_row -= nrows; @@ -349,14 +349,14 @@ tr.tr_end.tp_row = t->t_cursor.tp_row + 1; tr.tr_end.tp_col = t->t_winsize.tp_col; - if (ncols < (t->t_winsize.tp_col - t->t_cursor.tp_col)) { + if (t->t_cursor.tp_col + ncols >= t->t_winsize.tp_col) { + tr.tr_begin.tp_col = t->t_cursor.tp_col; + } else { /* Copy characters to the left. */ tr.tr_begin.tp_col = t->t_cursor.tp_col + ncols; teken_funcs_copy(t, &tr, &t->t_cursor); tr.tr_begin.tp_col = t->t_winsize.tp_col - ncols; - } else { - tr.tr_begin.tp_col = t->t_cursor.tp_col; } /* Blank trailing columns. */ @@ -372,14 +372,14 @@ tr.tr_end.tp_row = t->t_scrollreg.ts_end; tr.tr_end.tp_col = t->t_winsize.tp_col; - if (nrows < ((int)t->t_scrollreg.ts_end - t->t_cursor.tp_row)) { + if (t->t_cursor.tp_row + nrows >= t->t_scrollreg.ts_end) { + tr.tr_begin.tp_row = t->t_cursor.tp_row; + } else { /* Copy rows up. */ tr.tr_begin.tp_row = t->t_cursor.tp_row + nrows; teken_funcs_copy(t, &tr, &t->t_cursor); tr.tr_begin.tp_row = t->t_scrollreg.ts_end - nrows; - } else { - tr.tr_begin.tp_row = t->t_cursor.tp_row; } /* Blank trailing rows. */ @@ -387,7 +387,7 @@ } static void -teken_subr_device_control_string(teken_t *t) +teken_subr_device_control_string(teken_t *t __unused) { teken_printf("device control string???\n"); @@ -407,14 +407,14 @@ } static void -teken_subr_double_height_double_width_line_top(teken_t *t) +teken_subr_double_height_double_width_line_top(teken_t *t __unused) { teken_printf("double height double width top\n"); } static void -teken_subr_double_height_double_width_line_bottom(teken_t *t) +teken_subr_double_height_double_width_line_bottom(teken_t *t __unused) { teken_printf("double height double width bottom\n"); @@ -428,10 +428,10 @@ tr.tr_begin = t->t_cursor; tr.tr_end.tp_row = t->t_cursor.tp_row + 1; - if (ncols < (t->t_winsize.tp_col - t->t_cursor.tp_col)) + if (t->t_cursor.tp_col + ncols >= t->t_winsize.tp_col) + tr.tr_end.tp_col = t->t_winsize.tp_col - 1; + else tr.tr_end.tp_col = t->t_cursor.tp_col + ncols; - else - tr.tr_end.tp_col = t->t_winsize.tp_col - 1; teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); } @@ -550,7 +550,9 @@ tr.tr_begin = t->t_cursor; tr.tr_end.tp_row = t->t_cursor.tp_row + 1; - if (ncols < (t->t_winsize.tp_col - t->t_cursor.tp_col)) { + if (t->t_cursor.tp_col + ncols >= t->t_winsize.tp_col) { + tr.tr_end.tp_col = t->t_winsize.tp_col; + } else { teken_pos_t tp; /* Copy characters to the right. */ @@ -560,8 +562,6 @@ teken_funcs_copy(t, &tr, &tp); tr.tr_end.tp_col = t->t_cursor.tp_col + ncols; - } else { - tr.tr_end.tp_col = t->t_winsize.tp_col; } /* Blank current location. */ @@ -577,7 +577,9 @@ tr.tr_begin.tp_col = 0; tr.tr_end.tp_col = t->t_winsize.tp_col; - if (nrows < ((int)t->t_scrollreg.ts_end - t->t_cursor.tp_row)) { + if (t->t_cursor.tp_row + nrows >= t->t_scrollreg.ts_end) { + tr.tr_end.tp_row = t->t_scrollreg.ts_end; + } else { teken_pos_t tp; /* Copy lines down. */ @@ -587,8 +589,6 @@ teken_funcs_copy(t, &tr, &tp); tr.tr_end.tp_row = t->t_cursor.tp_row + nrows; - } else { - tr.tr_end.tp_row = t->t_scrollreg.ts_end; } /* Blank current location. */ @@ -633,11 +633,6 @@ } static void -teken_subr_null_character(teken_t *t) -{ -} - -static void teken_subr_pan_down(teken_t *t, unsigned int nrows) { @@ -859,7 +854,7 @@ } static void -teken_subr_scs(teken_t *t) +teken_subr_scs(teken_t *t __unused) { teken_printf("scs???\n"); @@ -1046,21 +1041,21 @@ } static void -teken_subr_single_height_double_width_line(teken_t *t) +teken_subr_single_height_double_width_line(teken_t *t __unused) { teken_printf("single height double width???\n"); } static void -teken_subr_single_height_single_width_line(teken_t *t) +teken_subr_single_height_single_width_line(teken_t *t __unused) { teken_printf("single height single width???\n"); } static void -teken_subr_string_terminator(teken_t *t) +teken_subr_string_terminator(teken_t *t __unused) { teken_printf("string terminator???\n"); From owner-p4-projects@FreeBSD.ORG Sat Dec 27 13:45:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA57C1065678; Sat, 27 Dec 2008 13:45:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91D751065677 for ; Sat, 27 Dec 2008 13:45:17 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 64C3A8FC18 for ; Sat, 27 Dec 2008 13:45:17 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBRDjH9h040557 for ; Sat, 27 Dec 2008 13:45:17 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBRDjHjk040555 for perforce@freebsd.org; Sat, 27 Dec 2008 13:45:17 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 27 Dec 2008 13:45:17 GMT Message-Id: <200812271345.mBRDjHjk040555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155323 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: Sat, 27 Dec 2008 13:45:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=155323 Change 155323 by ed@ed_dull on 2008/12/27 13:45:04 Also remove the debug log. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/Makefile#3 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/Makefile#3 (text+ko) ==== @@ -2,7 +2,7 @@ PROG= teken_demo SRCS= teken_demo.c teken.c teken_state.h -CLEANFILES= teken_state.h +CLEANFILES= teken_state.h teken.log LDADD= -lncurses -lutil NO_MAN= WARNS?= 6 From owner-p4-projects@FreeBSD.ORG Sat Dec 27 16:15:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D9341065673; Sat, 27 Dec 2008 16:15:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31EC41065674 for ; Sat, 27 Dec 2008 16:15:56 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 20CD68FC14 for ; Sat, 27 Dec 2008 16:15:56 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBRGFtnO055250 for ; Sat, 27 Dec 2008 16:15:55 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBRGFtYN055248 for perforce@freebsd.org; Sat, 27 Dec 2008 16:15:55 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 27 Dec 2008 16:15:55 GMT Message-Id: <200812271615.mBRGFtYN055248@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155331 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: Sat, 27 Dec 2008 16:15:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=155331 Change 155331 by ed@ed_dull on 2008/12/27 16:15:35 - Add a stress testing utility, that throws random data into the emulator. - Fix two crash bugs, caused by the stress testing utility. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_stress.c#1 add .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#20 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#20 (text+ko) ==== @@ -375,9 +375,13 @@ if (t->t_cursor.tp_row + nrows >= t->t_scrollreg.ts_end) { tr.tr_begin.tp_row = t->t_cursor.tp_row; } else { + teken_pos_t tp; + /* Copy rows up. */ tr.tr_begin.tp_row = t->t_cursor.tp_row + nrows; - teken_funcs_copy(t, &tr, &t->t_cursor); + tp.tp_row = t->t_cursor.tp_row; + tp.tp_col = 0; + teken_funcs_copy(t, &tr, &tp); tr.tr_begin.tp_row = t->t_scrollreg.ts_end - nrows; } @@ -429,7 +433,7 @@ tr.tr_end.tp_row = t->t_cursor.tp_row + 1; if (t->t_cursor.tp_col + ncols >= t->t_winsize.tp_col) - tr.tr_end.tp_col = t->t_winsize.tp_col - 1; + tr.tr_end.tp_col = t->t_winsize.tp_col; else tr.tr_end.tp_col = t->t_cursor.tp_col + ncols; From owner-p4-projects@FreeBSD.ORG Sat Dec 27 18:26:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0F271065676; Sat, 27 Dec 2008 18:26:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73A1C1065675 for ; Sat, 27 Dec 2008 18:26:08 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 626938FC1C for ; Sat, 27 Dec 2008 18:26:08 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBRIQ8so076593 for ; Sat, 27 Dec 2008 18:26:08 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBRIQ84I076591 for perforce@freebsd.org; Sat, 27 Dec 2008 18:26:08 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 27 Dec 2008 18:26:08 GMT Message-Id: <200812271826.mBRIQ84I076591@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155334 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: Sat, 27 Dec 2008 18:26:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=155334 Change 155334 by ed@ed_dull on 2008/12/27 18:26:05 IFC. Affected files ... .. //depot/projects/mpsafetty/Makefile#4 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate .. //depot/projects/mpsafetty/lib/libutil/kinfo_getfile.c#3 integrate .. //depot/projects/mpsafetty/lib/libutil/kinfo_getvmmap.c#3 integrate .. //depot/projects/mpsafetty/sbin/geom/misc/subr.c#3 integrate .. //depot/projects/mpsafetty/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/mpsafetty/sbin/mount/mount.c#4 integrate .. //depot/projects/mpsafetty/share/man/man4/ndis.4#2 integrate .. //depot/projects/mpsafetty/sys/arm/conf/AVILA#8 integrate .. //depot/projects/mpsafetty/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/mpsafetty/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/mpsafetty/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/ndis/usbd_var.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_console.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/mpsafetty/sys/dev/uart/uart_tty.c#6 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/subr_param.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#13 integrate .. //depot/projects/mpsafetty/sys/modules/ndis/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/usb2/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/net/if_tun.c#11 integrate .. //depot/projects/mpsafetty/sys/net/route.h#7 integrate .. //depot/projects/mpsafetty/sys/net/rtsock.c#11 integrate .. //depot/projects/mpsafetty/sys/netinet/in.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6.c#9 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec.c#10 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec.h#6 integrate .. //depot/projects/mpsafetty/usr.bin/make/make.1#3 integrate .. //depot/projects/mpsafetty/usr.bin/netstat/inet6.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/top/machine.c#4 integrate .. //depot/projects/mpsafetty/usr.sbin/arp/arp.c#4 integrate .. //depot/projects/mpsafetty/usr.sbin/ndiscvt/inf.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/ndiscvt/windrv_stub.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/ndp/ndp.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/pkg_install/lib/lib.h#3 integrate .. //depot/projects/mpsafetty/usr.sbin/pkg_install/lib/plist.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.355 2008/12/01 00:45:51 alfred Exp $ +# $FreeBSD: src/Makefile,v 1.356 2008/12/27 15:07:51 bz Exp $ # # The user-driven targets are: # @@ -298,7 +298,7 @@ .endif .for target in ${TARGETS} KERNCONFS!= cd ${.CURDIR}/sys/${target}/conf && \ - find [A-Z]*[A-Z] -type f -maxdepth 0 \ + find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \ ! -name DEFAULTS ! -name LINT KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/} universe: universe_${target} ==== //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/mpsafetty/lib/libutil/kinfo_getfile.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ #include -__FBSDID("$FreeBSD: src/lib/libutil/kinfo_getfile.c,v 1.3 2008/12/19 06:47:59 marcus Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/kinfo_getfile.c,v 1.4 2008/12/27 11:12:23 rwatson Exp $"); -#include +#include #include #include #include ==== //depot/projects/mpsafetty/lib/libutil/kinfo_getvmmap.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ #include -__FBSDID("$FreeBSD: src/lib/libutil/kinfo_getvmmap.c,v 1.3 2008/12/19 06:47:59 marcus Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/kinfo_getvmmap.c,v 1.4 2008/12/27 11:12:23 rwatson Exp $"); -#include +#include #include #include #include ==== //depot/projects/mpsafetty/sbin/geom/misc/subr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/misc/subr.c,v 1.9 2008/12/13 14:14:56 lulf Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/misc/subr.c,v 1.10 2008/12/27 14:24:24 lulf Exp $"); #include #include @@ -211,7 +211,7 @@ sector = NULL; error = 0; - fd = open(path, O_RDWR); + fd = open(path, O_WRONLY); if (fd == -1) return (errno); mediasize = g_get_mediasize(name); ==== //depot/projects/mpsafetty/sbin/mount/getmntopts.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/mount/getmntopts.c,v 1.18 2005/11/14 17:39:00 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sbin/mount/getmntopts.c,v 1.19 2008/12/26 22:55:38 obrien Exp $"); #include #include @@ -130,7 +130,7 @@ struct stat sb; if (realpath(path, resolved) != NULL && stat(resolved, &sb) == 0) { - if (!S_ISDIR(sb.st_mode)) + if (!S_ISDIR(sb.st_mode)) errx(EX_USAGE, "%s: not a directory", resolved); } else errx(EX_USAGE, "%s: %s", resolved, strerror(errno)); @@ -176,7 +176,7 @@ char val[255] = { 0 }; va_start(ap, fmt); - vsnprintf(val, sizeof(val), fmt, ap); + vsnprintf(val, sizeof(val), fmt, ap); va_end(ap); build_iovec(iov, iovlen, name, strdup(val), (size_t)-1); } ==== //depot/projects/mpsafetty/sbin/mount/mount.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.100 2008/12/18 18:44:46 obrien Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.102 2008/12/26 22:55:38 obrien Exp $"; #endif /* not lint */ #include @@ -145,7 +145,7 @@ if (strcmp(vfstype, fs[i]) == 0) return (1); } - + return (0); } @@ -210,7 +210,7 @@ restart_mountd(void) { struct pidfh *pfh; - pid_t mountdpid; + pid_t mountdpid; pfh = pidfile_open(_PATH_MOUNTDPID, 0600, &mountdpid); if (pfh != NULL) { @@ -302,7 +302,7 @@ if ((init_flags & MNT_UPDATE) && (ro == 0)) options = catopt(options, "noro"); - + rval = 0; switch (argc) { case 0: @@ -503,9 +503,10 @@ mountfs(const char *vfstype, const char *spec, const char *name, int flags, const char *options, const char *mntopts) { + static int argc; char *argv[MAX_ARGS]; struct statfs sf; - int argc, i, ret; + int i, ret; char *optbuf, execname[PATH_MAX], mntpath[PATH_MAX]; /* resolve the mountpoint with realpath(3) */ @@ -566,7 +567,7 @@ if (use_mountprog(vfstype)) { ret = exec_mountprog(name, execname, argv); } else { - ret = mount_fs(vfstype, argc, argv); + ret = mount_fs(vfstype, argc, argv); } free(optbuf); ==== //depot/projects/mpsafetty/share/man/man4/ndis.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ndis.4,v 1.1 2008/08/21 00:40:55 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man4/ndis.4,v 1.2 2008/12/27 08:03:32 weongyo Exp $ .\" .Dd October 13, 2006 .Dt NDIS 4 i386 @@ -105,7 +105,7 @@ The .Nm driver is designed to support mainly Ethernet and wireless -network devices with PCI and PCMCIA bus attachments. +network devices with PCI, PCMCIA and USB bus attachments. (Cardbus devices are also supported as a subset of PCI.) It can ==== //depot/projects/mpsafetty/sys/arm/conf/AVILA#8 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.20 2008/12/20 03:26:09 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.21 2008/12/27 17:22:17 bz Exp $ ident AVILA @@ -31,7 +31,6 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale -makeoptions MODULES_OVERRIDE="" #options HZ=1000 options HZ=100 options DEVICE_POLLING ==== //depot/projects/mpsafetty/sys/compat/ndis/kern_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.98 2008/07/23 10:49:27 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.100 2008/12/27 09:42:17 weongyo Exp $"); #include #include @@ -65,6 +65,9 @@ #include #include +#include +#include + #include #include #include @@ -144,7 +147,6 @@ } TAILQ_INIT(&ndis_devhead); - break; case MOD_SHUTDOWN: if (TAILQ_FIRST(&ndis_devhead) == NULL) { @@ -1199,6 +1201,33 @@ } int +ndis_pnpevent_nic(arg, type) + void *arg; + int type; +{ + device_t dev; + struct ndis_softc *sc; + ndis_handle adapter; + ndis_pnpevent_handler pnpeventfunc; + + dev = arg; + sc = device_get_softc(arg); + NDIS_LOCK(sc); + adapter = sc->ndis_block->nmb_miniportadapterctx; + pnpeventfunc = sc->ndis_chars->nmc_pnpevent_handler; + NDIS_UNLOCK(sc); + if (adapter == NULL || pnpeventfunc == NULL) + return(EIO); + + if (sc->ndis_chars->nmc_rsvd0 == NULL) + MSCALL4(pnpeventfunc, adapter, type, NULL, 0); + else + MSCALL4(pnpeventfunc, sc->ndis_chars->nmc_rsvd0, type, NULL, 0); + + return (0); +} + +int ndis_init_nic(arg) void *arg; { ==== //depot/projects/mpsafetty/sys/compat/ndis/kern_windrv.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.14 2007/05/20 22:03:57 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.15 2008/12/27 08:03:32 weongyo Exp $"); #include #include @@ -56,6 +56,9 @@ #include #endif +#include +#include + #include #include #include @@ -349,9 +352,11 @@ if (pe_patch_imports(img, "NDIS", ndis_functbl)) return(ENOEXEC); - /* Dynamically link the HAL.dll routines -- also required. */ - if (pe_patch_imports(img, "HAL", hal_functbl)) - return(ENOEXEC); + /* Dynamically link the HAL.dll routines -- optional. */ + if (pe_get_import_descriptor(img, &imp_desc, "HAL") == 0) { + if (pe_patch_imports(img, "HAL", hal_functbl)) + return(ENOEXEC); + } /* Dynamically link ntoskrnl.exe -- optional. */ if (pe_get_import_descriptor(img, &imp_desc, "ntoskrnl") == 0) { ==== //depot/projects/mpsafetty/sys/compat/ndis/ndis_var.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.48 2007/12/02 04:04:42 thompsa Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.49 2008/12/27 08:03:32 weongyo Exp $ */ #ifndef _NDIS_VAR_H_ @@ -1658,6 +1658,7 @@ typedef void (*ndis_enable_interrupts_handler)(ndis_handle); typedef void (*ndis_disable_interrupts_handler)(ndis_handle); typedef void (*ndis_shutdown_handler)(void *); +typedef void (*ndis_pnpevent_handler)(void *, int, void *, uint32_t); typedef void (*ndis_allocdone_handler)(ndis_handle, void *, ndis_physaddr *, uint32_t, void *); typedef uint8_t (*ndis_checkforhang_handler)(ndis_handle); @@ -1739,6 +1740,7 @@ extern int ndis_reset_nic(void *); extern int ndis_halt_nic(void *); extern int ndis_shutdown_nic(void *); +extern int ndis_pnpevent_nic(void *, int); extern int ndis_init_nic(void *); extern void ndis_return_packet(void *, void *); extern int ndis_init_dma(void *); @@ -1759,6 +1761,7 @@ extern void NdisFreePacket(ndis_packet *); extern ndis_status NdisScheduleWorkItem(ndis_work_item *); extern void NdisMSleep(uint32_t); +extern void ndis_cancel_timerlist(void); __END_DECLS #endif /* _NDIS_VAR_H_ */ ==== //depot/projects/mpsafetty/sys/compat/ndis/ntoskrnl_var.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.45 2008/09/13 17:34:18 thompsa Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.46 2008/12/27 08:03:32 weongyo Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -536,6 +536,11 @@ #define WAITKEY_VALID 0x8000 +/* kthread priority */ +#define LOW_PRIORITY 0 +#define LOW_REALTIME_PRIORITY 16 +#define HIGH_PRIORITY 31 + struct thread_context { void *tc_thrctx; void *tc_thrfunc; @@ -989,7 +994,13 @@ } s2; void *irp_fileobj; } irp_overlay; - kapc irp_apc; + union { + kapc irp_apc; + struct { + void *irp_xfer; + void *irp_dev; + } irp_usb; + } irp_misc; void *irp_compkey; } irp_tail; }; @@ -997,6 +1008,9 @@ #define irp_csl s2.u2.irp_csl #define irp_pkttype s2.u2.irp_pkttype +#define IRP_NDIS_DEV(irp) (irp)->irp_tail.irp_misc.irp_usb.irp_dev +#define IRP_NDISUSB_XFER(irp) (irp)->irp_tail.irp_misc.irp_usb.irp_xfer + typedef struct irp irp; #define InterlockedExchangePointer(dst, val) \ @@ -1009,6 +1023,10 @@ (cancel_func)InterlockedExchangePointer( \ (void *)&(ip)->irp_cancelfunc, (void *)(func)) +#define IoSetCancelValue(irp, val) \ + (u_long)InterlockedExchangePointer( \ + (void *)&(ip)->irp_cancel, (void *)(val)) + #define IoGetCurrentIrpStackLocation(irp) \ (irp)->irp_tail.irp_overlay.irp_csl @@ -1035,6 +1053,8 @@ #define IoMarkIrpPending(irp) \ IoGetCurrentIrpStackLocation(irp)->isl_ctl |= SL_PENDING_RETURNED +#define IoUnmarkIrpPending(irp) \ + IoGetCurrentIrpStackLocation(irp)->isl_ctl &= ~SL_PENDING_RETURNED #define IoCopyCurrentIrpStackLocationToNext(irp) \ do { \ @@ -1191,14 +1211,21 @@ #define STATUS_ALERTED 0x00000101 #define STATUS_TIMEOUT 0x00000102 #define STATUS_PENDING 0x00000103 +#define STATUS_FAILURE 0xC0000001 +#define STATUS_NOT_IMPLEMENTED 0xC0000002 #define STATUS_INVALID_PARAMETER 0xC000000D #define STATUS_INVALID_DEVICE_REQUEST 0xC0000010 #define STATUS_MORE_PROCESSING_REQUIRED 0xC0000016 +#define STATUS_NO_MEMORY 0xC0000017 #define STATUS_BUFFER_TOO_SMALL 0xC0000023 #define STATUS_MUTANT_NOT_OWNED 0xC0000046 +#define STATUS_NOT_SUPPORTED 0xC00000BB #define STATUS_INVALID_PARAMETER_2 0xC00000F0 #define STATUS_INSUFFICIENT_RESOURCES 0xC000009A +#define STATUS_DEVICE_NOT_CONNECTED 0xC000009D +#define STATUS_CANCELLED 0xC0000120 #define STATUS_NOT_FOUND 0xC0000225 +#define STATUS_DEVICE_REMOVED 0xC00002B6 #define STATUS_WAIT_0 0x00000000 @@ -1365,6 +1392,7 @@ extern uint32_t IoConnectInterrupt(kinterrupt **, void *, void *, kspin_lock *, uint32_t, uint8_t, uint8_t, uint8_t, uint8_t, uint32_t, uint8_t); +extern uint8_t MmIsAddressValid(void *); extern void *MmMapIoSpace(uint64_t, uint32_t, uint32_t); extern void MmUnmapIoSpace(void *, size_t); extern void MmBuildMdlForNonPagedPool(mdl *); ==== //depot/projects/mpsafetty/sys/compat/ndis/subr_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.114 2008/08/28 15:23:18 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.115 2008/12/27 08:03:32 weongyo Exp $"); /* * This file implements a translation layer between the BSD networking @@ -95,6 +95,8 @@ #include #include +#include +#include #include #include @@ -302,6 +304,15 @@ */ #define NDIS_POOL_EXTRA 16 +struct ktimer_list { + ktimer *kl_timer; + list_entry kl_next; +}; + +static struct list_entry ndis_timerlist; +static kspin_lock ndis_timerlock; +static int ndis_isusbdev; + int ndis_libinit() { @@ -317,6 +328,9 @@ patch++; } + KeInitializeSpinLock(&ndis_timerlock); + InitializeListHead(&ndis_timerlist); + return(0); } @@ -1215,6 +1229,16 @@ ndis_timer_function func; void *ctx; { + ndis_miniport_block *block; + struct ktimer_list *kl; + struct ndis_softc *sc; + uint8_t irql; + + block = (ndis_miniport_block *)handle; + sc = device_get_softc(block->nmb_physdeviceobj->do_devext); + if (sc->ndis_iftype == PNPBus && ndis_isusbdev == 0) + ndis_isusbdev = 1; + /* Save the driver's funcptr and context */ timer->nmt_timerfunc = func; @@ -1232,7 +1256,38 @@ ndis_findwrap((funcptr)ndis_timercall), timer); timer->nmt_ktimer.k_dpc = &timer->nmt_kdpc; - return; + if (ndis_isusbdev == 1) { + kl = (struct ktimer_list *)malloc(sizeof(*kl), M_DEVBUF, + M_NOWAIT | M_ZERO); + if (kl == NULL) + panic("out of memory"); /* no way to report errors */ + + kl->kl_timer = &timer->nmt_ktimer; + KeAcquireSpinLock(&ndis_timerlock, &irql); + InsertHeadList((&ndis_timerlist), (&kl->kl_next)); + KeReleaseSpinLock(&ndis_timerlock, irql); + } +} + +void +ndis_cancel_timerlist(void) +{ + list_entry *l; + struct ktimer_list *kl; + uint8_t cancelled, irql; + + KeAcquireSpinLock(&ndis_timerlock, &irql); + + while(!IsListEmpty(&ndis_timerlist)) { + l = RemoveHeadList(&ndis_timerlist); + kl = CONTAINING_RECORD(l, struct ktimer_list, kl_next); + KeReleaseSpinLock(&ndis_timerlock, irql); + cancelled = KeCancelTimer(kl->kl_timer); + free(kl, M_DEVBUF); + KeAcquireSpinLock(&ndis_timerlock, &irql); + } + + KeReleaseSpinLock(&ndis_timerlock, irql); } /* @@ -1277,6 +1332,26 @@ ndis_timer *timer; uint8_t *cancelled; { + list_entry *l; + struct ktimer_list *kl; + uint8_t irql; + + if (ndis_isusbdev == 1) { + KeAcquireSpinLock(&ndis_timerlock, &irql); + l = ndis_timerlist.nle_flink; + while(l != &ndis_timerlist) { + kl = CONTAINING_RECORD(l, struct ktimer_list, kl_next); + if (kl->kl_timer == &timer->nt_ktimer) { + RemoveEntryList((&kl->kl_next)); + l = l->nle_flink; + free(kl, M_DEVBUF); + continue; + } + l = l->nle_flink; + } + KeReleaseSpinLock(&ndis_timerlock, irql); + } + *cancelled = KeCancelTimer(&timer->nt_ktimer); return; } ==== //depot/projects/mpsafetty/sys/compat/ndis/subr_ntoskrnl.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.96 2008/06/15 13:37:29 cokane Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.97 2008/12/27 08:03:32 weongyo Exp $"); #include #include @@ -207,7 +207,6 @@ static void *MmMapLockedPagesSpecifyCache(mdl *, uint8_t, uint32_t, void *, uint32_t, uint32_t); static void MmUnmapLockedPages(void *, mdl *); -static uint8_t MmIsAddressValid(void *); static device_t ntoskrnl_finddev(device_t, uint64_t, struct resource **); static void RtlZeroMemory(void *, size_t); static void RtlCopyMemory(void *, const void *, size_t); @@ -251,6 +250,8 @@ static uint32_t DbgPrint(char *, ...); static void DbgBreakPoint(void); static void KeBugCheckEx(uint32_t, u_long, u_long, u_long, u_long); +static int32_t KeDelayExecutionThread(uint8_t, uint8_t, int64_t *); +static int32_t KeSetPriorityThread(struct thread *, int32_t); static void dummy(void); static struct mtx ntoskrnl_dispatchlock; @@ -1143,16 +1144,18 @@ IoCancelIrp(irp *ip) { cancel_func cfunc; + uint8_t cancelirql; - IoAcquireCancelSpinLock(&ip->irp_cancelirql); + IoAcquireCancelSpinLock(&cancelirql); cfunc = IoSetCancelRoutine(ip, NULL); ip->irp_cancel = TRUE; - if (ip->irp_cancelfunc == NULL) { - IoReleaseCancelSpinLock(ip->irp_cancelirql); + if (cfunc == NULL) { + IoReleaseCancelSpinLock(cancelirql); return(FALSE); } + ip->irp_cancelirql = cancelirql; MSCALL2(cfunc, IoGetCurrentIrpStackLocation(ip)->isl_devobj, ip); - return(TRUE); + return (uint8_t)IoSetCancelValue(ip, TRUE); } uint32_t @@ -1186,24 +1189,27 @@ irp *ip; uint8_t prioboost; { - uint32_t i; uint32_t status; device_object *dobj; io_stack_location *sl; completion_func cf; - ip->irp_pendingreturned = - IoGetCurrentIrpStackLocation(ip)->isl_ctl & SL_PENDING_RETURNED; - sl = (io_stack_location *)(ip + 1); + KASSERT(ip->irp_iostat.isb_status != STATUS_PENDING, + ("incorrect IRP(%p) status (STATUS_PENDING)", ip)); + + sl = IoGetCurrentIrpStackLocation(ip); + IoSkipCurrentIrpStackLocation(ip); + + do { + if (sl->isl_ctl & SL_PENDING_RETURNED) + ip->irp_pendingreturned = TRUE; - for (i = ip->irp_currentstackloc; i < (uint32_t)ip->irp_stackcnt; i++) { - if (ip->irp_currentstackloc < ip->irp_stackcnt - 1) { - IoSkipCurrentIrpStackLocation(ip); + if (ip->irp_currentstackloc != (ip->irp_stackcnt + 1)) dobj = IoGetCurrentIrpStackLocation(ip)->isl_devobj; - } else + else dobj = NULL; - if (sl[i].isl_completionfunc != NULL && + if (sl->isl_completionfunc != NULL && ((ip->irp_iostat.isb_status == STATUS_SUCCESS && sl->isl_ctl & SL_INVOKE_ON_SUCCESS) || (ip->irp_iostat.isb_status != STATUS_SUCCESS && @@ -1214,12 +1220,16 @@ status = MSCALL3(cf, dobj, ip, sl->isl_completionctx); if (status == STATUS_MORE_PROCESSING_REQUIRED) return; + } else { + if ((ip->irp_currentstackloc <= ip->irp_stackcnt) && + (ip->irp_pendingreturned == TRUE)) + IoMarkIrpPending(ip); } - if (IoGetCurrentIrpStackLocation(ip)->isl_ctl & - SL_PENDING_RETURNED) - ip->irp_pendingreturned = TRUE; - } + /* move to the next. */ + IoSkipCurrentIrpStackLocation(ip); + sl++; + } while (ip->irp_currentstackloc <= (ip->irp_stackcnt + 1)); /* Handle any associated IRPs. */ @@ -2672,7 +2682,7 @@ * here, but it doesn't. */ -static uint8_t +uint8_t MmIsAddressValid(vaddr) void *vaddr; { @@ -4258,6 +4268,73 @@ return(timer->k_header.dh_sigstate); } +static int32_t +KeDelayExecutionThread(wait_mode, alertable, interval) + uint8_t wait_mode; + uint8_t alertable; + int64_t *interval; +{ + ktimer timer; + + if (wait_mode != 0) + panic("invalid wait_mode %d", wait_mode); + + KeInitializeTimer(&timer); + KeSetTimer(&timer, *interval, NULL); + KeWaitForSingleObject(&timer, 0, 0, alertable, NULL); + + return STATUS_SUCCESS; +} + +static uint64_t +KeQueryInterruptTime(void) +{ + int ticks; + struct timeval tv; + + getmicrouptime(&tv); + + ticks = tvtohz(&tv); + + return ticks * ((10000000 + hz - 1) / hz); +} + +static struct thread * +KeGetCurrentThread(void) +{ + + return curthread; +} + +static int32_t +KeSetPriorityThread(td, pri) + struct thread *td; + int32_t pri; +{ + int32_t old; + + if (td == NULL) + return LOW_REALTIME_PRIORITY; + + if (td->td_priority <= PRI_MIN_KERN) + old = HIGH_PRIORITY; + else if (td->td_priority >= PRI_MAX_KERN) + old = LOW_PRIORITY; + else + old = LOW_REALTIME_PRIORITY; + + thread_lock(td); + if (pri == HIGH_PRIORITY) + sched_prio(td, PRI_MIN_KERN); + if (pri == LOW_REALTIME_PRIORITY) + sched_prio(td, PRI_MIN_KERN + (PRI_MAX_KERN - PRI_MIN_KERN) / 2); + if (pri == LOW_PRIORITY) + sched_prio(td, PRI_MAX_KERN); + thread_unlock(td); + + return old; +} + static void dummy() { @@ -4441,6 +4518,10 @@ IMPORT_CFUNC(WmiTraceMessage, 0), IMPORT_SFUNC(KeQuerySystemTime, 1), IMPORT_CFUNC(KeTickCount, 0), + IMPORT_SFUNC(KeDelayExecutionThread, 3), + IMPORT_SFUNC(KeQueryInterruptTime, 0), + IMPORT_SFUNC(KeGetCurrentThread, 0), + IMPORT_SFUNC(KeSetPriorityThread, 2), /* * This last entry is a catch-all for any function we haven't ==== //depot/projects/mpsafetty/sys/compat/ndis/subr_usbd.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.3 2005/05/05 03:56:09 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.4 2008/12/27 08:03:32 weongyo Exp $"); #include #include @@ -45,10 +45,24 @@ #include #include #include +#include +#include #include #include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include "usbdevs.h" + #include #include #include @@ -56,18 +70,64 @@ #include #include #include +#include static driver_object usbd_driver; -static uint32_t usbd_iodispatch(device_object *, irp *); +static int32_t usbd_func_bulkintr(irp *); +static int32_t usbd_func_vendorclass(irp *); +static int32_t usbd_func_selconf(irp *); +static int32_t usbd_func_getdesc(irp *); +static usbd_status usbd_get_desc_ndis(usbd_device_handle, int, int, int, + void *, int *); +static union usbd_urb *usbd_geturb(irp *); +static usbd_status usbd_init_ndispipe(irp *, usb_endpoint_descriptor_t *); +static usbd_xfer_handle usbd_init_ndisxfer(irp *, usb_endpoint_descriptor_t *, + void *, uint32_t); +static int32_t usbd_iodispatch(device_object *, irp *); +static int32_t usbd_ioinvalid(device_object *, irp *); +static int32_t usbd_pnp(device_object *, irp *); +static int32_t usbd_power(device_object *, irp *); +static void usbd_irpcancel(device_object *, irp *); +static void usbd_irpcancel_cb(void *); +static int32_t usbd_submit_urb(irp *); +static int32_t usbd_urb2nt(int32_t); +static void usbd_xfereof(usbd_xfer_handle, usbd_private_handle, + usbd_status); +static void usbd_xferadd(usbd_xfer_handle, usbd_private_handle, + usbd_status); +static void usbd_xfertask(device_object *, void *); +static void dummy(void); + +static union usbd_urb *USBD_CreateConfigurationRequestEx( + usb_config_descriptor_t *, + struct usbd_interface_list_entry *); +static union usbd_urb *USBD_CreateConfigurationRequest( + usb_config_descriptor_t *, + uint16_t *); +static void USBD_GetUSBDIVersion(usbd_version_info *); +static usb_interface_descriptor_t *USBD_ParseConfigurationDescriptorEx( + usb_config_descriptor_t *, void *, int32_t, int32_t, + int32_t, int32_t, int32_t); +static usb_interface_descriptor_t *USBD_ParseConfigurationDescriptor( + usb_config_descriptor_t *, uint8_t, uint8_t); -static void USBD_GetUSBDIVersion(usbd_version_info *); -static void dummy(void); +/* + * We need to wrap these functions because these need `context switch' from + * Windows to UNIX before it's called. + */ +static funcptr usbd_iodispatch_wrap; +static funcptr usbd_ioinvalid_wrap; +static funcptr usbd_pnp_wrap; +static funcptr usbd_power_wrap; +static funcptr usbd_irpcancel_wrap; +static funcptr usbd_xfertask_wrap; int usbd_libinit(void) { image_patch_table *patch; + int i; patch = usbd_functbl; while (patch->ipt_func != NULL) { @@ -77,14 +137,36 @@ patch++; } + windrv_wrap((funcptr)usbd_ioinvalid, + (funcptr *)&usbd_ioinvalid_wrap, 2, WINDRV_WRAP_STDCALL); + windrv_wrap((funcptr)usbd_iodispatch, + (funcptr *)&usbd_iodispatch_wrap, 2, WINDRV_WRAP_STDCALL); + windrv_wrap((funcptr)usbd_pnp, + (funcptr *)&usbd_pnp_wrap, 2, WINDRV_WRAP_STDCALL); + windrv_wrap((funcptr)usbd_power, + (funcptr *)&usbd_power_wrap, 2, WINDRV_WRAP_STDCALL); + windrv_wrap((funcptr)usbd_irpcancel, + (funcptr *)&usbd_irpcancel_wrap, 2, WINDRV_WRAP_STDCALL); + windrv_wrap((funcptr)usbd_xfertask, + (funcptr *)&usbd_xfertask_wrap, 2, WINDRV_WRAP_STDCALL); + /* Create a fake USB driver instance. */ windrv_bus_attach(&usbd_driver, "USB Bus"); /* Set up our dipatch routine. */ + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + usbd_driver.dro_dispatch[i] = + (driver_dispatch)usbd_ioinvalid_wrap; usbd_driver.dro_dispatch[IRP_MJ_INTERNAL_DEVICE_CONTROL] = - (driver_dispatch)usbd_iodispatch; + (driver_dispatch)usbd_iodispatch_wrap; + usbd_driver.dro_dispatch[IRP_MJ_DEVICE_CONTROL] = + (driver_dispatch)usbd_iodispatch_wrap; + usbd_driver.dro_dispatch[IRP_MJ_POWER] = + (driver_dispatch)usbd_power_wrap; + usbd_driver.dro_dispatch[IRP_MJ_PNP] = + (driver_dispatch)usbd_pnp_wrap; return(0); } @@ -100,17 +182,949 @@ patch++; } + windrv_unwrap(usbd_ioinvalid_wrap); + windrv_unwrap(usbd_iodispatch_wrap); + windrv_unwrap(usbd_pnp_wrap); + windrv_unwrap(usbd_power_wrap); + windrv_unwrap(usbd_irpcancel_wrap); + windrv_unwrap(usbd_xfertask_wrap); + free(usbd_driver.dro_drivername.us_buf, M_DEVBUF); return(0); } -static uint32_t +static int32_t usbd_iodispatch(dobj, ip) device_object *dobj; irp *ip; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 27 19:21:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F24871065676; Sat, 27 Dec 2008 19:21:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B68A91065673 for ; Sat, 27 Dec 2008 19:21:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A4AC38FC24 for ; Sat, 27 Dec 2008 19:21:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBRJL4DT081786 for ; Sat, 27 Dec 2008 19:21:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBRJL49T081784 for perforce@freebsd.org; Sat, 27 Dec 2008 19:21:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 27 Dec 2008 19:21:04 GMT Message-Id: <200812271921.mBRJL49T081784@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 155336 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: Sat, 27 Dec 2008 19:21:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=155336 Change 155336 by rwatson@rwatson_cinnamon on 2008/12/27 19:21:03 Add a nominal libauditd(3) that basically just says the library is there, but has no public interfaces. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#22 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#17 edit .. //depot/projects/trustedbsd/openbsm/configure#47 edit .. //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#2 edit .. //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/libauditd/libauditd.3#1 add Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#22 (text+ko) ==== @@ -1,5 +1,9 @@ OpenBSM Version History +OpenBSM 1.1 alpha 5 + +- Stub libauditd(3) man page added. + OpenBSM 1.1 alpha 4 - With the addition of BSM error number mapping, we also need to map the @@ -393,4 +397,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#21 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#22 $ ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#17 (text+ko) ==== @@ -25,7 +25,7 @@ .\" (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/bin/auditd/auditd.8#16 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#17 $ .\" .Dd December 11, 2008 .Dt AUDITD 8 @@ -115,6 +115,7 @@ .Nm . .Sh SEE ALSO .Xr asl 3 , +.Xr libauditd 3 , .Xr audit 4 , .Xr audit_class 5 , .Xr audit_control 5 , ==== //depot/projects/trustedbsd/openbsm/configure#47 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#47 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#48 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4. # ==== //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#2 $ # if USE_NATIVE_INCLUDES @@ -13,5 +13,5 @@ libauditd_la_SOURCES = \ auditd_lib.c -#man3_MANS = \ -# libauditd.3 +man3_MANS = \ + libauditd.3 ==== //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#2 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#1 $ +# $P4: //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#2 $ # VPATH = @srcdir@ @@ -51,7 +51,7 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libauditd_la_LIBADD = @@ -71,6 +71,9 @@ $(LDFLAGS) -o $@ SOURCES = $(libauditd_la_SOURCES) DIST_SOURCES = $(libauditd_la_SOURCES) +man3dir = $(mandir)/man3 +NROFF = nroff +MANS = $(man3_MANS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,6 +191,9 @@ libauditd_la_SOURCES = \ auditd_lib.c +man3_MANS = \ + libauditd.3 + all: all-am .SUFFIXES: @@ -285,6 +291,51 @@ clean-libtool: -rm -rf .libs _libs +install-man3: $(man3_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \ + done +uninstall-man3: + @$(NORMAL_UNINSTALL) + @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.3*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ + *) ext='3' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man3dir)/$$inst"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -362,9 +413,9 @@ done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(MANS) installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -412,7 +463,7 @@ info-am: -install-data-am: +install-data-am: install-man install-dvi: install-dvi-am @@ -422,7 +473,7 @@ install-info: install-info-am -install-man: +install-man: install-man3 install-pdf: install-pdf-am @@ -448,7 +499,9 @@ ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: uninstall-libLTLIBRARIES uninstall-man + +uninstall-man: uninstall-man3 .MAKE: install-am install-strip @@ -459,16 +512,14 @@ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-libLTLIBRARIES install-man install-man3 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES - + tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + uninstall-man uninstall-man3 -#man3_MANS = \ -# libauditd.3 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: From owner-p4-projects@FreeBSD.ORG Sat Dec 27 20:09:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 810721065677; Sat, 27 Dec 2008 20:09:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 455B81065675 for ; Sat, 27 Dec 2008 20:09:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33C8A8FC1F for ; Sat, 27 Dec 2008 20:09:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBRK9s1n089078 for ; Sat, 27 Dec 2008 20:09:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBRK9sIe089076 for perforce@freebsd.org; Sat, 27 Dec 2008 20:09:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 27 Dec 2008 20:09:54 GMT Message-Id: <200812272009.mBRK9sIe089076@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 155339 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: Sat, 27 Dec 2008 20:09:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=155339 Change 155339 by rwatson@rwatson_cinnamon on 2008/12/27 20:09:40 Don't print out errno when auditd_read_dirs() fails, just the libauditd error string. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#41 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#41 (text+ko) ==== @@ -26,7 +26,7 @@ * (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/bin/auditd/auditd.c#40 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#41 $ */ #include @@ -252,7 +252,7 @@ */ err = auditd_read_dirs(audit_warn_soft, audit_warn_hard); if (err) { - auditd_log_err("auditd_read_dirs() %s: %m", + auditd_log_err("auditd_read_dirs(): %s", auditd_strerror(err)); if (err == ADE_HARDLIM) audit_warn_allhard(); From owner-p4-projects@FreeBSD.ORG Sat Dec 27 20:26:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1951E1065691; Sat, 27 Dec 2008 20:26:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D00DF1065670 for ; Sat, 27 Dec 2008 20:26:10 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF3C88FC1E for ; Sat, 27 Dec 2008 20:26:10 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBRKQAkS091673 for ; Sat, 27 Dec 2008 20:26:10 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBRKQAKR091671 for perforce@freebsd.org; Sat, 27 Dec 2008 20:26:10 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 27 Dec 2008 20:26:10 GMT Message-Id: <200812272026.mBRKQAKR091671@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155340 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: Sat, 27 Dec 2008 20:26:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=155340 Change 155340 by rene@rene_self on 2008/12/27 20:25:36 Finalize translation of the contributing-ports article. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#3 (text+ko) ==== @@ -15,8 +15,9 @@ Abstract - Dit artikel beschrijft de manieren waarop een individueel - kan bijdragen aan de &os; Portscollectie. + + Dit artikel beschrijft de manieren waarop een individu kan + bijdragen aan de &os; Portscollectie. Vertaald door René Ladan. @@ -24,16 +25,20 @@ Sam + Lawrance + Mark + Linimon &tm-attrib.freebsd; + &tm-attrib.general; @@ -44,7 +49,7 @@ Introductie De Portscollectie is een eeuwig werk-in-uitvoering. We willen - onze gebruikers een repository van software van derde partijen + onze gebruikers een reservoir van software van derde partijen bieden dat gemakkelijk te gebruiken, bijgewerkt, en van hoge kwaliteit is. We hebben mensen nodig die wat tijd en moeite investeren om ons dit doel te helpen bereiken. @@ -58,20 +63,21 @@ Als een vrijwilliger kunt u doen en laten wat u wilt. We vragen echter wel dat u op de hoogte bent van wat andere leden van de &os;-gemeenschap van u verwachten. U doet er goed aan om dit - te overwegen voordat u besluit om vrijwilliger te zijn. + te overwegen voordat u besluit om vrijwilliger te worden. Wat u kunt doen om te helpen - Er zijn een aantal manieren waarop u bij kunt dragen om de - portsboom actueel en in een goede toestand te houden: + Er zijn een aantal gemakkelijke manieren waarop u bij kunt + dragen om de portsboom actueel en in een goede toestand te + houden: Zoek wat leuke of nuttige software en creëer er een port - voor. + linkend="create-port">creëer er een port + voor. @@ -87,8 +93,8 @@ - Als u op zoek bent naar een snelle uitdaging zou u een - een bug of een kapotte port kunnen + Als u op zoek bent naar een snelle uitdaging zou u een bug of een kapotte port kunnen repareren. @@ -99,8 +105,8 @@ Er is een apart document beschikbaar om u door het creëeren (en bijwerken) van een port te loodsen genaamd het - Porters - Handbook. Het Porters Handbook is het beste naslagwerk + Porter's + Handbook. Het Porter's Handbook is het beste naslagwerk wat betreft het werken met het portssysteem. Het noemt details over hoe het portssysteem werkt en bespreekt aangeraden praktijken. @@ -113,18 +119,18 @@ Een niet-onderhouden port kiezen Het beheer overnemen van ports die niet onderhouden worden - is een uitstekende manier betrokken te raken. Niet-onderhouden - ports worden alleen bijgewerkt en gerepareerd wannneer iemand - zich aanbiedt om eraan te werken. Er is een groot aantal ports - dat niet onderhouden wordt. Het is een goed idee om met het - adopteren van een port te beginnen die u regelmatig - gebruikt. + is een uitstekende manier om betrokken te raken. + Niet-onderhouden ports worden alleen bijgewerkt en gerepareerd + wanneer iemand zich aanbiedt om eraan te werken. Er is een + groot aantal ports dat niet onderhouden wordt. Het is een goed + idee om met het adopteren van een port te beginnen die u + regelmatig gebruikt. Voor niet-onderhouden ports staat de MAINTAINER op ports@FreeBSD.org. Een lijst van ports die niet onderhouden wordt en hun huidige fouten en - probleemrapporten kan worden bekeken op &os; Ports Monitoring System. @@ -132,16 +138,16 @@ Sommige ports beïnvloeden een groot aantal anderen vanwege afhankelijkheden en relaties als slaafport. Over het algemeen wensen we dat mensen wat ervaring hebben voordat ze - zo'n port onderhouden. + zulke ports onderhouden. U kunt uitzoeken of een port wel of geen afhankelijkheden of slaafpoorten heeft door in een hoofdindex van ports genaamd INDEX te kijken. (De naam van het bestand varieert naar gelang de uitgave van &os;; bijvoorbeeld INDEX-6.) Sommige ports hebben - conditionele afhankelijkheden die niet in standaard in een bouw - van INDEX worden opgenomen. We verwachten - dat u zulke ports kunt herkennen door naar de + conditionele afhankelijkheden die niet standaard in een bouw van + INDEX worden opgenomen. We verwachten dat + u zulke ports kunt herkennen door naar de Makefile van andere ports te kijken. @@ -152,17 +158,19 @@ verantwoordelijkheden als onderhouder begrijpt. Lees ook het Porter's Handbook. Neem alstublieft niet meer werk - op u dan dat u aankunt. + op u dan dat u op een comfortabele manier + aankunt. - U kunt zo snel als u wilt beheer van een niet-onderhouden - port aanvragen. Stel MAINTAINER in op uw - emailadres en stuur een PR (probleemrapport) in met de - verandering. Als de port bouwfouten bevat of moet worden - bijgewerkt, kunt u deze veranderingen in hetzelfde PR opnemen. - Dit helpt omdat veel committers minder bereid zijn om beheer aan - iemand toe te kennen die geen bekende geschiedenis met &os; - heeft. Het insturen van PR's die bouwfouten repareren of ports - bijwerken zijn de beste manier om er een op te bouwen. + U kunt zo snel als u wilt het beheer van een + niet-onderhouden port aanvragen. Stel + MAINTAINER in op uw emailadres en stuur een + PR (probleemrapport) in met de verandering. Als de port + bouwfouten bevat of moet worden bijgewerkt, dan kunt u deze + veranderingen in hetzelfde PR opnemen. Dit helpt omdat veel + committers minder bereid zijn om beheer aan iemand toe te kennen + die geen bekende geschiedenis met &os; heeft. Het insturen van + PR's die bouwfouten repareren of ports bijwerken zijn de beste + manier om er een op te bouwen. Stuur uw PR in met categorie ports en klasse change-request. Een committer zal uw @@ -173,7 +181,7 @@ - De uitdaging voor portonderhouders + De uitdaging voor port-onderhouders Deze sectie geeft u een idee waarom ports onderhouden moeten worden en schetst de verantwoordelijkheden van een onderhouder van @@ -190,7 +198,7 @@ De voornaamste reden waarom ports onderhoud nodig hebben is om het nieuwste en beste van software van derde partijen aan de - gemeenschap van &os; te geven. Een aanvullende uitdaging is om + &os;-gemeenschap te geven. Een aanvullende uitdaging is om individuele ports werkend te houden binnen het evoluerende raamwerk van de Portscollectie. @@ -200,10 +208,10 @@ - Nieuwe versies en upates van software. + Nieuwe versies en updates van software. - Nieuwe verses en updates van bestaande geporteerde - software komt telkens beschikbaar, en dezen moeten in de + Nieuwe versies en updates van bestaande geporteerde + software komen continu beschikbaar, en moeten in de Portscollectie worden verwerkt om actuele software aan te bieden. @@ -236,12 +244,12 @@ Interactie met andere gebruikers, onderhouders, en ontwikkelaars. - Een gedeelte van een onderhouder zijn is het opnemen + Een gedeelte van een onderhouder zijn is het vervullen van een ondersteunende rol. Er wordt niet van u verwacht dat u algemene ondersteuning biedt (maar we juichen het - toe als u dat doet). Wat u dient te bieden is een - centraal punt voor &os;-specifieke zaken met betrekking - tot uw ports. + toe als u dat doet). U dient een centraal punt voor + &os;-specifieke zaken met betrekking tot uw ports te + bieden. @@ -249,11 +257,11 @@ Bugs oplossen. - Een port kan vatbaar zijn voor bugs die specifiek voor - &os; zijn. U dient deze bugs te onderzoeken en te + Een port kan vatbaar zijn voor bugs die specifiek zijn + voor &os;. U dient deze bugs te onderzoeken en te repareren wanneer ze worden gerapporteerd. Het grondig testen van een port om problemen te identificeren voordat - ze in de Portscollectie komen is nog beter. + ze in de Portscollectie terechtkomen is nog beter. @@ -263,11 +271,11 @@ beleid. Af en toe worden die systemen die gebruikt worden om - ports en pakketten te bouwen bijgwerkt of wordt er een + ports en pakketten te bouwen bijgewerkt of wordt er een nieuwe aanbeveling met betrekking tot de infrastructuur gemaakt. U dient van deze veranderingen op de hoogte te - zijn indien ze betrekking hebben op uw ports en ze moeten - worden bijgewerkt. + zijn indien ze betrekking hebben op uw ports en ze + bijgewerkt moeten worden. @@ -277,7 +285,7 @@ &os; is constant in ontwikkeling. Veranderingen aan software, bibliotheken, de kernel, of zelfs - beleidsveranderingen kunnen noodzakelijke veraderingen + beleidsveranderingen kunnen noodzakelijke veranderingen aan ports veroorzaken. @@ -302,20 +310,20 @@ Kijk uit naar updates - Houd de stroomopwaartste leverancier in de gaten wat - betreft nieuwe versies, updates, en beveligingsreparaties + Houd de stroomopwaartse leverancier in de gaten wat + betreft nieuwe versies, updates, en beveiligingsreparaties voor de software. Mailinglijsten met aankondigingen of - webpagina's met nieuws zijn handig hiervoor. Soms zullen + webpagina's met nieuws zijn hiervoor handig. Soms zullen gebruikers contact met u opnemen en vragen wanneer uw port wordt bijgewerkt. Als u het druk hebt met andere dingen of u het om enige andere reden niet nu kunt bijwerken, vraag ze dan om u te helpen door een update te - versturen. + sturen. U kunt ook geautomatiseerde email van de &os; Ports Version Check ontvangen die u informeert of er een nieuwe versie van het distributiebestand van uw - port beschikbaar is. Meer informatie ovre dat systeem + port beschikbaar is. Meer informatie over dat systeem (inclusief hoe toekomstige emails te stoppen) staat in het bericht. @@ -325,13 +333,13 @@ Verwerk veranderingen in de port wanneer ze beschikbaar komen. U dient een patch aan te kunnen maken - tussen de originele port en uw bijgwerkte port. + tussen de originele port en uw bijgewerkte port. - Review en test + Herzie en test - Review en test uw veranderingen grondig: + Herzie en test uw veranderingen grondig: @@ -344,9 +352,10 @@ Zorg dat de afhankelijkheden van uw port compleet zijn. De aangeraden manier om dit te doen is door uw - eigen ports tinderbox te - installeren. Kijk in - bronnen voor meer informatie. + eigen tinderbox voor ports + te installeren. Bekijk bronnen voor meer + informatie. @@ -357,32 +366,33 @@ Verifieer uw port met &man.portlint.1; als gids. - Kijk in bronnen voor + Bekijk bronnen voor belangrijke informatie over het gebruik van portlint. Overweeg of veranderingen aan uw port andere ports - zou kunnen kapotmaken. Bespreek de veranderingen met - de onderhouders van die ports als dit het geval is. - Dit is speciaal van belang als uw update de versie van - de gedeelde bibliotheek verandert; in dit geval dienen - tenminste de afhankelijke ports een verhoging van de - PORTREVISION te krijgen zodat ze - automatisch worden bijgewerkt door geautomatiseerde - gereedschappen als &man.portupgrade.1;. + zouden kunnen kapotmaken. Bespreek de veranderingen + met de onderhouders van die ports als dit het geval + is. Dit is speciaal van belang als uw update de + versie van de gedeelde bibliotheek verandert; in dit + geval dienen de afhankelijke ports minstens een + verhoging van de PORTREVISION te + krijgen zodat ze automatisch worden bijgewerkt door + geautomatiseerde gereedschappen als + &man.portupgrade.1;. - Stuur de veranderingen in + Stuur veranderingen in Verzend uw update door een PR met een uitleg van de veranderingen en een patch die de verschillen tussen de originele port en de bijgewerkte port bevat in te sturen. - Bekijk alstublieft in Probleemrapporten voor &os; schrijven voor informatie over hoe een echt goed PR te schrijven. @@ -391,10 +401,10 @@ Stuur alstublieft geen &man.shar.1;-archief van de gehele port; gebruik in plaats daarvan &man.diff.1; -r. Op deze manier kunnen committers - veel makkelijker zien welke veranderingen er precies + veel gemakkelijker zien welke veranderingen er precies gemaakt worden. De sectie in het Porter's Handbook over - Upgrading heeft meer informatie + Upgrading bevat meer informatie hierover. @@ -411,7 +421,7 @@ Geef feedback Als een committer een probleem vindt in uw - veranderingen zullen ze het waarchijnlijk aan u + veranderingen zullen ze het waarschijnlijk aan u terugkoppelen. Een snel antwoord helpt om uw PR sneller gecommit te krijgen, en is beter voor het behouden van een discussie wanneer er geprobeerd wordt om problemen op te @@ -429,16 +439,16 @@ - Zorg ervoor dat uw ports blijvend correct bouwen + Zorg ervoor dat uw ports correct blijven bouwen Deze sectie gaat over het ontdekken en oplossen van - problemen die tegenhouden dat uw ports correct bouwen. + problemen die verhinderen dat uw ports correct bouwen. &os; garandeert alleen dat de Portscollectie op de -STABLE-takken werkt. U dient 5-STABLE of 6-STABLE te draaien, bij voorkeur de laatste. In theorie zou het - voldoende moeten zijn om de niewste uitgave van elke + voldoende moeten zijn om de nieuwste uitgave van elke STABLE-tak te draaien (aangezien de ABI's niet horen te veranderen), maar als u die tak kunt draaien is dat beter. @@ -457,12 +467,12 @@ De gebruikelijke manieren om te falen voor niet-i386 machines zijn dat de originele programmeurs aannamen dat, bijvoorbeeld, pointers - ints zijn of dat de relatief laxe + ints zijn of dat de relatief lakse compiler gcc 2.95 werd - gebruikt. Steeds meer werken applicatie-auteurs aan het - verwijderen van deze aannames — maar als de auteur de - code niet actief onderhoudt, zult u dit zelf moeten - doen. + gebruikt. Steeds meer reorganiseren applicatie-auteurs hun + code om deze aannames te verwijderen — maar als de + auteur de code niet actief onderhoudt, zult u dit zelf + moeten doen. Deze taken moet u uitvoeren om ervoor te zorgen dat uw @@ -475,11 +485,11 @@ Controleer regelmatig het geautomatiseerde portbouwcluster, pointyhat, - en de overzicht van distributiebestanden om te zien of er ports zijn die u onderhoudt die er niet in slagen om - te worden gebouwd of opgehaald (bekijk bronnen voor meer informatie over deze systemen). Rapportages over mislukkingen kunnen ook via email van andere gebruikers of geautomatiseerde @@ -489,13 +499,14 @@ Verzamel informatie - Als u op de hoogte bent van een probleem, verzamel dan - informatie die u helpt het op te lossen. Bouwfouten die - door pointyhat worden gerapporteerd - worden vergezeld door logs die aangeven waar het bouwen - mislukte. Als de mislukking door een gebruiker aan u werd - gerapporteerd, vraa ze dan om informatie te verzenden dat - u helpt om het probleem te diagnosticeren, zoals: + Als u eenmaal op de hoogte bent van een probleem, + verzamel dan informatie die u helpt het op te lossen. + Bouwfouten die door pointyhat worden + gerapporteerd worden vergezeld door logs die aangeven waar + het bouwen mislukte. Als de mislukking door een gebruiker + aan u werd gerapporteerd, vraag ze dan om informatie te + verzenden die u helpt om het probleem te vast te stellen, + zoals: @@ -545,7 +556,7 @@ Stuur veranderingen in Net zoals bij het bijwerken van een port, dient u nu - de veranderingen te integreren, te reviewen en te testen, + de veranderingen te integreren, te herzien en te testen, uw veranderingen als een PR in te sturen, en feedback te geven als dat nodig is. @@ -553,13 +564,13 @@ Stuur patches naar de stroomopwaartse auteurs - In sommige gevallen moet u patches maken om de port - op &os; te laten draaien. Sommige (maar niet alle) + In sommige gevallen moet u patches maken om de port op + &os; te laten draaien. Sommige (maar niet alle) stroomopwaartse auteurs zullen zulke patches in hun code accepteren voor de volgende uitgave. Als dit zo is, kan dit zelfs hun gebruikers op andere op BSD-gebaseerde systemen helpen en misschien dubbel werk besparen. - Overweeg alstublieft om geschike patches naar de auteurs + Overweeg alstublieft om geschikte patches naar de auteurs te zenden als teken van goede wil. @@ -575,8 +586,8 @@ &os;-specifieke bugs worden in het algemeen veroorzaakt door aannames over de bouw- en draaiomgevingen die niet voor &os; gelden. U zult zo'n soort fout minder snel aantreffen, - maar het kan subtieler en moelijker vast te stellen - zijn. + maar het kan subtieler en moeilijker zijn om het vast te + stellen. De onderstaande taken moet u uitvoeren om ervoor te zorgen dat uw port als bedoeld blijft werken: @@ -586,7 +597,7 @@ Reageer op bugrapporten Bugs kunnen per email via de + url="&url.base;/cgi/query-pr-summary.cgi?query"> GNATS Probleemrapportendatabase aan u worden gerapporteerd. Bugs kunnen ook direct door gebruikers aan u gerapporteerd worden. @@ -680,23 +691,23 @@ Deel van een onderhouder zijn is ondersteuning bieden — niet noodzakelijk voor de software in het algemeen - — maar voor de port en alle &os;-specifieke wijzigingen - en problemen. Gebruikers kunnen contact met u opnemen met + — maar voor de port en alle &os;-specifieke rariteiten + en problemen. Gebruikers kunnen contact met u opnemen voor vragen, suggesties, problemen, en patches. Meestal zal hun correspondentie specifiek voor &os; zijn. Af en toe zult u uw diplomatieke vaardigheden moeten gebruiken, en gebruikers die algemene ondersteuning zoeken vriendelijk naar de geschikte bronnen verwijzen. Minder vaak - zult u iemand tegenkomen die vraagt waarrom de + zult u iemand tegenkomen die vraagt waarom de RPMs niet actueel zijn of hoe ze de software onder Foo Linux kunnen draaien. Grijp deze kans om ze te vertellen dat uw port actueel is (als het dat is, uiteraard!) en stel voor dat ze &os; uitproberen. Soms zullen gebruikers en ontwikkelaars besluiten dat u - een druk persoon bent wiens tijd waardevol is en wat van het - werk voor u doen. Ze kunnen bijvoorbeeld: + een druk persoon bent wiens tijd waardevol is en wat werk van + u overnemen. Ze kunnen bijvoorbeeld: @@ -718,10 +729,10 @@ In deze gevallen is uw hoofdplicht om op tijd te reageren. De timeout voor niet-reagerende onderhouders is 14 dagen. Na deze periode mogen niet-goedgekeurde veranderingen gecommit - worden. Ze hebben de moeite genomen om u voor dit te doen; - dus probeer tenminste op tijd te reageren. Review, keur, - wijzig, of bediscussieer daarna zo snel mogelijk hun - veranderingen met ze. + worden. Ze hebben de moeite genomen om dit voor u te doen; + dus probeer tenminste op tijd te reageren. Daarna dient u zo + snel mogelijk hun veranderingen te herzien, goed te keuren, te + wijzigen, of met hen te bediscussiëren. Als u ervoor kunt zorgen dat ze het gevoel hebben dat hun bijdrage gewaardeerd wordt (wat zo hoort te zijn), dan heeft u @@ -738,9 +749,9 @@ aandacht nodig heeft. U kunt de web - interface voor de probleeemrapportendatabase gebruiken om - door onopgeloste PR's te zoeken en ze te bekijken. De meerderheid + url="&url.base;/cgi/query-pr-summary.cgi?query">webinterface + voor de probleemrapportdatabase gebruiken om + onopgeloste PR's te doorzoeken en ze te bekijken. De meerderheid van port-PR's zijn updates, maar met een beetje zoeken door en uitkammen van de samenvattingen zou u iets moeten kunnen vinden wat interessant is om aan te werken (de klasse @@ -756,8 +767,8 @@ te vragen in het geval dat ze al aan het probleem werken. Als u eenmaal een bug of probleem heeft gevonden, verzamel dan - informatie, onderzoek en repareer het! Als er een bestaand PR is, - ga dan daar mee verder. Maak anders een nieuw PR aan. Uw + informatie, onderzoek, en repareer het! Als er een bestaand PR + is, ga daar dan mee verder. Maak anders een nieuw PR aan. Uw veranderingen zullen worden herzien en, als alles goed is, gecommit. @@ -769,17 +780,18 @@ erachter komen dat u niet langer tijd heeft om sommige van (of al) uw ports-bijdragen voort te zetten. Dat is prima! Laat ons weten als u een port niet langer gebruikt of om andere redenen de tijd - of interesse heeft verloren om te onderhouden. Op deze manier - kunnen we verder gaan en andere mensen toestaan om te proberen om - aan bestaande problemen met de port te werken zonder op uw - antwoord te wachten. Herinner dat &os; een vrijwilligersproject - is, dus al het onderhouden van een port niet langer leuk is, is - het waarschijnlijk tijd om iemand anders het te laten doen! + of interesse heeft verloren om ports te onderhouden. Op deze + manier kunnen we verder gaan en andere mensen toestaan om te + proberen om aan bestaande problemen met de port te werken zonder + op uw antwoord te wachten. Herinner dat &os; een + vrijwilligersproject is, dus als het onderhouden van een port + niet langer leuk is, is het waarschijnlijk tijd om iemand anders + het te laten doen! In elk geval houdt het Ports Management Team (portmgr) zich het recht voor om u als onderhouder te wissen als u uw port voor enige tijd niet actief - heeft onderhouden. (Momenteel is dit 3 maanden). Hiermee + heeft onderhouden. (Momenteel is dit 3 maanden.) Hiermee bedoelen we dat er onopgeloste problemen of wachtende updates zijn waaraan binnen die tijd niet gewerkt is. @@ -789,7 +801,7 @@ Het Porter's Handbook is - uw overlevingsgids voor het ports-systeem. Hou het in de + uw overlevingsgids voor het portssysteem. Houd het in de buurt! Probleemrapporten @@ -800,12 +812,12 @@ behandelen. De + url="&url.base;/cgi/query-pr-summary.cgi?query"> Probleemrapportendatabase. Pointyhat - is het port-bouwcluster. U kunt Pointyhat gebruiken om buidlogs - van ports over alle architecturen en grote uitgaven te + is het bouwcluster voor ports. U kunt Pointyhat gebruiken om + bouwlogs van ports over alle architecturen en grote uitgaven te controleren. Het MASTER_SITES moet worden bijwerkt. - De ports-tinderbox is de meest + De tinderbox voor ports is de meest grondige manier om een port door de gehele cyclus van installatie, inpakken, en deïnstallatie te halen. Het biedt een opdrachtregelinterface maar kan ook via een webinterface worden @@ -835,7 +847,7 @@ &man.portlint.1; is een applicatie die gebruikt kan worden om te verifiëren dat uw port zich aan vele belangrijke - stylistische en functionele richtlijnen houdt. + stilistische en functionele richtlijnen houdt. portlint is een eenvoudige heuristieke applicatie, dus dient u het alleen als gids te gebruiken. Als portlint From owner-p4-projects@FreeBSD.ORG Sat Dec 27 20:45:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89DCE1065676; Sat, 27 Dec 2008 20:45:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D663106564A for ; Sat, 27 Dec 2008 20:45:06 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3E0B38FC1C for ; Sat, 27 Dec 2008 20:45:06 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBRKj6i8094703 for ; Sat, 27 Dec 2008 20:45:06 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBRKj6Tw094701 for perforce@freebsd.org; Sat, 27 Dec 2008 20:45:06 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 27 Dec 2008 20:45:06 GMT Message-Id: <200812272045.mBRKj6Tw094701@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 155342 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: Sat, 27 Dec 2008 20:45:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=155342 Change 155342 by ed@ed_dull on 2008/12/27 20:44:49 Fix crashes when panning up/down too many lines. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#21 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#21 (text+ko) ==== @@ -96,7 +96,7 @@ /* Scroll down. */ /* Copy existing data up. */ - if (t->t_scrollreg.ts_end - t->t_scrollreg.ts_begin > amount) { + if (t->t_scrollreg.ts_begin + amount < t->t_scrollreg.ts_end) { tr.tr_begin.tp_row = t->t_scrollreg.ts_begin + amount; tr.tr_begin.tp_col = 0; tr.tr_end.tp_row = t->t_scrollreg.ts_end; @@ -104,6 +104,10 @@ tp.tp_row = t->t_scrollreg.ts_begin; tp.tp_col = 0; teken_funcs_copy(t, &tr, &tp); + + tr.tr_end.tp_row = t->t_scrollreg.ts_end - amount; + } else { + tr.tr_end.tp_row = t->t_scrollreg.ts_begin; } /* Clear the last lines. */ @@ -117,7 +121,7 @@ amount = -amount; /* Copy existing data down. */ - if (t->t_scrollreg.ts_end - t->t_scrollreg.ts_begin > amount) { + if (t->t_scrollreg.ts_begin + amount < t->t_scrollreg.ts_end) { tr.tr_begin.tp_row = t->t_scrollreg.ts_begin; tr.tr_begin.tp_col = 0; tr.tr_end.tp_row = t->t_scrollreg.ts_end - amount; @@ -125,12 +129,15 @@ tp.tp_row = t->t_scrollreg.ts_begin + amount; tp.tp_col = 0; teken_funcs_copy(t, &tr, &tp); + + tr.tr_end.tp_row = t->t_scrollreg.ts_begin + amount; + } else { + tr.tr_end.tp_row = t->t_scrollreg.ts_end; } /* Clear the first lines. */ tr.tr_begin.tp_row = t->t_scrollreg.ts_begin; tr.tr_begin.tp_col = 0; - tr.tr_end.tp_row = t->t_scrollreg.ts_begin + amount; tr.tr_end.tp_col = t->t_winsize.tp_col; teken_funcs_fill(t, &tr, BLANK, &t->t_curattr); } From owner-p4-projects@FreeBSD.ORG Sat Dec 27 21:13:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3513A1065674; Sat, 27 Dec 2008 21:13:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED7BA1065670 for ; Sat, 27 Dec 2008 21:13:38 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CEBCC8FC08 for ; Sat, 27 Dec 2008 21:13:38 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBRLDcXs011099 for ; Sat, 27 Dec 2008 21:13:38 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBRLDcKh011097 for perforce@freebsd.org; Sat, 27 Dec 2008 21:13:38 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 27 Dec 2008 21:13:38 GMT Message-Id: <200812272113.mBRLDcKh011097@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 155345 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: Sat, 27 Dec 2008 21:13:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=155345 Change 155345 by rene@rene_self on 2008/12/27 21:13:15 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#10 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#9 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/Makefile#2 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#23 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#8 integrate .. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#3 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -680,7 +680,7 @@ MySQL However, some applications such as - MySQL need to be have the + MySQL need to have their Makefile configured with the specific charset. This is usually done in the Makefile or done by passing a value to ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -5145,7 +5145,7 @@ not being received on the log server. There are several reasons this may occur; however, the most common two are network connection issues and DNS issues. To test - these cases, ensure both hosts are able to reach other + these cases, ensure both hosts are able to reach one another using the hostname specified in /etc/rc.conf. If this appears to be working properly, an alternation to the ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.3 2008/12/24 14:14:36 rene Exp $ +# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.4 2008/12/27 20:34:02 rene Exp $ # %SOURCE% en_US.ISO8859-1/articles/Makefile # %SRCID% 1.60 ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/Makefile#2 (text+ko) ==== ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#4 (text+ko) ==== ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#23 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.214 2008/12/13 19:09:59 danger Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.216 2008/12/25 15:44:12 blackend Exp $ @@ -36,6 +36,20 @@ 12 + 25 + + + FreeBSD 7.1-RC2 Available + +

      The second and last release candidate of &os; 7.1 is now + available. ISO images for Tier-1 architectures are now + available on most of the &os; + mirror sites.

      +       +       + + 9 ==== //depot/projects/docproj_nl/www/share/sgml/release.ent#8 (text+ko) ==== @@ -1,4 +1,4 @@ - +