Date: Mon, 1 Apr 2002 14:05:58 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8830 for review Message-ID: <200204012205.g31M5wv65551@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8830 Change 8830 by jhb@jhb_laptop on 2002/04/01 14:05:07 IFC suser(). Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/promcons.c#10 integrate ... //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#9 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#12 integrate ... //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#8 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#17 integrate ... //depot/projects/smpng/sys/compat/linux/linux_uid16.c#9 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#10 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#13 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#8 integrate ... //depot/projects/smpng/sys/dev/an/if_an.c#19 integrate ... //depot/projects/smpng/sys/dev/asr/asr.c#11 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#19 integrate ... //depot/projects/smpng/sys/dev/awi/awi.c#6 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wep.c#6 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#6 integrate ... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#9 integrate ... //depot/projects/smpng/sys/dev/dgb/dgb.c#8 integrate ... //depot/projects/smpng/sys/dev/digi/digi.c#12 integrate ... //depot/projects/smpng/sys/dev/nmdm/nmdm.c#10 integrate ... //depot/projects/smpng/sys/dev/null/null.c#4 integrate ... //depot/projects/smpng/sys/dev/ofw/ofw_console.c#8 integrate ... //depot/projects/smpng/sys/dev/random/randomdev.c#9 integrate ... //depot/projects/smpng/sys/dev/rp/rp.c#8 integrate ... //depot/projects/smpng/sys/dev/sbni/if_sbni.c#5 integrate ... //depot/projects/smpng/sys/dev/si/si.c#5 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#15 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.c#16 integrate ... //depot/projects/smpng/sys/dev/syscons/sysmouse.c#5 integrate ... //depot/projects/smpng/sys/dev/usb/ohci.c#13 integrate ... //depot/projects/smpng/sys/dev/usb/ucom.c#4 integrate ... //depot/projects/smpng/sys/dev/usb/uhci.c#14 integrate ... //depot/projects/smpng/sys/dev/usb/uhcivar.h#5 integrate ... //depot/projects/smpng/sys/dev/usb/ukbd.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/umass.c#12 integrate ... //depot/projects/smpng/sys/dev/usb/umodem.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/ums.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/usb.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/usb_port.h#8 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.h#5 integrate ... //depot/projects/smpng/sys/dev/usb/usbdivar.h#7 integrate ... //depot/projects/smpng/sys/dev/vinum/vinum.c#7 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#25 integrate ... //depot/projects/smpng/sys/dev/wl/if_wl.c#6 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#12 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#8 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#6 integrate ... //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#8 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#13 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#7 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#28 integrate ... //depot/projects/smpng/sys/i386/i386/mem.c#8 integrate ... //depot/projects/smpng/sys/i386/i386/sys_machdep.c#19 integrate ... //depot/projects/smpng/sys/i386/i386/vm86.c#8 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#6 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#8 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/cx.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/cy.c#15 integrate ... //depot/projects/smpng/sys/i386/isa/istallion.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#9 integrate ... //depot/projects/smpng/sys/i386/isa/rc.c#9 integrate ... //depot/projects/smpng/sys/i386/isa/spigot.c#9 integrate ... //depot/projects/smpng/sys/i386/isa/stallion.c#5 integrate ... //depot/projects/smpng/sys/i386/linux/linux_machdep.c#13 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/ssc.c#7 integrate ... //depot/projects/smpng/sys/isa/fd.c#10 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_acct.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_acl.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_exec.c#31 integrate ... //depot/projects/smpng/sys/kern/kern_jail.c#17 integrate ... //depot/projects/smpng/sys/kern/kern_ktrace.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_linker.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_ntptime.c#7 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#55 integrate ... //depot/projects/smpng/sys/kern/kern_resource.c#17 integrate ... //depot/projects/smpng/sys/kern/kern_shutdown.c#20 integrate ... //depot/projects/smpng/sys/kern/kern_sysctl.c#16 integrate ... //depot/projects/smpng/sys/kern/kern_time.c#9 integrate ... //depot/projects/smpng/sys/kern/kern_xxx.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_prf.c#13 integrate ... //depot/projects/smpng/sys/kern/sysv_ipc.c#9 integrate ... //depot/projects/smpng/sys/kern/sysv_msg.c#12 integrate ... //depot/projects/smpng/sys/kern/tty.c#15 integrate ... //depot/projects/smpng/sys/kern/tty_cons.c#13 integrate ... //depot/projects/smpng/sys/kern/tty_pty.c#14 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#22 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#32 integrate ... //depot/projects/smpng/sys/kern/vfs_vnops.c#21 integrate ... //depot/projects/smpng/sys/net/if.c#19 integrate ... //depot/projects/smpng/sys/net/if_ppp.c#11 integrate ... //depot/projects/smpng/sys/net/if_sl.c#10 integrate ... //depot/projects/smpng/sys/net/if_tap.c#11 integrate ... //depot/projects/smpng/sys/net/if_tun.c#10 integrate ... //depot/projects/smpng/sys/net/net_osdep.h#5 integrate ... //depot/projects/smpng/sys/net/ppp_tty.c#7 integrate ... //depot/projects/smpng/sys/net/raw_usrreq.c#6 integrate ... //depot/projects/smpng/sys/net/rtsock.c#15 integrate ... //depot/projects/smpng/sys/netatalk/at_control.c#5 integrate ... //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#7 integrate ... //depot/projects/smpng/sys/netatm/atm_usrreq.c#6 integrate ... //depot/projects/smpng/sys/netgraph/ng_socket.c#10 integrate ... //depot/projects/smpng/sys/netgraph/ng_tty.c#7 integrate ... //depot/projects/smpng/sys/netinet/in.c#11 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.c#21 integrate ... //depot/projects/smpng/sys/netinet/ip_divert.c#11 integrate ... //depot/projects/smpng/sys/netinet/ip_output.c#21 integrate ... //depot/projects/smpng/sys/netinet/raw_ip.c#16 integrate ... //depot/projects/smpng/sys/netinet/tcp_subr.c#17 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#18 integrate ... //depot/projects/smpng/sys/netinet6/in6.c#9 integrate ... //depot/projects/smpng/sys/netinet6/in6_pcb.c#12 integrate ... //depot/projects/smpng/sys/netinet6/in6_src.c#7 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#11 integrate ... //depot/projects/smpng/sys/netinet6/ip6_output.c#9 integrate ... //depot/projects/smpng/sys/netinet6/raw_ip6.c#9 integrate ... //depot/projects/smpng/sys/netinet6/udp6_output.c#7 integrate ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#10 integrate ... //depot/projects/smpng/sys/netipx/ipx.c#5 integrate ... //depot/projects/smpng/sys/netipx/ipx_pcb.c#6 integrate ... //depot/projects/smpng/sys/netipx/ipx_usrreq.c#6 integrate ... //depot/projects/smpng/sys/netncp/ncp_subr.h#4 integrate ... //depot/projects/smpng/sys/netsmb/smb_subr.h#6 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_lock.c#17 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_serv.c#15 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#9 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#23 integrate ... //depot/projects/smpng/sys/pc98/pc98/fd.c#9 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#15 integrate ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#13 integrate ... //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#7 integrate ... //depot/projects/smpng/sys/pccard/pccard.c#12 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_mmap.c#8 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_util.c#8 integrate ... //depot/projects/smpng/sys/sparc64/include/param.h#9 integrate ... //depot/projects/smpng/sys/sys/systm.h#28 integrate ... //depot/projects/smpng/sys/sys/ucred.h#14 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#10 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#18 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vnops.c#4 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#14 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#11 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#7 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#9 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#13 integrate ... //depot/projects/smpng/sys/vm/vm_mmap.c#15 integrate ... //depot/projects/smpng/sys/vm/vm_swap.c#11 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.25 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.26 2002/04/01 21:30:29 jhb Exp $ */ /* $NetBSD: promcons.c,v 1.13 1998/03/21 22:52:59 mycroft Exp $ */ /* ==== //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.16 2002/02/27 18:31:35 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.17 2002/04/01 21:30:29 jhb Exp $ * */ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.27 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.28 2002/04/01 21:30:29 jhb Exp $ */ ==== //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.32 2002/03/20 18:58:47 obrien Exp $ + * $FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.33 2002/04/01 21:30:29 jhb Exp $ */ /* * This driver is a somewhat hack. A real driver might use the zs driver ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#17 (text+ko) ==== @@ -25,7 +25,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/sys/compat/linux/linux_misc.c,v 1.116 2002/03/20 10:32:00 jeff Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.117 2002/04/01 21:30:29 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/linux/linux_uid16.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.5 2002/02/27 18:31:41 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.6 2002/04/01 21:30:29 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#10 (text+ko) ==== @@ -28,7 +28,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/sys/compat/svr4/svr4_fcntl.c,v 1.22 2002/03/20 05:41:37 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.23 2002/04/01 21:30:30 jhb Exp $ */ #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#13 (text+ko) ==== @@ -25,7 +25,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/sys/compat/svr4/svr4_misc.c,v 1.43 2002/03/27 21:36:18 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.44 2002/04/01 21:30:30 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#8 (text+ko) ==== @@ -25,7 +25,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/sys/compat/svr4/svr4_stat.c,v 1.11 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.12 2002/04/01 21:30:30 jhb Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/dev/an/if_an.c#19 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/an/if_an.c,v 1.33 2002/03/20 02:02:34 alfred Exp $ + * $FreeBSD: src/sys/dev/an/if_an.c,v 1.34 2002/04/01 21:30:30 jhb Exp $ */ /* @@ -132,7 +132,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an.c,v 1.33 2002/03/20 02:02:34 alfred Exp $"; + "$FreeBSD: src/sys/dev/an/if_an.c,v 1.34 2002/04/01 21:30:30 jhb Exp $"; #endif /* These are global because we need them in sys/pci/if_an_p.c. */ ==== //depot/projects/smpng/sys/dev/asr/asr.c#11 (text+ko) ==== @@ -103,7 +103,7 @@ * use proprietary packet creation instead of scsi_inquire * CAM layer sends synchronize commands. * - * $FreeBSD: src/sys/dev/asr/asr.c,v 1.19 2002/04/01 06:09:17 alfred Exp $ + * $FreeBSD: src/sys/dev/asr/asr.c,v 1.20 2002/04/01 21:30:30 jhb Exp $ */ #define ASR_VERSION 1 ==== //depot/projects/smpng/sys/dev/ata/atapi-cd.c#19 (text+ko) ==== @@ -25,7 +25,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/sys/dev/ata/atapi-cd.c,v 1.114 2002/03/27 19:47:52 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.115 2002/04/01 21:30:31 jhb Exp $ */ #include "opt_ata.h" ==== //depot/projects/smpng/sys/dev/awi/awi.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.17 2002/03/20 02:02:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.18 2002/04/01 21:30:31 jhb Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/awi/awi_wep.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi_wep.c,v 1.4 2000/08/14 11:28:03 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.6 2002/03/20 02:02:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.7 2002/04/01 21:30:31 jhb Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi_wicfg.c,v 1.3 2000/07/06 17:22:25 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi_wicfg.c,v 1.6 2002/03/20 02:02:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi_wicfg.c,v 1.7 2002/04/01 21:30:31 jhb Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_cnw.c,v 1.15 2000/10/16 10:26:41 itojun Exp $ */ -/* $FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.5 2002/03/20 02:04:09 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.6 2002/04/01 21:30:31 jhb Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/dgb/dgb.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * dgb.c $FreeBSD: src/sys/dev/dgb/dgb.c,v 1.69 2002/03/20 02:07:16 alfred Exp $ + * dgb.c $FreeBSD: src/sys/dev/dgb/dgb.c,v 1.70 2002/04/01 21:30:32 jhb Exp $ * * Digiboard driver. * ==== //depot/projects/smpng/sys/dev/digi/digi.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.c,v 1.20 2002/03/26 18:01:38 jhb Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.21 2002/04/01 21:30:32 jhb Exp $ */ /*- ==== //depot/projects/smpng/sys/dev/nmdm/nmdm.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.9 2002/02/27 18:31:47 jhb Exp $ + * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.10 2002/04/01 21:30:32 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/null/null.c#4 (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/sys/dev/null/null.c,v 1.7 2002/03/31 22:36:40 phk Exp $ + * $FreeBSD: src/sys/dev/null/null.c,v 1.8 2002/04/01 21:30:33 jhb Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/dev/ofw/ofw_console.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.5 2002/01/09 04:03:55 jake Exp $"; + "$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.6 2002/04/01 21:30:33 jhb Exp $"; #endif /* not lint */ #include <sys/param.h> ==== //depot/projects/smpng/sys/dev/random/randomdev.c#9 (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/sys/dev/random/randomdev.c,v 1.34 2002/03/03 20:09:41 markm Exp $ + * $FreeBSD: src/sys/dev/random/randomdev.c,v 1.35 2002/04/01 21:30:33 jhb Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/dev/rp/rp.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/rp/rp.c,v 1.44 2002/03/20 02:07:38 alfred Exp $ + * $FreeBSD: src/sys/dev/rp/rp.c,v 1.45 2002/04/01 21:30:34 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/sbni/if_sbni.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.2 2002/01/08 19:36:54 msmith Exp $ + * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.3 2002/04/01 21:30:34 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/si/si.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $FreeBSD: src/sys/dev/si/si.c,v 1.109 2001/09/12 08:37:10 julian Exp $ + * $FreeBSD: src/sys/dev/si/si.c,v 1.110 2002/04/01 21:30:34 jhb Exp $ */ #ifndef lint ==== //depot/projects/smpng/sys/dev/sio/sio.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sio/sio.c,v 1.371 2002/03/31 09:15:43 bde Exp $ + * $FreeBSD: src/sys/dev/sio/sio.c,v 1.372 2002/04/01 21:30:35 jhb Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ ==== //depot/projects/smpng/sys/dev/syscons/syscons.c#16 (text+ko) ==== @@ -25,7 +25,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/sys/dev/syscons/syscons.c,v 1.379 2002/03/16 23:31:15 sobomax Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.380 2002/04/01 21:30:35 jhb Exp $ */ #include "opt_syscons.h" ==== //depot/projects/smpng/sys/dev/syscons/sysmouse.c#5 (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/sys/dev/syscons/sysmouse.c,v 1.12 2001/09/12 08:37:14 julian Exp $ + * $FreeBSD: src/sys/dev/syscons/sysmouse.c,v 1.13 2002/04/01 21:30:35 jhb Exp $ */ #include "opt_syscons.h" ==== //depot/projects/smpng/sys/dev/usb/ohci.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: ohci.c,v 1.94 2000/11/10 14:11:49 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.76 2002/04/01 20:01:41 joe Exp $ */ +/* $NetBSD: ohci.c,v 1.99 2001/01/21 02:39:52 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.78 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -41,8 +41,8 @@ /* * USB Open Host Controller driver. * - * OHCI spec: ftp://ftp.compaq.com/pub/supportinformation/papers/hcir1_0a.exe - * USB spec: http://www.usb.org/developers/data/usb11.pdf + * OHCI spec: http://www.compaq.com/productinfo/development/openhci.html + * USB spec: http://www.usb.org/developers/data/usbspec.zip */ #include <sys/param.h> @@ -124,7 +124,7 @@ #endif Static usbd_status ohci_open(usbd_pipe_handle); Static void ohci_poll(struct usbd_bus *); -Static void ohci_softintr (struct usbd_bus *); +Static void ohci_softintr (void *); Static void ohci_waitintr(ohci_softc_t *, usbd_xfer_handle); Static void ohci_add_done(ohci_softc_t *, ohci_physaddr_t); Static void ohci_rhsc(ohci_softc_t *, usbd_xfer_handle); @@ -1181,9 +1181,9 @@ } void -ohci_softintr(struct usbd_bus *bus) +ohci_softintr(void *v) { - ohci_softc_t *sc = (ohci_softc_t *)bus; + ohci_softc_t *sc = v; ohci_soft_itd_t *sitd, *sidone, *sitdnext; ohci_soft_td_t *std, *sdone, *stdnext; usbd_xfer_handle xfer; ==== //depot/projects/smpng/sys/dev/usb/ucom.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.15 2002/03/18 18:23:39 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.16 2002/04/01 21:30:36 jhb Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. ==== //depot/projects/smpng/sys/dev/usb/uhci.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: uhci.c,v 1.130 2000/12/18 15:55:30 tsutsui Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.96 2002/04/01 20:18:21 joe Exp $ */ +/* $NetBSD: uhci.c,v 1.138 2001/10/02 17:59:38 pooka Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.103 2002/04/01 21:56:42 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -237,7 +237,7 @@ Static usbd_status uhci_open(usbd_pipe_handle); Static void uhci_poll(struct usbd_bus *); -Static void uhci_softintr(struct usbd_bus *); +Static void uhci_softintr(void *); Static usbd_status uhci_device_request(usbd_xfer_handle xfer); @@ -629,11 +629,9 @@ UXFER(xfer)->iinfo.sc = sc; #ifdef DIAGNOSTIC UXFER(xfer)->iinfo.isdone = 1; + xfer->busy_free = XFER_BUSY; #endif } -#ifdef DIAGNOSTIC - xfer->busy_free = XFER_BUSY; -#endif return (xfer); } @@ -683,7 +681,7 @@ int cmd; int s; - s = splusb(); + s = splhardusb(); cmd = UREAD2(sc, UHCI_CMD); DPRINTF(("uhci_power: sc=%p, why=%d (was %d), cmd=0x%x\n", @@ -704,6 +702,8 @@ sc->sc_saved_frnum = UREAD2(sc, UHCI_FRNUM); sc->sc_saved_sof = UREAD1(sc, UHCI_SOF); + UWRITE2(sc, UHCI_INTR, 0); /* disable intrs */ + UHCICMD(sc, cmd | UHCI_CMD_EGSM); /* enter global suspend */ usb_delay_ms(&sc->sc_bus, USB_RESUME_WAIT); sc->sc_suspend = why; @@ -1176,17 +1176,18 @@ if (status == 0) /* The interrupt was not for us. */ return (0); +#if defined(DIAGNOSTIC) && defined(__NetBSD__) + if (sc->sc_suspend != PWR_RESUME) + printf("uhci_intr: suspended sts=0x%x\n", status); +#endif + if (sc->sc_suspend != PWR_RESUME) { printf("%s: interrupt while not operating ignored\n", USBDEVNAME(sc->sc_bus.bdev)); + UWRITE2(sc, UHCI_STS, status); /* acknowledge the ints */ return (0); } -#if defined(DIAGNOSTIC) && defined(__NetBSD__) - if (sc->sc_suspend != PWR_RESUME) - printf("uhci_intr: suspended sts=0x%x\n", status); -#endif - ack = 0; if (status & UHCI_STS_USBINT) ack |= UHCI_STS_USBINT; @@ -1209,19 +1210,19 @@ } if (status & UHCI_STS_HCH) { /* no acknowledge needed */ - if (!sc->sc_dying) - printf("%s: host controller halted\n", + if (!sc->sc_dying) { + printf("%s: host controller halted\n", USBDEVNAME(sc->sc_bus.bdev)); +#ifdef UHCI_DEBUG + uhci_dump_all(sc); +#endif + } sc->sc_dying = 1; } - if (ack) { /* acknowledge the ints */ - UWRITE2(sc, UHCI_STS, ack); - } else { /* nothing to acknowledge */ - printf("%s: UHCI interrupt, STS = 0x%04x, but ack == 0\n", - USBDEVNAME(sc->sc_bus.bdev), status); - return (0); - } + if (!ack) + return (0); /* nothing to acknowledge */ + UWRITE2(sc, UHCI_STS, ack); /* acknowledge the ints */ sc->sc_bus.no_intrs++; usb_schedsoftintr(&sc->sc_bus); @@ -1232,9 +1233,9 @@ } void -uhci_softintr(struct usbd_bus *bus) +uhci_softintr(void *v) { - uhci_softc_t *sc = (uhci_softc_t *)bus; + uhci_softc_t *sc = v; uhci_intr_info_t *ii; DPRINTFN(10,("%s: uhci_softintr\n", USBDEVNAME(sc->sc_bus.bdev))); @@ -1525,7 +1526,7 @@ u_int16_t cmd; run = run != 0; - s = splusb(); + s = splhardusb(); DPRINTF(("uhci_run: setting run=%d\n", run)); cmd = UREAD2(sc, UHCI_CMD); if (run) ==== //depot/projects/smpng/sys/dev/usb/uhcivar.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: uhcivar.h,v 1.31 2000/06/01 14:28:59 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.31 2002/04/01 19:01:08 joe Exp $ */ +/* $NetBSD: uhcivar.h,v 1.32 2000/08/13 16:18:09 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.32 2002/04/01 21:13:21 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/usb/ukbd.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/ukbd.c,v 1.35 2002/01/02 18:28:45 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ukbd.c,v 1.36 2002/04/01 21:13:21 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ /* - * HID spec: http://www.usb.org/developers/data/usbhid10.pdf + * HID spec: http://www.usb.org/developers/data/devclass/hid1_1.pdf */ #include "opt_kbd.h" ==== //depot/projects/smpng/sys/dev/usb/umass.c#12 (text+ko) ==== @@ -24,17 +24,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.56 2002/03/20 18:04:11 obrien Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.57 2002/04/01 21:13:21 joe Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ /* - * Ported to NetBSD by Lennart Augustsson <augustss@netbsd.org>. - * Parts of the code written my Jason R. Thorpe <thorpej@shagadelic.org>. + * Universal Serial Bus Mass Storage Class specs: + * http://www.usb.org/developers/data/devclass/usbmassover_11.pdf + * http://www.usb.org/developers/data/devclass/usbmassbulk_10.pdf + * http://www.usb.org/developers/data/devclass/usbmass-cbi10.pdf + * http://www.usb.org/developers/data/devclass/usbmass-ufi10.pdf */ /* - * The PDF documentation can be found at http://www.usb.org/developers/ + * Ported to NetBSD by Lennart Augustsson <augustss@netbsd.org>. + * Parts of the code written my Jason R. Thorpe <thorpej@shagadelic.org>. */ /* ==== //depot/projects/smpng/sys/dev/usb/umodem.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: umodem.c,v 1.5 1999/01/08 11:58:25 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/umodem.c,v 1.36 2002/04/01 19:01:09 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/umodem.c,v 1.38 2002/04/01 21:30:36 jhb Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -39,7 +39,8 @@ */ /* - * Comm Class spec: http://www.usb.org/developers/data/usbcdc11.pdf + * Comm Class spec: http://www.usb.org/developers/data/devclass/usbcdc10.pdf + * http://www.usb.org/developers/data/devclass/usbcdc11.pdf */ /* ==== //depot/projects/smpng/sys/dev/usb/ums.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/ums.c,v 1.51 2002/03/16 12:06:01 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ums.c,v 1.52 2002/04/01 21:13:21 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ /* - * HID spec: http://www.usb.org/developers/data/usbhid10.pdf + * HID spec: http://www.usb.org/developers/data/devclass/hid1_1.pdf */ #include <sys/param.h> ==== //depot/projects/smpng/sys/dev/usb/usb.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usb.c,v 1.48 2000/12/13 04:05:14 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb.c,v 1.62 2002/04/01 17:54:07 joe Exp $ */ +/* $NetBSD: usb.c,v 1.49 2001/01/21 02:39:53 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb.c,v 1.63 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -229,6 +229,20 @@ ue.u.ue_ctrlr.ue_bus = USBDEVUNIT(sc->sc_dev); usb_add_event(USB_EVENT_CTRLR_ATTACH, &ue); +#ifdef USB_USE_SOFTINTR +#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS + /* XXX we should have our own level */ + sc->sc_bus->soft = softintr_establish(IPL_SOFTNET, + sc->sc_bus->methods->soft_intr, sc->sc_bus); + if (sc->sc_bus->soft == NULL) { + printf("%s: can't register softintr\n", USBDEVNAME(sc->sc_dev)); + sc->sc_dying = 1; + } +#else + callout_init(&sc->sc_bus->softi); +#endif +#endif + err = usbd_new_device(USBDEV(sc->sc_dev), sc->sc_bus, 0, 0, 0, &sc->sc_port); if (!err) { @@ -703,9 +717,23 @@ } void -usb_schedsoftintr(struct usbd_bus *bus) +usb_schedsoftintr(usbd_bus_handle bus) { +#ifdef USB_USE_SOFTINTR + if (bus->use_polling) { + bus->methods->soft_intr(bus); + } else { +#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS + softintr_schedule(bus->soft); +#else + if (!callout_pending(&bus->softi)) + callout_reset(&bus->softi, 0, bus->methods->soft_intr, + bus); +#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ + } +#else bus->methods->soft_intr(bus); +#endif } #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -757,6 +785,17 @@ usbd_finish(); +#ifdef USB_USE_SOFTINTR +#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS + if (sc->sc_bus->soft != NULL) { + softintr_disestablish(sc->sc_bus->soft); + sc->sc_bus->soft = NULL; + } +#else + callout_stop(&sc->sc_bus->softi); +#endif +#endif + ue.u.ue_ctrlr.ue_bus = USBDEVUNIT(sc->sc_dev); usb_add_event(USB_EVENT_CTRLR_DETACH, &ue); ==== //depot/projects/smpng/sys/dev/usb/usb_port.h#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: usb_port.h,v 1.23 2000/03/24 22:03:32 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.44 2002/04/01 16:53:29 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.45 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -52,6 +52,8 @@ #include "opt_usbverbose.h" +/*#define USB_USE_SOFTINTR */ + #ifdef USB_DEBUG #define UHID_DEBUG 1 #define OHCI_DEBUG 1 ==== //depot/projects/smpng/sys/dev/usb/usbdi.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usbdi.c,v 1.77 2000/09/23 21:02:04 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.54 2002/04/01 17:30:24 joe Exp $ */ +/* $NetBSD: usbdi.c,v 1.79 2001/01/21 02:39:53 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.56 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -299,12 +299,16 @@ int i; usbd_bus_handle bus = pipe->device->bus; int to = xfer->timeout * 1000; + DPRINTFN(2,("usbd_transfer: polling\n")); for (i = 0; i < to; i += 10) { delay(10); bus->methods->do_poll(bus); if (xfer->done) break; } + DPRINTFN(2,("usbd_transfer: polling done =\n", + xfer->done)); + /* XXX Is this right, what about the HC timeout? */ if (!xfer->done) { pipe->methods->abort(xfer); xfer->status = USBD_TIMEOUT; ==== //depot/projects/smpng/sys/dev/usb/usbdi.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usbdi.h,v 1.46 2001/01/18 20:28:23 jdolecek Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.31 2002/04/01 19:22:04 joe Exp $ */ +/* $NetBSD: usbdi.h,v 1.47 2001/01/21 02:39:53 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.32 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -249,14 +249,11 @@ int usbd_driver_load(module_t mod, int what, void *arg); #endif -/* - * XXX - * splusb MUST be the lowest level interrupt so that within USB callbacks - * the level can be raised the appropriate level. - * XXX Should probably use a softsplusb. - */ -/* XXX */ +/* XXX Perhaps USB should have its own levels? */ +#ifdef USB_USE_SOFTINTR +#define splusb splsoftnet +#else #define splusb splbio +#endif #define splhardusb splbio #define IPL_USB IPL_BIO -/* XXX */ ==== //depot/projects/smpng/sys/dev/usb/usbdivar.h#7 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usbdivar.h,v 1.60 2000/12/28 10:40:36 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.27 2002/04/01 20:26:38 joe Exp $ */ +/* $NetBSD: usbdivar.h,v 1.62 2001/01/21 02:39:53 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.29 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -53,7 +53,7 @@ struct usbd_bus_methods { usbd_status (*open_pipe)(struct usbd_pipe *pipe); - void (*soft_intr)(struct usbd_bus *); + void (*soft_intr)(void *); void (*do_poll)(struct usbd_bus *); usbd_status (*allocm)(struct usbd_bus *, usb_dma_t *, u_int32_t bufsize); @@ -113,7 +113,15 @@ #define USBREV_1_0 2 #define USBREV_1_1 3 #define USBREV_2_0 4 -#define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1" } +#define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0" } + +#ifdef USB_USE_SOFTINTR +#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS + void *soft; /* soft interrupt cookie */ +#else + struct callout softi; +#endif +#endif #if defined(__NetBSD__) || defined(__OpenBSD__) bus_dma_tag_t dmatag; /* DMA tag */ ==== //depot/projects/smpng/sys/dev/vinum/vinum.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ * advised of the possibility of such damage. * * $Id: vinum.c,v 1.34 2001/05/22 04:07:22 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.48 2002/03/29 21:14:34 phk Exp $ + * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.49 2002/04/01 21:30:36 jhb Exp $ */ #define STATIC static /* nothing while we're testing XXX */ ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#25 (text+ko) ==== @@ -117,7 +117,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.86 2002/04/01 18:52:53 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.87 2002/04/01 21:30:37 jhb Exp $"; #endif #ifdef foo ==== //depot/projects/smpng/sys/dev/wl/if_wl.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/wl/if_wl.c,v 1.40 2002/02/27 23:34:02 imp Exp $ */ +/* $FreeBSD: src/sys/dev/wl/if_wl.c,v 1.41 2002/04/01 21:30:37 jhb Exp $ */ /* * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ==== //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.35 2002/03/19 22:19:57 alfred Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.36 2002/04/01 21:30:38 jhb Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204012205.g31M5wv65551>