From owner-p4-projects@FreeBSD.ORG Wed May 30 09:38:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C794416A46B; Wed, 30 May 2007 09:38:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8968816A468 for ; Wed, 30 May 2007 09:38:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 72B9413C448 for ; Wed, 30 May 2007 09:38:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4U9ctq5077415 for ; Wed, 30 May 2007 09:38:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U9criO077388 for perforce@freebsd.org; Wed, 30 May 2007 09:38:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 09:38:53 GMT Message-Id: <200705300938.l4U9criO077388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120609 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: Wed, 30 May 2007 09:38:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=120609 Change 120609 by rwatson@rwatson_zoo on 2007/05/30 09:38:26 Integrate TrustedBSD audit3 branch from base branch; see @120608 for change description. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/busdma_machdep.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/busdma_machdep.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/vmparam.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/avila_ata.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/ixp425var.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/conf.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/main.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/README.quirks#1 branch .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_da.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_lro.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/en/midway.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fxp/if_fxp.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/random/randomdev_soft.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_ural.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nullfs/null_vfsops.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/support/spin.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bit.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_bmap_btree.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_dir.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_ialloc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_inode.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_log_recover.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_rtalloc.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/xfs/xfs_vnodeops.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/GENERIC#16 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/busdma_machdep.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/sys_machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/vm_machdep.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/busdma_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_clock.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_event.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mib.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sx.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_witness.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_usrreq.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/cxgb/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/net/ethernet.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_auth.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_lock_bsd.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_peeloff.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_uio.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netipsec/key.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/ncr.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#45 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#40 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#38 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/bus_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/bus_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sx.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syslimits.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/amd64/amd64/busdma_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.80 2007/04/17 21:05:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.81 2007/05/29 06:30:25 yongari Exp $"); #include #include @@ -649,6 +649,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#15 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.477 2007/05/10 01:39:50 kevlo Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $ cpu HAMMER ident GENERIC @@ -285,3 +285,6 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) +device fwip # IP over FireWire (RFC 2734,3146) +device dcons # Dumb console driver +device dcons_crom # Configuration ROM for dcons ==== //depot/projects/trustedbsd/audit3/sys/arm/arm/busdma_machdep.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.31 2007/05/29 06:30:25 yongari Exp $"); /* * ARM bus dma support routines @@ -799,6 +799,8 @@ * Compute the segment size, and adjust counts. */ sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK); + if (sgsize > dmat->maxsegsz) + sgsize = dmat->maxsegsz; if (buflen < sgsize) sgsize = buflen; ==== //depot/projects/trustedbsd/audit3/sys/arm/conf/AVILA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.1 2007/05/24 16:27:48 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.2 2007/05/29 18:10:42 jhay Exp $ # # Device wiring for the Gateworks Avila 2384. @@ -8,7 +8,7 @@ hint.uart.0.at="ixp0" hint.uart.0.addr=0xc8000000 hint.uart.0.irq=15 -#hint.uart.0.flags=0x10 +hint.uart.0.flags=0x10 # USART0 is unit 1 hint.uart.1.at="ixp0" hint.uart.1.addr=0xc8001000 ==== //depot/projects/trustedbsd/audit3/sys/arm/include/vmparam.h#7 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.8 2007/05/05 19:50:26 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.9 2007/05/28 21:04:22 alc Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -48,31 +48,12 @@ #define KERNBASE 0xc0000000 /* - * Override the default pager_map size, there's not enough KVA. - */ - -/* * max number of non-contig chunks of physical RAM you can have */ #define VM_PHYSSEG_MAX 32 /* - * when converting a physical address to a vm_page structure, we - * want to use a binary search on the chunks of physical memory - * to find our RAM - */ - -#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH - -/* - * this indicates that we can't add RAM to the VM system after the - * vm system is init'd. - */ - -#define VM_PHYSSEG_NOADD - -/* * The physical address space is densely populated. */ #define VM_PHYSSEG_DENSE ==== //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/avila_ata.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.4 2007/05/24 16:15:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.5 2007/05/28 18:45:16 jhay Exp $"); /* * Compact Flash Support for the Avila Gateworks XScale boards. @@ -120,7 +120,7 @@ { struct ata_avila_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); - u_int32_t alt_t_off, ide_gpin, ide_gptype, ide_irq; + u_int32_t alt_t_off, ide_gpin, ide_irq; sc->sc_dev = dev; /* NB: borrow from parent */ @@ -137,7 +137,6 @@ panic("%s: unable to map Expansion Bus CS2 window", __func__); ide_gpin = AVILA_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING); ide_irq = AVILA_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS1_OFFSET; alt_t_off = EXP_TIMING_CS2_OFFSET; @@ -152,7 +151,6 @@ panic("%s: unable to map Expansion Bus CS4 window", __func__); ide_gpin = PRONGHORN_IDE_GPIN; - ide_gptype = GPIO_TYPE(ide_gpin, GPIO_TYPE_ACT_HIGH); ide_irq = PRONGHORN_IDE_IRQ; sc->sc_16bit_off = EXP_TIMING_CS3_OFFSET; alt_t_off = EXP_TIMING_CS4_OFFSET; @@ -190,7 +188,8 @@ /* set interrupt type */ GPIO_CONF_WRITE_4(sa, GPIO_TYPE_REG(ide_gpin), (GPIO_CONF_READ_4(sa, GPIO_TYPE_REG(ide_gpin)) &~ - GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | ide_gptype); + GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | + GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING)); /* clear ISR */ GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPISR, (1< -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.6 2007/05/24 16:25:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.8 2007/05/29 18:10:42 jhay Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -95,7 +95,7 @@ IXP425_EXP_BUS_CS4_VBASE }, }; -static int +int getvbase(uint32_t hwbase, uint32_t size, uint32_t *vbase) { int i; @@ -367,12 +367,8 @@ driver_intr_t *intr, void *arg, void **cookiep) { uint32_t mask; - int i, irq; + int i; - if (BUS_READ_IVAR(dev, child, IXP425_IVAR_IRQ, &irq) == 0) { - rman_set_start(ires, irq); - rman_set_end(ires, rman_get_start(ires)); - } BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); ==== //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/ixp425var.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425var.h,v 1.3 2007/05/24 16:25:49 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425var.h,v 1.4 2007/05/29 18:10:42 jhay Exp $ * */ @@ -98,6 +98,8 @@ int ixp425_md_route_interrupt(device_t, device_t, int); void ixp425_md_attach(device_t); +int getvbase(uint32_t, uint32_t, uint32_t *); + struct ixp425_ivar { uint32_t addr; int irq; ==== //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.2 2007/05/24 16:17:51 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_bus_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -71,6 +71,15 @@ sc = device_get_softc(dev); sc->sc_class = &uart_ns8250_class; + sc->sc_rrid = 0; + sc->sc_rtype = SYS_RES_MEMORY; + sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, + 0, ~0, uart_getrange(sc->sc_class), RF_ACTIVE); + if (sc->sc_rres == NULL) { + return (ENXIO); + } + sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres); + sc->sc_bas.bst = rman_get_bustag(sc->sc_rres); /* * XXX set UART Unit Enable (0x40) AND * receiver timeout int enable (0x10). @@ -79,9 +88,9 @@ * uart_ns8250 carefully avoids touching these bits so we can * just set them here and proceed. But this is fragile... */ - bus_space_write_4(&ixp425_a4x_bs_tag, - device_get_unit(dev) == 0 ? IXP425_UART0_VBASE : IXP425_UART1_VBASE, - IXP425_UART_IER, IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_space_write_4(sc->sc_bas.bst, sc->sc_bas.bsh, IXP425_UART_IER, + IXP425_UART_IER_UUE | IXP425_UART_IER_RTOIE); + bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); return uart_bus_probe(dev, 0, IXP425_UART_FREQ, 0, 0); } ==== //depot/projects/trustedbsd/audit3/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.2 2007/04/02 22:00:22 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c,v 1.3 2007/05/29 18:10:42 jhay Exp $"); #include #include @@ -51,17 +51,46 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = uart_getops(&uart_ns8250_class); - di->bas.chan = 0; - di->bas.bst = &ixp425_a4x_bs_tag; - di->bas.regshft = 0; - di->bas.rclk = IXP425_UART_FREQ; - di->baudrate = 115200; - di->databits = 8; - di->stopbits = 1; - di->parity = UART_PARITY_NONE; - uart_bus_space_io = &ixp425_a4x_bs_tag; - uart_bus_space_mem = NULL; - di->bas.bsh = IXP425_UART0_VBASE; - return (0); + uint32_t i, ivar, vaddr; + + /* + * Scan the hints. The IXP425 only have 2 serial ports, so only + * scan them. + */ + for (i = 0; i < 2; i++) { + if (resource_int_value("uart", i, "flags", &ivar)) + continue; + if (devtype == UART_DEV_CONSOLE && !UART_FLAGS_CONSOLE(ivar)) + continue; + if (devtype == UART_DEV_DBGPORT && !UART_FLAGS_DBGPORT(ivar)) + continue; + /* + * We have a possible device. Make sure it's enabled and + * that we have an I/O port. + */ + if (resource_int_value("uart", i, "disabled", &ivar) == 0 && + ivar != 0) + continue; + if (resource_int_value("uart", i, "addr", &ivar) != 0 || + ivar == 0) + continue; + /* Got it. Fill in the instance and return it. */ + di->ops = uart_getops(&uart_ns8250_class); + di->bas.chan = 0; + di->bas.bst = &ixp425_a4x_bs_tag; + di->bas.regshft = 0; + di->bas.rclk = IXP425_UART_FREQ; + di->baudrate = 115200; + di->databits = 8; + di->stopbits = 1; + di->parity = UART_PARITY_NONE; + uart_bus_space_io = NULL; + uart_bus_space_mem = &ixp425_a4x_bs_tag; + + getvbase(ivar, IXP425_REG_SIZE, &vaddr); + di->bas.bsh = vaddr; + return (0); + } + + return (ENXIO); } ==== //depot/projects/trustedbsd/audit3/sys/boot/i386/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.20 2003/12/08 19:02:06 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.21 2007/05/29 14:35:57 simokawa Exp $ -SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 loader +SUBDIR= mbr boot0 boot0sio btx boot2 cdboot kgzldr libi386 libfirewire \ + loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr ==== //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.84 2006/11/02 00:26:44 marcel Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.85 2007/05/29 14:35:57 simokawa Exp $ .include @@ -9,6 +9,12 @@ # architecture-specific loader code SRCS= main.c conf.c vers.c +# Put LOADER_FIREWIRE_SUPPORT=yes in /etc/make.conf for FireWire/dcons support +.if defined(LOADER_FIREWIRE_SUPPORT) +CFLAGS+= -DLOADER_FIREWIRE_SUPPORT +LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a +.endif + # Enable PXE TFTP or NFS support, not both. .if defined(LOADER_TFTP_SUPPORT) CFLAGS+= -DLOADER_TFTP_SUPPORT @@ -90,8 +96,8 @@ # XXX crt0.o needs to be first for pxeboot(8) to work OBJS= ${BTXCRT} -DPADD= ${LIBFICL} ${LIBI386} ${LIBSTAND} -LDADD= ${LIBFICL} ${LIBI386} -lstand +DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBI386} -lstand .include ==== //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/conf.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.25 2004/08/29 00:48:42 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.26 2007/05/29 14:35:57 simokawa Exp $"); #include #include @@ -46,6 +46,10 @@ #error "Cannot have both tftp and nfs support yet." #endif +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct devsw fwohci; +#endif + /* Exported for libstand */ struct devsw *devsw[] = { &bioscd, @@ -53,6 +57,9 @@ #if defined(LOADER_NFS_SUPPORT) || defined(LOADER_TFTP_SUPPORT) &pxedisk, #endif +#if defined(LOADER_FIREWIRE_SUPPORT) + &fwohci, +#endif NULL }; @@ -103,11 +110,17 @@ */ extern struct console vidconsole; extern struct console comconsole; +#if defined(LOADER_FIREWIRE_SUPPORT) +extern struct console dconsole; +#endif extern struct console nullconsole; struct console *consoles[] = { &vidconsole, &comconsole, +#if defined(LOADER_FIREWIRE_SUPPORT) + &dconsole, +#endif &nullconsole, NULL }; ==== //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/main.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.39 2006/11/16 13:32:30 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.40 2007/05/29 14:35:57 simokawa Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -91,7 +91,7 @@ */ bios_getmem(); -#ifdef LOADER_BZIP2_SUPPORT +#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) heap_top = PTOV(memtop_copyin); memtop_copyin -= 0x300000; heap_bottom = PTOV(memtop_copyin); ==== //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_da.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.213 2007/05/29 20:04:01 mjacob Exp $"); #include ==== //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#19 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.167 2007/05/27 05:38:44 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.168 2007/05/29 16:13:59 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4592,14 +4592,19 @@ ath_hal_setledstate(ah, leds[nstate]); /* set LED */ if (nstate == IEEE80211_S_INIT) { - sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); /* - * NB: disable interrupts so we don't rx frames. + * Shutdown host/driver operation: + * o disable interrupts so we don't rx frames + * o clean any pending items on the task q + * o notify the rate control algorithm */ + sc->sc_imask &= ~(HAL_INT_SWBA | HAL_INT_BMISS); ath_hal_intrset(ah, sc->sc_imask &~ HAL_INT_GLOBAL); - /* - * Notify the rate control algorithm. - */ + /* XXX can't use taskqueue_drain 'cuz we're holding sc_mtx */ + taskqueue_drain(sc->sc_tq, &sc->sc_rxtask); + taskqueue_drain(sc->sc_tq, &sc->sc_rxorntask); + taskqueue_drain(sc->sc_tq, &sc->sc_bmisstask); + taskqueue_drain(sc->sc_tq, &sc->sc_bstucktask); ath_rate_newstate(sc, nstate); goto done; } ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_ael1002.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,10 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif enum { AEL100X_TX_DISABLE = 9, ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_common.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,13 +25,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_common.h,v 1.4 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef __CHELSIO_COMMON_H #define __CHELSIO_COMMON_H +#ifdef CONFIG_DEFINED +#include +#else #include +#endif enum { MAX_NPORTS = 2, /* max # of ports */ @@ -538,7 +538,11 @@ unsigned int val; }; +#ifdef CONFIG_DEFINED +#include +#else #include +#endif #ifndef PCI_VENDOR_ID_CHELSIO # define PCI_VENDOR_ID_CHELSIO 0x1425 ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,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/cxgb/common/cxgb_firmware_exports.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_firmware_exports.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef _FIRMWARE_EXPORTS_H_ ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_mc5.c#3 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,10 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.2 2007/05/25 09:48:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mc5.c,v 1.3 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif enum { IDT75P52100 = 4, ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,9 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /* Marvell PHY interrupt status bits. */ #define MV_INTR_JABBER 0x0001 ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_regs.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,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/cxgb/common/cxgb_regs.h,v 1.2 2007/03/20 21:43:32 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_regs.h,v 1.3 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* This file is automatically generated --- do not edit */ ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_sge_defs.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,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/cxgb/common/cxgb_sge_defs.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_sge_defs.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,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/cxgb/common/cxgb_t3_cpl.h,v 1.2 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_cpl.h,v 1.3 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ #ifndef T3_CPL_H ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_t3_hw.c#3 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,12 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.3 2007/05/25 09:48:19 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_t3_hw.c,v 1.4 2007/05/28 22:57:26 kmacy Exp $"); -#include -#include -#include -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /** * t3_wait_op_done_val - wait until an operation is completed ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_tcb.h#2 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,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/cxgb/common/cxgb_tcb.h,v 1.1 2007/03/14 02:37:44 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_tcb.h,v 1.2 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_version.h#3 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -29,7 +25,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/cxgb/common/cxgb_version.h,v 1.3 2007/05/25 09:48:19 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/common/cxgb_version.h,v 1.4 2007/05/28 22:57:26 kmacy Exp $ ***************************************************************************/ /* ==== //depot/projects/trustedbsd/audit3/sys/dev/cxgb/common/cxgb_vsc8211.c#2 (text+ko) ==== @@ -9,11 +9,7 @@ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Chelsio Corporation nor the names of its + 2. Neither the name of the Chelsio Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,9 +28,13 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.1 2007/03/14 02:37:44 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $"); -#include +#ifdef CONFIG_DEFINED +#include +#else +#include +#endif /* VSC8211 PHY specific registers. */ enum { >>> TRUNCATED FOR MAIL (1000 lines) <<<