Date: Wed, 13 Oct 2004 22:15:07 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 63177 for review Message-ID: <200410132215.i9DMF7Do044479@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=63177 Change 63177 by peter@peter_daintree on 2004/10/13 22:14:49 IFC @63176 Affected files ... .. //depot/projects/hammer/Makefile.inc1#64 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#37 integrate .. //depot/projects/hammer/etc/remote#6 integrate .. //depot/projects/hammer/lib/libc/string/strerror.3#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_join.c#9 integrate .. //depot/projects/hammer/sbin/dmesg/dmesg.c#9 integrate .. //depot/projects/hammer/share/man/man4/Makefile#52 integrate .. //depot/projects/hammer/share/man/man4/de.4#6 integrate .. //depot/projects/hammer/share/man/man4/man4.sparc64/auxio.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_ubt.4#10 integrate .. //depot/projects/hammer/share/man/man4/re.4#10 integrate .. //depot/projects/hammer/share/man/man4/tcp.4#12 integrate .. //depot/projects/hammer/share/man/man9/Makefile#42 integrate .. //depot/projects/hammer/share/man/man9/contigmalloc.9#3 integrate .. //depot/projects/hammer/share/man/man9/hashinit.9#1 branch .. //depot/projects/hammer/share/misc/scsi_modes#2 integrate .. //depot/projects/hammer/share/monetdef/Makefile#15 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.h#2 integrate .. //depot/projects/hammer/sys/conf/files#87 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#36 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#48 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#40 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#19 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#19 integrate .. //depot/projects/hammer/sys/dev/cx/machdep.h#3 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.c#10 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.h#3 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_crom.c#5 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#1 branch .. //depot/projects/hammer/sys/dev/dcons/dcons_os.h#1 branch .. //depot/projects/hammer/sys/dev/md/md.c#41 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#16 integrate .. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#21 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#43 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/isa/es1888.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ess.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb8.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/aureal.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#14 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/solo.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#11 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus.h#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#26 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#30 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#19 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#10 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_socksys.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysi86.c#4 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ipr.c#12 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_isppp.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#69 integrate .. //depot/projects/hammer/sys/kern/kern_xxx.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#27 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#14 integrate .. //depot/projects/hammer/sys/kern/tty.c#29 integrate .. //depot/projects/hammer/sys/modules/dcons/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/dcons_crom/Makefile#2 integrate .. //depot/projects/hammer/sys/net/bridge.c#19 integrate .. //depot/projects/hammer/sys/net/bridge.h#3 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#34 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#14 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#15 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#15 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#29 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#25 integrate .. //depot/projects/hammer/sys/netncp/ncp_ncp.c#9 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#32 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#34 integrate .. //depot/projects/hammer/sys/sys/random.h#3 integrate .. //depot/projects/hammer/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/hammer/sys/sys/ttydefaults.h#5 integrate .. //depot/projects/hammer/sys/sys/turnstile.h#4 integrate .. //depot/projects/hammer/usr.sbin/config/lang.l#7 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#64 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.448 2004/09/27 08:23:42 dougb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.449 2004/10/11 23:51:13 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -265,7 +265,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/c++/3.3 usr/include/sys usr/lib \ + usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ ==== //depot/projects/hammer/etc/defaults/rc.conf#37 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.220 2004/09/29 07:07:43 trhodes Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.225 2004/10/13 07:12:14 ru Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -152,7 +152,6 @@ syslogd_enable="YES" # Run syslog daemon (or NO). syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one. syslogd_flags="-s" # Flags to syslogd (if enabled). -#syslogd_flags="-ss" # Syslogd flags to not bind an inet socket inetd_enable="NO" # Run the network daemon dispatcher (YES/NO). inetd_program="/usr/sbin/inetd" # path to inetd, if you want a different one. inetd_flags="-wW -C 60" # Optional flags to inetd @@ -438,7 +437,7 @@ osf1_enable="NO" # Alpha OSF/1 emulation loaded at startup (or NO). clear_tmp_enable="NO" # Clear /tmp at startup. ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks -ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib" +ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib /usr/local/lib/compat/pkg" # shared library search paths ldconfig_paths_aout="/usr/lib/compat/aout /usr/X11R6/lib/aout /usr/local/lib/aout" # a.out shared library search paths ==== //depot/projects/hammer/etc/remote#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.15 2004/06/06 11:46:27 schweikh Exp $ +# $FreeBSD: src/etc/remote,v 1.16 2004/10/13 08:32:34 phk Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -52,17 +52,17 @@ dial14400|14400 Baud Hayes attributes:\ br#57600:tc=dial: dial|Generic dialing parameters:\ - :dv=/dev/cuaa0:cu=/dev/cuaa0:at=hayes:du:pa=none: + :dv=/dev/cuad0:cu=/dev/cuad0:at=hayes:du:pa=none: # Hardwired line -cuaa0c|cua0c:dv=/dev/cuaa0:br#9600:pa=none: +cuad0c|cua0c:dv=/dev/cuad0:br#9600:pa=none: # Finger friendly shortcuts -sio0|com1:dv=/dev/cuaa0:br#9600:pa=none: -sio1|com2:dv=/dev/cuaa1:br#9600:pa=none: -sio2|com3:dv=/dev/cuaa2:br#9600:pa=none: -sio3|com4:dv=/dev/cuaa3:br#9600:pa=none: -sio4|com5:dv=/dev/cuaa4:br#9600:pa=none: -sio5|com6:dv=/dev/cuaa5:br#9600:pa=none: -sio6|com7:dv=/dev/cuaa6:br#9600:pa=none: -sio7|com8:dv=/dev/cuaa7:br#9600:pa=none: +sio0|com1:dv=/dev/cuad0:br#9600:pa=none: +sio1|com2:dv=/dev/cuad1:br#9600:pa=none: +sio2|com3:dv=/dev/cuad2:br#9600:pa=none: +sio3|com4:dv=/dev/cuad3:br#9600:pa=none: +sio4|com5:dv=/dev/cuad4:br#9600:pa=none: +sio5|com6:dv=/dev/cuad5:br#9600:pa=none: +sio6|com7:dv=/dev/cuad6:br#9600:pa=none: +sio7|com8:dv=/dev/cuad7:br#9600:pa=none: ==== //depot/projects/hammer/lib/libc/string/strerror.3#4 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)strerror.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.22 2002/12/19 10:24:52 tjr Exp $ +.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.23 2004/10/12 14:52:52 keramida Exp $ .\" -.Dd December 19, 2002 +.Dd October 12, 2004 .Dt STRERROR 3 .Os .Sh NAME @@ -102,18 +102,17 @@ .Pq Dq Li ":\ " ; otherwise, only the error message string is printed. .Pp -If -.Fa errnum -is not a recognized error number, +If the error number is not recognized, these functions return an error message +string containing +.Dq Li "Unknown error:\ " +followed by the error number in decimal. +The .Fn strerror -returns an error message string containing -.Dq Li "Unknown error:\ " -followed by the error number in decimal, while +and .Fn strerror_r -leaves -.Fa strerrbuf -unchanged and returns -.Er EINVAL . +functions return +.Er EINVAL +as a warning. Error numbers recognized by this implementation fall in the range 0 < .Fa errnum ==== //depot/projects/hammer/lib/libthr/thread/thr_exit.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_exit.c,v 1.15 2004/10/08 14:48:02 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.16 2004/10/13 11:42:20 mtm Exp $ */ #include <errno.h> #include <unistd.h> @@ -195,7 +195,8 @@ TAILQ_FOREACH_SAFE(ptd, &_dead_list, dle, ptdTemp) { /* Don't destroy the initial thread or non-detached threads. */ if (ptd == _thread_initial || - (ptd->attr.flags & PTHREAD_DETACHED) == 0) + (ptd->attr.flags & PTHREAD_DETACHED) == 0 || + !ptd->isdead) continue; TAILQ_REMOVE(&_dead_list, ptd, dle); deadlist_free_onethread(ptd); ==== //depot/projects/hammer/lib/libthr/thread/thr_join.c#9 (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_join.c,v 1.14 2004/05/20 12:06:16 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_join.c,v 1.15 2004/10/13 11:42:20 mtm Exp $ */ #include <errno.h> #include <pthread.h> @@ -41,7 +41,7 @@ int _pthread_join(pthread_t pthread, void **thread_return) { - int ret = 0; + int ret, dead; pthread_t thread; /* Check if the caller has specified an invalid thread: */ @@ -60,6 +60,9 @@ * the searches in _thread_list and _dead_list (as well as setting up * join/detach state) have to be done atomically. */ + ret = 0; + dead = 0; + thread = NULL; _thread_sigblock(); DEAD_LIST_LOCK; THREAD_LIST_LOCK; @@ -70,10 +73,12 @@ break; } } - } else { + } + if (thread == NULL) { TAILQ_FOREACH(thread, &_dead_list, dle) { if (thread == pthread) { PTHREAD_LOCK(pthread); + dead = 1; break; } } @@ -109,7 +114,7 @@ } /* Check if the thread is not dead: */ - if (!pthread->isdead) { + if (!dead) { /* Set the running thread to be the joiner: */ pthread->joiner = curthread; PTHREAD_UNLOCK(pthread); ==== //depot/projects/hammer/sbin/dmesg/dmesg.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/dmesg/dmesg.c,v 1.25 2004/10/03 15:48:32 stefanf Exp $"); +__FBSDID("$FreeBSD: src/sbin/dmesg/dmesg.c,v 1.26 2004/10/13 20:33:18 schweikh Exp $"); #include <sys/types.h> #include <sys/msgbuf.h> @@ -99,7 +99,8 @@ usage(); } argc -= optind; - argv += optind; + if (argc != 0) + usage(); if (memf == NULL) { /* ==== //depot/projects/hammer/share/man/man4/Makefile#52 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.285 2004/10/07 12:10:24 mlaier Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.287 2004/10/12 23:38:22 emax Exp $ MAN= aac.4 \ acpi.4 \ ==== //depot/projects/hammer/share/man/man4/de.4#6 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/de.4,v 1.17 2004/09/16 20:29:19 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/de.4,v 1.18 2004/10/13 11:03:50 brueffer Exp $ .\" .Dd August 15, 2004 .Dt DE 4 @@ -92,12 +92,12 @@ .It Adaptec ANA-6944/TX .It -Asante -.It Cogent EM100FX and EM440TX .It Corega FastEther PCI-TX .It +D-Link DFE-500TX +.It DEC DE435, DE425, DEC DE450, and DEC DE500 .It ELECOM LD-PCI2T, LD-PCITS ==== //depot/projects/hammer/share/man/man4/man4.sparc64/auxio.4#2 (text+ko) ==== @@ -23,10 +23,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.sparc64/auxio.4,v 1.1 2004/10/09 07:31:02 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/man4.sparc64/auxio.4,v 1.2 2004/10/13 05:15:41 yongari Exp $ .\" .Dd October 8, 2004 -.Dt AUXIO 4 +.Dt AUXIO 4 sparc64 .Os .Sh NAME .Nm auxio @@ -40,16 +40,16 @@ .Nm device provides auxiliary I/O functions required by Sun .Tn UltraSPARC -workstation and server models. The front panel LED is also -controlled by the deivce. +workstation and server models. +The front panel LED is also controlled by the deivce. This LED can be made to blink by writing .Tn ASCII strings to the -.Pa /dev/led/auxio +.Pa /dev/led/auxioled device. .Sh FILES -.Bl -tag -width "/dev/led/auxio" -.It Pa /dev/led/auxio +.Bl -tag -width ".Pa /dev/led/auxioled" +.It Pa /dev/led/auxioled Auxiliary I/O device node .El .Sh SEE ALSO @@ -57,14 +57,16 @@ .Sh HISTORY The .Nm -driver was written for -.Nx -by -.An Matthew R. Green . +driver appeared in +.Fx 5.3 . +.Sh AUTHORS +.An -nosplit The .Nm -driver was then ported to -.Fx 5.3 -by +driver was ported by .An Pyun YongHyeon -.Aq yongari@FreeBSD.org . +.Aq yongari@FreeBSD.org +from the +.Nx +driver written by +.An Matthew R. Green . ==== //depot/projects/hammer/share/man/man4/ng_ubt.4#10 (text+ko) ==== @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: ng_ubt.4,v 1.3 2003/05/21 19:37:35 max Exp $ -.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.9 2004/09/16 18:46:21 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.10 2004/10/12 23:35:34 emax Exp $ .\" .Dd September 13, 2004 .Dt NG_UBT 4 @@ -102,86 +102,6 @@ input (output) errors. .It Dv NGM_UBT_NODE_RESET_STAT Reset all statistic counters to zero. -.It Dv NGM_UBT_NODE_DEV_NODES -This command takes a single integer parameter. -If the parameter's value is not zero, then the driver will create device nodes -for the control, interrupt, bulk-in and bulk-out endpoints. -If the parameter's value is zero, then the driver will destroy the device nodes -for the endpoints. -The device nodes interface is mutually exclusive with the Netgraph interface. -.El -.Sh DEVICE NODES INTERFACE -The -.Nm ubt -driver can create or destroy endpoint device nodes on request. -This feature can be used to implement an external firmware download utility. -.Pp -Control transfers can only happen on the control endpoint which -is always endpoint 0. -Control requests are issued by -.Xr ioctl 2 -calls. -.Pp -Only incoming transfers are supported on an interrupt endpoint. -To perform I/O on an interrupt endpoint, -.Xr read 2 -should be used. -All I/O operations on an interrupt endpoint are unbuffered. -.Pp -The bulk transfers can be in or out depending on the endpoint. -To perform I/O on a bulk endpoint, -.Xr read 2 -and -.Xr write 2 -should be used. -All I/O operations on a bulk endpoint are unbuffered. -.Pp -The control endpoint (endpoint 0) handles the following -.Xr ioctl 2 -calls: -.Bl -tag -width indent -.It Dv USB_GET_DEVICE_DESC Pq Vt usb_device_descriptor_t -Return the device descriptor. -.It Dv USB_GET_STRING_DESC Pq Vt "struct usb_string_desc" -Get a string descriptor for the given language ID and string index. -.Bd -literal -struct usb_string_desc { - int string_index; - int language_id; - usb_string_descriptor_t desc; -}; -.Ed -.It Dv USB_DO_REQUEST Pq Vt "struct usb_ctl_request" -Send a USB request to the device on the control endpoint. -Any data sent to/from the device is located at -.Va data . -The size of the transferred data is determined from the -.Va request . -The -.Va addr -field is ignored in this call. -The -.Va flags -field can be used to flag that the request is allowed to -be shorter than the requested size, and the -.Va actlen -will contain the actual size on completion. -.Bd -literal -struct usb_ctl_request { - int addr; - usb_device_request_t request; - void *data; - int flags; -#define USBD_SHORT_XFER_OK 0x04 /* allow short reads */ - int actlen; /* actual length transferred */ -}; -.Ed -This is a dangerous operation in that it can perform arbitrary operations -on the device. -Some of the most dangerous (e.g., changing the device address) are not allowed. -.It Dv USB_GET_DEVICEINFO Pq Vt "struct usb_device_info" -Get an information summary for the device. -This call will not issue any USB transactions. .El .Sh SHUTDOWN This node shuts down when the corresponding USB device is un-plugged. @@ -189,14 +109,6 @@ Isochronous USB transfers are broken. This means that the USB device will not be able to transfer SCO data (voice). USB interrupt transfers are implemented as bulk-in transfers (not really a bug). -.Sh FILES -.Bl -tag -width ".Pa /dev/ubt Ns Ar N Ns Pa \&. Ns Ar EE" -compact -.It Pa /dev/ubt Ns Ar N Ns Pa \&. Ns Ar EE -Endpoint -.Ar EE -of device -.Ar N . -.El .Sh SEE ALSO .Xr netgraph 4 , .Xr ugen 4 , ==== //depot/projects/hammer/share/man/man4/re.4#10 (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/re.4,v 1.9 2004/09/28 18:24:19 jmg Exp $ +.\" $FreeBSD: src/share/man/man4/re.4,v 1.10 2004/10/12 21:43:03 jmg Exp $ .\" -.Dd September 4, 2004 +.Dd September 28, 2004 .Dt RE 4 .Os .Sh NAME ==== //depot/projects/hammer/share/man/man4/tcp.4#12 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.46 2004/08/03 13:54:11 andre Exp $ +.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.49 2004/10/13 12:05:33 maxim Exp $ .\" -.Dd July 10, 2004 +.Dd October 12, 2004 .Dt TCP 4 .Os .Sh NAME @@ -482,6 +482,9 @@ which allows the receiver to inform the sender about all successfully arrived segments, allowing the sender to retransmit the missing segments only. +.It Va sack.initburst +Control the number of SACK retransmissions done upon initiation of SACK +recovery. .El .Sh ERRORS A socket operation may fail with one of the following errors returned: ==== //depot/projects/hammer/share/man/man9/Makefile#42 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.244 2004/10/08 09:52:56 glebius Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.245 2004/10/12 02:36:24 jkoshy Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -103,6 +103,7 @@ g_provider_by_name.9 \ groupmember.9 \ g_wither_geom.9 \ + hashinit.9 \ hexdump.9 \ ieee80211.9 \ ieee80211_crypto.9 \ @@ -467,6 +468,8 @@ MLINKS+=g_provider.9 g_destroy_provider.9 \ g_provider.9 g_error_provider.9 \ g_provider.9 g_new_providerf.9 +MLINKS+=hashinit.9 hashdestroy.9 \ + hashinit.9 phashinit.9 MLINKS+=ieee80211.9 ieee80211_attach.9 \ ieee80211.9 ieee80211_chan2ieee.9 \ ieee80211.9 ieee80211_chan2mode.9 \ ==== //depot/projects/hammer/share/man/man9/contigmalloc.9#3 (text+ko) ==== @@ -11,10 +11,10 @@ .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" -.\" THIS SOFTWARE IS PROVIDED BY JOSEPH KOSHY AND CONTRIBUTORS ``AS IS'' +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' .\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE .\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/contigmalloc.9,v 1.3 2004/08/10 16:38:19 green Exp $ +.\" $FreeBSD: src/share/man/man9/contigmalloc.9,v 1.4 2004/10/12 02:04:11 jkoshy Exp $ .\" .Dd August 10, 2004 .Dt CONTIGMALLOC 9 ==== //depot/projects/hammer/share/misc/scsi_modes#2 (text+ko) ==== @@ -29,7 +29,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/share/misc/scsi_modes,v 1.11 2002/02/24 13:27:57 joerg Exp $ +# $FreeBSD: src/share/misc/scsi_modes,v 1.12 2004/10/12 08:51:04 bms Exp $ # # The ordering is alphabetical by page name, as it appears in the SCSI spec. @@ -291,6 +291,18 @@ {Reserved} *i4 } +# Removable devices +0x1b "Removable Block Access Capacities Page" { + {System Floppy Type Device} t1 + {Supports Reporting Format Progress} t1 + {Reserved} *t6 + {Non CD Optical Device} t1 + {Single or Multiple LUN Supported} t1 + {Reserved} *t3 + {Total Logical Units Supported} t3 + {Reserved} *i8 +} + # CD-ROM (and CD-R[W]) devices 0x2a "CD capabilities and mechanical status page" { {Reserved} *t4 ==== //depot/projects/hammer/share/monetdef/Makefile#15 (text+ko) ==== @@ -1,9 +1,6 @@ -# $FreeBSD: src/share/monetdef/Makefile,v 1.60 2004/08/28 13:24:24 tjr Exp $ +# $FreeBSD: src/share/monetdef/Makefile,v 1.61 2004/10/13 15:47:02 ru Exp $ -NOMAN=YES -CLEANFILES+= ${LOCALES:S/$/.out/g} - -LOCALES= af_ZA.ISO8859-1 \ +LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ be_BY.CP1131 \ be_BY.CP1251 \ @@ -77,94 +74,56 @@ zh_HK.UTF-8 \ zh_TW.Big5 -LOCALEDIR= ${DESTDIR}/usr/share/locale - -ASCIILINKS= en_AU en_CA en_GB en_NZ en_US -LATIN15LINKS= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ \ - en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS is_IS it_IT \ - it_CH nl_BE nl_NL no_NO pt_PT sv_SE +LOCALEDIR= /usr/share/locale -UTF8_LATIN1LINKS= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_NZ \ - en_US es_ES fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \ - nl_NL no_NO pt_BR pt_PT sv_SE -UTF8_LATIN2LINKS= hr_HR hu_HU ro_RO sk_SK sl_SI sr_YU -UTF8_LATIN7LINKS= el_GR -UTF8_LATIN9LINKS= tr_TR -UTF8_LATIN13LINKS= lt_LT -UTF8_LATIN15LINKS= et_EE - -CH_SRC= de_CH -CH_LINKS= fr_CH it_CH - .SUFFIXES: .src .out .src.out: grep -v '^#' < ${.IMPSRC} > ${.TARGET} -all: ${LOCALES:S/$/.out/g} +FILES= ${LOCALES:S/$/.out/} +FILESNAME= LC_MONETARY -afterinstall: .for lang in ${LOCALES} - ${INSTALL} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \ - ${LOCALEDIR}/${lang}/LC_MONETARY +FILESDIR_${lang}.out= ${LOCALEDIR}/${lang} .endfor -.for link in ${LATIN15LINKS} - ln -sf ../${link}.ISO8859-1/LC_MONETARY \ - ${LOCALEDIR}/${link}.ISO8859-15/LC_MONETARY + +CLEANFILES= ${FILES} + +ENCODINGS= Big5 Big5HKSCS CP949 eucJP eucKR GB2312 GBK \ + ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-7 ISO8859-9 \ + ISO8859-13 ISO8859-15 SJIS US-ASCII UTF-8 + +Big5_UTF-8= zh_TW +eucJP_SJIS= ja_JP +eucKR_CP949= ko_KR +GB2312_GBK= zh_CN +ISO8859-1_ISO8859-1= es_ES:eu_ES de_CH:fr_CH de_CH:it_CH +ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA \ + en_GB en_NZ en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR \ + is_IS it_IT it_CH nl_BE nl_NL no_NO pt_PT sv_SE +ISO8859-1_US-ASCII= en_AU en_CA en_GB en_NZ en_US +ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_NZ \ + en_US es_ES fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \ + nl_NL no_NO pt_BR pt_PT sv_SE +ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI sr_YU +ISO8859-7_UTF-8= el_GR +ISO8859-9_UTF-8= tr_TR +ISO8859-13_ISO8859-4= lt_LT +ISO8859-13_UTF-8= lt_LT +ISO8859-15_ISO8859-15= es_ES:eu_ES +ISO8859-15_UTF-8= et_EE +UTF-8_Big5HKSCS= zh_HK +UTF-8_UTF-8= es_ES:eu_ES de_CH:fr_CH de_CH:it_CH + +SYMLINKS= +.for enc1 in ${ENCODINGS} +.for enc2 in ${ENCODINGS} +.for lang_terr in ${${enc1}_${enc2}} +SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ + ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2} .endfor -.for link in ${ASCIILINKS} - ln -sf ../${link}.ISO8859-1/LC_MONETARY \ - ${LOCALEDIR}/${link}.US-ASCII/LC_MONETARY .endfor -.for link in ${CH_LINKS} - ln -sf ../${CH_SRC}.ISO8859-1/LC_MONETARY \ - ${LOCALEDIR}/${link}.ISO8859-1/LC_MONETARY .endfor - ln -sf ../ja_JP.eucJP/LC_MONETARY \ - ${LOCALEDIR}/ja_JP.SJIS/LC_MONETARY - ln -sf ../ko_KR.eucKR/LC_MONETARY \ - ${LOCALEDIR}/ko_KR.CP949/LC_MONETARY - ln -sf ../zh_CN.GB2312/LC_MONETARY \ - ${LOCALEDIR}/zh_CN.GBK/LC_MONETARY -.for link in ${UTF8_LATIN1LINKS} - ln -sf ../${link}.ISO8859-1/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${UTF8_LATIN2LINKS} - ln -sf ../${link}.ISO8859-2/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${UTF8_LATIN7LINKS} - ln -sf ../${link}.ISO8859-7/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${UTF8_LATIN9LINKS} - ln -sf ../${link}.ISO8859-9/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${UTF8_LATIN13LINKS} - ln -sf ../${link}.ISO8859-13/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${UTF8_LATIN15LINKS} - ln -sf ../${link}.ISO8859-15/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${CH_LINKS} - ln -sf ../${CH_SRC}.UTF-8/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor - ln -sf ../zh_TW.Big5/LC_MONETARY \ - ${LOCALEDIR}/zh_TW.UTF-8/LC_MONETARY - ln -sf ../zh_HK.UTF-8/LC_MONETARY \ - ${LOCALEDIR}/zh_HK.Big5HKSCS/LC_MONETARY - ln -sf ../es_ES.ISO8859-1/LC_MONETARY \ - ${LOCALEDIR}/eu_ES.ISO8859-1/LC_MONETARY - ln -sf ../es_ES.ISO8859-15/LC_MONETARY \ - ${LOCALEDIR}/eu_ES.ISO8859-15/LC_MONETARY - ln -sf ../es_ES.UTF-8/LC_MONETARY \ - ${LOCALEDIR}/eu_ES.UTF-8/LC_MONETARY - ln -sf ../lt_LT.ISO8859-13/LC_MONETARY \ - ${LOCALEDIR}/lt_LT.ISO8859-4/LC_MONETARY .include <bsd.prog.mk> ==== //depot/projects/hammer/sys/cam/scsi/scsi_da.h#2 (text+ko) ==== @@ -46,7 +46,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.5 2000/05/21 23:57:52 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.7 2004/10/13 09:31:04 bms Exp $ */ #ifndef _SCSI_SCSI_DA_H @@ -151,6 +151,9 @@ #define REASSIGN_BLOCKS 0x07 #define MODE_SELECT 0x15 #define MODE_SENSE 0x1a +#define READ_FORMAT_CAPACITIES 0x23 +#define WRITE_AND_VERIFY 0x2e +#define VERIFY 0x2f #define READ_DEFECT_DATA_10 0x37 #define READ_DEFECT_DATA_12 0xb7 @@ -182,6 +185,82 @@ u_int8_t pat_length[2]; }; +struct scsi_read_format_capacities +{ + uint8_t opcode; /* READ_FORMAT_CAPACITIES */ + uint8_t byte2; +#define SRFC_LUN_MASK 0xE0 + uint8_t reserved0[5]; + uint8_t alloc_length[2]; + uint8_t reserved1[3]; +}; + +struct scsi_verify +{ + uint8_t opcode; /* VERIFY */ + uint8_t byte2; +#define SVFY_LUN_MASK 0xE0 +#define SVFY_RELADR 0x01 +#define SVFY_BYTECHK 0x02 +#define SVFY_DPO 0x10 + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to verify */ + uint8_t reserved1[3]; +}; + +struct scsi_write_and_verify +{ + uint8_t opcode; /* WRITE_AND_VERIFY */ + uint8_t byte2; +#define SWVY_LUN_MASK 0xE0 +#define SWVY_RELADR 0x01 +#define SWVY_BYTECHK 0x02 +#define SWVY_DPO 0x10 + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to write and verify */ + uint8_t reserved1[3]; +}; + +/* + * Replies to READ_FORMAT_CAPACITIES look like this: + * + * struct format_capacity_list_header + * struct format_capacity_descriptor[1..n] + * + * These are similar, but not totally identical to, the + * defect list used to format a rigid disk. + * + * The appropriate csio_decode() format string looks like this: + * "{} *i3 {Len} i1 {Blocks} i4 {} *b6 {Code} b2 {Blocklen} i3" + * + * If the capacity_list_length is greater than + * sizeof(struct format_capacity_descriptor), then there are + * additional format capacity descriptors available which + * denote which format(s) the drive can handle. + * + * (Source: USB Mass Storage UFI Specification) + */ + +struct format_capacity_list_header { + uint8_t unused[3]; + uint8_t capacity_list_length; +}; + +struct format_capacity_descriptor { + uint8_t nblocks[4]; /* total number of LBAs */ + uint8_t byte4; /* only present in max/cur descriptor */ +#define FCD_CODE_MASK 0x03 /* mask for code field above */ +#define FCD_UNFORMATTED 0x01 /* unformatted media present, + * maximum capacity returned */ +#define FCD_FORMATTED 0x02 /* formatted media present, + * current capacity returned */ +#define FCD_NOMEDIA 0x03 /* no media present, + * maximum device capacity returned */ + uint8_t block_length[3]; /* length of an LBA in bytes */ +}; + struct scsi_reassign_blocks_data { u_int8_t reserved[2]; ==== //depot/projects/hammer/sys/conf/files#87 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.956 2004/10/08 00:24:30 brooks Exp $ +# $FreeBSD: src/sys/conf/files,v 1.957 2004/10/13 05:41:09 simokawa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -393,6 +393,7 @@ dev/cy/cy_pci.c optional cy pci dev/dcons/dcons.c optional dcons dev/dcons/dcons_crom.c optional dcons_crom +dev/dcons/dcons_os.c optional dcons dev/digi/digi.c optional digi dev/digi/digi_isa.c optional digi isa dev/digi/digi_pci.c optional digi pci ==== //depot/projects/hammer/sys/conf/kmod.mk#36 (text+ko) ==== @@ -1,43 +1,43 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.169 2004/10/11 21:23:56 joerg Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.171 2004/10/12 15:08:24 ru Exp $ # -# The include file <bsd.kmod.mk> handles installing Kernel Loadable Device -# drivers (KLD's). +# The include file <bsd.kmod.mk> handles building and installing loadable +# kernel modules. # # # +++ variables +++ # # CLEANFILES Additional files to remove for the clean and cleandir targets. # -# KMOD The name of the kernel module to build. +# EXPORT_SYMS A list of symbols that should be exported from the module, +# or the name of a file containing a list of symbols, or YES +# to export all symbols. If not defined, no symbols are +# exported. +# +# KMOD The name of the kernel module to build. # # KMODDIR Base path for kernel modules (see kld(4)). [/boot/kernel] # -# KMODOWN KLD owner. [${BINOWN}] +# KMODOWN Module file owner. [${BINOWN}] # -# KMODGRP KLD group. [${BINGRP}] +# KMODGRP Module file group. [${BINGRP}] # -# KMODMODE KLD mode. [${BINMODE}] +# KMODMODE Module file mode. [${BINMODE}] # # KMODLOAD Command to load a kernel module [/sbin/kldload] # # KMODUNLOAD Command to unload a kernel module [/sbin/kldunload] # -# PROG The name of the kernel module to build. -# If not supplied, ${KMOD}.o is used. +# MFILES Optionally a list of interfaces used by the module. +# This file contains a default list of interfaces. # -# SRCS List of source files +# PROG The name of the kernel module to build. +# If not supplied, ${KMOD}.ko is used. # -# DESTDIR Change the tree where the module gets installed. [not set] +# SRCS List of source files. # -# MFILES Optionally a list of interfaces used by the module. -# This file contains a default list of interfaces. +# DESTDIR The tree where the module gets installed. [not set] # -# EXPORT_SYMS A list of symbols that should be exported from the module, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410132215.i9DMF7Do044479>