From owner-p4-projects@FreeBSD.ORG Fri Jan 16 11:35:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2CB01065697; Fri, 16 Jan 2009 11:35:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 642191065691 for ; Fri, 16 Jan 2009 11:35:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36D148FC2C for ; Fri, 16 Jan 2009 11:35:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0GBZRQd027096 for ; Fri, 16 Jan 2009 11:35:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0GBZQuh027087 for perforce@freebsd.org; Fri, 16 Jan 2009 11:35:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 16 Jan 2009 11:35:26 GMT Message-Id: <200901161135.n0GBZQuh027087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 156248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jan 2009 11:35:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=156248 Change 156248 by hselasky@hselasky_laptop001 on 2009/01/16 11:35:22 IFC @ 156247 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/exception.S#8 integrate .. //depot/projects/usb/src/sys/amd64/conf/USB2#3 integrate .. //depot/projects/usb/src/sys/boot/common/load.c#2 delete .. //depot/projects/usb/src/sys/bsm/audit.h#9 integrate .. //depot/projects/usb/src/sys/bsm/audit_domain.h#1 branch .. //depot/projects/usb/src/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/usb/src/sys/bsm/audit_internal.h#10 integrate .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#10 integrate .. //depot/projects/usb/src/sys/bsm/audit_record.h#10 integrate .. //depot/projects/usb/src/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/usb/src/sys/cam/cam_xpt.c#12 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#6 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#6 integrate .. //depot/projects/usb/src/sys/conf/files#47 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#15 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#14 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#15 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iic.c#7 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#7 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#9 integrate .. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#7 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_iicbus.c#1 branch .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci.c#85 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#37 integrate .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#33 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#49 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#42 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#33 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#40 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_auereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2_reg.h#8 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdcereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cuereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_fw.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kuefw.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kuereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_ruereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2_reg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udavreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_fw.h#5 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_reg.h#5 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_var.h#8 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumfw.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumvar.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_reg.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_var.h#8 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_uralreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_uralvar.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_fw.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#10 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zydfw.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zydreg.h#1 branch .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/usb/src/sys/i386/conf/USB2#3 integrate .. //depot/projects/usb/src/sys/kern/sysv_sem.c#8 integrate .. //depot/projects/usb/src/sys/mips/idt/idtpci.c#3 integrate .. //depot/projects/usb/src/sys/mips/include/pmap.h#3 integrate .. //depot/projects/usb/src/sys/mips/malta/gt_pci.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/busdma_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#6 integrate .. //depot/projects/usb/src/sys/mips/mips/nexus.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#16 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_ftp.c#6 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_irc.c#5 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_nbt.c#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#12 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#14 integrate .. //depot/projects/usb/src/sys/netinet/vinet.h#4 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#15 integrate .. //depot/projects/usb/src/sys/powerpc/conf/NOTES#10 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/kiic.c#1 branch .. //depot/projects/usb/src/sys/security/audit/audit_bsm_domain.c#1 branch .. //depot/projects/usb/src/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_socket_type.c#1 branch .. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#11 integrate .. //depot/projects/usb/src/sys/sys/param.h#18 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/exception.S#8 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.135 2008/12/14 09:06:28 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.136 2009/01/14 14:20:08 kib Exp $ */ #include "opt_atpic.h" @@ -494,6 +494,7 @@ movq %rsp,%rdx /* frame */ sti call *%rax + cli nocallchain: #endif testl %ebx,%ebx ==== //depot/projects/usb/src/sys/amd64/conf/USB2#3 (text+ko) ==== @@ -2,7 +2,7 @@ # USB2 -- Generic kernel configuration file for FreeBSD/amd64 with USBng # stack. # -# $FreeBSD: src/sys/amd64/conf/USB2,v 1.2 2008/12/30 20:13:20 rpaulo Exp $ +# $FreeBSD: src/sys/amd64/conf/USB2,v 1.3 2009/01/13 19:05:10 thompsa Exp $ include GENERIC ==== //depot/projects/usb/src/sys/bsm/audit.h#9 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#1 - * $FreeBSD: src/sys/bsm/audit.h,v 1.13 2008/12/31 11:12:24 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#4 + * $FreeBSD: src/sys/bsm/audit.h,v 1.14 2009/01/14 10:44:16 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -280,8 +280,8 @@ * Structure for the audit file statistics. */ struct audit_fstat { - u_quad_t af_filesz; - u_quad_t af_currsz; + u_int64_t af_filesz; + u_int64_t af_currsz; }; typedef struct audit_fstat au_fstat_t; ==== //depot/projects/usb/src/sys/bsm/audit_errno.h#2 (text) ==== @@ -26,8 +26,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#4 - * $FreeBSD: src/sys/bsm/audit_errno.h,v 1.1 2008/12/31 11:12:24 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#5 + * $FreeBSD: src/sys/bsm/audit_errno.h,v 1.2 2009/01/14 10:44:16 rwatson Exp $ */ #ifndef _BSM_AUDIT_ERRNO_H_ @@ -42,128 +42,128 @@ * * When adding constants here, also add them to bsm_errno.c. */ -#define BSM_ESUCCESS 0 -#define BSM_EPERM 1 -#define BSM_ENOENT 2 -#define BSM_ESRCH 3 -#define BSM_EINTR 4 -#define BSM_EIO 5 -#define BSM_ENXIO 6 -#define BSM_E2BIG 7 -#define BSM_ENOEXEC 8 -#define BSM_EBADF 9 -#define BSM_ECHILD 10 -#define BSM_EAGAIN 11 -#define BSM_ENOMEM 12 -#define BSM_EACCES 13 -#define BSM_EFAULT 14 -#define BSM_ENOTBLK 15 -#define BSM_EBUSY 16 -#define BSM_EEXIST 17 -#define BSM_EXDEV 18 -#define BSM_ENODEV 19 -#define BSM_ENOTDIR 20 -#define BSM_EISDIR 21 -#define BSM_EINVAL 22 -#define BSM_ENFILE 23 -#define BSM_EMFILE 24 -#define BSM_ENOTTY 25 -#define BSM_ETXTBSY 26 -#define BSM_EFBIG 27 -#define BSM_ENOSPC 28 -#define BSM_ESPIPE 29 -#define BSM_EROFS 30 -#define BSM_EMLINK 31 -#define BSM_EPIPE 32 -#define BSM_EDOM 33 -#define BSM_ERANGE 34 -#define BSM_ENOMSG 35 -#define BSM_EIDRM 36 -#define BSM_ECHRNG 37 /* Solaris/Linux-specific. */ -#define BSM_EL2NSYNC 38 /* Solaris/Linux-specific. */ -#define BSM_EL3HLT 39 /* Solaris/Linux-specific. */ -#define BSM_EL3RST 40 /* Solaris/Linux-specific. */ -#define BSM_ELNRNG 41 /* Solaris/Linux-specific. */ -#define BSM_EUNATCH 42 /* Solaris/Linux-specific. */ -#define BSM_ENOCSI 43 /* Solaris/Linux-specific. */ -#define BSM_EL2HLT 44 /* Solaris/Linux-specific. */ -#define BSM_EDEADLK 45 -#define BSM_ENOLCK 46 -#define BSM_ECANCELED 47 -#define BSM_ENOTSUP 48 -#define BSM_EDQUOT 49 -#define BSM_EBADE 50 /* Solaris/Linux-specific. */ -#define BSM_EBADR 51 /* Solaris/Linux-specific. */ -#define BSM_EXFULL 52 /* Solaris/Linux-specific. */ -#define BSM_ENOANO 53 /* Solaris/Linux-specific. */ -#define BSM_EBADRQC 54 /* Solaris/Linux-specific. */ -#define BSM_EBADSLT 55 /* Solaris/Linux-specific. */ -#define BSM_EDEADLOCK 56 /* Solaris-specific. */ -#define BSM_EBFONT 57 /* Solaris/Linux-specific. */ -#define BSM_EOWNERDEAD 58 /* Solaris/Linux-specific. */ -#define BSM_ENOTRECOVERABLE 59 /* Solaris/Linux-specific. */ -#define BSM_ENOSTR 60 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ENODATA 61 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ETIME 62 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ENOSR 63 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ENONET 64 /* Solaris/Linux-specific. */ -#define BSM_ENOPKG 65 /* Solaris/Linux-specific. */ -#define BSM_EREMOTE 66 -#define BSM_ENOLINK 67 -#define BSM_EADV 68 /* Solaris/Linux-specific. */ -#define BSM_ESRMNT 69 /* Solaris/Linux-specific. */ -#define BSM_ECOMM 70 /* Solaris/Linux-specific. */ -#define BSM_EPROTO 71 -#define BSM_ELOCKUNMAPPED 72 /* Solaris-specific. */ -#define BSM_ENOTACTIVE 73 /* Solaris-specific. */ -#define BSM_EMULTIHOP 74 -#define BSM_EBADMSG 77 -#define BSM_ENAMETOOLONG 78 -#define BSM_EOVERFLOW 79 -#define BSM_ENOTUNIQ 80 /* Solaris/Linux-specific. */ -#define BSM_EBADFD 81 /* Solaris/Linux-specific. */ -#define BSM_EREMCHG 82 /* Solaris/Linux-specific. */ -#define BSM_ELIBACC 83 /* Solaris/Linux-specific. */ -#define BSM_ELIBBAD 84 /* Solaris/Linux-specific. */ -#define BSM_ELIBSCN 85 /* Solaris/Linux-specific. */ -#define BSM_ELIBMAX 86 /* Solaris/Linux-specific. */ -#define BSM_ELIBEXEC 87 /* Solaris/Linux-specific. */ -#define BSM_EILSEQ 88 -#define BSM_ENOSYS 89 -#define BSM_ELOOP 90 -#define BSM_ERESTART 91 -#define BSM_ESTRPIPE 92 /* Solaris/Linux-specific. */ -#define BSM_ENOTEMPTY 93 -#define BSM_EUSERS 94 -#define BSM_ENOTSOCK 95 -#define BSM_EDESTADDRREQ 96 -#define BSM_EMSGSIZE 97 -#define BSM_EPROTOTYPE 98 -#define BSM_ENOPROTOOPT 99 -#define BSM_EPROTONOSUPPORT 120 -#define BSM_ESOCKTNOSUPPORT 121 -#define BSM_EOPNOTSUPP 122 -#define BSM_EPFNOSUPPORT 123 -#define BSM_EAFNOSUPPORT 124 -#define BSM_EADDRINUSE 125 -#define BSM_EADDRNOTAVAIL 126 -#define BSM_ENETDOWN 127 -#define BSM_ENETUNREACH 128 -#define BSM_ENETRESET 129 -#define BSM_ECONNABORTED 130 -#define BSM_ECONNRESET 131 -#define BSM_ENOBUFS 132 -#define BSM_EISCONN 133 -#define BSM_ENOTCONN 134 -#define BSM_ESHUTDOWN 143 -#define BSM_ETOOMANYREFS 144 -#define BSM_ETIMEDOUT 145 -#define BSM_ECONNREFUSED 146 -#define BSM_EHOSTDOWN 147 -#define BSM_EHOSTUNREACH 148 -#define BSM_EALREADY 149 -#define BSM_EINPROGRESS 150 -#define BSM_ESTALE 151 +#define BSM_ERRNO_ESUCCESS 0 +#define BSM_ERRNO_EPERM 1 +#define BSM_ERRNO_ENOENT 2 +#define BSM_ERRNO_ESRCH 3 +#define BSM_ERRNO_EINTR 4 +#define BSM_ERRNO_EIO 5 +#define BSM_ERRNO_ENXIO 6 +#define BSM_ERRNO_E2BIG 7 +#define BSM_ERRNO_ENOEXEC 8 +#define BSM_ERRNO_EBADF 9 +#define BSM_ERRNO_ECHILD 10 +#define BSM_ERRNO_EAGAIN 11 +#define BSM_ERRNO_ENOMEM 12 +#define BSM_ERRNO_EACCES 13 +#define BSM_ERRNO_EFAULT 14 +#define BSM_ERRNO_ENOTBLK 15 +#define BSM_ERRNO_EBUSY 16 +#define BSM_ERRNO_EEXIST 17 +#define BSM_ERRNO_EXDEV 18 +#define BSM_ERRNO_ENODEV 19 +#define BSM_ERRNO_ENOTDIR 20 +#define BSM_ERRNO_EISDIR 21 +#define BSM_ERRNO_EINVAL 22 +#define BSM_ERRNO_ENFILE 23 +#define BSM_ERRNO_EMFILE 24 +#define BSM_ERRNO_ENOTTY 25 +#define BSM_ERRNO_ETXTBSY 26 +#define BSM_ERRNO_EFBIG 27 +#define BSM_ERRNO_ENOSPC 28 +#define BSM_ERRNO_ESPIPE 29 +#define BSM_ERRNO_EROFS 30 +#define BSM_ERRNO_EMLINK 31 +#define BSM_ERRNO_EPIPE 32 +#define BSM_ERRNO_EDOM 33 +#define BSM_ERRNO_ERANGE 34 +#define BSM_ERRNO_ENOMSG 35 +#define BSM_ERRNO_EIDRM 36 +#define BSM_ERRNO_ECHRNG 37 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL2NSYNC 38 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL3HLT 39 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL3RST 40 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELNRNG 41 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EUNATCH 42 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOCSI 43 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL2HLT 44 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EDEADLK 45 +#define BSM_ERRNO_ENOLCK 46 +#define BSM_ERRNO_ECANCELED 47 +#define BSM_ERRNO_ENOTSUP 48 +#define BSM_ERRNO_EDQUOT 49 +#define BSM_ERRNO_EBADE 50 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADR 51 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EXFULL 52 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOANO 53 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADRQC 54 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADSLT 55 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EDEADLOCK 56 /* Solaris-specific. */ +#define BSM_ERRNO_EBFONT 57 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EOWNERDEAD 58 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOTRECOVERABLE 59 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOSTR 60 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ENODATA 61 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ETIME 62 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ENOSR 63 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ENONET 64 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOPKG 65 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EREMOTE 66 +#define BSM_ERRNO_ENOLINK 67 +#define BSM_ERRNO_EADV 68 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ESRMNT 69 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ECOMM 70 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EPROTO 71 +#define BSM_ERRNO_ELOCKUNMAPPED 72 /* Solaris-specific. */ +#define BSM_ERRNO_ENOTACTIVE 73 /* Solaris-specific. */ +#define BSM_ERRNO_EMULTIHOP 74 +#define BSM_ERRNO_EBADMSG 77 +#define BSM_ERRNO_ENAMETOOLONG 78 +#define BSM_ERRNO_EOVERFLOW 79 +#define BSM_ERRNO_ENOTUNIQ 80 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADFD 81 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EREMCHG 82 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBACC 83 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBBAD 84 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBSCN 85 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBMAX 86 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBEXEC 87 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EILSEQ 88 +#define BSM_ERRNO_ENOSYS 89 +#define BSM_ERRNO_ELOOP 90 +#define BSM_ERRNO_ERESTART 91 +#define BSM_ERRNO_ESTRPIPE 92 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOTEMPTY 93 +#define BSM_ERRNO_EUSERS 94 +#define BSM_ERRNO_ENOTSOCK 95 +#define BSM_ERRNO_EDESTADDRREQ 96 +#define BSM_ERRNO_EMSGSIZE 97 +#define BSM_ERRNO_EPROTOTYPE 98 +#define BSM_ERRNO_ENOPROTOOPT 99 +#define BSM_ERRNO_EPROTONOSUPPORT 120 +#define BSM_ERRNO_ESOCKTNOSUPPORT 121 +#define BSM_ERRNO_EOPNOTSUPP 122 +#define BSM_ERRNO_EPFNOSUPPORT 123 +#define BSM_ERRNO_EAFNOSUPPORT 124 +#define BSM_ERRNO_EADDRINUSE 125 +#define BSM_ERRNO_EADDRNOTAVAIL 126 +#define BSM_ERRNO_ENETDOWN 127 +#define BSM_ERRNO_ENETUNREACH 128 +#define BSM_ERRNO_ENETRESET 129 +#define BSM_ERRNO_ECONNABORTED 130 +#define BSM_ERRNO_ECONNRESET 131 +#define BSM_ERRNO_ENOBUFS 132 +#define BSM_ERRNO_EISCONN 133 +#define BSM_ERRNO_ENOTCONN 134 +#define BSM_ERRNO_ESHUTDOWN 143 +#define BSM_ERRNO_ETOOMANYREFS 144 +#define BSM_ERRNO_ETIMEDOUT 145 +#define BSM_ERRNO_ECONNREFUSED 146 +#define BSM_ERRNO_EHOSTDOWN 147 +#define BSM_ERRNO_EHOSTUNREACH 148 +#define BSM_ERRNO_EALREADY 149 +#define BSM_ERRNO_EINPROGRESS 150 +#define BSM_ERRNO_ESTALE 151 /* * OpenBSM constants for error numbers not defined in Solaris. In the event @@ -172,44 +172,44 @@ * * ELAST doesn't get a constant in the BSM space. */ -#define BSM_EPROCLIM 190 /* FreeBSD/Darwin-specific. */ -#define BSM_EBADRPC 191 /* FreeBSD/Darwin-specific. */ -#define BSM_ERPCMISMATCH 192 /* FreeBSD/Darwin-specific. */ -#define BSM_EPROGUNAVAIL 193 /* FreeBSD/Darwin-specific. */ -#define BSM_EPROGMISMATCH 194 /* FreeBSD/Darwin-specific. */ -#define BSM_EPROCUNAVAIL 195 /* FreeBSD/Darwin-specific. */ -#define BSM_EFTYPE 196 /* FreeBSD/Darwin-specific. */ -#define BSM_EAUTH 197 /* FreeBSD/Darwin-specific. */ -#define BSM_ENEEDAUTH 198 /* FreeBSD/Darwin-specific. */ -#define BSM_ENOATTR 199 /* FreeBSD/Darwin-specific. */ -#define BSM_EDOOFUS 200 /* FreeBSD-specific. */ -#define BSM_EJUSTRETURN 201 /* FreeBSD-specific. */ -#define BSM_ENOIOCTL 202 /* FreeBSD-specific. */ -#define BSM_EDIRIOCTL 203 /* FreeBSD-specific. */ -#define BSM_EPWROFF 204 /* Darwin-specific. */ -#define BSM_EDEVERR 205 /* Darwin-specific. */ -#define BSM_EBADEXEC 206 /* Darwin-specific. */ -#define BSM_EBADARCH 207 /* Darwin-specific. */ -#define BSM_ESHLIBVERS 208 /* Darwin-specific. */ -#define BSM_EBADMACHO 209 /* Darwin-specific. */ -#define BSM_EPOLICY 210 /* Darwin-specific. */ -#define BSM_EDOTDOT 211 /* Linux-specific. */ -#define BSM_EUCLEAN 212 /* Linux-specific. */ -#define BSM_ENOTNAM 213 /* Linux(Xenix?)-specific. */ -#define BSM_ENAVAIL 214 /* Linux(Xenix?)-specific. */ -#define BSM_EISNAM 215 /* Linux(Xenix?)-specific. */ -#define BSM_EREMOTEIO 216 /* Linux-specific. */ -#define BSM_ENOMEDIUM 217 /* Linux-specific. */ -#define BSM_EMEDIUMTYPE 218 /* Linux-specific. */ -#define BSM_ENOKEY 219 /* Linux-specific. */ -#define BSM_EKEYEXPIRED 220 /* Linux-specific. */ -#define BSM_EKEYREVOKED 221 /* Linux-specific. */ -#define BSM_EKEYREJECTED 222 /* Linux-specific. */ +#define BSM_ERRNO_EPROCLIM 190 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EBADRPC 191 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_ERPCMISMATCH 192 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EPROGUNAVAIL 193 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EPROGMISMATCH 194 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EPROCUNAVAIL 195 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EFTYPE 196 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EAUTH 197 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_ENEEDAUTH 198 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_ENOATTR 199 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EDOOFUS 200 /* FreeBSD-specific. */ +#define BSM_ERRNO_EJUSTRETURN 201 /* FreeBSD-specific. */ +#define BSM_ERRNO_ENOIOCTL 202 /* FreeBSD-specific. */ +#define BSM_ERRNO_EDIRIOCTL 203 /* FreeBSD-specific. */ +#define BSM_ERRNO_EPWROFF 204 /* Darwin-specific. */ +#define BSM_ERRNO_EDEVERR 205 /* Darwin-specific. */ +#define BSM_ERRNO_EBADEXEC 206 /* Darwin-specific. */ +#define BSM_ERRNO_EBADARCH 207 /* Darwin-specific. */ +#define BSM_ERRNO_ESHLIBVERS 208 /* Darwin-specific. */ +#define BSM_ERRNO_EBADMACHO 209 /* Darwin-specific. */ +#define BSM_ERRNO_EPOLICY 210 /* Darwin-specific. */ +#define BSM_ERRNO_EDOTDOT 211 /* Linux-specific. */ +#define BSM_ERRNO_EUCLEAN 212 /* Linux-specific. */ +#define BSM_ERRNO_ENOTNAM 213 /* Linux(Xenix?)-specific. */ +#define BSM_ERRNO_ENAVAIL 214 /* Linux(Xenix?)-specific. */ +#define BSM_ERRNO_EISNAM 215 /* Linux(Xenix?)-specific. */ +#define BSM_ERRNO_EREMOTEIO 216 /* Linux-specific. */ +#define BSM_ERRNO_ENOMEDIUM 217 /* Linux-specific. */ +#define BSM_ERRNO_EMEDIUMTYPE 218 /* Linux-specific. */ +#define BSM_ERRNO_ENOKEY 219 /* Linux-specific. */ +#define BSM_ERRNO_EKEYEXPIRED 220 /* Linux-specific. */ +#define BSM_ERRNO_EKEYREVOKED 221 /* Linux-specific. */ +#define BSM_ERRNO_EKEYREJECTED 222 /* Linux-specific. */ /* * In the event that OpenBSM doesn't have a file representation of a local * error number, use this. */ -#define BSM_UNKNOWNERR 250 /* OpenBSM-specific. */ +#define BSM_ERRNO_UNKNOWN 250 /* OpenBSM-specific. */ #endif /* !_BSM_AUDIT_ERRNO_H_ */ ==== //depot/projects/usb/src/sys/bsm/audit_internal.h#10 (text) ==== @@ -30,8 +30,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#2 - * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.12 2008/12/31 11:12:24 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#5 + * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.13 2009/01/14 10:44:16 rwatson Exp $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/usb/src/sys/bsm/audit_kevents.h#10 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#3 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.17 2008/12/31 11:12:24 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#4 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.18 2009/01/14 10:44:16 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ ==== //depot/projects/usb/src/sys/bsm/audit_record.h#10 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#3 - * $FreeBSD: src/sys/bsm/audit_record.h,v 1.14 2008/12/31 11:12:24 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#9 + * $FreeBSD: src/sys/bsm/audit_record.h,v 1.15 2009/01/14 10:44:16 rwatson Exp $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -282,10 +282,15 @@ token_t *au_to_zonename(const char *zonename); /* - * BSM library routines for manipulating errno values. + * BSM library routines for converting between local and BSM constant spaces. */ +int au_bsm_to_domain(u_short bsm_domain, int *local_domainp); int au_bsm_to_errno(u_char bsm_error, int *errorp); -u_char au_errno_to_bsm(int error); +int au_bsm_to_socket_type(u_short bsm_socket_type, + int *local_socket_typep); +u_short au_domain_to_bsm(int local_domain); +u_char au_errno_to_bsm(int local_errno); +u_short au_socket_type_to_bsm(int local_socket_type); __END_DECLS ==== //depot/projects/usb/src/sys/cam/cam_xpt.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.205 2009/01/08 17:26:51 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.206 2009/01/14 21:29:20 trasz Exp $"); #include #include @@ -6137,7 +6137,7 @@ } xpt_release_ccb(done_ccb); softc->action = PROBE_TUR_FOR_NEGOTIATION; - xpt_schedule(periph, done_ccb->ccb_h.pinfo.priority); + xpt_schedule(periph, priority); return; } ==== //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.53 2008/08/16 21:26:58 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.54 2009/01/14 21:25:17 trasz Exp $"); #include @@ -3432,6 +3432,7 @@ break; case T_NODEVICE: dtype = "Uninstalled"; + break; default: dtype = "unknown"; break; ==== //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.232 2008/12/23 09:11:05 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.233 2009/01/14 21:27:30 trasz Exp $"); #include @@ -1021,7 +1021,6 @@ case AC_FOUND_DEVICE: { struct ccb_getdev *cgd; - struct cam_sim *sim; cam_status status; cgd = (struct ccb_getdev *)arg; @@ -1038,7 +1037,6 @@ * this device and start the probe * process. */ - sim = xpt_path_sim(cgd->ccb_h.path); status = cam_periph_alloc(daregister, daoninvalidate, dacleanup, dastart, "da", CAM_PERIPH_BIO, ==== //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.12 2009/01/10 17:22:49 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.13 2009/01/14 21:31:22 trasz Exp $"); #include #include @@ -941,6 +941,7 @@ case CAM_DEV_NOT_THERE: *hoststat = DID_BAD_TARGET; *drvstat = 0; + break; case CAM_SEL_TIMEOUT: *hoststat = DID_NO_CONNECT; *drvstat = 0; ==== //depot/projects/usb/src/sys/conf/files#47 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1363 2009/01/08 17:12:47 sam Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1365 2009/01/14 10:44:16 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2539,8 +2539,10 @@ security/audit/audit.c optional audit security/audit/audit_arg.c optional audit security/audit/audit_bsm.c optional audit +security/audit/audit_bsm_domain.c optional audit security/audit/audit_bsm_errno.c optional audit security/audit/audit_bsm_klib.c optional audit +security/audit/audit_bsm_socket_type.c optional audit security/audit/audit_bsm_token.c optional audit security/audit/audit_pipe.c optional audit security/audit/audit_syscalls.c standard ==== //depot/projects/usb/src/sys/conf/files.powerpc#15 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.89 2009/01/13 15:41:58 raj Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.91 2009/01/15 02:52:31 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -34,6 +34,7 @@ dev/ofw/ofw_bus_subr.c optional aim dev/ofw/ofw_console.c optional aim dev/ofw/ofw_disk.c optional ofwd aim +dev/ofw/ofw_iicbus.c optional iicbus aim dev/ofw/ofw_standard.c optional aim dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac dev/quicc/quicc_bfe_ocp.c optional quicc mpc85xx @@ -112,6 +113,7 @@ powerpc/powermac/dbdma.c optional powermac pci powerpc/powermac/grackle.c optional powermac pci powerpc/powermac/hrowpic.c optional powermac pci +powerpc/powermac/kiic.c optional powermac kiic powerpc/powermac/macio.c optional powermac pci powerpc/powermac/openpic_macio.c optional powermac pci powerpc/powermac/pswitch.c optional powermac pswitch ==== //depot/projects/usb/src/sys/conf/kern.pre.mk#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.103 2009/01/12 16:54:41 gnn Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.105 2009/01/15 06:54:59 rodrigc Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. ==== //depot/projects/usb/src/sys/dev/bce/if_bce.c#15 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.48 2009/01/13 07:12:32 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.50 2009/01/15 22:28:05 delphij Exp $"); /* * The following controllers are supported by this driver: @@ -107,7 +107,9 @@ { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x3106, "HP NC370i Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x3070, - "HP NC380T PCI Express Dual Port Multifunction Gigabit Server Adapter" }, + "HP NC380T PCIe DP Multifunc Gig Server Adapter" }, + { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x1709, + "HP NC371i Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5706 1000Base-T" }, @@ -119,37 +121,37 @@ /* BCM5708C controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7037, - "HP NC373T PCI Express Multifunction Gigabit Server Adapter" }, + "HP NC373T PCIe Multifunction Gig Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7038, - "HP NC373i Integrated Multifunction Gigabit Server Adapter" }, + "HP NC373i Multifunction Gigabit Server Adapter" }, + { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7045, + "HP NC374m PCIe Multifunction Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5708 1000Base-T" }, /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x1706, - "HP NC373m Multifunction Gigabit Server Adapter" }, - { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x7038, - "HP NC373i PCI Express Multifunction Gigabit Server Adapter" }, + "HP NC373m Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x703b, - "HP NC373i Integrated Multifunction Gigabit Server Adapter" }, + "HP NC373i Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x703d, - "HP NC373F PCI Express Multifunction Gigabit Server Adapter" }, + "HP NC373F PCIe Multifunc Giga Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5708 1000Base-SX" }, /* BCM5709C controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, HP_VENDORID, 0x7055, - "HP NC382i Integrated Quad Port PCI Express Gigabit Server Adapter" }, + "HP NC382i DP Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, HP_VENDORID, 0x7059, - "HP NC382T PCI Express Dual Port Multifunction Gigabit Server Adapter" }, + "HP NC382T PCIe DP Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5709 1000Base-T" }, /* BCM5709S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, HP_VENDORID, 0x171d, - "HP NC382m Dual Port 1GbE Multifunction BL-c Adapter" }, + "HP NC382m DP 1GbE Multifunction BL-c Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, HP_VENDORID, 0x7056, - "HP NC382i Integrated Quad Port PCI Express Gigabit Server Adapter" }, + "HP NC382i DP Multifunction Gigabit Server Adapter" }, { BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, PCI_ANY_ID, PCI_ANY_ID, "Broadcom NetXtreme II BCM5709 1000Base-SX" }, @@ -2908,7 +2910,6 @@ { struct bce_softc *sc; int i, error, rc = 0; - bus_addr_t busaddr; bus_size_t max_size, max_seg_size; int max_segments; @@ -2977,7 +2978,7 @@ sc->status_block, BCE_STATUS_BLK_SZ, bce_dma_map_addr, - &busaddr, + &sc->status_block_paddr, BUS_DMA_NOWAIT); if (error) { @@ -2987,7 +2988,6 @@ goto bce_dma_alloc_exit; } - sc->status_block_paddr = busaddr; DBPRINT(sc, BCE_INFO, "%s(): status_block_paddr = 0x%jX\n", __FUNCTION__, (uintmax_t) sc->status_block_paddr); @@ -3031,7 +3031,7 @@ sc->stats_block, BCE_STATS_BLK_SZ, bce_dma_map_addr, - &busaddr, + &sc->stats_block_paddr, BUS_DMA_NOWAIT); if(error) { @@ -3041,7 +3041,6 @@ goto bce_dma_alloc_exit; } - sc->stats_block_paddr = busaddr; DBPRINT(sc, BCE_INFO, "%s(): stats_block_paddr = 0x%jX\n", __FUNCTION__, (uintmax_t) sc->stats_block_paddr); @@ -3099,7 +3098,7 @@ sc->ctx_block[i], BCM_PAGE_SIZE, bce_dma_map_addr, - &busaddr, + &sc->ctx_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3109,7 +3108,6 @@ goto bce_dma_alloc_exit; } - sc->ctx_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): ctx_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->ctx_paddr[i]); } @@ -3155,7 +3153,7 @@ sc->tx_bd_chain[i], BCE_TX_CHAIN_PAGE_SZ, bce_dma_map_addr, - &busaddr, + &sc->tx_bd_chain_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3165,7 +3163,6 @@ goto bce_dma_alloc_exit; } - sc->tx_bd_chain_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): tx_bd_chain_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->tx_bd_chain_paddr[i]); } @@ -3253,7 +3250,7 @@ sc->rx_bd_chain[i], BCE_RX_CHAIN_PAGE_SZ, bce_dma_map_addr, - &busaddr, + &sc->rx_bd_chain_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3263,7 +3260,6 @@ goto bce_dma_alloc_exit; } - sc->rx_bd_chain_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): rx_bd_chain_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->rx_bd_chain_paddr[i]); } @@ -3350,7 +3346,7 @@ sc->pg_bd_chain[i], BCE_PG_CHAIN_PAGE_SZ, bce_dma_map_addr, - &busaddr, + &sc->pg_bd_chain_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3360,7 +3356,6 @@ goto bce_dma_alloc_exit; } - sc->pg_bd_chain_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): pg_bd_chain_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->pg_bd_chain_paddr[i]); } ==== //depot/projects/usb/src/sys/dev/iicbus/iic.c#7 (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/dev/iicbus/iic.c,v 1.41 2009/01/06 17:23:37 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.42 2009/01/15 23:14:59 nwhitehorn Exp $ * */ #include @@ -110,14 +110,18 @@ { if (device_find_child(parent, "iic", -1) == NULL) - BUS_ADD_CHILD(parent, 0, "iic", 0); + BUS_ADD_CHILD(parent, 0, "iic", -1); } static int iic_probe(device_t dev) { + if (iicbus_get_addr(dev) > 0) + return (ENXIO); + device_set_desc(dev, "I2C generic I/O"); - return (BUS_PROBE_NOWILDCARD); + + return (0); } static int ==== //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.26 2009/01/06 17:23:37 nwhitehorn Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<<