From owner-p4-projects Sun Dec 22 10:49:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 721CF37B408; Sun, 22 Dec 2002 10:49:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 221F537B401 for ; Sun, 22 Dec 2002 10:49:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D104343EDE for ; Sun, 22 Dec 2002 10:49:10 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMInAfh098785 for ; Sun, 22 Dec 2002 10:49:10 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMInA8k098782 for perforce@freebsd.org; Sun, 22 Dec 2002 10:49:10 -0800 (PST) Date: Sun, 22 Dec 2002 10:49:10 -0800 (PST) Message-Id: <200212221849.gBMInA8k098782@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22619 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22619 Change 22619 by marcel@marcel_nfs on 2002/12/22 10:49:09 ACPI has been entangled with ISA. Not illogical, but undesirable. Add sio_isa.c if acpi is enabled. This is not what we should be doing for all ISA devices, so I do it for sio(4) only as a way to make progress. Affected files ... .. //depot/projects/ia64/sys/conf/files.ia64#27 edit Differences ... ==== //depot/projects/ia64/sys/conf/files.ia64#27 (text+ko) ==== @@ -89,6 +89,7 @@ dev/kbd/kbd.c optional kbd dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd +dev/sio/sio_isa.c optional sio acpi dev/sio/sio_isa.c optional sio isa dev/syscons/schistory.c optional sc dev/syscons/scmouse.c optional sc To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 10:53:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47CE937B405; Sun, 22 Dec 2002 10:53:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D2A9837B401 for ; Sun, 22 Dec 2002 10:53:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7860D43EE5 for ; Sun, 22 Dec 2002 10:53:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMIrGfh002366 for ; Sun, 22 Dec 2002 10:53:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMIrFHO002363 for perforce@freebsd.org; Sun, 22 Dec 2002 10:53:15 -0800 (PST) Date: Sun, 22 Dec 2002 10:53:15 -0800 (PST) Message-Id: <200212221853.gBMIrFHO002363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22620 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22620 Change 22620 by marcel@marcel_nfs on 2002/12/22 10:52:32 Remove inclusion of isa include files. This file has been broken to have sc(4) on nexus instead of isa. Removal of the inclusion now mostly makes the file name and location broken. Affected files ... .. //depot/projects/ia64/sys/isa/syscons_isa.c#5 edit Differences ... ==== //depot/projects/ia64/sys/isa/syscons_isa.c#5 (text+ko) ==== @@ -39,9 +39,6 @@ #include -#include -#include - static devclass_t sc_devclass; static sc_softc_t main_softc; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 10:55:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8861637B406; Sun, 22 Dec 2002 10:55:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 35D7137B405 for ; Sun, 22 Dec 2002 10:55:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC34843EE8 for ; Sun, 22 Dec 2002 10:55:19 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMItJfh002453 for ; Sun, 22 Dec 2002 10:55:19 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMItJ4U002450 for perforce@freebsd.org; Sun, 22 Dec 2002 10:55:19 -0800 (PST) Date: Sun, 22 Dec 2002 10:55:19 -0800 (PST) Message-Id: <200212221855.gBMItJ4U002450@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22621 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22621 Change 22621 by marcel@marcel_nfs on 2002/12/22 10:54:52 Remove inclusion of . Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_cons.c#5 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_cons.c#5 (text+ko) ==== @@ -59,8 +59,6 @@ #include #include -#include - #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 11: 6:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0C8837B405; Sun, 22 Dec 2002 11:06:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36E4937B401 for ; Sun, 22 Dec 2002 11:06:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4ABD43EDA for ; Sun, 22 Dec 2002 11:06:33 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMJ6Xfh006059 for ; Sun, 22 Dec 2002 11:06:33 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMJ6X37006056 for perforce@freebsd.org; Sun, 22 Dec 2002 11:06:33 -0800 (PST) Date: Sun, 22 Dec 2002 11:06:33 -0800 (PST) Message-Id: <200212221906.gBMJ6X37006056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22622 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22622 Change 22622 by marcel@marcel_nfs on 2002/12/22 11:06:03 Change the interface of sioprobe and sioattach. We now expect all necessary parameters to be passed in the softc (ie com_s). This means that the bus specific front-ends need to deal with the resources, because we only have the tag and handle in the softc. Consequently, we let the bus code allocate the softc for us. \BEGIN{CRITICAL SECTION} Affected files ... .. //depot/projects/ia64/sys/dev/sio/siovar.h#9 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/siovar.h#9 (text+ko) ==== @@ -206,9 +206,9 @@ extern speed_t comdefaultrate; extern u_long comdefaultrclk; -int sioattach(device_t dev, int xrid, u_long rclk); +int sioattach(device_t dev); int siodetach(device_t dev); -int sioprobe(device_t dev, int xrid, u_long rclk, int noprobe); +int sioprobe(device_t dev); u_int siodivisor(u_long rclk, u_long speed); int sioprobe1(struct com_s *sc); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 11:12:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9A8D37B405; Sun, 22 Dec 2002 11:12:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 519EB37B401 for ; Sun, 22 Dec 2002 11:12:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFEEC43EDA for ; Sun, 22 Dec 2002 11:12:41 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMJCffh009507 for ; Sun, 22 Dec 2002 11:12:41 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMJCf5i009504 for perforce@freebsd.org; Sun, 22 Dec 2002 11:12:41 -0800 (PST) Date: Sun, 22 Dec 2002 11:12:41 -0800 (PST) Message-Id: <200212221912.gBMJCf5i009504@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22623 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22623 Change 22623 by marcel@marcel_nfs on 2002/12/22 11:11:43 Convert to the new sioprobe/sioattach interface. While here, remove the sio_pci_unit_kludge function. We consider this the "future" version which according to the comment makes it obsolete :-) Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_pci.c#10 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_pci.c#10 (text+ko) ==== @@ -33,16 +33,19 @@ #include #include #include +#include #include + #include -#include +#include + +#include #include #include static int sio_pci_attach(device_t dev); -static void sio_pci_kludge_unit(device_t dev); static int sio_pci_probe(device_t dev); static device_method_t sio_pci_methods[] = { @@ -56,7 +59,7 @@ static driver_t sio_pci_driver = { sio_driver_name, sio_pci_methods, - 0, + sizeof(struct com_s), }; struct pci_ids { @@ -80,70 +83,66 @@ { 0x00000000, NULL, 0 } }; -static int -sio_pci_attach(dev) - device_t dev; +static struct pci_ids * +pci_id(device_t dev) { - u_int32_t type; - struct pci_ids *id; + struct pci_ids *id; + u_int32_t type; type = pci_get_devid(dev); id = pci_ids; while (id->type && id->type != type) id++; - if (id->desc == NULL) - return (ENXIO); - sio_pci_kludge_unit(dev); - return (sioattach(dev, id->rid, 0UL)); + return ((id->desc != NULL) ? id : NULL); } -/* - * Don't cut and paste this to other drivers. It is a horrible kludge - * which will fail to work and also be unnecessary in future versions. - */ -static void -sio_pci_kludge_unit(dev) - device_t dev; +static int +sio_pci_attach(device_t dev) { - devclass_t dc; - int err; - int start; - int unit; + struct com_s *com; + struct pci_ids *id; + struct resource *res; + int error, rid, space; - unit = 0; - start = 0; - while (resource_int_value("sio", unit, "port", &start) == 0 && - start > 0) - unit++; - if (device_get_unit(dev) < unit) { - dc = device_get_devclass(dev); - while (devclass_get_device(dc, unit)) - unit++; - device_printf(dev, "moving to sio%d\n", unit); - err = device_set_unit(dev, unit); /* EVIL DO NOT COPY */ - if (err) - device_printf(dev, "error moving device %d\n", err); - } + com = device_get_softc(dev); + id = pci_id(dev); + rid = (id->rid >= 0) ? id->rid : -id->rid; + space = (id->rid >= 0) ? SYS_RES_IOPORT : SYS_RES_MEMORY; + res = bus_alloc_resource(dev, space, &rid, 0, ~0, 8, RF_ACTIVE); + com->bsh = rman_get_bushandle(res); + com->bst = rman_get_bustag(res); + error = sioattach(dev); + if (error) + bus_release_resource(dev, space, rid, res); + return (error); } static int -sio_pci_probe(dev) - device_t dev; +sio_pci_probe(device_t dev) { - u_int32_t type; - struct pci_ids *id; + struct com_s *com; + struct pci_ids *id; + struct resource *res; + int error, rid, space; - type = pci_get_devid(dev); - id = pci_ids; - while (id->type && id->type != type) - id++; - if (id->desc == NULL) + com = device_get_softc(dev); + id = pci_id(dev); + if (id == NULL) return (ENXIO); device_set_desc(dev, id->desc); + rid = (id->rid >= 0) ? id->rid : -id->rid; + space = (id->rid >= 0) ? SYS_RES_IOPORT : SYS_RES_MEMORY; + res = bus_alloc_resource(dev, space, &rid, 0, ~0, 8, RF_ACTIVE); + com->bsh = rman_get_bushandle(res); + com->bst = rman_get_bustag(res); + #ifdef PC98 SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); #endif - return (sioprobe(dev, id->rid, 0UL, 1)); + + error = sioprobe(dev); + bus_release_resource(dev, space, rid, res); + return (error); } DRIVER_MODULE(sio, pci, sio_pci_driver, sio_devclass, 0, 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 11:15:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68FBD37B405; Sun, 22 Dec 2002 11:15:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 121E237B401 for ; Sun, 22 Dec 2002 11:15:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6697B43EE8 for ; Sun, 22 Dec 2002 11:15:46 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMJFkfh009599 for ; Sun, 22 Dec 2002 11:15:46 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMJFjoA009596 for perforce@freebsd.org; Sun, 22 Dec 2002 11:15:45 -0800 (PST) Date: Sun, 22 Dec 2002 11:15:45 -0800 (PST) Message-Id: <200212221915.gBMJFjoA009596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22624 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22624 Change 22624 by marcel@marcel_nfs on 2002/12/22 11:15:02 Convert sio_isa.c to the new sioprobe/sioattach interface. Leak a debbuging function in here as well, because we now do probe the ACPI listed memory mapped UARTS, we just have to grab the resources so that we can allocate them. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_isa.c#9 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_isa.c#9 (text+ko) ==== @@ -33,9 +33,13 @@ #include #include #include +#include #include + #include -#include +#include + +#include #include @@ -49,14 +53,13 @@ /* Device interface */ DEVMETHOD(device_probe, sio_isa_probe), DEVMETHOD(device_attach, sio_isa_attach), - { 0, 0 } }; static driver_t sio_isa_driver = { sio_driver_name, sio_isa_methods, - 0, + sizeof(struct com_s), }; static struct isa_pnp_id sio_ids[] = { @@ -144,21 +147,69 @@ {0} }; +static struct resource * +sio_isa_alloc(device_t dev, int *sp, int *rid) +{ + struct resource *res; + + *rid = 0; + *sp = SYS_RES_IOPORT; + device_printf(dev, "trying I/O port\n"); + res = bus_alloc_resource(dev, *sp, rid, 0, ~0, 8, RF_ACTIVE); + if (res == NULL) { + device_printf(dev, "trying memory mapped\n"); + *rid = 0; + *sp = SYS_RES_MEMORY; + res = bus_alloc_resource(dev, *sp, rid, 0, ~0, 8, RF_ACTIVE); + if (res == NULL) { + device_printf(dev, "Bollocks!\n"); + return (NULL); + } + } + + return (res); +} + static int -sio_isa_probe(dev) - device_t dev; +sio_isa_probe(device_t dev) { + struct com_s *com; + struct resource *res; + int error, rid, space; + /* Check isapnp ids */ if (ISA_PNP_PROBE(device_get_parent(dev), dev, sio_ids) == ENXIO) return (ENXIO); - return (sioprobe(dev, 0, 0UL, 0)); + + com = device_get_softc(dev); + res = sio_isa_alloc(dev, &space, &rid); + if (res == NULL) + return (0); + com->bsh = rman_get_bushandle(res); + com->bst = rman_get_bustag(res); + error = sioprobe(dev); + bus_release_resource(dev, space, rid, res); + return (error); } static int sio_isa_attach(dev) device_t dev; { - return (sioattach(dev, 0, 0UL)); + struct com_s *com; + struct resource *res; + int error, rid, space; + + com = device_get_softc(dev); + res = sio_isa_alloc(dev, &space, &rid); + if (res == NULL) + return (ENXIO); + com->bsh = rman_get_bushandle(res); + com->bst = rman_get_bustag(res); + error = sioattach(dev); + if (error) + bus_release_resource(dev, space, rid, res); + return (error); } DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 11:19:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3FC437B405; Sun, 22 Dec 2002 11:19:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5CE8537B401 for ; Sun, 22 Dec 2002 11:19:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11A6B43EDA for ; Sun, 22 Dec 2002 11:19:52 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMJJpfh009689 for ; Sun, 22 Dec 2002 11:19:51 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMJJpY3009686 for perforce@freebsd.org; Sun, 22 Dec 2002 11:19:51 -0800 (PST) Date: Sun, 22 Dec 2002 11:19:51 -0800 (PST) Message-Id: <200212221919.gBMJJpY3009686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22625 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22625 Change 22625 by marcel@marcel_nfs on 2002/12/22 11:19:45 Convert to the new sioprobe/sioattach interface. Untested. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_ebus.c#4 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_ebus.c#4 (text+ko) ==== @@ -34,6 +34,9 @@ #include #include +#include + +#include #include @@ -55,7 +58,7 @@ static driver_t sio_ebus_driver = { sio_driver_name, sio_ebus_methods, - 0, + sizeof(struct com_s), }; DRIVER_MODULE(sio, ebus, sio_ebus_driver, sio_devclass, 0, 0); @@ -94,20 +97,43 @@ sio_ebus_probe(dev) device_t dev; { - char *n; + struct com_s *com; + struct resource *res; + char *n; + int error, rid; n = ebus_get_name(dev); if (!sio_ofw_inlist(n, sio_ofw_names) && (strcmp(n, "serial") != 0 || !sio_ofw_inlist(ebus_get_compat(dev), sio_ofw_compat))) return (ENXIO); - /* Do not probe IRQ - isa_irq_pending() does not work for ebus. */ - return (sioprobe(dev, 0, 0UL, 1)); + + com = device_get_softc(dev); + rid = 0; + res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, + RF_ACTIVE); + com->bsh = rman_get_bushandle(res); + com->bst = rman_get_bustag(res); + error = sioprobe(dev); + bus_release_resource(dev, SYS_RES_IOPORT, rid, res); + return (error); } static int sio_ebus_attach(dev) device_t dev; { + struct com_s *com; + struct resource *res; + int error, rid; - return (sioattach(dev, 0, 0UL)); + com = device_get_softc(dev); + rid = 0; + res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, + RF_ACTIVE); + com->bsh = rman_get_bushandle(res); + com->bst = rman_get_bustag(res); + error = sioattach(dev, 0, 0UL); + if (error) + bus_release_resource(dev, SYS_RES_IOPORT, rid, res); + return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 11:27: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47F8037B401; Sun, 22 Dec 2002 11:27:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D022E37B405 for ; Sun, 22 Dec 2002 11:27:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70D7443EEF for ; Sun, 22 Dec 2002 11:27:01 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMJR1fh013194 for ; Sun, 22 Dec 2002 11:27:01 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMJR0si013191 for perforce@freebsd.org; Sun, 22 Dec 2002 11:27:00 -0800 (PST) Date: Sun, 22 Dec 2002 11:27:00 -0800 (PST) Message-Id: <200212221927.gBMJR0si013191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22626 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22626 Change 22626 by marcel@marcel_nfs on 2002/12/22 11:26:02 Convert to the new sioprobe/sioattach interface. Untested. While here, break siodetach even more. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_pccard.c#6 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_pccard.c#6 (text+ko) ==== @@ -66,7 +66,7 @@ static driver_t sio_pccard_driver = { sio_driver_name, sio_pccard_methods, - 0, + sizeof(struct com_s), }; static int @@ -91,27 +91,52 @@ sio_pccard_probe(dev) device_t dev; { + struct com_s *com; + struct resource *res; + int error, rid; #ifdef PC98 SET_FLAG(dev, SET_IFTYPE(COM_IF_MODEM_CARD)); #endif - /* Do not probe IRQ - pccard doesn't turn on the interrupt line */ - /* until bus_setup_intr */ - return (sioprobe(dev, 0, 0UL, 1)); + + com = device_get_softc(dev); + rid = 0; + res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, + RF_ACTIVE); + if (res == NULL) + return (ENXIO); + com->bsh = rman_get_bushandle(res); + com->bst = rman_get_bustag(res); + error = sioprobe(dev); + bus_release_resource(dev, SYS_RES_IOPORT, rid, res); + return (error); } static int sio_pccard_attach(dev) device_t dev; { - return (sioattach(dev, 0, 0UL)); + struct com_s *com; + struct resource *res; + int error, rid; + + com = device_get_softc(dev); + rid = 0; + res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, + RF_ACTIVE); + if (res == NULL) + return (ENXIO); + error = sioattach(dev); + if (error) + bus_release_resource(dev, SYS_RES_IOPORT, rid, res); + return (error); } static int sio_pccard_detach(dev) device_t dev; { - return (siodetach(dev)); + /* XXX broken */ } DRIVER_MODULE(sio, pccard, sio_pccard_driver, sio_devclass, 0, 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 11:28: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 094DB37B405; Sun, 22 Dec 2002 11:28:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE74537B401 for ; Sun, 22 Dec 2002 11:28:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6760C43ED8 for ; Sun, 22 Dec 2002 11:28:03 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMJS3fh013234 for ; Sun, 22 Dec 2002 11:28:03 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMJS2Vb013231 for perforce@freebsd.org; Sun, 22 Dec 2002 11:28:02 -0800 (PST) Date: Sun, 22 Dec 2002 11:28:02 -0800 (PST) Message-Id: <200212221928.gBMJS2Vb013231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22627 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22627 Change 22627 by marcel@marcel_nfs on 2002/12/22 11:27:53 Improve upon the previous commit. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_ebus.c#5 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_ebus.c#5 (text+ko) ==== @@ -110,7 +110,9 @@ com = device_get_softc(dev); rid = 0; res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, - RF_ACTIVE); + RF_ACTIVE); + if (res == NULL) + return (ENXIO); com->bsh = rman_get_bushandle(res); com->bst = rman_get_bustag(res); error = sioprobe(dev); @@ -130,9 +132,9 @@ rid = 0; res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, RF_ACTIVE); - com->bsh = rman_get_bushandle(res); - com->bst = rman_get_bustag(res); - error = sioattach(dev, 0, 0UL); + if (res == NULL) + return (ENXIO); + error = sioattach(dev); if (error) bus_release_resource(dev, SYS_RES_IOPORT, rid, res); return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 11:37:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DDA937B405; Sun, 22 Dec 2002 11:37:16 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 998C537B401 for ; Sun, 22 Dec 2002 11:37:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3544143EE5 for ; Sun, 22 Dec 2002 11:37:15 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMJbFfh016783 for ; Sun, 22 Dec 2002 11:37:15 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMJbEP9016780 for perforce@freebsd.org; Sun, 22 Dec 2002 11:37:14 -0800 (PST) Date: Sun, 22 Dec 2002 11:37:14 -0800 (PST) Message-Id: <200212221937.gBMJbEP9016780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22628 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22628 Change 22628 by marcel@marcel_nfs on 2002/12/22 11:36:15 Convert to new sioprobe/sioattach interface. The rclk handling specific to puc(4) is now nothing special anymore... Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_puc.c#6 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_puc.c#6 (text+ko) ==== @@ -38,6 +38,8 @@ #include #include #include +#include +#include #include #include @@ -58,34 +60,55 @@ static driver_t sio_puc_driver = { sio_driver_name, sio_puc_methods, - 0, + sizeof(struct com_s), }; static int sio_puc_attach(dev) device_t dev; { + struct com_s *com; + struct resource *res; + int error, rid; uintptr_t rclk; - if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, - &rclk) != 0) - rclk = DEFAULT_RCLK; - return (sioattach(dev, 0, rclk)); + com = device_get_softc(dev); + rid = 0; + res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, + RF_ACTIVE); + if (res == NULL) + return (ENXIO); + error = sioattach(dev); + if (error) + bus_release_resource(dev, SYS_RES_IOPORT, rid, res); + return (error); } static int sio_puc_probe(dev) device_t dev; { + struct com_s *com; + struct resource *res; + int error, rid; uintptr_t rclk; - if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, - &rclk) != 0) - rclk = DEFAULT_RCLK; + com = device_get_softc(dev); + rid = 0; + res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, + RF_ACTIVE); + if (res == NULL) + return (ENXIO); + com->bsh = rman_get_bushandle(res); + com->bst = rman_get_bustag(res); + if (!BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, &rclk)) + com->rclk = rclk; #ifdef PC98 SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); #endif - return (sioprobe(dev, 0, rclk, 1)); + error = sioprobe(dev); + bus_release_resource(dev, SYS_RES_IOPORT, rid, res); + return (error); } DRIVER_MODULE(sio, puc, sio_puc_driver, sio_devclass, 0, 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 11:45:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA25137B405; Sun, 22 Dec 2002 11:45:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6CD3737B401 for ; Sun, 22 Dec 2002 11:45:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C42DB43EDE for ; Sun, 22 Dec 2002 11:45:25 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMJjPfh020289 for ; Sun, 22 Dec 2002 11:45:25 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMJjPJc020286 for perforce@freebsd.org; Sun, 22 Dec 2002 11:45:25 -0800 (PST) Date: Sun, 22 Dec 2002 11:45:25 -0800 (PST) Message-Id: <200212221945.gBMJjPJc020286@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22629 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22629 Change 22629 by marcel@marcel_nfs on 2002/12/22 11:44:26 Change the interface of sioprobe/sioattach: o All parameters are passed in struct com_s. This means that we don't allocate the softc anymore. In sioprobe we replace the previously allocated softc with the static one used by the serial consolei if the tag and handle of the device we're about to probe match the tag and handle of the serial console. This means that anything that we knew during console probing, we know here... o Do not deal with resources here anymore. The bus specific front-ends have the best knowledge to fiddle with the resources. Here we only work with tags and handle. o Do not test interrupts anymore. This too is better done by the bus specific front-ends. The IRQ handling is mostly in limbo. \END{CRITICAL SECTION} This obviously needs more work... Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#23 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#23 (text+ko) ==== @@ -70,8 +70,6 @@ #include #include -#include - #include #include @@ -376,20 +374,9 @@ struct com_s *com; int i; - com = (struct com_s *) device_get_softc(dev); - if (com == NULL) { - device_printf(dev, "NULL com in siounload\n"); - return (0); - } + com = (struct com_s *)device_get_softc(dev); com->gone = 1; - for (i = 0 ; i < 6; i++) - destroy_dev(com->devs[i]); - if (com->irqres) { - bus_teardown_intr(dev, com->irqres, com->cookie); - bus_release_resource(dev, SYS_RES_IRQ, 0, com->irqres); - } - if (com->ioportres) - bus_release_resource(dev, com->ioportspace, 0, com->ioportres); + if (com->tp && (com->tp->t_state & TS_ISOPEN)) { device_printf(dev, "still open, forcing close\n"); (*linesw[com->tp->t_line].l_close)(com->tp, 0); @@ -397,27 +384,22 @@ ttyclose(com->tp); ttwakeup(com->tp); ttwwakeup(com->tp); - } else { - if (com->ibuf != NULL) - free(com->ibuf, M_DEVBUF); - device_set_softc(dev, NULL); - free(com, M_DEVBUF); } + + for (i = 0 ; i < 6; i++) + destroy_dev(com->devs[i]); + + if (com->ibuf != NULL) + free(com->ibuf, M_DEVBUF); + return (0); } int -sioprobe(dev, xrid, rclk, noprobe) - device_t dev; - int xrid; - u_long rclk; - int noprobe; +sioprobe(device_t dev) { -#if 0 - static bool_t already_init; - device_t xdev; -#endif struct com_s *com; + u_int divisor; bool_t failures[10]; int fn; @@ -425,32 +407,9 @@ u_char mcr_image; int result; u_int flags = device_get_flags(dev); - int rid, space; - struct resource *port; - rid = (xrid < 0) ? -xrid : xrid; - space = (xrid < 0) ? SYS_RES_MEMORY : SYS_RES_IOPORT; - port = bus_alloc_resource(dev, space, &rid, 0, ~0, IO_COMSIZE, - RF_ACTIVE); - if (!port) - return (ENXIO); + com = (struct com_s *)device_get_softc(dev); - if (rman_get_bustag(port) != sio_console.bst || - rman_get_bushandle(port) != sio_console.bsh) { - com = malloc(sizeof(*com), M_DEVBUF, M_NOWAIT | M_ZERO); - if (com == NULL) - return (ENOMEM); - bzero(com, sizeof *com); - com->bst = rman_get_bustag(port); - com->bsh = rman_get_bushandle(port); - if (rclk == 0) - rclk = DEFAULT_RCLK; - com->rclk = rclk; - } else - com = &sio_console; - - device_set_softc(dev, com); - while (sio_inited != 2) if (atomic_cmpset_int(&sio_inited, 0, 1)) { mtx_init(&sio_lock, sio_driver_name, NULL, @@ -459,20 +418,21 @@ atomic_store_rel_int(&sio_inited, 2); } - if (com->consdev != NULL) { - bus_release_resource(dev, space, rid, port); + /* Check if we're probing the console. */ + if (com->bst == sio_console.bst && com->bsh == sio_console.bsh) { + com = &sio_console; + device_set_softc(dev, com); return (0); } if (COM_LLCONSOLE(flags)) { - printf("sio%d: reserved for low-level i/o\n", - device_get_unit(dev)); - bus_release_resource(dev, space, rid, port); - device_set_softc(dev, NULL); - free(com, M_DEVBUF); + device_printf(dev, "reserved for low-level i/o\n"); return (ENXIO); } + if (com->rclk == 0) + com->rclk = DEFAULT_RCLK; + /* * If the device is on a multiport card and has an AST/4 * compatible interrupt control register, initialize this @@ -487,8 +447,8 @@ if (COM_ISMULTIPORT(flags)) { idev = devclass_get_device(sio_devclass, COM_MPMASTER(flags)); if (idev == NULL) { - printf("sio%d: master device %d not configured\n", - device_get_unit(dev), COM_MPMASTER(flags)); + device_printf(dev, "master device %d not configured\n", + COM_MPMASTER(flags)); idev = dev; } if (!COM_NOTAST4(flags)) { @@ -506,6 +466,7 @@ } } #endif /* COM_MULTIPORT */ + if (bus_get_resource(idev, SYS_RES_IRQ, 0, NULL, NULL) != 0) mcr_image = 0; @@ -531,7 +492,7 @@ * We don't want to to wait long enough to drain at 2 bps. */ sio_setreg(com, com_lcr, LCR_DLAB | LCR_8BITS); - divisor = siodivisor(rclk, SIO_TEST_SPEED); + divisor = siodivisor(com->rclk, SIO_TEST_SPEED); sio_setreg(com, com_dlbl, divisor & 0xff); sio_setreg(com, com_dlbh, divisor >> 8); sio_setreg(com, com_lcr, LCR_8BITS); @@ -594,95 +555,30 @@ * Some pcmcia cards have the "TXRDY bug", so we check everyone * for IIR_TXRDY implementation ( Palido 321s, DC-1S... ) */ - if (noprobe) { - /* Reading IIR register twice */ - for (fn = 0; fn < 2; fn ++) { - DELAY(10000); - failures[6] = sio_getreg(com, com_iir); - } - /* Check IIR_TXRDY clear ? */ - result = 0; - if (failures[6] & IIR_TXRDY) { - /* No, Double check with clearing IER */ - sio_setreg(com, com_ier, 0); - if (sio_getreg(com, com_iir) & IIR_NOPEND) { - /* Ok. We discovered TXRDY bug! */ - SET_FLAG(dev, COM_C_IIR_TXRDYBUG); - } else { - /* Unknown, Just omit this chip.. XXX */ - result = ENXIO; - sio_setreg(com, com_mcr, 0); - } + for (fn = 0; fn < 2; fn ++) { + DELAY(10000); + failures[6] = sio_getreg(com, com_iir); + } + /* Check IIR_TXRDY clear ? */ + result = 0; + if (failures[6] & IIR_TXRDY) { + /* No, Double check with clearing IER */ + sio_setreg(com, com_ier, 0); + if (sio_getreg(com, com_iir) & IIR_NOPEND) { + /* Ok. We discovered TXRDY bug! */ + SET_FLAG(dev, COM_C_IIR_TXRDYBUG); } else { - /* OK. this is well-known guys */ - CLR_FLAG(dev, COM_C_IIR_TXRDYBUG); + /* Unknown, Just omit this chip.. XXX */ + result = ENXIO; + sio_setreg(com, com_mcr, 0); } - sio_setreg(com, com_ier, 0); - sio_setreg(com, com_lcr, LCR_8BITS); - mtx_unlock_spin(&sio_lock); - bus_release_resource(dev, space, rid, port); - if (result != 0) { - device_set_softc(dev, NULL); - free(com, M_DEVBUF); - } - return (result); + } else { + /* OK. this is well-known guys */ + CLR_FLAG(dev, COM_C_IIR_TXRDYBUG); } - - /* - * Check that - * o the CFCR, IER and MCR in UART hold the values written to them - * (the values happen to be all distinct - this is good for - * avoiding false positive tests from bus echoes). - * o an output interrupt is generated and its vector is correct. - * o the interrupt goes away when the IIR in the UART is read. - */ -/* EXTRA DELAY? */ - failures[0] = sio_getreg(com, com_lcr) - LCR_8BITS; - failures[1] = sio_getreg(com, com_ier) - IER_ETXRDY; - failures[2] = sio_getreg(com, com_mcr) - mcr_image; - DELAY(10000); /* Some internal modems need this time */ - failures[4] = (sio_getreg(com, com_iir) & IIR_IMASK) - IIR_TXRDY; - DELAY(1000); /* XXX */ - failures[6] = (sio_getreg(com, com_iir) & IIR_IMASK) - IIR_NOPEND; - - /* - * Turn off all device interrupts and check that they go off properly. - * Leave MCR_IENABLE alone. For ports without a master port, it gates - * the OUT2 output of the UART to - * the ICU input. Closing the gate would give a floating ICU input - * (unless there is another device driving it) and spurious interrupts. - * (On the system that this was first tested on, the input floats high - * and gives a (masked) interrupt as soon as the gate is closed.) - */ sio_setreg(com, com_ier, 0); - sio_setreg(com, com_lcr, LCR_8BITS); /* dummy to avoid bus echo */ - failures[7] = sio_getreg(com, com_ier); - DELAY(1000); /* XXX */ - failures[9] = (sio_getreg(com, com_iir) & IIR_IMASK) - IIR_NOPEND; - + sio_setreg(com, com_lcr, LCR_8BITS); mtx_unlock_spin(&sio_lock); - - result = 0; - for (fn = 0; fn < sizeof failures; ++fn) - if (failures[fn]) { - sio_setreg(com, com_mcr, 0); - result = ENXIO; - if (bootverbose) { - printf("sio%d: probe failed test(s):", - device_get_unit(dev)); - for (fn = 0; fn < sizeof failures; ++fn) - if (failures[fn]) - printf(" %d", fn); - printf("\n"); - } - break; - } - - bus_release_resource(dev, space, rid, port); - if (result != 0) { - device_set_softc(dev, NULL); - free(com, M_DEVBUF); - } return (result); } @@ -752,10 +648,7 @@ #endif /* COM_ESP */ int -sioattach(dev, xrid, rclk) - device_t dev; - int xrid; - u_long rclk; +sioattach(device_t dev) { struct com_s *com; #ifdef COM_ESP @@ -764,20 +657,11 @@ int minorbase; int unit; u_int flags; - int rid, space; - struct resource *port; int ret; - rid = (xrid < 0) ? -xrid : xrid; - space = (xrid < 0) ? SYS_RES_MEMORY : SYS_RES_IOPORT; - port = bus_alloc_resource(dev, space, &rid, 0, ~0, IO_COMSIZE, - RF_ACTIVE); - if (!port) - return (ENXIO); - - unit = device_get_unit(dev); com = device_get_softc(dev); flags = device_get_flags(dev); + unit = device_get_unit(dev); if (unit >= sio_numunits) sio_numunits = unit + 1; @@ -798,10 +682,6 @@ * device from sending before we are ready. */ com->unit = unit; - com->ioportres = port; - com->ioportspace = space; - com->bst = rman_get_bustag(port); - com->bsh = rman_get_bushandle(port); com->cfcr_image = LCR_8BITS; com->dtr_wait = 3 * hz; com->loses_outints = COM_LOSESOUTINTS(flags) != 0; @@ -812,10 +692,6 @@ com->mcr_image = sio_getreg(com, com_mcr); - if (rclk == 0) - rclk = DEFAULT_RCLK; - com->rclk = rclk; - /* * We don't use all the flags from since they * are only relevant for logins. It's important to have echo off @@ -837,16 +713,12 @@ com->it_in.c_ispeed = com->it_in.c_ospeed = comdefaultrate; } else com->it_in.c_ispeed = com->it_in.c_ospeed = TTYDEF_SPEED; + if (siosetwater(com, com->it_in.c_ispeed) != 0) { mtx_unlock_spin(&sio_lock); - /* - * Leave i/o resources allocated if this is a `cn'-level - * console, so that other devices can't snarf them. - */ - if (com->consdev == NULL) - bus_release_resource(dev, space, rid, port); return (ENOMEM); } + mtx_unlock_spin(&sio_lock); termioschars(&com->it_in); com->it_out = com->it_in; @@ -990,9 +862,6 @@ com->pps.ppscap = PPS_CAPTUREASSERT | PPS_CAPTURECLEAR; pps_init(&com->pps); - rid = 0; - com->irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0ul, ~0ul, 1, - RF_ACTIVE); if (com->irqres) { ret = BUS_SETUP_INTR(device_get_parent(dev), dev, com->irqres, INTR_TYPE_TTY | INTR_FAST, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 12:51:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62A5B37B405; Sun, 22 Dec 2002 12:51:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA11C37B401 for ; Sun, 22 Dec 2002 12:51:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B04D43EEA for ; Sun, 22 Dec 2002 12:51:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMKplfh045068 for ; Sun, 22 Dec 2002 12:51:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMKpkKo045065 for perforce@freebsd.org; Sun, 22 Dec 2002 12:51:46 -0800 (PST) Date: Sun, 22 Dec 2002 12:51:46 -0800 (PST) Message-Id: <200212222051.gBMKpkKo045065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22630 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22630 Change 22630 by marcel@marcel_nfs on 2002/12/22 12:50:49 Let's not redefine bst and bsh in the attach method. We define them in the probe method and since sioprobe can swap the softc, it seems better to just leave them alone. This assumes that attach does not get different resources than probe... Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_pci.c#11 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_pci.c#11 (text+ko) ==== @@ -109,8 +109,6 @@ rid = (id->rid >= 0) ? id->rid : -id->rid; space = (id->rid >= 0) ? SYS_RES_IOPORT : SYS_RES_MEMORY; res = bus_alloc_resource(dev, space, &rid, 0, ~0, 8, RF_ACTIVE); - com->bsh = rman_get_bushandle(res); - com->bst = rman_get_bustag(res); error = sioattach(dev); if (error) bus_release_resource(dev, space, rid, res); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 13:51: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D4BB37B405; Sun, 22 Dec 2002 13:51:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0CCD837B401 for ; Sun, 22 Dec 2002 13:51:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2E9943EEC for ; Sun, 22 Dec 2002 13:51:02 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMLp2fh065568 for ; Sun, 22 Dec 2002 13:51:02 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMLp2nS065553 for perforce@freebsd.org; Sun, 22 Dec 2002 13:51:02 -0800 (PST) Date: Sun, 22 Dec 2002 13:51:02 -0800 (PST) Message-Id: <200212222151.gBMLp2nS065553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22635 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22635 Change 22635 by marcel@marcel_nfs on 2002/12/22 13:50:16 Add license. While here, put the return (ENXIO) in the else part so that if the #if 0 is changed into a #if 1 we don't have compiler warnings. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#4 (text+ko) ==== @@ -1,3 +1,31 @@ +/* + * Copyright (c) 2002 Marcel Moolenaar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + #include #include #include @@ -100,7 +128,7 @@ cd->baud = 115200L; cd->rclk = cd->baud << 4; return (0); +#else + return (ENXIO); #endif - - return (ENXIO); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 14:10:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCABF37B406; Sun, 22 Dec 2002 14:10:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 53B2437B401; Sun, 22 Dec 2002 14:10:10 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D06243EDE; Sun, 22 Dec 2002 14:10:08 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.6/8.12.3) with ESMTP id gBMMA7uB071525; Sun, 22 Dec 2002 15:10:07 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 22 Dec 2002 15:09:27 -0700 (MST) Message-Id: <20021222.150927.83284721.imp@bsdimp.com> To: marcel@freebsd.org Cc: perforce@freebsd.org Subject: Re: PERFORCE change 22623 for review From: "M. Warner Losh" In-Reply-To: <200212221912.gBMJCf5i009504@repoman.freebsd.org> References: <200212221912.gBMJCf5i009504@repoman.freebsd.org> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <200212221912.gBMJCf5i009504@repoman.freebsd.org> Marcel Moolenaar writes: : Convert to the new sioprobe/sioattach interface. While here, : remove the sio_pci_unit_kludge function. We consider this the : "future" version which according to the comment makes it : obsolete :-) It is not obsolete. There's no way to say that the ISA serial ports have reserved sio0 and sio1 so that the pci serial port should attach to sio2 or sio4. Until there is, this kludge is needed. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 14:11: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7917C37B401; Sun, 22 Dec 2002 14:11:07 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EA6937B406; Sun, 22 Dec 2002 14:11:07 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E3C243ED8; Sun, 22 Dec 2002 14:11:06 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.6/8.12.3) with ESMTP id gBMMB5uB071544; Sun, 22 Dec 2002 15:11:05 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 22 Dec 2002 15:10:26 -0700 (MST) Message-Id: <20021222.151026.100645554.imp@bsdimp.com> To: marcel@freebsd.org Cc: perforce@freebsd.org Subject: Re: PERFORCE change 22626 for review From: "M. Warner Losh" In-Reply-To: <200212221927.gBMJR0si013191@repoman.freebsd.org> References: <200212221927.gBMJR0si013191@repoman.freebsd.org> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <200212221927.gBMJR0si013191@repoman.freebsd.org> Marcel Moolenaar writes: : static int : sio_pccard_detach(dev) : device_t dev; : { : - return (siodetach(dev)); : + /* XXX broken */ : } This is clearly not acceptible. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 15:20:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CF4237B405; Sun, 22 Dec 2002 15:20:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE20B37B401 for ; Sun, 22 Dec 2002 15:20:12 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17C8843EDC for ; Sun, 22 Dec 2002 15:20:12 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from athlon.pn.xcllnt.net (athlon.pn.xcllnt.net [192.168.4.3]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBMNJwrT099052; Sun, 22 Dec 2002 15:19:59 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from athlon.pn.xcllnt.net (localhost [127.0.0.1]) by athlon.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBMNJwdT001419; Sun, 22 Dec 2002 15:19:58 -0800 (PST) (envelope-from marcel@athlon.pn.xcllnt.net) Received: (from marcel@localhost) by athlon.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gBMNJwHK001418; Sun, 22 Dec 2002 15:19:58 -0800 (PST) (envelope-from marcel) Date: Sun, 22 Dec 2002 15:19:58 -0800 From: Marcel Moolenaar To: "M. Warner Losh" Cc: perforce@freebsd.org Subject: Re: PERFORCE change 22623 for review Message-ID: <20021222231958.GA1414@athlon.pn.xcllnt.net> References: <200212221912.gBMJCf5i009504@repoman.freebsd.org> <20021222.150927.83284721.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021222.150927.83284721.imp@bsdimp.com> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Dec 22, 2002 at 03:09:27PM -0700, M. Warner Losh wrote: > In message: <200212221912.gBMJCf5i009504@repoman.freebsd.org> > Marcel Moolenaar writes: > : Convert to the new sioprobe/sioattach interface. While here, > : remove the sio_pci_unit_kludge function. We consider this the > : "future" version which according to the comment makes it > : obsolete :-) > > It is not obsolete. There's no way to say that the ISA serial ports > have reserved sio0 and sio1 so that the pci serial port should attach > to sio2 or sio4. Until there is, this kludge is needed. Can you tell me why or when this would be useful? -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 15:49:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 638EB37B406; Sun, 22 Dec 2002 15:49:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EDBAC37B405 for ; Sun, 22 Dec 2002 15:49:41 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4669243EDC for ; Sun, 22 Dec 2002 15:49:41 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from athlon.pn.xcllnt.net (athlon.pn.xcllnt.net [192.168.4.3]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBMNnYrT099097; Sun, 22 Dec 2002 15:49:34 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from athlon.pn.xcllnt.net (localhost [127.0.0.1]) by athlon.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBMNnYdT001485; Sun, 22 Dec 2002 15:49:34 -0800 (PST) (envelope-from marcel@athlon.pn.xcllnt.net) Received: (from marcel@localhost) by athlon.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gBMNnX1J001484; Sun, 22 Dec 2002 15:49:33 -0800 (PST) (envelope-from marcel) Date: Sun, 22 Dec 2002 15:49:33 -0800 From: Marcel Moolenaar To: "M. Warner Losh" Cc: perforce@freebsd.org Subject: Re: PERFORCE change 22626 for review Message-ID: <20021222234933.GB1414@athlon.pn.xcllnt.net> References: <200212221927.gBMJR0si013191@repoman.freebsd.org> <20021222.151026.100645554.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021222.151026.100645554.imp@bsdimp.com> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Dec 22, 2002 at 03:10:26PM -0700, M. Warner Losh wrote: > In message: <200212221927.gBMJR0si013191@repoman.freebsd.org> > Marcel Moolenaar writes: > : static int > : sio_pccard_detach(dev) > : device_t dev; > : { > : - return (siodetach(dev)); > : + /* XXX broken */ > : } > > This is clearly not acceptible. I completely fail to see why. I have to get a job done and as long as I don't commit it to CVS I don't see why I cannot break anything that's not immediately relevant to ia64 or to the job at hand. The primary reason for this kind of axing is that I cannot test it at all and it can only create bugs if I try to preserve it. It's much better to get rid of it and spend the extra effort when it's being restored. A second reason why I don't worry about it now is that it's not specific to pccard anymore. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 19:10:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E751037B406; Sun, 22 Dec 2002 19:10:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D63937B401 for ; Sun, 22 Dec 2002 19:10:15 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA2F543EEA for ; Sun, 22 Dec 2002 19:10:14 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.6/8.12.3) with ESMTP id gBN3ACuB072696; Sun, 22 Dec 2002 20:10:13 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 22 Dec 2002 20:09:21 -0700 (MST) Message-Id: <20021222.200921.66023382.imp@bsdimp.com> To: marcel@xcllnt.net Cc: perforce@freebsd.org Subject: Re: PERFORCE change 22623 for review From: "M. Warner Losh" In-Reply-To: <20021222231958.GA1414@athlon.pn.xcllnt.net> References: <200212221912.gBMJCf5i009504@repoman.freebsd.org> <20021222.150927.83284721.imp@bsdimp.com> <20021222231958.GA1414@athlon.pn.xcllnt.net> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <20021222231958.GA1414@athlon.pn.xcllnt.net> Marcel Moolenaar writes: : On Sun, Dec 22, 2002 at 03:09:27PM -0700, M. Warner Losh wrote: : > In message: <200212221912.gBMJCf5i009504@repoman.freebsd.org> : > Marcel Moolenaar writes: : > : Convert to the new sioprobe/sioattach interface. While here, : > : remove the sio_pci_unit_kludge function. We consider this the : > : "future" version which according to the comment makes it : > : obsolete :-) : > : > It is not obsolete. There's no way to say that the ISA serial ports : > have reserved sio0 and sio1 so that the pci serial port should attach : > to sio2 or sio4. Until there is, this kludge is needed. : : Can you tell me why or when this would be useful? Yes. Consider that we probe sio on isa after sio on pci. When probing sio on pci, we get sio0 because the sio on isa stuff hasn't happened yet. So, pci steal sio0 and the sio on the isa bus get sio1 and sio2. When using a serial console, this can cause problems with the console code because sio0 is flagged as the conosle, but sio1 is attached and there were (are?) problems in the console code that caused a panic if you ran in this combo. If that's no longer the case, then we have the 'usual' disconnect between the hints and the actual instances. I just remeber when I did it that it was a big deal to me and to the folks that hired me to create a pci driver for the controller based modems. Maybe things have changed, and if so I'm cool with things going away. But if they haven't changed, this needs to stay around until the underlying problems are fixed. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 19:13:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF46637B406; Sun, 22 Dec 2002 19:13:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47CAF37B401 for ; Sun, 22 Dec 2002 19:13:33 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AFE043EE8 for ; Sun, 22 Dec 2002 19:13:32 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.6/8.12.3) with ESMTP id gBN3DVuB072715; Sun, 22 Dec 2002 20:13:31 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 22 Dec 2002 20:12:40 -0700 (MST) Message-Id: <20021222.201240.16049170.imp@bsdimp.com> To: marcel@xcllnt.net Cc: perforce@freebsd.org Subject: Re: PERFORCE change 22626 for review From: "M. Warner Losh" In-Reply-To: <20021222234933.GB1414@athlon.pn.xcllnt.net> References: <200212221927.gBMJR0si013191@repoman.freebsd.org> <20021222.151026.100645554.imp@bsdimp.com> <20021222234933.GB1414@athlon.pn.xcllnt.net> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <20021222234933.GB1414@athlon.pn.xcllnt.net> Marcel Moolenaar writes: : On Sun, Dec 22, 2002 at 03:10:26PM -0700, M. Warner Losh wrote: : > In message: <200212221927.gBMJR0si013191@repoman.freebsd.org> : > Marcel Moolenaar writes: : > : static int : > : sio_pccard_detach(dev) : > : device_t dev; : > : { : > : - return (siodetach(dev)); : > : + /* XXX broken */ : > : } : > : > This is clearly not acceptible. : : I completely fail to see why. I have to get a job done and as long as : I don't commit it to CVS I don't see why I cannot break anything that's : not immediately relevant to ia64 or to the job at hand. The primary : reason for this kind of axing is that I cannot test it at all and it : can only create bugs if I try to preserve it. It's much better to get : rid of it and spend the extra effort when it's being restored. A second : reason why I don't worry about it now is that it's not specific to : pccard anymore. OK. I guess I should have been less upset. So long as at the end of the day I can pop out my sio card from my cardbus/pccard slot and the device goes away properly, I'm happy. Part of the reason I got upset is that I was going to try to integrate your changes to sio into my tree and try to give it a test in my environment. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 19:22:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4864F37B405; Sun, 22 Dec 2002 19:22:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D321537B401 for ; Sun, 22 Dec 2002 19:22:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8963F43EF1 for ; Sun, 22 Dec 2002 19:22:51 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBN3Mpfh084084 for ; Sun, 22 Dec 2002 19:22:51 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBN3MpPo084081 for perforce@freebsd.org; Sun, 22 Dec 2002 19:22:51 -0800 (PST) Date: Sun, 22 Dec 2002 19:22:51 -0800 (PST) Message-Id: <200212230322.gBN3MpPo084081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22647 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22647 Change 22647 by marcel@marcel_nfs on 2002/12/22 19:22:20 Fix a De Morgan bug: If we only expect a memory range OR an I/O port range, then we should ignore a resource if it's NOT a memory range AND NOT an I/O port range. The OR in the condition caused us to ignore perfectly valid memory addresses and consequently left us we sio(4) devices without I/O port AND without memory addresses. While here, remove redundant parenthesis and reindent the debug print. Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#6 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#6 (text+ko) ==== @@ -238,10 +238,10 @@ "IO" : "Memory")); break; } - if ((res->Data.Address32.ResourceType != ACPI_MEMORY_RANGE) || - (res->Data.Address32.ResourceType != ACPI_IO_RANGE)) { - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "ignored Address32 for non-memory, non-I/O\n")); + if (res->Data.Address32.ResourceType != ACPI_MEMORY_RANGE && + res->Data.Address32.ResourceType != ACPI_IO_RANGE) { + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, + "ignored Address32 for non-memory, non-I/O\n")); break; } @@ -296,10 +296,10 @@ "IO" : "Memory")); break; } - if ((res->Data.Address16.ResourceType != ACPI_MEMORY_RANGE) || - (res->Data.Address16.ResourceType != ACPI_IO_RANGE)) { - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "ignored Address16 for non-memory, non-I/O\n")); + if (res->Data.Address16.ResourceType != ACPI_MEMORY_RANGE && + res->Data.Address16.ResourceType != ACPI_IO_RANGE) { + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, + "ignored Address16 for non-memory, non-I/O\n")); break; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 19:36: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17B3F37B407; Sun, 22 Dec 2002 19:35:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A46D737B401 for ; Sun, 22 Dec 2002 19:35:57 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AF9643ED8 for ; Sun, 22 Dec 2002 19:35:56 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from athlon.pn.xcllnt.net (athlon.pn.xcllnt.net [192.168.4.3]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBN3ZgrT099476; Sun, 22 Dec 2002 19:35:42 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from athlon.pn.xcllnt.net (localhost [127.0.0.1]) by athlon.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBN3ZgdT002068; Sun, 22 Dec 2002 19:35:42 -0800 (PST) (envelope-from marcel@athlon.pn.xcllnt.net) Received: (from marcel@localhost) by athlon.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gBN3ZgNA002067; Sun, 22 Dec 2002 19:35:42 -0800 (PST) (envelope-from marcel) Date: Sun, 22 Dec 2002 19:35:42 -0800 From: Marcel Moolenaar To: "M. Warner Losh" Cc: perforce@freebsd.org Subject: Re: PERFORCE change 22623 for review Message-ID: <20021223033542.GA2039@athlon.pn.xcllnt.net> References: <200212221912.gBMJCf5i009504@repoman.freebsd.org> <20021222.150927.83284721.imp@bsdimp.com> <20021222231958.GA1414@athlon.pn.xcllnt.net> <20021222.200921.66023382.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021222.200921.66023382.imp@bsdimp.com> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Dec 22, 2002 at 08:09:21PM -0700, M. Warner Losh wrote: > : > > : > It is not obsolete. There's no way to say that the ISA serial ports > : > have reserved sio0 and sio1 so that the pci serial port should attach > : > to sio2 or sio4. Until there is, this kludge is needed. > : > : Can you tell me why or when this would be useful? > > Consider that we probe sio on isa after sio on pci. When probing sio > on pci, we get sio0 because the sio on isa stuff hasn't happened yet. > So, pci steal sio0 and the sio on the isa bus get sio1 and sio2. When > using a serial console, this can cause problems with the console code > because sio0 is flagged as the conosle, but sio1 is attached and there > were (are?) problems in the console code that caused a panic if you > ran in this combo. If that's no longer the case, then we have the > 'usual' disconnect between the hints and the actual instances. The diconnect is unavoidable and not even specific to sio(4). The console problem is easily solved now that we don't care about the unit anymore. All we care about it the address of the UART. When we find the UART during bus enumeration we'll automaticly use the right unit and everything is fine. As I said, the disconnect between hints and actual unit number is unavoidable. I think the best way to treat the hint "unit" is by viewwing it as a (random) identifier that binds independent hints. Once we find a sio hint that tells us that we have a potential console (by mean of hint.sio.XXX.flags), we look up the hints for sio XXX to find the port. We should not attach any more value to it than that. The device could easily end up as sio9... > I just remeber when I did it that it was a big deal to me and to the > folks that hired me to create a pci driver for the controller based > modems. Maybe things have changed, and if so I'm cool with things > going away. But if they haven't changed, this needs to stay around > until the underlying problems are fixed. The console problem has gone now that we only care about the tag and handle. The disconnect can still be confusing to people, but as I said above, this applies to any device that uses/needs hints. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 19:46:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99ADB37B407; Sun, 22 Dec 2002 19:46:30 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 33A0D37B401 for ; Sun, 22 Dec 2002 19:46:30 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81F5343ED8 for ; Sun, 22 Dec 2002 19:46:29 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from athlon.pn.xcllnt.net (athlon.pn.xcllnt.net [192.168.4.3]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBN3kMrT099490; Sun, 22 Dec 2002 19:46:22 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from athlon.pn.xcllnt.net (localhost [127.0.0.1]) by athlon.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBN3kMdT002094; Sun, 22 Dec 2002 19:46:22 -0800 (PST) (envelope-from marcel@athlon.pn.xcllnt.net) Received: (from marcel@localhost) by athlon.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gBN3kMSf002093; Sun, 22 Dec 2002 19:46:22 -0800 (PST) (envelope-from marcel) Date: Sun, 22 Dec 2002 19:46:22 -0800 From: Marcel Moolenaar To: "M. Warner Losh" Cc: perforce@freebsd.org Subject: Re: PERFORCE change 22626 for review Message-ID: <20021223034622.GB2039@athlon.pn.xcllnt.net> References: <200212221927.gBMJR0si013191@repoman.freebsd.org> <20021222.151026.100645554.imp@bsdimp.com> <20021222234933.GB1414@athlon.pn.xcllnt.net> <20021222.201240.16049170.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021222.201240.16049170.imp@bsdimp.com> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Dec 22, 2002 at 08:12:40PM -0700, M. Warner Losh wrote: > > Part of the reason I got upset is that I was going to try to integrate > your changes to sio into my tree and try to give it a test in my > environment. I see. yes, I can see how that is upsetting :-) Ok... Let me finish my hackery for today so that we have a console on pluto1 and I'll clean it up so that it works on i386 and alpha as well. I think I can get my hands on a pccard to test that too. After that we can decide what we want to do with it. If we think it's a nice starting point we should probably create a project for it... -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 20: 7:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FC9E37B405; Sun, 22 Dec 2002 20:07:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB96837B401 for ; Sun, 22 Dec 2002 20:07:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61B8243EDE for ; Sun, 22 Dec 2002 20:07:48 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBN47mfh098500 for ; Sun, 22 Dec 2002 20:07:48 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBN47lQq098497 for perforce@freebsd.org; Sun, 22 Dec 2002 20:07:47 -0800 (PST) Date: Sun, 22 Dec 2002 20:07:47 -0800 (PST) Message-Id: <200212230407.gBN47lQq098497@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22650 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22650 Change 22650 by marcel@marcel_nfs on 2002/12/22 20:07:41 Don't set the bus tag and handle at attach (by convention). Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_isa.c#10 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_isa.c#10 (text+ko) ==== @@ -204,8 +204,6 @@ res = sio_isa_alloc(dev, &space, &rid); if (res == NULL) return (ENXIO); - com->bsh = rman_get_bushandle(res); - com->bst = rman_get_bustag(res); error = sioattach(dev); if (error) bus_release_resource(dev, space, rid, res); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 20:44:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 220C137B405; Sun, 22 Dec 2002 20:44:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE26737B401 for ; Sun, 22 Dec 2002 20:44:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B5FA43EE6 for ; Sun, 22 Dec 2002 20:44:34 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBN4iYfh012816 for ; Sun, 22 Dec 2002 20:44:34 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBN4iXO6012813 for perforce@freebsd.org; Sun, 22 Dec 2002 20:44:33 -0800 (PST) Date: Sun, 22 Dec 2002 20:44:33 -0800 (PST) Message-Id: <200212230444.gBN4iXO6012813@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22652 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22652 Change 22652 by marcel@marcel_nfs on 2002/12/22 20:43:42 We have a memory mapped serial console: sio0 iomem 0xff5e0000-0xff5e0007 irq 34 on acpi0 sio0: type 16550, console Start cleaning things up by removing unused code and "explicit lyrics". Also, make the bus driver glue conditional on the presence of the bus. This makes me happy because the HP box doesn't have an ISA bus and will make bde happy because he doesn't have ACPI enabled ;-) Interrupts are still broken by the previous interface change. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_isa.c#11 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_isa.c#11 (text+ko) ==== @@ -24,6 +24,8 @@ * $FreeBSD: src/sys/dev/sio/sio_isa.c,v 1.9 2002/05/06 09:02:55 dwmalone Exp $ */ +#include "opt_acpi.h" + #include #include #include @@ -154,19 +156,12 @@ *rid = 0; *sp = SYS_RES_IOPORT; - device_printf(dev, "trying I/O port\n"); res = bus_alloc_resource(dev, *sp, rid, 0, ~0, 8, RF_ACTIVE); if (res == NULL) { - device_printf(dev, "trying memory mapped\n"); *rid = 0; *sp = SYS_RES_MEMORY; res = bus_alloc_resource(dev, *sp, rid, 0, ~0, 8, RF_ACTIVE); - if (res == NULL) { - device_printf(dev, "Bollocks!\n"); - return (NULL); - } } - return (res); } @@ -181,10 +176,10 @@ if (ISA_PNP_PROBE(device_get_parent(dev), dev, sio_ids) == ENXIO) return (ENXIO); - com = device_get_softc(dev); res = sio_isa_alloc(dev, &space, &rid); if (res == NULL) - return (0); + return (ENXIO); + com = device_get_softc(dev); com->bsh = rman_get_bushandle(res); com->bst = rman_get_bustag(res); error = sioprobe(dev); @@ -193,14 +188,11 @@ } static int -sio_isa_attach(dev) - device_t dev; +sio_isa_attach(device_t dev) { - struct com_s *com; struct resource *res; int error, rid, space; - com = device_get_softc(dev); res = sio_isa_alloc(dev, &space, &rid); if (res == NULL) return (ENXIO); @@ -210,5 +202,9 @@ return (error); } +#ifdef DEV_ISA DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0); +#endif +#ifdef DEV_ACPI DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0); +#endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 22:33:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B9AB37B405; Sun, 22 Dec 2002 22:33:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D739637B401 for ; Sun, 22 Dec 2002 22:33:56 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F16F43EDE for ; Sun, 22 Dec 2002 22:33:56 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.6/8.12.3) with ESMTP id gBN6XtuB073433; Sun, 22 Dec 2002 23:33:55 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 22 Dec 2002 23:32:59 -0700 (MST) Message-Id: <20021222.233259.132389122.imp@bsdimp.com> To: marcel@xcllnt.net Cc: perforce@freebsd.org Subject: Re: PERFORCE change 22626 for review From: "M. Warner Losh" In-Reply-To: <20021223034622.GB2039@athlon.pn.xcllnt.net> References: <20021222234933.GB1414@athlon.pn.xcllnt.net> <20021222.201240.16049170.imp@bsdimp.com> <20021223034622.GB2039@athlon.pn.xcllnt.net> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <20021223034622.GB2039@athlon.pn.xcllnt.net> Marcel Moolenaar writes: : On Sun, Dec 22, 2002 at 08:12:40PM -0700, M. Warner Losh wrote: : > : > Part of the reason I got upset is that I was going to try to integrate : > your changes to sio into my tree and try to give it a test in my : > environment. : : I see. yes, I can see how that is upsetting :-) : : Ok... Let me finish my hackery for today so that we have a console : on pluto1 and I'll clean it up so that it works on i386 and alpha : as well. I think I can get my hands on a pccard to test that too. : : After that we can decide what we want to do with it. If we think : it's a nice starting point we should probably create a project for : it... Ok. I'll wait for you to finish up and then give it a try on my machines. We can work on getting it into shape there. I have far too many weird sio devices... Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 22 22:34:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E5E937B405; Sun, 22 Dec 2002 22:34:46 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D42C37B401 for ; Sun, 22 Dec 2002 22:34:46 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6837443EDA for ; Sun, 22 Dec 2002 22:34:45 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.6/8.12.3) with ESMTP id gBN6YiuB073444; Sun, 22 Dec 2002 23:34:44 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 22 Dec 2002 23:33:48 -0700 (MST) Message-Id: <20021222.233348.122304694.imp@bsdimp.com> To: marcel@xcllnt.net Cc: perforce@freebsd.org Subject: Re: PERFORCE change 22623 for review From: "M. Warner Losh" In-Reply-To: <20021223033542.GA2039@athlon.pn.xcllnt.net> References: <20021222231958.GA1414@athlon.pn.xcllnt.net> <20021222.200921.66023382.imp@bsdimp.com> <20021223033542.GA2039@athlon.pn.xcllnt.net> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <20021223033542.GA2039@athlon.pn.xcllnt.net> Marcel Moolenaar writes: : > I just remeber when I did it that it was a big deal to me and to the : > folks that hired me to create a pci driver for the controller based : > modems. Maybe things have changed, and if so I'm cool with things : > going away. But if they haven't changed, this needs to stay around : > until the underlying problems are fixed. : : The console problem has gone now that we only care about the tag : and handle. The disconnect can still be confusing to people, but : as I said above, this applies to any device that uses/needs hints. OK. As long as the console problem is gone, I'm happy. The hint/unit disconnect is something that needs to be addressed, but that's a much uglier issue. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 13:17: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09CDD37B405; Mon, 23 Dec 2002 13:16:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7EF7937B401 for ; Mon, 23 Dec 2002 13:16:56 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3585743EEF for ; Mon, 23 Dec 2002 13:16:55 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBNLGfrT001627; Mon, 23 Dec 2002 13:16:42 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBNLHaHF000821; Mon, 23 Dec 2002 13:17:36 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gBNLHaoS000820; Mon, 23 Dec 2002 13:17:36 -0800 (PST) Date: Mon, 23 Dec 2002 13:17:36 -0800 From: Marcel Moolenaar To: "M. Warner Losh" Cc: perforce@freebsd.org Subject: Re: PERFORCE change 22623 for review Message-ID: <20021223211736.GB660@dhcp01.pn.xcllnt.net> References: <20021222231958.GA1414@athlon.pn.xcllnt.net> <20021222.200921.66023382.imp@bsdimp.com> <20021223033542.GA2039@athlon.pn.xcllnt.net> <20021222.233348.122304694.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021222.233348.122304694.imp@bsdimp.com> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Dec 22, 2002 at 11:33:48PM -0700, M. Warner Losh wrote: > In message: <20021223033542.GA2039@athlon.pn.xcllnt.net> > Marcel Moolenaar writes: > : > I just remeber when I did it that it was a big deal to me and to the > : > folks that hired me to create a pci driver for the controller based > : > modems. Maybe things have changed, and if so I'm cool with things > : > going away. But if they haven't changed, this needs to stay around > : > until the underlying problems are fixed. > : > : The console problem has gone now that we only care about the tag > : and handle. The disconnect can still be confusing to people, but > : as I said above, this applies to any device that uses/needs hints. > > OK. As long as the console problem is gone, I'm happy. The hint/unit > disconnect is something that needs to be addressed, but that's a much > uglier issue. This is what I figure: We need to change the semantics of the hints if we want to have consistency. Hints can be given gratuitously now, which decreases their value to the point that they are referenced as a last resort. This includes the PnP case where there are multiple possible settings and as long as there's no conflict either of those settings is equally valid. Hints will help us decide only. Thus, hints are lacking the "authority" to force or dictate behaviour. If we remove the need for hints in cases it isn't required and we stop the gratuity of them being given, we can turn them into reservations. Let's explain with an example: In a machine M are two identical ethernet interfaces, one at address A0 and one at address A1. Bus enumeration has caused the assignment: foo0: at address A1, and foo1: at address A0 Also present in machine M are two serial interfaces of which one is auto-detected (PnP) and placed at address A2. The placement is from the set S={A2,A3,A4} of possible settings. The assignment yields: ser0: at address A2 The second serial interface cannot be found by bus-enumeration and also happens to be hardwired (jumpered) at address A2. The user likes to use that one as the console and wants it given unit 1. Picky as the user is, he also likes foo0 at address A0 and foo1 at address A1. If hints are reservations, the following may possibly achieve what the user wants: foo.0.address=A0 ser.1.address=A2 serial_console=A2 The logic (in chronological order) would be something like: /* {t1,t2}: Make reservations */ t1 Reserve unit 0 of devclass foo for address A0 t2 Reserve unit 1 of devclass ser for address A2 /* {t3}: Console probing */ t3 Probe serial console at address A2; unit unknown /* {t4,t6}: Bus enumeration */ t4 found unreserved foo at address A1; first free unit 1 t5 found reserved foo at address A0; unit 0 t6 found unreserved ser at {A2,A3,A4}; first free unit 0; first free resource A3 /* {t7}: Probe reserved undetected devices */ t7 Undetected reserved ser at address A2; unit 1, console Note that if hints are reservations, the use of unit numbers for console devices is possible, provided a reservation exists that ties it to an address. Thus: serial_console=unit:1 ser.1.address=mem:0x1234 If there's no reservation, serial consoles have to be defined in terms of addresses: serial_console=port:0x3f8 (the prefix "unit", "mem" or "port" is for illustrative purposes) Anyway: just some thoughts... -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 16:58:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC08937B405; Mon, 23 Dec 2002 16:58:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5238E37B401 for ; Mon, 23 Dec 2002 16:58:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AF7543ED8 for ; Mon, 23 Dec 2002 16:58:31 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO0wUfh045295 for ; Mon, 23 Dec 2002 16:58:30 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO0wUZ2045287 for perforce@freebsd.org; Mon, 23 Dec 2002 16:58:30 -0800 (PST) Date: Mon, 23 Dec 2002 16:58:30 -0800 (PST) Message-Id: <200212240058.gBO0wUZ2045287@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22678 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22678 Change 22678 by marcel@marcel_nfs on 2002/12/23 16:57:35 Don't enable the FIFOs for the console. Interrupts are disabled anyway, so there's really no advantage. Enabling them may cause problems. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_cons.c#6 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_cons.c#6 (text+ko) ==== @@ -155,19 +155,16 @@ static void siocninit(struct consdev *cp) { - u_char fcr, iir; + u_char iir; /* Disable all interrupt sources. */ sio_setreg(&sio_console, com_ier, 0); /* XXX barrier */ - /* Set FCR. */ - fcr = FCR_RX_MEDH | FCR_ENABLE; - sio_setreg(&sio_console, com_fcr, fcr); + /* Disable the FIFO (if present). */ + sio_setreg(&sio_console, com_fcr, 0); /* XXX barrier */ - sio_setreg(&sio_console, com_fcr, fcr | FCR_RCV_RST | FCR_XMT_RST); - /* XXX barrier */ - sio_console.reg_fcr = fcr; + sio_console.reg_fcr = 0; /* Set MCR. */ sio_setreg(&sio_console, com_mcr, MCR_IENABLE | MCR_RTS | MCR_DTR); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 17:30:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AD9B37B405; Mon, 23 Dec 2002 17:30:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C6D4137B401 for ; Mon, 23 Dec 2002 17:30:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EACED43EE8 for ; Mon, 23 Dec 2002 17:30:09 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO1U9fh056225 for ; Mon, 23 Dec 2002 17:30:09 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO1U90C056209 for perforce@freebsd.org; Mon, 23 Dec 2002 17:30:09 -0800 (PST) Date: Mon, 23 Dec 2002 17:30:09 -0800 (PST) Message-Id: <200212240130.gBO1U90C056209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22679 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22679 Change 22679 by marcel@marcel_nfs on 2002/12/23 17:29:10 o Axe support for the Hayes ESP. It still uses ports and could only bitrot further. Once the driver stabilizes, support can be added back, although it looks to me that any support we add here would annihilate the purpose of having an ESP because in enhanced mode it doesn't look like an UART at all so we can only support it in compat mode. o Remove COM_MULTIPORT code. There's too much weirdness trying to deal with multi-port boards in the core of the UART driver that it makes more sense to use puc(4) to abstract them. The intention is for the puc(4) driver to detect the multi-port cards and to deal with the weirdness. It provides an abstracted bus for sio(4) to attach too with minimal tweaks. This keeps the sio(4) core clean and yields the most flexible environment. o Strip sioprobe. The complexity of probing depends on the bus and should be done where it can least interfere with other busses. This removes the isa_irq_pending() references. Also, we want to minimize the fiddling with the UART at probe time because we may not even attach to it. Hence, presetting of the UART has been moved to sioattach. Note that identification will be moved to sioprobe so that we can properly set the description. o Enable interrupts again. The decision to use puc(4) for multi-port cards allows us to deal with the IRQ resource here. We still need a way to not assume polling mode in the case no IRQ resource exists. This follows later. Use of puc(4) discussed with imp. Current status: The sio(4) driver works on BigSur, which has an ISA legacy. On the HP box we don't seem to have any sio(4) interrupts. vmstat -i does list sio(4) devices at all. No indication exists that this is a sio(4) specific problem. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#24 edit .. //depot/projects/ia64/sys/dev/sio/siovar.h#10 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#24 (text+ko) ==== @@ -76,10 +76,6 @@ #include #include -#ifdef COM_ESP -#include -#endif - #define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */ #define CALLOUT_MASK 0x80 @@ -92,17 +88,6 @@ #define UNIT_TO_MINOR(unit) ((((unit) & ~0x1fU) << (8 + 3)) \ | ((unit) & 0x1f)) -#ifdef COM_MULTIPORT -/* checks in flags for multiport and which is multiport "master chip" - * for a given card - */ -#define COM_ISMULTIPORT(flags) ((flags) & 0x01) -#define COM_MPMASTER(flags) (((flags) >> 8) & 0x0ff) -#define COM_NOTAST4(flags) ((flags) & 0x04) -#else -#define COM_ISMULTIPORT(flags) (0) -#endif /* COM_MULTIPORT */ - #define COM_CONSOLE(flags) ((flags) & 0x10) #define COM_FORCECONSOLE(flags) ((flags) & 0x20) #define COM_LLCONSOLE(flags) ((flags) & 0x40) @@ -154,15 +139,6 @@ #define CE_RECORD(com, errnum) (++(com)->delta_error_counts[errnum]) -/* types. XXX - should be elsewhere */ -#ifdef COM_ESP -typedef u_int Port_t; /* hardware port */ -#endif - -#ifdef COM_ESP -static int espattach(struct com_s *com, Port_t esp_port); -#endif - static timeout_t siobusycheck; static timeout_t siodtrwakeup; static void comhardclose(struct com_s *com); @@ -231,13 +207,6 @@ = CALLOUT_HANDLE_INITIALIZER(&sio_timeout_handle); static int sio_numunits; -#ifdef COM_ESP -/* XXX configure this properly. */ -/* XXX quite broken for new-bus. */ -static Port_t likely_com_ports[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, }; -static Port_t likely_esp_ports[] = { 0x140, 0x180, 0x280, 0 }; -#endif - /* * handle sysctl read/write requests for console speed * @@ -323,7 +292,6 @@ /* * Do some non-destructive (for this device that is) tests * to make sure we have something that looks like an UART. - * */ int sioprobe1(struct com_s *sc) { @@ -340,7 +308,7 @@ if (val & 0xe0) goto fail; - /* Check known 0 bits that depend on ~DLAB. */ + /* Check known 0 bits that depend on !DLAB. */ val = sio_getreg(sc, com_ier); if (val & 0xf0) goto fail; @@ -368,10 +336,9 @@ * read and write do not hang. */ int -siodetach(dev) - device_t dev; +siodetach(device_t dev) { - struct com_s *com; + struct com_s *com; int i; com = (struct com_s *)device_get_softc(dev); @@ -385,13 +352,14 @@ ttwakeup(com->tp); ttwwakeup(com->tp); } - + if (com->irqres) { + bus_teardown_intr(dev, com->irqres, com->cookie); + bus_release_resource(dev, SYS_RES_IRQ, 0, com->irqres); + } for (i = 0 ; i < 6; i++) destroy_dev(com->devs[i]); - if (com->ibuf != NULL) free(com->ibuf, M_DEVBUF); - return (0); } @@ -399,17 +367,8 @@ sioprobe(device_t dev) { struct com_s *com; + u_int flags; - u_int divisor; - bool_t failures[10]; - int fn; - device_t idev; - u_char mcr_image; - int result; - u_int flags = device_get_flags(dev); - - com = (struct com_s *)device_get_softc(dev); - while (sio_inited != 2) if (atomic_cmpset_int(&sio_inited, 0, 1)) { mtx_init(&sio_lock, sio_driver_name, NULL, @@ -418,6 +377,8 @@ atomic_store_rel_int(&sio_inited, 2); } + com = (struct com_s *)device_get_softc(dev); + /* Check if we're probing the console. */ if (com->bst == sio_console.bst && com->bsh == sio_console.bsh) { com = &sio_console; @@ -425,239 +386,32 @@ return (0); } + flags = device_get_flags(dev); + if (COM_LLCONSOLE(flags)) { device_printf(dev, "reserved for low-level i/o\n"); return (ENXIO); } + /* Perform rudimentary sanity checking. */ + if (sioprobe1(com)) + return (ENXIO); + if (com->rclk == 0) com->rclk = DEFAULT_RCLK; - /* - * If the device is on a multiport card and has an AST/4 - * compatible interrupt control register, initialize this - * register and prepare to leave MCR_IENABLE clear in the mcr. - * Otherwise, prepare to set MCR_IENABLE in the mcr. - * Point idev to the device struct giving the correct id_irq. - * This is the struct for the master device if there is one. - */ - idev = dev; - mcr_image = MCR_IENABLE; -#ifdef COM_MULTIPORT - if (COM_ISMULTIPORT(flags)) { - idev = devclass_get_device(sio_devclass, COM_MPMASTER(flags)); - if (idev == NULL) { - device_printf(dev, "master device %d not configured\n", - COM_MPMASTER(flags)); - idev = dev; - } - if (!COM_NOTAST4(flags)) { - struct com_s icom; - - icom = (struct com_s *) device_get_softc(idev); - if (icom != NULL) { - if (bus_get_resource(idev, SYS_RES_IRQ, 0, - NULL, NULL) == 0) - sio_setreg(icom, com_scr, 0x80); - else - sio_setreg(icom, com_scr, 0); - } - mcr_image = 0; - } - } -#endif /* COM_MULTIPORT */ - - if (bus_get_resource(idev, SYS_RES_IRQ, 0, NULL, NULL) != 0) - mcr_image = 0; - - bzero(failures, sizeof failures); - - /* - * We don't want to get actual interrupts, just masked ones. - * Interrupts from this line should already be masked in the ICU, - * but mask them in the processor as well in case there are some - * (misconfigured) shared interrupts. - */ - mtx_lock_spin(&sio_lock); -/* EXTRA DELAY? */ - - /* - * Initialize the speed and the word size and wait long enough to - * drain the maximum of 16 bytes of junk in device output queues. - * The speed is undefined after a master reset and must be set - * before relying on anything related to output. There may be - * junk after a (very fast) soft reboot and (apparently) after - * master reset. - * XXX what about the UART bug avoided by waiting in comparam()? - * We don't want to to wait long enough to drain at 2 bps. - */ - sio_setreg(com, com_lcr, LCR_DLAB | LCR_8BITS); - divisor = siodivisor(com->rclk, SIO_TEST_SPEED); - sio_setreg(com, com_dlbl, divisor & 0xff); - sio_setreg(com, com_dlbh, divisor >> 8); - sio_setreg(com, com_lcr, LCR_8BITS); - DELAY((16 + 1) * 1000000 / (SIO_TEST_SPEED / 10)); - - /* - * Enable the interrupt gate and disable device interupts. This - * should leave the device driving the interrupt line low and - * guarantee an edge trigger if an interrupt can be generated. - */ -/* EXTRA DELAY? */ - sio_setreg(com, com_mcr, mcr_image); sio_setreg(com, com_ier, 0); - DELAY(1000); /* XXX */ + /* XXX barrier */ - /* - * Attempt to set loopback mode so that we can send a null byte - * without annoying any external device. - */ -/* EXTRA DELAY? */ - sio_setreg(com, com_mcr, mcr_image | MCR_LOOPBACK); - - /* - * Attempt to generate an output interrupt. On 8250's, setting - * IER_ETXRDY generates an interrupt independent of the current - * setting and independent of whether the THR is empty. On 16450's, - * setting IER_ETXRDY generates an interrupt independent of the - * current setting. On 16550A's, setting IER_ETXRDY only - * generates an interrupt when IER_ETXRDY is not already set. - */ - sio_setreg(com, com_ier, IER_ETXRDY); - - /* - * On some 16x50 incompatibles, setting IER_ETXRDY doesn't generate - * an interrupt. They'd better generate one for actually doing - * output. Loopback may be broken on the same incompatibles but - * it's unlikely to do more than allow the null byte out. - */ - sio_setreg(com, com_data, 0); - DELAY((1 + 2) * 1000000 / (SIO_TEST_SPEED / 10)); - - /* - * Turn off loopback mode so that the interrupt gate works again - * (MCR_IENABLE was hidden). This should leave the device driving - * an interrupt line high. It doesn't matter if the interrupt - * line oscillates while we are not looking at it, since interrupts - * are disabled. - */ -/* EXTRA DELAY? */ - sio_setreg(com, com_mcr, mcr_image); - - /* - * It seems my Xircom CBEM56G Cardbus modem wants to be reset - * to 8 bits *again*, or else probe test 0 will fail. - * gwk@sgi.com, 4/19/2001 - */ - sio_setreg(com, com_lcr, LCR_8BITS); - - /* - * Some pcmcia cards have the "TXRDY bug", so we check everyone - * for IIR_TXRDY implementation ( Palido 321s, DC-1S... ) - */ - for (fn = 0; fn < 2; fn ++) { - DELAY(10000); - failures[6] = sio_getreg(com, com_iir); - } - /* Check IIR_TXRDY clear ? */ - result = 0; - if (failures[6] & IIR_TXRDY) { - /* No, Double check with clearing IER */ - sio_setreg(com, com_ier, 0); - if (sio_getreg(com, com_iir) & IIR_NOPEND) { - /* Ok. We discovered TXRDY bug! */ - SET_FLAG(dev, COM_C_IIR_TXRDYBUG); - } else { - /* Unknown, Just omit this chip.. XXX */ - result = ENXIO; - sio_setreg(com, com_mcr, 0); - } - } else { - /* OK. this is well-known guys */ - CLR_FLAG(dev, COM_C_IIR_TXRDYBUG); - } - sio_setreg(com, com_ier, 0); - sio_setreg(com, com_lcr, LCR_8BITS); - mtx_unlock_spin(&sio_lock); - return (result); + return (0); } -#ifdef COM_ESP -static int -espattach(com, esp_port) - struct com_s *com; - Port_t esp_port; -{ - u_char dips; - u_char val; - - /* - * Check the ESP-specific I/O port to see if we're an ESP - * card. If not, return failure immediately. - */ - if ((inb(esp_port) & 0xf3) == 0) { - printf(" port 0x%x is not an ESP board?\n", esp_port); - return (0); - } - - /* - * We've got something that claims to be a Hayes ESP card. - * Let's hope so. - */ - - /* Get the dip-switch configuration */ - outb(esp_port + ESP_CMD1, ESP_GETDIPS); - dips = inb(esp_port + ESP_STATUS1); - - /* - * Bits 0,1 of dips say which COM port we are. - */ - if (rman_get_start(com->ioportres) == likely_com_ports[dips & 0x03]) - printf(" : ESP"); - else { - printf(" esp_port has com %d\n", dips & 0x03); - return (0); - } - - /* - * Check for ESP version 2.0 or later: bits 4,5,6 = 010. - */ - outb(esp_port + ESP_CMD1, ESP_GETTEST); - val = inb(esp_port + ESP_STATUS1); /* clear reg 1 */ - val = inb(esp_port + ESP_STATUS2); - if ((val & 0x70) < 0x20) { - printf("-old (%o)", val & 0x70); - return (0); - } - - /* - * Check for ability to emulate 16550: bit 7 == 1 - */ - if ((dips & 0x80) == 0) { - printf(" slave"); - return (0); - } - - /* - * Okay, we seem to be a Hayes ESP card. Whee. - */ - com->esp = TRUE; - com->esp_port = esp_port; - return (1); -} -#endif /* COM_ESP */ - int sioattach(device_t dev) { struct com_s *com; -#ifdef COM_ESP - Port_t *espp; -#endif - int minorbase; - int unit; + int minorbase, ret, rid, unit; u_int flags; - int ret; com = device_get_softc(dev); flags = device_get_flags(dev); @@ -666,23 +420,25 @@ if (unit >= sio_numunits) sio_numunits = unit + 1; - if (com->consdev) + /* + * Preset the UART to something reasonable. Only do this when the + * UART is not used as the console. We assume the console works + * and whatever the setting, it cannot be unreasonable. + */ + if (com->consdev == NULL) { + sio_setreg(com, com_lcr, LCR_8BITS | LCR_DLAB); + /* XXX barrier */ + com->reg_dl = siodivisor(com->rclk, comdefaultrate); + sio_setdreg(com, com_dl, com->reg_dl); + /* XXX barrier */ + sio_setreg(com, com_lcr, LCR_8BITS); + /* XXX barrier */ + sio_setreg(com, com_mcr, MCR_IENABLE); + /* XXX barrier */ + } else com->consdev->cn_dev = makedev(CDEV_MAJOR, unit); - /* - * sioprobe() has initialized the device registers as follows: - * o cfcr = LCR_8BITS. - * It is most important that LCR_DLAB is off, so that the - * data port is not hidden when we enable interrupts. - * o ier = 0. - * Interrupts are only enabled when the line is open. - * o mcr = MCR_IENABLE, or 0 if the port has AST/4 compatible - * interrupt control register or the config specifies no irq. - * Keeping MCR_DTR and MCR_RTS off might stop the external - * device from sending before we are ready. - */ com->unit = unit; - com->cfcr_image = LCR_8BITS; com->dtr_wait = 3 * hz; com->loses_outints = COM_LOSESOUTINTS(flags) != 0; com->no_irq = bus_get_resource(dev, SYS_RES_IRQ, 0, NULL, NULL) != 0; @@ -690,7 +446,8 @@ com->obufs[0].l_head = com->obuf1; com->obufs[1].l_head = com->obuf2; - com->mcr_image = sio_getreg(com, com_mcr); + com->reg_lcr = sio_getreg(com, com_lcr); + com->reg_mcr = sio_getreg(com, com_mcr); /* * We don't use all the flags from since they @@ -724,113 +481,74 @@ com->it_out = com->it_in; /* attempt to determine UART type */ - printf("sio%d: type", unit); + device_printf(dev, "type "); - if (!COM_ISMULTIPORT(flags) && - !COM_IIR_TXRDYBUG(flags) && !COM_NOSCR(flags)) { + if (!COM_IIR_TXRDYBUG(flags) && !COM_NOSCR(flags)) { u_char scr; u_char scr1; u_char scr2; scr = sio_getreg(com, com_scr); + /* XXX barrier */ sio_setreg(com, com_scr, 0xa5); + /* XXX barrier */ scr1 = sio_getreg(com, com_scr); + /* XXX barrier */ sio_setreg(com, com_scr, 0x5a); + /* XXX barrier */ scr2 = sio_getreg(com, com_scr); + /* XXX barrier */ sio_setreg(com, com_scr, scr); + /* XXX barrier */ if (scr1 != 0xa5 || scr2 != 0x5a) { - printf(" 8250 or not responding"); + printf("8250"); goto determined_type; } } + sio_setreg(com, com_fcr, FCR_ENABLE | FCR_RX_HIGH); + /* XXX barrier with SYNC semantics */ DELAY(100); + com->st16650a = 0; switch (sio_getreg(com, com_iir) & IIR_FIFO_MASK) { case FCR_RX_LOW: - printf(" 16450"); + printf("16450"); break; case FCR_RX_MEDL: - printf(" 16450?"); + printf("16450?"); break; case FCR_RX_MEDH: - printf(" 16550?"); + printf("16550?"); break; case FCR_RX_HIGH: if (COM_NOFIFO(flags)) { - printf(" 16550A fifo disabled"); + printf("16550A fifo disabled"); } else { com->hasfifo = TRUE; if (COM_ST16650A(flags)) { com->st16650a = 1; com->tx_fifo_size = 32; - printf(" ST16650A"); + printf("ST16650A"); } else { com->tx_fifo_size = COM_FIFOSIZE(flags); - printf(" 16550A"); + printf("16550A"); } } -#ifdef COM_ESP - for (espp = likely_esp_ports; *espp != 0; espp++) - if (espattach(com, *espp)) { - com->tx_fifo_size = 1024; - break; - } -#endif if (!com->st16650a) { if (!com->tx_fifo_size) com->tx_fifo_size = 16; else - printf(" lookalike with %d bytes FIFO", + printf("lookalike with %d bytes FIFO", com->tx_fifo_size); } break; } -#ifdef COM_ESP - if (com->esp) { - /* - * Set 16550 compatibility mode. - * We don't use the ESP_MODE_SCALE bit to increase the - * fifo trigger levels because we can't handle large - * bursts of input. - * XXX flow control should be set in comparam(), not here. - */ - outb(com->esp_port + ESP_CMD1, ESP_SETMODE); - outb(com->esp_port + ESP_CMD2, ESP_MODE_RTS | ESP_MODE_FIFO); - - /* Set RTS/CTS flow control. */ - outb(com->esp_port + ESP_CMD1, ESP_SETFLOWTYPE); - outb(com->esp_port + ESP_CMD2, ESP_FLOW_RTS); - outb(com->esp_port + ESP_CMD2, ESP_FLOW_CTS); - - /* Set flow-control levels. */ - outb(com->esp_port + ESP_CMD1, ESP_SETRXFLOW); - outb(com->esp_port + ESP_CMD2, HIBYTE(768)); - outb(com->esp_port + ESP_CMD2, LOBYTE(768)); - outb(com->esp_port + ESP_CMD2, HIBYTE(512)); - outb(com->esp_port + ESP_CMD2, LOBYTE(512)); - } -#endif /* COM_ESP */ sio_setreg(com, com_fcr, 0); determined_type: ; -#ifdef COM_MULTIPORT - if (COM_ISMULTIPORT(flags)) { - device_t masterdev; - - com->multiport = TRUE; - printf(" (multiport"); - if (unit == COM_MPMASTER(flags)) - printf(" master"); - printf(")"); - masterdev = devclass_get_device(sio_devclass, - COM_MPMASTER(flags)); - com->no_irq = (masterdev == NULL || bus_get_resource(masterdev, - SYS_RES_IRQ, 0, NULL, NULL) != 0); - } -#endif /* COM_MULTIPORT */ if (com->consdev != NULL) printf(", console"); if (COM_IIR_TXRDYBUG(flags)) @@ -862,6 +580,9 @@ com->pps.ppscap = PPS_CAPTUREASSERT | PPS_CAPTURECLEAR; pps_init(&com->pps); + rid = 0; + com->irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0ul, ~0ul, 1, + RF_ACTIVE); if (com->irqres) { ret = BUS_SETUP_INTR(device_get_parent(dev), dev, com->irqres, INTR_TYPE_TTY | INTR_FAST, @@ -1130,7 +851,7 @@ com->do_timestamp = FALSE; com->do_dcd_timestamp = FALSE; com->pps.ppsparam.mode = 0; - sio_setreg(com, com_lcr, com->cfcr_image &= ~LCR_SBREAK); + sio_setreg(com, com_lcr, com->reg_lcr &= ~LCR_SBREAK); tp = com->tp; #if defined(DDB) && (defined(BREAK_TO_DEBUGGER) || \ @@ -1356,9 +1077,9 @@ * so enable RTS if it is now disabled and there is room in the * high-level buffer. */ - if ((com->state & CS_RTS_IFLOW) && !(com->mcr_image & MCR_RTS) && + if ((com->state & CS_RTS_IFLOW) && !(com->reg_mcr & MCR_RTS) && !(tp->t_state & TS_TBLOCK)) - sio_setreg(com, com_mcr, com->mcr_image |= MCR_RTS); + sio_setreg(com, com_mcr, com->reg_mcr |= MCR_RTS); } static void @@ -1367,44 +1088,11 @@ { struct com_s *com; -#ifndef COM_MULTIPORT com = (struct com_s *)arg; mtx_lock_spin(&sio_lock); siointr1(com); mtx_unlock_spin(&sio_lock); -#else /* COM_MULTIPORT */ - bool_t possibly_more_intrs; - int unit; - - /* - * Loop until there is no activity on any port. This is necessary - * to get an interrupt edge more than to avoid another interrupt. - * If the IRQ signal is just an OR of the IRQ signals from several - * devices, then the edge from one may be lost because another is - * on. - */ - mtx_lock_spin(&sio_lock); - do { - possibly_more_intrs = FALSE; - for (unit = 0; unit < sio_numunits; ++unit) { - com = com_addr(unit); - /* - * XXX COM_LOCK(); - * would it work here, or be counter-productive? - */ - if (com != NULL - && !com->gone - && (sio_getreg(com, com_iir) & IIR_IMASK) - != IIR_NOPEND) { - siointr1(com); - possibly_more_intrs = TRUE; - } - /* XXX COM_UNLOCK(); */ - } - } while (possibly_more_intrs); - mtx_unlock_spin(&sio_lock); -#endif /* COM_MULTIPORT */ } static struct timespec siots[8192]; @@ -1556,10 +1244,10 @@ ioptr[0] = recv_data; ioptr[com->ierroff] = line_status; com->iptr = ++ioptr; - if (ioptr == com->ihighwater - && com->state & CS_RTS_IFLOW) + if (ioptr == com->ihighwater && + com->state & CS_RTS_IFLOW) sio_setreg(com, com_mcr, - com->mcr_image &= ~MCR_RTS); + com->reg_mcr &= ~MCR_RTS); if (line_status & LSR_OE) CE_RECORD(com, CE_OVERRUN); } @@ -1658,9 +1346,7 @@ } /* finished? */ -#ifndef COM_MULTIPORT if ((sio_getreg(com, com_iir) & IIR_IMASK) == IIR_NOPEND) -#endif /* COM_MULTIPORT */ return; } } @@ -1764,10 +1450,10 @@ } switch (cmd) { case TIOCSBRK: - sio_setreg(com, com_lcr, com->cfcr_image |= LCR_SBREAK); + sio_setreg(com, com_lcr, com->reg_lcr |= LCR_SBREAK); break; case TIOCCBRK: - sio_setreg(com, com_lcr, com->cfcr_image &= ~LCR_SBREAK); + sio_setreg(com, com_lcr, com->reg_lcr &= ~LCR_SBREAK); break; case TIOCSDTR: (void)commctl(com, TIOCM_DTR, DMBIS); @@ -1974,15 +1660,6 @@ com->reg_fcr = com->unit == siotsunit ? 0 : t->c_ospeed <= 4800 ? FCR_ENABLE : FCR_ENABLE | FCR_RX_MEDH; -#ifdef COM_ESP - /* - * The Hayes ESP card needs the fifo DMA mode bit set - * in compatibility mode. If not, it will interrupt - * for each character received. - */ - if (com->esp) - com->reg_fcr |= FCR_DMA_MODE; -#endif sio_setreg(com, com_fcr, com->reg_fcr); } @@ -2009,7 +1686,7 @@ sio_setreg(com, com_dlbh, dlbh); } - sio_setreg(com, com_lcr, com->cfcr_image = cfcr); + sio_setreg(com, com_lcr, com->reg_lcr = cfcr); if (!(tp->t_state & TS_TTSTOP)) com->state |= CS_TTGO; @@ -2033,7 +1710,7 @@ * CS_RTS_IFLOW just changed from on to off. Force MCR_RTS * on here, since comstart() won't do it later. */ - sio_setreg(com, com_mcr, com->mcr_image |= MCR_RTS); + sio_setreg(com, com_mcr, com->reg_mcr |= MCR_RTS); if (com->st16650a) { sio_setreg(com, com_lcr, 0xbf); sio_setreg(com, com_fcr, @@ -2066,7 +1743,7 @@ } } - sio_setreg(com, com_lcr, com->cfcr_image); + sio_setreg(com, com_lcr, com->reg_lcr); /* XXX shouldn't call functions while intrs are disabled. */ disc_optim(tp, t, com); @@ -2181,12 +1858,12 @@ else com->state |= CS_TTGO; if (tp->t_state & TS_TBLOCK) { - if (com->mcr_image & MCR_RTS && com->state & CS_RTS_IFLOW) - sio_setreg(com, com_mcr, com->mcr_image &= ~MCR_RTS); + if (com->reg_mcr & MCR_RTS && com->state & CS_RTS_IFLOW) + sio_setreg(com, com_mcr, com->reg_mcr &= ~MCR_RTS); } else { - if (!(com->mcr_image & MCR_RTS) && com->iptr < com->ihighwater + if (!(com->reg_mcr & MCR_RTS) && com->iptr < com->ihighwater && com->state & CS_RTS_IFLOW) - sio_setreg(com, com_mcr, com->mcr_image |= MCR_RTS); + sio_setreg(com, com_mcr, com->reg_mcr |= MCR_RTS); } mtx_unlock_spin(&sio_lock); if (tp->t_state & (TS_TIMEOUT | TS_TTSTOP)) { @@ -2261,10 +1938,6 @@ mtx_lock_spin(&sio_lock); if (rw & FWRITE) { if (com->hasfifo) -#ifdef COM_ESP - /* XXX avoid h/w bug. */ - if (!com->esp) -#endif sio_setreg(com, com_fcr, FCR_XMT_RST | com->reg_fcr); com->obufs[0].l_queued = FALSE; @@ -2276,10 +1949,6 @@ } if (rw & FREAD) { if (com->hasfifo) -#ifdef COM_ESP - /* XXX avoid h/w bug. */ - if (!com->esp) -#endif sio_setreg(com, com_fcr, FCR_RCV_RST | com->reg_fcr); com_events -= (com->iptr - com->ibuf); @@ -2300,7 +1969,7 @@ if (how == DMGET) { bits = TIOCM_LE; /* XXX - always enabled while open */ - mcr = com->mcr_image; + mcr = com->reg_mcr; if (mcr & MCR_DTR) bits |= TIOCM_DTR; if (mcr & MCR_RTS) @@ -2332,13 +2001,13 @@ switch (how) { case DMSET: sio_setreg(com, com_mcr, - com->mcr_image = mcr | (com->mcr_image & MCR_IENABLE)); + com->reg_mcr = mcr | (com->reg_mcr & MCR_IENABLE)); break; case DMBIS: - sio_setreg(com, com_mcr, com->mcr_image |= mcr); + sio_setreg(com, com_mcr, com->reg_mcr |= mcr); break; case DMBIC: - sio_setreg(com, com_mcr, com->mcr_image &= ~mcr); + sio_setreg(com, com_mcr, com->reg_mcr &= ~mcr); break; } mtx_unlock_spin(&sio_lock); ==== //depot/projects/ia64/sys/dev/sio/siovar.h#10 (text+ko) ==== @@ -83,23 +83,17 @@ u_int regshft; /* Interleaved multi-port. */ u_short reg_dl; /* Copy of DL. */ u_char reg_fcr; /* Copy of FCR. */ + u_char reg_lcr; /* Copy of LCR. */ + u_char reg_mcr; /* Copy of MCR. */ /* Old SIO fields. Need auditing. */ u_int flags; /* Copy isa device flags */ u_char state; /* miscellaneous flag bits */ bool_t active_out; /* nonzero if the callout device is open */ - u_char cfcr_image; /* copy of value written to CFCR */ -#ifdef COM_ESP - bool_t esp; /* is this unit a hayes esp board? */ -#endif u_char extra_state; /* more flag bits, separate for order trick */ bool_t hasfifo; /* nonzero for 16550 UARTs */ bool_t st16650a; /* Is a Startech 16650A or RTS/CTS compat */ bool_t loses_outints; /* nonzero if device loses output interrupts */ - u_char mcr_image; /* copy of value written to MCR */ -#ifdef COM_MULTIPORT - bool_t multiport; /* is this unit part of a multiport device? */ -#endif /* COM_MULTIPORT */ bool_t no_irq; /* nonzero if irq is not attached */ bool_t gone; /* hardware disappeared */ bool_t poll; /* nonzero if polling is required */ @@ -129,10 +123,6 @@ struct lbq obufq; /* head of queue of output buffers */ struct lbq obufs[2]; /* output buffers */ -#ifdef COM_ESP - Port_t esp_port; -#endif - struct tty *tp; /* cross reference */ /* Initial state. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 18:27:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FF2537B405; Mon, 23 Dec 2002 18:27:22 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA7B437B401 for ; Mon, 23 Dec 2002 18:27:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F25043EE6 for ; Mon, 23 Dec 2002 18:27:21 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO2RLfh077285 for ; Mon, 23 Dec 2002 18:27:21 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO2RLhM077282 for perforce@freebsd.org; Mon, 23 Dec 2002 18:27:21 -0800 (PST) Date: Mon, 23 Dec 2002 18:27:21 -0800 (PST) Message-Id: <200212240227.gBO2RLhM077282@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 Subject: PERFORCE change 22682 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22682 Change 22682 by rwatson@rwatson_paprika on 2002/12/23 18:26:45 Integ command line tools for update to new ACL foo. Affected files ... .. //depot/projects/trustedbsd/acl/bin/getfacl/Makefile#1 branch .. //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.1#1 branch .. //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.c#1 branch .. //depot/projects/trustedbsd/acl/bin/setfacl/Makefile#1 branch .. //depot/projects/trustedbsd/acl/bin/setfacl/file.c#1 branch .. //depot/projects/trustedbsd/acl/bin/setfacl/mask.c#1 branch .. //depot/projects/trustedbsd/acl/bin/setfacl/merge.c#1 branch .. //depot/projects/trustedbsd/acl/bin/setfacl/remove.c#1 branch .. //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.1#1 branch .. //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.c#1 branch .. //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.h#1 branch .. //depot/projects/trustedbsd/acl/bin/setfacl/util.c#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 18:42:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ED7837B405; Mon, 23 Dec 2002 18:42:41 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 391B137B401 for ; Mon, 23 Dec 2002 18:42:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5E4C43EE5 for ; Mon, 23 Dec 2002 18:42:40 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO2gefh084254 for ; Mon, 23 Dec 2002 18:42:40 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO2gei0084251 for perforce@freebsd.org; Mon, 23 Dec 2002 18:42:40 -0800 (PST) Date: Mon, 23 Dec 2002 18:42:40 -0800 (PST) Message-Id: <200212240242.gBO2gei0084251@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 Subject: PERFORCE change 22683 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22683 Change 22683 by rwatson@rwatson_paprika on 2002/12/23 18:42:03 Teach these tools about a "-h" argument congruent to -h on chmod, chown, ... This flag indicates the operation shall be performed on the symbol link itself, rather than on the target of the symbolic link. Affected files ... .. //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.1#2 edit .. //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.c#2 edit .. //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.1#2 edit .. //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.c#2 edit .. //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.h#2 edit Differences ... ==== //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.1#2 (text+ko) ==== @@ -38,7 +38,7 @@ .Nd get ACL information .Sh SYNOPSIS .Nm -.Op Fl d +.Op Fl dh .Op Ar .Sh DESCRIPTION The @@ -61,6 +61,9 @@ access ACL. An error is generated if a default ACL cannot be associated with .Ar file . +.It Fl h +If the target of the operation is a symbolic link, return the ACL from +the symbol link itself rather than following the link. .El .Pp The following operand is available: ==== //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ } static int -print_acl(char *path, acl_type_t type) +print_acl(char *path, acl_type_t type, int hflag) { struct stat sb; acl_t acl; @@ -167,7 +167,10 @@ printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid, sb.st_gid); - acl = acl_get_file(path, type); + if (hflag) + acl = acl_get_link(path, type); + else + acl = acl_get_file(path, type); if (!acl) { if (errno != EOPNOTSUPP) { warn("%s", path); @@ -198,7 +201,7 @@ } static int -print_acl_from_stdin(acl_type_t type) +print_acl_from_stdin(acl_type_t type, int hflag) { char *p, pathname[PATH_MAX]; int carried_error = 0; @@ -206,7 +209,7 @@ while (fgets(pathname, (int)sizeof(pathname), stdin)) { if ((p = strchr(pathname, '\n')) != NULL) *p = '\0'; - if (print_acl(pathname, type) == -1) { + if (print_acl(pathname, type, hflag) == -1) { carried_error = -1; } } @@ -220,12 +223,17 @@ acl_type_t type = ACL_TYPE_ACCESS; int carried_error = 0; int ch, error, i; + int hflag; - while ((ch = getopt(argc, argv, "d")) != -1) + hflag = 0; + while ((ch = getopt(argc, argv, "dh")) != -1) switch(ch) { case 'd': type = ACL_TYPE_DEFAULT; break; + case 'h': + hflag = 1; + break; default: usage(); return(-1); @@ -234,17 +242,17 @@ argv += optind; if (argc == 0) { - error = print_acl_from_stdin(type); + error = print_acl_from_stdin(type, hflag); return(error ? 1 : 0); } for (i = 0; i < argc; i++) { if (!strcmp(argv[i], "-")) { - error = print_acl_from_stdin(type); + error = print_acl_from_stdin(type, hflag); if (error == -1) carried_error = -1; } else { - error = print_acl(argv[i], type); + error = print_acl(argv[i], type, hflag); if (error == -1) carried_error = -1; } ==== //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .Nd set ACL information .Sh SYNOPSIS .Nm -.Op Fl bdkn +.Op Fl bdhkn .Op Fl m Ar entries .Op Fl M Ar file1 .Op Fl x Ar entries @@ -63,6 +63,9 @@ The operations apply to the default ACL entries instead of access ACL entries. Currently only directories may have default ACL's. +.It Fl h +If the target of the operation is a symbolic link, perform the operation +on the symbolic link itself, rather than following the link. .It Fl k Delete any default ACL entries on the specified files. It is not considered an error if the specified files do not have ==== //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.c#2 (text+ko) ==== @@ -71,11 +71,19 @@ } acl = zmalloc(sizeof(acl_t) * 2); - acl[ACCESS_ACL] = acl_get_file(filename, ACL_TYPE_ACCESS); + if (h_flag) + acl[ACCESS_ACL] = acl_get_link(filename, ACL_TYPE_ACCESS); + else + acl[ACCESS_ACL] = acl_get_file(filename, ACL_TYPE_ACCESS); if (acl[ACCESS_ACL] == NULL) err(1, "acl_get_file() failed"); if (S_ISDIR(sb.st_mode)) { - acl[DEFAULT_ACL] = acl_get_file(filename, ACL_TYPE_DEFAULT); + if (h_flag) + acl[DEFAULT_ACL] = acl_get_link(filename, + ACL_TYPE_DEFAULT); + else + acl[DEFAULT_ACL] = acl_get_file(filename, + ACL_TYPE_DEFAULT); if (acl[DEFAULT_ACL] == NULL) err(1, "acl_get_file() failed"); } else @@ -104,12 +112,12 @@ acl_type = ACL_TYPE_ACCESS; carried_error = local_error = 0; - have_mask = have_stdin = n_flag = need_mask = 0; + h_flag = have_mask = have_stdin = n_flag = need_mask = 0; TAILQ_INIT(&entrylist); TAILQ_INIT(&filelist); - while ((ch = getopt(argc, argv, "M:X:bdkm:nx:")) != -1) + while ((ch = getopt(argc, argv, "M:X:bdhkm:nx:")) != -1) switch(ch) { case 'M': entry = zmalloc(sizeof(struct sf_entry)); @@ -133,6 +141,9 @@ case 'd': acl_type = ACL_TYPE_DEFAULT; break; + case 'h': + h_flag = 1; + break; case 'k': entry = zmalloc(sizeof(struct sf_entry)); entry->op = OP_REMOVE_DEF; ==== //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.h#2 (text+ko) ==== @@ -75,6 +75,7 @@ uint have_mask; uint need_mask; uint have_stdin; +uint h_flag; uint n_flag; #endif /* _SETFACL_H */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 19:13:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFD5B37B405; Mon, 23 Dec 2002 19:13:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7494537B401 for ; Mon, 23 Dec 2002 19:13:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 204C643EF1 for ; Mon, 23 Dec 2002 19:13:19 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO3DIfh095171 for ; Mon, 23 Dec 2002 19:13:18 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO3DIFq095168 for perforce@freebsd.org; Mon, 23 Dec 2002 19:13:18 -0800 (PST) Date: Mon, 23 Dec 2002 19:13:18 -0800 (PST) Message-Id: <200212240313.gBO3DIFq095168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22685 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22685 Change 22685 by marcel@marcel_nfs on 2002/12/23 19:12:24 Scan the hints for a serial console if we haven't found any tables. This provides backward compatibility and is what the BigSur kludge was all about. Move COM_CONSOLE to siovar.h now that we need it in sio_machdep.c. Remove COM_FORCECONSOLE. It's broken and doesn't provide any functionality we already have in different ways. The brokenness is in the fact that it's a global property (ie the desire to have a serial console) attached to a non- global entity (ie a single UART) that may not be checked (an UART with lower unit number is flagged as console) or may have conflicting attributes (not a console or disabled). Additional brokenness is caused by us not using hints at all if we have an HCDP table or a SPCR table. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#25 edit .. //depot/projects/ia64/sys/dev/sio/siovar.h#11 edit .. //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#5 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#25 (text+ko) ==== @@ -88,8 +88,6 @@ #define UNIT_TO_MINOR(unit) ((((unit) & ~0x1fU) << (8 + 3)) \ | ((unit) & 0x1f)) -#define COM_CONSOLE(flags) ((flags) & 0x10) -#define COM_FORCECONSOLE(flags) ((flags) & 0x20) #define COM_LLCONSOLE(flags) ((flags) & 0x40) #define COM_DEBUGGER(flags) ((flags) & 0x80) #define COM_LOSESOUTINTS(flags) ((flags) & 0x08) ==== //depot/projects/ia64/sys/dev/sio/siovar.h#11 (text+ko) ==== @@ -60,6 +60,8 @@ #define SET_IFTYPE(type) ((type) << 24) #endif /* PC98 */ +#define COM_CONSOLE(flags) ((flags) & 0x10) + #define CE_NTYPES 3 typedef u_char bool_t; /* boolean */ ==== //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#5 (text+ko) ==== @@ -79,7 +79,9 @@ { struct dig64_hcdp_table *tbl; struct dig64_hcdp_entry *ent; - unsigned int i; + unsigned int i, ivar; + + bzero(cd, sizeof(*cd)); /* * Use the DIG64 HCDP table if present. @@ -100,7 +102,6 @@ /* XXX - We should have pre-mapped all UC memory. */ if (cd->bst == IA64_BUS_SPACE_MEM) (void)sio_map(cd->bsh, 6); - cd->regshft = 0; cd->rclk = (ent->pclock) ? ent->pclock : 115200L; cd->rclk <<= 4; /* rclk = 16 * pclock */ cd->baud = ent->baud_high; @@ -115,20 +116,34 @@ /* FALLTHROUGH */ } + /* XXX - Try ACPI SPCR descriptor */ + /* - * XXX - Try alternate methods, such as: - * o ACPI SPCR descriptor, - * o hints. + * Scan the hints for backward compatibility. We only try units + * 0 to 3 (inclusive). This covers the ISA legacy where 4 UARTs + * had their resources predefined. */ -#if 0 - /* BigSur settings... */ - cd->bsh = 0x3f8; - cd->bst = IA64_BUS_SPACE_IO; - cd->regshft = 0; - cd->baud = 115200L; - cd->rclk = cd->baud << 4; - return (0); -#else + for (i = 0; i < 4; i++) { + if (resource_int_value("sio", i, "flags", &ivar)) + continue; + if (!COM_CONSOLE(ivar)) + continue; + /* We have a possible console. Make sure it's enabled. */ + if (resource_int_value("sio", i, "disabled", &ivar) == 0 && + ivar != 0) + continue; + /* It's alive. Get the port. */ + if (resource_int_value("sio", i, "port", &ivar) != 0 || + ivar == 0) + continue; + cd->bsh = ivar; + cd->bst = IA64_BUS_SPACE_IO; + cd->baud = 0; /* Keep current baud. */ + cd->databits = 8; + cd->stopbits = 1; + cd->parity = 0; + return (0); + } + return (ENXIO); -#endif } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 19:57:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8255237B405; Mon, 23 Dec 2002 19:57:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DC1337B401 for ; Mon, 23 Dec 2002 19:57:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C49CC43ED8 for ; Mon, 23 Dec 2002 19:57:12 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO3vCfh009515 for ; Mon, 23 Dec 2002 19:57:12 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO3vCfG009512 for perforce@freebsd.org; Mon, 23 Dec 2002 19:57:12 -0800 (PST) Date: Mon, 23 Dec 2002 19:57:12 -0800 (PST) Message-Id: <200212240357.gBO3vCfG009512@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 Subject: PERFORCE change 22686 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22686 Change 22686 by rwatson@rwatson_paprika on 2002/12/23 19:56:27 Oops, _link() calls are suffixed with _np as non-portable. Affected files ... .. //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.c#3 edit .. //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.c#3 edit Differences ... ==== //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.c#3 (text+ko) ==== @@ -168,7 +168,7 @@ printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid, sb.st_gid); if (hflag) - acl = acl_get_link(path, type); + acl = acl_get_link_np(path, type); else acl = acl_get_file(path, type); if (!acl) { ==== //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.c#3 (text+ko) ==== @@ -72,14 +72,14 @@ acl = zmalloc(sizeof(acl_t) * 2); if (h_flag) - acl[ACCESS_ACL] = acl_get_link(filename, ACL_TYPE_ACCESS); + acl[ACCESS_ACL] = acl_get_link_np(filename, ACL_TYPE_ACCESS); else acl[ACCESS_ACL] = acl_get_file(filename, ACL_TYPE_ACCESS); if (acl[ACCESS_ACL] == NULL) err(1, "acl_get_file() failed"); if (S_ISDIR(sb.st_mode)) { if (h_flag) - acl[DEFAULT_ACL] = acl_get_link(filename, + acl[DEFAULT_ACL] = acl_get_link_np(filename, ACL_TYPE_DEFAULT); else acl[DEFAULT_ACL] = acl_get_file(filename, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 20: 6:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F17F37B405; Mon, 23 Dec 2002 20:06:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D309137B401 for ; Mon, 23 Dec 2002 20:06:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CB1443EE8 for ; Mon, 23 Dec 2002 20:06:24 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO46Ofh013056 for ; Mon, 23 Dec 2002 20:06:24 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO46OXh013053 for perforce@freebsd.org; Mon, 23 Dec 2002 20:06:24 -0800 (PST) Date: Mon, 23 Dec 2002 20:06:24 -0800 (PST) Message-Id: <200212240406.gBO46OXh013053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22687 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22687 Change 22687 by marcel@marcel_nfs on 2002/12/23 20:05:55 Make this compile on i386: o ACPI is loaded as a module by default. Therefore, do not make the ACPI bus driver optional. o Include opt_isa.h for the definition of DEV_ISA. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_isa.c#12 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_isa.c#12 (text+ko) ==== @@ -24,7 +24,7 @@ * $FreeBSD: src/sys/dev/sio/sio_isa.c,v 1.9 2002/05/06 09:02:55 dwmalone Exp $ */ -#include "opt_acpi.h" +#include "opt_isa.h" #include #include @@ -202,9 +202,7 @@ return (error); } +DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0); #ifdef DEV_ISA DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0); #endif -#ifdef DEV_ACPI -DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0); -#endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 20: 8:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B837637B405; Mon, 23 Dec 2002 20:08:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 391AD37B401 for ; Mon, 23 Dec 2002 20:08:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C041443ED8 for ; Mon, 23 Dec 2002 20:08:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO48Rfh013117 for ; Mon, 23 Dec 2002 20:08:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO48REm013114 for perforce@freebsd.org; Mon, 23 Dec 2002 20:08:27 -0800 (PST) Date: Mon, 23 Dec 2002 20:08:27 -0800 (PST) Message-Id: <200212240408.gBO48REm013114@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 Subject: PERFORCE change 22688 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22688 Change 22688 by rwatson@rwatson_paprika on 2002/12/23 20:07:56 Add prototypes for acl _link system calls and wrappers. Affected files ... .. //depot/projects/trustedbsd/acl/sys/sys/acl.h#2 edit Differences ... ==== //depot/projects/trustedbsd/acl/sys/sys/acl.h#2 (text+ko) ==== @@ -140,12 +140,17 @@ int __acl_aclcheck_fd(int _filedes, acl_type_t _type, struct acl *_aclp); int __acl_aclcheck_file(const char *_path, acl_type_t _type, struct acl *_aclp); +int __acl_aclcheck_link(const char *_path, acl_type_t _type, + struct acl *_aclp); int __acl_delete_fd(int _filedes, acl_type_t _type); int __acl_delete_file(const char *_path_p, acl_type_t _type); +int __acl_delete_link(const char *_path_p, acl_type_t _type); int __acl_get_fd(int _filedes, acl_type_t _type, struct acl *_aclp); int __acl_get_file(const char *_path, acl_type_t _type, struct acl *_aclp); +int __acl_get_link(const char *_path, acl_type_t _type, struct acl *_aclp); int __acl_set_fd(int _filedes, acl_type_t _type, struct acl *_aclp); int __acl_set_file(const char *_path, acl_type_t _type, struct acl *_aclp); +int __acl_set_link(const char *_path, acl_type_t _type, struct acl *_aclp); __END_DECLS /* @@ -162,10 +167,12 @@ ssize_t acl_copy_ext(void *_buf_p, acl_t _acl, ssize_t _size); acl_t acl_copy_int(const void *_buf_p); int acl_create_entry(acl_t *_acl_p, acl_entry_t *_entry_p); +int acl_delete_entry(acl_t _acl, acl_entry_t _entry_d); int acl_delete_fd_np(int _filedes, acl_type_t _type); -int acl_delete_entry(acl_t _acl, acl_entry_t _entry_d); int acl_delete_file_np(const char *_path_p, acl_type_t _type); +int acl_delete_link_np(const char *_path_p, acl_type_t _type); int acl_delete_def_file(const char *_path_p); +int acl_delete_def_link_np(const char *_path_p); int acl_delete_perm(acl_permset_t _permset_d, acl_perm_t _perm); acl_t acl_dup(acl_t _acl); int acl_free(void *_obj_p); @@ -174,6 +181,7 @@ acl_t acl_get_fd(int _fd); acl_t acl_get_fd_np(int fd, acl_type_t _type); acl_t acl_get_file(const char *_path_p, acl_type_t _type); +acl_t acl_get_link_np(const char *_path_p, acl_type_t _type); void *acl_get_qualifier(acl_entry_t _entry_d); int acl_get_perm_np(acl_permset_t _permset_d, acl_perm_t _perm); int acl_get_permset(acl_entry_t _entry_d, acl_permset_t *_permset_p); @@ -182,6 +190,7 @@ int acl_set_fd(int _fd, acl_t _acl); int acl_set_fd_np(int _fd, acl_t _acl, acl_type_t _type); int acl_set_file(const char *_path_p, acl_type_t _type, acl_t _acl); +int acl_set_link_np(const char *_path_p, acl_type_t _type, acl_t _acl); int acl_set_permset(acl_entry_t _entry_d, acl_permset_t _permset_d); int acl_set_qualifier(acl_entry_t _entry_d, const void *_tag_qualifier_p); int acl_set_tag_type(acl_entry_t _entry_d, acl_tag_t _tag_type); @@ -190,6 +199,7 @@ int acl_valid(acl_t _acl); int acl_valid_fd_np(int _fd, acl_type_t _type, acl_t _acl); int acl_valid_file_np(const char *_path_p, acl_type_t _type, acl_t _acl); +int acl_valid_link_np(const char *_path_p, acl_type_t _type, acl_t _acl); __END_DECLS #endif /* !_KERNEL */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 20:14:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90AA337B405; Mon, 23 Dec 2002 20:14:41 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 26D9337B401 for ; Mon, 23 Dec 2002 20:14:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA05E43EDE for ; Mon, 23 Dec 2002 20:14:40 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO4Eefh016573 for ; Mon, 23 Dec 2002 20:14:40 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO4EZBt016569 for perforce@freebsd.org; Mon, 23 Dec 2002 20:14:35 -0800 (PST) Date: Mon, 23 Dec 2002 20:14:35 -0800 (PST) Message-Id: <200212240414.gBO4EZBt016569@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 Subject: PERFORCE change 22689 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22689 Change 22689 by rwatson@rwatson_paprika on 2002/12/23 20:14:00 Add -h to usage(). Affected files ... .. //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.c#4 edit Differences ... ==== //depot/projects/trustedbsd/acl/bin/setfacl/setfacl.c#4 (text+ko) ==== @@ -96,7 +96,7 @@ usage(void) { - fprintf(stderr, "usage: setfacl [-bdknv] [-m entries] [-M file1] " + fprintf(stderr, "usage: setfacl [-bdhknv] [-m entries] [-M file1] " "[-x entries] [-X file2] [file ...]\n"); exit(1); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 20:15:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86C3437B405; Mon, 23 Dec 2002 20:15:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FE5437B401 for ; Mon, 23 Dec 2002 20:15:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B438643EDE for ; Mon, 23 Dec 2002 20:15:42 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO4Fgfh016664 for ; Mon, 23 Dec 2002 20:15:42 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO4FgFZ016661 for perforce@freebsd.org; Mon, 23 Dec 2002 20:15:42 -0800 (PST) Date: Mon, 23 Dec 2002 20:15:42 -0800 (PST) Message-Id: <200212240415.gBO4FgFZ016661@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 Subject: PERFORCE change 22690 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22690 Change 22690 by rwatson@rwatson_paprika on 2002/12/23 20:14:59 Add -h to getfacl usage(). sigh. Affected files ... .. //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.c#4 edit Differences ... ==== //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.c#4 (text+ko) ==== @@ -52,7 +52,7 @@ usage(void) { - fprintf(stderr, "getfacl [-d] [files ...]\n"); + fprintf(stderr, "getfacl [-dh] [files ...]\n"); } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 20:19:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 199AC37B405; Mon, 23 Dec 2002 20:19:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A92C137B401 for ; Mon, 23 Dec 2002 20:19:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49CD343EDA for ; Mon, 23 Dec 2002 20:19:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO4Jmfh016747 for ; Mon, 23 Dec 2002 20:19:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO4JlpN016744 for perforce@freebsd.org; Mon, 23 Dec 2002 20:19:47 -0800 (PST) Date: Mon, 23 Dec 2002 20:19:47 -0800 (PST) Message-Id: <200212240419.gBO4JlpN016744@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 Subject: PERFORCE change 22691 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22691 Change 22691 by rwatson@rwatson_paprika on 2002/12/23 20:19:27 If generating ACL from stat() results, obey h flag and use lstat. Affected files ... .. //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.c#5 edit Differences ... ==== //depot/projects/trustedbsd/acl/bin/getfacl/getfacl.c#5 (text+ko) ==== @@ -154,7 +154,10 @@ char *acl_text; int error; - error = stat(path, &sb); + if (hflag) + error = lstat(path, &sb); + else + error = stat(path, &sb); if (error == -1) { warn("%s", path); return(-1); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 20:33: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 904F837B405; Mon, 23 Dec 2002 20:33:06 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22E5837B401 for ; Mon, 23 Dec 2002 20:33:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D11F843EDC for ; Mon, 23 Dec 2002 20:33:05 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO4X5fh023749 for ; Mon, 23 Dec 2002 20:33:05 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO4X5Oq023739 for perforce@freebsd.org; Mon, 23 Dec 2002 20:33:05 -0800 (PST) Date: Mon, 23 Dec 2002 20:33:05 -0800 (PST) Message-Id: <200212240433.gBO4X5Oq023739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22693 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22693 Change 22693 by marcel@marcel_nfs on 2002/12/23 20:32:52 Add the MD function sio_get_console(). This function now only scans the hints, but could also look for the SPCR table under ACPI. Add support for specifying the baudrate with a hint (eg hint.sio.0.baud=9600). Affected files ... .. //depot/projects/ia64/sys/conf/files.i386#24 edit .. //depot/projects/ia64/sys/i386/i386/sio_machdep.c#1 add Differences ... ==== //depot/projects/ia64/sys/conf/files.i386#24 (text+ko) ==== @@ -227,6 +227,7 @@ i386/i386/perfmon.c optional perfmon i386/i386/perfmon.c optional perfmon profiling-routine i386/i386/pmap.c standard +i386/i386/sio_machdep.c optional sio i386/i386/support.s standard i386/i386/swtch.s standard i386/i386/sys_machdep.c standard To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 21:23: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C01D37B405; Mon, 23 Dec 2002 21:23:07 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E643C37B401 for ; Mon, 23 Dec 2002 21:23:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A0BD443EDC for ; Mon, 23 Dec 2002 21:23:06 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO5N6fh041661 for ; Mon, 23 Dec 2002 21:23:06 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO5N6ot041658 for perforce@freebsd.org; Mon, 23 Dec 2002 21:23:06 -0800 (PST) Date: Mon, 23 Dec 2002 21:23:06 -0800 (PST) Message-Id: <200212240523.gBO5N6ot041658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22694 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22694 Change 22694 by marcel@marcel_nfs on 2002/12/23 21:22:14 Don't use cd.rclk because it can be 0 (meaning system default). We deal with this when we initialize sio_console.rclk. Use the latter to calculate the divisor. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_cons.c#7 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_cons.c#7 (text+ko) ==== @@ -139,7 +139,7 @@ sio_setreg(&sio_console, com_lcr, lcr | LCR_DLAB); /* XXX barrier */ if (cd.baud != 0) { - divisor = siodivisor(cd.rclk, cd.baud); + divisor = siodivisor(sio_console.rclk, cd.baud); sio_setdreg(&sio_console, com_dl, divisor); } else divisor = sio_getdreg(&sio_console, com_dl); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 23 23:58:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA46437B405; Mon, 23 Dec 2002 23:58:29 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 921C837B401 for ; Mon, 23 Dec 2002 23:58:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAC9943EDC for ; Mon, 23 Dec 2002 23:58:27 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO7wRfh094894 for ; Mon, 23 Dec 2002 23:58:27 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO7wElC094887 for perforce@freebsd.org; Mon, 23 Dec 2002 23:58:14 -0800 (PST) Date: Mon, 23 Dec 2002 23:58:14 -0800 (PST) Message-Id: <200212240758.gBO7wElC094887@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 22696 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22696 Change 22696 by tzukanov@tzukanov_antares on 2002/12/23 23:57:37 IFC. Tooks 3 days due to local connection troubles. Affected files ... .. //depot/projects/s390/MAINTAINERS#5 integrate .. //depot/projects/s390/Makefile#4 integrate .. //depot/projects/s390/UPDATING#4 integrate .. //depot/projects/s390/bin/ls/ls.c#5 integrate .. //depot/projects/s390/bin/ls/print.c#5 integrate .. //depot/projects/s390/bin/realpath/realpath.c#2 integrate .. //depot/projects/s390/bin/sh/jobs.c#3 integrate .. //depot/projects/s390/bin/sh/sh.1#3 integrate .. //depot/projects/s390/contrib/amd/amd/amd.8#2 integrate .. //depot/projects/s390/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/s390/contrib/amd/fixmount/fixmount.8#2 integrate .. //depot/projects/s390/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/projects/s390/contrib/amd/hlfsd/hlfsd.8#2 integrate .. //depot/projects/s390/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/ftpd.conf.5#2 integrate .. //depot/projects/s390/contrib/lukemftpd/src/ftpusers.5#2 integrate .. //depot/projects/s390/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/s390/contrib/one-true-awk/FREEBSD-upgrade#3 integrate .. //depot/projects/s390/contrib/one-true-awk/README#2 integrate .. //depot/projects/s390/contrib/one-true-awk/awk.h#2 integrate .. //depot/projects/s390/contrib/one-true-awk/b.c#2 integrate .. //depot/projects/s390/contrib/one-true-awk/lex.c#2 integrate .. //depot/projects/s390/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/s390/contrib/one-true-awk/mac.code#2 integrate .. //depot/projects/s390/contrib/one-true-awk/main.c#2 integrate .. //depot/projects/s390/contrib/one-true-awk/makefile#2 integrate .. //depot/projects/s390/contrib/one-true-awk/maketab.c#2 integrate .. //depot/projects/s390/contrib/one-true-awk/parse.c#2 integrate .. //depot/projects/s390/contrib/one-true-awk/proto.h#2 integrate .. //depot/projects/s390/contrib/one-true-awk/run.c#2 integrate .. //depot/projects/s390/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/s390/contrib/openpam/CREDITS#2 integrate .. //depot/projects/s390/contrib/openpam/HISTORY#2 integrate .. //depot/projects/s390/contrib/openpam/MANIFEST#2 integrate .. //depot/projects/s390/contrib/openpam/README#2 integrate .. //depot/projects/s390/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/s390/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_log.c#3 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/openpam_ttyconv.c#4 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/s390/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/s390/contrib/openpam/modules/Makefile#2 integrate .. //depot/projects/s390/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/s390/contrib/traceroute/traceroute.8#3 integrate .. //depot/projects/s390/crypto/openssh/auth-pam.h#3 integrate .. //depot/projects/s390/crypto/openssh/auth2-kbdint.c#2 integrate .. //depot/projects/s390/crypto/openssh/auth2-pam-freebsd.c#4 integrate .. //depot/projects/s390/crypto/openssh/auth2.c#3 integrate .. //depot/projects/s390/crypto/openssh/scp.c#2 integrate .. //depot/projects/s390/crypto/openssh/session.c#4 integrate .. //depot/projects/s390/etc/Makefile#4 integrate .. //depot/projects/s390/etc/defaults/rc.conf#4 integrate .. //depot/projects/s390/etc/netconfig#2 integrate .. //depot/projects/s390/etc/pccard_ether#2 integrate .. //depot/projects/s390/etc/periodic/daily/440.status-mailq#2 integrate .. //depot/projects/s390/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/s390/etc/periodic/daily/470.status-named#3 integrate .. //depot/projects/s390/etc/periodic/security/550.ipfwlimit#3 integrate .. //depot/projects/s390/etc/periodic/security/650.ip6fwlimit#3 integrate .. //depot/projects/s390/etc/protocols#2 integrate .. //depot/projects/s390/etc/rc#5 integrate .. //depot/projects/s390/etc/rc.d/bgfsck#3 integrate .. //depot/projects/s390/etc/rc.d/devfs#2 integrate .. //depot/projects/s390/etc/rc.d/network1#4 integrate .. //depot/projects/s390/etc/rc.diskless1#3 integrate .. //depot/projects/s390/etc/rc.network#4 integrate .. //depot/projects/s390/etc/services#2 integrate .. //depot/projects/s390/games/grdc/grdc.6#2 integrate .. //depot/projects/s390/gnu/usr.bin/sdiff/sdiff.1#2 integrate .. //depot/projects/s390/gnu/usr.bin/tar/tar.1#3 integrate .. //depot/projects/s390/include/unistd.h#5 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/Makefile#3 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/libc.so.4.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/libedit.so.3.bz2.uu#1 branch .. //depot/projects/s390/lib/compat/compat4x.i386/libedit.so.3.gz.uu#2 delete .. //depot/projects/s390/lib/compat/compat4x.i386/libpam.so.1.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/libperl.so.3.bz2.uu#1 branch .. //depot/projects/s390/lib/compat/compat4x.i386/libperl.so.3.gz.uu#2 delete .. //depot/projects/s390/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu#1 branch .. //depot/projects/s390/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/pam_deny.so.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/pam_opie.so.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/pam_permit.so.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/pam_radius.so.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/pam_skey.so.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu#2 integrate .. //depot/projects/s390/lib/compat/compat4x.i386/pam_unix.so.bz2.uu#2 integrate .. //depot/projects/s390/lib/libc/compat-43/creat.2#2 integrate .. //depot/projects/s390/lib/libc/compat-43/gethostid.3#2 integrate .. //depot/projects/s390/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/s390/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/s390/lib/libc/compat-43/sigsetmask.2#2 integrate .. //depot/projects/s390/lib/libc/compat-43/sigvec.2#2 integrate .. //depot/projects/s390/lib/libc/db/man/btree.3#2 integrate .. //depot/projects/s390/lib/libc/db/man/dbm.3#2 integrate .. //depot/projects/s390/lib/libc/db/man/dbopen.3#3 integrate .. //depot/projects/s390/lib/libc/db/man/hash.3#2 integrate .. //depot/projects/s390/lib/libc/db/man/mpool.3#2 integrate .. //depot/projects/s390/lib/libc/gen/alarm.3#2 integrate .. //depot/projects/s390/lib/libc/gen/basename.3#2 integrate .. //depot/projects/s390/lib/libc/gen/basename.c#2 integrate .. //depot/projects/s390/lib/libc/gen/ctermid.3#2 integrate .. //depot/projects/s390/lib/libc/gen/devname.3#2 integrate .. //depot/projects/s390/lib/libc/gen/directory.3#2 integrate .. //depot/projects/s390/lib/libc/gen/dirname.3#2 integrate .. //depot/projects/s390/lib/libc/gen/dirname.c#2 integrate .. //depot/projects/s390/lib/libc/gen/dladdr.3#2 integrate .. //depot/projects/s390/lib/libc/gen/dllockinit.3#2 integrate .. //depot/projects/s390/lib/libc/gen/dlopen.3#3 integrate .. //depot/projects/s390/lib/libc/gen/exec.3#2 integrate .. //depot/projects/s390/lib/libc/gen/fmtcheck.3#4 integrate .. //depot/projects/s390/lib/libc/gen/fnmatch.3#2 integrate .. //depot/projects/s390/lib/libc/gen/frexp.3#2 integrate .. //depot/projects/s390/lib/libc/gen/fts.3#4 integrate .. //depot/projects/s390/lib/libc/gen/getbootfile.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getcap.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getdomainname.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getgrent.3#2 integrate .. //depot/projects/s390/lib/libc/gen/gethostname.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getmntinfo.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getnetgrent.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getobjformat.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getpagesize.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getpeereid.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getpeereid.c#2 integrate .. //depot/projects/s390/lib/libc/gen/getpwent.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/s390/lib/libc/gen/getvfsbyname.3#3 integrate .. //depot/projects/s390/lib/libc/gen/getvfsent.3#2 integrate .. //depot/projects/s390/lib/libc/gen/glob.3#3 integrate .. //depot/projects/s390/lib/libc/gen/lockf.3#2 integrate .. //depot/projects/s390/lib/libc/gen/makecontext.3#3 integrate .. //depot/projects/s390/lib/libc/gen/modf.3#2 integrate .. //depot/projects/s390/lib/libc/gen/msgctl.3#2 integrate .. //depot/projects/s390/lib/libc/gen/msgget.3#2 integrate .. //depot/projects/s390/lib/libc/gen/msgrcv.3#2 integrate .. //depot/projects/s390/lib/libc/gen/msgsnd.3#2 integrate .. //depot/projects/s390/lib/libc/gen/pselect.3#4 integrate .. //depot/projects/s390/lib/libc/gen/rand48.3#2 integrate .. //depot/projects/s390/lib/libc/gen/readpassphrase.3#2 integrate .. //depot/projects/s390/lib/libc/gen/rfork_thread.3#2 integrate .. //depot/projects/s390/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/s390/lib/libc/gen/setjmp.3#2 integrate .. //depot/projects/s390/lib/libc/gen/setproctitle.3#2 integrate .. //depot/projects/s390/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/s390/lib/libc/gen/signal.3#3 integrate .. //depot/projects/s390/lib/libc/gen/sigsetops.3#2 integrate .. //depot/projects/s390/lib/libc/gen/statvfs.3#3 integrate .. //depot/projects/s390/lib/libc/gen/stringlist.3#2 integrate .. //depot/projects/s390/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/s390/lib/libc/gen/syslog.3#2 integrate .. //depot/projects/s390/lib/libc/gen/tcsendbreak.3#2 integrate .. //depot/projects/s390/lib/libc/gen/tcsetattr.3#2 integrate .. //depot/projects/s390/lib/libc/gen/timezone.3#2 integrate .. //depot/projects/s390/lib/libc/gen/ttyname.3#2 integrate .. //depot/projects/s390/lib/libc/gen/ualarm.3#2 integrate .. //depot/projects/s390/lib/libc/gen/ulimit.3#3 integrate .. //depot/projects/s390/lib/libc/gen/unvis.3#2 integrate .. //depot/projects/s390/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/s390/lib/libc/gen/vis.3#2 integrate .. //depot/projects/s390/lib/libc/gmon/moncontrol.3#2 integrate .. //depot/projects/s390/lib/libc/i386/stdlib/div.S#2 integrate .. //depot/projects/s390/lib/libc/i386/stdlib/ldiv.S#2 integrate .. //depot/projects/s390/lib/libc/i386/sys/i386_get_ioperm.2#2 integrate .. //depot/projects/s390/lib/libc/i386/sys/i386_get_ldt.2#2 integrate .. //depot/projects/s390/lib/libc/i386/sys/i386_set_watch.3#2 integrate .. //depot/projects/s390/lib/libc/i386/sys/i386_vm86.2#2 integrate .. //depot/projects/s390/lib/libc/locale/ctype.3#2 integrate .. //depot/projects/s390/lib/libc/locale/isblank.3#3 integrate .. //depot/projects/s390/lib/libc/locale/mbrune.3#3 integrate .. //depot/projects/s390/lib/libc/locale/rune.3#3 integrate .. //depot/projects/s390/lib/libc/net/Makefile.inc#4 integrate .. //depot/projects/s390/lib/libc/net/addr2ascii.3#2 integrate .. //depot/projects/s390/lib/libc/net/ethers.3#2 integrate .. //depot/projects/s390/lib/libc/net/getaddrinfo.3#2 integrate .. //depot/projects/s390/lib/libc/net/gethostbyname.3#2 integrate .. //depot/projects/s390/lib/libc/net/getipnodebyname.3#2 integrate .. //depot/projects/s390/lib/libc/net/getnameinfo.3#2 integrate .. //depot/projects/s390/lib/libc/net/getnetent.3#2 integrate .. //depot/projects/s390/lib/libc/net/hesiod.3#2 integrate .. //depot/projects/s390/lib/libc/net/inet6_option_space.3#2 integrate .. //depot/projects/s390/lib/libc/net/inet6_rthdr_space.3#2 integrate .. //depot/projects/s390/lib/libc/net/inet_net.3#2 integrate .. //depot/projects/s390/lib/libc/net/iso_addr.3#2 integrate .. //depot/projects/s390/lib/libc/net/linkaddr.3#2 integrate .. //depot/projects/s390/lib/libc/net/nsdispatch.3#2 integrate .. //depot/projects/s390/lib/libc/net/rcmd.3#3 integrate .. //depot/projects/s390/lib/libc/net/rcmdsh.3#3 integrate .. //depot/projects/s390/lib/libc/net/resolver.3#2 integrate .. //depot/projects/s390/lib/libc/net/sockatmark.3#1 branch .. //depot/projects/s390/lib/libc/net/sockatmark.c#1 branch .. //depot/projects/s390/lib/libc/posix1e/acl_add_perm.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_calc_mask.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_clear_perms.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_copy_entry.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_create_entry.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_delete.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_delete_entry.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_delete_perm.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_from_text.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get_entry.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get_perm_np.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get_permset.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get_qualifier.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_get_tag_type.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_set_permset.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_set_qualifier.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_set_tag_type.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/acl_to_text.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/extattr.3#2 integrate .. //depot/projects/s390/lib/libc/posix1e/mac.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/mac_get.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/mac_is_present_np.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/mac_set.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/mac_text.3#3 integrate .. //depot/projects/s390/lib/libc/posix1e/posix1e.3#4 integrate .. //depot/projects/s390/lib/libc/regex/regex.3#3 integrate .. //depot/projects/s390/lib/libc/rpc/bindresvport.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/des_crypt.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/getnetconfig.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/s390/lib/libc/rpc/getnetpath.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/getrpcent.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/getrpcport.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/publickey.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/rpc.3#3 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_clnt_auth.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_clnt_calls.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_clnt_create.3#3 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_generic.c#2 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_secure.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_soc.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_svc_calls.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_svc_create.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_svc_err.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/rpc_svc_reg.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/rpcbind.3#2 integrate .. //depot/projects/s390/lib/libc/rpc/rtime.3#2 integrate .. //depot/projects/s390/lib/libc/stdio/fclose.3#2 integrate .. //depot/projects/s390/lib/libc/stdio/fflush.3#2 integrate .. //depot/projects/s390/lib/libc/stdio/fopen.3#4 integrate .. //depot/projects/s390/lib/libc/stdio/fputs.3#4 integrate .. //depot/projects/s390/lib/libc/stdio/fseek.3#6 integrate .. //depot/projects/s390/lib/libc/stdio/fwide.3#2 integrate .. //depot/projects/s390/lib/libc/stdio/mktemp.3#2 integrate .. //depot/projects/s390/lib/libc/stdio/perror.c#2 integrate .. //depot/projects/s390/lib/libc/stdio/printf.3#4 integrate .. //depot/projects/s390/lib/libc/stdio/putc.3#4 integrate .. //depot/projects/s390/lib/libc/stdio/scanf.3#5 integrate .. //depot/projects/s390/lib/libc/stdio/setbuf.3#4 integrate .. //depot/projects/s390/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/s390/lib/libc/stdio/wscanf.3#3 integrate .. //depot/projects/s390/lib/libc/stdlib/abs.3#2 integrate .. //depot/projects/s390/lib/libc/stdlib/atexit.3#4 integrate .. //depot/projects/s390/lib/libc/stdlib/atof.3#2 integrate .. //depot/projects/s390/lib/libc/stdlib/atoi.3#2 integrate .. //depot/projects/s390/lib/libc/stdlib/div.3#2 integrate .. //depot/projects/s390/lib/libc/stdlib/exit.3#3 integrate .. //depot/projects/s390/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/s390/lib/libc/stdlib/getopt_long.3#2 integrate .. //depot/projects/s390/lib/libc/stdlib/labs.3#2 integrate .. //depot/projects/s390/lib/libc/stdlib/ldiv.3#2 integrate .. //depot/projects/s390/lib/libc/stdlib/lsearch.3#2 integrate .. //depot/projects/s390/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/s390/lib/libc/stdlib/qsort.3#4 integrate .. //depot/projects/s390/lib/libc/stdlib/rand.3#2 integrate .. //depot/projects/s390/lib/libc/stdlib/realpath.3#2 integrate .. //depot/projects/s390/lib/libc/stdlib/strtod.3#3 integrate .. //depot/projects/s390/lib/libc/stdlib/tsearch.3#3 integrate .. //depot/projects/s390/lib/libc/stdtime/ctime.3#2 integrate .. //depot/projects/s390/lib/libc/stdtime/strptime.3#3 integrate .. //depot/projects/s390/lib/libc/string/index.3#3 integrate .. //depot/projects/s390/lib/libc/string/rindex.3#3 integrate .. //depot/projects/s390/lib/libc/string/strchr.3#2 integrate .. //depot/projects/s390/lib/libc/string/strcpy.3#4 integrate .. //depot/projects/s390/lib/libc/string/strerror.3#3 integrate .. //depot/projects/s390/lib/libc/string/strerror.c#2 integrate .. //depot/projects/s390/lib/libc/string/strlcpy.3#2 integrate .. //depot/projects/s390/lib/libc/string/strtok.3#3 integrate .. //depot/projects/s390/lib/libc/string/wcscoll.3#2 integrate .. //depot/projects/s390/lib/libc/string/wcswidth.3#2 integrate .. //depot/projects/s390/lib/libc/string/wcsxfrm.3#2 integrate .. //depot/projects/s390/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/s390/lib/libc/sys/_exit.2#2 integrate .. //depot/projects/s390/lib/libc/sys/accept.2#2 integrate .. //depot/projects/s390/lib/libc/sys/access.2#2 integrate .. //depot/projects/s390/lib/libc/sys/acct.2#3 integrate .. //depot/projects/s390/lib/libc/sys/adjtime.2#3 integrate .. //depot/projects/s390/lib/libc/sys/aio_cancel.2#3 integrate .. //depot/projects/s390/lib/libc/sys/aio_error.2#3 integrate .. //depot/projects/s390/lib/libc/sys/aio_read.2#3 integrate .. //depot/projects/s390/lib/libc/sys/aio_return.2#3 integrate .. //depot/projects/s390/lib/libc/sys/aio_suspend.2#3 integrate .. //depot/projects/s390/lib/libc/sys/aio_waitcomplete.2#3 integrate .. //depot/projects/s390/lib/libc/sys/aio_write.2#3 integrate .. //depot/projects/s390/lib/libc/sys/bind.2#3 integrate .. //depot/projects/s390/lib/libc/sys/brk.2#2 integrate .. //depot/projects/s390/lib/libc/sys/chdir.2#3 integrate .. //depot/projects/s390/lib/libc/sys/chflags.2#3 integrate .. //depot/projects/s390/lib/libc/sys/chmod.2#3 integrate .. //depot/projects/s390/lib/libc/sys/chown.2#3 integrate .. //depot/projects/s390/lib/libc/sys/chroot.2#3 integrate .. //depot/projects/s390/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/s390/lib/libc/sys/close.2#3 integrate .. //depot/projects/s390/lib/libc/sys/connect.2#2 integrate .. //depot/projects/s390/lib/libc/sys/dup.2#3 integrate .. //depot/projects/s390/lib/libc/sys/execve.2#3 integrate .. //depot/projects/s390/lib/libc/sys/extattr_get_file.2#3 integrate .. //depot/projects/s390/lib/libc/sys/fcntl.2#3 integrate .. //depot/projects/s390/lib/libc/sys/fhopen.2#3 integrate .. //depot/projects/s390/lib/libc/sys/flock.2#3 integrate .. //depot/projects/s390/lib/libc/sys/fork.2#3 integrate .. //depot/projects/s390/lib/libc/sys/fsync.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getdirentries.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getdtablesize.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getfh.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getfsstat.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getgid.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getgroups.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getitimer.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getlogin.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getpeername.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getpgrp.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getpid.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getpriority.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getrlimit.2#3 integrate .. //depot/projects/s390/lib/libc/sys/getrusage.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getsid.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getsockname.2#2 integrate .. //depot/projects/s390/lib/libc/sys/getsockopt.2#2 integrate .. //depot/projects/s390/lib/libc/sys/gettimeofday.2#3 integrate .. //depot/projects/s390/lib/libc/sys/getuid.2#2 integrate .. //depot/projects/s390/lib/libc/sys/intro.2#4 integrate .. //depot/projects/s390/lib/libc/sys/ioctl.2#2 integrate .. //depot/projects/s390/lib/libc/sys/issetugid.2#2 integrate .. //depot/projects/s390/lib/libc/sys/jail.2#2 integrate .. //depot/projects/s390/lib/libc/sys/kenv.2#2 integrate .. //depot/projects/s390/lib/libc/sys/kill.2#2 integrate .. //depot/projects/s390/lib/libc/sys/kldfind.2#2 integrate .. //depot/projects/s390/lib/libc/sys/kldfirstmod.2#2 integrate .. //depot/projects/s390/lib/libc/sys/kldload.2#2 integrate .. //depot/projects/s390/lib/libc/sys/kldnext.2#2 integrate .. //depot/projects/s390/lib/libc/sys/kldstat.2#2 integrate .. //depot/projects/s390/lib/libc/sys/kldsym.2#2 integrate .. //depot/projects/s390/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/s390/lib/libc/sys/kqueue.2#3 integrate .. //depot/projects/s390/lib/libc/sys/kse.2#3 integrate .. //depot/projects/s390/lib/libc/sys/ktrace.2#2 integrate .. //depot/projects/s390/lib/libc/sys/link.2#2 integrate .. //depot/projects/s390/lib/libc/sys/listen.2#2 integrate .. //depot/projects/s390/lib/libc/sys/lseek.2#2 integrate .. //depot/projects/s390/lib/libc/sys/madvise.2#3 integrate .. //depot/projects/s390/lib/libc/sys/mincore.2#3 integrate .. //depot/projects/s390/lib/libc/sys/minherit.2#3 integrate .. //depot/projects/s390/lib/libc/sys/mkdir.2#2 integrate .. //depot/projects/s390/lib/libc/sys/mkfifo.2#2 integrate .. //depot/projects/s390/lib/libc/sys/mknod.2#2 integrate .. //depot/projects/s390/lib/libc/sys/mlock.2#3 integrate .. //depot/projects/s390/lib/libc/sys/mmap.2#3 integrate .. //depot/projects/s390/lib/libc/sys/modfind.2#2 integrate .. //depot/projects/s390/lib/libc/sys/modnext.2#2 integrate .. //depot/projects/s390/lib/libc/sys/modstat.2#2 integrate .. //depot/projects/s390/lib/libc/sys/mount.2#2 integrate .. //depot/projects/s390/lib/libc/sys/mprotect.2#3 integrate .. //depot/projects/s390/lib/libc/sys/msync.2#3 integrate .. //depot/projects/s390/lib/libc/sys/munmap.2#3 integrate .. //depot/projects/s390/lib/libc/sys/nanosleep.2#2 integrate .. //depot/projects/s390/lib/libc/sys/nfssvc.2#2 integrate .. //depot/projects/s390/lib/libc/sys/open.2#2 integrate .. //depot/projects/s390/lib/libc/sys/pathconf.2#3 integrate .. //depot/projects/s390/lib/libc/sys/pipe.2#2 integrate .. //depot/projects/s390/lib/libc/sys/poll.2#2 integrate .. //depot/projects/s390/lib/libc/sys/profil.2#2 integrate .. //depot/projects/s390/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/s390/lib/libc/sys/quotactl.2#2 integrate .. //depot/projects/s390/lib/libc/sys/read.2#2 integrate .. //depot/projects/s390/lib/libc/sys/readlink.2#2 integrate .. //depot/projects/s390/lib/libc/sys/reboot.2#2 integrate .. //depot/projects/s390/lib/libc/sys/recv.2#2 integrate .. //depot/projects/s390/lib/libc/sys/rename.2#2 integrate .. //depot/projects/s390/lib/libc/sys/revoke.2#2 integrate .. //depot/projects/s390/lib/libc/sys/rfork.2#3 integrate .. //depot/projects/s390/lib/libc/sys/rmdir.2#2 integrate .. //depot/projects/s390/lib/libc/sys/rtprio.2#2 integrate .. //depot/projects/s390/lib/libc/sys/sched_get_priority_max.2#2 integrate .. //depot/projects/s390/lib/libc/sys/sched_setparam.2#2 integrate .. //depot/projects/s390/lib/libc/sys/sched_setscheduler.2#2 integrate .. //depot/projects/s390/lib/libc/sys/sched_yield.2#2 integrate .. //depot/projects/s390/lib/libc/sys/select.2#3 integrate .. //depot/projects/s390/lib/libc/sys/semctl.2#2 integrate .. //depot/projects/s390/lib/libc/sys/semget.2#2 integrate .. //depot/projects/s390/lib/libc/sys/semop.2#2 integrate .. //depot/projects/s390/lib/libc/sys/send.2#2 integrate .. //depot/projects/s390/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/s390/lib/libc/sys/setgroups.2#2 integrate .. //depot/projects/s390/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/s390/lib/libc/sys/setregid.2#2 integrate .. //depot/projects/s390/lib/libc/sys/setresuid.2#2 integrate .. //depot/projects/s390/lib/libc/sys/setreuid.2#2 integrate .. //depot/projects/s390/lib/libc/sys/setsid.2#2 integrate .. //depot/projects/s390/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/s390/lib/libc/sys/shmat.2#2 integrate .. //depot/projects/s390/lib/libc/sys/shmctl.2#2 integrate .. //depot/projects/s390/lib/libc/sys/shmget.2#2 integrate .. //depot/projects/s390/lib/libc/sys/shutdown.2#2 integrate .. //depot/projects/s390/lib/libc/sys/sigaction.2#4 integrate .. //depot/projects/s390/lib/libc/sys/sigaltstack.2#3 integrate .. //depot/projects/s390/lib/libc/sys/sigpending.2#2 integrate .. //depot/projects/s390/lib/libc/sys/sigprocmask.2#4 integrate .. //depot/projects/s390/lib/libc/sys/sigreturn.2#3 integrate .. //depot/projects/s390/lib/libc/sys/sigstack.2#2 integrate .. //depot/projects/s390/lib/libc/sys/sigsuspend.2#2 integrate .. //depot/projects/s390/lib/libc/sys/socket.2#2 integrate .. //depot/projects/s390/lib/libc/sys/socketpair.2#3 integrate .. //depot/projects/s390/lib/libc/sys/stat.2#3 integrate .. //depot/projects/s390/lib/libc/sys/statfs.2#2 integrate .. //depot/projects/s390/lib/libc/sys/swapon.2#2 integrate .. //depot/projects/s390/lib/libc/sys/symlink.2#2 integrate .. //depot/projects/s390/lib/libc/sys/sync.2#2 integrate .. //depot/projects/s390/lib/libc/sys/sysarch.2#2 integrate .. //depot/projects/s390/lib/libc/sys/syscall.2#2 integrate .. //depot/projects/s390/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/s390/lib/libc/sys/umask.2#2 integrate .. //depot/projects/s390/lib/libc/sys/undelete.2#2 integrate .. //depot/projects/s390/lib/libc/sys/unlink.2#2 integrate .. //depot/projects/s390/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/s390/lib/libc/sys/uuidgen.2#3 integrate .. //depot/projects/s390/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/s390/lib/libc/sys/wait.2#2 integrate .. //depot/projects/s390/lib/libc/sys/write.2#3 integrate .. //depot/projects/s390/lib/libc/uuid/uuid.3#2 integrate .. //depot/projects/s390/lib/libc/xdr/xdr.3#2 integrate .. //depot/projects/s390/lib/libc_r/man/pthread_attr_get_np.3#2 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_accept.c#3 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_connect.c#3 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_recvfrom.c#3 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_recvmsg.c#3 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_sendmsg.c#3 integrate .. //depot/projects/s390/lib/libc_r/uthread/uthread_sendto.c#3 integrate .. //depot/projects/s390/lib/libpam/modules/pam_ksu/pam_ksu.8#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_ssh/pam_ssh.8#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/s390/lib/libpam/modules/pam_ssh/pam_ssh.h#2 integrate .. //depot/projects/s390/lib/libpthread/Makefile#2 integrate .. //depot/projects/s390/lib/libpthread/test/Makefile#2 integrate .. //depot/projects/s390/lib/libstand/Makefile#4 integrate .. //depot/projects/s390/lib/libstand/gzipfs.c#1 branch .. //depot/projects/s390/lib/libstand/libstand.3#3 integrate .. //depot/projects/s390/lib/libstand/stand.h#3 integrate .. //depot/projects/s390/lib/libstand/zalloc.c#2 integrate .. //depot/projects/s390/lib/libstand/zipfs.c#2 delete .. //depot/projects/s390/lib/libypclnt/ypclnt_passwd.c#2 integrate .. //depot/projects/s390/libexec/rpc.rquotad/rpc.rquotad.8#2 integrate .. //depot/projects/s390/libexec/rtld-aout/rtld.1aout#2 integrate .. //depot/projects/s390/libexec/rtld-elf/map_object.c#3 integrate .. //depot/projects/s390/libexec/rtld-elf/rtld.1#2 integrate .. //depot/projects/s390/libexec/ypxfr/ypxfr.8#2 integrate .. //depot/projects/s390/release/Makefile#6 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#4 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/hardware/i386/article.sgml#3 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#4 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml#3 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/installation/i386/article.sgml#3 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#3 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/readme/article.sgml#4 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#4 integrate .. //depot/projects/s390/release/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml#3 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#4 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#4 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/s390/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#3 integrate .. //depot/projects/s390/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/s390/release/i386/drivers.conf#5 integrate .. //depot/projects/s390/release/scripts/chkINDEX#2 integrate .. //depot/projects/s390/release/scripts/driver-desc.awk#1 branch .. //depot/projects/s390/release/scripts/mkpkghier#2 integrate .. //depot/projects/s390/release/scripts/print-cdrom-packages.sh#4 integrate .. //depot/projects/s390/sbin/atacontrol/atacontrol.8#3 integrate .. //depot/projects/s390/sbin/camcontrol/camcontrol.8#3 integrate .. //depot/projects/s390/sbin/camcontrol/camcontrol.c#3 integrate .. //depot/projects/s390/sbin/devd/Makefile#2 integrate .. //depot/projects/s390/sbin/devd/devd-generic#2 integrate .. //depot/projects/s390/sbin/devd/devd.c#2 delete .. //depot/projects/s390/sbin/devd/devd.cc#1 branch .. //depot/projects/s390/sbin/devd/devd.conf#2 integrate .. //depot/projects/s390/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/s390/sbin/devd/devd.h#2 integrate .. //depot/projects/s390/sbin/devd/parse.y#2 integrate .. //depot/projects/s390/sbin/devd/token.l#2 integrate .. //depot/projects/s390/sbin/devfs/devfs.8#2 integrate .. //depot/projects/s390/sbin/disklabel/disklabel.5#3 integrate .. //depot/projects/s390/sbin/dump/dump.8#4 integrate .. //depot/projects/s390/sbin/fsck/fsck.8#3 integrate .. //depot/projects/s390/sbin/fsck/preen.c#3 integrate .. //depot/projects/s390/sbin/fsck_ffs/fsck_ffs.8#3 integrate .. //depot/projects/s390/sbin/fsck_ffs/fsutil.c#4 integrate .. //depot/projects/s390/sbin/fsck_ffs/pass5.c#4 integrate .. //depot/projects/s390/sbin/gbde/Makefile#2 integrate .. //depot/projects/s390/sbin/gbde/gbde.8#2 integrate .. //depot/projects/s390/sbin/gbde/gbde.c#2 integrate .. //depot/projects/s390/sbin/growfs/growfs.8#4 integrate .. //depot/projects/s390/sbin/init/init.c#3 integrate .. //depot/projects/s390/sbin/mount/mount.8#3 integrate .. //depot/projects/s390/sbin/mount_nullfs/mount_nullfs.8#3 integrate .. //depot/projects/s390/sbin/mount_udf/mount_udf.8#3 integrate .. //depot/projects/s390/sbin/mount_umapfs/mount_umapfs.8#3 integrate .. //depot/projects/s390/sbin/mount_unionfs/mount_unionfs.8#3 integrate .. //depot/projects/s390/sbin/raidctl/raidctl.8#2 integrate .. //depot/projects/s390/sbin/reboot/nextboot.8#2 integrate .. //depot/projects/s390/sbin/swapon/Makefile#2 integrate .. //depot/projects/s390/sbin/swapon/swapon.8#3 integrate .. //depot/projects/s390/sbin/swapon/swapon.c#2 integrate .. //depot/projects/s390/sbin/vinum/list.c#2 integrate .. //depot/projects/s390/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/s390/share/examples/IPv6/USAGE#2 integrate .. //depot/projects/s390/share/examples/cvsup/ports-supfile#3 integrate .. //depot/projects/s390/share/examples/isdn/i4brunppp/i4brunppp.8#3 integrate .. //depot/projects/s390/share/examples/scsi_target/scsi_target.8#2 integrate .. //depot/projects/s390/share/man/man3/pthread.3#2 integrate .. //depot/projects/s390/share/man/man3/sysexits.3#2 integrate .. //depot/projects/s390/share/man/man3/tree.3#2 integrate .. //depot/projects/s390/share/man/man4/Makefile#4 integrate .. //depot/projects/s390/share/man/man4/ahd.4#2 integrate .. //depot/projects/s390/share/man/man4/aio.4#2 integrate .. //depot/projects/s390/share/man/man4/atapicam.4#2 integrate .. //depot/projects/s390/share/man/man4/cardbus.4#3 integrate .. //depot/projects/s390/share/man/man4/ccd.4#2 integrate .. //depot/projects/s390/share/man/man4/crypto.4#2 integrate .. //depot/projects/s390/share/man/man4/da.4#2 integrate .. //depot/projects/s390/share/man/man4/devctl.4#1 branch .. //depot/projects/s390/share/man/man4/firewire.4#2 integrate .. //depot/projects/s390/share/man/man4/fwe.4#2 integrate .. //depot/projects/s390/share/man/man4/fwohci.4#2 integrate .. //depot/projects/s390/share/man/man4/gbde.4#2 integrate .. //depot/projects/s390/share/man/man4/geom.4#2 integrate .. //depot/projects/s390/share/man/man4/gre.4#2 integrate .. //depot/projects/s390/share/man/man4/hifn.4#2 integrate .. //depot/projects/s390/share/man/man4/intro.4#2 integrate .. //depot/projects/s390/share/man/man4/kld.4#2 integrate .. //depot/projects/s390/share/man/man4/lomac.4#3 integrate .. //depot/projects/s390/share/man/man4/mac_biba.4#2 integrate .. //depot/projects/s390/share/man/man4/mac_bsdextended.4#2 integrate .. //depot/projects/s390/share/man/man4/mac_ifoff.4#1 branch .. //depot/projects/s390/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/s390/share/man/man4/mac_none.4#1 branch .. //depot/projects/s390/share/man/man4/mac_partition.4#1 branch .. //depot/projects/s390/share/man/man4/mac_seeotheruids.4#1 branch .. //depot/projects/s390/share/man/man4/mac_test.4#1 branch .. //depot/projects/s390/share/man/man4/man4.alpha/linux.4#2 integrate .. //depot/projects/s390/share/man/man4/man4.i386/linux.4#2 integrate .. //depot/projects/s390/share/man/man4/man4.i386/mcd.4#2 integrate .. //depot/projects/s390/share/man/man4/man4.i386/scd.4#2 integrate .. //depot/projects/s390/share/man/man4/md.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_bluetooth.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_bt3c.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_btsocket.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_device.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_h4.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_hci.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_l2cap.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_l2tp.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_source.4#2 integrate .. //depot/projects/s390/share/man/man4/ng_ubt.4#2 integrate .. //depot/projects/s390/share/man/man4/pccard.4#3 integrate .. //depot/projects/s390/share/man/man4/pccbb.4#2 integrate .. //depot/projects/s390/share/man/man4/pcm.4#2 integrate .. //depot/projects/s390/share/man/man4/pst.4#2 integrate .. //depot/projects/s390/share/man/man4/raid.4#2 integrate .. //depot/projects/s390/share/man/man4/sbp.4#2 integrate .. //depot/projects/s390/share/man/man4/sio.4#3 integrate .. //depot/projects/s390/share/man/man4/smp.4#3 integrate .. //depot/projects/s390/share/man/man4/syncer.4#2 integrate .. //depot/projects/s390/share/man/man4/targ.4#2 integrate .. //depot/projects/s390/share/man/man4/tcp.4#4 integrate .. //depot/projects/s390/share/man/man4/trm.4#1 branch .. //depot/projects/s390/share/man/man4/ubsa.4#2 integrate .. //depot/projects/s390/share/man/man4/ubsec.4#2 integrate .. //depot/projects/s390/share/man/man4/umass.4#3 integrate .. //depot/projects/s390/share/man/man4/unix.4#2 integrate .. //depot/projects/s390/share/man/man4/usb.4#3 integrate .. //depot/projects/s390/share/man/man4/uvisor.4#2 integrate .. //depot/projects/s390/share/man/man4/vga.4#2 integrate .. //depot/projects/s390/share/man/man4/vinum.4#2 integrate .. //depot/projects/s390/share/man/man4/vpo.4#2 integrate .. //depot/projects/s390/share/man/man5/devfs.5#2 integrate .. //depot/projects/s390/share/man/man5/device.hints.5#4 integrate .. //depot/projects/s390/share/man/man5/dir.5#2 integrate .. //depot/projects/s390/share/man/man5/disktab.5#2 integrate .. //depot/projects/s390/share/man/man5/drivers.conf.5#3 integrate .. //depot/projects/s390/share/man/man5/fdescfs.5#2 integrate .. //depot/projects/s390/share/man/man5/fs.5#3 integrate .. //depot/projects/s390/share/man/man5/fstab.5#2 integrate .. //depot/projects/s390/share/man/man5/link.5#2 integrate .. //depot/projects/s390/share/man/man5/linprocfs.5#2 integrate .. //depot/projects/s390/share/man/man5/make.conf.5#4 integrate .. //depot/projects/s390/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/s390/share/man/man5/periodic.conf.5#4 integrate .. //depot/projects/s390/share/man/man5/procfs.5#2 integrate .. //depot/projects/s390/share/man/man5/quota.user.5#2 integrate .. //depot/projects/s390/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/s390/share/man/man7/ffs.7#2 integrate .. //depot/projects/s390/share/man/man7/hier.7#4 integrate .. //depot/projects/s390/share/man/man7/maclabel.7#2 integrate .. //depot/projects/s390/share/man/man7/release.7#4 integrate .. //depot/projects/s390/share/man/man7/security.7#2 integrate .. //depot/projects/s390/share/man/man7/tuning.7#4 integrate .. //depot/projects/s390/share/man/man8/crash.8#2 integrate .. //depot/projects/s390/share/man/man8/diskless.8#3 integrate .. //depot/projects/s390/share/man/man8/intro.8#3 integrate .. //depot/projects/s390/share/man/man8/picobsd.8#3 integrate .. //depot/projects/s390/share/man/man8/rc.8#4 integrate .. //depot/projects/s390/share/man/man9/VFS.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_CHECKEXP.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_FHTOVP.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_INIT.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_MOUNT.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_QUOTACTL.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_START.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_STATFS.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_UNMOUNT.9#2 integrate .. //depot/projects/s390/share/man/man9/VFS_VGET.9#2 integrate .. //depot/projects/s390/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/s390/share/man/man9/VOP_ACLCHECK.9#3 integrate .. //depot/projects/s390/share/man/man9/VOP_ADVLOCK.9#2 integrate .. //depot/projects/s390/share/man/man9/VOP_ATTRIB.9#3 integrate .. //depot/projects/s390/share/man/man9/VOP_BWRITE.9#2 integrate .. //depot/projects/s390/share/man/man9/VOP_CREATE.9#3 integrate .. //depot/projects/s390/share/man/man9/VOP_FSYNC.9#2 integrate .. //depot/projects/s390/share/man/man9/VOP_GETACL.9#3 integrate .. //depot/projects/s390/share/man/man9/VOP_GETEXTATTR.9#3 integrate .. //depot/projects/s390/share/man/man9/VOP_GETVOBJECT.9#2 integrate .. //depot/projects/s390/share/man/man9/VOP_INACTIVE.9#2 integrate .. //depot/projects/s390/share/man/man9/VOP_IOCTL.9#4 integrate .. //depot/projects/s390/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/s390/share/man/man9/VOP_LOOKUP.9#3 integrate .. //depot/projects/s390/share/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/s390/share/man/man9/VOP_RDWR.9#2 integrate .. //depot/projects/s390/share/man/man9/VOP_SETACL.9#3 integrate .. //depot/projects/s390/share/man/man9/VOP_SETEXTATTR.9#3 integrate .. //depot/projects/s390/share/man/man9/VOP_STRATEGY.9#2 integrate .. //depot/projects/s390/share/man/man9/acl.9#2 integrate .. //depot/projects/s390/share/man/man9/buf.9#2 integrate .. //depot/projects/s390/share/man/man9/extattr.9#2 integrate .. //depot/projects/s390/share/man/man9/getnewvnode.9#3 integrate .. //depot/projects/s390/share/man/man9/inittodr.9#2 integrate .. //depot/projects/s390/share/man/man9/jumbo.9#2 integrate .. //depot/projects/s390/share/man/man9/mac.9#2 integrate .. //depot/projects/s390/share/man/man9/pseudofs.9#2 integrate .. //depot/projects/s390/share/man/man9/thread_exit.9#2 integrate .. //depot/projects/s390/share/man/man9/vaccess.9#2 integrate .. //depot/projects/s390/share/man/man9/vfs_getnewfsid.9#2 integrate .. //depot/projects/s390/share/man/man9/vfs_getvfs.9#2 integrate .. //depot/projects/s390/share/man/man9/vfs_mount.9#2 integrate .. //depot/projects/s390/share/man/man9/vfs_mountedon.9#2 integrate .. //depot/projects/s390/share/man/man9/vfs_unmountall.9#3 integrate .. //depot/projects/s390/share/man/man9/vfsconf.9#2 integrate .. //depot/projects/s390/share/man/man9/vgone.9#2 integrate .. //depot/projects/s390/share/man/man9/vinvalbuf.9#2 integrate .. //depot/projects/s390/share/man/man9/vnode.9#3 integrate .. //depot/projects/s390/share/man/man9/zero_copy.9#3 integrate .. //depot/projects/s390/share/termcap/termcap.src#3 integrate .. //depot/projects/s390/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/s390/sys/alpha/alpha/sys_machdep.c#3 integrate .. //depot/projects/s390/sys/alpha/alpha/vm_machdep.c#4 integrate .. //depot/projects/s390/sys/alpha/osf1/osf1_misc.c#3 integrate .. //depot/projects/s390/sys/alpha/osf1/osf1_mount.c#3 integrate .. //depot/projects/s390/sys/alpha/osf1/osf1_signal.c#4 integrate .. //depot/projects/s390/sys/alpha/osf1/osf1_util.h#2 integrate .. //depot/projects/s390/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/s390/sys/boot/arc/loader/conf.c#2 integrate .. //depot/projects/s390/sys/boot/common/loader.8#4 integrate .. //depot/projects/s390/sys/boot/common/ufsread.c#4 integrate .. //depot/projects/s390/sys/boot/efi/Makefile.inc#3 integrate .. //depot/projects/s390/sys/boot/efi/include/efiapi.h#2 integrate .. //depot/projects/s390/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/s390/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/s390/sys/boot/efi/libefi/arch/ia64/start.S#2 integrate .. //depot/projects/s390/sys/boot/efi/libefi/bootinfo.c#3 integrate .. //depot/projects/s390/sys/boot/efi/libefi/efi_console.c#2 integrate .. //depot/projects/s390/sys/boot/efi/libefi/exit.c#2 delete .. //depot/projects/s390/sys/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/s390/sys/boot/efi/loader/conf.c#3 integrate .. //depot/projects/s390/sys/boot/efi/loader/main.c#4 integrate .. //depot/projects/s390/sys/boot/efi/loader/version#3 integrate .. //depot/projects/s390/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/s390/sys/boot/i386/boot2/boot1.s#3 integrate .. //depot/projects/s390/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/s390/sys/boot/i386/loader/conf.c#3 integrate .. //depot/projects/s390/sys/boot/i386/pxeldr/pxeboot.8#3 integrate .. //depot/projects/s390/sys/boot/ia64/skiload/conf.c#2 integrate .. //depot/projects/s390/sys/boot/libstand/Makefile#2 delete .. //depot/projects/s390/sys/boot/libstand/__main.c#2 delete .. //depot/projects/s390/sys/boot/libstand/alpha/_setjmp.S#2 delete .. //depot/projects/s390/sys/boot/libstand/arp.c#2 delete .. //depot/projects/s390/sys/boot/libstand/assert.c#2 delete .. //depot/projects/s390/sys/boot/libstand/bcd.c#2 delete .. //depot/projects/s390/sys/boot/libstand/bootp.c#2 delete .. //depot/projects/s390/sys/boot/libstand/bootp.h#2 delete .. //depot/projects/s390/sys/boot/libstand/bootparam.c#2 delete .. //depot/projects/s390/sys/boot/libstand/bootparam.h#2 delete .. //depot/projects/s390/sys/boot/libstand/bswap.c#2 delete .. //depot/projects/s390/sys/boot/libstand/bzipfs.c#2 delete .. //depot/projects/s390/sys/boot/libstand/bzlib.c.diff#2 delete .. //depot/projects/s390/sys/boot/libstand/bzlib.h.diff#2 delete .. //depot/projects/s390/sys/boot/libstand/bzlib_private.h.diff#2 delete .. //depot/projects/s390/sys/boot/libstand/cd9660.c#2 delete .. //depot/projects/s390/sys/boot/libstand/close.c#2 delete .. //depot/projects/s390/sys/boot/libstand/closeall.c#2 delete .. //depot/projects/s390/sys/boot/libstand/dev.c#2 delete .. //depot/projects/s390/sys/boot/libstand/dosfs.c#2 delete .. //depot/projects/s390/sys/boot/libstand/dosfs.h#2 delete .. //depot/projects/s390/sys/boot/libstand/environment.c#2 delete .. //depot/projects/s390/sys/boot/libstand/ether.c#2 delete .. //depot/projects/s390/sys/boot/libstand/ext2fs.c#2 delete .. //depot/projects/s390/sys/boot/libstand/fstat.c#2 delete .. //depot/projects/s390/sys/boot/libstand/getopt.c#2 delete .. //depot/projects/s390/sys/boot/libstand/gets.c#2 delete .. //depot/projects/s390/sys/boot/libstand/globals.c#2 delete .. //depot/projects/s390/sys/boot/libstand/i386/_setjmp.S#2 delete .. //depot/projects/s390/sys/boot/libstand/if_ether.h#2 delete .. //depot/projects/s390/sys/boot/libstand/in_cksum.c#2 delete .. //depot/projects/s390/sys/boot/libstand/inet_ntoa.c#2 delete .. //depot/projects/s390/sys/boot/libstand/ioctl.c#2 delete .. //depot/projects/s390/sys/boot/libstand/iodesc.h#2 delete .. //depot/projects/s390/sys/boot/libstand/libstand.3#3 delete .. //depot/projects/s390/sys/boot/libstand/lseek.c#2 delete .. //depot/projects/s390/sys/boot/libstand/net.c#2 delete .. //depot/projects/s390/sys/boot/libstand/net.h#2 delete .. //depot/projects/s390/sys/boot/libstand/netif.c#2 delete .. //depot/projects/s390/sys/boot/libstand/netif.h#2 delete .. //depot/projects/s390/sys/boot/libstand/nfs.c#2 delete .. //depot/projects/s390/sys/boot/libstand/nfsv2.h#2 delete .. //depot/projects/s390/sys/boot/libstand/nullfs.c#2 delete .. //depot/projects/s390/sys/boot/libstand/open.c#2 delete .. //depot/projects/s390/sys/boot/libstand/pager.c#2 delete .. //depot/projects/s390/sys/boot/libstand/powerpc/_setjmp.S#2 delete .. //depot/projects/s390/sys/boot/libstand/printf.c#2 delete .. //depot/projects/s390/sys/boot/libstand/qdivrem.c#2 delete .. //depot/projects/s390/sys/boot/libstand/quad.h#2 delete .. //depot/projects/s390/sys/boot/libstand/random.c#2 delete .. //depot/projects/s390/sys/boot/libstand/rarp.c#2 delete .. //depot/projects/s390/sys/boot/libstand/read.c#2 delete .. //depot/projects/s390/sys/boot/libstand/readdir.c#2 delete .. //depot/projects/s390/sys/boot/libstand/rpc.c#2 delete .. //depot/projects/s390/sys/boot/libstand/rpc.h#2 delete .. //depot/projects/s390/sys/boot/libstand/rpcv2.h#2 delete .. //depot/projects/s390/sys/boot/libstand/saioctl.h#2 delete .. //depot/projects/s390/sys/boot/libstand/sbrk.c#2 delete .. //depot/projects/s390/sys/boot/libstand/sparc64/_setjmp.S#2 delete .. //depot/projects/s390/sys/boot/libstand/splitfs.c#2 delete .. //depot/projects/s390/sys/boot/libstand/stand.h#2 delete .. //depot/projects/s390/sys/boot/libstand/stat.c#2 delete .. //depot/projects/s390/sys/boot/libstand/strcasecmp.c#2 delete .. //depot/projects/s390/sys/boot/libstand/strdup.c#2 delete .. //depot/projects/s390/sys/boot/libstand/strerror.c#2 delete .. //depot/projects/s390/sys/boot/libstand/strtol.c#2 delete .. //depot/projects/s390/sys/boot/libstand/tftp.c#2 delete .. //depot/projects/s390/sys/boot/libstand/tftp.h#2 delete .. //depot/projects/s390/sys/boot/libstand/twiddle.c#2 delete .. //depot/projects/s390/sys/boot/libstand/udp.c#2 delete .. //depot/projects/s390/sys/boot/libstand/ufs.c#3 delete .. //depot/projects/s390/sys/boot/libstand/write.c#2 delete .. //depot/projects/s390/sys/boot/libstand/zalloc.c#2 delete .. //depot/projects/s390/sys/boot/libstand/zalloc_defs.h#2 delete .. //depot/projects/s390/sys/boot/libstand/zalloc_malloc.c#2 delete .. //depot/projects/s390/sys/boot/libstand/zalloc_mem.h#2 delete .. //depot/projects/s390/sys/boot/libstand/zalloc_protos.h#2 delete .. //depot/projects/s390/sys/boot/libstand/zipfs.c#2 delete .. //depot/projects/s390/sys/boot/libstand/zutil.h.diff#2 delete .. //depot/projects/s390/sys/boot/powerpc/loader/conf.c#2 integrate .. //depot/projects/s390/sys/boot/sparc64/loader/Makefile#5 integrate .. //depot/projects/s390/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/s390/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_filio.c#3 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_resource.c#3 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_signal.c#3 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/s390/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/s390/sys/conf/NOTES#5 integrate .. //depot/projects/s390/sys/conf/files#6 integrate .. //depot/projects/s390/sys/conf/kmod.mk#4 integrate .. //depot/projects/s390/sys/conf/newvers.sh#3 integrate .. //depot/projects/s390/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/s390/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/s390/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/s390/sys/dev/amd/amd.c#1 branch .. //depot/projects/s390/sys/dev/amd/amd.h#1 branch .. //depot/projects/s390/sys/dev/amr/amr.c#4 integrate .. //depot/projects/s390/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/s390/sys/dev/amr/amr_disk.c#4 integrate .. //depot/projects/s390/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/s390/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/s390/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/s390/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/s390/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/s390/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/s390/sys/dev/bktr/bktr_core.c#4 integrate .. //depot/projects/s390/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/s390/sys/dev/exca/excavar.h#3 integrate .. //depot/projects/s390/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/s390/sys/dev/raidframe/rf_freebsdkintf.c#2 integrate .. //depot/projects/s390/sys/dev/random/yarrow.c#3 integrate .. //depot/projects/s390/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/s390/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/s390/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/s390/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/s390/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/s390/sys/dev/sound/isa/sbc.c#3 integrate .. //depot/projects/s390/sys/dev/sound/isa/uartsio.c#2 integrate .. //depot/projects/s390/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/s390/sys/dev/streams/streams.c#2 integrate .. //depot/projects/s390/sys/dev/trm/trm.c#3 integrate .. //depot/projects/s390/sys/dev/trm/trm.h#2 integrate .. //depot/projects/s390/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/s390/sys/dev/usb/ulpt.c#4 integrate .. //depot/projects/s390/sys/dev/usb/umass.c#4 integrate .. //depot/projects/s390/sys/dev/vinum/vinumconfig.c#4 integrate .. //depot/projects/s390/sys/dev/vinum/vinumioctl.c#4 integrate .. //depot/projects/s390/sys/dev/vinum/vinumrevive.c#3 integrate .. //depot/projects/s390/sys/fs/devfs/devfs.h#4 integrate .. //depot/projects/s390/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/s390/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/s390/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs.h#3 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_node.h#3 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_smb.c#4 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_subr.c#2 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/s390/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/s390/sys/geom/bde/g_bde_crypt.c#2 integrate .. //depot/projects/s390/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/s390/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/s390/sys/geom/geom.h#5 integrate .. //depot/projects/s390/sys/geom/geom_aes.c#4 integrate .. //depot/projects/s390/sys/geom/geom_bsd.c#4 integrate .. //depot/projects/s390/sys/geom/geom_dev.c#5 integrate .. //depot/projects/s390/sys/geom/geom_disk.c#6 integrate .. //depot/projects/s390/sys/geom/geom_dump.c#5 integrate .. //depot/projects/s390/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/s390/sys/geom/geom_io.c#5 integrate .. //depot/projects/s390/sys/geom/geom_mbr.c#4 integrate .. //depot/projects/s390/sys/geom/geom_pc98.c#4 integrate .. //depot/projects/s390/sys/geom/geom_slice.c#5 integrate .. //depot/projects/s390/sys/geom/geom_slice.h#4 integrate .. //depot/projects/s390/sys/geom/geom_subr.c#5 integrate .. //depot/projects/s390/sys/geom/geom_sunlabel.c#4 integrate .. //depot/projects/s390/sys/i386/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/s390/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/s390/sys/i386/i386/autoconf.c#3 integrate .. //depot/projects/s390/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/s390/sys/i386/i386/i386-gdbstub.c#2 integrate .. //depot/projects/s390/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/s390/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_fcntl.c#3 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_ioctl.c#3 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_signal.c#3 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_stat.c#2 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/s390/sys/i386/ibcs2/ibcs2_xenix.c#3 integrate .. //depot/projects/s390/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/s390/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/s390/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/s390/sys/ia64/ia32/ia32_misc.c#2 integrate .. //depot/projects/s390/sys/ia64/ia32/ia32_proto.h#4 integrate .. //depot/projects/s390/sys/ia64/ia32/ia32_syscall.h#4 integrate .. //depot/projects/s390/sys/ia64/ia32/ia32_sysent.c#4 integrate .. //depot/projects/s390/sys/ia64/ia32/ia32_util.h#2 integrate .. //depot/projects/s390/sys/ia64/ia32/syscalls.master#4 integrate .. //depot/projects/s390/sys/ia64/ia64/dump_machdep.c#4 integrate .. //depot/projects/s390/sys/ia64/ia64/sys_machdep.c#2 integrate .. //depot/projects/s390/sys/ia64/ia64/vm_machdep.c#4 integrate .. //depot/projects/s390/sys/ia64/include/bootinfo.h#2 integrate .. //depot/projects/s390/sys/ia64/include/dig64.h#1 branch .. //depot/projects/s390/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/s390/sys/kern/init_sysent.c#4 integrate .. //depot/projects/s390/sys/kern/kern_acct.c#4 integrate .. //depot/projects/s390/sys/kern/kern_acl.c#3 integrate .. //depot/projects/s390/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/s390/sys/kern/kern_environment.c#4 integrate .. //depot/projects/s390/sys/kern/kern_exec.c#5 integrate .. //depot/projects/s390/sys/kern/kern_exit.c#6 integrate .. //depot/projects/s390/sys/kern/kern_fork.c#6 integrate .. //depot/projects/s390/sys/kern/kern_jail.c#3 integrate .. //depot/projects/s390/sys/kern/kern_linker.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 0:28: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACA5037B405; Tue, 24 Dec 2002 00:28:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A99137B401 for ; Tue, 24 Dec 2002 00:28:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1579843EE5 for ; Tue, 24 Dec 2002 00:28:05 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO8S4fh005694 for ; Tue, 24 Dec 2002 00:28:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO8S4jb005691 for perforce@freebsd.org; Tue, 24 Dec 2002 00:28:04 -0800 (PST) Date: Tue, 24 Dec 2002 00:28:04 -0800 (PST) Message-Id: <200212240828.gBO8S4jb005691@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22698 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22698 Change 22698 by marcel@marcel_nfs on 2002/12/24 00:27:44 When we initialize FCR and MCR, update the softc where we keep an image of them. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_cons.c#8 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_cons.c#8 (text+ko) ==== @@ -162,12 +162,13 @@ /* XXX barrier */ /* Disable the FIFO (if present). */ - sio_setreg(&sio_console, com_fcr, 0); + sio_console.reg_fcr = 0; + sio_setreg(&sio_console, com_fcr, sio_console.reg_fcr); /* XXX barrier */ - sio_console.reg_fcr = 0; /* Set MCR. */ - sio_setreg(&sio_console, com_mcr, MCR_IENABLE | MCR_RTS | MCR_DTR); + sio_console.reg_mcr = MCR_IENABLE | MCR_RTS | MCR_DTR; + sio_setreg(&sio_console, com_mcr, sio_console.reg_mcr); /* XXX barrier */ /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 1:13:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C99CC37B405; Tue, 24 Dec 2002 01:13:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 770AE37B401 for ; Tue, 24 Dec 2002 01:13:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0414843EDC for ; Tue, 24 Dec 2002 01:13:01 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO9D0fh023346 for ; Tue, 24 Dec 2002 01:13:00 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO9D0up023337 for perforce@freebsd.org; Tue, 24 Dec 2002 01:13:00 -0800 (PST) Date: Tue, 24 Dec 2002 01:13:00 -0800 (PST) Message-Id: <200212240913.gBO9D0up023337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22700 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22700 Change 22700 by marcel@marcel_nfs on 2002/12/24 01:12:53 o Initialize the FIFOs at the end of sioprobe. Set loopback prior to enabling the FIFOs so that we don't send garbage and clear the RHR after resetting the FIFOs. With loopback enabled we should be able to determine the size of the FIFO. This we don't do yet. We assume a regular 16 byte FIFO for now. o Move UART identification after FIFO initialization in sioprobe. Only set the device description if it hasn't been set yet. This allows bus specific front-end code to give a more detailed or a more relevant description. A generic ACPI defined UART will now yield: sio0: <16550 or compatible> port 0x3f8-0x3ff irq 4 on acpi0 Recognize the newer 16650 and 16750 based on the FIFO size. We avoid fiddling with the SPR when we know we have a FIFO. This avoids potential problems with multi-port cards. The fiddling is only needed to differentiate between the INS8250 and the NS16450 and both are not current devices. o Don't reinitialize the FIFOs when we open the device. The code appears to be broken and unnecessary and was probably added to work around some weirdness. Keep it, but wrap it inside #if 0 / #endif. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#26 edit .. //depot/projects/ia64/sys/dev/sio/siovar.h#12 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#26 (text+ko) ==== @@ -263,6 +263,104 @@ 0, 0, sysctl_machdep_comdefaultrate, "I", ""); /* TUNABLE_INT("machdep.conspeed", &comdefaultrate); */ +/* + * Initialize FIFOs. We cannot simple enable the FIFOs because that may cause + * garbage to appear on the wire (non-empty transmit FIFO) or garbage to be + * received (non-empty receive FIFO). The former is prevented by enabling + * loopback prior to enabling the FIFOs. The latter is prevented by ignoring + * any data in the RHR after we have reset the FIFOs. + */ +static void +sioinitfifo(struct com_s *sc) +{ + + sio_setreg(sc, com_mcr, sc->reg_mcr | MCR_LOOPBACK); + /* XXX barrier */ + sio_setreg(sc, com_fcr, FCR_ENABLE); + /* XXX barrier */ + sio_setreg(sc, com_fcr, FCR_ENABLE | FCR_RCV_RST | FCR_XMT_RST); + /* XXX barrier */ + DELAY(100); + sc->reg_fcr = 0; + sc->hasfifo = (sio_getreg(sc, com_iir) & IIR_FIFO_MASK) ? 1 : 0; + if (sc->hasfifo) { + while (sio_getreg(sc, com_lsr) & LSR_RXRDY) { + (void)sio_getreg(sc, com_data); + /* XXX barrier */ + } + sc->reg_fcr = FCR_ENABLE | FCR_RX_HIGH; + sio_setreg(sc, com_mcr, sc->reg_fcr); + /* XXX barrier */ + + sc->fifosize = 16; /* Minimal FIFO size. */ + /* + * XXX count the number of characters we can send before + * we have a receive interrupt. This tells us how large + * the FIFOs are. + */ + } + sio_setreg(sc, com_mcr, sc->reg_mcr); + /* XXX barrier */ +} + +static void +siodescribe(device_t dev, struct com_s *sc) +{ + int has_spr; + u_char spr; + + if (sc->hasfifo) { + /* + * NS16550 or higher. The minimum FIFO size is 16 bytes for + * the NS16550. The ST16C650 has 32 bytes FIFOs and the + * NS16750 has 64 bytes FIFOs. + */ + switch (sc->fifosize) { + case 16: + /* + * XXX Should we try to see if we have a broken + * 16550 or a fixed 16550A? + */ + device_set_desc(dev, "16550 or compatible"); + break; + case 32: + /* + * XXX Should we check that features like automatic + * flow control exist? + */ + device_set_desc(dev, "16650 or compatible"); + break; + case 64: + /* + * XXX Should we check that features like automatic + * flow control exist? + */ + device_set_desc(dev, "16750 or compatible"); + break; + default: + /* XXX Probably not right. */ + device_set_desc(dev, "16550 with non-standard FIFO"); + break; + } + } else { + /* + * NS16450 or lower. Use the Scratch Pad Register (SPR) to + * differentiate the NS16450 from the INS8250. + */ + spr = sio_getreg(sc, com_scr); + sio_setreg(sc, com_scr, ~spr); + /* XXX barrier */ + has_spr = (sio_getreg(sc, com_scr) == ~spr) ? 1 : 0; + /* XXX barrier */ + sio_setreg(sc, com_scr, spr); + /* XXX barrier */ + if (!has_spr) + device_set_desc(dev, "8250 or compatible"); + else + device_set_desc(dev, "16450 or compatible"); + } +} + u_int siodivisor(u_long rclk, u_long speed) { @@ -313,6 +411,8 @@ /* XXX we can do more. */ + sio_setreg(sc, com_ier, 0); + /* XXX barrier */ sio_setreg(sc, com_lcr, lcr); /* XXX barrier */ return (0); @@ -377,13 +477,27 @@ com = (struct com_s *)device_get_softc(dev); - /* Check if we're probing the console. */ + /* Check if we're probing what could be the console. */ if (com->bst == sio_console.bst && com->bsh == sio_console.bsh) { com = &sio_console; device_set_softc(dev, com); - return (0); + } + + if (com->consdev == NULL) { + /* Perform rudimentary sanity checking. */ + if (sioprobe1(com)) + return (ENXIO); + + if (com->rclk == 0) + com->rclk = DEFAULT_RCLK; } + /* Initialize the FIFOs. */ + sioinitfifo(com); + + if (device_get_desc(dev) == NULL) + siodescribe(dev, com); + flags = device_get_flags(dev); if (COM_LLCONSOLE(flags)) { @@ -391,16 +505,6 @@ return (ENXIO); } - /* Perform rudimentary sanity checking. */ - if (sioprobe1(com)) - return (ENXIO); - - if (com->rclk == 0) - com->rclk = DEFAULT_RCLK; - - sio_setreg(com, com_ier, 0); - /* XXX barrier */ - return (0); } @@ -440,7 +544,6 @@ com->dtr_wait = 3 * hz; com->loses_outints = COM_LOSESOUTINTS(flags) != 0; com->no_irq = bus_get_resource(dev, SYS_RES_IRQ, 0, NULL, NULL) != 0; - com->tx_fifo_size = 1; com->obufs[0].l_head = com->obuf1; com->obufs[1].l_head = com->obuf2; @@ -478,80 +581,8 @@ termioschars(&com->it_in); com->it_out = com->it_in; - /* attempt to determine UART type */ - device_printf(dev, "type "); - - if (!COM_IIR_TXRDYBUG(flags) && !COM_NOSCR(flags)) { - u_char scr; - u_char scr1; - u_char scr2; - - scr = sio_getreg(com, com_scr); - /* XXX barrier */ - sio_setreg(com, com_scr, 0xa5); - /* XXX barrier */ - scr1 = sio_getreg(com, com_scr); - /* XXX barrier */ - sio_setreg(com, com_scr, 0x5a); - /* XXX barrier */ - scr2 = sio_getreg(com, com_scr); - /* XXX barrier */ - sio_setreg(com, com_scr, scr); - /* XXX barrier */ - if (scr1 != 0xa5 || scr2 != 0x5a) { - printf("8250"); - goto determined_type; - } - } - - sio_setreg(com, com_fcr, FCR_ENABLE | FCR_RX_HIGH); - /* XXX barrier with SYNC semantics */ - DELAY(100); - - com->st16650a = 0; - switch (sio_getreg(com, com_iir) & IIR_FIFO_MASK) { - case FCR_RX_LOW: - printf("16450"); - break; - case FCR_RX_MEDL: - printf("16450?"); - break; - case FCR_RX_MEDH: - printf("16550?"); - break; - case FCR_RX_HIGH: - if (COM_NOFIFO(flags)) { - printf("16550A fifo disabled"); - } else { - com->hasfifo = TRUE; - if (COM_ST16650A(flags)) { - com->st16650a = 1; - com->tx_fifo_size = 32; - printf("ST16650A"); - } else { - com->tx_fifo_size = COM_FIFOSIZE(flags); - printf("16550A"); - } - } - if (!com->st16650a) { - if (!com->tx_fifo_size) - com->tx_fifo_size = 16; - else - printf("lookalike with %d bytes FIFO", - com->tx_fifo_size); - } - - break; - } - - sio_setreg(com, com_fcr, 0); -determined_type: ; - if (com->consdev != NULL) - printf(", console"); - if (COM_IIR_TXRDYBUG(flags)) - printf(" with a bogus IIR_TXRDY register"); - printf("\n"); + device_printf(dev, "console\n"); if (sio_fast_ih == NULL) { swi_add(&tty_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, @@ -697,6 +728,7 @@ --com->wopeners; if (error != 0) goto out; +#if 0 /* * XXX we should goto open_top if comparam() slept. */ @@ -740,6 +772,7 @@ goto out; } } +#endif mtx_lock_spin(&sio_lock); (void) sio_getreg(com, com_lsr); @@ -1291,12 +1324,12 @@ if (line_status & LSR_TXRDY && com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)) { ioptr = com->obufq.l_head; - if (com->tx_fifo_size > 1 && com->unit != siotsunit) { + if (com->hasfifo && com->unit != siotsunit) { u_int ocount; ocount = com->obufq.l_tail - ioptr; - if (ocount > com->tx_fifo_size) - ocount = com->tx_fifo_size; + if (ocount > com->fifosize) + ocount = com->fifosize; com->bytes_out += ocount; do sio_setreg(com, com_data, *ioptr++); ==== //depot/projects/ia64/sys/dev/sio/siovar.h#12 (text+ko) ==== @@ -83,6 +83,8 @@ bus_space_handle_t bsh; u_long rclk; /* Receiver clock (bin 9) */ u_int regshft; /* Interleaved multi-port. */ + u_int hasfifo:1; + u_int fifosize; u_short reg_dl; /* Copy of DL. */ u_char reg_fcr; /* Copy of FCR. */ u_char reg_lcr; /* Copy of LCR. */ @@ -93,7 +95,6 @@ u_char state; /* miscellaneous flag bits */ bool_t active_out; /* nonzero if the callout device is open */ u_char extra_state; /* more flag bits, separate for order trick */ - bool_t hasfifo; /* nonzero for 16550 UARTs */ bool_t st16650a; /* Is a Startech 16650A or RTS/CTS compat */ bool_t loses_outints; /* nonzero if device loses output interrupts */ bool_t no_irq; /* nonzero if irq is not attached */ @@ -101,7 +102,6 @@ bool_t poll; /* nonzero if polling is required */ bool_t poll_output; /* nonzero if polling for output is required */ int dtr_wait; /* time to hold DTR down on close (* 1/hz) */ - u_int tx_fifo_size; u_int wopeners; /* # processes waiting for DCD in open() */ /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 1:27:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9365037B405; Tue, 24 Dec 2002 01:27:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2810437B401 for ; Tue, 24 Dec 2002 01:27:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1ABB943ED8 for ; Tue, 24 Dec 2002 01:27:20 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBO9RJfh026978 for ; Tue, 24 Dec 2002 01:27:19 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBO9RIa7026975 for perforce@freebsd.org; Tue, 24 Dec 2002 01:27:18 -0800 (PST) Date: Tue, 24 Dec 2002 01:27:18 -0800 (PST) Message-Id: <200212240927.gBO9RIa7026975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22701 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22701 Change 22701 by marcel@marcel_nfs on 2002/12/24 01:26:47 IFC @22699 Affected files ... .. //depot/projects/ia64/UPDATING#26 integrate .. //depot/projects/ia64/bin/ps/ps.1#13 integrate .. //depot/projects/ia64/bin/sh/bltin/echo.c#3 integrate .. //depot/projects/ia64/bin/sh/sh.1#17 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.c#8 integrate .. //depot/projects/ia64/etc/rc#23 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#8 integrate .. //depot/projects/ia64/etc/rc.d/devd#3 integrate .. //depot/projects/ia64/etc/rc.d/diskless#7 integrate .. //depot/projects/ia64/etc/rc.d/initdiskless#6 integrate .. //depot/projects/ia64/etc/rc.d/rcconf.sh#1 branch .. //depot/projects/ia64/include/limits.h#4 integrate .. //depot/projects/ia64/lib/libc/gen/setproctitle.c#4 integrate .. //depot/projects/ia64/lib/libc/i386/stdlib/div.S#5 integrate .. //depot/projects/ia64/lib/libc/i386/stdlib/ldiv.S#5 integrate .. //depot/projects/ia64/lib/libc/sys/mmap.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/mprotect.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/rename.2#5 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.8#4 integrate .. //depot/projects/ia64/libexec/getty/getty.8#3 integrate .. //depot/projects/ia64/libexec/rlogind/rlogind.8#3 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.8#10 integrate .. //depot/projects/ia64/sbin/dump/dump.8#12 integrate .. //depot/projects/ia64/sbin/fdisk_pc98/fdisk.8#4 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#14 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.c#7 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/ia64/sbin/restore/restore.8#6 integrate .. //depot/projects/ia64/sbin/shutdown/shutdown.8#5 integrate .. //depot/projects/ia64/sbin/slattach/slattach.8#3 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/rdp.4#3 integrate .. //depot/projects/ia64/share/man/man4/tcp.4#9 integrate .. //depot/projects/ia64/share/man/man4/trm.4#3 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#26 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#21 integrate .. //depot/projects/ia64/share/man/man7/Makefile#8 integrate .. //depot/projects/ia64/share/man/man7/development.7#1 branch .. //depot/projects/ia64/share/man/man7/tuning.7#16 integrate .. //depot/projects/ia64/share/man/man8/adding_user.8#3 integrate .. //depot/projects/ia64/share/man/man8/diskless.8#7 integrate .. //depot/projects/ia64/sys/alpha/include/limits.h#4 integrate .. //depot/projects/ia64/sys/arm/include/limits.h#3 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#13 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#15 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sockio.c#5 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/fil.c#8 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#7 integrate .. //depot/projects/ia64/sys/dev/em/README#5 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#15 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#11 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#6 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#6 integrate .. //depot/projects/ia64/sys/dev/em/if_em_osdep.h#9 integrate .. //depot/projects/ia64/sys/dev/sio/sio_pccard.c#7 integrate .. //depot/projects/ia64/sys/dev/streams/streams.c#5 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#15 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#28 integrate .. //depot/projects/ia64/sys/i386/include/limits.h#4 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#12 integrate .. //depot/projects/ia64/sys/ia64/include/limits.h#4 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#38 integrate .. //depot/projects/ia64/sys/kern/kern_event.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_uuid.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#24 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#24 integrate .. //depot/projects/ia64/sys/kern/sys_socket.c#12 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#22 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#22 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#29 integrate .. //depot/projects/ia64/sys/kern/vfs_export.c#7 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#21 integrate .. //depot/projects/ia64/sys/modules/netgraph/fec/Makefile#2 integrate .. //depot/projects/ia64/sys/net/bridge.c#14 integrate .. //depot/projects/ia64/sys/net/if.c#16 integrate .. //depot/projects/ia64/sys/net/if_ef.c#6 integrate .. //depot/projects/ia64/sys/net/if_var.h#14 integrate .. //depot/projects/ia64/sys/net/radix.c#7 integrate .. //depot/projects/ia64/sys/net/radix.h#4 integrate .. //depot/projects/ia64/sys/net/route.c#7 integrate .. //depot/projects/ia64/sys/net/rtsock.c#15 integrate .. //depot/projects/ia64/sys/netatm/atm_if.c#7 integrate .. //depot/projects/ia64/sys/netatm/atm_usrreq.c#5 integrate .. //depot/projects/ia64/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/ia64/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/ia64/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/ia64/sys/netgraph/ng_source.c#4 integrate .. //depot/projects/ia64/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#15 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/ia64/sys/netinet6/in6.c#6 integrate .. //depot/projects/ia64/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/ia64/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/ia64/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/ia64/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#9 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#15 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/ia64/sys/pci/agp.c#10 integrate .. //depot/projects/ia64/sys/pci/if_ste.c#11 integrate .. //depot/projects/ia64/sys/pci/if_stereg.h#4 integrate .. //depot/projects/ia64/sys/powerpc/include/limits.h#4 integrate .. //depot/projects/ia64/sys/sparc64/include/limits.h#4 integrate .. //depot/projects/ia64/sys/sparc64/include/pmap.h#13 integrate .. //depot/projects/ia64/sys/sparc64/include/smp.h#8 integrate .. //depot/projects/ia64/sys/sparc64/include/tlb.h#10 integrate .. //depot/projects/ia64/sys/sparc64/include/tte.h#7 integrate .. //depot/projects/ia64/sys/sparc64/include/vmparam.h#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/cache.c#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/exception.S#8 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#16 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#13 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#27 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tlb.c#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tsb.c#11 integrate .. //depot/projects/ia64/sys/sys/_types.h#8 integrate .. //depot/projects/ia64/sys/sys/file.h#13 integrate .. //depot/projects/ia64/sys/sys/socketvar.h#23 integrate .. //depot/projects/ia64/sys/sys/types.h#21 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#9 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#20 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#16 integrate .. //depot/projects/ia64/sys/vm/vm_meter.c#8 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#32 integrate .. //depot/projects/ia64/sys/x86_64/include/limits.h#3 integrate .. //depot/projects/ia64/usr.bin/chpass/chpass.1#4 integrate .. //depot/projects/ia64/usr.bin/colcrt/colcrt.1#3 integrate .. //depot/projects/ia64/usr.bin/gencat/genlib.c#4 integrate .. //depot/projects/ia64/usr.bin/leave/leave.1#3 integrate .. //depot/projects/ia64/usr.bin/make/make.1#11 integrate .. //depot/projects/ia64/usr.bin/paste/paste.1#5 integrate .. //depot/projects/ia64/usr.bin/soelim/soelim.1#3 integrate .. //depot/projects/ia64/usr.bin/unifdef/unifdef.1#8 integrate .. //depot/projects/ia64/usr.bin/uuencode/uuencode.1#7 integrate .. //depot/projects/ia64/usr.bin/xargs/xargs.1#10 integrate .. //depot/projects/ia64/usr.sbin/ancontrol/ancontrol.8#5 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#12 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#21 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslog.conf.5#7 integrate Differences ... ==== //depot/projects/ia64/UPDATING#26 (text+ko) ==== @@ -17,6 +17,15 @@ developers choose to disable these features on build machines to maximize performance. +20021222: + For a period after the GCC 3.2.1 import (from 12/04 to 12/22), GCC + used an incompatible form of ABI for returning structures and unions + which FreeBSD's GCC maintainers were not aware of relative to previous + versions of FreeBSD. We have gone back to the ABI for now, and any + code compiled which is required to interoperate with other code (not + built at the same time) returning structs or unions should be + rebuilt. + 20021216: A name change in /etc/netconfig has been reverted to stay compatible with with suns TIRPC and also with NetBSD. You need @@ -1162,4 +1171,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.230 2002/12/16 22:24:24 mbr Exp $ +$FreeBSD: src/UPDATING,v 1.232 2002/12/22 07:08:14 kan Exp $ ==== //depot/projects/ia64/bin/ps/ps.1#13 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.59 2002/10/24 00:00:57 rwatson Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.60 2002/12/23 16:04:49 ru Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -269,7 +269,7 @@ Marks a process which is in .Xr jail 2 . The hostname of the prison can be found in -.Ql Li /proc//status . +.Ql /proc//status . .It L Marks a process that is waiting to acquire a lock. .It R ==== //depot/projects/ia64/bin/sh/bltin/echo.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)echo.c 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/bltin/echo.c,v 1.11 2002/02/02 06:50:55 imp Exp $ + * $FreeBSD: src/bin/sh/bltin/echo.c,v 1.12 2002/12/22 21:35:14 dwmalone Exp $ */ /* @@ -80,7 +80,7 @@ case 'a': c = '\a'; break; case 'b': c = '\b'; break; case 'c': return 0; /* exit */ - case 'e': c = '\e'; break; + case 'e': c = '\033'; break; case 'f': c = '\f'; break; case 'n': c = '\n'; break; case 'r': c = '\r'; break; ==== //depot/projects/ia64/bin/sh/sh.1#17 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.81 2002/12/17 20:27:48 trhodes Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.82 2002/12/23 15:21:38 ru Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1792,7 +1792,7 @@ is received. The signals are specified by name or number. In addition, the pseudo-signal -.Ic EXIT +.Cm EXIT may be used to specify an action that is performed when the shell terminates. The .Ar action ==== //depot/projects/ia64/contrib/gcc/config/i386/i386.c#8 (text+ko) ==== @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.14 2002/12/04 16:04:26 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.15 2002/12/22 05:57:53 kan Exp $ */ #include "config.h" @@ -1244,7 +1244,6 @@ specifying them, we will set the defaults in override_options. */ if (optimize >= 1) flag_omit_frame_pointer = 2; - flag_pcc_struct_return = 2; flag_asynchronous_unwind_tables = 2; } ==== //depot/projects/ia64/etc/rc#23 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.324 2002/12/18 07:21:30 mckusick Exp $ +# $FreeBSD: src/etc/rc,v 1.326 2002/12/23 07:09:44 dillon Exp $ # # System startup script run by init on autoboot @@ -50,30 +50,49 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin export HOME PATH -# If there is a global system configuration file, suck it in. -# XXX - The only purpose of duplicating it here is to catch rc_ng="YES" +# check_rcng() is run in a subshell solely to determine the +# RCNG mode. We do not want to pollute our variable space +# too soon so the procedure must be run in a subshell. An +# exit code of 3 indicates RCNG is enabled. # -if [ -r /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs -elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf +check_rcng() +{ + if [ -r /etc/defaults/rc.conf ]; then + . /etc/defaults/rc.conf + source_rc_confs + elif [ -r /etc/rc.conf ]; then + . /etc/rc.conf + fi + + # Diskless setups have to depend on a different mechanism since + # their config files haven't been retargeted yet. + # + [ -e /.rcng_yes ] && rc_ng="YES" + case ${rc_ng} in + [Yy][Ee][Ss]) + exit 3 + ;; + *) + exit 0 + ;; + esac +} + +( check_rcng ) +if [ $? = 3 ]; then + rc_ng=YES +else + rc_ng=NO fi -# Diskless setups have to depend on a different mechanism since -# their config files haven't been retargeted yet. -# -[ -e /.rcng_yes ] && rc_ng="YES" - case ${rc_ng} in -[Yy][Ee][Ss]) +YES) . /etc/rc.subr - # Load system configuration files. The 'XXX' is there because - # the function requires an argument that we don't need to use. + # Note: the system configuration files are loaded as part of + # the RCNG system (rc.d/rccond). Do not load them here as it may + # interfere with diskless booting. # - load_rc_config 'XXX' - if [ "$1" = autoboot ]; then autoboot=yes _boot="faststart" @@ -88,13 +107,6 @@ for _rc_elem in ${files}; do run_rc_script ${_rc_elem} ${_boot} - # Local FreeBSD hack to reload the rc.conf on - # a return status of 2 - if [ $? -eq 2 ]; then - unset _rc_conf_loaded - load_rc_config 'XXX' - echo "Reloading rc.conf." - fi done echo '' ==== //depot/projects/ia64/etc/rc.d/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.9 2002/11/09 07:45:53 imp Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.10 2002/12/22 22:25:53 dillon Exp $ .include @@ -12,7 +12,7 @@ mountd moused mroute6d mrouted msgs named network1 network2 \ network3 network_ipv6 nfsclient nfsd nfslocking nfsserver ntpd \ ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \ - rarpd root route6d routed rpcbind rtadvd rwho savecore \ + rarpd rcconf.sh root route6d routed rpcbind rtadvd rwho savecore \ securelevel sendmail serial sppp sshd swap1 syscons sysctl \ syslogd timed ttys usbd vinum virecover ypbind yppasswdd ypserv \ ypset ypupdated ypxfrd ==== //depot/projects/ia64/etc/rc.d/devd#3 (text+ko) ==== @@ -1,8 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devd,v 1.2 2002/11/30 00:40:53 imp Exp $ +# $FreeBSD: src/etc/rc.d/devd,v 1.3 2002/12/22 22:18:41 dillon Exp $ # +# REQUIRE: rcconf # PROVIDE: devd # BEFORE: disks # KEYWORD: FreeBSD ==== //depot/projects/ia64/etc/rc.d/diskless#7 (text+ko) ==== @@ -24,11 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/diskless,v 1.23 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/diskless,v 1.24 2002/12/22 22:18:41 dillon Exp $ # # PROVIDE: diskless -# REQUIRE: initdiskless mountcritlocal +# REQUIRE: initdiskless rcconf mountcritlocal # BEFORE: addswap random # KEYWORD: FreeBSD @@ -42,14 +42,12 @@ # as close as possible between 5-current and 4-stable. # $1 = size # $2 = mount point -# $3 = md unit number (ignored in pre 5.0 systems) -# $4 = (optional) bytes-per-inode -mount_md() -{ - if [ -n "$4" ]; then - bpi="-i $4" +# $3 = (optional) bytes-per-inode +mount_md() { + if [ -n "$3" ]; then + bpi="-i $3" fi - /sbin/mdmfs $bpi -s $1 -M md$3 $2 + /sbin/mdmfs $bpi -s $1 -M md $2 } # If there is a global system configuration file, suck it in. @@ -64,16 +62,36 @@ . /etc/rc.conf fi -echo "+++ mount_md of /var" -mount_md ${varsize:=32m} /var 1 +# If we do not have a writable /var, create a memory +# filesystem for /var. We don't have /usr yet so +# use mkdir instead of touch to test. We want mount +# to record its mounts so we have to make sure /var/db +# exists before doing the mount -a. +# +if (/bin/mkdir /var/.diskless 2> /dev/null); then + rmdir /var/.diskless +else + echo "+++ mount_md of /var" + mount_md ${varsize:=32m} /var +fi + +if [ ! -d /var/db ]; then + mkdir /var/db +fi + +# Now we need the rest of our mounts, particularly /usr +# +mount -a # chown and chgrp are in /usr +# Populate /var +# echo "+++ populate /var using /etc/mtree/BSD.var.dist" -/usr/sbin/mtree -deU -f /etc/mtree/BSD.var.dist -p /var +/usr/sbin/mtree -deU -f /etc/mtree/BSD.var.dist -p /var > /dev/null case ${sendmail_enable} in [Nn][Oo][Nn][Ee]) ;; *) - /usr/sbin/mtree -deU -f /etc/mtree/BSD.sendmail.dist -p / + /usr/sbin/mtree -deU -f /etc/mtree/BSD.sendmail.dist -p / > /dev/null ;; esac @@ -86,34 +104,62 @@ echo "+++ create lastlog" /usr/bin/touch /var/log/lastlog -mount -a # chown and chgrp are in /usr +# Make sure our aliases database is uptodate, the aliases may have +# been overriden in /conf. +# +/usr/bin/newaliases -# Since we are starting with a very fresh /etc on an MFS: -if [ -d /conf/default/etc ]; then - newaliases -fi - -# # XXX make sure to create one dir for each printer as requested by lpd # - -# If /tmp is a symlink, assume it points to somewhere writable, like -# /var/tmp, otherwise, use a small memory filesystem for /tmp. +# If we do not have a writable /tmp, create a memory +# filesystem for /tmp. If /tmp is a symlink (e.g. to /var/tmp, +# then it should already be writable). # -# XXX: mtree runs too early to create any directories needed in /tmp, -# so if /var/tmp == /tmp, then you don't get a vi.recover. -# -if [ ! -L /tmp ]; then - mount_md ${tmpsize:=64m} /tmp 2 - chmod 01777 /tmp +if (/bin/mkdir /tmp/.diskless 2> /dev/null); then + rmdir /tmp/.diskless +else + if [ -h /tmp ]; then + echo "*** /tmp is a symlink to a non-writable area!" + echo "dropping into shell, ^D to continue anyway." + /bin/sh + else + mount_md ${tmpsize:=20480} /tmp + chmod 01777 /tmp + fi fi -if sysctl vfs.devfs.generation > /dev/null 2>&1; then +if sysctl vfs.devfs.generation > /dev/null 2>&1 ; then # we have DEVFS, no worries... true +elif (/bin/mkdir /dev/.diskless 2> /dev/null); then + # if /dev is writable assume it has already been populated + # via rc.diskless1 + # + rmdir /dev/.diskless else - # extract a list of device entries, then copy them to a writable fs (cd /; find -x dev | cpio -o -H newc) > /tmp/dev.tmp - mount_md 4096 /dev 3 512 + mount_md 4096 /dev 512 (cd /; cpio -i -H newc -d < /tmp/dev.tmp) + rm -f /tmp/dev.tmp +fi + +# generate our hostname +# +if [ -z "`hostname -s`" ]; then + hostname=`/usr/bin/kenv dhcp.host-name` + hostname $hostname + echo "Hostname is $hostname" fi + +# if the info is available via dhcp/kenv +# build the resolv.conf +# +if [ ! -e /etc/resolv.conf ]; then + echo domain `/usr/bin/kenv dhcp.domain-name` > /etc/resolv.conf + + set `/usr/bin/kenv dhcp.domain-name-servers` + for ns in `IFS=','; echo $*`; do + echo nameserver $ns >> /etc/resolv.conf; + done +fi + ==== //depot/projects/ia64/etc/rc.d/initdiskless#6 (text+ko) ==== @@ -24,27 +24,64 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.21 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.22 2002/12/22 22:18:41 dillon Exp $ # - # PROVIDE: initdiskless # KEYWORD: FreeBSD + +# On entry to this script the entire system consists of a read-only root +# mounted via NFS. We use the contents of /conf to create and populate +# memory filesystems. The kernel has run BOOTP and configured an interface +# (otherwise it would not have been able to mount the NFS root!) +# +# The following directories are scanned. Each sucessive directory overrides +# (is merged into) the previous one. +# +# /conf/base universal base +# /conf/default modified by a secondary universal base +# /conf/${ipba} modified based on the assigned broadcast IP +# /conf/${ip} modified based on the machine's assigned IP +# +# Each of these directories may contain any number of subdirectories which +# represent directories in / on the diskless machine. The existance of +# these subdirectories causes this script to create a MEMORY FILESYSTEM for +# /. For example, if /conf/base/etc exists then a +# memory filesystem will be created for /etc. +# +# If a subdirectory contains the file 'diskless_remount' the contents of +# the file is used to remount the subdirectory prior to it being copied to +# the memory filesystem. For example, if /conf/base/etc/diskless_remount +# contains the string 'my.server.com:/etc' then my.server.com:/etc will be +# mounted in place of the subdirectory. This allows you to avoid making +# duplicates of system directories in /conf. +# +# If a subdirectory contains the file 'md_size', the contents of the +# file is used to determine the size of the memory filesystem, in 512 +# byte sectors. The default is 8192 (4MB). You only have to specify an +# md_size if the default doesn't work for you (i.e. if it is too big or +# too small). Note that in -current the default is 4096 (2MB). For +# example, /conf/base/etc/md_size might contain '16384'. +# +# If /conf//SUBDIR.cpio.gz exists, the file is cpio'd into +# the specified /SUBDIR (and a memory filesystem is created for /SUBDIR +# if necessary). +# +# If /conf//SUBDIR.remove exists, the file contains a list +# of paths which are rm -rf'd relative to /SUBDIR. +# +# You will almost universally want to create a /conf/base/etc containing +# a diskless_remount and possibly an md_size file. You will then almost +# universally want to override rc.conf, rc.local, and fstab by creating +# /conf/default/etc/{rc.conf,rc.local,fstab}. Your fstab should be sure +# to mount a /usr... typically an NFS readonly /usr. +# +# NOTE! rc.diskless2 will create /var, /tmp, and /dev. Those filesystems +# should not be specified in /conf. At least not yet. + dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` [ ${dlv:=0} -eq 0 ] && exit 0 -# -# BOOTP has mounted / for us. Assume a read-only mount. We must then -# - figure out our IP by querying the interface -# - mount /etc as an MFS -# - populate /etc from /conf/default version -# - override files in /etc with files from /conf/*/etc where -# '*' is default, netmask of client, ip-address of client -# -# The operator is in charge of setting /conf/*/etc/* things as appropriate. -# Typically rc.conf and fstab need to be changed, but possibly also other -# files such as inetd.conf etc. - # chkerr: # # Routine to check for error @@ -52,22 +89,37 @@ # checks error code and drops into shell on failure. # if shell exits, terminates script as well as /etc/rc. # -chkerr() -{ - case $1 in - 0) - ;; - *) - echo "$2 failed: dropping into /bin/sh" - /bin/sh - # RESUME - ;; - esac +chkerr() { + case $1 in + 0) + ;; + *) + echo "$2 failed: dropping into /bin/sh" + /bin/sh + # RESUME + ;; + esac +} + +# Create a generic memory disk +# +mount_md() { + /sbin/mdmfs -i 4096 -s $1 -M md $2 } -mount_md() -{ - /sbin/mdmfs -i 4096 -s $1 -M md$3 $2 +# Create the memory filesystem if it has not already been created +# +create_md() { + if [ "x`eval echo \\$md_created_$1`" = "x" ]; then + if [ "x`eval echo \$md_size_$1`" = "x" ]; then + md_size=4096 + else + md_size=`eval echo \\$md_size_$1` + fi + mount_md $md_size /$1 + /bin/chmod 755 /$1 + eval md_created_$1=created + fi } # DEBUGGING @@ -81,62 +133,91 @@ bootp_ipbca="" iflist=`ifconfig -l` for i in ${iflist} ; do - set `ifconfig ${i}` - while [ $# -ge 1 ] ; do - if [ "${bootp_ifc}" = "" -a "$1" = "inet" ]; then - bootp_ifc=${i} ; bootp_ipa=${2} ; shift - fi - if [ "${bootp_ipbca}" = "" -a "$1" = "broadcast" ]; then - bootp_ipbca=$2; shift - fi - shift - done - if [ "${bootp_ifc}" != "" ]; then - break - fi + set `ifconfig ${i}` + while [ $# -ge 1 ] ; do + if [ "${bootp_ifc}" = "" -a "$1" = "inet" ] ; then + bootp_ifc=${i} ; bootp_ipa=${2} ; shift + fi + if [ "${bootp_ipbca}" = "" -a "$1" = "broadcast" ] ; then + bootp_ipbca=$2; shift + fi + shift + done + if [ "${bootp_ifc}" != "" ] ; then + break + fi done echo "Interface ${bootp_ifc} IP-Address ${bootp_ipa} Broadcast ${bootp_ipbca}" -if [ -z "`hostname -s`" ]; then - hostname=`kenv dhcp.host-name` - hostname $hostname - echo "Hostname is $hostname" -fi - -if [ -d /conf/default/etc ]; then - mount_md 4096 /etc 0 - chkerr $? "MFS mount on /etc" - /bin/chmod 755 /etc - - /bin/cp -Rp /conf/default/etc/* /etc - chkerr $? "cp /conf/default/etc to /etc MFS" -fi - -# Allow for override files to replace files in /etc. Use /conf/*/etc to find -# the override files. First choice is default files that # always override, -# then files that from the directory that matches the client's broadcast -# address, finally followed by overrides that match the client's IP address. +# Resolve templates in /conf/base, /conf/default, /conf/${bootp_ipbca}, +# and /conf/${bootp_ipa}. For each subdirectory found within these +# directories: +# +# - calculate memory filesystem sizes. If the subdirectory (prior to +# NFS remounting) contains the file 'md_size', the contents specified +# in 512 byte sectors will be used to size the memory filesystem. Otherwise +# 8192 sectors (4MB) is used. +# +# - handle NFS remounts. If the subdirectory contains the file +# diskless_remount, the contents of the file is NFS mounted over +# the directory. For example /conf/base/etc/diskless_remount +# might contain 'myserver:/etc'. NFS remounts allow you to avoid +# having to dup your system directories in /conf. Your server must +# be sure to export those filesystems -alldirs, however. # -# This way we have some flexibility to handle clusters of machines on -# separate subnets. +for i in base default ${bootp_ipbca} ${bootp_ipa} ; do + for j in /conf/$i/* ; do + # memory filesystem size specification + # + subdir=${j##*/} + if [ -d $j -a -f $j/md_size ]; then + eval md_size_$subdir=`cat $j/md_size` + fi -for i in ${bootp_ipbca} ${bootp_ipa} ${hostname} ; do - if [ -d /conf/${i}/etc ]; then - cp -Rp /conf/${i}/etc/* /etc + # NFS remount + # + if [ -d $j -a -f $j/diskless_remount ]; then + nfspt=`/bin/cat $j/diskless_remount` + mount_nfs $nfspt $j + chkerr $? "mount_nfs $nfspt $j" fi + done done +# - Create all required MFS filesystems and populate them from +# our templates. Support both a direct template and a dir.cpio.gz +# archive. Support dir.remove files containing a list of relative +# paths to remove. # -# if the info is available via dhcp/kenv -# build the resolv.conf -# -if [ ! -e /etc/resolv.conf ]; then - echo domain `kenv dhcp.domain-name` > /etc/resolv.conf +# TODO: +# + find a way to assign a 'group' identifier to a machine +# so we can use group-specific configurations; - set `kenv dhcp.domain-name-servers` - for ns in `IFS=','; echo $*`; do - echo nameserver $ns >> /etc/resolv.conf; - done -fi +for i in base default ${bootp_ipbca} ${bootp_ipa} ; do + for j in /conf/$i/* ; do + subdir=${j##*/} + if [ -d $j ]; then + create_md $subdir + cp -Rp $j/* /$subdir + fi + done + for j in /conf/$i/*.cpio.gz ; do + subdir=${j%*.cpio.gz} + subdir=${subdir##*/} + if [ -f $j ]; then + create_md $subdir + echo "Loading /$subdir from cpio archive $j" + (cd / ; /stand/gzip -d < $j | /stand/cpio --extract -d ) + fi + done + for j in /conf/$i/*.remove ; do + subdir=${j%*.remove} + subdir=${subdir##*/} + if [ -f $j ]; then + # doubly sure it is a memory disk before rm -rf'ing + create_md $subdir + (cd /$subdir; rm -rf `/bin/cat $j`) + fi + done +done -exit 2 # Tell /etc/rc to re-source rc.conf ==== //depot/projects/ia64/include/limits.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/include/limits.h,v 1.14 2002/10/27 18:03:02 wollman Exp $ + * $FreeBSD: src/include/limits.h,v 1.15 2002/12/22 06:38:44 tjr Exp $ */ #ifndef _LIMITS_H_ @@ -123,6 +123,8 @@ #define NL_TEXTMAX 2048 #endif +#define MB_LEN_MAX 6 /* 31-bit UTF-8 */ + #include #if __POSIX_VISIBLE ==== //depot/projects/ia64/lib/libc/gen/setproctitle.c#4 (text+ko) ==== @@ -16,7 +16,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/setproctitle.c,v 1.16 2002/03/29 22:43:41 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/setproctitle.c,v 1.17 2002/12/21 22:04:50 bbraun Exp $"); #include "namespace.h" #include @@ -62,11 +62,11 @@ setproctitle(const char *fmt, ...) { static struct ps_strings *ps_strings; - static char buf[SPT_BUFSIZE]; - static char obuf[SPT_BUFSIZE]; + static char *buf = NULL; + static char *obuf = NULL; static char **oargv, *kbuf; static int oargc = -1; - static char *nargv[2] = { buf, NULL }; + static char *nargv[2] = { NULL, NULL }; char **nargvp; int nargc; int i; @@ -75,10 +75,23 @@ unsigned long ul_ps_strings; int oid[4]; + if (buf == NULL) { + buf = malloc(SPT_BUFSIZE); + if (buf == NULL) + return; + nargv[0] = buf; + } + + if (obuf == NULL ) { + obuf = malloc(SPT_BUFSIZE); + if (obuf == NULL) + return; + } + va_start(ap, fmt); if (fmt) { - buf[sizeof(buf) - 1] = '\0'; + buf[SPT_BUFSIZE - 1] = '\0'; if (fmt[0] == '-') { /* skip program name prefix */ @@ -86,12 +99,12 @@ len = 0; } else { /* print program name heading for grep */ - (void)snprintf(buf, sizeof(buf), "%s: ", _getprogname()); + (void)snprintf(buf, SPT_BUFSIZE, "%s: ", _getprogname()); len = strlen(buf); } /* print the argument string */ - (void) vsnprintf(buf + len, sizeof(buf) - len, fmt, ap); + (void) vsnprintf(buf + len, SPT_BUFSIZE - len, fmt, ap); nargvp = nargv; nargc = 1; @@ -140,12 +153,12 @@ oargc = i; break; } - snprintf(obuf + len, sizeof(obuf) - len, "%s%s", + snprintf(obuf + len, SPT_BUFSIZE - len, "%s%s", len ? " " : "", oargv[i]); if (len) len++; len += strlen(oargv[i]); - if (len >= sizeof(obuf)) + if (len >= SPT_BUFSIZE) break; } } @@ -155,7 +168,7 @@ /* style #2 - we can only restore our first arg :-( */ if (*obuf == '\0') strncpy(obuf, OLD_PS_STRINGS->old_ps_argvstr, - sizeof(obuf) - 1); + SPT_BUFSIZE - 1); OLD_PS_STRINGS->old_ps_nargvstr = 1; OLD_PS_STRINGS->old_ps_argvstr = nargvp[0]; } ==== //depot/projects/ia64/lib/libc/i386/stdlib/div.S#5 (text+ko) ==== @@ -1,19 +1,41 @@ /* - * Written by J.T. Conklin . - * Public domain. + * Copyright (c) 1993 Winning Strategies, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Winning Strategies, Inc. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/div.S,v 1.9 2002/12/21 05:11:39 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/div.S,v 1.10 2002/12/22 06:41:09 kan Exp $"); ENTRY(div) - pushl %ebx - movl 8(%esp),%ebx - movl 12(%esp),%eax - movl 16(%esp),%ecx - cdq - idiv %ecx - movl %eax,(%ebx) - movl %edx,4(%ebx) - popl %ebx - ret $4 + movl 4(%esp),%eax + movl 8(%esp),%ecx + cdq + idiv %ecx + movl %eax,4(%esp) + movl %edx,8(%esp) + ret ==== //depot/projects/ia64/lib/libc/i386/stdlib/ldiv.S#5 (text+ko) ==== @@ -1,19 +1,41 @@ /* - * Written by J.T. Conklin . - * Public domain. + * Copyright (c) 1993 Winning Strategies, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 3:18:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9495537B405; Tue, 24 Dec 2002 03:18:36 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B97B37B401 for ; Tue, 24 Dec 2002 03:18:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D66E543EEC for ; Tue, 24 Dec 2002 03:18:35 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBOBIZfh066326 for ; Tue, 24 Dec 2002 03:18:35 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBOBIZIO066323 for perforce@freebsd.org; Tue, 24 Dec 2002 03:18:35 -0800 (PST) Date: Tue, 24 Dec 2002 03:18:35 -0800 (PST) Message-Id: <200212241118.gBOBIZIO066323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22703 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22703 Change 22703 by marcel@marcel_nfs on 2002/12/24 03:18:28 Bump the interrupt count. On the HP rx2600 we have sio2 on interrupt 82. With only room for 64 interrupts we were corrupting the interrupt counters for interrupts 27, 28 and 29. We now have room for 128 interrupts. Deal with the fact that we now have 3 digit interrupt numbers. While here, replace "intr" with a single hash mark. It helps a modified vmstat that also shows interrupt sources that don't have any interrupts yet... Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/locore.s#10 edit .. //depot/projects/ia64/sys/ia64/include/intrcnt.h#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/locore.s#10 (text+ko) ==== @@ -360,9 +360,11 @@ .byte 0 intr_n = 0 .rept INTRCNT_COUNT - 1 - .ascii "intr " - .byte intr_n / 10 + '0, intr_n % 10 + '0 - .fill INTRNAME_LEN - 5 - 2 - 1, 1, ' ' + .ascii "#" + .byte intr_n / 100 + '0 + .byte (intr_n % 100) / 10 + '0 + .byte intr_n % 10 + '0 + .fill INTRNAME_LEN - 1 - 3 - 1, 1, ' ' .byte 0 intr_n = intr_n + 1 .endr ==== //depot/projects/ia64/sys/ia64/include/intrcnt.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ #define INTRCNT_ISA_IRQ (INTRCNT_CLOCK + 1) #define INTRCNT_ISA_IRQ_LEN 16 #define INTRCNT_OTHER_BASE (INTRCNT_ISA_IRQ + INTRCNT_ISA_IRQ_LEN) -#define INTRCNT_OTHER_LEN 48 +#define INTRCNT_OTHER_LEN 112 #define INTRCNT_COUNT (INTRCNT_OTHER_BASE + INTRCNT_OTHER_LEN) /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 9:38:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F11AA37B405; Tue, 24 Dec 2002 09:38:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A77937B401 for ; Tue, 24 Dec 2002 09:38:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 240AE43E4A for ; Tue, 24 Dec 2002 09:38:19 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBOHcIfh001708 for ; Tue, 24 Dec 2002 09:38:18 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBOHcISk001705 for perforce@freebsd.org; Tue, 24 Dec 2002 09:38:18 -0800 (PST) Date: Tue, 24 Dec 2002 09:38:18 -0800 (PST) Message-Id: <200212241738.gBOHcISk001705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 22710 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22710 Change 22710 by tzukanov@tzukanov_antares on 2002/12/24 09:37:34 Post-IFC fixes. Affected files ... .. //depot/projects/s390/lib/libc/s390/gen/infinity.c#3 edit .. //depot/projects/s390/lib/libc/s390/sys/s390_sysinfo.c#2 edit .. //depot/projects/s390/sys/s390/include/sysarch.h#2 edit .. //depot/projects/s390/sys/s390/s390/pmap.c#5 edit .. //depot/projects/s390/sys/s390/s390/sys_machdep.c#2 edit .. //depot/projects/s390/sys/s390/s390/vm_machdep.c#4 edit .. //depot/projects/s390/sys/s390x/include/sysarch.h#2 edit Differences ... ==== //depot/projects/s390/lib/libc/s390/gen/infinity.c#3 (text+ko) ==== @@ -1,4 +1,6 @@ /* $FreeBSD: src/lib/libc/s390/gen/fabs.S,v 1.0 2002/03/23 02:44:18 tzukanov Exp $ */ +#include + /* Bytes for +Infinity on a S/390. */ const union __infinity_un __infinity = {{0x7f, 0xf0, 0, 0, 0, 0, 0, 0}}; ==== //depot/projects/s390/lib/libc/s390/sys/s390_sysinfo.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ int s390_sysinfo(unsigned int r0, unsigned int r1, void *buf) { - struct s390_sysarch_args p; + struct s390_sysinfo_args p; p.r0 = r0; p.r1 = r1; ==== //depot/projects/s390/sys/s390/include/sysarch.h#2 (text+ko) ==== @@ -15,16 +15,16 @@ #define S390_SYSINFO 0 struct s390_sysinfo_args { - u_int r0; - u_int r1; - void *buf; + unsigned int r0; + unsigned int r1; + void *buf; }; #ifndef _KERNEL #include __BEGIN_DECLS -int s390_sysinfo(u_int, u_int, void *buf); +int s390_sysinfo(unsigned int, unsigned int, void *buf); __END_DECLS #endif /* !_KERNEL */ ==== //depot/projects/s390/sys/s390/s390/pmap.c#5 (text+ko) ==== ==== //depot/projects/s390/sys/s390/s390/sys_machdep.c#2 (text+ko) ==== ==== //depot/projects/s390/sys/s390/s390/vm_machdep.c#4 (text+ko) ==== @@ -121,7 +121,7 @@ } void -cpu_thread_dtor(struct thread *td) +cpu_thread_clean(struct thread *td) { } @@ -168,6 +168,7 @@ void cpu_set_upcall_kse(struct thread *td, struct kse *ke) { + cpu_thread_clean(td); suword(&td->td_frame->tf_gpr[2], (u_long)ke->ke_mailbox); } ==== //depot/projects/s390/sys/s390x/include/sysarch.h#2 (text+ko) ==== @@ -15,16 +15,16 @@ #define S390X_SYSINFO 0 struct s390x_sysinfo_args { - u_int r0; - u_int r1; - void *buf; + unsigned int r0; + unsigned int r1; + void *buf; }; #ifndef _KERNEL #include __BEGIN_DECLS -int s390x_sysinfo(u_int, u_int, void *buf); +int s390x_sysinfo(unsigned int, unsigned int, void *buf); __END_DECLS #endif /* !_KERNEL */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 11:46:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AC3437B405; Tue, 24 Dec 2002 11:46:56 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7E6A37B401 for ; Tue, 24 Dec 2002 11:46:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 290E943EA9 for ; Tue, 24 Dec 2002 11:46:55 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBOJksfh047876 for ; Tue, 24 Dec 2002 11:46:54 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBOJksir047873 for perforce@freebsd.org; Tue, 24 Dec 2002 11:46:54 -0800 (PST) Date: Tue, 24 Dec 2002 11:46:54 -0800 (PST) Message-Id: <200212241946.gBOJksir047873@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 Subject: PERFORCE change 22712 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22712 Change 22712 by rwatson@rwatson_paprika on 2002/12/24 11:46:05 Expunge vop_refreshlabel() definition; it is no longer used. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vnode_if.src#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vnode_if.src#14 (text+ko) ==== @@ -581,15 +581,6 @@ }; # -#% refreshlabel vp L L L -# -vop_refreshlabel { - IN struct vnode *vp; - IN struct ucred *cred; - IN struct thread *td; -}; - -# #% setlabel vp L L L # vop_setlabel { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 13:26: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 887FB37B405; Tue, 24 Dec 2002 13:26:00 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F8BD37B401 for ; Tue, 24 Dec 2002 13:26:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B223743EC2 for ; Tue, 24 Dec 2002 13:25:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBOLPxfh083460 for ; Tue, 24 Dec 2002 13:25:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBOLPxEb083457 for perforce@freebsd.org; Tue, 24 Dec 2002 13:25:59 -0800 (PST) Date: Tue, 24 Dec 2002 13:25:59 -0800 (PST) Message-Id: <200212242125.gBOLPxEb083457@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 Subject: PERFORCE change 22718 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22718 Change 22718 by rwatson@rwatson_paprika on 2002/12/24 13:25:23 Instrument and authorized swapoff event. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#371 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#193 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#115 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#91 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#225 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#179 edit .. //depot/projects/trustedbsd/mac/sys/vm/vm_swap.c#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#371 (text+ko) ==== @@ -2693,6 +2693,20 @@ } int +mac_check_system_swapoff(struct ucred *cred, struct vnode *vp) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_check_system_swapoff"); + + if (!mac_enforce_system) + return (0); + + MAC_CHECK(check_system_swapoff, cred, vp, &vp->v_label); + return (error); +} + +int mac_check_system_sysctl(struct ucred *cred, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) { ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#193 (text+ko) ==== @@ -1959,6 +1959,26 @@ } static int +mac_biba_check_system_swapoff(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_biba *subj, *obj; + int error; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + error = mac_biba_subject_privileged(subj); + if (error) + return (error); + + return (0); +} + +static int mac_biba_check_system_sysctl(struct ucred *cred, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) { @@ -2691,6 +2711,7 @@ .mpo_check_system_acct = mac_biba_check_system_acct, .mpo_check_system_settime = mac_biba_check_system_settime, .mpo_check_system_swapon = mac_biba_check_system_swapon, + .mpo_check_system_swapoff = mac_biba_check_system_swapoff, .mpo_check_system_sysctl = mac_biba_check_system_sysctl, .mpo_check_vnode_access = mac_biba_check_vnode_open, .mpo_check_vnode_chdir = mac_biba_check_vnode_chdir, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#115 (text+ko) ==== @@ -700,6 +700,14 @@ } static int +mac_none_check_system_swapoff(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (0); +} + +static int mac_none_check_system_sysctl(struct ucred *cred, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) { @@ -1066,6 +1074,7 @@ .mpo_check_system_reboot = mac_none_check_system_reboot, .mpo_check_system_settime = mac_none_check_system_settime, .mpo_check_system_swapon = mac_none_check_system_swapon, + .mpo_check_system_swapoff = mac_none_check_system_swapoff, .mpo_check_system_sysctl = mac_none_check_system_sysctl, .mpo_check_vnode_access = mac_none_check_vnode_access, .mpo_check_vnode_chdir = mac_none_check_vnode_chdir, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#91 (text+ko) ==== @@ -1096,6 +1096,14 @@ } static int +mac_test_check_system_swapoff(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (0); +} + +static int mac_test_check_system_sysctl(struct ucred *cred, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) { @@ -1463,6 +1471,7 @@ .mpo_check_system_reboot = mac_test_check_system_reboot, .mpo_check_system_settime = mac_test_check_system_settime, .mpo_check_system_swapon = mac_test_check_system_swapon, + .mpo_check_system_swapoff = mac_test_check_system_swapoff, .mpo_check_system_sysctl = mac_test_check_system_sysctl, .mpo_check_vnode_access = mac_test_check_vnode_access, .mpo_check_vnode_chdir = mac_test_check_vnode_chdir, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#225 (text+ko) ==== @@ -270,6 +270,7 @@ int mac_check_system_reboot(struct ucred *cred, int howto); int mac_check_system_settime(struct ucred *cred); int mac_check_system_swapon(struct ucred *cred, struct vnode *vp); +int mac_check_system_swapoff(struct ucred *cred, struct vnode *vp); int mac_check_system_sysctl(struct ucred *cred, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#179 (text+ko) ==== @@ -330,6 +330,8 @@ int (*mpo_check_system_settime)(struct ucred *cred); int (*mpo_check_system_swapon)(struct ucred *cred, struct vnode *vp, struct label *label); + int (*mpo_check_system_swapoff)(struct ucred *cred, + struct vnode *vp, struct label *label); int (*mpo_check_system_sysctl)(struct ucred *cred, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen); ==== //depot/projects/trustedbsd/mac/sys/vm/vm_swap.c#16 (text+ko) ==== @@ -422,6 +422,14 @@ error = EINVAL; goto done; found: +#ifdef MAC + (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + error = mac_check_system_swapoff(td->td_ucred, vp); + (void) VOP_UNLOCK(vp, 0, td); + if (error != 0) + goto done; +#endif + nblks = sp->sw_nblks; /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 14: 6:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E94C37B405; Tue, 24 Dec 2002 14:06:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 136BA37B401 for ; Tue, 24 Dec 2002 14:06:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A198C43EA9 for ; Tue, 24 Dec 2002 14:06:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBOM6nfh097668 for ; Tue, 24 Dec 2002 14:06:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBOM6m4M097665 for perforce@freebsd.org; Tue, 24 Dec 2002 14:06:48 -0800 (PST) Date: Tue, 24 Dec 2002 14:06:48 -0800 (PST) Message-Id: <200212242206.gBOM6m4M097665@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 Subject: PERFORCE change 22719 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22719 Change 22719 by rwatson@rwatson_paprika on 2002/12/24 14:06:46 Instrument and authorize sysarch(), the platform-dependent service access system call. Perform authorization only for sysarch() calls that require suser privilege, since those are the ones we're most interested in right now. Affected files ... .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/sys_machdep.c#7 edit .. //depot/projects/trustedbsd/mac/sys/i386/i386/sys_machdep.c#8 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#372 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#194 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#116 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#92 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#226 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#180 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/sys_machdep.c#7 (text+ko) ==== @@ -35,9 +35,12 @@ * */ +#include "opt_mac.h" + #include #include #include +#include #include #include #include @@ -114,6 +117,12 @@ if (error) return (error); +#ifdef MAC + error = mac_check_sysarch_ioperm(td->td_ucred)); + if (error) + return (error); +#endif + error = securelevel_gt(td->td_ucred, 0); if (error) return (error); ==== //depot/projects/trustedbsd/mac/sys/i386/i386/sys_machdep.c#8 (text+ko) ==== @@ -36,10 +36,12 @@ */ #include "opt_kstack_pages.h" +#include "opt_mac.h" #include #include #include +#include #include #include #include @@ -183,6 +185,10 @@ if ((error = copyin(args, &ua, sizeof(struct i386_ioperm_args))) != 0) return (error); +#ifdef MAC + if ((error = mac_check_sysarch_ioperm(td->td_ucred)) != 0) + return (error); +#endif if ((error = suser(td)) != 0) return (error); if ((error = securelevel_gt(td->td_ucred, 0)) != 0) ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#372 (text+ko) ==== @@ -2622,6 +2622,18 @@ } int +mac_check_sysarch_ioperm(struct ucred *cred) +{ + int error; + + if (!mac_enforce_system) + return (0); + + MAC_CHECK(check_sysarch_ioperm, cred); + return (error); +} + +int mac_check_system_acct(struct ucred *cred, struct vnode *vp) { int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#194 (text+ko) ==== @@ -1892,6 +1892,24 @@ } static int +mac_biba_check_sysarch_ioperm(struct ucred *cred) +{ + struct mac_biba *subj; + int error; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + + error = mac_biba_subject_privileged(subj); + if (error) + return (error); + + return (0); +} + +static int mac_biba_check_system_acct(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -2708,6 +2726,7 @@ .mpo_check_socket_deliver = mac_biba_check_socket_deliver, .mpo_check_socket_relabel = mac_biba_check_socket_relabel, .mpo_check_socket_visible = mac_biba_check_socket_visible, + .mpo_check_sysarch_ioperm = mac_biba_check_sysarch_ioperm, .mpo_check_system_acct = mac_biba_check_system_acct, .mpo_check_system_settime = mac_biba_check_system_settime, .mpo_check_system_swapon = mac_biba_check_system_swapon, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#116 (text+ko) ==== @@ -670,6 +670,13 @@ } static int +mac_none_check_sysarch_ioperm(struct ucred *cred) +{ + + return (0); +} + +static int mac_none_check_system_acct(struct ucred *cred, struct vnode *vp, struct label *vlabel) { @@ -1070,6 +1077,7 @@ .mpo_check_socket_listen = mac_none_check_socket_listen, .mpo_check_socket_relabel = mac_none_check_socket_relabel, .mpo_check_socket_visible = mac_none_check_socket_visible, + .mpo_check_sysarch_ioperm = mac_none_check_sysarch_ioperm, .mpo_check_system_acct = mac_none_check_system_acct, .mpo_check_system_reboot = mac_none_check_system_reboot, .mpo_check_system_settime = mac_none_check_system_settime, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#92 (text+ko) ==== @@ -1066,6 +1066,13 @@ } static int +mac_test_check_sysarch_ioperm(struct ucred *cred) +{ + + return (0); +} + +static int mac_test_check_system_acct(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1467,6 +1474,7 @@ .mpo_check_socket_listen = mac_test_check_socket_listen, .mpo_check_socket_relabel = mac_test_check_socket_relabel, .mpo_check_socket_visible = mac_test_check_socket_visible, + .mpo_check_sysarch_ioperm = mac_test_check_sysarch_ioperm, .mpo_check_system_acct = mac_test_check_system_acct, .mpo_check_system_reboot = mac_test_check_system_reboot, .mpo_check_system_settime = mac_test_check_system_settime, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#226 (text+ko) ==== @@ -265,6 +265,7 @@ int mac_check_socket_receive(struct ucred *cred, struct socket *so); int mac_check_socket_send(struct ucred *cred, struct socket *so); int mac_check_socket_visible(struct ucred *cred, struct socket *so); +int mac_check_sysarch_ioperm(struct ucred *cred); int mac_check_system_acct(struct ucred *cred, struct vnode *vp); int mac_check_system_nfsd(struct ucred *cred); int mac_check_system_reboot(struct ucred *cred, int howto); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#180 (text+ko) ==== @@ -323,6 +323,7 @@ struct socket *so, struct label *socketlabel); int (*mpo_check_socket_visible)(struct ucred *cred, struct socket *so, struct label *socketlabel); + int (*mpo_check_sysarch_ioperm)(struct ucred *cred); int (*mpo_check_system_acct)(struct ucred *cred, struct vnode *vp, struct label *vlabel); int (*mpo_check_system_nfsd)(struct ucred *cred); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 14:24:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2BF237B405; Tue, 24 Dec 2002 14:24:12 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DC7C37B401 for ; Tue, 24 Dec 2002 14:24:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13DA943EA9 for ; Tue, 24 Dec 2002 14:24:12 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBOMOBfh004845 for ; Tue, 24 Dec 2002 14:24:11 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBOMOB95004842 for perforce@freebsd.org; Tue, 24 Dec 2002 14:24:11 -0800 (PST) Date: Tue, 24 Dec 2002 14:24:11 -0800 (PST) Message-Id: <200212242224.gBOMOB95004842@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 Subject: PERFORCE change 22720 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22720 Change 22720 by rwatson@rwatson_paprika on 2002/12/24 14:23:25 Integrate cp(1) and mv(1) to merge Chris Faulhaber's ACL support. Affected files ... .. //depot/projects/trustedbsd/acl/bin/cp/Makefile#1 branch .. //depot/projects/trustedbsd/acl/bin/cp/cp.1#1 branch .. //depot/projects/trustedbsd/acl/bin/cp/cp.c#1 branch .. //depot/projects/trustedbsd/acl/bin/cp/extern.h#1 branch .. //depot/projects/trustedbsd/acl/bin/cp/utils.c#1 branch .. //depot/projects/trustedbsd/acl/bin/mv/Makefile#1 branch .. //depot/projects/trustedbsd/acl/bin/mv/mv.1#1 branch .. //depot/projects/trustedbsd/acl/bin/mv/mv.c#1 branch .. //depot/projects/trustedbsd/acl/bin/mv/pathnames.h#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 14:26:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E9CC37B405; Tue, 24 Dec 2002 14:26:16 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1A7837B401 for ; Tue, 24 Dec 2002 14:26:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4668943E4A for ; Tue, 24 Dec 2002 14:26:15 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBOMQFfh004933 for ; Tue, 24 Dec 2002 14:26:15 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBOMQE5m004930 for perforce@freebsd.org; Tue, 24 Dec 2002 14:26:14 -0800 (PST) Date: Tue, 24 Dec 2002 14:26:14 -0800 (PST) Message-Id: <200212242226.gBOMQE5m004930@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 Subject: PERFORCE change 22721 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22721 Change 22721 by rwatson@rwatson_paprika on 2002/12/24 14:25:44 Apply Chris Faulhaber's ACL patches for mv(1). These changes preserve ACLs across cross-file system move operations. Affected files ... .. //depot/projects/trustedbsd/acl/bin/mv/Makefile#2 edit .. //depot/projects/trustedbsd/acl/bin/mv/mv.c#2 edit Differences ... ==== //depot/projects/trustedbsd/acl/bin/mv/Makefile#2 (text+ko) ==== @@ -3,4 +3,6 @@ PROG= mv +CFLAGS+=-DWANT_ACL + .include ==== //depot/projects/trustedbsd/acl/bin/mv/mv.c#2 (text+ko) ==== @@ -49,6 +49,9 @@ __FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.39 2002/07/09 17:45:13 johan Exp $"); #include +#ifdef WANT_ACL +#include +#endif #include #include #include @@ -242,6 +245,9 @@ int fastcopy(char *from, char *to, struct stat *sbp) { +#ifdef WANT_ACL + acl_t acc_acl, def_acl; +#endif struct timeval tval[2]; static u_int blen; static char *bp; @@ -283,6 +289,19 @@ (void)close(to_fd); return (1); } +#ifdef WANT_ACL + /* retrieve the access ACL */ + acc_acl = acl_get_file(from, ACL_TYPE_ACCESS); + if (acc_acl == NULL && errno != EOPNOTSUPP) + warn("%s: get access acl", from); + if (S_ISDIR(sbp->st_mode)) { + /* retrieve the default ACL */ + def_acl = acl_get_file(from, ACL_TYPE_DEFAULT); + if (def_acl == NULL && errno != EOPNOTSUPP) + warn("%s: get access acl", from); + } else + def_acl = NULL; +#endif (void)close(from_fd); oldmode = sbp->st_mode & ALLPERMS; @@ -298,6 +317,26 @@ } if (fchmod(to_fd, sbp->st_mode)) warn("%s: set mode (was: 0%03o)", to, oldmode); +#ifdef WANT_ACL + if (acc_acl) { + /* set the access ACL */ + if (acl_set_fd(to_fd, acc_acl) == -1 && errno != EOPNOTSUPP) + warn("%s: set access acl", to); + acl_free(acc_acl); + } + if (S_ISDIR(sbp->st_mode)) { + /* retrieve the default ACL */ + def_acl = acl_get_file(from, ACL_TYPE_DEFAULT); + if (def_acl) { + /* set the default ACL */ + if (acl_set_file(to, ACL_TYPE_DEFAULT, def_acl) == -1 && + errno != EOPNOTSUPP) + warn("%s: set default acl", to); + acl_free(def_acl); + } else if (errno != EOPNOTSUPP) + warn("%s: get default acl", from); + } +#endif /* * XXX * NFS doesn't support chflags; ignore errors unless there's reason To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 15:18:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73EFE37B405; Tue, 24 Dec 2002 15:18:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B1FA37B401 for ; Tue, 24 Dec 2002 15:18:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E27643EC2 for ; Tue, 24 Dec 2002 15:18:19 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBONIJfh022655 for ; Tue, 24 Dec 2002 15:18:19 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBONIIEl022652 for perforce@freebsd.org; Tue, 24 Dec 2002 15:18:18 -0800 (PST) Date: Tue, 24 Dec 2002 15:18:18 -0800 (PST) Message-Id: <200212242318.gBONIIEl022652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22723 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22723 Change 22723 by marcel@marcel_vaio on 2002/12/24 15:17:56 Revise the revised interface to sioprobe/sioattach. In order to have a centralized function that handles detachment, we need to have the rid, type and resource pointer for the address of the UART. We now store it in the softc. Consequently, we don't have to do all the work in the bus specific front-ends. As such, the bus specific front-ends only have to define the addr_rid, addr_type and addr_res fields and sioprobe will do the rest. Note that the allocation of the resource is kept in the bus specific front-end because we may need to try a couple of times before it works (see sio_isa.c). The bus specific attachment routines are simple stubs again. The same applies to the detachment routines. Have the softc point back to the device to de-weird-ify the siodescribe prototype. Remove the no_irq flag for now. It was only used to initialize the poll field. We can use irq_res for that as well. Some other cleanups like removal of unused fields and reordering of the bus specific routines. Only sio_ebus.c has not been verified to at least compile. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#27 edit .. //depot/projects/ia64/sys/dev/sio/sio_ebus.c#6 edit .. //depot/projects/ia64/sys/dev/sio/sio_isa.c#13 edit .. //depot/projects/ia64/sys/dev/sio/sio_pccard.c#8 edit .. //depot/projects/ia64/sys/dev/sio/sio_pci.c#12 edit .. //depot/projects/ia64/sys/dev/sio/sio_puc.c#7 edit .. //depot/projects/ia64/sys/dev/sio/siovar.h#13 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#27 (text+ko) ==== @@ -450,10 +450,11 @@ ttwakeup(com->tp); ttwwakeup(com->tp); } - if (com->irqres) { - bus_teardown_intr(dev, com->irqres, com->cookie); - bus_release_resource(dev, SYS_RES_IRQ, 0, com->irqres); + if (com->irq_res) { + bus_teardown_intr(dev, com->irq_res, com->irq_cookie); + bus_release_resource(dev, SYS_RES_IRQ, 0, com->irq_res); } + bus_release_resource(dev, com->addr_type, com->addr_rid, com->addr_res); for (i = 0 ; i < 6; i++) destroy_dev(com->devs[i]); if (com->ibuf != NULL) @@ -476,17 +477,38 @@ } com = (struct com_s *)device_get_softc(dev); + com->bsh = rman_get_bushandle(com->addr_res); + com->bst = rman_get_bustag(com->addr_res); - /* Check if we're probing what could be the console. */ + /* + * Check if we're probing what could be the console. If so, we'll + * switch to the static sio_console struct so that if we have a + * serial console we have all the state information. We assume that + * at this time the bus specific front-ends only defined addr_type, + * addr_rid and addr_res. + */ if (com->bst == sio_console.bst && com->bsh == sio_console.bsh) { + sio_console.addr_res = com->addr_res; + sio_console.addr_rid = com->addr_rid; + sio_console.addr_type = com->addr_type; + device_set_softc(dev, &sio_console); com = &sio_console; - device_set_softc(dev, com); } + com->dev = dev; + + /* + * Perform rudimentary sanity checking and specific initialization + * for non-console devices. We expect that the console device has + * had the sanity checking and that the fields we initialize here + * are set correctly for the console. + */ if (com->consdev == NULL) { - /* Perform rudimentary sanity checking. */ - if (sioprobe1(com)) + if (sioprobe1(com)) { + bus_release_resource(dev, com->addr_type, + com->addr_rid, com->addr_res); return (ENXIO); + } if (com->rclk == 0) com->rclk = DEFAULT_RCLK; @@ -502,9 +524,14 @@ if (COM_LLCONSOLE(flags)) { device_printf(dev, "reserved for low-level i/o\n"); + /* + * Don't release the address resource! We don't want it to be + * taken by other drivers. + */ return (ENXIO); } + bus_release_resource(dev, com->addr_type, com->addr_rid, com->addr_res); return (0); } @@ -516,6 +543,13 @@ u_int flags; com = device_get_softc(dev); + + /* Assume addr_rid and addr_type are still valid (set by probe). */ + com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid, + 0, ~0, 8, RF_ACTIVE); + if (com->addr_res == NULL) + return (ENXIO); + flags = device_get_flags(dev); unit = device_get_unit(dev); @@ -543,7 +577,6 @@ com->unit = unit; com->dtr_wait = 3 * hz; com->loses_outints = COM_LOSESOUTINTS(flags) != 0; - com->no_irq = bus_get_resource(dev, SYS_RES_IRQ, 0, NULL, NULL) != 0; com->obufs[0].l_head = com->obuf1; com->obufs[1].l_head = com->obuf2; @@ -574,6 +607,8 @@ if (siosetwater(com, com->it_in.c_ispeed) != 0) { mtx_unlock_spin(&sio_lock); + bus_release_resource(dev, com->addr_type, com->addr_rid, + com->addr_res); return (ENOMEM); } @@ -590,6 +625,7 @@ swi_add(&clk_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, &sio_slow_ih); } + minorbase = UNIT_TO_MINOR(unit); com->devs[0] = make_dev(&sio_cdevsw, minorbase, UID_ROOT, GID_WHEEL, 0600, "ttyd%r", unit); @@ -605,37 +641,43 @@ com->devs[5] = make_dev(&sio_cdevsw, minorbase | CALLOUT_MASK | CONTROL_LOCK_STATE, UID_UUCP, GID_DIALER, 0660, "cuala%r", unit); + com->flags = flags; com->pps.ppscap = PPS_CAPTUREASSERT | PPS_CAPTURECLEAR; pps_init(&com->pps); rid = 0; - com->irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0ul, ~0ul, 1, + com->irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0ul, ~0ul, 1, RF_ACTIVE); - if (com->irqres) { - ret = BUS_SETUP_INTR(device_get_parent(dev), dev, com->irqres, - INTR_TYPE_TTY | INTR_FAST, - siointr, com, &com->cookie); + if (com->irq_res) { + ret = BUS_SETUP_INTR(device_get_parent(dev), dev, com->irq_res, + INTR_TYPE_TTY | INTR_FAST, siointr, com, &com->irq_cookie); if (ret) { ret = BUS_SETUP_INTR(device_get_parent(dev), dev, - com->irqres, INTR_TYPE_TTY, - siointr, com, &com->cookie); + com->irq_res, INTR_TYPE_TTY, siointr, com, + &com->irq_cookie); if (ret == 0) - device_printf(dev, "unable to activate interrupt in fast mode - using normal mode\n"); + device_printf(dev, + "unable to activate interrupt in fast mode - using normal mode\n"); } - if (ret) + if (ret) { device_printf(dev, "could not activate interrupt\n"); -#if defined(DDB) && (defined(BREAK_TO_DEBUGGER) || \ - defined(ALT_BREAK_TO_DEBUGGER)) - /* - * Enable interrupts for early break-to-debugger support - * on the console. - */ - if (ret == 0 && com->consdev != NULL) - sio_setreg(com, com_ier, IER_ERXRDY | IER_ERLS | - IER_EMSC); + bus_release_resource(dev, SYS_RES_IRQ, rid, + com->irq_res); + com->irq_res = NULL; + } + } + +#if defined(DDB) +#if defined(BREAK_TO_DEBUGGER) || defined(ALT_BREAK_TO_DEBUGGER) + /* + * Enable interrupts for early break-to-debugger support + * on the console. + */ + if (com->irq_res != NULL && com->consdev != NULL) + sio_setreg(com, com_ier, IER_ERXRDY | IER_ERLS | IER_EMSC); #endif - } +#endif /* DDB */ return (0); } @@ -721,7 +763,7 @@ tp->t_termios = mynor & CALLOUT_MASK ? com->it_out : com->it_in; (void)commctl(com, TIOCM_DTR | TIOCM_RTS, DMSET); - com->poll = com->no_irq; + com->poll = (com->irq_res == NULL) ? 1 : 0; com->poll_output = com->loses_outints; ++com->wopeners; error = comparam(tp, &tp->t_termios); ==== //depot/projects/ia64/sys/dev/sio/sio_ebus.c#6 (text+ko) ==== @@ -61,8 +61,6 @@ sizeof(struct com_s), }; -DRIVER_MODULE(sio, ebus, sio_ebus_driver, sio_devclass, 0, 0); - /* Needed for EBus attach and sparc64 console support */ char *sio_ofw_names[] = { "serial", @@ -94,13 +92,10 @@ } static int -sio_ebus_probe(dev) - device_t dev; +sio_ebus_probe(device_t dev) { struct com_s *com; - struct resource *res; char *n; - int error, rid; n = ebus_get_name(dev); if (!sio_ofw_inlist(n, sio_ofw_names) && (strcmp(n, "serial") != 0 || @@ -108,34 +103,20 @@ return (ENXIO); com = device_get_softc(dev); - rid = 0; - res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, - RF_ACTIVE); - if (res == NULL) + com->addr_rid = 0; + com->addr_type = SYS_RES_IOPORT; + com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid, + 0, ~0, 8, RF_ACTIVE); + if (com->addr_res == NULL) return (ENXIO); - com->bsh = rman_get_bushandle(res); - com->bst = rman_get_bustag(res); - error = sioprobe(dev); - bus_release_resource(dev, SYS_RES_IOPORT, rid, res); - return (error); + return (sioprobe(dev)); } static int -sio_ebus_attach(dev) - device_t dev; +sio_ebus_attach(device_t dev) { - struct com_s *com; - struct resource *res; - int error, rid; - com = device_get_softc(dev); - rid = 0; - res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, - RF_ACTIVE); - if (res == NULL) - return (ENXIO); - error = sioattach(dev); - if (error) - bus_release_resource(dev, SYS_RES_IOPORT, rid, res); - return (error); + return (sioattach(dev)); } + +DRIVER_MODULE(sio, ebus, sio_ebus_driver, sio_devclass, 0, 0); ==== //depot/projects/ia64/sys/dev/sio/sio_isa.c#13 (text+ko) ==== @@ -149,57 +149,36 @@ {0} }; -static struct resource * -sio_isa_alloc(device_t dev, int *sp, int *rid) -{ - struct resource *res; - - *rid = 0; - *sp = SYS_RES_IOPORT; - res = bus_alloc_resource(dev, *sp, rid, 0, ~0, 8, RF_ACTIVE); - if (res == NULL) { - *rid = 0; - *sp = SYS_RES_MEMORY; - res = bus_alloc_resource(dev, *sp, rid, 0, ~0, 8, RF_ACTIVE); - } - return (res); -} - static int sio_isa_probe(device_t dev) { struct com_s *com; - struct resource *res; - int error, rid, space; /* Check isapnp ids */ if (ISA_PNP_PROBE(device_get_parent(dev), dev, sio_ids) == ENXIO) return (ENXIO); - res = sio_isa_alloc(dev, &space, &rid); - if (res == NULL) - return (ENXIO); com = device_get_softc(dev); - com->bsh = rman_get_bushandle(res); - com->bst = rman_get_bustag(res); - error = sioprobe(dev); - bus_release_resource(dev, space, rid, res); - return (error); + com->addr_rid = 0; + com->addr_type = SYS_RES_IOPORT; + com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid, + 0, ~0, 8, RF_ACTIVE); + if (com->addr_res == NULL) { + com->addr_rid = 0; + com->addr_type = SYS_RES_MEMORY; + com->addr_res = bus_alloc_resource(dev, com->addr_type, + &com->addr_rid, 0, ~0, 8, RF_ACTIVE); + if (com->addr_res == NULL) + return (ENXIO); + } + return (sioprobe(dev)); } static int sio_isa_attach(device_t dev) { - struct resource *res; - int error, rid, space; - res = sio_isa_alloc(dev, &space, &rid); - if (res == NULL) - return (ENXIO); - error = sioattach(dev); - if (error) - bus_release_resource(dev, space, rid, res); - return (error); + return (sioattach(dev)); } DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0); ==== //depot/projects/ia64/sys/dev/sio/sio_pccard.c#8 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -90,55 +91,36 @@ } static int -sio_pccard_probe(dev) - device_t dev; +sio_pccard_probe(device_t dev) { struct com_s *com; - struct resource *res; - int error, rid; #ifdef PC98 SET_FLAG(dev, SET_IFTYPE(COM_IF_MODEM_CARD)); #endif com = device_get_softc(dev); - rid = 0; - res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, - RF_ACTIVE); - if (res == NULL) + com->addr_rid = 0; + com->addr_type = SYS_RES_IOPORT; + com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid, + 0, ~0, 8, RF_ACTIVE); + if (com->addr_res == NULL) return (ENXIO); - com->bsh = rman_get_bushandle(res); - com->bst = rman_get_bustag(res); - error = sioprobe(dev); - bus_release_resource(dev, SYS_RES_IOPORT, rid, res); - return (error); + return (sioprobe(dev)); } static int -sio_pccard_attach(dev) - device_t dev; +sio_pccard_attach(device_t dev) { - struct com_s *com; - struct resource *res; - int error, rid; - com = device_get_softc(dev); - rid = 0; - res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, - RF_ACTIVE); - if (res == NULL) - return (ENXIO); - error = sioattach(dev); - if (error) - bus_release_resource(dev, SYS_RES_IOPORT, rid, res); - return (error); + return (sioattach(dev)); } static int -sio_pccard_detach(dev) - device_t dev; +sio_pccard_detach(device_t dev) { - /* XXX broken */ + + return (siodetach(dev)); } DRIVER_MODULE(sio, pccard, sio_pccard_driver, sio_devclass, 0, 0); ==== //depot/projects/ia64/sys/dev/sio/sio_pci.c#12 (text+ko) ==== @@ -97,50 +97,35 @@ } static int -sio_pci_attach(device_t dev) +sio_pci_probe(device_t dev) { struct com_s *com; struct pci_ids *id; - struct resource *res; - int error, rid, space; + +#ifdef PC98 + SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); +#endif + id = pci_id(dev); + if (id == NULL) + return (ENXIO); + if (id->desc) + device_set_desc(dev, id->desc); com = device_get_softc(dev); - id = pci_id(dev); - rid = (id->rid >= 0) ? id->rid : -id->rid; - space = (id->rid >= 0) ? SYS_RES_IOPORT : SYS_RES_MEMORY; - res = bus_alloc_resource(dev, space, &rid, 0, ~0, 8, RF_ACTIVE); - error = sioattach(dev); - if (error) - bus_release_resource(dev, space, rid, res); - return (error); + com->addr_rid = (id->rid >= 0) ? id->rid : -id->rid; + com->addr_type = (id->rid >= 0) ? SYS_RES_IOPORT : SYS_RES_MEMORY; + com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid, + 0, ~0, 8, RF_ACTIVE); + if (com->addr_res == NULL) + return (ENXIO); + return (sioprobe(dev)); } static int -sio_pci_probe(device_t dev) +sio_pci_attach(device_t dev) { - struct com_s *com; - struct pci_ids *id; - struct resource *res; - int error, rid, space; - com = device_get_softc(dev); - id = pci_id(dev); - if (id == NULL) - return (ENXIO); - device_set_desc(dev, id->desc); - rid = (id->rid >= 0) ? id->rid : -id->rid; - space = (id->rid >= 0) ? SYS_RES_IOPORT : SYS_RES_MEMORY; - res = bus_alloc_resource(dev, space, &rid, 0, ~0, 8, RF_ACTIVE); - com->bsh = rman_get_bushandle(res); - com->bst = rman_get_bustag(res); - -#ifdef PC98 - SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); -#endif - - error = sioprobe(dev); - bus_release_resource(dev, space, rid, res); - return (error); + return (sioattach(dev)); } DRIVER_MODULE(sio, pci, sio_pci_driver, sio_devclass, 0, 0); ==== //depot/projects/ia64/sys/dev/sio/sio_puc.c#7 (text+ko) ==== @@ -64,51 +64,34 @@ }; static int -sio_puc_attach(dev) - device_t dev; +sio_puc_probe(device_t dev) { struct com_s *com; - struct resource *res; - int error, rid; uintptr_t rclk; +#ifdef PC98 + SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); +#endif + com = device_get_softc(dev); - rid = 0; - res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, - RF_ACTIVE); - if (res == NULL) + com->addr_rid = 0; + com->addr_type = SYS_RES_IOPORT; + com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid, + 0, ~0, 8, RF_ACTIVE); + if (com->addr_res == NULL) return (ENXIO); - error = sioattach(dev); - if (error) - bus_release_resource(dev, SYS_RES_IOPORT, rid, res); - return (error); + + if (!BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, &rclk)) + com->rclk = rclk; + + return (sioprobe(dev)); } static int -sio_puc_probe(dev) - device_t dev; +sio_puc_attach(device_t dev) { - struct com_s *com; - struct resource *res; - int error, rid; - uintptr_t rclk; - com = device_get_softc(dev); - rid = 0; - res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 8, - RF_ACTIVE); - if (res == NULL) - return (ENXIO); - com->bsh = rman_get_bushandle(res); - com->bst = rman_get_bustag(res); - if (!BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, &rclk)) - com->rclk = rclk; -#ifdef PC98 - SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); -#endif - error = sioprobe(dev); - bus_release_resource(dev, SYS_RES_IOPORT, rid, res); - return (error); + return (sioattach(dev)); } DRIVER_MODULE(sio, puc, sio_puc_driver, sio_devclass, 0, 0); ==== //depot/projects/ia64/sys/dev/sio/siovar.h#13 (text+ko) ==== @@ -77,11 +77,17 @@ /* com device structure */ struct com_s { /* SIO/ng blessed. */ + device_t dev; + struct resource *irq_res; + void *irq_cookie; + struct resource *addr_res; struct consdev *consdev; /* Set for SIO console. */ int unit; bus_space_tag_t bst; bus_space_handle_t bsh; - u_long rclk; /* Receiver clock (bin 9) */ + u_long rclk; /* Receiver clock (pin 9). */ + int addr_rid; + int addr_type; /* SYS_RES_{IOPORT|MEMORY}. */ u_int regshft; /* Interleaved multi-port. */ u_int hasfifo:1; u_int fifosize; @@ -97,7 +103,6 @@ u_char extra_state; /* more flag bits, separate for order trick */ bool_t st16650a; /* Is a Startech 16650A or RTS/CTS compat */ bool_t loses_outints; /* nonzero if device loses output interrupts */ - bool_t no_irq; /* nonzero if irq is not attached */ bool_t gone; /* hardware disappeared */ bool_t poll; /* nonzero if polling is required */ bool_t poll_output; /* nonzero if polling for output is required */ @@ -146,10 +151,6 @@ u_int delta_error_counts[CE_NTYPES]; u_long error_counts[CE_NTYPES]; - struct resource *irqres; - struct resource *ioportres; - int ioportspace; - void *cookie; dev_t devs[6]; /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 15:31:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2895937B405; Tue, 24 Dec 2002 15:31:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B719A37B401 for ; Tue, 24 Dec 2002 15:31:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E52C43EC5 for ; Tue, 24 Dec 2002 15:31:36 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBONVafh029083 for ; Tue, 24 Dec 2002 15:31:36 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBONVZnA029068 for perforce@freebsd.org; Tue, 24 Dec 2002 15:31:35 -0800 (PST) Date: Tue, 24 Dec 2002 15:31:35 -0800 (PST) Message-Id: <200212242331.gBONVZnA029068@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 Subject: PERFORCE change 22724 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22724 Change 22724 by rwatson@rwatson_paprika on 2002/12/24 15:31:24 Integ gnu gzip into the trustedbsd_acl branch for ACL adaptation. Affected files ... .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/COPYING#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/ChangeLog#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/Makefile#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/NEWS#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/README#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/THANKS#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/TODO#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/algorithm.doc#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/bits.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/crypt.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/crypt.h#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/deflate.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/getopt.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/getopt.h#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzexe#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzexe.1#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzip.1#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzip.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzip.h#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/inflate.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/lzw.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/lzw.h#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/match.S#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/revision.h#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/tailor.h#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/trees.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/unlzh.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/unlzw.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/unpack.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/unzip.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/util.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zdiff#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zdiff.1#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zforce#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zforce.1#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zgrep#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zgrep.1#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zgrep.getopt#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zgrep.libz#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zip.c#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zmore#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/zmore.1#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/znew#1 branch .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/znew.1#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 15:33:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55CB137B405; Tue, 24 Dec 2002 15:33:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E274237B401 for ; Tue, 24 Dec 2002 15:33:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9235143EB2 for ; Tue, 24 Dec 2002 15:33:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBONXdfh029629 for ; Tue, 24 Dec 2002 15:33:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBONXdwa029626 for perforce@freebsd.org; Tue, 24 Dec 2002 15:33:39 -0800 (PST) Date: Tue, 24 Dec 2002 15:33:39 -0800 (PST) Message-Id: <200212242333.gBONXdwa029626@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 Subject: PERFORCE change 22725 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22725 Change 22725 by rwatson@rwatson_paprika on 2002/12/24 15:33:31 Adapt gzip to maintain ACLs before/after gzip and gunzip. Patches submitted by Chris Faulhaber. Affected files ... .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/Makefile#2 edit .. //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzip.c#2 edit Differences ... ==== //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ PROG= gzip SRCS= gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \ crypt.c lzw.c unlzw.c unlzh.c unpack.c getopt.c -CFLAGS+=-DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DDIRENT=1 +CFLAGS+=-DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DDIRENT=1 -DWITH_ACL_SUPPORT .if ${MACHINE_ARCH} == "i386" SRCS+= match.S CFLAGS+=-DASMV ==== //depot/projects/trustedbsd/acl/gnu/usr.bin/gzip/gzip.c#2 (text+ko) ==== @@ -50,6 +50,9 @@ #include #include +#ifdef WITH_ACL_SUPPORT +#include +#endif #include #include #include @@ -1626,6 +1629,9 @@ local void copy_stat(ifstat) struct stat *ifstat; { +#ifdef WITH_ACL_SUPPORT + acl_t acl; +#endif #ifndef NO_UTIME if (decompress && time_stamp != 0 && ifstat->st_mtime != time_stamp) { ifstat->st_mtime = time_stamp; @@ -1643,6 +1649,16 @@ #ifndef NO_CHOWN chown(ofname, ifstat->st_uid, ifstat->st_gid); /* Copy ownership */ #endif +#ifdef WITH_ACL_SUPPORT + /* Copy the ACL */ + acl = acl_get_file(ifname, ACL_TYPE_ACCESS); + if (acl != NULL) { + if (acl_set_file(ofname, ACL_TYPE_ACCESS, acl) == -1 && + errno != EOPNOTSUPP && !quiet) + warn("failed to set the ACL on %s", ofname); + acl_free(acl); + } +#endif remove_ofname = 0; /* It's now safe to remove the input file: */ if (unlink(ifname)) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 15:40:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E1B737B405; Tue, 24 Dec 2002 15:40:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D308637B401 for ; Tue, 24 Dec 2002 15:40:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 668F843EB2 for ; Tue, 24 Dec 2002 15:40:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBONenfh031401 for ; Tue, 24 Dec 2002 15:40:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBONemYC031384 for perforce@freebsd.org; Tue, 24 Dec 2002 15:40:48 -0800 (PST) Date: Tue, 24 Dec 2002 15:40:48 -0800 (PST) Message-Id: <200212242340.gBONemYC031384@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 Subject: PERFORCE change 22726 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22726 Change 22726 by rwatson@rwatson_paprika on 2002/12/24 15:40:31 Integrate bzip2 into the ACL branch for ACL adaptation. Affected files ... .. //depot/projects/trustedbsd/acl/contrib/bzip2/CHANGES#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/LICENSE#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/Makefile#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/Makefile-libbz2_so#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/README#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/README.COMPILATION.PROBLEMS#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/Y2K_INFO#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/blocksort.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzip2.1#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzip2.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzip2recover.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzlib.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzlib.h#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/bzlib_private.h#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/compress.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/crctable.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/decompress.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/dlltest.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/huffman.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/libbz2.def#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/makefile.msc#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/manual.texi#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/randtable.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample1.bz2.uu#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample1.ref.gz.uu#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample2.bz2.uu#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample2.ref.gz.uu#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample3.bz2.uu#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/sample3.ref.gz.uu#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/spewG.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/unzcrash.c#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/words0#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/words1#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/words2#1 branch .. //depot/projects/trustedbsd/acl/contrib/bzip2/words3#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 16:22:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D81B737B401; Tue, 24 Dec 2002 16:22:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7091837B407 for ; Tue, 24 Dec 2002 16:22:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BB1043ED4 for ; Tue, 24 Dec 2002 16:22:42 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBP0Mgfh047369 for ; Tue, 24 Dec 2002 16:22:42 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBP0MfaV047366 for perforce@freebsd.org; Tue, 24 Dec 2002 16:22:41 -0800 (PST) Date: Tue, 24 Dec 2002 16:22:41 -0800 (PST) Message-Id: <200212250022.gBP0MfaV047366@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22730 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22730 Change 22730 by marcel@marcel_nfs on 2002/12/24 16:22:09 De-weird-ify the siodescribe prototype. Only pass the softc. We have the device in there. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#28 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#28 (text+ko) ==== @@ -304,7 +304,7 @@ } static void -siodescribe(device_t dev, struct com_s *sc) +siodescribe(struct com_s *sc) { int has_spr; u_char spr; @@ -321,25 +321,26 @@ * XXX Should we try to see if we have a broken * 16550 or a fixed 16550A? */ - device_set_desc(dev, "16550 or compatible"); + device_set_desc(com->dev, "16550 or compatible"); break; case 32: /* * XXX Should we check that features like automatic * flow control exist? */ - device_set_desc(dev, "16650 or compatible"); + device_set_desc(com->dev, "16650 or compatible"); break; case 64: /* * XXX Should we check that features like automatic * flow control exist? */ - device_set_desc(dev, "16750 or compatible"); + device_set_desc(com->dev, "16750 or compatible"); break; default: /* XXX Probably not right. */ - device_set_desc(dev, "16550 with non-standard FIFO"); + device_set_desc(com->dev, + "16550 with non-standard FIFO"); break; } } else { @@ -355,9 +356,9 @@ sio_setreg(sc, com_scr, spr); /* XXX barrier */ if (!has_spr) - device_set_desc(dev, "8250 or compatible"); + device_set_desc(com->dev, "8250 or compatible"); else - device_set_desc(dev, "16450 or compatible"); + device_set_desc(com->dev, "16450 or compatible"); } } @@ -518,7 +519,7 @@ sioinitfifo(com); if (device_get_desc(dev) == NULL) - siodescribe(dev, com); + siodescribe(com); flags = device_get_flags(dev); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 16:58:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC4FC37B405; Tue, 24 Dec 2002 16:58:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 656A637B401 for ; Tue, 24 Dec 2002 16:58:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04D3243EEC for ; Tue, 24 Dec 2002 16:58:25 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBP0wPfh058123 for ; Tue, 24 Dec 2002 16:58:25 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBP0wPoo058120 for perforce@freebsd.org; Tue, 24 Dec 2002 16:58:25 -0800 (PST) Date: Tue, 24 Dec 2002 16:58:25 -0800 (PST) Message-Id: <200212250058.gBP0wPoo058120@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22731 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22731 Change 22731 by marcel@marcel_vaio on 2002/12/24 16:57:47 Converge on the use of "com" for the softc. Even though I like "sc" better, the inconsistency is worse. In other words: fix compile breakage caused by the previous untested submission... :-/ Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#29 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#29 (text+ko) ==== @@ -271,51 +271,51 @@ * any data in the RHR after we have reset the FIFOs. */ static void -sioinitfifo(struct com_s *sc) +sioinitfifo(struct com_s *com) { - sio_setreg(sc, com_mcr, sc->reg_mcr | MCR_LOOPBACK); + sio_setreg(com, com_mcr, com->reg_mcr | MCR_LOOPBACK); /* XXX barrier */ - sio_setreg(sc, com_fcr, FCR_ENABLE); + sio_setreg(com, com_fcr, FCR_ENABLE); /* XXX barrier */ - sio_setreg(sc, com_fcr, FCR_ENABLE | FCR_RCV_RST | FCR_XMT_RST); + sio_setreg(com, com_fcr, FCR_ENABLE | FCR_RCV_RST | FCR_XMT_RST); /* XXX barrier */ DELAY(100); - sc->reg_fcr = 0; - sc->hasfifo = (sio_getreg(sc, com_iir) & IIR_FIFO_MASK) ? 1 : 0; - if (sc->hasfifo) { - while (sio_getreg(sc, com_lsr) & LSR_RXRDY) { - (void)sio_getreg(sc, com_data); + com->reg_fcr = 0; + com->hasfifo = (sio_getreg(com, com_iir) & IIR_FIFO_MASK) ? 1 : 0; + if (com->hasfifo) { + while (sio_getreg(com, com_lsr) & LSR_RXRDY) { + (void)sio_getreg(com, com_data); /* XXX barrier */ } - sc->reg_fcr = FCR_ENABLE | FCR_RX_HIGH; - sio_setreg(sc, com_mcr, sc->reg_fcr); + com->reg_fcr = FCR_ENABLE | FCR_RX_HIGH; + sio_setreg(com, com_mcr, com->reg_fcr); /* XXX barrier */ - sc->fifosize = 16; /* Minimal FIFO size. */ + com->fifosize = 16; /* Minimal FIFO size. */ /* * XXX count the number of characters we can send before * we have a receive interrupt. This tells us how large * the FIFOs are. */ } - sio_setreg(sc, com_mcr, sc->reg_mcr); + sio_setreg(com, com_mcr, com->reg_mcr); /* XXX barrier */ } static void -siodescribe(struct com_s *sc) +siodescribe(struct com_s *com) { int has_spr; u_char spr; - if (sc->hasfifo) { + if (com->hasfifo) { /* * NS16550 or higher. The minimum FIFO size is 16 bytes for * the NS16550. The ST16C650 has 32 bytes FIFOs and the * NS16750 has 64 bytes FIFOs. */ - switch (sc->fifosize) { + switch (com->fifosize) { case 16: /* * XXX Should we try to see if we have a broken @@ -348,12 +348,12 @@ * NS16450 or lower. Use the Scratch Pad Register (SPR) to * differentiate the NS16450 from the INS8250. */ - spr = sio_getreg(sc, com_scr); - sio_setreg(sc, com_scr, ~spr); + spr = sio_getreg(com, com_scr); + sio_setreg(com, com_scr, ~spr); /* XXX barrier */ - has_spr = (sio_getreg(sc, com_scr) == ~spr) ? 1 : 0; + has_spr = (sio_getreg(com, com_scr) == ~spr) ? 1 : 0; /* XXX barrier */ - sio_setreg(sc, com_scr, spr); + sio_setreg(com, com_scr, spr); /* XXX barrier */ if (!has_spr) device_set_desc(com->dev, "8250 or compatible"); @@ -390,36 +390,36 @@ * Do some non-destructive (for this device that is) tests * to make sure we have something that looks like an UART. */ -int sioprobe1(struct com_s *sc) +int sioprobe1(struct com_s *com) { u_char lcr, val; - lcr = sio_getreg(sc, com_lcr); - sio_setreg(sc, com_lcr, lcr & ~LCR_DLAB); + lcr = sio_getreg(com, com_lcr); + sio_setreg(com, com_lcr, lcr & ~LCR_DLAB); /* Check known 0 bits that don't depend on DLAB. */ - val = sio_getreg(sc, com_iir); + val = sio_getreg(com, com_iir); if (val & 0x30) goto fail; - val = sio_getreg(sc, com_mcr); + val = sio_getreg(com, com_mcr); if (val & 0xe0) goto fail; /* Check known 0 bits that depend on !DLAB. */ - val = sio_getreg(sc, com_ier); + val = sio_getreg(com, com_ier); if (val & 0xf0) goto fail; /* XXX we can do more. */ - sio_setreg(sc, com_ier, 0); + sio_setreg(com, com_ier, 0); /* XXX barrier */ - sio_setreg(sc, com_lcr, lcr); + sio_setreg(com, com_lcr, lcr); /* XXX barrier */ return (0); fail: - sio_setreg(sc, com_lcr, lcr); + sio_setreg(com, com_lcr, lcr); /* XXX barrier */ return (ENXIO); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 24 22:23: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD19E37B405; Tue, 24 Dec 2002 22:22:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BF9A37B401 for ; Tue, 24 Dec 2002 22:22:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83D9643ED1 for ; Tue, 24 Dec 2002 22:22:57 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBP6Mvfh074499 for ; Tue, 24 Dec 2002 22:22:57 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBP6MuMo074496 for perforce@freebsd.org; Tue, 24 Dec 2002 22:22:56 -0800 (PST) Date: Tue, 24 Dec 2002 22:22:56 -0800 (PST) Message-Id: <200212250622.gBP6MuMo074496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22732 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22732 Change 22732 by marcel@marcel_nfs on 2002/12/24 22:22:25 Auto-detect the FIFO size. Keep a debug printf in there to keep an eye on it for a while. Rename two LCR bits to match the names used in the datasheet. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#30 edit .. //depot/projects/ia64/sys/dev/sio/sio_cons.c#9 edit .. //depot/projects/ia64/sys/dev/sio/sioreg.h#6 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#30 (text+ko) ==== @@ -264,43 +264,158 @@ /* TUNABLE_INT("machdep.conspeed", &comdefaultrate); */ /* - * Initialize FIFOs. We cannot simple enable the FIFOs because that may cause - * garbage to appear on the wire (non-empty transmit FIFO) or garbage to be - * received (non-empty receive FIFO). The former is prevented by enabling - * loopback prior to enabling the FIFOs. The latter is prevented by ignoring - * any data in the RHR after we have reset the FIFOs. + * Set a FIFO mode. We try not to be disruptive, but leave some of the + * responsibility for the caller to avoid unconditional high overhead. + * For best results, set loopback mode and clear all interrupt sources + * before calling this function. The loopback mode prevents garbage on + * the line and clearing IER avoids possible stray interrupts. */ -static void -sioinitfifo(struct com_s *com) +static int +siosetfifo(struct com_s *com, int fcr) { + int delay, limit; + + /* 1/10th the time to transmit 1 character (estimate). */ + delay = 16000000 * com->reg_dl / com->rclk; - sio_setreg(com, com_mcr, com->reg_mcr | MCR_LOOPBACK); + com->reg_fcr = 0; + sio_setreg(com, com_fcr, 0); /* XXX barrier */ - sio_setreg(com, com_fcr, FCR_ENABLE); + + /* + * Make sure the transmitter is idle before we play with the + * FIFOs. We don't wait more than roughly three times as long + * as needed to send a single character. Given that we may need + * to wait for both the THR and the TSR to clear, this leaves + * us roughly 1 character time slack. + */ + limit = 30; + while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) { + if (delay) + DELAY(delay); + } + if (limit == 0) + return (EIO); + + com->reg_fcr = fcr; + sio_setreg(com, com_fcr, fcr | FCR_XMT_RST | FCR_RCV_RST); /* XXX barrier */ - sio_setreg(com, com_fcr, FCR_ENABLE | FCR_RCV_RST | FCR_XMT_RST); - /* XXX barrier */ - DELAY(100); - com->reg_fcr = 0; + + /* + * Set the hasfifo field when the device has FIFOs. In that case + * we also flush any possible garbage from the transmitter and + * receiver. Flush the transmitter before flushing the receiver + * to allow having the UART in loopback mode. Since we always + * enable FIFO mode after disabling it first, we won't have more + * than two characters the flush. + */ com->hasfifo = (sio_getreg(com, com_iir) & IIR_FIFO_MASK) ? 1 : 0; if (com->hasfifo) { - while (sio_getreg(com, com_lsr) & LSR_RXRDY) { + limit = 30; + while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) { + if (delay) + DELAY(delay); + } + if (limit == 0) + return (EIO); + + limit = 30; + while ((sio_getreg(com, com_lsr) & LSR_RXRDY) && --limit) { (void)sio_getreg(com, com_data); /* XXX barrier */ } - com->reg_fcr = FCR_ENABLE | FCR_RX_HIGH; - sio_setreg(com, com_mcr, com->reg_fcr); + if (limit == 0) + return (EIO); + } + + return (0); +} + +/* + * Initialize the FIFOs and determine the size of the receiver FIFO. We + * assume that the transmitter FIFO has the same size. First we set DMA + * mode (mode 1) with the highest trigger level. In combination with + * loopback this allows us to determine the size of the receiver FIFO. + * After that we re-initialize with a medium high trigger level. + */ +static int +sioinitfifo(struct com_s *com) +{ + int count, delay, error, limit; + + com->fifosize = 0; + + sio_setreg(com, com_mcr, MCR_LOOPBACK | MCR_DTR | MCR_RTS); + /* XXX barrier */ + + error = siosetfifo(com, FCR_ENABLE | FCR_DMA_MODE | FCR_RX_HIGH); + if (error || !com->hasfifo) { + sio_setreg(com, com_mcr, com->reg_mcr); + /* XXX barrier */ + return (error); + } + + /* 1/10th the time to transmit 1 character (estimate). */ + delay = 16000000 * com->reg_dl / com->rclk; + + sio_setreg(com, com_ier, IER_ERXRDY); + /* XXX barrier */ + + /* + * We should have a sufficiently clean "pipe" to determine + * the size of the FIFOs. If there was a character lurking + * in the receiver, then it really cannot do any harm. We + * send as much characters as is reasonable and wait for the + * the TX interrupt to be asserted, counting the characters + * as we send them. Based on that count we know the FIFO size. + */ + count = 0; + while ((sio_getreg(com, com_iir) & IIR_RXRDY) == 0 && count < 1030) { + sio_setreg(com, com_data, 0); /* XXX barrier */ + count++; + + limit = 30; + while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) { + if (delay) + DELAY(delay); + } + if (limit == 0) { + sio_setreg(com, com_ier, 0); + /* XXX barrier */ + sio_setreg(com, com_mcr, com->reg_mcr); + /* XXX barrier */ + return (EIO); + } + } - com->fifosize = 16; /* Minimal FIFO size. */ - /* - * XXX count the number of characters we can send before - * we have a receive interrupt. This tells us how large - * the FIFOs are. - */ + sio_setreg(com, com_ier, 0); + /* XXX barrier */ + + error = siosetfifo(com, FCR_ENABLE | FCR_RX_MEDH); + if (error) { + sio_setreg(com, com_mcr, com->reg_mcr); + /* XXX barrier */ + return (error); } + + if (count >= 14 && count < 16) + com->fifosize = 16; /* 16550 */ + else if (count >= 28 && count < 32) + com->fifosize = 32; /* 16650 */ + else if (count >= 56 && count < 64) + com->fifosize = 64; /* 16750 */ + else if (count >= 120 && count < 128) + com->fifosize = 128; /* 16950 */ + else + com->fifosize = 1; /* XXX */ + sio_setreg(com, com_mcr, com->reg_mcr); /* XXX barrier */ + + device_printf(com->dev, "count=%d, FIFO size=%d\n", count, + com->fifosize); + return (0); } static void @@ -324,23 +439,21 @@ device_set_desc(com->dev, "16550 or compatible"); break; case 32: - /* - * XXX Should we check that features like automatic - * flow control exist? - */ + /* XXX Should we check features? */ device_set_desc(com->dev, "16650 or compatible"); break; case 64: - /* - * XXX Should we check that features like automatic - * flow control exist? - */ + /* XXX Should we check features? */ device_set_desc(com->dev, "16750 or compatible"); break; + case 128: + /* XXX Should we check features? */ + device_set_desc(com->dev, "16950 or compatible"); + break; default: /* XXX Probably not right. */ device_set_desc(com->dev, - "16550 with non-standard FIFO"); + "Non-standard or broken UART with FIFO"); break; } } else { @@ -467,6 +580,7 @@ sioprobe(device_t dev) { struct com_s *com; + int error; u_int flags; while (sio_inited != 2) @@ -505,18 +619,35 @@ * are set correctly for the console. */ if (com->consdev == NULL) { - if (sioprobe1(com)) { + error = sioprobe1(com); + if (error) { bus_release_resource(dev, com->addr_type, com->addr_rid, com->addr_res); - return (ENXIO); + return (error); } if (com->rclk == 0) com->rclk = DEFAULT_RCLK; + + sio_setreg(com, com_lcr, LCR_8BITS | LCR_DLAB); + /* XXX barrier */ + com->reg_dl = siodivisor(com->rclk, comdefaultrate); + sio_setdreg(com, com_dl, com->reg_dl); + /* XXX barrier */ + sio_setreg(com, com_lcr, LCR_8BITS); + /* XXX barrier */ + com->reg_mcr = MCR_IENABLE; + sio_setreg(com, com_mcr, com->reg_mcr); + /* XXX barrier */ } /* Initialize the FIFOs. */ - sioinitfifo(com); + error = sioinitfifo(com); + if (error) { + bus_release_resource(dev, com->addr_type, com->addr_rid, + com->addr_res); + return (error); + } if (device_get_desc(dev) == NULL) siodescribe(com); @@ -532,7 +663,8 @@ return (ENXIO); } - bus_release_resource(dev, com->addr_type, com->addr_rid, com->addr_res); + bus_release_resource(dev, com->addr_type, com->addr_rid, + com->addr_res); return (0); } @@ -557,22 +689,7 @@ if (unit >= sio_numunits) sio_numunits = unit + 1; - /* - * Preset the UART to something reasonable. Only do this when the - * UART is not used as the console. We assume the console works - * and whatever the setting, it cannot be unreasonable. - */ - if (com->consdev == NULL) { - sio_setreg(com, com_lcr, LCR_8BITS | LCR_DLAB); - /* XXX barrier */ - com->reg_dl = siodivisor(com->rclk, comdefaultrate); - sio_setdreg(com, com_dl, com->reg_dl); - /* XXX barrier */ - sio_setreg(com, com_lcr, LCR_8BITS); - /* XXX barrier */ - sio_setreg(com, com_mcr, MCR_IENABLE); - /* XXX barrier */ - } else + if (com->consdev != NULL) com->consdev->cn_dev = makedev(CDEV_MAJOR, unit); com->unit = unit; @@ -1039,8 +1156,7 @@ s = spltty(); if (com->state & CS_BUSY) com->extra_state &= ~CSE_BUSYCHECK; /* False alarm. */ - else if ((sio_getreg(com, com_lsr) & (LSR_TSRE | LSR_TXRDY)) - == (LSR_TSRE | LSR_TXRDY)) { + else if (sio_getreg(com, com_lsr) & LSR_TEMT) { com->tp->t_state &= ~TS_BUSY; ttwwakeup(com->tp); com->extra_state &= ~CSE_BUSYCHECK; @@ -1364,7 +1480,7 @@ } /* output queued and everything ready? */ - if (line_status & LSR_TXRDY + if (line_status & LSR_THRE && com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)) { ioptr = com->obufq.l_head; if (com->hasfifo && com->unit != siotsunit) { ==== //depot/projects/ia64/sys/dev/sio/sio_cons.c#9 (text+ko) ==== @@ -210,7 +210,7 @@ s = spltty(); to = 100000; - while ((sio_getreg(&sio_console, com_lsr) & LSR_TSRE) == 0 && --to) + while ((sio_getreg(&sio_console, com_lsr) & LSR_THRE) == 0 && --to) ; sio_setreg(&sio_console, com_data, c); splx(s); ==== //depot/projects/ia64/sys/dev/sio/sioreg.h#6 (text+ko) ==== @@ -79,7 +79,7 @@ #define FCR_RX_MEDH 0x80 #define FCR_RX_HIGH 0xc0 -/* character format control register */ +/* line control register */ #define LCR_DLAB 0x80 #define LCR_SBREAK 0x40 #define LCR_PZERO 0x30 @@ -102,8 +102,8 @@ /* line status register */ #define LSR_RCV_FIFO 0x80 -#define LSR_TSRE 0x40 -#define LSR_TXRDY 0x20 +#define LSR_TEMT 0x40 /* Transmitter Empty. */ +#define LSR_THRE 0x20 /* Transmitter Holding Register Empty. */ #define LSR_BI 0x10 #define LSR_FE 0x08 #define LSR_PE 0x04 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Dec 25 14:48: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9728937B405; Wed, 25 Dec 2002 14:47:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2AFDF37B401; Wed, 25 Dec 2002 14:47:59 -0800 (PST) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id E411343E4A; Wed, 25 Dec 2002 14:47:58 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id CEB572A7EA; Wed, 25 Dec 2002 14:47:58 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Marcel Moolenaar Cc: Perforce Change Reviews Subject: Re: PERFORCE change 22703 for review In-Reply-To: <200212241118.gBOBIZIO066323@repoman.freebsd.org> Date: Wed, 25 Dec 2002 14:47:58 -0800 From: Peter Wemm Message-Id: <20021225224758.CEB572A7EA@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=22703 > > Change 22703 by marcel@marcel_nfs on 2002/12/24 03:18:28 > > Bump the interrupt count. On the HP rx2600 we have sio2 on > interrupt 82. With only room for 64 interrupts we were > corrupting the interrupt counters for interrupts 27, 28 and > 29. We now have room for 128 interrupts. > Deal with the fact that we now have 3 digit interrupt numbers. > While here, replace "intr" with a single hash mark. It helps > a modified vmstat that also shows interrupt sources that > don't have any interrupts yet... Hmm. The tiger4 goes up to interrupt 180 or so... It has got a *LOT* of apics on the board.. it seems like one per PCI slot.. something to do with the hot-plug stuff. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Dec 25 15:11:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AB7F37B405; Wed, 25 Dec 2002 15:11:30 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2876D37B401 for ; Wed, 25 Dec 2002 15:11:30 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C12C43E4A for ; Wed, 25 Dec 2002 15:11:29 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBPNBNrT006378; Wed, 25 Dec 2002 15:11:23 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBPNCLNK001319; Wed, 25 Dec 2002 15:12:21 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gBPNCLlq001318; Wed, 25 Dec 2002 15:12:21 -0800 (PST) Date: Wed, 25 Dec 2002 15:12:21 -0800 From: Marcel Moolenaar To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 22703 for review Message-ID: <20021225231221.GA1253@dhcp01.pn.xcllnt.net> References: <200212241118.gBOBIZIO066323@repoman.freebsd.org> <20021225224758.CEB572A7EA@canning.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20021225224758.CEB572A7EA@canning.wemm.org> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, Dec 25, 2002 at 02:47:58PM -0800, Peter Wemm wrote: > Marcel Moolenaar wrote: > > http://perforce.freebsd.org/chv.cgi?CH=22703 > > > > Change 22703 by marcel@marcel_nfs on 2002/12/24 03:18:28 > > > > Bump the interrupt count. On the HP rx2600 we have sio2 on > > interrupt 82. With only room for 64 interrupts we were > > corrupting the interrupt counters for interrupts 27, 28 and > > 29. We now have room for 128 interrupts. > > Deal with the fact that we now have 3 digit interrupt numbers. > > While here, replace "intr" with a single hash mark. It helps > > a modified vmstat that also shows interrupt sources that > > don't have any interrupts yet... > > Hmm. The tiger4 goes up to interrupt 180 or so... Argh :-( > It has got a *LOT* of > apics on the board.. it seems like one per PCI slot.. something to do with > the hot-plug stuff. Ok. I'm mostly done with sio(4) and puc(4) for now. I have a slew of changes to make the Diva multi-port card probe and work with puc(4), and I only have to do a round of testing before I can commit it. There are a couple of knows bugs in the sio(4) driver, but they don't stand in the way of using it if it wasn't for unrelated interrupt issues. The 3 UARTs on the Diva board cannot allocate the IRQ and the ACPI UARTs don't seem to interrupt. The bottom line: I'll be going over the interrupt stuff soon so I'll keep an eye on possible ways to avoid the static table. A sysctl interface seems most logical... -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Dec 25 15:31:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CC9137B405; Wed, 25 Dec 2002 15:31:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3883537B401 for ; Wed, 25 Dec 2002 15:31:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7BFD43ED8 for ; Wed, 25 Dec 2002 15:31:52 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBPNVqfh039659 for ; Wed, 25 Dec 2002 15:31:52 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBPNVqEh039656 for perforce@freebsd.org; Wed, 25 Dec 2002 15:31:52 -0800 (PST) Date: Wed, 25 Dec 2002 15:31:52 -0800 (PST) Message-Id: <200212252331.gBPNVqEh039656@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22742 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22742 Change 22742 by marcel@marcel_nfs on 2002/12/25 15:31:16 Add empty definition of bus_space_unmap(). It's used by puc(4). Affected files ... .. //depot/projects/ia64/sys/ia64/include/bus.h#6 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/bus.h#6 (text+ko) ==== @@ -124,8 +124,11 @@ * Unmap a region of device bus space. */ -void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, - bus_size_t size); +static __inline void +bus_space_unmap(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused, + bus_size_t size __unused) +{ +} /* * Get a new handle for a subregion of an already-mapped area of bus space. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Dec 25 15:45:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1289137B405; Wed, 25 Dec 2002 15:45:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D06337B401 for ; Wed, 25 Dec 2002 15:45:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 558AE43EA9 for ; Wed, 25 Dec 2002 15:45:10 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBPNjAfh043303 for ; Wed, 25 Dec 2002 15:45:10 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBPNj9AY043300 for perforce@freebsd.org; Wed, 25 Dec 2002 15:45:09 -0800 (PST) Date: Wed, 25 Dec 2002 15:45:09 -0800 (PST) Message-Id: <200212252345.gBPNj9AY043300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22744 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22744 Change 22744 by marcel@marcel_nfs on 2002/12/25 15:44:30 Remove the hackery that made the Diva multi-port board probe and attach. Assume I/O ports again until we have an UART that's memory mapped. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_pci.c#13 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_pci.c#13 (text+ko) ==== @@ -79,7 +79,6 @@ { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 }, { 0x0103115d, "Xircom Cardbus modem", 0x10 }, { 0x98459710, "Netmos Nm9845 PCI Bridge with Dual UART", 0x10 }, - { 0x1048103c, "Diva Serial [GSP] Multiport UART", -0x10 }, { 0x00000000, NULL, 0 } }; @@ -112,8 +111,8 @@ if (id->desc) device_set_desc(dev, id->desc); com = device_get_softc(dev); - com->addr_rid = (id->rid >= 0) ? id->rid : -id->rid; - com->addr_type = (id->rid >= 0) ? SYS_RES_IOPORT : SYS_RES_MEMORY; + com->addr_rid = id->rid; + com->addr_type = SYS_RES_IOPORT; com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid, 0, ~0, 8, RF_ACTIVE); if (com->addr_res == NULL) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Dec 25 16: 6:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6F2E37B405; Wed, 25 Dec 2002 16:06:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D8F837B401 for ; Wed, 25 Dec 2002 16:06:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 178A343E4A for ; Wed, 25 Dec 2002 16:06:37 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBQ06afh050477 for ; Wed, 25 Dec 2002 16:06:36 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBQ06a9p050474 for perforce@freebsd.org; Wed, 25 Dec 2002 16:06:36 -0800 (PST) Date: Wed, 25 Dec 2002 16:06:36 -0800 (PST) Message-Id: <200212260006.gBQ06a9p050474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22745 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22745 Change 22745 by marcel@marcel_nfs on 2002/12/25 16:06:33 Add support to puc(4) for memory mapped communication devices. Introduce PUC_FLAGS_MEMORY for this purpose. While here, create PUC_FLAGS_FASTINTR to replace the non-abstracted use of INTR_FAST. The PUC_FLAGS_MEMORY bit controls the address resource type. By default it is still SYS_RES_IOPORT. The flag switches to SYS_RES_MEMORY. In sio_puc.c we check the flags using device_get_flags() and use the corresponding resource type. Add the HP Diva multi-port to the device table. It's a memory mapped multi-port card. Also, since sio(4) sets the device description when not already set, stop duplicating the puc(4) description to the containing sio(4) devices. The output is more sensible that way: \begin{example} : puc0: mem 0xf8030000-0xf8030fff irq 82 at device 1.1 on pci224 sio0: <16950 or compatible> on puc0 sio1: <16950 or compatible> on puc0 sio2: <16950 or compatible> on puc0 : sio3: <16550 or compatible> iomem 0xff5e0000-0xff5e0007 irq 34 on acpi0 sio3: console sio4: <16550 or compatible> iomem 0xff5e2000-0xff5e2007 irq 35 on acpi0 : \end{example} There is at least one loose end: interrupts cannot not be activated for the UARTs under puc(4)... Affected files ... .. //depot/projects/ia64/sys/dev/puc/puc.c#9 edit .. //depot/projects/ia64/sys/dev/puc/pucdata.c#7 edit .. //depot/projects/ia64/sys/dev/puc/pucvar.h#6 edit .. //depot/projects/ia64/sys/dev/sio/sio_puc.c#8 edit .. //depot/projects/ia64/sys/ia64/conf/HP_RX2600#7 edit Differences ... ==== //depot/projects/ia64/sys/dev/puc/puc.c#9 (text+ko) ==== @@ -134,7 +134,7 @@ puc_attach(device_t dev, const struct puc_device_description *desc) { char *typestr; - int bidx, childunit, i, irq_setup, rid; + int bidx, childunit, i, irq_setup, rid, type; struct puc_softc *sc; struct puc_device *pdev; struct resource *res; @@ -163,7 +163,7 @@ irq_setup = BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY | INTR_FAST, puc_intr, sc, &sc->intr_cookie); if (irq_setup == 0) - sc->fastintr = INTR_FAST; + sc->fastintr = PUC_FLAGS_FASTINTR; else irq_setup = BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY, puc_intr, sc, &sc->intr_cookie); @@ -183,15 +183,21 @@ if (sc->sc_bar_mappings[bidx].res != NULL) continue; - res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, - 0ul, ~0ul, 1, RF_ACTIVE); + + type = (sc->sc_desc->ports[i].flags & PUC_FLAGS_MEMORY) + ? SYS_RES_MEMORY : SYS_RES_IOPORT; + + res = bus_alloc_resource(dev, type, &rid, 0ul, ~0ul, 1, + RF_ACTIVE); if (res == NULL) { printf("could not get resource\n"); continue; } + sc->sc_bar_mappings[bidx].type = type; sc->sc_bar_mappings[bidx].res = res; #ifdef PUC_DEBUG - printf("port rid %d bst %x, start %x, end %x\n", rid, + printf("%s rid %d bst %x, start %x, end %x\n", + (type == SYS_RES_MEMORY) ? "memory" : "port", rid, (u_int)rman_get_bustag(res), (u_int)rman_get_start(res), (u_int)rman_get_end(res)); #endif @@ -229,13 +235,14 @@ rle = resource_list_find(&pdev->resources, SYS_RES_IRQ, 0); rle->res = sc->irqres; - /* Now fake an IOPORT resource */ + /* Now fake an IOPORT or MEMORY resource */ res = sc->sc_bar_mappings[bidx].res; - resource_list_add(&pdev->resources, SYS_RES_IOPORT, 0, + type = sc->sc_bar_mappings[bidx].type; + resource_list_add(&pdev->resources, type, 0, rman_get_start(res) + sc->sc_desc->ports[i].offset, rman_get_start(res) + sc->sc_desc->ports[i].offset + 8 - 1, 8); - rle = resource_list_find(&pdev->resources, SYS_RES_IOPORT, 0); + rle = resource_list_find(&pdev->resources, type, 0); if (sc->barmuxed == 0) { rle->res = sc->sc_bar_mappings[bidx].res; @@ -264,15 +271,16 @@ if (sc->sc_ports[i].dev == NULL) { if (sc->barmuxed) { bus_space_unmap(rman_get_bustag(rle->res), - rman_get_bushandle(rle->res), - 8); + rman_get_bushandle(rle->res), 8); free(rle->res, M_DEVBUF); free(pdev, M_DEVBUF); } continue; } device_set_ivars(sc->sc_ports[i].dev, pdev); +#if 0 device_set_desc(sc->sc_ports[i].dev, sc->sc_desc->name); +#endif if (!bootverbose) device_quiet(sc->sc_ports[i].dev); #ifdef PUC_DEBUG @@ -463,7 +471,7 @@ struct puc_softc *sc; sc = (struct puc_softc *)device_get_softc(dev); - if ((flags & INTR_FAST) != sc->fastintr) + if ((flags & PUC_FLAGS_FASTINTR) != sc->fastintr) return (ENXIO); for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { if (sc->sc_ports[i].dev == child) { ==== //depot/projects/ia64/sys/dev/puc/pucdata.c#7 (text+ko) ==== @@ -49,6 +49,17 @@ const struct puc_device_description puc_devices[] = { + { "Diva Serial [GSP] Multiport UART", + NULL, + { 0x103c, 0x1048, 0x103c, 0x1282 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, 0, PUC_FLAGS_MEMORY }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, 0, PUC_FLAGS_MEMORY }, + { PUC_PORT_TYPE_COM, 0x10, 0x38, 0, PUC_FLAGS_MEMORY }, + }, + }, + { "Comtrol RocketPort 550/4 RJ45", NULL, { 0x11fe, 0x8014, 0, 0 }, ==== //depot/projects/ia64/sys/dev/puc/pucvar.h#6 (text+ko) ==== @@ -91,6 +91,9 @@ #define PUC_PORT_TYPE_COM 1 #define PUC_PORT_TYPE_LPT 2 +#define PUC_FLAGS_FASTINTR 0x0001 /* Use fast interrupts. */ +#define PUC_FLAGS_MEMORY 0x0002 /* Use memory mapped I/O. */ + #define PUC_PORT_VALID(desc, port) \ ((port) < PUC_MAX_PORTS && (desc)->ports[(port)].type != PUC_PORT_TYPE_NONE) @@ -128,6 +131,7 @@ struct { int used; int bar; + int type; /* SYS_RES_IOPORT or SYS_RES_MEMORY. */ struct resource *res; } sc_bar_mappings[PUC_MAX_BAR]; ==== //depot/projects/ia64/sys/dev/sio/sio_puc.c#8 (text+ko) ==== @@ -68,14 +68,17 @@ { struct com_s *com; uintptr_t rclk; + int flags; #ifdef PC98 SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); #endif + flags = device_get_flags(dev); com = device_get_softc(dev); com->addr_rid = 0; - com->addr_type = SYS_RES_IOPORT; + com->addr_type = (flags & PUC_FLAGS_MEMORY) + ? SYS_RES_MEMORY : SYS_RES_IOPORT; com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid, 0, ~0, 8, RF_ACTIVE); if (com->addr_res == NULL) ==== //depot/projects/ia64/sys/ia64/conf/HP_RX2600#7 (text+ko) ==== @@ -46,6 +46,7 @@ device pass device pci device pty +device puc device random device sc device scbus To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Dec 25 16:32:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1CC137B405; Wed, 25 Dec 2002 16:32:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 81A6C37B401 for ; Wed, 25 Dec 2002 16:32:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F72843ED8 for ; Wed, 25 Dec 2002 16:32:08 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBQ0W8fh060960 for ; Wed, 25 Dec 2002 16:32:08 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBQ0W7IL060957 for perforce@freebsd.org; Wed, 25 Dec 2002 16:32:07 -0800 (PST) Date: Wed, 25 Dec 2002 16:32:07 -0800 (PST) Message-Id: <200212260032.gBQ0W7IL060957@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22746 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22746 Change 22746 by marcel@marcel_nfs on 2002/12/25 16:31:35 Improve on the FIFO size determination. We don't really need a siosetfifo() called twice by sioinitfifo(). Having seperate functions only creates phase ordering problems. They are now merged. Tune the algorithm to better deal with large FIFOs. The HP Diva card apparently needs a lot of time before the receiver FIFO is cleared. Also, have more verbose debugging for now and fallback to non-FIFO operation if we get in trouble after we enabled the FIFOs. Fix the trigger level for 128 byte FIFOs. Properly scaled it is 112. This allows us to properly set the FIFO size for the HP Diva card. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#31 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#31 (text+ko) ==== @@ -264,24 +264,24 @@ /* TUNABLE_INT("machdep.conspeed", &comdefaultrate); */ /* - * Set a FIFO mode. We try not to be disruptive, but leave some of the - * responsibility for the caller to avoid unconditional high overhead. - * For best results, set loopback mode and clear all interrupt sources - * before calling this function. The loopback mode prevents garbage on - * the line and clearing IER avoids possible stray interrupts. + * Initialize the FIFOs and determine the size of the receiver FIFO. We + * assume that the transmitter FIFO has the same size. First we set DMA + * mode (mode 1) with the highest trigger level. In combination with + * loopback this allows us to determine the size of the receiver FIFO. + * After that we re-initialize with a medium high trigger level. This + * function is expected to be called with FIFOs disabled. */ static int -siosetfifo(struct com_s *com, int fcr) +sioinitfifo(struct com_s *com) { - int delay, limit; + int count, delay, limit; + + com->hasfifo = 0; + com->fifosize = 0; /* 1/10th the time to transmit 1 character (estimate). */ delay = 16000000 * com->reg_dl / com->rclk; - com->reg_fcr = 0; - sio_setreg(com, com_fcr, 0); - /* XXX barrier */ - /* * Make sure the transmitter is idle before we play with the * FIFOs. We don't wait more than roughly three times as long @@ -294,80 +294,80 @@ if (delay) DELAY(delay); } - if (limit == 0) + if (limit == 0) { + printf("transmitter appears stuck"); return (EIO); + } - com->reg_fcr = fcr; - sio_setreg(com, com_fcr, fcr | FCR_XMT_RST | FCR_RCV_RST); + /* + * Set loopback mode. This avoids having garbage on the wire and + * also allows us send and receive data. We set DTR and RTS to + * avoid the possibility that automatic flow-control prevents + * any data from being sent. + */ + sio_setreg(com, com_mcr, com->reg_mcr | MCR_LOOPBACK|MCR_DTR|MCR_RTS); /* XXX barrier */ /* - * Set the hasfifo field when the device has FIFOs. In that case - * we also flush any possible garbage from the transmitter and - * receiver. Flush the transmitter before flushing the receiver - * to allow having the UART in loopback mode. Since we always - * enable FIFO mode after disabling it first, we won't have more - * than two characters the flush. + * Enable FIFOs. Set DMA mode with the highest trigger level so + * that we can determine the FIFO size. Since this is the first + * time we enable the FIFOs, reset them. */ + com->reg_fcr = FCR_ENABLE | FCR_DMA_MODE | FCR_RX_HIGH; + sio_setreg(com, com_fcr, com->reg_fcr | FCR_XMT_RST | FCR_RCV_RST); + /* XXX barrier */ + + /* Check if the UART has FIFOs. If not, we're done. */ com->hasfifo = (sio_getreg(com, com_iir) & IIR_FIFO_MASK) ? 1 : 0; - if (com->hasfifo) { - limit = 30; - while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) { - if (delay) - DELAY(delay); - } - if (limit == 0) - return (EIO); + if (!com->hasfifo) { + sio_setreg(com, com_mcr, com->reg_mcr); + /* XXX barrier */ + printf("no FIFOs... "); + return (0); + } - limit = 30; - while ((sio_getreg(com, com_lsr) & LSR_RXRDY) && --limit) { - (void)sio_getreg(com, com_data); - /* XXX barrier */ - } - if (limit == 0) - return (EIO); + /* + * We have FIFOs. Flush the transmitter FIFO and shift register. + * This could fill up the receiver FIFO, so we flush that too. + * Bad timing may cause at most one character to remain in the + * receiver FIFO after we're done flushing. This cannot do any + * harm, so we don't worry about it. + */ + limit = 30; + while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) { + if (delay) + DELAY(delay); + } + if (limit == 0) { + sio_setreg(com, com_mcr, com->reg_mcr); + /* XXX barrier */ + printf("transmitter appears stuck... "); + goto fallback; } - return (0); -} - -/* - * Initialize the FIFOs and determine the size of the receiver FIFO. We - * assume that the transmitter FIFO has the same size. First we set DMA - * mode (mode 1) with the highest trigger level. In combination with - * loopback this allows us to determine the size of the receiver FIFO. - * After that we re-initialize with a medium high trigger level. - */ -static int -sioinitfifo(struct com_s *com) -{ - int count, delay, error, limit; - - com->fifosize = 0; - - sio_setreg(com, com_mcr, MCR_LOOPBACK | MCR_DTR | MCR_RTS); - /* XXX barrier */ - - error = siosetfifo(com, FCR_ENABLE | FCR_DMA_MODE | FCR_RX_HIGH); - if (error || !com->hasfifo) { + limit = 10300; + while ((sio_getreg(com, com_lsr) & LSR_RXRDY) && --limit) { + (void)sio_getreg(com, com_data); + /* XXX barrier */ + if (delay) + DELAY(delay); + } + if (limit == 0) { sio_setreg(com, com_mcr, com->reg_mcr); /* XXX barrier */ - return (error); + printf("receiver appears broken... "); + goto fallback; } - /* 1/10th the time to transmit 1 character (estimate). */ - delay = 16000000 * com->reg_dl / com->rclk; - sio_setreg(com, com_ier, IER_ERXRDY); /* XXX barrier */ /* - * We should have a sufficiently clean "pipe" to determine - * the size of the FIFOs. If there was a character lurking - * in the receiver, then it really cannot do any harm. We - * send as much characters as is reasonable and wait for the - * the TX interrupt to be asserted, counting the characters - * as we send them. Based on that count we know the FIFO size. + * We should have a sufficiently clean "pipe" to determine the + * size of the FIFOs. We send as much characters as is reasonable + * and wait for the the RX interrupt to be asserted, counting the + * characters as we send them. Based on that count we know the + * FIFO size. */ count = 0; while ((sio_getreg(com, com_iir) & IIR_RXRDY) == 0 && count < 1030) { @@ -385,19 +385,21 @@ /* XXX barrier */ sio_setreg(com, com_mcr, com->reg_mcr); /* XXX barrier */ - return (EIO); + printf("can't determine FIFO size... "); + goto fallback; } } sio_setreg(com, com_ier, 0); /* XXX barrier */ - error = siosetfifo(com, FCR_ENABLE | FCR_RX_MEDH); - if (error) { - sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ - return (error); - } + /* Reset FIFOs. */ + com->reg_fcr = FCR_ENABLE; + sio_setreg(com, com_fcr, com->reg_fcr | FCR_XMT_RST | FCR_RCV_RST); + /* XXX barrier */ + + sio_setreg(com, com_mcr, com->reg_mcr); + /* XXX barrier */ if (count >= 14 && count < 16) com->fifosize = 16; /* 16550 */ @@ -405,16 +407,17 @@ com->fifosize = 32; /* 16650 */ else if (count >= 56 && count < 64) com->fifosize = 64; /* 16750 */ - else if (count >= 120 && count < 128) + else if (count >= 112 && count < 128) com->fifosize = 128; /* 16950 */ else com->fifosize = 1; /* XXX */ - sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ + printf("count=%d; FIFO=%d... ", count, com->fifosize); + return (0); - device_printf(com->dev, "count=%d, FIFO size=%d\n", count, - com->fifosize); +fallback: + printf("disabling FIFOs... "); + com->hasfifo = 0; return (0); } @@ -583,6 +586,8 @@ int error; u_int flags; + device_printf(dev, "probing... "); + while (sio_inited != 2) if (atomic_cmpset_int(&sio_inited, 0, 1)) { mtx_init(&sio_lock, sio_driver_name, NULL, @@ -621,6 +626,7 @@ if (com->consdev == NULL) { error = sioprobe1(com); if (error) { + printf("sanity check failed\n"); bus_release_resource(dev, com->addr_type, com->addr_rid, com->addr_res); return (error); @@ -644,11 +650,14 @@ /* Initialize the FIFOs. */ error = sioinitfifo(com); if (error) { + printf("failed\n"); bus_release_resource(dev, com->addr_type, com->addr_rid, com->addr_res); return (error); } + printf("ok\n"); + if (device_get_desc(dev) == NULL) siodescribe(com); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Dec 26 0: 0:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 584DD37B408; Thu, 26 Dec 2002 00:00:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF2A337B405 for ; Thu, 26 Dec 2002 00:00:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F68443ED1 for ; Thu, 26 Dec 2002 00:00:14 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBQ80Efh017361 for ; Thu, 26 Dec 2002 00:00:14 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBQ80Dnx017355 for perforce@freebsd.org; Thu, 26 Dec 2002 00:00:13 -0800 (PST) Date: Thu, 26 Dec 2002 00:00:13 -0800 (PST) Message-Id: <200212260800.gBQ80Dnx017355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 22751 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22751 Change 22751 by tzukanov@tzukanov_antares on 2002/12/25 23:59:17 Fixed hang on pmap_release(). Affected files ... .. //depot/projects/s390/sys/s390/conf/GENERIC#5 edit .. //depot/projects/s390/sys/s390/s390/hhc.c#3 edit .. //depot/projects/s390/sys/s390/s390/hmcsc.c#4 edit .. //depot/projects/s390/sys/s390/s390/locore.S#3 edit .. //depot/projects/s390/sys/s390/s390/machdep.c#5 edit .. //depot/projects/s390/sys/s390/s390/pmap.c#6 edit .. //depot/projects/s390/sys/s390/s390/swtch.S#2 edit .. //depot/projects/s390/sys/s390/s390/vm_machdep.c#5 edit Differences ... ==== //depot/projects/s390/sys/s390/conf/GENERIC#5 (text+ko) ==== @@ -34,8 +34,8 @@ options INVARIANT_SUPPORT options INVARIANTS options WITNESS -#options WITNESS_SKIPSPIN -#options DIAGNOSTIC +options WITNESS_SKIPSPIN +options DIAGNOSTIC options DEBUG_LOCKS options KTR @@ -43,7 +43,7 @@ options KTR_COMPILE=KTR_ALL #options KTR_MASK="(KTR_PMAP|KTR_TRAP|KTR_PROC|KTR_SIG|KTR_VM|KTR_SYSC|KTR_VOP|KTR_SMP)" #options KTR_MASK="(KTR_PMAP|KTR_SIG|KTR_PROC)" -options KTR_MASK=KTR_PROC +options KTR_MASK=0 options KTR_CPUMASK=0x3 options KTR_VERBOSE ==== //depot/projects/s390/sys/s390/s390/hhc.c#3 (text+ko) ==== @@ -50,14 +50,15 @@ static void hhc_cnprobe(struct consdev *cn) { - cn->cn_dev = makedev(CDEV_MAJOR, 0); + cn->cn_dev = NULL; cn->cn_pri = CN_INTERNAL; - cn->cn_tp = hhc_tp; } static void hhc_cninit(struct consdev *cn) { + cn->cn_dev = makedev(CDEV_MAJOR, 0); + cn->cn_tp = hhc_tp; } static __inline int ==== //depot/projects/s390/sys/s390/s390/hmcsc.c#4 (text+ko) ==== @@ -63,7 +63,7 @@ static struct sccb_mcdb *mcdb; static struct sccb_mcdbh *mcdbh; static struct sccb_mto *mto; -static struct sccb_go *go; +/*static struct sccb_go *go;*/ static int outcur; static volatile int incur; @@ -129,15 +129,17 @@ static void hmcsc_cnprobe(struct consdev *cn) { - cn->cn_dev = makedev(CDEV_MAJOR, 0); + cn->cn_dev = NULL; cn->cn_pri = CN_NORMAL; - cn->cn_tp = hmcsc_tp; } static void hmcsc_cninit(struct consdev *cn) { struct sccb_em *em; + + cn->cn_dev = makedev(CDEV_MAJOR, 0); + cn->cn_tp = hmcsc_tp; em = (struct sccb_em *)(sccb + 1); edh = (struct sccb_edh *)(sccb + 1); @@ -160,10 +162,12 @@ external_register(EI_SERVICE_SIGNAL, hmcsc_intr); } +#if 0 static void hmcsc_term(struct consdev *cn) { } +#endif static int hmcsc_cngetc(dev_t dev) @@ -366,4 +370,4 @@ } SYSINIT -(hmcsc, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, hmcsc_devinit, NULL); +(hmcsc, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE + CDEV_MAJOR, hmcsc_devinit, NULL); ==== //depot/projects/s390/sys/s390/s390/locore.S#3 (text+ko) ==== @@ -117,9 +117,9 @@ .align 8 .globl sigcode sigcode: - .long 0 basr %r14, %r5 - lhi %r0, SYSCALLNUM(sigreturn) + lr %r2, %r8 + lhi %r0, SYS_sigreturn svc 0 /* not reached */ .align 8 ==== //depot/projects/s390/sys/s390/s390/machdep.c#5 (text+ko) ==== @@ -281,7 +281,7 @@ /* Build the argument list for the signal handler. */ tf->tf_gpr[2] = sig; - tf->tf_gpr[4] = (register_t)&sfp->sf_uc; + tf->tf_gpr[4] = tf->tf_gpr[8] = (register_t)&sfp->sf_uc; tf->tf_gpr[5] = (register_t)catcher; PROC_LOCK(p); if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { ==== //depot/projects/s390/sys/s390/s390/pmap.c#6 (text+ko) ==== @@ -1156,12 +1156,11 @@ pmap_kremove(ks); ks += PAGE_SIZE; #else - ks = kmem_alloc_nofault(kernel_map, pages); + ks = kmem_alloc_nofault(kernel_map, pages * PAGE_SIZE); if (ks == 0) panic("pmap_new_thread: kstack allocation failed"); #endif td->td_kstack = ks; - td->td_kstack_pages = pages; for (i = 0; i < pages; i++) { m = vm_page_grab(ksobj, i, VM_ALLOC_NORMAL | @@ -1248,7 +1247,7 @@ stpg = vm_page_grab(pmap->pm_pteobj, NPTP, VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); - + vm_page_flag_clear(stpg, PG_BUSY); stpg->valid = VM_PAGE_BITS_ALL; pmap_kenter((vm_offset_t)pmap->pm_sto, VM_PAGE_TO_PHYS(stpg)); ==== //depot/projects/s390/sys/s390/s390/swtch.S#2 (text+ko) ==== @@ -30,6 +30,11 @@ /* Mark current pmap inactive. */ l %r1, TD_PROC(%r2) l %r1, P_VMSPACE(%r1) +/* l %r3, PC_CPUMASK(%r5) + lnr %r3, %r3 + l %r4, VM_PMAP + PM_ACTIVE(%r1) + nr %r4, %r3 + st %r4, VM_PMAP + PM_ACTIVE(%r1)*/ xc VM_PMAP + PM_ACTIVE(4, %r1), PC_CPUMASK(%r5) /* Save current context. */ ==== //depot/projects/s390/sys/s390/s390/vm_machdep.c#5 (text+ko) ==== @@ -168,7 +168,15 @@ void cpu_set_upcall_kse(struct thread *td, struct kse *ke) { + struct trapframe *tf; + cpu_thread_clean(td); + + tf = td->td_frame; + tf->tf_gpr[15] = + (int)ke->ke_stack.ss_sp + ke->ke_stack.ss_size; + psw_define_addr(&tf->tf_psw, (u_long)ke->ke_upcall); + suword(&td->td_frame->tf_gpr[2], (u_long)ke->ke_mailbox); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Dec 26 5:46:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C2FD37B405; Thu, 26 Dec 2002 05:46:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E9BE37B401 for ; Thu, 26 Dec 2002 05:46:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3930943EC2 for ; Thu, 26 Dec 2002 05:46:14 -0800 (PST) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBQDkEfh042677 for ; Thu, 26 Dec 2002 05:46:14 -0800 (PST) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBQDkDKK042674 for perforce@freebsd.org; Thu, 26 Dec 2002 05:46:13 -0800 (PST) Date: Thu, 26 Dec 2002 05:46:13 -0800 (PST) Message-Id: <200212261346.gBQDkDKK042674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 22755 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22755 Change 22755 by cvance@cvance_laptop on 2002/12/26 05:45:40 By default always rebuild file_contexts, also remove during 'clean' Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#6 (text+ko) ==== @@ -36,7 +36,7 @@ ALLDOMAINS != echo domains/*.te domains/misc/*.te domains/program/*.te -policy.11: policy.conf +policy.11: policy.conf $(FC) ${CHECKPOLICY} -o policy.11 policy.conf policy.conf: tmp $(FLASKFILES) $(POLICYFILES) $(MACROFILES) @@ -73,4 +73,4 @@ cat $> > $@ clean: - rm -f policy.11 policy.conf tmp/* + rm -f policy.11 policy.conf file_contexts/file_contexts tmp/* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Dec 26 5:47:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9F1C37B405; Thu, 26 Dec 2002 05:47:16 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 829A637B401 for ; Thu, 26 Dec 2002 05:47:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34CBE43EEC for ; Thu, 26 Dec 2002 05:47:16 -0800 (PST) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBQDlGfh042696 for ; Thu, 26 Dec 2002 05:47:16 -0800 (PST) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBQDlFak042693 for perforce@freebsd.org; Thu, 26 Dec 2002 05:47:15 -0800 (PST) Date: Thu, 26 Dec 2002 05:47:15 -0800 (PST) Message-Id: <200212261347.gBQDlFak042693@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 22756 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22756 Change 22756 by cvance@cvance_laptop on 2002/12/26 05:47:01 Modify policy to correctly label /dev/bpf entries, and allow dhclient to read/write to them. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/dhcpc.te#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dhcpc.fc#3 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#3 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/types/device.te#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/dhcpc.te#2 (text+ko) ==== @@ -59,3 +59,6 @@ file_type_auto_trans(dhcpc_t, dhcp_state_t, dhcpc_state_t) can_exec(dhcpc_t, { bin_t shell_exec_t }) + +# Allow dhclient to use /dev/bpf* +allow dhcpc_t bpf_device_t:chr_file rw_file_perms; ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dhcpc.fc#3 (text+ko) ==== @@ -1,8 +1,6 @@ # dhcpcd /etc/dhcpc.*(/.*)? system_u:object_r:etc_dhcpc_t /etc/dhclient.conf system_u:object_r:etc_dhcpc_t -/etc/dhclient-script system_u:object_r:etc_dhcpc_t -/sbin/dhcpcd system_u:object_r:dhcpc_exec_t +/stand/dhclient.* system_u:object_r:etc_dhcpc_t /sbin/dhclient.* system_u:object_r:dhcpc_exec_t -/var/lib/dhcp system_u:object_r:dhcp_state_t -/var/lib/dhcp/dhclient.* system_u:object_r:dhcpc_state_t +/var/db/dhclient.leases system_u:object_r:dhcpc_state_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#3 (text+ko) ==== @@ -58,4 +58,5 @@ genfscon devfs /acpi system_u:object_r:apm_bios_t genfscon devfs /sound -c system_u:object_r:sound_device_t genfscon devfs /usb system_u:object_r:usbdevfs_device_t +genfscon devfs /bpf -c system_u:object_r:bpf_device_t # FLASK ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/types/device.te#2 (text+ko) ==== @@ -104,3 +104,7 @@ # Type for /dev/cpu/mtrr type mtrr_device_t, file_type; + +# Type for /dev/bpf* +type bpf_device_t, file_type; + To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Dec 26 13:39:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9F0437B405; Thu, 26 Dec 2002 13:39:54 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7827837B401 for ; Thu, 26 Dec 2002 13:39:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C5FD43ED8 for ; Thu, 26 Dec 2002 13:39:54 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBQLdrfh009932 for ; Thu, 26 Dec 2002 13:39:54 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBQLdrwe009929 for perforce@freebsd.org; Thu, 26 Dec 2002 13:39:53 -0800 (PST) Date: Thu, 26 Dec 2002 13:39:53 -0800 (PST) Message-Id: <200212262139.gBQLdrwe009929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22764 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22764 Change 22764 by marcel@marcel_nfs on 2002/12/26 13:39:16 Fix a brainfart. The flags used for INTR_FAST is not the same flags used in the device table. Revert to using INTR_FAST and remove PUC_FLAGS_FASTINTR. It appears the flags were previously unused. This fixes the IRQ allocation problem. Affected files ... .. //depot/projects/ia64/sys/dev/puc/puc.c#10 edit .. //depot/projects/ia64/sys/dev/puc/pucvar.h#7 edit Differences ... ==== //depot/projects/ia64/sys/dev/puc/puc.c#10 (text+ko) ==== @@ -163,7 +163,7 @@ irq_setup = BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY | INTR_FAST, puc_intr, sc, &sc->intr_cookie); if (irq_setup == 0) - sc->fastintr = PUC_FLAGS_FASTINTR; + sc->fastintr = INTR_FAST; else irq_setup = BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY, puc_intr, sc, &sc->intr_cookie); @@ -471,7 +471,7 @@ struct puc_softc *sc; sc = (struct puc_softc *)device_get_softc(dev); - if ((flags & PUC_FLAGS_FASTINTR) != sc->fastintr) + if ((flags & INTR_FAST) != sc->fastintr) return (ENXIO); for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { if (sc->sc_ports[i].dev == child) { ==== //depot/projects/ia64/sys/dev/puc/pucvar.h#7 (text+ko) ==== @@ -91,8 +91,7 @@ #define PUC_PORT_TYPE_COM 1 #define PUC_PORT_TYPE_LPT 2 -#define PUC_FLAGS_FASTINTR 0x0001 /* Use fast interrupts. */ -#define PUC_FLAGS_MEMORY 0x0002 /* Use memory mapped I/O. */ +#define PUC_FLAGS_MEMORY 0x0001 /* Use memory mapped I/O. */ #define PUC_PORT_VALID(desc, port) \ ((port) < PUC_MAX_PORTS && (desc)->ports[(port)].type != PUC_PORT_TYPE_NONE) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Dec 26 14:47:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9EAF37B405; Thu, 26 Dec 2002 14:47:18 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E49F37B401 for ; Thu, 26 Dec 2002 14:47:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A80D43EE1 for ; Thu, 26 Dec 2002 14:47:17 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBQMlHfh034677 for ; Thu, 26 Dec 2002 14:47:17 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBQMlGSw034667 for perforce@freebsd.org; Thu, 26 Dec 2002 14:47:16 -0800 (PST) Date: Thu, 26 Dec 2002 14:47:16 -0800 (PST) Message-Id: <200212262247.gBQMlGSw034667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22766 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22766 Change 22766 by marcel@marcel_vaio on 2002/12/26 14:47:08 IFC @22765 Affected files ... .. //depot/projects/ia64/bin/sh/builtins.def#5 integrate .. //depot/projects/ia64/bin/sh/expand.c#7 integrate .. //depot/projects/ia64/bin/sh/expand.h#3 integrate .. //depot/projects/ia64/bin/sh/sh.1#18 integrate .. //depot/projects/ia64/include/Makefile#21 integrate .. //depot/projects/ia64/include/wordexp.h#1 branch .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#16 integrate .. //depot/projects/ia64/lib/libc/gen/wordexp.3#1 branch .. //depot/projects/ia64/lib/libc/gen/wordexp.c#1 branch .. //depot/projects/ia64/lib/libc/locale/mbrune.3#5 integrate .. //depot/projects/ia64/lib/libc/stdio/mktemp.3#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.3#12 integrate .. //depot/projects/ia64/lib/libc/sys/fcntl.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/mmap.2#9 integrate .. //depot/projects/ia64/lib/libc/sys/vfork.2#3 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#14 integrate .. //depot/projects/ia64/lib/libkvm/kvm.3#3 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/ia64/libexec/atrun/atrun.man#2 integrate .. //depot/projects/ia64/libexec/mknetid/netid.5#3 integrate .. //depot/projects/ia64/release/Makefile#31 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.8#10 integrate .. //depot/projects/ia64/sbin/ping/ping.8#5 integrate .. //depot/projects/ia64/share/man/man4/ccd.4#5 integrate .. //depot/projects/ia64/share/man/man4/ieee80211.4#2 integrate .. //depot/projects/ia64/share/man/man4/tcp.4#10 integrate .. //depot/projects/ia64/share/man/man4/worm.4#2 integrate .. //depot/projects/ia64/share/man/man7/hier.7#15 integrate .. //depot/projects/ia64/share/man/man7/ports.7#6 integrate .. //depot/projects/ia64/share/man/man7/security.7#5 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#17 integrate .. //depot/projects/ia64/share/man/man9/DEVICE_PROBE.9#4 integrate .. //depot/projects/ia64/share/man/man9/VOP_ATTRIB.9#9 integrate .. //depot/projects/ia64/share/man/man9/VOP_INACTIVE.9#4 integrate .. //depot/projects/ia64/share/man/man9/VOP_LINK.9#4 integrate .. //depot/projects/ia64/share/man/man9/VOP_OPENCLOSE.9#4 integrate .. //depot/projects/ia64/share/man/man9/accf_data.9#2 integrate .. //depot/projects/ia64/share/man/man9/accf_http.9#4 integrate .. //depot/projects/ia64/share/man/man9/device_add_child.9#2 integrate .. //depot/projects/ia64/share/man/man9/device_enable.9#3 integrate .. //depot/projects/ia64/share/man/man9/device_get_state.9#2 integrate .. //depot/projects/ia64/share/man/man9/device_quiet.9#3 integrate .. //depot/projects/ia64/share/man/man9/device_set_desc.9#2 integrate .. //depot/projects/ia64/share/man/man9/device_set_flags.9#2 integrate .. //depot/projects/ia64/share/man/man9/malloc.9#4 integrate .. //depot/projects/ia64/share/man/man9/vget.9#3 integrate .. //depot/projects/ia64/share/man/man9/vref.9#2 integrate .. //depot/projects/ia64/share/man/man9/vrele.9#2 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#13 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#5 integrate .. //depot/projects/ia64/sys/dev/usb/uhci.c#11 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#26 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#20 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#13 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#10 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#16 integrate .. //depot/projects/ia64/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#39 integrate .. //depot/projects/ia64/sys/kern/kern_event.c#11 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#25 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#18 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#22 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#10 integrate .. //depot/projects/ia64/sys/net/radix.c#8 integrate .. //depot/projects/ia64/sys/net/route.c#8 integrate .. //depot/projects/ia64/sys/net/rtsock.c#16 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#13 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#24 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/ia64/sys/netinet6/in6.c#7 integrate .. //depot/projects/ia64/sys/netinet6/nd6_rtr.c#5 integrate .. //depot/projects/ia64/sys/sys/file.h#14 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#23 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#17 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.australia#2 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.history#7 integrate .. //depot/projects/ia64/usr.bin/chpass/chpass.1#5 integrate .. //depot/projects/ia64/usr.bin/finger/finger.1#6 integrate .. //depot/projects/ia64/usr.bin/passwd/passwd.1#4 integrate .. //depot/projects/ia64/usr.bin/talk/talk.1#6 integrate .. //depot/projects/ia64/usr.bin/tcopy/tcopy.1#3 integrate .. //depot/projects/ia64/usr.bin/tip/tip/tip.1#7 integrate .. //depot/projects/ia64/usr.sbin/apm/apm.8#5 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.4#3 integrate .. //depot/projects/ia64/usr.sbin/ctm/ctm_rmail/ctm_rmail.1#3 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntpq.8#5 integrate .. //depot/projects/ia64/usr.sbin/rtsold/rtsold.8#3 integrate .. //depot/projects/ia64/usr.sbin/sicontrol/sicontrol.8#4 integrate .. //depot/projects/ia64/usr.sbin/usbd/usbd.c#4 integrate Differences ... ==== //depot/projects/ia64/bin/sh/builtins.def#5 (text+ko) ==== @@ -35,7 +35,7 @@ # SUCH DAMAGE. # # @(#)builtins.def 8.4 (Berkeley) 5/4/95 -# $FreeBSD: src/bin/sh/builtins.def,v 1.12 2002/07/23 11:50:53 tjr Exp $ +# $FreeBSD: src/bin/sh/builtins.def,v 1.13 2002/12/26 14:28:54 tjr Exp $ # # This file lists all the builtin commands. The first column is the name @@ -93,3 +93,4 @@ ulimitcmd ulimit testcmd test [ bindcmd bind +wordexpcmd wordexp ==== //depot/projects/ia64/bin/sh/expand.c#7 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.39 2002/10/08 11:22:49 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.40 2002/12/26 14:28:54 tjr Exp $"); #include #include @@ -52,6 +52,7 @@ #include #include #include +#include /* * Routines to expand arguments to commands. We have to deal with @@ -1521,3 +1522,24 @@ STPUTC(*p++, buf); return buf; } + +/* + * Do most of the work for wordexp(3). + */ + +int +wordexpcmd(int argc, char **argv) +{ + size_t len; + int i; + + out1fmt("%08x", argc - 1); + for (i = 1, len = 0; i < argc; i++) + len += strlen(argv[i]); + out1fmt("%08x", (int)len); + for (i = 1; i < argc; i++) { + out1str(argv[i]); + out1c('\0'); + } + return (0); +} ==== //depot/projects/ia64/bin/sh/expand.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)expand.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/expand.h,v 1.10 2002/02/02 06:50:46 imp Exp $ + * $FreeBSD: src/bin/sh/expand.h,v 1.11 2002/12/26 14:28:54 tjr Exp $ */ struct strlist { @@ -65,3 +65,4 @@ int patmatch(char *, char *, int); void rmescapes(char *); int casematch(union node *, char *); +int wordexpcmd(int, char **); ==== //depot/projects/ia64/bin/sh/sh.1#18 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.82 2002/12/23 15:21:38 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.83 2002/12/24 13:41:45 ru Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -158,7 +158,7 @@ The long name for an option may be specified as an argument to the .Fl /+o option of -.Xr sh 1 . +.Nm . Once the shell is running, the long name for an option may be specified as an argument to the .Fl /+o ==== //depot/projects/ia64/include/Makefile#21 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.191 2002/12/03 15:05:32 rwatson Exp $ +# $FreeBSD: src/include/Makefile,v 1.192 2002/12/26 14:30:55 tjr Exp $ # # Doing a make install builds /usr/include # @@ -18,7 +18,8 @@ resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \ stdbool.h stddef.h stdio.h stdlib.h strhash.h string.h stringlist.h \ strings.h sysexits.h tar.h time.h timeconv.h timers.h ttyent.h \ - ulimit.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h + ulimit.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h \ + wordexp.h MHDRS= float.h floatingpoint.h stdarg.h varargs.h ==== //depot/projects/ia64/lib/libc/gen/Makefile.inc#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.98 2002/11/18 09:50:55 ru Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.99 2002/12/26 14:34:18 tjr Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -29,7 +29,7 @@ sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \ syslog.c telldir.c termios.c time.c times.c timezone.c ttyname.c \ ttyslot.c ualarm.c ulimit.c uname.c unvis.c usleep.c utime.c \ - valloc.c vis.c wait.c wait3.c waitpid.c + valloc.c vis.c wait.c wait3.c waitpid.c wordexp.c # machine-dependent gen sources .if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc) @@ -56,7 +56,7 @@ strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \ ttyname.3 tzset.3 ualarm.3 ucontext.3 ulimit.3 uname.3 \ - unvis.3 usleep.3 utime.3 valloc.3 vis.3 + unvis.3 usleep.3 utime.3 valloc.3 vis.3 wordexp.3 MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3 MLINKS+=ctermid.3 ctermid_r.3 @@ -131,3 +131,4 @@ MLINKS+=tzset.3 tzsetwall.3 MLINKS+=unvis.3 strunvis.3 unvis.3 strunvisx.3 MLINKS+=vis.3 strvis.3 vis.3 strvisx.3 +MLINKS+=wordexp.3 wordfree.3 ==== //depot/projects/ia64/lib/libc/locale/mbrune.3#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mbrune.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/locale/mbrune.3,v 1.13 2002/12/18 13:33:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbrune.3,v 1.14 2002/12/24 13:41:45 ru Exp $ .\" .Dd April 19, 1994 .Dt MBRUNE 3 @@ -157,7 +157,6 @@ .Fa pattern does not appear in the string. .Sh "SEE ALSO -.Xr mbrune 3 , .Xr rune 3 , .Xr setlocale 3 , .Xr euc 4 , ==== //depot/projects/ia64/lib/libc/stdio/mktemp.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mktemp.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/mktemp.3,v 1.18 2002/12/18 12:45:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/mktemp.3,v 1.19 2002/12/24 13:41:45 ru Exp $ .\" .Dd February 11, 1998 .Dt MKTEMP 3 @@ -102,7 +102,7 @@ The .Fn mkdtemp function makes the same replacement to the template as in -.Xr mktemp 3 +.Fn mktemp and creates the template directory, mode 0700. .Sh RETURN VALUES The ==== //depot/projects/ia64/lib/libc/stdlib/malloc.3#12 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)malloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.59 2002/12/20 01:01:24 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.60 2002/12/24 13:41:45 ru Exp $ .\" .Dd August 27, 1996 .Dt MALLOC 3 @@ -487,7 +487,7 @@ .Fx 2.2 . .Pp The -.Xr reallocf 3 +.Fn reallocf function first appeared in .Fx 3.0 . .Sh AUTHORS ==== //depot/projects/ia64/lib/libc/sys/fcntl.2#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fcntl.2 8.2 (Berkeley) 1/12/94 -.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.40 2002/12/19 09:40:24 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.41 2002/12/24 13:41:45 ru Exp $ .\" .Dd January 12, 1994 .Dt FCNTL 2 @@ -343,7 +343,7 @@ Note that .Xr flock 2 and -.Xr fcntl 2 +.Fn fcntl locks may be safely used concurrently but .Fn fcntl F_GETLK returns \-1 in ==== //depot/projects/ia64/lib/libc/sys/mmap.2#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.47 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.48 2002/12/24 16:52:30 ru Exp $ .\" .Dd November 17, 2001 .Dt MMAP 2 @@ -136,7 +136,7 @@ Region is not included in a core file. .It Dv MAP_NOSYNC Causes data dirtied via this VM map to be flushed to physical media -only when necessary (usually by the pager) rather then gratuitously. +only when necessary (usually by the pager) rather than gratuitously. Typically this prevents the update daemons from flushing pages dirtied through such maps and thus allows efficient sharing of memory across unassociated processes using a file-backed shared memory map. @@ -175,7 +175,7 @@ to implement a file-based shared memory store. It is recommended that you create the backing store by .Fn write Ns ing -zero's to the backing file rather then +zero's to the backing file rather than .Fn ftruncate Ns ing it. You can test file fragmentation by observing the KB/t (kilobytes per @@ -200,7 +200,7 @@ implements a coherent file system buffer cache. However, it may be used to associate dirty VM pages with file system buffers and thus cause -them to be flushed to physical media sooner rather then later. +them to be flushed to physical media sooner rather than later. .It Dv MAP_PRIVATE Modifications are private. .It Dv MAP_SHARED ==== //depot/projects/ia64/lib/libc/sys/vfork.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)vfork.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.19 2002/12/18 09:22:32 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.20 2002/12/24 13:41:45 ru Exp $ .\" .Dd June 4, 1993 .Dt VFORK 2 @@ -115,7 +115,7 @@ mechanisms are implemented. Users should not depend on the memory sharing semantics of -.Xr vfork 2 +.Fn vfork as it will, in that case, be made synonymous to .Xr fork 2 . .Pp ==== //depot/projects/ia64/lib/libc_r/man/pthread_rwlock_wrlock.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlock_wrlock.3,v 1.4 2001/10/01 16:09:09 ru Exp $ +.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlock_wrlock.3,v 1.5 2002/12/24 13:41:45 ru Exp $ .\" .Dd August 4, 1998 .Dt PTHREAD_RWLOCK_WRLOCK 3 @@ -61,9 +61,10 @@ functions will return zero. Otherwise an error number will be returned to indicate the error. .Sh SEE ALSO -.Xr pthread_rwlock_trywrlock 3 , -.Xr pthread_rwlock_unlock 3 , -.Xr pthread_rwlock_wrlock 3 +.Xr pthread_rwlock_init 3 , +.Xr pthread_rwlock_rdlock 3 , +.Xr pthread_rwlock_tryrdlock 3 , +.Xr pthread_rwlock_unlock 3 .Sh STANDARDS The .Fn pthread_rwlock_wrlock ==== //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_setpshared.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlockattr_setpshared.3,v 1.7 2001/10/01 16:09:09 ru Exp $ +.\" $FreeBSD: src/lib/libc_r/man/pthread_rwlockattr_setpshared.3,v 1.8 2002/12/24 13:41:45 ru Exp $ .\" .Dd August 4, 1998 .Dt PTHREAD_RWLOCKATTR_SETPSHARED 3 @@ -60,8 +60,8 @@ function will return zero. Otherwise an error number will be returned to indicate the error. .Sh SEE ALSO +.Xr pthread_rwlockattr_getpshared 3 , .Xr pthread_rwlockattr_init 3 , -.Xr pthread_rwlockattr_setpshared 3 , .Xr pthread_rwlock_init 3 .Sh STANDARDS The ==== //depot/projects/ia64/lib/libdisk/disk.c#14 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.110 2002/11/17 13:51:22 nyan Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.111 2002/12/26 15:50:45 nyan Exp $"); #include #include @@ -166,6 +166,8 @@ exit (0); } + if (s == 0) + return (NULL); d->sector_size = s; len /= s; /* media size in number of sectors. */ @@ -481,6 +483,8 @@ { #if !defined(__ia64__) #ifdef PC98 + if (d->sector_size == 0) + return; if (bootipl_size % d->sector_size != 0) return; if (d->bootipl) @@ -509,6 +513,8 @@ memcpy(d->bootmenu, bootmenu, bootmenu_size); } #else + if (d->sector_size == 0) + return; if (s % d->sector_size != 0) return; if (d->bootmgr) ==== //depot/projects/ia64/lib/libkvm/kvm.3#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)kvm.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libkvm/kvm.3,v 1.10 2002/12/04 18:57:45 ru Exp $ +.\" $FreeBSD: src/lib/libkvm/kvm.3,v 1.11 2002/12/24 13:41:45 ru Exp $ .\" .Dd June 4, 1993 .Dt KVM 3 @@ -46,7 +46,7 @@ .Lb libkvm .Sh DESCRIPTION The -.Xr kvm 3 +.Nm library provides a uniform interface for accessing kernel virtual memory images, including live systems and crash dumps. Access to live systems is via ==== //depot/projects/ia64/lib/libpthread/man/pthread_rwlock_wrlock.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libpthread/man/pthread_rwlock_wrlock.3,v 1.5 2002/09/16 19:29:29 mini Exp $ +.\" $FreeBSD: src/lib/libpthread/man/pthread_rwlock_wrlock.3,v 1.6 2002/12/24 13:41:45 ru Exp $ .\" .Dd August 4, 1998 .Dt PTHREAD_RWLOCK_WRLOCK 3 @@ -61,9 +61,9 @@ functions will return zero. Otherwise an error number will be returned to indicate the error. .Sh SEE ALSO -.Xr pthread_rwlock_trywrlock 3 , -.Xr pthread_rwlock_unlock 3 , -.Xr pthread_rwlock_wrlock 3 +.Xr pthread_rwlock_rdlock 3 , +.Xr pthread_rwlock_tryrdlock 3 , +.Xr pthread_rwlock_unlock 3 .Sh STANDARDS The .Fn pthread_rwlock_wrlock ==== //depot/projects/ia64/lib/libpthread/man/pthread_rwlockattr_setpshared.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libpthread/man/pthread_rwlockattr_setpshared.3,v 1.8 2002/09/16 19:29:29 mini Exp $ +.\" $FreeBSD: src/lib/libpthread/man/pthread_rwlockattr_setpshared.3,v 1.9 2002/12/24 13:41:46 ru Exp $ .\" .Dd August 4, 1998 .Dt PTHREAD_RWLOCKATTR_SETPSHARED 3 @@ -60,8 +60,8 @@ function will return zero. Otherwise an error number will be returned to indicate the error. .Sh SEE ALSO +.Xr pthread_rwlockattr_getpshared 3 , .Xr pthread_rwlockattr_init 3 , -.Xr pthread_rwlockattr_setpshared 3 , .Xr pthread_rwlock_init 3 .Sh STANDARDS The ==== //depot/projects/ia64/libexec/atrun/atrun.man#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/libexec/atrun/atrun.man,v 1.10 2001/07/10 10:49:45 ru Exp $ +.\" $FreeBSD: src/libexec/atrun/atrun.man,v 1.11 2002/12/24 13:41:46 ru Exp $ .Dd April 12, 1995 .Dt ATRUN 8 .Os @@ -24,7 +24,7 @@ .Ed .Pp so that -.Xr atrun 8 +.Nm gets invoked every five minutes. .Pp At every invocation, ==== //depot/projects/ia64/libexec/mknetid/netid.5#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/libexec/mknetid/netid.5,v 1.2 2002/01/14 16:59:01 ru Exp $ +.\" $FreeBSD: src/libexec/mknetid/netid.5,v 1.3 2002/12/24 13:41:46 ru Exp $ .\" .Dd January 13, 1996 .Dt NETID 5 @@ -70,7 +70,7 @@ .Sm on .Pp The third type refers to records from a -.Xr netid 5 +.Nm file other than the two types above. .Sh EXAMPLES A configuration file might look like the following: ==== //depot/projects/ia64/release/Makefile#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.738 2002/12/17 20:19:37 obrien Exp $ +# $FreeBSD: src/release/Makefile,v 1.739 2002/12/26 12:20:25 ru Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -421,12 +421,33 @@ echo "trap 'umount /dev || true' 0" >> ${CHROOTDIR}/mk echo "_RELTARGET=\$${1:-doRELEASE}" >> ${CHROOTDIR}/mk .for var in \ - AUTO_KEYBOARD_DETECT BOOT_CONFIG BUILDNAME \ - CD_EXTRA_BITS DISTRIBUTIONS DOC_LANG DOMINIMALDOCPORTS \ - EXTRA_SRC FIXCRYPTO KERNELS KERNEL_FLAGS \ - MAKE_ISOS NOCDROM NODOC NO_FLOPPIES NOKERBEROS NOPORTS NOSHARED \ - NOSRC NO_CPU_CFLAGS NO_CPU_COPTFLAGS NO_SENDMAIL RELEASETAG \ - RELNOTES_LANG TARGET TARGET_ARCH WORLD_FLAGS + AUTO_KEYBOARD_DETECT \ + BOOT_CONFIG \ + BUILDNAME \ + CD_EXTRA_BITS \ + DISTRIBUTIONS \ + DOC_LANG \ + DOMINIMALDOCPORTS \ + EXTRA_SRC \ + FIXCRYPTO \ + KERNELS \ + KERNEL_FLAGS \ + MAKE_ISOS \ + NOCDROM \ + NODOC \ + NOKERBEROS \ + NOPORTS \ + NOSHARED \ + NOSRC \ + NO_CPU_CFLAGS \ + NO_CPU_COPTFLAGS \ + NO_FLOPPIES \ + NO_SENDMAIL \ + RELEASETAG \ + RELNOTES_LANG \ + TARGET \ + TARGET_ARCH \ + WORLD_FLAGS .if defined(${var}) echo "export ${var}=\"${${var}}\"" >> ${CHROOTDIR}/mk .endif ==== //depot/projects/ia64/sbin/disklabel/disklabel.8#10 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)disklabel.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.42 2002/11/25 15:43:18 ru Exp $ +.\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.43 2002/12/24 13:41:46 ru Exp $ .\" .Dd July 30, 1999 .Dt DISKLABEL 8 @@ -470,7 +470,7 @@ Here you will define disk slices for your system. .It Use -.Xr disklabel 8 +.Nm to define and write partitions and mount points. You are not required to define the mount points here though, they can be defined later using ==== //depot/projects/ia64/sbin/ping/ping.8#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ping.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/sbin/ping/ping.8,v 1.36 2002/10/02 03:24:27 dd Exp $ +.\" $FreeBSD: src/sbin/ping/ping.8,v 1.37 2002/12/24 16:52:30 ru Exp $ .\" .Dd October 2, 2002 .Dt PING 8 @@ -134,7 +134,7 @@ .Em between sending each packet . The default is to wait for one second between each packet. The wait time may be fractional, but only the super-user may specify -values less then 1 second. +values less than 1 second. This option is incompatible with the .Fl f option. ==== //depot/projects/ia64/share/man/man4/ccd.4#5 (text+ko) ==== @@ -32,7 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ccd.4,v 1.25 2002/12/12 17:25:56 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ccd.4,v 1.26 2002/12/24 16:52:30 ru Exp $ .\" .Dd August 9, 1995 .Dt CCD 4 @@ -164,7 +164,7 @@ Currently .Nm uses a dual seek zone model to optimize reads for a multi-tasking load -rather then a sequential load. +rather than a sequential load. .Pp In an event of a disk failure, you can use ==== //depot/projects/ia64/share/man/man4/ieee80211.4#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ieee80211.4,v 1.4 2001/10/03 03:05:26 bde Exp $ +.\" $FreeBSD: src/share/man/man4/ieee80211.4,v 1.5 2002/12/24 16:52:30 ru Exp $ .\" .Dd February 23, 2001 .Dt IEEE80211 4 @@ -172,7 +172,7 @@ .Va i_data and .Va i_len . -The length should be no longer then 32 characters. +The length should be no longer than 32 characters. .It Dv IEEE80211_IOC_WEP Set the current WEP mode to the value given in .Va i_val . ==== //depot/projects/ia64/share/man/man4/tcp.4#10 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.31 2002/12/23 14:51:18 ru Exp $ +.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.32 2002/12/24 16:52:30 ru Exp $ .\" .Dd February 14, 1995 .Dt TCP 4 @@ -341,7 +341,7 @@ This puts an upper bound on the bandwidth delay product window, in bytes. This value should not generally be modified but may be used to set a global per-connection limit on queued data, potentially allowing you to -intentionally set a less then optimum limit to smooth data flow over a +intentionally set a less than optimum limit to smooth data flow over a network while still being able to specify huge internal TCP buffers. .It tcp.inflight_stab The bandwidth delay product algorithm requires a slightly larger window ==== //depot/projects/ia64/share/man/man4/worm.4#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/worm.4,v 1.25 2001/08/17 06:42:31 kris Exp $ +.\" $FreeBSD: src/share/man/man4/worm.4,v 1.26 2002/12/24 13:41:46 ru Exp $ .\" " .Dd October 15, 1998 .Dt WORM 4 @@ -60,7 +60,7 @@ layer. The new .Tn SCSI layer doesn't include a -.Xr worm 4 +.Nm driver, and isn't likely to include one in the future. Future in-kernel support for CD-R/CD-RW/DVD drives will likely be implemented through the .Xr cd 4 ==== //depot/projects/ia64/share/man/man7/hier.7#15 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.79 2002/12/12 17:25:57 ru Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.80 2002/12/24 13:41:46 ru Exp $ .\" .Dd June 5, 1993 .Dt HIER 7 @@ -408,7 +408,7 @@ .Fx ports framework. Within local/, the general layout sketched out by -.Xr hier 7 +.Nm for /usr should be used. Exceptions are the man directory (directly under local/ rather than under local/share/), ports documentation (in share/doc//), ==== //depot/projects/ia64/share/man/man7/ports.7#6 (text+ko) ==== @@ -23,7 +23,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/share/man/man7/ports.7,v 1.34 2002/10/22 23:11:38 keramida Exp $ +.\" $FreeBSD: src/share/man/man7/ports.7,v 1.35 2002/12/24 13:41:46 ru Exp $ .\" .Dd January 25, 1998 .Dt PORTS 7 @@ -380,6 +380,6 @@ chapter of .%B "The FreeBSD Handbook" , and -.Xr ports 7 . +this man page. .Pp This man page is too long. ==== //depot/projects/ia64/share/man/man7/security.7#5 (text+ko) ==== @@ -2,7 +2,7 @@ .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in .\" the source tree. .\" -.\" $FreeBSD: src/share/man/man7/security.7,v 1.29 2002/12/12 17:25:57 ru Exp $ +.\" $FreeBSD: src/share/man/man7/security.7,v 1.30 2002/12/24 16:52:31 ru Exp $ .\" .Dd September 18, 1999 .Dt SECURITY 7 @@ -74,7 +74,7 @@ It may not be able to take your machine down, but it can fill up Internet pipe. .Pp -A user account compromise is even more common then a D.O.S. attack. Many +A user account compromise is even more common than a D.O.S. attack. Many sysadmins still run standard telnetd, rlogind, rshd, and ftpd servers on their machines. These servers, by default, do not operate over encrypted connections. The result is that if you have any moderate-sized user base, @@ -174,7 +174,7 @@ may be the better solution since the wheel mechanism still allows an intruder to break root if the intruder has gotten hold of your password file and can break into a staff account. While having the wheel mechanism -is better then having nothing at all, it isn't necessarily the safest +is better than having nothing at all, it isn't necessarily the safest option. .Pp An indirect way to secure the root account is to secure your staff accounts @@ -276,7 +276,7 @@ was found in Xlib in 1998 that made xterm (which is typically suid) vulnerable. -It is better to be safe then sorry and the prudent sysadmin will restrict suid +It is better to be safe than sorry and the prudent sysadmin will restrict suid binaries that only staff should run to a special group that only staff can access, and get rid of .Pq Li "chmod 000" @@ -369,7 +369,7 @@ last layer of your security onion is perhaps the most important - detection. The rest of your security is pretty much useless (or, worse, presents you with a false sense of safety) if you cannot detect potential incursions. Half -the job of the onion is to slow down the attacker rather then stop him +the job of the onion is to slow down the attacker rather than stop him in order to give the detection side of the equation a chance to catch him in the act. .Pp @@ -413,7 +413,7 @@ and .Pa /usr .Pp -When using ssh rather then NFS, writing the security script is much more +When using ssh rather than NFS, writing the security script is much more difficult. You essentially have to .Pa scp the scripts to the client box in order to run them, making them visible, and @@ -608,7 +608,7 @@ These routes typically timeout in 1600 seconds or so. If the kernel detects that the cached route table has gotten too big it will dynamically reduce the rtexpire but will never decrease it to -less then rtminexpire. There are two problems: (1) The kernel does not react +less than rtminexpire. There are two problems: (1) The kernel does not react quickly enough when a lightly loaded server is suddenly attacked, and (2) The rtminexpire is not low enough for the kernel to survive a sustained attack. If your servers are connected to the internet via a T3 or better it may be ==== //depot/projects/ia64/share/man/man7/tuning.7#17 (text+ko) ==== @@ -2,7 +2,7 @@ .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in .\" the source tree. .\" -.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.57 2002/12/23 15:05:18 ru Exp $ +.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.58 2002/12/24 16:52:31 ru Exp $ .\" .Dd June 25, 2002 .Dt TUNING 7 @@ -496,7 +496,7 @@ bandwidth limitations in order to ensure that they are not charged for using too much bandwidth. .Pp -Setting the send or receive TCP buffer to values larger then 65535 will result +Setting the send or receive TCP buffer to values larger than 65535 will result in a marginal performance improvement unless both hosts support the window scaling extension of the TCP protocol, which is controlled by the .Va net.inet.tcp.rfc1323 ==== //depot/projects/ia64/share/man/man9/DEVICE_PROBE.9#4 (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. .\" -.\" $FreeBSD: src/share/man/man9/DEVICE_PROBE.9,v 1.13 2002/03/18 10:43:49 ru Exp $ +.\" $FreeBSD: src/share/man/man9/DEVICE_PROBE.9,v 1.15 2002/12/24 16:52:31 ru Exp $ .\" .Dd June 16, 1998 .Dt DEVICE_PROBE 9 @@ -75,13 +75,12 @@ A value equal to or less than zero indicates success, greater than zero indicates an error (errno). For values equal to or less than zero: zero indicates highest priority, no further probing is done; -for a value less then zero, the lower the value the lower the +for a value less than zero, the lower the value the lower the priority, e.g. -100 indicates a lower priority than -50. .Sh SEE ALSO .Xr device 9 , .Xr DEVICE_DETACH 9 , .Xr DEVICE_IDENTIFY 9 , -.Xr DEVICE_PROBE 9 , .Xr DEVICE_SHUTDOWN 9 .Sh AUTHORS This man page was written by ==== //depot/projects/ia64/share/man/man9/VOP_ATTRIB.9#9 (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. .\" -.\" $FreeBSD: src/share/man/man9/VOP_ATTRIB.9,v 1.22 2002/12/12 17:25:58 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_ATTRIB.9,v 1.23 2002/12/24 13:41:46 ru Exp $ .\" .Dd July 24, 1996 .Os @@ -60,7 +60,7 @@ .El .Pp Attributes which are not being modified by -.Xr VOP_SETATTR 9 +.Fn VOP_SETATTR should be set to the value .Dv VNOVAL ; .Fn VATTR_NULL @@ -69,21 +69,21 @@ .Fa *vap prior to setting specific values. .Sh LOCKS -.Xr VOP_GETATTR 9 +.Fn VOP_GETATTR expects the vnode to be locked on entry and will leave the vnode locked on return. The lock type can be either shared or exclusive. .Pp -.Xr VOP_SETATTR 9 +.Fn VOP_SETATTR expects the vnode to be locked on entry and will leave the vnode locked on return. The lock type must be exclusive. .Sh RETURN VALUES -.Xr VOP_GETATTR 9 +.Fn VOP_GETATTR returns 0 if it was able to retrieve the attribute data via .Fa *vap , otherwise an appropriate error is returned. -.Xr VOP_SETATTR 9 +.Fn VOP_SETATTR returns zero if the attributes were changed successfully, otherwise an appropriate error is returned. .Sh PSEUDOCODE ==== //depot/projects/ia64/share/man/man9/VOP_INACTIVE.9#4 (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. .\" -.\" $FreeBSD: src/share/man/man9/VOP_INACTIVE.9,v 1.10 2002/12/12 17:25:58 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_INACTIVE.9,v 1.11 2002/12/24 13:41:46 ru Exp $ .\" .Dd July 24, 1996 .Os @@ -49,12 +49,12 @@ the vnode being reclaimed .El .Pp -.Xr VOP_INACTIVE 9 +.Fn VOP_INACTIVE is called when the kernel is no longer using the vnode. This may be because the reference count reaches zero or it may be that the file system is being forcibly unmounted while there are open files. It can be used to reclaim space for 'open but deleted' files. -.Xr VOP_RECLAIM 9 +.Fn VOP_RECLAIM >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Dec 27 16:13: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01EEC37B405; Fri, 27 Dec 2002 16:12:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D2EC37B401 for ; Fri, 27 Dec 2002 16:12:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3612743EA9 for ; Fri, 27 Dec 2002 16:12:59 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBS0Cxfh078534 for ; Fri, 27 Dec 2002 16:12:59 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBS0CwdE078531 for perforce@freebsd.org; Fri, 27 Dec 2002 16:12:58 -0800 (PST) Date: Fri, 27 Dec 2002 16:12:58 -0800 (PST) Message-Id: <200212280012.gBS0CwdE078531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22822 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22822 Change 22822 by green@green_laptop_2 on 2002/12/27 16:12:33 Add to libsebsd the query_user_context() call which has a PAM conversation with the user to determine what domain to transition to, and add support for this to login(1). Users can now finally log in and receive the correct domain, via the console so far. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libsebsd/Makefile#4 edit .. //depot/projects/trustedbsd/mac/lib/libsebsd/query_user_context.c#1 add .. //depot/projects/trustedbsd/mac/lib/libsebsd/sebsd.h#5 edit .. //depot/projects/trustedbsd/mac/usr.bin/login/Makefile#6 edit .. //depot/projects/trustedbsd/mac/usr.bin/login/login.c#26 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libsebsd/Makefile#4 (text+ko) ==== @@ -11,7 +11,7 @@ NOMAN= SRCS= system.c security_get_user_contexts.c get_ordered_context_list.c \ - getseccontext.c + getseccontext.c query_user_context.c INCS= sebsd_context.h sebsd_ss.h sebsd_proc.h sebsd_fs.h sebsd.h \ sebsd_syscalls.h flask_types.h ==== //depot/projects/trustedbsd/mac/lib/libsebsd/sebsd.h#5 (text+ko) ==== @@ -37,6 +37,8 @@ #ifndef _SEBSD_H #define _SEBSD_H +#include +#include #include "flask_types.h" #include "sebsd_syscalls.h" @@ -52,6 +54,8 @@ char ***ordered_list, size_t *length); int get_default_context(const char *username, const char *from_context, char **default_context); +int query_user_context(pam_handle_t *pamh, char **ordered_context_list, + size_t length, char **retcontext); int sebsd_avc_toggle(void); int sebsd_enabled(void); ==== //depot/projects/trustedbsd/mac/usr.bin/login/Makefile#6 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= login SRCS= login.c login_fbtab.c CFLAGS+=-DLOGALL -DPADD= ${LIBUTIL} ${LIBCRYPT} ${LIBPAM} -LDADD= -lutil -lcrypt ${MINUSLPAM} +DPADD= ${LIBUTIL} ${LIBCRYPT} ${LIBPAM} ${LIBSEBSD} +LDADD= -lutil -lcrypt ${MINUSLPAM} -lsebsd MAN= login.1 login.access.5 BINOWN= root BINMODE=4555 ==== //depot/projects/trustedbsd/mac/usr.bin/login/login.c#26 (text+ko) ==== @@ -68,6 +68,7 @@ #include #include #include +#include #include #include #include @@ -156,6 +157,8 @@ static int pam_cred_established; static int pam_session_established; +extern char **environ; + int main(int argc, char *argv[]) { @@ -172,6 +175,7 @@ const char *tp; const char *shell = NULL; login_cap_t *lc = NULL; + mac_t execlabel = NULL; const char *label_string; pid_t pid; @@ -491,6 +495,34 @@ } /* + * Determine if we must execute a transition when we + * run our shell, for MAC policies which require it. For now, + * this is just SEBSD, and therefore not generic at all. + */ + if (sebsd_enabled()) { + char *labeltext, *queried, **contexts; + size_t ncontexts; + int n; + + if (get_ordered_context_list(username, NULL, &contexts, + &ncontexts) != 0 || ncontexts == 0) + goto nosebsd; + if (query_user_context(pamh, contexts, ncontexts, + &queried) != 0 || + asprintf(&labeltext, "sebsd/%s", queried) == -1 || + mac_from_text(&execlabel, labeltext) != 0) { + syslog(LOG_ERR, "Determining SEBSD domain transition:" + " %m"); + bail(NO_SLEEP_EXIT, 1); + } + free(labeltext); + for (n = 0; n < ncontexts; n++) + free(contexts[n]); + free(contexts); + } +nosebsd: + + /* * Destroy environment unless user has requested its * preservation - but preserve TERM in all cases */ @@ -646,7 +678,15 @@ err(1, "asprintf()"); } - execlp(shell, arg0, (char *)0); + if (execlabel != NULL) { + char *shell_argv[2]; + + shell_argv[0] = arg0; + shell_argv[1] = NULL; + mac_execve(pwd->pw_shell, shell_argv, environ, execlabel); + } else { + execlp(shell, arg0, (char *)0); + } err(1, "%s", shell); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Dec 27 17:32:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5533237B405; Fri, 27 Dec 2002 17:32:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E0A9F37B401 for ; Fri, 27 Dec 2002 17:32:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BD4443EB2 for ; Fri, 27 Dec 2002 17:32:37 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBS1Wbfh007304 for ; Fri, 27 Dec 2002 17:32:37 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBS1WakY007301 for perforce@freebsd.org; Fri, 27 Dec 2002 17:32:36 -0800 (PST) Date: Fri, 27 Dec 2002 17:32:36 -0800 (PST) Message-Id: <200212280132.gBS1WakY007301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22825 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22825 Change 22825 by marcel@marcel_nfs on 2002/12/27 17:31:54 o Move ia64_sapics and ia64_sapic_count from interrupt.c to sapic.c. o Remove ia64_add_sapic(). Adding a sapic to the array is done in sapic_create directly now. o Update the interrupt counter as early as possible to help diagnose interrupt problems. o Create a new sysctl "hw.apic" that shows the RTEs for all (x)APICs in the system. This may be combined with interrupt counters as an alternative interface for vmstat -i. It may also go away... In ia64_enable(), we have a serious problem. We use the IRQ to determine the trigger mode and polarity. We assume that the first 16 IRQs are identity mapped onto the the dual-PIC IRQs used by legacy systems to support 8259 compatibility mode. Those interrupts are hardcoded to be edge sensitive and active high. All other (higher) IRQs are assumed (and hardcode) to be level sensitive active low. The latter is not true. On the HP rx2600 the ACPI based sio(4) devices are edge triggered active high and have vectors 66 and 67. DANGER, WILL ROBINSON: this change hardcodes the trigger mode and polarity for 3 interrupt vectors to be edge sensitive active high. Do not use this code unless you know it cannot harm. The kludge committed to get a serial console on the HP box in the cluster until we have figured where and how we can get information about interrupts and specificly about trigger mode and polarity. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#18 edit .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#15 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#18 (text+ko) ==== @@ -206,11 +206,12 @@ volatile long *cntp; /* interrupt counter */ }; -static struct sapic *ia64_sapics[16]; /* XXX make this resizable */ -static int ia64_sapic_count; static struct mtx ia64_intrs_lock; static struct ia64_intr *ia64_intrs[256]; +extern struct sapic *ia64_sapics[]; +extern int ia64_sapic_count; + static void ithds_init(void *dummy) { @@ -219,13 +220,6 @@ } SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL); -void -ia64_add_sapic(struct sapic *sa) -{ - - ia64_sapics[ia64_sapic_count++] = sa; -} - static void ia64_enable(int vector) { @@ -234,14 +228,11 @@ irq = vector - IA64_HARDWARE_IRQ_BASE; for (i = 0; i < ia64_sapic_count; i++) { struct sapic *sa = ia64_sapics[i]; - if (irq >= sa->sa_base && irq <= sa->sa_limit) - sapic_enable(sa, irq - sa->sa_base, vector, - (irq < 16 - ? SAPIC_TRIGGER_EDGE - : SAPIC_TRIGGER_LEVEL), - (irq < 16 - ? SAPIC_POLARITY_HIGH - : SAPIC_POLARITY_LOW)); + if (irq < sa->sa_base || irq > sa->sa_limit) + continue; + sapic_enable(sa, irq - sa->sa_base, vector, + (irq < 16) ? SAPIC_TRIGGER_EDGE : SAPIC_TRIGGER_LEVEL, + (irq < 16) ? SAPIC_POLARITY_HIGH : SAPIC_POLARITY_LOW); } } @@ -338,6 +329,9 @@ if (i == NULL) return; /* no ithread for this vector */ + if (i->cntp) + atomic_add_long(i->cntp, 1); + ithd = i->ithd; KASSERT(ithd != NULL, ("interrupt vector without a thread")); @@ -348,9 +342,6 @@ if (TAILQ_EMPTY(&ithd->it_handlers)) return; - if (i->cntp) - atomic_add_long(i->cntp, 1); - /* * Handle a fast interrupt if there is no actual thread for this * interrupt by calling the handler directly without Giant. Note ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#15 (text+ko) ==== @@ -36,9 +36,18 @@ #include #include #include +#include static MALLOC_DEFINE(M_SAPIC, "sapic", "I/O SAPIC devices"); +static int sysctl_hw_apic(SYSCTL_HANDLER_ARGS); + +SYSCTL_OID(_hw, OID_AUTO, apic, CTLTYPE_STRING|CTLFLAG_RD, + NULL, 0, sysctl_hw_apic, "A", "(x)APIC redirection table entries"); + +struct sapic *ia64_sapics[16]; /* XXX make this resizable */ +int ia64_sapic_count; + struct sapic_rte { u_int64_t rte_vector :8; u_int64_t rte_delivery_mode :3; @@ -75,11 +84,8 @@ ia64_mf(); } -#ifdef DDB - static void -sapic_read_rte(struct sapic *sa, int which, - struct sapic_rte *rte) +sapic_read_rte(struct sapic *sa, int which, struct sapic_rte *rte) { u_int32_t *p = (u_int32_t *) rte; register_t c; @@ -90,8 +96,6 @@ intr_restore(c); } -#endif - static void sapic_write_rte(struct sapic *sa, int which, struct sapic_rte *rte) @@ -122,7 +126,7 @@ max = (sapic_read(sa, SAPIC_VERSION) >> 16) & 0xff; sa->sa_limit = base + max; - ia64_add_sapic(sa); + ia64_sapics[ia64_sapic_count++] = sa; return sa; } @@ -137,8 +141,13 @@ bzero(&rte, sizeof(rte)); rte.rte_destination_id = (lid >> 24) & 255; rte.rte_destination_eid = (lid >> 16) & 255; - rte.rte_trigger_mode = trigger_mode; - rte.rte_polarity = polarity; + if (vector == 66 || vector == 67 || vector == 68) { + rte.rte_trigger_mode = SAPIC_TRIGGER_EDGE; + rte.rte_polarity = SAPIC_POLARITY_HIGH; + } else { + rte.rte_trigger_mode = trigger_mode; + rte.rte_polarity = polarity; + } rte.rte_delivery_mode = SAPIC_DELMODE_LOWPRI; rte.rte_vector = vector; sapic_write_rte(sa, input, &rte); @@ -153,6 +162,46 @@ ia64_mf(); } +static int +sysctl_hw_apic(SYSCTL_HANDLER_ARGS) +{ + char buf[80]; + struct sapic_rte rte; + struct sapic *sa; + int apic, count, error, index, len; + + len = sprintf(buf, "\n APIC Idx: Id,EId : RTE\n"); + error = SYSCTL_OUT(req, buf, len); + if (error) + return (error); + + for (apic = 0; apic < ia64_sapic_count; apic++) { + sa = ia64_sapics[apic]; + count = sa->sa_limit - sa->sa_base + 1; + for (index = 0; index < count; index++) { + sapic_read_rte(sa, index, &rte); + if (rte.rte_mask != 0) + continue; + len = sprintf(buf, + " 0x%02x %3d: (%02x,%02x): %3d %d %d %s %s %s %s %s\n", + sa->sa_id, index, + rte.rte_destination_id, rte.rte_destination_eid, + rte.rte_vector, rte.rte_delivery_mode, + rte.rte_destination_mode, + rte.rte_delivery_status ? "DS" : " ", + rte.rte_polarity ? "low-active " : "high-active", + rte.rte_rirr ? "RIRR" : " ", + rte.rte_trigger_mode ? "level" : "edge ", + rte.rte_flushen ? "F" : " "); + error = SYSCTL_OUT(req, buf, len); + if (error) + return (error); + } + } + + return (0); +} + #ifdef DDB #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Dec 27 21:14:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2007637B405; Fri, 27 Dec 2002 21:14:18 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC56037B401 for ; Fri, 27 Dec 2002 21:14:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FFBE43E4A for ; Fri, 27 Dec 2002 21:14:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBS5EGfh085498 for ; Fri, 27 Dec 2002 21:14:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBS5EFTP085495 for perforce@freebsd.org; Fri, 27 Dec 2002 21:14:15 -0800 (PST) Date: Fri, 27 Dec 2002 21:14:15 -0800 (PST) Message-Id: <200212280514.gBS5EFTP085495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22828 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22828 Change 22828 by marcel@marcel_vaio on 2002/12/27 21:13:51 IFC @22826 Affected files ... .. //depot/projects/ia64/lib/libc/gen/devname.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/dirname.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/getcap.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/getpagesize.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/readpassphrase.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/tcsetattr.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/wordexp.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/wordexp.c#2 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_set_watch.3#4 integrate .. //depot/projects/ia64/lib/libc/net/inet6_option_space.3#4 integrate .. //depot/projects/ia64/lib/libc/net/nsdispatch.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_get_qualifier.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_get_tag_type.3#4 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_set.3#5 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc.3#4 integrate .. //depot/projects/ia64/lib/libc/sys/aio_read.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/fhopen.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/kse.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/madvise.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/nfssvc.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sigaction.2#11 integrate .. //depot/projects/ia64/lib/libc/sys/socket.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/vfork.2#4 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_attr_get_np.3#3 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_mutexattr.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/sem_destroy.3#2 integrate .. //depot/projects/ia64/lib/libcam/cam_cdbparse.3#3 integrate .. //depot/projects/ia64/lib/libcrypt/crypt.3#4 integrate .. //depot/projects/ia64/lib/libdevinfo/devinfo.3#3 integrate .. //depot/projects/ia64/lib/libedit/editrc.5#3 integrate .. //depot/projects/ia64/lib/libexpat/libbsdxml.3#2 integrate .. //depot/projects/ia64/lib/libfetch/fetch.3#4 integrate .. //depot/projects/ia64/lib/libftpio/ftpio.3#2 integrate .. //depot/projects/ia64/lib/libipsec/ipsec_set_policy.3#3 integrate .. //depot/projects/ia64/lib/libkvm/kvm_sparc64.c#6 integrate .. //depot/projects/ia64/lib/libnetgraph/netgraph.3#2 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_ftp/pam_ftp.8#2 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_opie/pam_opie.8#5 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.8#5 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_mutexattr.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/sem_destroy.3#2 integrate .. //depot/projects/ia64/lib/libutil/auth.3#2 integrate .. //depot/projects/ia64/lib/libutil/login_cap.3#3 integrate .. //depot/projects/ia64/lib/msun/man/hypot.3#2 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#7 integrate .. //depot/projects/ia64/libexec/getty/gettytab.5#3 integrate .. //depot/projects/ia64/libexec/ypxfr/ypxfr.8#5 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#11 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#9 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#6 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#18 integrate .. //depot/projects/ia64/sbin/atm/atm/atm.8#2 integrate .. //depot/projects/ia64/sbin/devd/devd.8#4 integrate .. //depot/projects/ia64/sbin/devd/devd.conf.5#4 integrate .. //depot/projects/ia64/sbin/fsck/fsck.8#6 integrate .. //depot/projects/ia64/sbin/ip6fw/ip6fw.8#6 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#6 integrate .. //depot/projects/ia64/sbin/mount_hpfs/mount_hpfs.8#5 integrate .. //depot/projects/ia64/sbin/ping/ping.8#6 integrate .. //depot/projects/ia64/sbin/raidctl/raidctl.8#4 integrate .. //depot/projects/ia64/sbin/reboot/reboot.8#9 integrate .. //depot/projects/ia64/sbin/vinum/vinum.8#7 integrate .. //depot/projects/ia64/share/examples/ipfilter/firewall.1#2 integrate .. //depot/projects/ia64/share/examples/ipfilter/firewall.2#2 integrate .. //depot/projects/ia64/share/man/man4/ahd.4#3 integrate .. //depot/projects/ia64/share/man/man4/crypto.4#3 integrate .. //depot/projects/ia64/share/man/man4/geom.4#5 integrate .. //depot/projects/ia64/share/man/man4/mac_biba.4#7 integrate .. //depot/projects/ia64/share/man/man4/ng_bluetooth.4#3 integrate .. //depot/projects/ia64/share/man/man4/ng_btsocket.4#3 integrate .. //depot/projects/ia64/share/man/man4/ng_hci.4#3 integrate .. //depot/projects/ia64/share/man/man4/psm.4#3 integrate .. //depot/projects/ia64/share/man/man4/tcp.4#11 integrate .. //depot/projects/ia64/share/man/man4/ti.4#4 integrate .. //depot/projects/ia64/share/man/man5/Makefile#6 integrate .. //depot/projects/ia64/share/man/man5/msdos.5#1 branch .. //depot/projects/ia64/share/man/man5/rc.conf.5#22 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#18 integrate .. //depot/projects/ia64/share/man/man8/picobsd.8#12 integrate .. //depot/projects/ia64/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/ia64/share/man/man9/accept_filter.9#3 integrate .. //depot/projects/ia64/share/man/man9/mac.9#5 integrate .. //depot/projects/ia64/share/man/man9/mi_switch.9#4 integrate .. //depot/projects/ia64/share/man/man9/microseq.9#2 integrate .. //depot/projects/ia64/share/man/man9/style.9#19 integrate .. //depot/projects/ia64/sys/ddb/db_command.c#10 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#11 integrate .. //depot/projects/ia64/sys/ddb/ddb.h#6 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#12 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#9 integrate .. //depot/projects/ia64/sys/dev/iir/iir_ctrl.c#4 integrate .. //depot/projects/ia64/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/ia64/sys/dev/ppbus/pps.c#7 integrate .. //depot/projects/ia64/sys/dev/tdfx/tdfx_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/tga/tga_pci.c#3 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/db_trace.c#8 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#29 integrate .. //depot/projects/ia64/sys/kern/init_main.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#40 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#22 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#18 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#24 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#30 integrate .. //depot/projects/ia64/sys/net/bridge.c#15 integrate .. //depot/projects/ia64/sys/net/if_var.h#15 integrate .. //depot/projects/ia64/sys/net/raw_usrreq.c#8 integrate .. //depot/projects/ia64/sys/netinet/ip_fw.c#11 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/ia64/sys/sparc64/include/vmparam.h#8 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/dump_machdep.c#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#28 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#28 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#14 integrate .. //depot/projects/ia64/sys/sys/mount.h#18 integrate .. //depot/projects/ia64/sys/sys/proc.h#41 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_extern.h#10 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_subr.c#6 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#26 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_inode.c#10 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufsmount.h#6 integrate .. //depot/projects/ia64/sys/vm/phys_pager.c#8 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#33 integrate .. //depot/projects/ia64/usr.bin/getopt/getopt.1#3 integrate .. //depot/projects/ia64/usr.bin/lex/lex.1#2 integrate .. //depot/projects/ia64/usr.bin/m4/m4.1#6 integrate .. //depot/projects/ia64/usr.bin/mkdep/mkdep.1#3 integrate .. //depot/projects/ia64/usr.bin/mklocale/mklocale.1#6 integrate .. //depot/projects/ia64/usr.bin/nice/nice.1#7 integrate .. //depot/projects/ia64/usr.bin/systat/systat.1#5 integrate .. //depot/projects/ia64/usr.bin/tcopy/tcopy.1#4 integrate .. //depot/projects/ia64/usr.bin/telnet/telnet.1#3 integrate .. //depot/projects/ia64/usr.bin/time/time.1#5 integrate .. //depot/projects/ia64/usr.bin/xargs/xargs.1#11 integrate .. //depot/projects/ia64/usr.sbin/acpi/amldb/amldb.8#4 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.8#8 integrate .. //depot/projects/ia64/usr.sbin/adduser/rmuser.8#6 integrate .. //depot/projects/ia64/usr.sbin/ancontrol/ancontrol.8#6 integrate .. //depot/projects/ia64/usr.sbin/apmd/apmd.8#3 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.8#5 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.c#9 integrate .. //depot/projects/ia64/usr.sbin/cron/crontab/crontab.5#3 integrate .. //depot/projects/ia64/usr.sbin/fdcontrol/fdcontrol.8#3 integrate .. //depot/projects/ia64/usr.sbin/gifconfig/gifconfig.8#5 integrate .. //depot/projects/ia64/usr.sbin/i4b/dtmfdecode/dtmfdecode.1#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdntrace/isdntrace.8#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4btel.4#4 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/ihfc.4#4 integrate .. //depot/projects/ia64/usr.sbin/iostat/iostat.8#5 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/lpd.8#5 integrate .. //depot/projects/ia64/usr.sbin/mountd/exports.5#5 integrate .. //depot/projects/ia64/usr.sbin/moused/moused.8#3 integrate .. //depot/projects/ia64/usr.sbin/mrouted/mrinfo.8#3 integrate .. //depot/projects/ia64/usr.sbin/mrouted/mrouted.8#4 integrate .. //depot/projects/ia64/usr.sbin/mrouted/mtrace.8#3 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.8#7 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntp.conf.5#6 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntp.keys.5#3 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntpdc.8#5 integrate .. //depot/projects/ia64/usr.sbin/ntp/doc/ntpq.8#6 integrate .. //depot/projects/ia64/usr.sbin/pcvt/loadfont/loadfont.1#2 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/pkg_add.1#6 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/create/pkg_create.1#9 integrate .. //depot/projects/ia64/usr.sbin/pppd/pppd.8#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8#5 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8#4 integrate .. //depot/projects/ia64/usr.sbin/rrenumd/rrenumd.conf.5#2 integrate .. //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.conf.5#2 integrate .. //depot/projects/ia64/usr.sbin/setkey/setkey.8#4 integrate .. //depot/projects/ia64/usr.sbin/usbd/usbd.conf.5#2 integrate .. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.8#9 integrate .. //depot/projects/ia64/usr.sbin/ypserv/ypserv.8#6 integrate Differences ... ==== //depot/projects/ia64/lib/libc/gen/devname.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)devname.3 8.2 (Berkeley) 4/29/95 -.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.14 2002/12/18 10:13:53 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/devname.3,v 1.15 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd July 18, 1999 .Dt DEVNAME 3 @@ -83,5 +83,5 @@ .Sh BUGS The .Fn devname -function returns a poiner to an internal static object; +function returns a pointer to an internal static object; thus, subsequent calls will modify the same buffer. ==== //depot/projects/ia64/lib/libc/gen/dirname.3#3 (text+ko) ==== @@ -25,14 +25,14 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: dirname.3,v 1.9 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.6 2002/12/18 13:33:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.7 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd August 17, 1997 .Dt DIRNAME 3 .Os .Sh NAME .Nm dirname -.Nd extract the directory portition of a pathname +.Nd extract the directory part of a pathname .Sh SYNOPSIS .In libgen.h .Ft char * ==== //depot/projects/ia64/lib/libc/gen/getcap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getcap.c,v 1.17 2002/03/22 09:18:24 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getcap.c,v 1.18 2002/12/27 08:43:40 alfred Exp $"); #include "namespace.h" #include @@ -69,7 +69,7 @@ static char *toprec; /* Additional record specified by cgetset() */ static int gottoprec; /* Flag indicating retrieval of toprecord */ -static int cdbget(DB *, char **, char *); +static int cdbget(DB *, char **, const char *); static int getent(char **, u_int *, char **, int, const char *, int, char *); static int nfcmp(char *, char *); @@ -533,19 +533,25 @@ } static int -cdbget(DB *capdbp, char **bp, char *name) +cdbget(DB *capdbp, char **bp, const char *name) { DBT key, data; + char *namebuf; - key.data = name; - key.size = strlen(name); + namebuf = strdup(name); + if (namebuf == NULL) + return (-2); + key.data = namebuf; + key.size = strlen(namebuf); for (;;) { /* Get the reference. */ switch(capdbp->get(capdbp, &key, &data, 0)) { case -1: + free(namebuf); return (-2); case 1: + free(namebuf); return (-1); } @@ -558,6 +564,7 @@ } *bp = (char *)data.data + 1; + free(namebuf); return (((char *)(data.data))[0] == TCERR ? 1 : 0); } @@ -568,7 +575,7 @@ int cgetmatch(const char *buf, const char *name) { - char *np, *bp; + const char *np, *bp; /* * Start search at beginning of record. ==== //depot/projects/ia64/lib/libc/gen/getpagesize.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getpagesize.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getpagesize.3,v 1.10 2002/12/18 10:13:54 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getpagesize.3,v 1.11 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd June 4, 1993 .Dt GETPAGESIZE 3 @@ -60,6 +60,6 @@ .Xr sbrk 2 .Sh HISTORY The -.Fn getpagesze +.Fn getpagesize function appeared in .Bx 4.2 . ==== //depot/projects/ia64/lib/libc/gen/readpassphrase.3#5 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/readpassphrase.3,v 1.5 2002/12/18 10:13:54 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/readpassphrase.3,v 1.6 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd December 7, 2001 .Dt READPASSPHRASE 3 @@ -168,7 +168,7 @@ and .Dv SIGTTOU signals (stop signal generated from keyboard or due to terminal I/O -from a background proccess) are treated specially. +from a background process) are treated specially. When the process is resumed after it has been stopped, .Fn readpassphrase will reprint the prompt and the user may then enter a passphrase. ==== //depot/projects/ia64/lib/libc/gen/tcsetattr.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)tcsetattr.3 8.3 (Berkeley) 1/2/94 -.\" $FreeBSD: src/lib/libc/gen/tcsetattr.3,v 1.11 2002/12/19 09:40:21 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/tcsetattr.3,v 1.12 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd January 2, 1994 .Dt TCSETATTR 3 @@ -96,7 +96,7 @@ The input and output baud rates are found in the termios structure. The unsigned integer .Li speed_t -is typdef'd in the include file +is typedef'd in the include file .Aq Pa termios.h . The value of the integer corresponds directly to the baud rate being represented, however, the following symbolic values are defined. ==== //depot/projects/ia64/lib/libc/gen/wordexp.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.1 2002/12/26 14:34:18 tjr Exp $ +.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.2 2002/12/27 08:28:53 tjr Exp $ .\" .Dd December 27, 2002 .Dt WORDEXP 3 @@ -192,7 +192,7 @@ .Fn wordexp and .Fn wordfree -functions conforms to +functions conform to .St -p1003.1-2001 . .Sh BUGS Do not pass untrusted user data to ==== //depot/projects/ia64/lib/libc/gen/wordexp.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include "un-namespace.h" -__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.1 2002/12/26 14:34:18 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.2 2002/12/27 01:01:03 tjr Exp $"); static int we_askshell(const char *, wordexp_t *, int); static int we_check(const char *, int); @@ -210,7 +210,7 @@ * special characters: |&;<>(){} * or command substitutions when WRDE_NOCMD is set in flags. */ -int +static int we_check(const char *words, int flags) { char c; ==== //depot/projects/ia64/lib/libc/i386/sys/i386_set_watch.3#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/i386/sys/i386_set_watch.3,v 1.5 2002/12/19 09:40:22 ru Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_set_watch.3,v 1.6 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd August 24, 2000 .Os @@ -68,7 +68,7 @@ specifies the size in bytes of the area to be watched (1, 2, or 4 bytes), and .Fa access -specifes the type of watch point: +specifies the type of watch point: .Pp .Bd -literal -offset indent -compact DBREG_DR7_EXEC An execution breakpoint. ==== //depot/projects/ia64/lib/libc/net/inet6_option_space.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: inet6_option_space.3,v 1.4 2000/02/05 10:32:24 jinmei Exp $ -.\" $FreeBSD: src/lib/libc/net/inet6_option_space.3,v 1.10 2002/12/19 09:40:22 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/inet6_option_space.3,v 1.11 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd December 10, 1999 .Dt INET6_OPTION_SPACE 3 @@ -66,7 +66,7 @@ .Sh DESCRIPTION .\" Building and parsing the Hop-by-Hop and Destination options is -complicated due to alignment constranints, padding and +complicated due to alignment constraints, padding and ancillary data manipulation. RFC2292 defines a set of functions to help the application. The function prototypes for ==== //depot/projects/ia64/lib/libc/net/nsdispatch.3#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: nsdispatch.3,v 1.8 1999/03/22 19:44:53 garbled Exp $ -.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.6 2002/12/12 22:22:51 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.7 2002/12/27 12:15:28 schweikh Exp $ .\" .\" Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -89,7 +89,7 @@ .Va cb defined as a function which handles that source, and .Va cb_data -is used to pass arbritrary data to the callback function. +is used to pass arbitrary data to the callback function. The last entry in .Va dtab should contain @@ -161,7 +161,7 @@ .Va va_list . .Ss Valid source types Whilst there is support for arbitrary sources, the following -#defines for commonly implementated sources are available: +#defines for commonly implemented sources are available: .Bl -column NS_COMPAT COMPAT -offset indent .It Sy "#define value" .It "NSSRC_FILES ""files""" ==== //depot/projects/ia64/lib/libc/posix1e/acl.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.19 2002/11/08 15:01:28 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.20 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd January 28, 2000 .Dt ACL 3 @@ -41,7 +41,7 @@ permits file systems to export Access Control Lists via the VFS, and provides a library for userland access to and manipulation of these ACLs. Not all file systems provide support for ACLs, and some may require that -ACL support be explicitely enabled by the administrator. +ACL support be explicitly enabled by the administrator. The library calls include routines to allocate, duplicate, retrieve, set, and validate ACLs associated with file objects. As well as the POSIX.1e routines, there are a number of non-portable ==== //depot/projects/ia64/lib/libc/posix1e/acl_get_qualifier.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_get_qualifier.3,v 1.5 2002/12/18 12:45:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_get_qualifier.3,v 1.6 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd March 13, 2001 .Dt ACL_GET_QUALIFIER 3 @@ -66,7 +66,7 @@ will be a pointer to type .Vt gid_t . .Pp -If the value of the tag type in the ACL enty referred to by +If the value of the tag type in the ACL entry referred to by .Fa entry_d is .Dv ACL_UNDEFINED_TAG , ACL_USER_OBJ , ACL_GROUP_OBJ , ==== //depot/projects/ia64/lib/libc/posix1e/acl_get_tag_type.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_get_tag_type.3,v 1.6 2002/12/18 12:45:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_get_tag_type.3,v 1.7 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd March 10, 2001 .Dt ACL_GET_TAG_TYPE 3 @@ -42,7 +42,7 @@ The .Fn acl_get_tag_type function -is a POSIX.1e call that returs the tag type for the ACL entry +is a POSIX.1e call that returns the tag type for the ACL entry .Fa entry_d . Upon successful completion, the location referred to by the argument .Fa tag_type_p ==== //depot/projects/ia64/lib/libc/posix1e/mac_set.3#5 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.4 2002/12/19 09:40:23 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.5 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd December 21, 2001 .Dt MAC_SET 3 @@ -101,7 +101,7 @@ by the file referenced by .Fa fd . .It Bq Er EPERM -The calling process had insufficient privelege +The calling process had insufficient privilege to change the MAC label. .It Bq Er EROFS File system for the object being modified ==== //depot/projects/ia64/lib/libc/rpc/rpc.3#4 (text+ko) ==== @@ -1,7 +1,7 @@ .\" @(#)rpc.3n 1.31 93/08/31 SMI; from SVr4 .\" Copyright 1989 AT&T .\" $NetBSD: rpc.3,v 1.10 2000/06/02 23:11:12 fvdl Exp $ -.\" $FreeBSD: src/lib/libc/rpc/rpc.3,v 1.19 2002/12/19 09:40:23 ru Exp $ +.\" $FreeBSD: src/lib/libc/rpc/rpc.3,v 1.20 2002/12/27 12:15:29 schweikh Exp $ .Dd May 7, 1993 .Dt RPC 3 .Os @@ -298,7 +298,7 @@ }; /* - * The format of the addres and options arguments of the XTI t_bind call. + * The format of the address and options arguments of the XTI t_bind call. * Only provided for compatibility, it should not be used other than * as an argument to svc_tli_create(). */ ==== //depot/projects/ia64/lib/libc/sys/aio_read.2#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/aio_read.2,v 1.16 2002/12/19 09:40:24 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_read.2,v 1.17 2002/12/27 12:15:29 schweikh Exp $ .\" .Dd November 17, 1998 .Dt AIO_READ 2 @@ -132,7 +132,7 @@ .Fn aio_return system call must be called, and will return -1, and .Fn aio_error -must be called to determine the actual calue that would have been +must be called to determine the actual value that would have been returned in .Va errno . .Pp ==== //depot/projects/ia64/lib/libc/sys/fhopen.2#5 (text+ko) ==== @@ -4,7 +4,7 @@ .\" All rights reserved. .\" .\" This software was written by William Studenmund of the -.\" Numerical Aerospace Similation Facility, NASA Ames Research Center. +.\" Numerical Aerospace Simulation Facility, NASA Ames Research Center. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -31,7 +31,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.14 2002/12/19 09:40:24 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.15 2002/12/27 12:15:29 schweikh Exp $ .\" .Dd June 29, 1999 .Dt FHOPEN 2 @@ -87,7 +87,7 @@ .Xr fstat 2 and .Xr fstatfs 2 -calls except that they return information for the file refered to by +calls except that they return information for the file referred to by .Fa fhp rather than an open file. .Sh RETURN VALUES @@ -105,7 +105,7 @@ .Xr fstat 2 , and .Xr fstatfs 2 -respectivly, +respectively, .Fn fhopen , .Fn fhstat , and ==== //depot/projects/ia64/lib/libc/sys/kse.2#7 (text+ko) ==== @@ -33,7 +33,7 @@ .\" THE USE OF THIS SOFTWARE, EVEN IF PACKET DESIGN IS ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.6 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/kse.2,v 1.7 2002/12/27 08:21:15 julian Exp $ .\" .Dd September 10, 2002 .Dt KSE 2 @@ -85,7 +85,7 @@ ability to make scheduling decisions. A kernel-to-user upcall mechanism is used to pass control to the user threading library whenever a scheduling decision needs to be made. -Arbitrarily many user threads are multiplexed onto a fixed number of +An arbitrarily number of user threads are multiplexed onto a fixed number of virtual CPUs supplied by the kernel. This can be thought of as an .Dq "N to M" @@ -126,11 +126,13 @@ The KSE becomes .Sy unassigned , and the associated thread is suspended, when the KSE has an associated -.Sy mailbox -(see below) and any of the following occurs: +.Sy mailbox , +(see below) the thread has an associated +.Sy thread mailbox , +(also see below) and any of the following occurs: .Bl -bullet .It -The thread invokes a blocking system call. +The thread invokes a system call that blocks. .It The thread makes any other demand of the kernel that cannot be immediately satisfied, e.g., touches a page of memory that needs to be fetched from disk, @@ -139,7 +141,8 @@ Another thread that was previously blocked in the kernel completes its work in the kernel (or is .Sy interrupted ) -and becomes ready to return to user space. +and becomes ready to return to user space, and the current thread is returning +to user space. .It A signal is delivered to the process, and this KSE is chosen to deliver it. .El @@ -163,13 +166,13 @@ priority may be assigned. For the purposes of process scheduling and accounting, each KSE group -counts the same as a traditional unthreaded process. +counts similarly to a traditional unthreaded process. Individual KSEs within a KSE group are effectively indistinguishable, and any KSE in a KSE group may be assigned by the kernel to any runnable -thread associated with that KSE group. +(in the kernel) thread associated with that KSE group. In practice, the kernel attempts to preserve the affinity between threads and actual CPUs to optimize cache behavior, but this is invisible to the -user process. +user process. (Affinity is not yet implemented). .Pp Each KSE has a unique .Sy "KSE mailbox" @@ -234,7 +237,8 @@ .Fa newgroup equal to zero does not create a new KSE; instead, it simply associates the current KSE with the supplied KSE mailbox, and no immediate upcall results. -However, the upcall will be invoked the next time the thread blocks. +However, an upcall will be triggered the next time the thread blocks and +the required conditions are met. .Pp The kernel does not allow more KSEs to exist in a KSE group than the number of physical CPUs in the system (this number is available as the @@ -256,7 +260,7 @@ causes the KSE assigned to the currently running thread to be destroyed. If this KSE is the last one in the KSE group, there must be no remaining threads associated with the KSE group blocked in the kernel. -This system call does not return. +This system call does not return unless there is an error. .Pp As a special case, if the last remaining KSE in the last remaining KSE group invokes this system call, then the KSE is not destroyed; @@ -264,6 +268,7 @@ .Fn kse_exit returns normally. This returns the process to its original, unthreaded state. +(this is not yet implemented). .Pp The .Fn kse_release @@ -272,18 +277,19 @@ .Dq park the KSE assigned to the currently running thread when it is not needed, e.g., when there are more available KSEs than runnable user threads. -The KSE remains unassigned but does not upcall until there is a new reason to -do so, e.g., a previously blocked thread becomes runnable. +The thread converts to an upcall but does not get scheduled until +there is a new reason to do so, e.g., a previously +blocked thread becomes runnable. If successful, .Fn kse_release -does not return. +does not return o the caller. .Pp The .Fn kse_wakeup system call is the opposite of .Fn kse_release . -It causes the KSE associated with the mailbox pointed to by +It causes the (parked) KSE associated with the mailbox pointed to by .Fa mbx to be woken up, causing it to upcall. If the KSE has already woken up for another reason, this system call has no @@ -315,16 +321,13 @@ .Ss Signals .\" When a process has at least one KSE with an associated mailbox, then -signals are no longer delivered on the process stack. -Instead, signals are delivered via upcalls. +signals might no longer be delivered on the process stack. +Instead, signals may be delivered via upcalls. Multiple signals may be delivered with one upcall. +(This feature is not yet coded). .Pp If there are multiple KSE groups in the process, which KSE group is chosen to deliver the signal is indeterminate. -However, once a signal has been delivered to a specific KSE group, -that KSE group then takes ownership of signal delivery and all subsequent -signals are delivered via that KSE group. -When this KSE group is destroyed, a new KSE group is chosen as needed. .\" .Ss KSE Mailboxes .\" @@ -410,26 +413,30 @@ .Em Note : modification of .Va km_curthread -by the user thread scheduler must be atomic to avoid the race condition -where the kernel saves a partially modified value. +by the user thread scheduler must be atomic +with the loading of the context of the new thread, to avoid +the situation where the thread context area +may be modified by a blocking async operation, while there +is still valid information to be read out of it. .Pp .Va km_completed points to a linked list of user threads that have completed their work in the kernel since the last upcall. The user thread scheduler should put these threads back into its own runnable queue. -Each thread in a KSE group that completes is guaranteed to be +Each thread in a KSE group that completes a kernel operation +(synchronous or asynchronous) that results in an upcall is guaranteed to be linked into exactly one KSE's .Va km_completed list; which KSE in the group, however, is indeterminate. -Furthermore, the thread will appear in only one upcall. +Furthermore, the completion will be reported in only one upcall. .Pp .Va km_sigscaught contains the list of signals caught by this process since the previous upcall to any KSE in the process. As long as there exists one or more KSEs with an associated mailbox in the user process, signals are delivered this way rather than the -traditional way. +traditional way. (This has not bein implemented and may change). .Pp .Va km_timeofday is set by the kernel to the current system time before performing @@ -463,7 +470,7 @@ .Pp .Va tm_context stores the context for the thread when the thread is blocked in user space. -This field is updated by the kernel before a completed thread is returned +This field is also updated by the kernel before a completed thread is returned to the user thread scheduler via .Va km_completed . .Pp @@ -514,9 +521,6 @@ .Pp All of these system calls return a non-zero error code in case of an error. .Pp -.Em Note : -error codes are returned directly rather than via -.Va errno . .Sh ERRORS The .Fn kse_create ==== //depot/projects/ia64/lib/libc/sys/madvise.2#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)madvise.2 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.26 2002/12/18 09:22:31 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.27 2002/12/27 12:15:29 schweikh Exp $ .\" .Dd July 19, 1996 .Dt MADVISE 2 @@ -121,7 +121,7 @@ .It Dv MADV_AUTOSYNC Undoes the effects of MADV_NOSYNC for any future pages dirtied within the address range. The effect on pages already dirtied is indeterminate - they -may or may not be reverted. You can guarentee reversion by using the +may or may not be reverted. You can guarantee reversion by using the .Xr msync 2 or .Xr fsync 2 ==== //depot/projects/ia64/lib/libc/sys/nfssvc.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)nfssvc.2 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/sys/nfssvc.2,v 1.14 2002/12/18 09:22:31 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/nfssvc.2,v 1.15 2002/12/27 12:15:29 schweikh Exp $ .\" .Dd June 9, 1993 .Dt NFSSVC 2 @@ -150,7 +150,7 @@ struct ucred nsd_cr; /* Cred. uid maps to */ int nsd_authlen; /* Length of auth string (ret) */ u_char *nsd_authstr; /* Auth string (ret) */ - int nsd_verflen; /* and the verfier */ + int nsd_verflen; /* and the verifier */ u_char *nsd_verfstr; struct timeval nsd_timestamp; /* timestamp from verifier */ u_int32_t nsd_ttl; /* credential ttl (sec) */ ==== //depot/projects/ia64/lib/libc/sys/sigaction.2#11 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)sigaction.2 8.2 (Berkeley) 4/3/94 -.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.46 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.47 2002/12/27 12:15:29 schweikh Exp $ .\" .Dd April 3, 1994 .Dt SIGACTION 2 @@ -484,7 +484,7 @@ .Dv sa_handler member of .Dv struct sigaction . -In pratice, +In practice, .Fx always sends the three arguments of the latter and since the ANSI C prototype is a subset, both will work. @@ -517,7 +517,7 @@ .Dv si_code member of the .Dv info -argument to a SA_SIGINFO handler contain a numeric code explaning the +argument to a SA_SIGINFO handler contain a numeric code explaining the cause of the signal, usually one of the .Dv SI_... values from ==== //depot/projects/ia64/lib/libc/sys/socket.2#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)socket.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/socket.2,v 1.24 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/socket.2,v 1.25 2002/12/27 12:15:29 schweikh Exp $ .\" .Dd November 24, 1997 .Dt SOCKET 2 @@ -85,7 +85,7 @@ PF_COIP Connection-Oriented IP, aka ST II, PF_CNT Computer Network Technology, PF_SIP Simple Internet Protocol, -PF_IPX Novell Intenet Packet eXchange protocol, +PF_IPX Novell Internet Packet eXchange protocol, PF_RTIP Help Identify RTIP packets, PF_PIP Help Identify PIP packets, PF_ISDN Integrated Services Digital Network, ==== //depot/projects/ia64/lib/libc/sys/vfork.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)vfork.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.20 2002/12/24 13:41:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.21 2002/12/27 12:15:29 schweikh Exp $ .\" .Dd June 4, 1993 .Dt VFORK 2 @@ -78,7 +78,7 @@ system call can normally be used just like .Xr fork 2 . -It does not work, however, to return while running in the childs context +It does not work, however, to return while running in the child's context from the procedure that called .Fn vfork since the eventual return from ==== //depot/projects/ia64/lib/libc_r/man/pthread_attr_get_np.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc_r/man/pthread_attr_get_np.3,v 1.2 2002/12/09 12:41:29 ru Exp $ +.\" $FreeBSD: src/lib/libc_r/man/pthread_attr_get_np.3,v 1.3 2002/12/27 12:15:29 schweikh Exp $ .\" .Dd October 26, 2002 .Dt PTHREAD_ATTR_GET_NP 3 @@ -44,7 +44,7 @@ .Fa dst is supposed to be used in conjunction with .Fn pthread_attr_get* -functions to retrive individual values from +functions to retrieve individual values from .Vt pthread_attr_t structure. Parameter ==== //depot/projects/ia64/lib/libc_r/man/pthread_mutexattr.3#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc_r/man/pthread_mutexattr.3,v 1.7 2001/10/01 16:09:09 ru Exp $ +.\" $FreeBSD: src/lib/libc_r/man/pthread_mutexattr.3,v 1.8 2002/12/27 12:15:29 schweikh Exp $ .Dd May 1, 2000 .Dt PTHREAD_MUTEXATTR 3 .Os @@ -87,7 +87,7 @@ to the location pointed to by the second function parameter. .Sh RETURN VALUES If successful, these functions return 0. -Otherwise, an error number is returned to indicacte the error. +Otherwise, an error number is returned to indicate the error. .Sh ERRORS .Fn pthread_mutexattr_init will fail if: ==== //depot/projects/ia64/lib/libc_r/man/sem_destroy.3#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc_r/man/sem_destroy.3,v 1.9 2001/10/01 16:09:09 ru Exp $ +.\" $FreeBSD: src/lib/libc_r/man/sem_destroy.3,v 1.10 2002/12/27 12:15:29 schweikh Exp $ .Dd February 15, 2000 .Dt SEM_DESTROY 3 .Os @@ -46,7 +46,7 @@ After a successful call to .Fn sem_destroy , .Fa sem -is unuseable until re-initialized by another call to +is unusable until re-initialized by another call to .Fn sem_init . .Sh RETURN VALUES >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Dec 28 2:20:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6873037B405; Sat, 28 Dec 2002 02:20:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFDBE37B401 for ; Sat, 28 Dec 2002 02:20:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AE8243ED4 for ; Sat, 28 Dec 2002 02:20:31 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBSAKVfh092960 for ; Sat, 28 Dec 2002 02:20:31 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBSAKUM7092941 for perforce@freebsd.org; Sat, 28 Dec 2002 02:20:30 -0800 (PST) Date: Sat, 28 Dec 2002 02:20:30 -0800 (PST) Message-Id: <200212281020.gBSAKUM7092941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22834 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22834 Change 22834 by marcel@marcel_nfs on 2002/12/28 02:20:18 Don't hardcode the address of the Processor Interrupt Block (PIB), also known as the Local APIC. By default the PAL will allocate it at 0xfee00000 and we'll initialize the variable (ia64_lapic_address) with that address. We'll set it to the address in the MADT header if we scan the MADT table and override that address again when we encounter the Local APIC override structure. Affected files ... .. //depot/projects/ia64/sys/ia64/acpica/madt.c#12 edit .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#24 edit .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#16 edit .. //depot/projects/ia64/sys/ia64/include/intr.h#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/acpica/madt.c#12 (text+ko) ==== @@ -30,6 +30,8 @@ #include +extern u_int64_t ia64_lapic_address; + struct sapic *sapic_create(int, int, u_int64_t); #pragma pack(1) @@ -71,6 +73,13 @@ UINT32 FlagsReserved: 31; } LOCAL_SAPIC; +typedef struct /* LOCAL APIC OVERRIDE */ +{ + APIC_HEADER Header; + UINT16 Reserved; + UINT64 LocalApicAddress; +} LAPIC_OVERRIDE; + typedef struct /* PLATFORM INTERRUPT SOURCE */ { APIC_HEADER Header; @@ -123,6 +132,15 @@ } static void +parse_lapic_override(LAPIC_OVERRIDE *lapic) +{ + if (bootverbose) + printf("\t\tLocal APIC address=0x%lx\n", + lapic->LocalApicAddress); + ia64_lapic_address = lapic->LocalApicAddress; +} + +static void parse_platform_interrupt(PLATFORM_INTERRUPT_SOURCE *source) { if (bootverbose) @@ -163,6 +181,12 @@ return (cpus); } + /* Save the address of the processor interrupt block. */ + if (bootverbose) + printf("\tLocal APIC address=0x%x\n", + madt->LocalApicAddress); + ia64_lapic_address = madt->LocalApicAddress; + for (p = (char *)(madt + 1); p < end; ) { APIC_HEADER *head = (APIC_HEADER *)p; @@ -201,6 +225,7 @@ case APIC_LOCAL_APIC_OVERRIDE: if (bootverbose) printf("Local APIC override entry\n"); + parse_lapic_override((LAPIC_OVERRIDE*)head); break; case APIC_IO_SAPIC: ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#24 (text+ko) ==== @@ -59,6 +59,7 @@ void ia64_ap_startup(void); extern vm_offset_t vhpt_base, vhpt_size; +extern u_int64_t ia64_lapic_address; #define LID_SAPIC_ID(x) ((int)((x) >> 24) & 0xff) #define LID_SAPIC_EID(x) ((int)((x) >> 16) & 0xff) @@ -349,7 +350,7 @@ volatile u_int64_t *pipi; u_int64_t vector; - pipi = ia64_memory_address(PAL_PIB_DEFAULT_ADDR | + pipi = ia64_memory_address(ia64_lapic_address | ((lid & LID_SAPIC_MASK) >> 12)); vector = (u_int64_t)(ipi_vector[ipi] & 0xff); CTR3(KTR_SMP, "ipi_send(%p, %ld), cpuid=%d", pipi, vector, ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#16 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include static MALLOC_DEFINE(M_SAPIC, "sapic", "I/O SAPIC devices"); @@ -48,6 +49,8 @@ struct sapic *ia64_sapics[16]; /* XXX make this resizable */ int ia64_sapic_count; +u_int64_t ia64_lapic_address = PAL_PIB_DEFAULT_ADDR; + struct sapic_rte { u_int64_t rte_vector :8; u_int64_t rte_delivery_mode :3; ==== //depot/projects/ia64/sys/ia64/include/intr.h#2 (text+ko) ==== @@ -43,8 +43,10 @@ u_int8_t ib_reserved4[0x1fff0]; }; +extern u_int64_t ia64_lapic_address; + #define IA64_INTERRUPT_BLOCK \ - (struct ia64_interrupt_block *)IA64_PHYS_TO_RR6(0xfee00000) + (struct ia64_interrupt_block *)IA64_PHYS_TO_RR6(ia64_lapic_address) struct sapic; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Dec 28 10:10: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D56BE37B406; Sat, 28 Dec 2002 10:10:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D73E37B405 for ; Sat, 28 Dec 2002 10:10:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 215BA43E4A for ; Sat, 28 Dec 2002 10:10:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBSIA2fh061103 for ; Sat, 28 Dec 2002 10:10:02 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBSIA14h061100 for perforce@freebsd.org; Sat, 28 Dec 2002 10:10:01 -0800 (PST) Date: Sat, 28 Dec 2002 10:10:01 -0800 (PST) Message-Id: <200212281810.gBSIA14h061100@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 Subject: PERFORCE change 22840 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22840 Change 22840 by rwatson@rwatson_paprika on 2002/12/28 10:09:13 Map VAPPEND into VWRITE when making mac_bsdextended access control decisions. This should fix open failures with the append-only flag set. Reported by: "Daniel C. Sobral" Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#67 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#67 (text+ko) ==== @@ -279,6 +279,15 @@ if (rules[i] == NULL) continue; + /* + * Since we don't separately handle append, map append to + * write. + */ + if (acc_mode & VAPPEND) { + acc_mode &= ~VAPPEND; + acc_mode |= VWRITE; + } + error = mac_bsdextended_rulecheck(rules[i], cred, object_uid, object_gid, acc_mode); if (error) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Dec 28 17: 0:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13E3337B405; Sat, 28 Dec 2002 16:59:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98E9C37B401 for ; Sat, 28 Dec 2002 16:59:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE8FB43E4A for ; Sat, 28 Dec 2002 16:59:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBT0xnfh007921 for ; Sat, 28 Dec 2002 16:59:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBT0xfE3007918 for perforce@freebsd.org; Sat, 28 Dec 2002 16:59:41 -0800 (PST) Date: Sat, 28 Dec 2002 16:59:41 -0800 (PST) Message-Id: <200212290059.gBT0xfE3007918@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 Subject: PERFORCE change 22867 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22867 Change 22867 by rwatson@rwatson_paprika on 2002/12/28 16:58:55 Integ TrustedBSD base branch: largely documentation tweaks, one-true-awk import, compat4.x update, vm fixes, ffs move to UMA, re-add of MNT_ACLS to the update list. Affected files ... .. //depot/projects/trustedbsd/base/UPDATING#26 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#16 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#14 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#12 integrate .. //depot/projects/trustedbsd/base/bin/realpath/realpath.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/bltin/echo.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/builtins.def#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/expand.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/expand.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/FIXES#4 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/b.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/main.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/run.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pam-freebsd.c#5 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#20 integrate .. //depot/projects/trustedbsd/base/etc/rc#21 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bgfsck#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devd#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/diskless#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/initdiskless#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/rcconf.sh#1 branch .. //depot/projects/trustedbsd/base/etc/rc.diskless1#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.diskless2#9 integrate .. //depot/projects/trustedbsd/base/include/Makefile#23 integrate .. //depot/projects/trustedbsd/base/include/limits.h#4 integrate .. //depot/projects/trustedbsd/base/include/wordexp.h#1 branch .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/libc.so.4.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/libedit.so.3.bz2.uu#1 branch .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/libedit.so.3.gz.uu#3 delete .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/libpam.so.1.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/libperl.so.3.bz2.uu#1 branch .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/libperl.so.3.gz.uu#3 delete .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/libposix1e.so.2.bz2.uu#1 branch .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/libstdc++.so.3.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_cleartext_pass_ok.so.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_deny.so.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_opie.so.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_permit.so.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_radius.so.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_skey.so.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_ssh.so.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_tacplus.so.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/pam_unix.so.bz2.uu#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/creat.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/gethostid.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/sigsetmask.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/sigvec.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/btree.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/dbm.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/dbopen.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/hash.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/man/mpool.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/alarm.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/basename.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/basename.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ctermid.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/devname.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/directory.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dirname.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dirname.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dladdr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dllockinit.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dlopen.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/exec.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fmtcheck.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fnmatch.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/frexp.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fts.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getbootfile.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getcap.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getcap.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getdomainname.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getgrent.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/gethostname.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getmntinfo.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getnetgrent.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getobjformat.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpagesize.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpeereid.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpwent.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getvfsbyname.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getvfsent.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/glob.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/lockf.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/makecontext.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/modf.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/msgctl.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/msgget.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/msgrcv.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/msgsnd.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/pselect.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/rand48.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/readpassphrase.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/rfork_thread.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/setjmp.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/setproctitle.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/setproctitle.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/signal.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sigsetops.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/stringlist.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysctl.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/syslog.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tcsendbreak.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/tcsetattr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/timezone.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ttyname.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ualarm.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ulimit.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/unvis.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/vis.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/wordexp.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/wordexp.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gmon/moncontrol.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/stdlib/div.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/stdlib/ldiv.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ioperm.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ldt.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_watch.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_vm86.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/ctype.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isblank.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrune.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/rune.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/addr2ascii.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/ethers.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbyname.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getipnodebyname.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnameinfo.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetent.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/hesiod.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet6_option_space.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet6_rthdr_space.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_net.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/iso_addr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/linkaddr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/nsdispatch.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/rcmd.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/rcmdsh.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/resolver.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sockatmark.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_add_perm.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_calc_mask.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_clear_perms.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_copy_entry.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_create_entry.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_delete.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_delete_entry.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_delete_perm.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_from_text.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get_entry.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get_perm_np.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get_permset.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get_qualifier.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get_tag_type.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_set_permset.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_set_qualifier.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_set_tag_type.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_to_text.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_set.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/regex/regex.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/bindresvport.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/des_crypt.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getnetconfig.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getnetpath.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getrpcent.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getrpcport.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/publickey.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_clnt_auth.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_clnt_calls.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_clnt_create.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_secure.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_soc.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_svc_calls.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_svc_create.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_svc_err.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_svc_reg.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcbind.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rtime.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fclose.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fflush.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fopen.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fputs.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fseek.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fwide.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/mktemp.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/perror.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/printf.3#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/putc.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/scanf.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/setbuf.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/tmpnam.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/abs.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/atexit.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/atof.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/atoi.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/div.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/getopt_long.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/labs.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/ldiv.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/lsearch.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/qsort.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/rand.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/realpath.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtod.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/tsearch.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/ctime.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/strptime.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/index.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/rindex.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strchr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strcpy.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strerror.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strerror.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strlcpy.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strtok.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/_exit.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/accept.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/access.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/acct.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/adjtime.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_cancel.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_error.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_read.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_return.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_suspend.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_waitcomplete.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_write.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/bind.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/brk.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chdir.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chflags.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chmod.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chown.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/chroot.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/close.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/connect.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/dup.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/execve.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/extattr_get_file.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/fcntl.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/fhopen.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/flock.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/fork.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/fsync.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getdirentries.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getdtablesize.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getfh.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getfsstat.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getgid.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getgroups.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getitimer.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getlogin.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getpeername.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getpgrp.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getpid.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getpriority.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getrlimit.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getrusage.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getsid.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getsockname.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getsockopt.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/gettimeofday.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getuid.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/intro.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ioctl.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/issetugid.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/jail.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kenv.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kill.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldfind.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldfirstmod.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldload.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldnext.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldstat.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldsym.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kqueue.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kse.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ktrace.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/link.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/listen.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/lseek.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/madvise.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mincore.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/minherit.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mkdir.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mkfifo.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mknod.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mlock.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mmap.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mmap.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/modfind.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/modnext.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/modstat.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mount.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mprotect.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/msync.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/munmap.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/nanosleep.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/nfssvc.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/open.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/pathconf.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/pipe.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/poll.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/profil.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ptrace.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/quotactl.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/read.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/readlink.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/reboot.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/rename.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/revoke.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/rfork.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/rmdir.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/rtprio.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sched_get_priority_max.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sched_setparam.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sched_setscheduler.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sched_yield.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/select.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/semctl.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/semget.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/semop.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/send.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/setgroups.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/setregid.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/setresuid.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/setreuid.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/setsid.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/setuid.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/shmat.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/shmctl.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/shmget.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/shutdown.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigaction.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigaltstack.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigpending.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigprocmask.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigreturn.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigstack.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigsuspend.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/socket.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/socketpair.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/stat.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/statfs.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/swapon.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/symlink.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sync.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sysarch.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/syscall.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/umask.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/undelete.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/unlink.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/utimes.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/uuidgen.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/wait.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/write.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/uuid/uuid.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_attr_get_np.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_mutexattr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/sem_destroy.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_accept.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_connect.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_info.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_recvfrom.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_recvmsg.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_sendmsg.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_sendto.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libcam/cam_cdbparse.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/crypt.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libdevinfo/devinfo.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libedit/editrc.5#3 integrate .. //depot/projects/trustedbsd/base/lib/libexpat/libbsdxml.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/fetch.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libftpio/ftpio.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/ipsec_set_policy.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_sparc64.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libnetgraph/netgraph.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ftp/pam_ftp.8#2 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_opie/pam_opie.8#4 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ssh/pam_ssh.8#5 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/pam_unix.8#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutexattr.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlock_wrlock.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlockattr_setpshared.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_destroy.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libstand/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libstand/libstand.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libstand/stand.h#9 integrate .. //depot/projects/trustedbsd/base/lib/libstand/zalloc.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libstand/zipfs.c#3 delete .. //depot/projects/trustedbsd/base/lib/libutil/auth.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_cap.3#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/hypot.3#2 integrate .. //depot/projects/trustedbsd/base/libexec/atrun/atrun.man#2 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#7 integrate .. //depot/projects/trustedbsd/base/libexec/getty/getty.8#3 integrate .. //depot/projects/trustedbsd/base/libexec/getty/gettytab.5#3 integrate .. //depot/projects/trustedbsd/base/libexec/mknetid/netid.5#3 integrate .. //depot/projects/trustedbsd/base/libexec/rlogind/rlogind.8#3 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr.8#5 integrate .. //depot/projects/trustedbsd/base/release/Makefile#35 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#10 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#9 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#15 integrate .. //depot/projects/trustedbsd/base/release/i386/drivers.conf#10 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/atm/atm/atm.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#2 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.conf.5#4 integrate .. //depot/projects/trustedbsd/base/sbin/devd/token.l#3 integrate .. //depot/projects/trustedbsd/base/sbin/disklabel/disklabel.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/dump/dump.8#11 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/fsck/fsck.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/gbde/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/gbde/gbde.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#18 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/mount_hpfs/mount_hpfs.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/raidctl/raidctl.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/reboot/reboot.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/restore/restore.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/shutdown/shutdown.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/slattach/slattach.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/vinum.8#7 integrate .. //depot/projects/trustedbsd/base/share/examples/IPv6/USAGE#3 integrate .. //depot/projects/trustedbsd/base/share/examples/ipfilter/firewall.1#2 integrate .. //depot/projects/trustedbsd/base/share/examples/ipfilter/firewall.2#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ahd.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ccd.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/crypto.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/geom.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ieee80211.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_biba.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_bsdextended.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac_partition.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/rdp.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_bluetooth.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_btsocket.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_hci.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/psm.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pst.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tcp.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ti.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/trm.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/usb.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vga.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/worm.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/device.hints.5#5 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#18 integrate .. //depot/projects/trustedbsd/base/share/man/man5/msdos.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#19 integrate .. //depot/projects/trustedbsd/base/share/man/man7/Makefile#10 integrate .. //depot/projects/trustedbsd/base/share/man/man7/development.7#1 branch .. //depot/projects/trustedbsd/base/share/man/man7/hier.7#11 integrate .. //depot/projects/trustedbsd/base/share/man/man7/ports.7#6 integrate .. //depot/projects/trustedbsd/base/share/man/man7/security.7#6 integrate .. //depot/projects/trustedbsd/base/share/man/man7/tuning.7#16 integrate .. //depot/projects/trustedbsd/base/share/man/man8/adding_user.8#3 integrate .. //depot/projects/trustedbsd/base/share/man/man8/diskless.8#7 integrate .. //depot/projects/trustedbsd/base/share/man/man8/picobsd.8#9 integrate .. //depot/projects/trustedbsd/base/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/DEVICE_PROBE.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_ATTRIB.9#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_INACTIVE.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_LINK.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_OPENCLOSE.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/accept_filter.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/accf_data.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/accf_http.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/device_add_child.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/device_enable.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/device_get_state.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/device_quiet.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/device_set_desc.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/device_set_flags.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mac.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/malloc.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mi_switch.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/microseq.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/style.9#17 integrate .. //depot/projects/trustedbsd/base/share/man/man9/vget.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/vref.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/vrele.9#2 integrate .. //depot/projects/trustedbsd/base/share/termcap/termcap.src#11 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#24 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/limits.h#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/limits.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arc/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/loader/conf.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/loader/main.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/boot2.c#12 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/conf.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/skiload/conf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/powerpc/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/main.c#9 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sockio.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#8 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_command.c#8 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_ps.c#11 integrate .. //depot/projects/trustedbsd/base/sys/ddb/ddb.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_resource.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/README#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_osdep.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/exca/excavar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir_ctrl.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/pps.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/pucvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio_pccard.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ad1816.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/mss.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sb16.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sbc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/uartsio.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/streams/streams.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/tga/tga_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#28 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde_crypt.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde_lock.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde_work.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_kern.c#12 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/OsdEnvironment.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#26 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#28 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/limits.h#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#13 integrate .. //depot/projects/trustedbsd/base/sys/ia64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/dig64.h#1 branch .. //depot/projects/trustedbsd/base/sys/ia64/include/limits.h#3 integrate .. //depot/projects/trustedbsd/base/sys/isa/fd.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_elf.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_conf.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_jail.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_uuid.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_smp.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_socket.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_pty.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_export.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#13 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/fec/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#15 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf_compat.h#2 integrate .. //depot/projects/trustedbsd/base/sys/net/bridge.c#13 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#16 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ef.c#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#24 integrate .. //depot/projects/trustedbsd/base/sys/net/if_loop.c#10 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#12 integrate .. //depot/projects/trustedbsd/base/sys/net/net_osdep.h#5 integrate .. //depot/projects/trustedbsd/base/sys/net/radix.c#6 integrate .. //depot/projects/trustedbsd/base/sys/net/radix.h#3 integrate .. //depot/projects/trustedbsd/base/sys/net/raw_cb.c#5 integrate .. //depot/projects/trustedbsd/base/sys/net/raw_usrreq.c#7 integrate .. //depot/projects/trustedbsd/base/sys/net/route.c#6 integrate .. //depot/projects/trustedbsd/base/sys/net/rtsock.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/at_control.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_if.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_usrreq.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_bridge.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_one2many.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ppp.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_pptpgre.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_tee.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_encap.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_icmp.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/esp_core.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/icmp6.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_fw.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_input.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipcomp_output.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/keysock.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netkey/keysock.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_trantcp.c#11 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/bootp_subr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#9 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_dcreg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#12 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_stereg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#13 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/limits.h#3 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/atomic.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/limits.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/smp.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/tlb.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/tte.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/vmparam.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/cache.c#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/dump_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#12 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#19 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#27 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_machdep.c#13 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#30 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tlb.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tsb.c#12 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/vm_machdep.c#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/_iovec.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/_types.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/file.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/ipc.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/msg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/mutex.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#33 integrate .. //depot/projects/trustedbsd/base/sys/sys/socket.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/time.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/types.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/uio.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#31 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#9 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#19 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_subr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_inode.c#9 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufsmount.h#5 integrate .. //depot/projects/trustedbsd/base/sys/vm/phys_pager.c#8 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#14 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#7 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#18 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#22 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#12 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_meter.c#8 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#23 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.h#9 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#27 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#18 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#17 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pager.h#5 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#19 integrate .. //depot/projects/trustedbsd/base/sys/x86_64/include/limits.h#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcrtomb.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdio/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdio/test-perror.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/string/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/string/test-strerror.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.australia#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.birthday#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.history#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/chpass/chpass.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/colcrt/colcrt.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/finger/finger.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/gencat/genlib.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/getopt/getopt.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/leave/leave.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/less/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/lex/lex.1#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/m4/m4.1#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/make.1#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/mkdep/mkdep.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/mklocale/mklocale.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/mklocale/yacc.y#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/nice/nice.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/passwd/passwd.1#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/paste/paste.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/soelim/soelim.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/systat/systat.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/talk/talk.1#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/tcopy/tcopy.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/telnet/telnet.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/time/time.1#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/tip/tip/tip.1#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/unifdef/unifdef.1#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/unifdef/unifdef.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/uuencode/uuencode.1#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/who/who.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/xargs/xargs.1#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/xargs/xargs.c#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpidump/acpi.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpidump/acpi_user.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpidump/acpidump.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/acpi/acpidump/acpidump.h#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/acpi/amldb/amldb.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.8#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/rmuser.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ancontrol/ancontrol.8#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/apm/apm.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/apmd/apmd.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.4#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/crontab/crontab.5#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ctm/ctm_rmail/ctm_rmail.1#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/fdcontrol/fdcontrol.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/gifconfig/gifconfig.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/dtmfdecode/dtmfdecode.1#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/isdntrace/isdntrace.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4btel.4#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/ihfc.4#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/iostat/iostat.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/lpd/lpd.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/exports.5#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/moused/moused.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mrouted/mrinfo.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mrouted/mrouted.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mrouted/mtrace.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/doc/ntp.conf.5#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/doc/ntp.keys.5#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/doc/ntpdc.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/doc/ntpq.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/loadfont/loadfont.1#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/pkg_add.1#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/pkg_create.1#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pppd/pppd.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rrenumd/rrenumd.conf.5#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rtadvd/rtadvd.conf.5#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rtsold/rtsold.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/setkey/setkey.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sicontrol/sicontrol.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/label.c#15 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/menus.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/sysinstall.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/syslogd/syslog.conf.5#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/usbd/usbd.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/usbd/usbd.conf.5#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wicontrol/wicontrol.8#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/ypserv.8#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/UPDATING#26 (text+ko) ==== @@ -17,6 +17,15 @@ developers choose to disable these features on build machines to maximize performance. +20021222: + For a period after the GCC 3.2.1 import (from 12/04 to 12/22), GCC + used an incompatible form of ABI for returning structures and unions + which FreeBSD's GCC maintainers were not aware of relative to previous + versions of FreeBSD. We have gone back to the ABI for now, and any + code compiled which is required to interoperate with other code (not + built at the same time) returning structs or unions should be + rebuilt. + 20021216: A name change in /etc/netconfig has been reverted to stay compatible with with suns TIRPC and also with NetBSD. You need @@ -1162,4 +1171,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.230 2002/12/16 22:24:24 mbr Exp $ +$FreeBSD: src/UPDATING,v 1.232 2002/12/22 07:08:14 kan Exp $ ==== //depot/projects/trustedbsd/base/bin/ls/ls.c#16 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.71 2002/11/06 01:18:12 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.72 2002/12/18 21:05:15 rwatson Exp $"); #include #include @@ -448,7 +448,8 @@ * If not recursing down this tree and don't need stat info, just get * the names. */ - ch_options = !f_recursive && options & FTS_NOSTAT ? FTS_NAMEONLY : 0; + ch_options = !f_recursive && !f_label && + options & FTS_NOSTAT ? FTS_NAMEONLY : 0; while ((p = fts_read(ftsp)) != NULL) switch (p->fts_info) { @@ -691,7 +692,9 @@ error = mac_prepare_file_label(&label); if (error == -1) { - warn("%s", cur->fts_name); + warn("MAC label for %s/%s", + cur->fts_parent->fts_path, + cur->fts_name); goto label_out; } @@ -700,8 +703,8 @@ "%s", cur->fts_name); else snprintf(name, sizeof(name), - "%s/%s", cur->fts_parent->fts_accpath, - cur->fts_name); + "%s/%s", cur->fts_parent-> + fts_accpath, cur->fts_name); if (options & FTS_LOGICAL) error = mac_get_file(name, @@ -710,7 +713,9 @@ error = mac_get_link(name, label); if (error == -1) { - warn("%s", cur->fts_name); + warn("MAC label for %s/%s", + cur->fts_parent->fts_path, + cur->fts_name); mac_free(label); goto label_out; } @@ -718,7 +723,9 @@ error = mac_to_text(label, &labelstr); if (error == -1) { - warn("%s", cur->fts_name); + warn("MAC label for %s/%s", + cur->fts_parent->fts_path, + cur->fts_name); mac_free(label); goto label_out; } ==== //depot/projects/trustedbsd/base/bin/ls/print.c#14 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.63 2002/11/06 01:18:12 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.64 2002/12/19 01:13:23 tjr Exp $"); #include #include @@ -674,6 +674,14 @@ else snprintf(name, sizeof(name), "%s/%s", p->fts_parent->fts_accpath, p->fts_name); + /* + * We have no way to tell whether a symbolic link has an ACL since + * pathconf() and acl_get_file() both follow them. + */ + if (S_ISLNK(p->fts_statp->st_mode)) { + *haveacls = 1; + return; + } if ((ret = pathconf(name, _PC_ACL_EXTENDED)) <= 0) { if (ret < 0 && errno != EINVAL) warn("%s", name); ==== //depot/projects/trustedbsd/base/bin/ps/ps.1#12 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.59 2002/10/24 00:00:57 rwatson Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.60 2002/12/23 16:04:49 ru Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -269,7 +269,7 @@ Marks a process which is in .Xr jail 2 . >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message