Date: Sat, 6 Dec 2003 14:47:49 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 43505 for review Message-ID: <200312062247.hB6Mln9u072522@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=43505 Change 43505 by marcel@marcel_nfs on 2003/12/06 14:47:03 IFC @43504 Affected files ... .. //depot/projects/ia64/lib/libc/amd64/gen/makecontext.c#2 integrate .. //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/enter_uts.S#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#29 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#73 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#9 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#133 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#31 integrate .. //depot/projects/ia64/sbin/init/init.c#6 integrate .. //depot/projects/ia64/sbin/mount/mount.c#12 integrate .. //depot/projects/ia64/sbin/umount/umount.c#10 integrate .. //depot/projects/ia64/share/man/man4/dc.4#7 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/cx.4#4 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC.hints#4 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#21 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.c#15 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#49 integrate .. //depot/projects/ia64/sys/i386/include/cronyx.h#2 delete .. //depot/projects/ia64/sys/kern/kern_prot.c#32 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#17 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#26 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#53 integrate .. //depot/projects/ia64/sys/pci/if_dcreg.h#19 integrate .. //depot/projects/ia64/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#24 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#17 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#24 integrate .. //depot/projects/ia64/sys/security/mac_partition/mac_partition.c#7 integrate .. //depot/projects/ia64/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#16 integrate .. //depot/projects/ia64/sys/sys/mac.h#23 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#19 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#28 integrate .. //depot/projects/ia64/tools/tools/tinderbox/etc/releng_5.rc#2 integrate Differences ... ==== //depot/projects/ia64/lib/libc/amd64/gen/makecontext.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/makecontext.c,v 1.1 2003/07/19 04:41:08 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/makecontext.c,v 1.2 2003/12/05 01:36:44 peter Exp $"); #include <sys/types.h> #include <sys/ucontext.h> @@ -70,8 +70,12 @@ /* Allocate space for a maximum of 6 arguments on the stack. */ args = sp - 6; - /* Account for arguments on stack and align to 16 bytes. */ - sp -= 8; + /* + * Account for arguments on stack and do the funky C entry alignment. + * This means that we need an 8-byte-odd alignment since the ABI expects + * the return address to be pushed, thus breaking the 16 byte alignment. + */ + sp -= 7; /* Add the arguments: */ va_start(ap, argc); ==== //depot/projects/ia64/lib/libpthread/arch/amd64/amd64/enter_uts.S#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/enter_uts.S,v 1.3 2003/08/02 22:39:10 davidxu Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/amd64/amd64/enter_uts.S,v 1.4 2003/12/05 01:41:43 peter Exp $"); /* @@ -35,7 +35,7 @@ ENTRY(_amd64_enter_uts) addq %rcx, %rdx /* get stack base */ andq $~0xf, %rdx /* align to 16 bytes */ + subq $8, %rdx /* simulate "call" alignment */ movq %rdx, %rsp /* switch to UTS stack */ movq %rdx, %rbp /* set frame */ - pushq %rsi - ret + jmpq *%rsi ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#29 (text+ko) ==== @@ -38,7 +38,7 @@ The &os; Project </corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.53 2003/10/06 04:20:26 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.54 2003/12/04 23:53:54 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -198,6 +198,14 @@ is unaffected, for example). More information can be found in security advisory <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:18.openssl.asc">FreeBSD-SA-03:18</ulink>.</para>; + + <para><application>BIND</application> contains the potential for a + denial-of-service attack. This vulnerability has been addressed + by a vendor patch on the &release.prev; security fix branch and + by the import of a new version to the &release.branch; + development branch. For more information, see + <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:19.bind.asc">FreeBSD-SA-03:19</ulink>.</para>; + ]]> </sect1> ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#73 (text+ko) ==== @@ -29,7 +29,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.203 2003/12/02 07:13:03 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.206 2003/12/06 20:43:48 bmah Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -274,16 +274,6 @@ <quote>C</quote>, <quote>S</quote>, and <quote>A</quote> Series Host Adapters (&man.bt.4; driver) - <note arch="i386,amd64"> - <para>BusLogic/Mylex <quote>Flashpoint</quote> adapters are not yet - supported.</para> - </note> - - <note arch="i386,amd64"> - <para>AMI FastDisk controllers that are true BusLogic - MultiMaster clones are also supported.</para> - </note> - <note arch="i386"> <para>The Buslogic/Bustek BT-640 and Storage Dimensions SDC3211B and SDC3211F Microchannel (MCA) bus adapters are @@ -336,11 +326,6 @@ <para arch="i386,amd64">Mylex AcceleRAID/eXtremeRAID family PCI to SCSI RAID controllers with 6.x firmware (&man.mly.4; driver) - - <note> - <para>Compatible Mylex controllers not listed should work, but - have not been verified.</para> - </note> </para> <para arch="i386">3ware Escalade ATA RAID controllers (&man.twe.4; driver) @@ -793,7 +778,7 @@ (&man.ste.4; driver) </para> - <para arch="i386,pc98,alpha,amd64">SysKonnect SK-984x PCI Gigabit Ethernet cards (&man.sk.4; drivers) + <para arch="i386,pc98,alpha,amd64">SysKonnect SK-984x PCI Gigabit Ethernet cards (&man.sk.4; driver) </para> <para arch="i386,pc98,alpha,amd64">Texas Instruments ThunderLAN PCI NICs (&man.tl.4; driver)</para> @@ -919,16 +904,6 @@ drivers), plus NICs supported by the Intel 82540EM, 82544, 82545EM, and 82546EB controller chips (&man.em.4; driver only) - <itemizedlist> - <listitem> - <para>Intel PRO/1000 Gigabit Ethernet</para> - </listitem> - </itemizedlist> - - <note> - <para>The &man.em.4; driver is officially supported by Intel, - but is only supported on the i386.</para> - </note> </para> <para arch="sparc64">Sun HME and QFE Ethernet NICs (&man.hme.4; driver)</para> @@ -1004,6 +979,9 @@ <sect2> <title>Miscellaneous Networks</title> + <para arch="i386">Cronyx-Sigma synchronous / asynchronous serial + adapters (&man.cx.4; driver)</para> + <para arch="i386">Granch SBNI12 point-to-point communications adapters (&man.sbni.4; driver) </para> @@ -1122,6 +1100,7 @@ <sect2> <title>Serial Interfaces</title> + <para arch="i386,alpha,ia64,amd64"><quote>PC standard</quote> 8250, 16450, and 16550-based serial ports (&man.sio.4; driver)</para> <para arch="sparc64">Serial ports based on the SAB82532 serial @@ -1169,14 +1148,6 @@ <para arch="i386">STB 4 port card using shared IRQ</para> <para arch="i386">DigiBoard intelligent serial cards (&man.dgb.4; driver) - <itemizedlist> - <listitem> - <para>DigiBoard PC/Xe series</para> - </listitem> - <listitem> - <para>DigiBoard PC/Xi series</para> - </listitem> - </itemizedlist> </para> <para arch="i386,ia64,amd64">PCI-Based multi-port serial boards (&man.puc.4; @@ -1267,23 +1238,7 @@ </para> <para arch="i386">Stallion Technologies multiport serial boards - <itemizedlist> - <listitem> - <para>EasyIO (&man.stl.4; driver)</para> - </listitem> - <listitem> - <para>EasyConnection 8/32 (&man.stl.4; driver)</para> - </listitem> - <listitem> - <para>EasyConnection 8/64 (&man.stli.4; driver)</para> - </listitem> - <listitem> - <para>ONboard 4/16 (&man.stli.4; driver)</para> - </listitem> - <listitem> - <para>Brumby (&man.stli.4; driver)</para> - </listitem> - </itemizedlist> + (&man.stl.4; and &man.stli.4; drivers) </para> <para arch="i386,amd64">Specialix SI/XIO/SX multiport serial cards, with both the @@ -1803,44 +1758,7 @@ </itemizedlist> </para> - <para arch="i386,pc98,amd64">Audio Devices (uaudio driver) - <itemizedlist> - <listitem> - <para>Audio-Technica USB Digital Headphone ATC-HA4USB</para> - </listitem> - - <listitem> - <para>Ergo Systems AUDIOTRAK OPTOPlay USB</para> - </listitem> - - <listitem> - <para>KENWOOD MD Personal Stereo System MDX-G7</para> - </listitem> - - <listitem> - <para>KENWOOD/SOTEC VH-7PC</para> - </listitem> - - <listitem> - <para>I-O DATA Analog to Digital USB Audio Adapter DAVOX</para> - </listitem> - - <listitem> - <para>ONKYO PC Speaker GX-R5U(W)</para> - </listitem> - - <listitem> - <para>ONKYO USB Digital Audio Processor SE-U55X(S)</para> - </listitem> - - <listitem> - <para>Roland UA-5 USB Audio Interface <quote>Audio Capture</quote></para> - </listitem> - - <listitem> - <para>Sony PC Active Speaker System SRS-T100PC</para> - </listitem> - </itemizedlist> + <para arch="i386,pc98,amd64">Audio Devices (&man.uaudio.4; driver) </para> <para arch="i386,pc98,amd64">Handspring Visor and other PalmOS ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#9 (text+ko) ==== @@ -1,5 +1,5 @@ <!-- - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.12 2003/07/29 07:28:43 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml,v 1.13 2003/12/06 20:39:58 bmah Exp $ --> <sect1 id="proc"> <title>Supported Processors and Motherboards</title> @@ -42,8 +42,9 @@ additional physical processors; in other words, no attempt is made to optimize scheduling decisions given the shared resources between logical processors within the same CPU. Because this - naive scheduling can result in suboptimal performance, the logical - CPUs are halted by default at startup. They can be enabled with + naive scheduling can result in suboptimal performance, under + certain circumstances it may be useful to disable the logical + processors with the the <varname>machdep.hlt_logical_cpus</varname> sysctl variable. It is also possible to halt any CPU in the idle loop with the <varname>machdep.hlt_cpus</varname> sysctl variable. The ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#133 (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.658 2003/12/01 00:17:33 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.660 2003/12/05 21:34:31 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -195,6 +195,11 @@ is no longer needed when only a USB keyboard is connected. &merged;</para> + <para arch="i386">The &man.cx.4; driver for Cronyx Sigmal + serial interfaces has been overhauled. As a part of this + update, the cxconfig userland configuration utility has been + replaced by a newer &man.sconfig.8; utility.</para> + <para arch="i386,pc98">The DRM kernel modules have been updated from DRI CVS as of 12 November 2003. Among other changes, this change includes a newly-ported SiS 300/305/540/630/730 @@ -343,10 +348,18 @@ to support serial ports on certain architectures, such as ia64 and sparc64.</para> + <para>A new &man.utopia.4; driver supports 25MBit/sec, + 155MBit/sec and 622MBit/sec ATM physical layer configuration, + status and statistics reporting for the most commonly use + ATM-PHY chips.</para> + <para>The suspend/resume support for the &man.wi.4; driver now works correctly when the device is configured down. &merged;</para> + <para>The &man.wi.4; driver should once again work correctly + with Lucent 802.11b interfaces.</para> + <para>The 802.11 support layer has been rewritten to allow for future growth and new features.</para> @@ -365,6 +378,18 @@ <sect3 id="net-proto"> <title>Network Protocols</title> + <para>The <literal>ip_flow</literal> feature in the IPv4 protocol + implementation has been replaced by the + <literal>ip_fastforward</literal> feature. + <literal>ip_fastforward</literal> attempts to speed up simple + cases of packet forwarding, processing a forwarded packet to + an outgoing interface without queues or netisrs. If it cannot + handle a particular packet, it passes that packet to the normal + <literal>ip_input</literal> routines for processing. This + feature can be enabled by setting the + <varname>net.inet.ip.fastforwarding</varname> sysctl variable + to <literal>1</literal>. + <para>The <literal>IP_ONESBCAST</literal> option has been added to enable undirected &man.ip.4; broadcasts to be sent to specific network interfaces.</para> @@ -557,6 +582,11 @@ </listitem> </itemizedlist> + <para>Support for NFSv4 has been added with the import of the + University of Michigan's Citi NFSv4 client implementation. + More information can be found in the &man.mount.nfs4.8; and + &man.idmapd.8; manual pages.</para> + </sect3> <sect3 id="mm"> @@ -843,6 +873,15 @@ <para>The supported release of <application>KDE</application> has been updated from 3.1.2 to 3.1.4. &merged;</para> + <para>The versions of <application>GNOME</application> and + <application>KDE</application> included on release disc 1 + (and installable from the &man.sysinstall.8; <quote>X + Desktops</quote> menu) are now <quote>Lite Edition</quote>, + packages, rather than the more full-featured meta-packages. + These packages are streamlined to provide users with the core + essentials for each desktop, while still fitting within the + space constraints of release disc 1.</para> + </sect2> <sect2 id="doc"> ==== //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#31 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.51 2003/12/02 20:47:31 marcus Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.52 2003/12/06 04:15:13 scottl Exp $ # # MAINTAINER: re # @@ -79,7 +79,6 @@ CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/postfix" CDROM_SET_1="${CDROM_SET_1} net/pcnfsd" -CDROM_SET_1="${CDROM_SET_1} net/rsync" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font100dpi" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font75dpi" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-fontCyrillic" @@ -110,13 +109,10 @@ CDROM_SET_1="${CDROM_SET_1} astro/xearth" CDROM_SET_1="${CDROM_SET_1} editors/emacs21" CDROM_SET_1="${CDROM_SET_1} editors/vim" +CDROM_SET_1="${CDROM_SET_1} editors/vim-lite" CDROM_SET_1="${CDROM_SET_1} emulators/mtools" -CDROM_SET_1="${CDROM_SET_1} ftp/ncftp" -CDROM_SET_1="${CDROM_SET_1} graphics/gimp1" -CDROM_SET_1="${CDROM_SET_1} graphics/xpdf" CDROM_SET_1="${CDROM_SET_1} graphics/xv" CDROM_SET_1="${CDROM_SET_1} irc/xchat2" -CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/fetchmail" CDROM_SET_1="${CDROM_SET_1} mail/mutt" CDROM_SET_1="${CDROM_SET_1} mail/pine4" @@ -125,6 +121,7 @@ CDROM_SET_1="${CDROM_SET_1} misc/bsdiff" CDROM_SET_1="${CDROM_SET_1} misc/screen" CDROM_SET_1="${CDROM_SET_1} net/cvsup" +CDROM_SET_1="${CDROM_SET_1} net/rsync" CDROM_SET_1="${CDROM_SET_1} net/samba" CDROM_SET_1="${CDROM_SET_1} news/slrn" CDROM_SET_1="${CDROM_SET_1} news/tin" @@ -137,7 +134,6 @@ fi CDROM_SET_1="${CDROM_SET_1} print/apsfilter" CDROM_SET_1="${CDROM_SET_1} print/ghostscript-gnu-nox11" -CDROM_SET_1="${CDROM_SET_1} print/ghostview" CDROM_SET_1="${CDROM_SET_1} print/gv" CDROM_SET_1="${CDROM_SET_1} print/psutils-letter" CDROM_SET_1="${CDROM_SET_1} security/sudo" @@ -147,10 +143,6 @@ CDROM_SET_1="${CDROM_SET_1} shells/zsh" CDROM_SET_1="${CDROM_SET_1} sysutils/portupgrade" CDROM_SET_1="${CDROM_SET_1} www/lynx" -CDROM_SET_1="${CDROM_SET_1} www/mozilla" -CDROM_SET_1="${CDROM_SET_1} www/netscape-remote" -CDROM_SET_1="${CDROM_SET_1} www/netscape-wrapper" -CDROM_SET_1="${CDROM_SET_1} www/netscape48-communicator" CDROM_SET_1="${CDROM_SET_1} www/opera" CDROM_SET_1="${CDROM_SET_1} x11/rxvt" ==== //depot/projects/ia64/sbin/init/init.c#6 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 7/15/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/init/init.c,v 1.55 2002/12/17 21:23:36 green Exp $"; + "$FreeBSD: src/sbin/init/init.c,v 1.56 2003/12/05 04:28:03 imp Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -1279,9 +1279,6 @@ int devlen; char *old_getty, *old_window, *old_type; - if (! sessions) - return (state_func_t) multi_user; - /* * mark all sessions for death, (!SE_PRESENT) * as we find or create new ones they'll be marked as keepers, ==== //depot/projects/ia64/sbin/mount/mount.c#12 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.54 2003/08/07 04:51:41 imp Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.55 2003/12/05 09:36:56 iedowse Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -292,8 +292,8 @@ * ':' will be correctly parsed only if the separator is '@'. * The definition of a valid hostname is taken from RFC 1034. */ - if (vfslist == NULL && ((ep = strchr(argv[0], '@')) != NULL) || - ((ep = strchr(argv[0], ':')) != NULL)) { + if (vfslist == NULL && ((ep = strchr(argv[0], '@')) != NULL || + (ep = strchr(argv[0], ':')) != NULL)) { if (*ep == '@') { cp = ep + 1; ep = cp + strlen(cp); @@ -393,8 +393,7 @@ const char *vfstype, *spec, *name, *options, *mntopts; int flags; { - const char *argv[100], **edir; - char *path, *cur; + const char *argv[100]; struct statfs sf; pid_t pid; int argc, i, status; @@ -468,7 +467,8 @@ (void)snprintf(execname, sizeof(execname), "mount_%s", vfstype); execvP(execname, _PATH_SYSPATH, (char * const *)argv); if (errno == ENOENT) { - warn("exec mount_%s not found in %s", vfstype, path); + warn("exec mount_%s not found in %s", vfstype, + _PATH_SYSPATH); } exit(1); /* NOTREACHED */ @@ -531,13 +531,15 @@ if (verbose) { if (sfp->f_syncwrites != 0 || sfp->f_asyncwrites != 0) (void)printf(", writes: sync %ld async %ld", - sfp->f_syncwrites, sfp->f_asyncwrites); + (long)sfp->f_syncwrites, (long)sfp->f_asyncwrites); if (sfp->f_syncreads != 0 || sfp->f_asyncreads != 0) (void)printf(", reads: sync %ld async %ld", - sfp->f_syncreads, sfp->f_asyncreads); - printf(", fsid "); - for (i = 0; i < sizeof(sfp->f_fsid); i++) - printf("%02x", ((u_char *)&sfp->f_fsid)[i]); + (long)sfp->f_syncreads, (long)sfp->f_asyncreads); + if (sfp->f_fsid.val[0] != 0 || sfp->f_fsid.val[1] != 0) { + printf(", fsid "); + for (i = 0; i < sizeof(sfp->f_fsid); i++) + printf("%02x", ((u_char *)&sfp->f_fsid)[i]); + } } (void)printf(")\n"); } ==== //depot/projects/ia64/sbin/umount/umount.c#10 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)umount.c 8.8 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/umount/umount.c,v 1.41 2003/11/16 16:48:18 iedowse Exp $"; + "$FreeBSD: src/sbin/umount/umount.c,v 1.43 2003/12/05 09:29:42 iedowse Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -365,8 +365,9 @@ warn("unmount of %s failed", sfs->f_mntonname); if (errno != ENOENT) return (1); - /* Compatability for old kernels. */ - warnx("retrying using path instead of file system ID"); + /* Compatibility for old kernels. */ + if (sfs->f_fsid.val[0] != 0 || sfs->f_fsid.val[1] != 0) + warnx("retrying using path instead of file system ID"); if (unmount(sfs->f_mntonname, fflag) != 0) { warn("unmount of %s failed", sfs->f_mntonname); return (1); @@ -557,7 +558,7 @@ } /* - * Convert a hexidecimal filesystem ID to an fsid_t. + * Convert a hexadecimal filesystem ID to an fsid_t. * Returns 0 on success. */ int ==== //depot/projects/ia64/share/man/man4/dc.4#7 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/dc.4,v 1.24 2003/11/13 17:01:08 simon Exp $ +.\" $FreeBSD: src/share/man/man4/dc.4,v 1.25 2003/12/06 02:29:31 sanpei Exp $ .\" .Dd November 20, 1999 .Dt DC 4 @@ -133,6 +133,8 @@ .It Digital DE500-BA 10/100 (21143, non-MII) .It +ELECOM Laneed LD-CBL/TXA (ADMtek AN985) +.It Hawking CB102 CardBus .It IBM EtherJet Cardbus Adapter ==== //depot/projects/ia64/share/man/man4/man4.i386/cx.4#4 (text+ko) ==== @@ -1,15 +1,31 @@ +.\" Copyright (c) 2003 Roman Kurakin <rik@cronyx.ru> +.\" Copyright (c) 2003 Cronyx Engineering +.\" All rights reserved. +.\" +.\" This software is distributed with NO WARRANTIES, not even the implied +.\" warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +.\" +.\" Authors grant any other persons or organisations a permission to use, +.\" modify and redistribute this software in source and binary forms, +.\" as long as this message is kept with the software, all derivative +.\" works or modified versions. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.16 2003/05/18 21:05:21 ru Exp $ +.\" Cronyx Id: cp.4,v 1.1.2.2 2003/09/11 14:56:50 rik Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/cx.4,v 1.17 2003/12/05 07:03:58 imp Exp $ .\" -.Dd December 12, 1994 -.Dt CX 4 i386 +.Dd November 27, 2003 +.Dt Cronyx-Sigma 4 .Os .Sh NAME .Nm cx -.Nd asynchronous/synchronous Cronyx-Sigma adapter driver +.Nd driver for synchronous/asynchronous Cronyx-Sigma WAN adapters .Sh SYNOPSIS -.Cd "device cx 1" -.Cd device sppp +.Cd "device cx" +.Pp +Additional options: +.Cd "device sppp" +.Cd "options NETGRAPH" +.Cd "options NETGRAPH_CRONYX" .Pp In .Pa /boot/device.hints : @@ -17,261 +33,70 @@ .Cd hint.cx.0.port="0x240" .Cd hint.cx.0.irq="15" .Cd hint.cx.0.drq="7" +.Sh DESCRIPTION +The +.Nm +driver needs either +.Xr sppp 4 +or +.Xr netgraph 4 . +Which one to use is determined by NETGRAPH_CRONYX option. +If this option is present in your kernel configuration file, the +.Nm +driver will be compiled with +.Xr netgraph 4 +support, else driver will be compiled with +.Xr sppp 4 +support. .Pp The base i/o port address specified in .Pa /boot/device.hints must match the port address set by jumpers on the board. The DMA i/o channel and interrupt request numbers are configured -by software at adapter initialization. Legal values are: +by software at adapter initialization. +Legal values are: .Pp -.Bl -tag -compact -width Port -.It Port +.Bl -tag -compact -width Port: +.It Port : 0x240, 0x260, 0x280, 0x300, 0x320, 0x380 -.It IRQ +.It IRQ : 3, 5, 7, 10, 11, 12, 15 -.It DMA +.It DMA : 5, 6, 7 .El -.Sh DESCRIPTION -The Cronyx-Sigma driver supports the adapters of models 100, -400, 500, 401, 404, 410, 440, 703, 801, 810, 840. Different models have -different set of channels: .Pp -.Bl -tag -compact -width Cronyx-Sigma-999 -.It Model -Channels -.It Cronyx-Sigma-100 -0 -.It Cronyx-Sigma-400 -4, 5, 6, 7 -.It Cronyx-Sigma-500 -0, 4, 5, 6, 7 -.It Cronyx-Sigma-401 -0, 1, 2, 3 -.It Cronyx-Sigma-404 -0, 1, 2, 3 -.It Cronyx-Sigma-410 -0, 1, 2, 3 -.It Cronyx-Sigma-440 -0, 1, 2, 3 -.It Cronyx-Sigma-703 -0, 1, 2, 4, 5, 6, 7 -.It Cronyx-Sigma-801 -0, 1, 2, 3, 4, 5, 6, 7 -.It Cronyx-Sigma-810 -0, 1, 2, 3, 4, 5, 6, 7 -.It Cronyx-Sigma-840 -0, 1, 2, 3, 4, 5, 6, 7 -.El +The +.Nm +driver supports autodetection. +As for all non-PNP hardware using of +autodetection could lead to some potential problems with other devices during +detection of hardware. +It is alway better to specify hardware resources manualy. .Pp -A pair of two adapters can be united together by the special -short inter-board cable. Two united adapters use the same -IRQ and DMA channels and from the point of driver works -as the single 16-channel multiplexer. One of the united -boards is ``master'' and the other is ``slave''. -.Pp -The channels of the slave united board are numbered by the driver -beginning with 8, for example, the united adapter of the model 100/500 -has channels 0, 8, 12, 13, 14, 15. -.Pp -The channels which have the RS-232 interface can be used -both in synchronous and asynchronous modes (software selectable -by cxconfig utility) and hence are called ``universal'' channels. -.Sh "Asynchronous driver" -The asynchronous channel device files have the names: -.Pa /dev/ttyx# -- for adapter cx0, -.Pa /dev/ttyy# -- for adapter cx1, -.Pa /dev/ttyz# -- for cx2. -Here # is the channel number in hexadecimal form, 0-9-a-f. -.Pp -The driver fulfills the following standard ioctl requests (see -.Xr ioctl 2 ) : -.Pp -.Bl -tag -width TIOCXXXXX -compact -.It Dv TIOCSBRK -Start sending BREAK. -.It Dv TIOCCBRK -Stop sending BREAK. -.It Dv TIOCSDTR -Set DTR signal (DTR := 1). The DTR signal is always set -on the first -.Xr open 2 -and could be changed by -.Dv TIOCCDTR , -.Dv TIOCSDTR , -.Dv TIOCMSET , -.Dv TIOCMBIS , -.Dv TIOCMBIC -ioctl calls. -.It TIOCCDTR -Clear DTR signal (DTR := 0). -.It TIOCMSET -Set the given values of DTR and RTS signals (<DTR:RTS> := data). -The signals DTR and RTS are controlled by -.Dv TIOCM_DTR -and -.Dv TIOCM_RTS -bits of the data argument of the ioctl system call. -.It TIOCMBIS -Set DTR and RTS signals (<DTR:RTS> |= data). -The signals DTR and RTS are controlled by -.Dv TIOCM_DTR -and -.Dv TIOCM_RTS -bits of the data argument of the ioctl system call. -.It TIOCMBIC -Clear DTR and RTS signals (<DTR:RTS> &= ~data). -The signals DTR and RTS are controlled by -.Dv TIOCM_DTR -and -.Dv TIOCM_RTS -bits of the data argument of the ioctl system call. -.It TIOCMGET -Determine the state of the modem signals of the line. -After the call the data argument contains the following bits: -.Pp -.Bl -tag -width TIOCM_XXX -compact -.It TIOCM_LE -always set (Line Enabled) -.It TIOCM_DSR -Data Set Ready signal received -.It TIOCM_CTS -Clear To Send signal received -.It TIOCM_CD -Data Carrier Detect signal received -.It TIOCM_DTR -Data Terminal Ready signal transmitted -.It TIOCM_RTS -Request To Send signal transmitted -.El -.El -.Sh "Synchronous driver" -The synchronous channels and universal channels, turned to the synchronous -mode by the -.Xr cxconfig 8 -utility, are accessible as network -interfaces named ``cx#'' where # is the channel number, 0..47. -All standard network interface parameters could be set by -.Xr ifconfig 8 -utility. +Refere to +.Xr sconfig 8 +for information about the +.Nm +adapter configuration. +.Sh SEE ALSO +.Xr cx 4 , +.Xr sppp 4 , +.Xr ifconfig 8 , +.Xr sconfig 8 , +.Xr spppcontrol 8 +.Sh HISTORY The -.Xr cxconfig 8 -command is used to change some extended channel -options, and also for setting the high-level software protocol -(e.g. PpP or Cisco HDLC). -.Pp -The universal channels could be used both in asynchronous and synchronous modes. -By default the asynchronous mode is set. -The mode could be changed by -.Xr cxconfig 8 -utility. -The mode is blocked while the channel is busy (an asynchronous channel -in open state or the network interface is up). -.Sh "Synchronous Point-to-Point protocol" -The Cronyx-Sigma driver uses the built-in implementation of the synchronous -Point-to-Point protocol (sppp). It includes the support for such -protocols as PpP/HDLC and Cisco/HDLC, and also the automatic -connection loss test (via keepalive packets). -The sppp protocol set is implemented as an independent module -and could be used by other drivers of synchronous serial channels. -The version of the driver for BSD/386 (BSDI) operating system -also supports the usage of the general set of synchronous -protocols, implemented inside the OS. -The external protocol set could be selected by ``cxconfig ext'' command -(see -.Xr cxconfig 8 ) . -.Sh "Channel Options Management" +.Nm +driver was updated in +.Fx 5.2 . +In most of previous versions of +.Fx +the +.Nm +driver is out of date. The -.Xr cxconfig 8 -utility is used for setting the channels options. -The channel options are generally set at the start of the operating -system (for example, from the file -.Pa /etc/rc ) . -Note, that not all options have a sense for every particular -case, and an attempt to set some of them can hang up the channel or -the whole adapter. -.Pp -The actual channel options control functions are implemented via -the ioctl-s on the special device file /dev/cronyx. -There are the following ioctl-s available: -.Pp -.Bl -tag -width CXIOCXXXXXXX -compact -.It CXIOCGETMODE -Get the channel option values. -.It CXIOCSETMODE -Set the channel option values. -.El -.Pp -The data argument of the ioctl call has an address of the options structure: -.Bd -literal -typedef struct { - unsigned char board; /* adapter number, 0..2 */ - unsigned char channel; /* channel number, 0..15 */ - unsigned char type; /* channel type (read only) */ - unsigned char iftype; /* chan0 interface */ - unsigned long rxbaud; /* receiver speed */ - unsigned long txbaud; /* transmitter speed */ - cx_chan_mode_t mode; /* channel mode */ - cx_chan_opt_t opt; /* common channel options */ - cx_opt_async_t aopt; /* async mode options */ - cx_opt_hdlc_t hopt; /* hdlc mode options */ - cx_opt_bisync_t bopt; /* bisync mode options */ - cx_opt_x21_t xopt; /* x.21 mode options */ - cx_soft_opt_t sopt; /* software options and state flags */ -} cx_options_t; /* user settable options */ -.Ed -.Pp -.Bl -tag -width rxbaudxxx -.It Fa board -The adapter number, 0..2. -.It Fa channel -The channel number, 0..15. -.It Fa type -The type of the channel (read-only argument). -.It Fa iftype -The interface type of the zero (and also the eight) channel: 0 - RS-232, -1 - RS-449/V.35. -.It Fa rxbaud -The receiver data baud rate. -.It Fa txbaud -The transmitter data baud rate. -.It Fa mode -The channel mode: asynchronous/HDLC/Bisync/X.21. -.It Fa opt -The general channel options. -.It Fa aopt -The asynchronous mode options. -.It Fa hopt -The HDLC mode options. -.It Fa bopt -The Bisync mode options. -.It Fa xopt -The X.21 mode options. -.It Fa sopt -The software protocol options. -.El -.Sh FILES -.Bl -tag -width /dev/cxXXXX -compact -.It Pa /dev/cx?? -Asynchronous channels. -.It Pa /dev/cronyx -The special device file for the channel options management. -.El -.Pp -The sources for the driver reside in: -.Pp -.Bl -tag -width /dev/cxXXXX -compact -.It Pa /sys/i386/isa/cronyx.c -.It Pa /sys/i386/isa/cx.c -.It Pa /sys/i386/isa/if_cx.c -.It Pa /sys/i386/isa/cronyx.h -.It Pa /sys/i386/isa/cxreg.h -.It Pa /sys/net/if_spppsubr.c -.It Pa /sys/net/if_sppp.h -.El -.Sh SEE ALSO -.Xr cxconfig 8 , -.Xr ifconfig 8 +.Nm +driver for previous versions of +.Fx +is available from +.Pa http://www.cronyx.ru/ . ==== //depot/projects/ia64/sys/alpha/conf/GENERIC.hints#4 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.6 2002/11/14 14:59:27 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.7 2003/12/05 00:57:11 des Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" hint.fdc.0.drq="2" hint.fd.0.at="fdc0" hint.fd.0.drive="0" +hint.fd.0.flags="4" hint.ata.0.at="isa" hint.ata.0.port="0x1F0" hint.ata.0.irq="14" ==== //depot/projects/ia64/sys/dev/ata/atapi-cam.c#21 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.28 2003/11/11 14:55:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.29 2003/12/05 01:02:46 scottl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -409,7 +409,7 @@ request_flags |= ATA_R_WRITE|ATA_R_DMA; break; case CAM_DIR_NONE: - request_flags |= ATA_R_CONTROL; + /* No flags need to be set */ break; default: ata_prtdev(dev, "unknown IO operation\n"); ==== //depot/projects/ia64/sys/dev/sound/pcm/channel.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312062247.hB6Mln9u072522>