Date: Sat, 21 Aug 2004 01:31:33 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 60172 for review Message-ID: <200408210131.i7L1VXbN048422@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=60172 Change 60172 by peter@peter_daintree on 2004/08/21 01:30:40 IFC @60171 Affected files ... .. //depot/projects/hammer/UPDATING#48 integrate .. //depot/projects/hammer/etc/rc.d/jail#9 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#27 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#17 integrate .. //depot/projects/hammer/lib/Makefile#39 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/hammer/lib/libthr/arch/amd64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libthr/arch/amd64/amd64/_setcurthread.c#1 branch .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#19 integrate .. //depot/projects/hammer/release/Makefile#53 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#12 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#54 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/setup.c#11 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#17 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#22 integrate .. //depot/projects/hammer/share/man/man4/aha.4#8 integrate .. //depot/projects/hammer/share/man/man4/hfa.4#2 integrate .. //depot/projects/hammer/share/man/man4/ipfirewall.4#4 integrate .. //depot/projects/hammer/share/man/man4/ixgb.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/snc.4#2 integrate .. //depot/projects/hammer/share/man/man4/ncr.4#3 integrate .. //depot/projects/hammer/share/man/man4/rc.4#3 integrate .. //depot/projects/hammer/share/man/man4/sk.4#5 integrate .. //depot/projects/hammer/share/man/man4/sym.4#5 integrate .. //depot/projects/hammer/share/man/man4/umct.4#5 integrate .. //depot/projects/hammer/share/man/man4/umodem.4#3 integrate .. //depot/projects/hammer/share/man/man4/uscanner.4#11 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#23 integrate .. //depot/projects/hammer/share/man/man9/MUTEX_PROFILING.9#3 integrate .. //depot/projects/hammer/share/man/man9/sleepqueue.9#5 integrate .. //depot/projects/hammer/sys/Makefile#8 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#11 integrate .. //depot/projects/hammer/sys/conf/NOTES#59 integrate .. //depot/projects/hammer/sys/conf/options#52 integrate .. //depot/projects/hammer/sys/conf/options.i386#28 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#14 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#15 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#24 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#12 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/fdc/fdcreg.h#2 delete .. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#45 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_state.c#3 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#20 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#50 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_module.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#61 integrate .. //depot/projects/hammer/sys/kern/subr_disk.c#11 integrate .. //depot/projects/hammer/sys/kern/subr_rman.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#50 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket.h#6 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_message.h#9 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#37 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#37 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#27 integrate .. //depot/projects/hammer/sys/pci/agp_amd64.c#2 integrate .. //depot/projects/hammer/sys/pci/agp_sis.c#12 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#14 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#29 integrate .. //depot/projects/hammer/sys/pci/if_skreg.h#7 integrate .. //depot/projects/hammer/sys/sys/bio.h#13 integrate .. //depot/projects/hammer/sys/sys/fdcio.h#2 integrate .. //depot/projects/hammer/sys/sys/proc.h#60 integrate .. //depot/projects/hammer/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/hammer/sys/ufs/ffs/fs.h#8 integrate .. //depot/projects/hammer/tools/tools/README#8 integrate .. //depot/projects/hammer/tools/tools/raidtest/Makefile#1 branch .. //depot/projects/hammer/tools/tools/raidtest/README#1 branch .. //depot/projects/hammer/tools/tools/raidtest/raidtest.c#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/etc/Makefile#7 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/default.rc#3 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_4.rc#5 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_5.rc#5 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/update_releng_4.rc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/etc/update_releng_5.rc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#11 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#22 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#17 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#23 integrate .. //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.c#4 integrate .. //depot/projects/hammer/usr.sbin/fdformat/fdformat.c#3 integrate .. //depot/projects/hammer/usr.sbin/fdread/fdutil.c#5 integrate Differences ... ==== //depot/projects/hammer/UPDATING#48 (text+ko) ==== @@ -21,6 +21,21 @@ developers choose to disable these features on build machines to maximize performance. +20040819: + Netgraph changed its message format slightly to align the data + portion well on 64 bit machines. + Netgraph using utilities (e.g. ngctl, nghook, ppp, mpd, + pppoed, bluetooth, ATM) should be recompiled when a new kernel + is installed. + +20040817: + IPFW has been converted to use PFIL_HOOKS. This change is + transparent to userland and preserves the ipfw ABI. The ipfw + core packet inspection and filtering functions have not been + changed, only how ipfw is invoked is different. Note that + "option PFIL_HOOKS" is required to use IPFIREWALL compiled + into the kernel or as KLD. + 20040814: The RANDOM_IP_ID option has been replaced by the sysctl net.inet.ip.random_id. If you had RANDOM_IP_ID in your kernel then @@ -1773,4 +1788,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.342 2004/08/14 16:16:01 dwmalone Exp $ +$FreeBSD: src/UPDATING,v 1.345 2004/08/20 01:24:23 julian Exp $ ==== //depot/projects/hammer/etc/rc.d/jail#9 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.15 2004/08/16 16:37:06 nectar Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.16 2004/08/19 08:55:24 des Exp $ # # PROVIDE: jail @@ -94,17 +94,17 @@ jail_umount_fs() { if checkyesno jail_fdescfs; then - if [ -d ${jail_fdescdir} ] ; then + if [ -d "${jail_fdescdir}" ] ; then umount -f ${jail_fdescdir} >/dev/null 2>&1 fi fi if checkyesno jail_devfs; then - if [ -d ${jail_devdir} ] ; then + if [ -d "${jail_devdir}" ] ; then umount -f ${jail_devdir} >/dev/null 2>&1 fi fi if checkyesno jail_procfs; then - if [ -d ${jail_procdir} ] ; then + if [ -d "${jail_procdir}" ] ; then umount -f ${jail_procdir} >/dev/null 2>&1 fi fi @@ -132,7 +132,7 @@ devfs_mount_jail "${jail_devdir}" ${jail_ruleset} # Transitional symlink for old binaries - if [ ! -L ${jail_devdir}/log ]; then + if [ ! -L "${jail_devdir}/log" ]; then __pwd="`pwd`" cd "${jail_devdir}" ln -sf ../var/run/log log @@ -153,7 +153,7 @@ fi if checkyesno jail_procfs; then info "Mounting procfs onto ${jail_procdir}" - if [ -d ${jail_procdir} ] ; then + if [ -d "${jail_procdir}" ] ; then mount -t procfs proc "${jail_procdir}" fi fi @@ -175,9 +175,9 @@ echo -n 'Stopping jails:' for _jail in ${jail_list} do - if [ -f /var/run/jail_${_jail}.id ]; then + if [ -f "/var/run/jail_${_jail}.id" ]; then _jail_id=$(cat /var/run/jail_${_jail}.id) - if [ ! -z ${_jail_id} ]; then + if [ ! -z "${_jail_id}" ]; then init_variables $_jail killall -j ${_jail_id} -TERM > /dev/null 2>&1 jail_umount_fs ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#27 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.141 2004/08/15 19:24:17 rwatson Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.142 2004/08/20 13:39:28 des Exp $ % -- Gifts for Children -- @@ -15991,6 +15991,9 @@ (5) Any computer with a mouse is worthless. -- Rich Kulawiec % +Women come and go, but BSD is forever. + -- Derek Young +% Wood is highly ecological, since trees are a renewable resource. If you cut down a tree, another will grow in its place. And if you cut down the new tree, still another will grow. And if you cut down that ==== //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#17 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.41 2004/04/16 07:19:13 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.42 2004/08/19 10:41:54 ru Exp $ .\" .\" %beginstrip% . @@ -57,10 +57,12 @@ .ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl) . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~5.2 +.ds doc-default-operating-system FreeBSD\~6.0 . .\" FreeBSD releases not found in doc-common +.\" .ds doc-operating-system-FreeBSD-4.11 4.11 .\" .ds doc-operating-system-FreeBSD-5.4 5.4 +.\" .ds doc-operating-system-FreeBSD-6.0 6.0 . .ec . ==== //depot/projects/hammer/lib/Makefile#39 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.189 2004/08/09 11:30:36 obrien Exp $ +# $FreeBSD: src/lib/Makefile,v 1.190 2004/08/19 23:51:42 davidxu Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -97,8 +97,7 @@ _libpthread= libpthread .endif -.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm" && \ - !defined(NOLIBTHR) +.if ${MACHINE_ARCH} != "arm" && !defined(NOLIBTHR) _libthr= libthr .endif ==== //depot/projects/hammer/lib/libc/stdlib/malloc.3#4 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)malloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.61 2004/08/18 21:13:15 alfred Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.62 2004/08/19 16:34:31 alfred Exp $ .\" -.Dd August 27, 1996 +.Dd August 19, 2004 .Dt MALLOC 3 .Os .Sh NAME @@ -120,13 +120,12 @@ If memory can be allocated, the memory referenced by .Fa ptr is freed and a pointer to the newly allocated memory is returned. -Note that the return value may differ from the -.Fa ptr -argument, that is +Note that .Fn realloc and .Fn reallocf -may move the memory. +may move the memory allocation resulting in a different return value than +.Fa ptr . If .Fa ptr is ==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#13 (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/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.14 2004/08/15 16:21:30 dfr Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.15 2004/08/19 23:49:04 davidxu Exp $ */ #include <sys/types.h> @@ -47,13 +47,16 @@ struct tcb *tcb_self; /* required by rtld */ void *tcb_dtv; /* required by rtld */ struct pthread *tcb_thread; + int tcb_ldt; }; void _retire_thread(void *entry) { - _rtld_free_tls(entry, sizeof(struct tcb), 16); - /* XXX free ldt descriptor here */ + struct tcb *tcb = (struct tcb *)entry; + + i386_set_ldt(tcb->tcb_ldt, NULL, 1); + _rtld_free_tls(tcb, sizeof(struct tcb), 16); } void * @@ -66,6 +69,10 @@ *err = 0; + if (uc == NULL && thr->arch_id != NULL) { + return (thr->arch_id); + } + if (uc == NULL) { __asm __volatile("movl %%gs:0, %0" : "=r" (oldtls)); } else { @@ -104,7 +111,7 @@ ldt_index = i386_set_ldt(LDT_AUTO_ALLOC, &desc, 1); if (ldt_index == -1) abort(); - + tcb->tcb_ldt = ldt_index; /* * Set up our gs with the index into the ldt for this entry. */ ==== //depot/projects/hammer/lib/libthr/thread/thr_create.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.18 2004/07/04 19:07:07 marcel Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.19 2004/08/19 23:49:04 davidxu Exp $ */ #include <errno.h> #include <stdlib.h> @@ -99,9 +99,10 @@ /* Initialise the machine context: */ getcontext(&new_thread->ctx); + new_thread->savedsig = new_thread->ctx.uc_sigmask; new_thread->ctx.uc_stack.ss_sp = new_thread->stack; new_thread->ctx.uc_stack.ss_size = pattr->stacksize_attr; - makecontext(&new_thread->ctx, _thread_start, 0); + makecontext(&new_thread->ctx, (void (*)(void))_thread_start, 1, new_thread); new_thread->arch_id = _set_curthread(&new_thread->ctx, new_thread, &ret); if (ret != 0) { if (pattr->stackaddr_attr == NULL) { @@ -145,7 +146,11 @@ */ if (pattr->suspend == PTHREAD_CREATE_SUSPENDED) new_thread->flags |= PTHREAD_FLAGS_SUSPENDED; + /* new thread inherits signal mask in kernel */ + _thread_sigblock(); ret = thr_create(&new_thread->ctx, &new_thread->thr_id, flags); + /* restore my signal mask */ + _thread_sigunblock(); if (ret != 0) { _thread_printf(STDERR_FILENO, "thr_create() == %d\n", ret); PANIC("thr_create"); @@ -160,12 +165,24 @@ } void -_thread_start(void) +_thread_start(pthread_t td) { + int ret; + + /* + * for AMD64, we need to set fsbase by thread itself, before + * fsbase is set, we can not run any other code, for example + * signal code. + */ + _set_curthread(NULL, td, &ret); + + /* restore signal mask inherited before */ + __sys_sigprocmask(SIG_SETMASK, &td->savedsig, NULL); + if ((curthread->flags & PTHREAD_FLAGS_SUSPENDED) != 0) _thread_suspend(curthread, NULL); + pthread_exit(curthread->start_routine(curthread->arg)); - /* This point should never be reached. */ PANIC("Thread has resumed after exit"); } ==== //depot/projects/hammer/lib/libthr/thread/thr_private.h#19 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.39 2004/07/18 04:23:30 marcel Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.40 2004/08/19 23:49:04 davidxu Exp $ */ #ifndef _THR_PRIVATE_H @@ -797,7 +797,7 @@ void _thread_dump_info(void); void _thread_init(void); void _thread_printf(int fd, const char *, ...); -void _thread_start(void); +void _thread_start(pthread_t td); void _thread_seterrno(pthread_t, int); void _thread_enter_cancellation_point(void); void _thread_leave_cancellation_point(void); ==== //depot/projects/hammer/release/Makefile#53 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.854 2004/08/18 11:11:46 grehan Exp $ +# $FreeBSD: src/release/Makefile,v 1.855 2004/08/19 10:34:59 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -18,11 +18,11 @@ # Set these, release builder! # # Fixed version: -#BUILDNAME=5.2-RELEASE +#BUILDNAME=6.0-CURRENT # # Automatic SNAP versioning: DATE != date +%Y%m%d -BASE = 5.2 +BASE = 6.0 BUILDNAME?=${BASE}-${DATE}-SNAP # #CHROOTDIR=/junk/release ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#12 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.69 2004/08/12 12:42:03 wilko Exp $ --> +<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.70 2004/08/19 19:23:39 wilko Exp $ --> <sect1 id="support-proc"> <sect1info> @@ -1074,7 +1074,8 @@ SRM V5.7-1). Adaptec 2930U2 and 2940U2[W] do not work.</para> <para>164LX and 164SX with SRM firmware version 5.8 or later can boot - from Adaptec 2940-series adapters.</para> + from Adaptec 2940-series adapters. A test with an Adaptec 3940UW + showed that that one is not supported however.</para> <para>In summary: this family of machines is <quote>blessed</quote> with a challenging compatibility as far as SCSI adapters go.</para> @@ -1083,6 +1084,8 @@ (PC100 or PC133) 256MB DIMMs are reported to work just fine. Whether 512MB DIMMs will also work is currently unknown. You can use ECC or non-ECC DIMMs. The non-ECC ones are the same as commonly found in PCs. + Unfortunately the 164SX is quite picky on which DIMMs it likes, + so be prepared to test and experiment. </para> <para>PCI bridge chips are sometimes not appreciated by the 164SX, ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#54 (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.227 2004/08/15 22:14:29 simon Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.229 2004/08/19 22:03:20 simon Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -46,12 +46,10 @@ etc. can be found in the manual pages.</para> <note> - <para>Lists of specific, supported devices are gradually being - removed from this document in order to reduce the amount of - duplicated (and potentially out-of-date) information contained - within. When this process is complete, the manual page for each - driver should be consulted for the authoritative list of devices - supported that particular driver.</para> + <para>The device lists in this document are being generated + automatically from &os; manual pages. This means that some + devices, which are supported by multiple drivers, may appear + multiple times.</para> </note> <sect2 id="disk"> @@ -220,12 +218,9 @@ &hwlist.twa; - <para arch="i386,pc98,alpha,sparc64,amd64">LSI/Symbios (formerly NCR) - 53C8<replaceable>XX</replaceable> and 53C10<replaceable>XX</replaceable> PCI - SCSI controllers, either embedded on motherboard or on add-on - boards (&man.ncr.4; and &man.sym.4; drivers) - </para> - + &hwlist.ncr; + + &hwlist.sym; &hwlist.ncv; @@ -233,8 +228,6 @@ &hwlist.isp; - <para arch="i386,amd64">DTC 3290 EISA SCSI controller in 1542 emulation mode.</para> - &hwlist.amd; &hwlist.nsp; @@ -1343,19 +1336,9 @@ </listitem> </itemizedlist> </para> - <para arch="i386,pc98,amd64">Modems (&man.umodem.4; driver) - <itemizedlist> - <listitem> - <para>3Com 5605</para> - </listitem> - <listitem> - <para>Metricom Ricochet GS USB wireless modem</para> - </listitem> - <listitem> - <para>Yamaha Broadband Wireless Router RTW65b</para> - </listitem> - </itemizedlist> - </para> + + &hwlist.umodem; + <para arch="i386,pc98,alpha,amd64">Mice (&man.ums.4; driver) </para> <para arch="i386,pc98,alpha,amd64">Printers and parallel printer conversion cables (&man.ulpt.4; driver) @@ -1390,8 +1373,9 @@ &man.ubser.4;, &man.uftdi.4;, and &man.uplcom.4; drivers) </para> - <para arch="i386,pc98,amd64">Scanners (through <application>SANE</application>) (&man.uscanner.4; driver) - </para> + + &hwlist.uscanner; + <para arch="i386,pc98,alpha,amd64">Storage (&man.umass.4; driver) <itemizedlist> <listitem> ==== //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#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/release/doc/share/misc/dev.archlist.txt,v 1.5 2004/08/15 22:14:29 simon Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.6 2004/08/19 22:03:20 simon Exp $ # # @@ -66,16 +66,20 @@ mly i386,amd64 mpt i386,alpha,pc98,sparc64,ia64,amd64 my i386,pc98 +ncr i386,pc98,alpha,sparc64,amd64 ncv i386,pc98 nsp i386,pc98 ohci i386,pc98,alpha,ia64,amd64 rl i386,pc98,alpha,sparc64,amd64 stg i386,pc98 +sym i386,pc98,alpha,sparc64,amd64 trm i386,amd64 twa i386 twe i386 txp i386,pc98,alpha,amd64 udav i386,pc98,amd64 +umodem i386,pc98,amd64 +uscanner i386,pc98,amd64 vr i386,pc98,alpha,amd64 xe i386,amd64 xl i386,pc98,alpha,sparc64,amd64 ==== //depot/projects/hammer/sbin/fsck_ffs/setup.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.47 2004/04/09 19:58:28 markm Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.48 2004/08/19 11:09:12 jhb Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -306,7 +306,7 @@ super = bflag; if ((bread(fsreadfd, (char *)&sblock, super, (long)SBLOCKSIZE))) return (0); - if (sblock.fs_magic == FS_BAD2_MAGIC) { + if (sblock.fs_magic == FS_BAD_MAGIC) { fprintf(stderr, BAD_MAGIC_MSG); exit(11); } @@ -322,7 +322,7 @@ if ((bread(fsreadfd, (char *)&sblock, super, (long)SBLOCKSIZE))) return (0); - if (sblock.fs_magic == FS_BAD2_MAGIC) { + if (sblock.fs_magic == FS_BAD_MAGIC) { fprintf(stderr, BAD_MAGIC_MSG); exit(11); } ==== //depot/projects/hammer/sbin/newfs/mkfs.c#17 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.85 2004/04/09 19:58:33 markm Exp $"); +__FBSDID("$FreeBSD: src/sbin/newfs/mkfs.c,v 1.86 2004/08/19 11:09:12 jhb Exp $"); #include <err.h> #include <grp.h> @@ -236,8 +236,14 @@ } sblock.fs_fsbtodb = ilog2(sblock.fs_fsize / sectorsize); sblock.fs_size = fssize = dbtofsb(&sblock, fssize); + + /* + * Before the filesystem is finally initialized, mark it + * as incompletely initialized. + */ + sblock.fs_magic = FS_BAD_MAGIC; + if (Oflag == 1) { - sblock.fs_magic = FS_UFS1_MAGIC; sblock.fs_sblockloc = SBLOCK_UFS1; sblock.fs_nindir = sblock.fs_bsize / sizeof(ufs1_daddr_t); sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs1_dinode); @@ -257,7 +263,6 @@ sblock.fs_old_postblformat = 1; sblock.fs_old_nrpos = 1; } else { - sblock.fs_magic = FS_BAD2_MAGIC; sblock.fs_sblockloc = SBLOCK_UFS2; sblock.fs_nindir = sblock.fs_bsize / sizeof(ufs2_daddr_t); sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs2_dinode); @@ -455,8 +460,8 @@ } if (Eflag == 2) printf("** Leaving BAD MAGIC on Eflag 2\n"); - else if (Oflag != 1) - sblock.fs_magic = FS_UFS2_MAGIC; + else + sblock.fs_magic = (Oflag != 1) ? FS_UFS2_MAGIC : FS_UFS1_MAGIC; /* * Now build the cylinders group blocks and ==== //depot/projects/hammer/share/examples/etc/make.conf#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.229 2004/08/15 20:32:06 marius Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.230 2004/08/19 09:54:28 des Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -106,6 +106,7 @@ #ENABLE_SUID_NEWGRP= true # # To avoid building various parts of the base system: +#NO_BOOT= true # do not build boot blocks and loader #NO_CVS= true # do not build CVS #NO_CXX= true # do not build C++ and friends #NO_BIND= true # do not build BIND ==== //depot/projects/hammer/share/man/man4/aha.4#8 (text+ko) ==== @@ -24,7 +24,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/man4/aha.4,v 1.24 2004/07/04 14:17:41 simon Exp $ +.\" $FreeBSD: src/share/man/man4/aha.4,v 1.25 2004/08/19 20:49:38 simon Exp $ .\" .Dd July 4, 2004 .Dt AHA 4 @@ -85,6 +85,8 @@ .It Adaptec AHA-174x in 154x emulation mode .It +DTC 3290 SCSI controller in 1542 emulation mode +.It Tekram SCSI controllers in 154x emulation mode .El .Sh BUGS ==== //depot/projects/hammer/share/man/man4/hfa.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/hfa.4,v 1.2 2004/08/06 16:08:43 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/hfa.4,v 1.3 2004/08/20 04:52:00 trhodes Exp $ .\" -.Dd August 06, 2004 +.Dd August 6, 2004 .Dt HFA 4 .Os .Sh NAME @@ -75,15 +75,17 @@ The following sysctls are recognized by the driver and may be used to enable or disable traffic shaping: .Bl -tag -width indent -.It Va hw.atm.hfaN.shape=0 -Disable shaping on card number N. -.It Va hw.atm.hfaN.shape=1 -Set one VCI to be traffic shaped on device N. +.It Va hw.atm.hfa Ns Ar N Ns Va .shape Pq 0 +Disable shaping on card number +.Ar N . +.It Va hw.atm.hfa Ns Ar N Ns Va .shape Pq 1 +Set one VCI to be traffic shaped on device +.Ar N . This will shape the first CBR VCI which is opened. -.It Va hw.atm.hfaN.shape=2 -Attempt to shape all VCIs on device N. +.It Va hw.atm.hfa Ns Ar N Ns Va .shape Pq 2 +Attempt to shape all VCIs on device +.Ar N . .El -.Pp The firmware should be loaded before using this driver, this can be an easy task if the .Xr fore_dnld 8 @@ -123,9 +125,10 @@ .Sh HISTORY The .Nm -driver -first appeared in -.Fx 3.0 . +driver was written by Network Computing Serices, Inc. +and added to +.Fx 3.0 by +.An Poul-Henning Kamp Aq phk@FreeBSD.org . This manual page first appeared in .Fx 5.3 . .Sh AUTHORS ==== //depot/projects/hammer/share/man/man4/ipfirewall.4#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/ipfirewall.4,v 1.29 2002/11/29 11:39:19 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ipfirewall.4,v 1.30 2004/08/19 18:04:10 andre Exp $ .\" .Dd October 28, 2002 .Dt IPFW 4 @@ -46,6 +46,8 @@ enable .Xr divert 4 sockets +.It Dv PFIL_HOOKS +add packet filter hooks .El .Sh SEE ALSO .Xr setsockopt 2 , @@ -53,4 +55,5 @@ .Xr ip 4 , .Xr ipfw 8 , .Xr sysctl 8 , -.Xr syslogd 8 +.Xr syslogd 8 , +.Xr pfil 9 ==== //depot/projects/hammer/share/man/man4/ixgb.4#3 (text+ko) ==== @@ -29,9 +29,9 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.\" $FreeBSD: src/share/man/man4/ixgb.4,v 1.2 2004/07/08 07:27:26 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ixgb.4,v 1.3 2004/08/19 14:33:53 brueffer Exp $ .\" -.Dd March 1, 2004 +.Dd August 19, 2004 .Dt IXGB 4 .Os .Sh NAME @@ -64,6 +64,17 @@ This driver version supports VLANs. For information on enabling VLANs, see the .Pa README . +.Sh HARDWARE +Adapters supported by the +.Nm +driver include: +.Pp +.Bl -bullet -compact +.It +Intel PRO/10GbE LR Server Adapter +.It +Intel PRO/10GbE SR Server Adapter +.El .Sh DIAGNOSTICS .Bl -diag .It "ixgb%d: Unable to allocate bus resource: memory" ==== //depot/projects/hammer/share/man/man4/man4.i386/snc.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/snc.4,v 1.1 2004/07/24 20:41:45 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/snc.4,v 1.2 2004/08/20 05:07:02 trhodes Exp $ .\" -.Dd July 24, 2004 +.Dd August 20, 2004 .Dt SNC 4 i386 .Os .Sh NAME @@ -95,23 +95,17 @@ .Tn PnP buses. Support is also provided for legacy C-Bus. -.Sh ERRORS +.Sh DIAGNOSTICS The following driver specific error messages may be reported: -.Bl -tag -width Er -.It Bq Er EIO -May be returned if the device cannot allocate a port, -memory resource, or +.Bl -diag +.It "snc%d: snc_nec16_register_irq: unsupported irq (%d)" +The card returned an .Tn IRQ -with the given resource ID. -.It Bq Er ENOENT -May be returned if the driver cannot assign memory, a port or an -.Tn IRQ -to the board. -.It Bq Er ENXIO -May be returned if the card supplied a -.Tn PnP -ID which did not match any of the known IDs. +which is not supported by the driver. +.It "snc%d: invalid packet length %d bytes" +An attempt to transfer a data packet failed due to an +invalid packet length. .El .Sh SEE ALSO .Xr card 4 , ==== //depot/projects/hammer/share/man/man4/ncr.4#3 (text+ko) ==== @@ -21,9 +21,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ncr.4,v 1.14 2003/11/09 22:21:21 simon Exp $ +.\" $FreeBSD: src/share/man/man4/ncr.4,v 1.15 2004/08/19 21:24:45 simon Exp $ .\" -.Dd November 9, 2003 +.Dd August 19, 2004 .Dt NCR 4 .Os .Sh NAME @@ -31,7 +31,7 @@ .Nd NCR 53C8xx SCSI driver .Sh SYNOPSIS .Cd "device ncr" -.Sh DESCRIPTION +.Sh HARDWARE The .Nm driver provides support for the following NCR/Symbios SCSI controller ==== //depot/projects/hammer/share/man/man4/rc.4#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/rc.4,v 1.2 2004/07/08 06:38:59 ru Exp $ +.\" $FreeBSD: src/share/man/man4/rc.4,v 1.3 2004/08/20 05:25:11 trhodes Exp $ .\" -.Dd June 21, 2004 +.Dd August 20, 2004 .Dt RC 4 .Os .Sh NAME @@ -62,30 +62,30 @@ file. .Pp This driver is mostly based on Cirrus Logic CL-CD180 driver. -.Sh ERRORS +.Sh DIAGNOSTICS The following driver specific error messages may be reported: -.Bl -tag -width Er -.It Bq Er EBUSY -May be returned if the device was busy when a -request to access its resources was made by +.Bl -diag +.It "rc%d channel%d: interrupt-level buffer overflow" +An internal buffer overflow error has occurred on +the listed channel. +The .Nm -and was denied. -.It Bq Er ENOMEM -May be returned if the +driver will need reloaded to correct this. +.It "rc%d: Bad char chan %d" +The channel has obtained a bad set of characters. +.It "rc%d: Got extra chars chan %d" +The .Nm -driver was unable to obtain the -.Tn IOBASE -addresses. -.It Bq Er ENXIO -May be returned if the device cannot obtain a valid -.Tn I/O -port through -.Fn isa_get_port . -This error may also be returned if the -.Fn isa_get_irq -function cannot obtain a valid -.Tn IRQ . +driver got more characters than expected on the channel shown. +.It "rc%d: data mismatch chan %d ptr %d (%d != %d)" +Data sent from channel +.Ar %d +to the rx buffer was different then expected. +.It "rc%d: channel %d command timeout, rc.c line: %d" +A command timeout has occurred on the channel, the +.Pa src/sys/dev/rc.c +file can be consulted for more information. .El .Sh SEE ALSO .Xr tty 1 , ==== //depot/projects/hammer/share/man/man4/sk.4#5 (text+ko) ==== @@ -28,9 +28,9 @@ .\" 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/sk.4,v 1.21 2004/01/09 17:43:37 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/sk.4,v 1.22 2004/08/20 06:27:58 jmg Exp $ .\" -.Dd July 3, 1999 +.Dd August 19, 2004 .Dt SK 4 .Os .Sh NAME @@ -49,6 +49,8 @@ .It 3COM 3C940 single port, 1000baseT adapter .It +Belkin F5D5005 single port, 10000baseT adapter +.It Linksys EG1032 single port, 1000baseT adapter .It SK-9521 SK-NET GE-T single port, 1000baseT adapter ==== //depot/projects/hammer/share/man/man4/sym.4#5 (text+ko) ==== @@ -54,9 +54,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408210131.i7L1VXbN048422>