Date: Wed, 11 Dec 2002 19:25:51 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22183 for review Message-ID: <200212120325.gBC3PpFl028781@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=22183 Change 22183 by marcel@marcel_vaio on 2002/12/11 19:25:51 IFC @22182 Affected files ... .. //depot/projects/ia64/etc/pccard_ether#3 integrate .. //depot/projects/ia64/etc/rc.network#19 integrate .. //depot/projects/ia64/games/grdc/grdc.6#2 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac.3#5 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_get.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_is_present_np.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_set.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_text.3#5 integrate .. //depot/projects/ia64/lib/libc/sys/chroot.2#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#59 integrate .. //depot/projects/ia64/sbin/raidctl/raidctl.8#2 integrate .. //depot/projects/ia64/sbin/vinum/list.c#3 integrate .. //depot/projects/ia64/share/examples/isdn/i4brunppp/i4brunppp.8#3 integrate .. //depot/projects/ia64/share/man/man4/Makefile#27 integrate .. //depot/projects/ia64/share/man/man4/cardbus.4#3 integrate .. //depot/projects/ia64/share/man/man4/devctl.4#1 branch .. //depot/projects/ia64/share/man/man4/geom.4#3 integrate .. //depot/projects/ia64/share/man/man4/mac_biba.4#3 integrate .. //depot/projects/ia64/share/man/man4/mac_bsdextended.4#3 integrate .. //depot/projects/ia64/share/man/man4/mac_ifoff.4#1 branch .. //depot/projects/ia64/share/man/man4/mac_mls.4#3 integrate .. //depot/projects/ia64/share/man/man4/mac_none.4#2 integrate .. //depot/projects/ia64/share/man/man4/mac_partition.4#1 branch .. //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#2 integrate .. //depot/projects/ia64/share/man/man4/mac_test.4#2 integrate .. //depot/projects/ia64/share/man/man4/pccard.4#3 integrate .. //depot/projects/ia64/share/man/man7/ffs.7#6 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#13 integrate .. //depot/projects/ia64/sys/dev/amr/amr.c#8 integrate .. //depot/projects/ia64/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/ia64/sys/dev/amr/amr_disk.c#5 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/amr/amrvar.h#7 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrevive.c#6 integrate .. //depot/projects/ia64/sys/ufs/ffs/README.snapshot#3 integrate .. //depot/projects/ia64/usr.bin/c99/c99.1#2 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/makeman#2 integrate .. //depot/projects/ia64/usr.sbin/getfmac/getfmac.8#3 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4b.4#4 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.8#5 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#10 integrate .. //depot/projects/ia64/usr.sbin/setfmac/setfmac.8#6 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/label.c#12 integrate Differences ... ==== //depot/projects/ia64/etc/pccard_ether#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.26 2001/09/13 06:18:07 imp Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.27 2002/12/11 23:30:34 imp Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -21,6 +21,13 @@ start_dhcp() { stop_dhcp + case ${pccard_ether_delay} in + [Nn][Oo]) + ;; + [0-9]) + sleep ${pccard_ether_delay} + ;; + esac if [ -x "${dhcp_program}" ]; then if [ `basename ${dhcp_program}` = "dhclient" ]; then pidfile="/var/run/dhclient.${interface}.pid" @@ -46,17 +53,6 @@ startstop=$1 shift -case ${pccard_ether_delay} in -[Nn][Oo]) - ;; -[0-9]) - sleep ${pccard_ether_delay} - ;; -*) # Default until it has had a chance to make it to /etc/defaults/rc.conf - sleep 5 - ;; -esac - case ${pccard_ifconfig} in [Nn][Oo] | '') expr "${removable_interfaces}" : ".*${interface}" > /dev/null || exit 0 @@ -69,6 +65,11 @@ case ${startstop} in [Ss][Tt][Aa][Rr][Tt] | '') + if ifconfig ${interface} | grep -s UP,; then + # Interface is already up, so ignore it. + exit 0 + fi + if [ -r /etc/start_if.${interface} ]; then . /etc/start_if.${interface} fi ==== //depot/projects/ia64/etc/rc.network#19 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.network,v 1.138 2002/11/02 08:21:26 ume Exp $ +# $FreeBSD: src/etc/rc.network,v 1.139 2002/12/11 23:30:34 imp Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -209,6 +209,11 @@ dhcp_interfaces="" for ifn in ${network_interfaces}; do + if ifconfig ${interface} | grep -s UP,; then + # Interface is already up, so ignore it. + continue; + fi + if [ -r /etc/start_if.${ifn} ]; then . /etc/start_if.${ifn} eval showstat_$ifn=1 ==== //depot/projects/ia64/games/grdc/grdc.6#2 (text+ko) ==== @@ -1,6 +1,7 @@ -.\" $FreeBSD: src/games/grdc/grdc.6,v 1.3 2001/09/25 13:45:46 ru Exp $ +.\" $FreeBSD: src/games/grdc/grdc.6,v 1.4 2002/12/11 15:55:28 ru Exp $ .Dd September 25, 2001 .Dt GRDC 6 +.Os .Sh NAME .Nm grdc .Nd grand digital clock (curses) ==== //depot/projects/ia64/lib/libc/posix1e/mac.3#5 (text+ko) ==== @@ -28,10 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.5 2002/12/04 16:28:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.6 2002/12/11 15:55:29 ru Exp $ .\" .Dd December 21, 2001 .Dt MAC 3 +.Os .Sh NAME .Nm mac .Nd introduction to the POSIX.1e MAC security API ==== //depot/projects/ia64/lib/libc/posix1e/mac_get.3#3 (text+ko) ==== @@ -31,10 +31,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.2 2002/12/04 16:28:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.3 2002/12/11 15:55:29 ru Exp $ .\" .Dd December 21, 2001 .Dt MAC_GET 3 +.Os .Sh NAME .Nm mac_get_file , .Nm mac_get_fd , ==== //depot/projects/ia64/lib/libc/posix1e/mac_is_present_np.3#3 (text+ko) ==== @@ -31,10 +31,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac_is_present_np.3,v 1.2 2002/12/04 16:28:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac_is_present_np.3,v 1.3 2002/12/11 15:55:29 ru Exp $ .\" .Dd January 9, 2002 .Dt MAC_IS_PRESENT_NP 3 +.Os .Sh NAME .Nm mac_is_present_np .Nd report whether the running system has MAC support ==== //depot/projects/ia64/lib/libc/posix1e/mac_set.3#3 (text+ko) ==== @@ -31,10 +31,11 @@ .\" 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.2 2002/12/04 16:28:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.3 2002/12/11 15:55:29 ru Exp $ .\" .Dd December 21, 2001 .Dt MAC_SET 3 +.Os .Sh NAME .Nm mac_set_file , .Nm mac_set_fd , ==== //depot/projects/ia64/lib/libc/posix1e/mac_text.3#5 (text+ko) ==== @@ -31,10 +31,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.5 2002/12/04 16:28:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.6 2002/12/11 15:55:29 ru Exp $ .\" .Dd December 21, 2001 .Dt MAC_TEXT 3 +.Os .Sh NAME .Nm mac_from_text , .Nm mac_to_text ==== //depot/projects/ia64/lib/libc/sys/chroot.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chroot.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/chroot.2,v 1.15 2002/07/15 20:59:12 keramida Exp $ +.\" $FreeBSD: src/lib/libc/sys/chroot.2,v 1.16 2002/12/11 14:04:37 ru Exp $ .\" .Dd June 4, 1993 .Dt CHROOT 2 @@ -120,7 +120,7 @@ .It Bq Er ELOOP Too many symbolic links were encountered in translating the pathname. .It Bq Er EFAULT -.Fa Path +.Fa dirname points outside the process's allocated address space. .It Bq Er EIO An I/O error occurred while reading from or writing to the file system. ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#59 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The FreeBSD Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.466 2002/12/05 16:45:14 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.467 2002/12/11 23:08:06 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -1468,16 +1468,16 @@ <filename>/usr/src/sys/ufs/ufs/README.extattr</filename> for details).</para> - <para role="historic">Due to a licensing change, softupdates have been + <para role="historic">Due to a licensing change, Soft Updates have been integrated into the main portion of the kernel source tree. - As a consequence, softupdates are now available with the + As a consequence, Soft Updates are now available with the <filename>GENERIC</filename> kernel. &merged;</para> <para>A filesystem snapshot capability has been added to FFS. Details can be found in <filename>/usr/src/sys/ufs/ffs/README.snapshot</filename>.</para> - <para>When running with softupdates, &man.statfs.2; and + <para>When running with Soft Updates, &man.statfs.2; and &man.df.1; will track the number of blocks and files that are committed to being freed.</para> @@ -1604,6 +1604,16 @@ screen in &man.sysinstall.8;. 64-bit platforms can boot from UFS2 root filesystems.</para> + <para>To support new features mentioned in this section, minor + changes have been made to the format of the UFS1 superblock. + These changes may create some compatability problems when a + system older than &os; 4.7-RELEASE attempts to &man.mount.8; + or &man.fsck.8; a local UFS1 filesystem created by &os; + &release.current; or later. &os; 4.7-RELEASE and later are + fully compatible. This situation typically arises on a + dual-boot machine with multiple versions of &os; + installed.</para> + </sect3> <sect3> @@ -2621,7 +2631,7 @@ <para>&man.fsck.ffs.8; now supports background filesystem checks to mounted FFS filesystems with the <option>-B</option> option - (softupdates must be enabled on these filesystems). The + (Soft Updates must be enabled on these filesystems). The <option>-F</option> flag now determines whether a specified filesystem needs foreground checking.</para> @@ -3092,7 +3102,7 @@ faster. &merged;</para> <para role="historic">&man.newfs.8; now takes a <option>-U</option> option to - enable softupdates on a new filesystem. &merged;</para> + enable Soft Updates on a new filesystem. &merged;</para> <para role="historic">The default number of cylinders per group in &man.newfs.8; is now computed to be the maximum allowable given the current ==== //depot/projects/ia64/sbin/raidctl/raidctl.8#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/sbin/raidctl/raidctl.8,v 1.1 2002/10/20 08:17:34 scottl Exp $ +.\" $FreeBSD: src/sbin/raidctl/raidctl.8,v 1.2 2002/12/11 15:57:40 ru Exp $ .\" $NetBSD: raidctl.8,v 1.21 2000/08/10 15:14:14 oster Exp $ .\" .\" Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ .\" .Dd November 6, 1998 .Dt RAIDCTL 8 -.Os FreeBSD +.Os .Sh NAME .Nm raidctl .Nd configuration utility for the RAIDframe disk driver ==== //depot/projects/ia64/sbin/vinum/list.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ * advised of the possibility of such damage. * * $Id: list.c,v 1.25 2000/12/20 03:38:43 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/list.c,v 1.34 2002/04/22 13:44:28 des Exp $ + * $FreeBSD: src/sbin/vinum/list.c,v 1.35 2002/12/12 02:25:30 grog Exp $ */ #include <ctype.h> @@ -889,7 +889,7 @@ break; case loginfo_user_bp: /* this is the bp when strategy is called */ - printf("%s %dVS %s %p\t%d.%-6d 0x%-9x\t%ld\n", + printf("%s %dVS %s %p\t%2d.%-6d 0x%9llx\t%d\n", timetext(&rq.timestamp), rq.type, rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", @@ -902,7 +902,7 @@ case loginfo_sdiol: /* subdisk I/O launch */ case loginfo_user_bpl: /* and this is the bp at launch time */ - printf("%s %dLR %s %p\t%d.%-6d 0x%-9x\t%ld\n", + printf("%s %dLR %s %p\t%2d.%-6d 0x%9llx\t%ld\n", timetext(&rq.timestamp), rq.type, rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", @@ -914,7 +914,7 @@ break; case loginfo_rqe: /* user RQE */ - printf("%s 3RQ %s %p\t%d.%-6d 0x%-9x\t%ld\t%d\t%x\t%x\t%x\n", + printf("%s 3RQ %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", timetext(&rq.timestamp), rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", rq.bp, @@ -929,7 +929,7 @@ break; case loginfo_iodone: /* iodone called */ - printf("%s 4DN %s %p\t%d.%-6d 0x%-9x\t%ld\t%d\t%x\t%x\t%x\n", + printf("%s 4DN %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", timetext(&rq.timestamp), rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", rq.bp, @@ -944,7 +944,7 @@ break; case loginfo_raid5_data: /* RAID-5 write data block */ - printf("%s 5RD %s %p\t%d.%-6d 0x%-9x\t%ld\t%d\t%x\t%x\t%x\n", + printf("%s 5RD %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", timetext(&rq.timestamp), rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", rq.bp, @@ -959,7 +959,7 @@ break; case loginfo_raid5_parity: /* RAID-5 write parity block */ - printf("%s 6RP %s %p\t%d.%-6d 0x%-9x\t%ld\t%d\t%x\t%x\t%x\n", + printf("%s 6RP %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", timetext(&rq.timestamp), rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", rq.bp, @@ -974,7 +974,7 @@ break; case loginfo_sdio: /* subdisk I/O */ - printf("%s %dVS %s %p\t\t 0x%-9x\t%ld\t%d\n", + printf("%s %dVS %s %p\t\t 0x%9llx\t%ld\t%d\n", timetext(&rq.timestamp), rq.type, rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", @@ -985,7 +985,7 @@ break; case loginfo_sdiodone: /* subdisk I/O done */ - printf("%s %dSD %s %p\t\t 0x%-9x\t%ld\t%d\n", + printf("%s %dSD %s %p\t\t 0x%9llx\t%ld\t%d\n", timetext(&rq.timestamp), rq.type, rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", ==== //depot/projects/ia64/share/examples/isdn/i4brunppp/i4brunppp.8#3 (text+ko) ==== @@ -22,12 +22,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/examples/isdn/i4brunppp/i4brunppp.8,v 1.3 2002/07/14 14:57:58 charnier Exp $ +.\" $FreeBSD: src/share/examples/isdn/i4brunppp/i4brunppp.8,v 1.4 2002/12/11 15:55:29 ru Exp $ .\" .\" last edit-date: [Sat Jul 21 13:37:00 2001] .\" .Dd July 28, 1999 .Dt I4BRUNPPP 8 +.Os .Sh NAME .Nm i4brunppp .Nd interface i4b to userland ppp in server mode ==== //depot/projects/ia64/share/man/man4/Makefile#27 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.176 2002/12/10 00:39:17 chris Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.180 2002/12/11 23:08:19 imp Exp $ MAN= aac.4 \ acpi.4 \ @@ -37,6 +37,7 @@ dc.4 \ ddb.4 \ de.4 \ + devctl.4 \ disc.4 \ divert.4 \ dpt.4 \ @@ -97,8 +98,10 @@ mly.4 \ mac_biba.4 \ mac_bsdextended.4 \ + mac_ifoff.4 \ mac_mls.4 \ mac_none.4 \ + mac_partition.4 \ mac_seeotheruids.4 \ mac_test.4 \ mouse.4 \ @@ -210,6 +213,7 @@ tun.4 \ twe.4 \ txp.4 \ + ubsa.4 \ ubsec.4 \ ucom.4 \ udbp.4 \ ==== //depot/projects/ia64/share/man/man4/cardbus.4#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/share/man/man4/cardbus.4,v 1.2 2002/11/29 16:30:04 ru Exp $ +.\" $FreeBSD: src/share/man/man4/cardbus.4,v 1.3 2002/12/11 23:15:10 imp Exp $ .\" .Dd July 9, 2002 .Dt CARDBUS 4 @@ -41,6 +41,4 @@ driver supports all cardbus bridges in the system. .Sh SEE ALSO .Xr pccard 4 , -.Xr pccbb 4 -.Sh BUGS -There is no way cause a program to run when a card is inserted. +.Xr pccbb 4 . ==== //depot/projects/ia64/share/man/man4/geom.4#3 (text+ko) ==== @@ -32,10 +32,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/geom.4,v 1.3 2002/06/09 10:25:51 phk Exp $ +.\" $FreeBSD: src/share/man/man4/geom.4,v 1.4 2002/12/11 15:57:40 ru Exp $ .\" .Dd March 27, 2002 -.Os FreeBSD 5.0 +.Os .Dt GEOM 4 .Sh NAME .Nm GEOM ==== //depot/projects/ia64/share/man/man4/mac_biba.4#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_biba.4,v 1.2 2002/12/10 00:39:17 chris Exp $ +.\" $FreeBSD: src/share/man/man4/mac_biba.4,v 1.3 2002/12/11 01:02:26 chris Exp $ .Dd NOVEMBER 18, 2002 .Os .Dt MAC_BIBA 4 @@ -176,8 +176,10 @@ .Sh SEE ALSO .Xr LOMAC 4 , .Xr mac_bsdextended 4 , +.Xr mac_ifoff 4 , .Xr mac_mls 4 , .Xr mac_none 4 , +.Xr mac_partition 4 , .Xr mac_seeotheruids 4 , .Xr mac_test 4 , .Xr mac 9 ==== //depot/projects/ia64/share/man/man4/mac_bsdextended.4#3 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_bsdextended.4,v 1.2 2002/12/10 00:39:17 chris Exp $ +.\" $FreeBSD: src/share/man/man4/mac_bsdextended.4,v 1.3 2002/12/11 01:02:26 chris Exp $ .Dd OCTOBER 16, 2002 .Os .Dt MAC_BSDEXTENDED 4 @@ -79,8 +79,10 @@ .Sh SEE ALSO .Xr libugidfw 3 , .Xr mac_biba 4 , +.Xr mac_ifoff 4 , .Xr mac_mls 4 , .Xr mac_none 4 , +.Xr mac_partition 4 , .Xr mac_seeotheruids 4 , .Xr mac_test 4 , .Xr ugidfw 8 , ==== //depot/projects/ia64/share/man/man4/mac_mls.4#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.3 2002/12/10 00:39:17 chris Exp $ +.\" $FreeBSD: src/share/man/man4/mac_mls.4,v 1.4 2002/12/11 01:02:26 chris Exp $ .Dd DECEMBER 1, 2002 .Os .Dt MAC_MLS 4 @@ -174,8 +174,10 @@ .Sh SEE ALSO .Xr mac_biba 4 , .Xr mac_bsdextended 4 , +.Xr mac_ifoff 4 , .Xr mac_mls 4 , .Xr mac_none 4 , +.Xr mac_partition 4 , .Xr mac_seeotheruids 4 , .Xr mac_test 4 .Xr maclabel 7 , ==== //depot/projects/ia64/share/man/man4/mac_none.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_none.4,v 1.1 2002/12/10 00:39:17 chris Exp $ +.\" $FreeBSD: src/share/man/man4/mac_none.4,v 1.2 2002/12/11 01:02:26 chris Exp $ .Dd DECEMBER 1, 2002 .Os .Dt MAC_NONE 4 @@ -62,7 +62,9 @@ .Sh SEE ALSO .Xr mac_biba 4 , .Xr mac_bsdextended 4 , +.Xr mac_ifoff 4 , .Xr mac_mls 4 , +.Xr mac_partition 4 , .Xr mac_seeotheruids 4 , .Xr mac_test 4 , .Xr mac 9 ==== //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_seeotheruids.4,v 1.1 2002/12/10 00:39:17 chris Exp $ +.\" $FreeBSD: src/share/man/man4/mac_seeotheruids.4,v 1.2 2002/12/11 01:02:26 chris Exp $ .Dd DECEMBER 8, 2002 .Os .Dt MAC_SEEOTHERUIDS 4 @@ -82,7 +82,9 @@ .Sh SEE ALSO .Xr mac_biba 4 , .Xr mac_bsdextended 4 , +.Xr mac_ifoff 4 , .Xr mac_mls 4 , +.Xr mac_partition 4 , .Xr mac_none 4 , .Xr mac_test 4 , .Xr mac 9 ==== //depot/projects/ia64/share/man/man4/mac_test.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac_test.4,v 1.1 2002/12/10 00:39:17 chris Exp $ +.\" $FreeBSD: src/share/man/man4/mac_test.4,v 1.2 2002/12/11 01:02:26 chris Exp $ .Dd DECEMBER 1, 2002 .Os .Dt MAC_TEST 4 @@ -68,8 +68,10 @@ .Sh SEE ALSO .Xr mac_biba 4 , .Xr mac_bsdextended 4 , +.Xr mac_ifoff 4 , .Xr mac_mls 4 , .Xr mac_none 4 , +.Xr mac_partition 4 , .Xr mac_seeotheruids 4 , .Xr mac 9 .Sh HISTORY ==== //depot/projects/ia64/share/man/man4/pccard.4#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/share/man/man4/pccard.4,v 1.2 2002/11/29 16:31:09 ru Exp $ +.\" $FreeBSD: src/share/man/man4/pccard.4,v 1.3 2002/12/11 23:15:10 imp Exp $ .\" .Dd July 9, 2002 .Dt PCCARD 4 @@ -43,7 +43,6 @@ .Xr cardbus 4 , .\" .Xr mecia 4 , .Xr pccbb 4 , -.Xr pcic 4 -.\" .Xr tcic 4 -.Sh BUGS -There is no way cause a program to run when a card is inserted. +.Xr pcic 4 . +.\" .Xr mecia 4 , +.\" .Xr tcic 4 . ==== //depot/projects/ia64/share/man/man7/ffs.7#6 (text+ko) ==== @@ -28,10 +28,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/ffs.7,v 1.10 2002/12/09 03:41:37 rwatson Exp $ +.\" $FreeBSD: src/share/man/man7/ffs.7,v 1.11 2002/12/11 15:55:29 ru Exp $ .\" .Dd December 26, 2001 .Dt FFS 7 +.Os .Sh NAME .Nm ffs .Nd Berkeley fast filesystem ==== //depot/projects/ia64/sys/dev/acpica/acpi.c#25 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.81 2002/11/24 02:27:07 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.82 2002/12/11 18:48:50 takawata Exp $ */ #include "opt_acpi.h" @@ -427,6 +427,10 @@ SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "verbose", CTLFLAG_RD | CTLFLAG_RW, &sc->acpi_verbose, 0, "verbose mode"); + SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), + OID_AUTO, "disable_on_poweroff", CTLFLAG_RD | CTLFLAG_RW, + &sc->acpi_disable_on_poweroff, 0, "ACPI subsystem disable on poweroff"); + sc->acpi_disable_on_poweroff = 1; sc->acpi_sleep_delay = 0; sc->acpi_s4bios = 1; if (bootverbose) @@ -869,8 +873,10 @@ acpi_shutdown_pre_sync(void *arg, int howto) { + struct acpi_softc *sc = arg; + ACPI_ASSERTLOCK; - + /* * Disable all ACPI events before soft off, otherwise the system * will be turned on again on some laptops. @@ -879,7 +885,8 @@ * before powering down, since we may still need ACPI during the * shutdown process. */ - acpi_Disable((struct acpi_softc *)arg); + if (sc->acpi_disable_on_poweroff) + acpi_Disable(sc); } static void ==== //depot/projects/ia64/sys/dev/acpica/acpivar.h#13 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.37 2002/10/31 17:58:38 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.38 2002/12/11 18:48:50 takawata Exp $ */ #include "bus_if.h" @@ -65,6 +65,7 @@ int acpi_sleep_delay; int acpi_s4bios; + int acpi_disable_on_poweroff; int acpi_verbose; ==== //depot/projects/ia64/sys/dev/amr/amr.c#8 (text+ko) ==== @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amr.c,v 1.35 2002/10/31 14:10:00 emoore Exp $ + * $FreeBSD: src/sys/dev/amr/amr.c,v 1.36 2002/12/11 20:59:46 emoore Exp $ */ /* @@ -134,7 +134,6 @@ */ static int amr_bio_command(struct amr_softc *sc, struct amr_command **acp); static int amr_wait_command(struct amr_command *ac); -static int amr_poll_command(struct amr_command *ac); static int amr_getslot(struct amr_command *ac); static void amr_mapcmd(struct amr_command *ac); static void amr_unmapcmd(struct amr_command *ac); @@ -151,9 +150,11 @@ */ static int amr_quartz_submit_command(struct amr_softc *sc); static int amr_quartz_get_work(struct amr_softc *sc, struct amr_mailbox *mbsave); +static int amr_quartz_poll_command(struct amr_command *ac); static int amr_std_submit_command(struct amr_softc *sc); static int amr_std_get_work(struct amr_softc *sc, struct amr_mailbox *mbsave); +static int amr_std_poll_command(struct amr_command *ac); static void amr_std_attach_mailbox(struct amr_softc *sc); #ifdef AMR_BOARD_INIT @@ -166,8 +167,10 @@ */ static void amr_describe_controller(struct amr_softc *sc); #ifdef AMR_DEBUG +#if 0 static void amr_printcommand(struct amr_command *ac); #endif +#endif /******************************************************************************** ******************************************************************************** @@ -214,9 +217,11 @@ if (AMR_IS_QUARTZ(sc)) { sc->amr_submit_command = amr_quartz_submit_command; sc->amr_get_work = amr_quartz_get_work; + sc->amr_poll_command = amr_quartz_poll_command; } else { sc->amr_submit_command = amr_std_submit_command; sc->amr_get_work = amr_std_get_work; + sc->amr_poll_command = amr_std_poll_command; amr_std_attach_mailbox(sc);; } @@ -336,7 +341,7 @@ struct amr_command_cluster *acc; /* detach from CAM */ - amr_cam_detach(sc); + amr_cam_detach(sc); /* cancel status timeout */ untimeout(amr_periodic, sc, sc->amr_timeout); @@ -346,6 +351,10 @@ TAILQ_REMOVE(&sc->amr_cmd_clusters, acc, acc_link); amr_freecmd_cluster(acc); } + + /* destroy control device */ + if( sc->amr_dev_t != (dev_t)NULL) + destroy_dev(sc->amr_dev_t); } /******************************************************************************* @@ -502,7 +511,7 @@ error = copyout(dp, au->au_buffer, au->au_length); debug(2, "copyout %ld bytes from %p -> %p", au->au_length, dp, au->au_buffer); if (dp != NULL) - debug(2, "%16D", dp, " "); + debug(2, "%16d", (int)dp); au->au_status = ac->ac_status; break; @@ -689,7 +698,7 @@ mbox[3] = cmdqual; /* can't assume that interrupts are going to work here, so play it safe */ - if (amr_poll_command(ac)) + if (sc->amr_poll_command(ac)) goto out; error = ac->ac_status; @@ -723,7 +732,7 @@ ac->ac_mailbox.mb_command = AMR_CMD_FLUSH; /* we have to poll, as the system may be going down or otherwise damaged */ - if (amr_poll_command(ac)) + if (sc->amr_poll_command(ac)) goto out; error = ac->ac_status; @@ -759,7 +768,7 @@ /* we have to poll, as the system may be going down or otherwise damaged */ - if (amr_poll_command(ac)) + if (sc->amr_poll_command(ac)) goto out; if( ac->ac_status == AMR_STATUS_SUCCESS ) { error = 1; @@ -929,7 +938,7 @@ * Returns nonzero on error. Can be safely called with interrupts enabled. */ static int -amr_poll_command(struct amr_command *ac) +amr_std_poll_command(struct amr_command *ac) { struct amr_softc *sc = ac->ac_sc; int error, count; @@ -960,6 +969,60 @@ } /******************************************************************************** + * Take a command, submit it to the controller and busy-wait for it to return. + * Returns nonzero on error. Can be safely called with interrupts enabled. + */ +static int +amr_quartz_poll_command(struct amr_command *ac) +{ + struct amr_softc *sc = ac->ac_sc; + int s; + + debug_called(2); + + /* now we have a slot, we can map the command (unmapped in amr_complete) */ + amr_mapcmd(ac); + + s = splbio(); + + if(sc->amr_busyslots) { + device_printf(sc->amr_dev, "adapter is busy"); + splx(s); + amr_unmapcmd(ac); + ac->ac_status=0; + return(1); + } + + bcopy(&ac->ac_mailbox, (void *)(uintptr_t)(volatile void *)sc->amr_mailbox, AMR_MBOX_CMDSIZE); + + /* clear the poll/ack fields in the mailbox */ + sc->amr_mailbox->mb_ident = 0xFE; + sc->amr_mailbox->mb_nstatus = 0xFF; + sc->amr_mailbox->mb_status = 0xFF; + sc->amr_mailbox->mb_poll = 0; + sc->amr_mailbox->mb_ack = 0; + + AMR_QPUT_IDB(sc, sc->amr_mailboxphys | AMR_QIDB_SUBMIT); + + while(sc->amr_mailbox->mb_nstatus == 0xFF); + while(sc->amr_mailbox->mb_status == 0xFF); + while(sc->amr_mailbox->mb_poll != 0x77); + sc->amr_mailbox->mb_poll = 0; + sc->amr_mailbox->mb_ack = 0x77; + + /* acknowledge that we have the commands */ + AMR_QPUT_IDB(sc, sc->amr_mailboxphys | AMR_QIDB_ACK); + + splx(s); + + /* unmap the command's data buffer */ + amr_unmapcmd(ac); + + ac->ac_status=0; + return(0); +} + +/******************************************************************************** * Get a free command slot for a command if it doesn't already have one. * * May be safely called multiple times for a given command. @@ -1713,6 +1776,7 @@ /******************************************************************************** * Print the command (ac) in human-readable format */ +#if 0 static void amr_printcommand(struct amr_command *ac) { @@ -1735,3 +1799,4 @@ device_printf(sc->amr_dev, " %x/%d\n", sg->sg_addr, sg->sg_count); } #endif +#endif ==== //depot/projects/ia64/sys/dev/amr/amr_cam.c#4 (text+ko) ==== @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.4 2002/10/30 22:00:11 emoore Exp $ + * $FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.5 2002/12/11 20:59:46 emoore Exp $ */ #include <sys/param.h> @@ -580,7 +580,7 @@ /* XXX note that we're ignoring ac->ac_status - good idea? */ - debug(1, "status 0x%x scsi_status 0x%x", ac->ac_status, ap->ap_scsi_status); + debug(1, "status 0x%x scsi_status 0x%x", ac->ac_status, aep->ap_scsi_status); /* * Hide disks from CAM so that they're not picked up and treated as 'normal' disks. ==== //depot/projects/ia64/sys/dev/amr/amr_disk.c#5 (text+ko) ==== @@ -54,7 +54,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.20 2002/10/30 22:00:11 emoore Exp $ + * $FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.21 2002/12/11 20:59:46 emoore Exp $ */ /* @@ -105,6 +105,9 @@ /* dump */ nodump, /* psize */ nopsize, /* flags */ D_DISK, +#if __FreeBSD_version < 500000 + /* bmaj */ -1 +#endif }; static devclass_t amrd_devclass; ==== //depot/projects/ia64/sys/dev/amr/amr_pci.c#7 (text+ko) ==== @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.13 2002/11/21 16:06:10 emoore Exp $ + * $FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.14 2002/12/11 20:59:46 emoore Exp $ */ #include <sys/param.h> @@ -337,6 +337,7 @@ amr_pci_shutdown(device_t dev) { struct amr_softc *sc = device_get_softc(dev); + int i,error,s; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212120325.gBC3PpFl028781>