From owner-p4-projects@FreeBSD.ORG Sun Mar 15 01:07:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C39F81065673; Sun, 15 Mar 2009 01:07:43 +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 845AC106566C for ; Sun, 15 Mar 2009 01:07:43 +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 685468FC14 for ; Sun, 15 Mar 2009 01:07:43 +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 n2F17hTY012584 for ; Sun, 15 Mar 2009 01:07:43 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2F17hNe012582 for perforce@freebsd.org; Sun, 15 Mar 2009 01:07:43 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 15 Mar 2009 01:07:43 GMT Message-Id: <200903150107.n2F17hNe012582@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 159225 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: Sun, 15 Mar 2009 01:07:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=159225 Change 159225 by hselasky@hselasky_laptop001 on 2009/03/15 01:07:17 USB CORE: Fix regression issue in the USB file system interface. - Use cdev_privdata pointer as indicator of correct file handle. - Remove redundant FIFO opened flags. Reported by: Alexander Best Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#8 (text+ko) ==== @@ -72,7 +72,8 @@ /* prototypes */ -static int usb2_fifo_open(struct usb2_fifo *, int); +static int usb2_fifo_open(struct usb2_cdev_privdata *, + struct usb2_fifo *, int); static void usb2_fifo_close(struct usb2_fifo *, int); static void usb2_dev_init(void *); static void usb2_dev_init_post(void *); @@ -200,6 +201,8 @@ cpd->is_write = 1; /* ref */ if (f == NULL || f->refcount == USB_FIFO_REF_MAX) goto error; + if (f->curr_cpd != cpd) + goto error; /* check if USB-FS is active */ if (f->fs_ep_max != 0) { cpd->is_usbfs = 1; @@ -222,6 +225,8 @@ cpd->is_read = 1; /* ref */ if (f == NULL || f->refcount == USB_FIFO_REF_MAX) goto error; + if (f->curr_cpd != cpd) + goto error; /* check if USB-FS is active */ if (f->fs_ep_max != 0) { cpd->is_usbfs = 1; @@ -434,7 +439,7 @@ /* wrong endpoint index */ continue; } - if (f->opened) { + if (f->curr_cpd != NULL) { /* FIFO is opened */ is_busy = 1; continue; @@ -451,7 +456,7 @@ /* wrong endpoint index */ continue; } - if (f->opened) { + if (f->curr_cpd != NULL) { /* FIFO is opened */ is_busy = 1; continue; @@ -470,6 +475,16 @@ return (is_busy ? EBUSY : EINVAL); } } + + if ((ep != 0) && is_busy) { + /* + * Only the default control endpoint is allowed to be + * opened multiple times! + */ + DPRINTFN(5, "busy\n"); + return (EBUSY); + } + /* Check TX FIFO */ if (is_tx && (udev->fifo[n + USB_FIFO_TX] == NULL)) { @@ -639,7 +654,8 @@ * Else: Failure *------------------------------------------------------------------------*/ static int -usb2_fifo_open(struct usb2_fifo *f, int fflags) +usb2_fifo_open(struct usb2_cdev_privdata *cpd, + struct usb2_fifo *f, int fflags) { int err; @@ -660,7 +676,7 @@ /* check if we are already opened */ /* we don't need any locks when checking this variable */ - if (f->opened) { + if (f->curr_cpd != NULL) { err = EBUSY; goto done; } @@ -690,9 +706,9 @@ /* reset ASYNC proc flag */ f->async_p = NULL; + mtx_lock(&usb2_ref_lock); /* flag the fifo as opened to prevent others */ - mtx_lock(&usb2_ref_lock); - f->opened = 1; + f->curr_cpd = cpd; mtx_unlock(&usb2_ref_lock); /* reset queue */ @@ -733,14 +749,14 @@ int err; /* check if we are not opened */ - if (!f->opened) { + if (f->curr_cpd == NULL) { /* nothing to do - already closed */ return; } mtx_lock(f->priv_mtx); - /* clear current file flag */ - f->opened = 0; + /* clear current cdev private data pointer */ + f->curr_cpd = NULL; /* check if we are selected */ if (f->flag_isselect) { @@ -834,21 +850,6 @@ } cpd->fflags = fflags; /* access mode for open lifetime */ - /* Check if the endpoint is already open, we always allow EP0 */ - if (ep > 0) { - if ((fflags & FREAD && cpd->udev->ep_rd_opened & (1 << ep)) || - (fflags & FWRITE && cpd->udev->ep_wr_opened & (1 << ep))) { - DPRINTFN(2, "endpoint already open\n"); - usb2_unref_device(cpd); - free(cpd, M_USBDEV); - return (EBUSY); - } - if (fflags & FREAD) - cpd->udev->ep_rd_opened |= (1 << ep); - if (fflags & FWRITE) - cpd->udev->ep_wr_opened |= (1 << ep); - } - /* create FIFOs, if any */ err = usb2_fifo_create(cpd); /* check for error */ @@ -859,7 +860,7 @@ return (err); } if (fflags & FREAD) { - err = usb2_fifo_open(cpd->rxfifo, fflags); + err = usb2_fifo_open(cpd, cpd->rxfifo, fflags); if (err) { DPRINTFN(2, "read open failed\n"); usb2_unref_device(cpd); @@ -868,7 +869,7 @@ } } if (fflags & FWRITE) { - err = usb2_fifo_open(cpd->txfifo, fflags); + err = usb2_fifo_open(cpd, cpd->txfifo, fflags); if (err) { DPRINTFN(2, "write open failed\n"); if (fflags & FREAD) { @@ -906,13 +907,9 @@ udev = cpd->udev; if (cpd->fflags & FREAD) { usb2_fifo_close(cpd->rxfifo, cpd->fflags); - /* clear read bitmask */ - udev->ep_rd_opened &= ~(1 << cpd->ep_addr); } if (cpd->fflags & FWRITE) { usb2_fifo_close(cpd->txfifo, cpd->fflags); - /* clear write bitmask */ - udev->ep_wr_opened &= ~(1 << cpd->ep_addr); } usb2_unref_device(cpd); @@ -1762,7 +1759,9 @@ f_sc->fp[USB_FIFO_RX] = NULL; if (f_sc->dev != NULL) { - destroy_dev_sched_cb(f_sc->dev, usb2_fifo_cleanup, f_sc->dev->si_drv1); + destroy_dev_sched_cb(f_sc->dev, + usb2_fifo_cleanup, f_sc->dev->si_drv1); + f_sc->dev = NULL; } DPRINTFN(2, "detached %p\n", f_sc); ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.h#5 (text+ko) ==== @@ -93,12 +93,12 @@ int bus_index; /* bus index */ int dev_index; /* device index */ int ep_addr; /* endpoint address */ + int fflags; uint8_t fifo_index; /* FIFO index */ uint8_t is_read; /* location has read access */ uint8_t is_write; /* location has write access */ uint8_t is_uref; /* USB refcount decr. needed */ uint8_t is_usbfs; /* USB-FS is active */ - int fflags; }; struct usb2_fs_privdata { @@ -130,7 +130,8 @@ struct usb2_xfer *xfer[2]; struct usb2_xfer **fs_xfer; struct mtx *priv_mtx; /* client data */ - int opened; /* set if FIFO is opened by a FILE */ + /* set if FIFO is opened by a FILE: */ + struct usb2_cdev_privdata *curr_cpd; void *priv_sc0; /* client data */ void *priv_sc1; /* client data */ void *queue_data; ==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#5 (text+ko) ==== @@ -127,8 +127,6 @@ uint32_t plugtime; /* copy of "ticks" */ - uint16_t ep_rd_opened; /* bitmask of endpoints opened */ - uint16_t ep_wr_opened; /* from the device nodes. */ uint16_t refcount; #define USB_DEV_REF_MAX 0xffff From owner-p4-projects@FreeBSD.ORG Sun Mar 15 06:44:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 307621065670; Sun, 15 Mar 2009 06:44:32 +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 D0E26106564A for ; Sun, 15 Mar 2009 06:44:31 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BCFA78FC08 for ; Sun, 15 Mar 2009 06:44:31 +0000 (UTC) (envelope-from julian@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 n2F6iVN8055365 for ; Sun, 15 Mar 2009 06:44:31 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2F6iOf2055359 for perforce@freebsd.org; Sun, 15 Mar 2009 06:44:24 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Mar 2009 06:44:24 GMT Message-Id: <200903150644.n2F6iOf2055359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 159228 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: Sun, 15 Mar 2009 06:44:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=159228 Change 159228 by julian@julian_trafmon1 on 2009/03/15 06:43:36 IFC latest Affected files ... .. //depot/projects/vimage/src/share/man/man4/Makefile#5 integrate .. //depot/projects/vimage/src/share/man/man4/altq.4#4 integrate .. //depot/projects/vimage/src/share/man/man4/amdtemp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/igmp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ip.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/k8temp.4#2 delete .. //depot/projects/vimage/src/share/man/man4/multicast.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/txp.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/uplcom.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/usb2_bluetooth.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_controller.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_ethernet.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_image.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_input.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_misc.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_ndis.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_quirk.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_serial.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_sound.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_storage.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_wlan.4#2 delete .. //depot/projects/vimage/src/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/vimage/src/share/man/man7/tuning.7#3 integrate .. //depot/projects/vimage/src/share/man/man8/diskless.8#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_VPTOCNP.9#2 integrate .. //depot/projects/vimage/src/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#26 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#16 integrate .. //depot/projects/vimage/src/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcb.h#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcpu.h#7 integrate .. //depot/projects/vimage/src/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#10 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#13 integrate .. //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#14 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#14 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#8 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#10 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#9 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_pci.c#6 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425reg.h#5 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/bioscd.c#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/devicename.c#5 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/loader/Makefile#6 integrate .. //depot/projects/vimage/src/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#8 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#29 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.h#4 integrate .. //depot/projects/vimage/src/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_windrv.c#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/resource_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#13 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_usbd.c#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/usbd_var.h#3 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/vimage/src/sys/conf/files#58 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#21 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#28 integrate .. //depot/projects/vimage/src/sys/conf/options.amd64#7 integrate .. //depot/projects/vimage/src/sys/conf/options.arm#10 integrate .. //depot/projects/vimage/src/sys/ddb/db_expr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp.c#6 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/vimage/src/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/vimage/src/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/vimage/src/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-cbus.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-sis.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#31 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath_pci.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#19 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#21 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcefw.h#9 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#14 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus_cis.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_core.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_dev.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/vimage/src/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ael1002.c#11 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_common.h#11 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#14 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_xgmac.c#10 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#16 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_ioctl.h#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#24 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_multiq.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#21 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#12 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#9 integrate .. //depot/projects/vimage/src/sys/dev/drm/drmP.h#9 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_bufs.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#12 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_scatter.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drv.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_drv.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_drv.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/vimage/src/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/savage_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/sis_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/tdfx_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/vimage/src/sys/dev/exca/exca.c#5 integrate .. //depot/projects/vimage/src/sys/dev/fe/if_fe_pccard.c#4 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#21 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_usb.c#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndisvar.h#9 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#11 integrate .. //depot/projects/vimage/src/sys/dev/k8temp/k8temp.c#6 delete .. //depot/projects/vimage/src/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/md/md.c#11 integrate .. //depot/projects/vimage/src/sys/dev/mii/ip1000phy.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#13 integrate .. //depot/projects/vimage/src/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccard_cis.c#6 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#10 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#20 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#13 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcib_private.h#8 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#14 integrate .. //depot/projects/vimage/src/sys/dev/pci/vga_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/lpbb.c#6 integrate .. //depot/projects/vimage/src/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ral/if_ral_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#23 integrate .. //depot/projects/vimage/src/sys/dev/sio/sio_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx.c#9 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.h#5 delete .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio_pcm.c#6 delete .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudioreg.h#4 delete .. //depot/projects/vimage/src/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#13 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.h#7 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.h#3 integrate .. //depot/projects/vimage/src/sys/dev/txp/if_txp.c#6 integrate .. //depot/projects/vimage/src/sys/dev/txp/if_txpreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_bus_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_if.m#4 delete .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#44 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbhid.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/vimage/src/sys/dev/xen/balloon/balloon.c#2 integrate .. //depot/projects/vimage/src/sys/dev/xen/blkfront/blkfront.c#7 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/xencons_ring.c#3 integrate .. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#10 integrate .. //depot/projects/vimage/src/sys/dev/xen/xenpci/evtchn.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/xenpci/machine_reboot.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/xenpci/xenpci.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/xenpci/xenpcivar.h#1 branch .. //depot/projects/vimage/src/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#24 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#11 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#11 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#14 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/vimage/src/sys/geom/geom_redboot.c#1 branch .. //depot/projects/vimage/src/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/vimage/src/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#28 integrate .. //depot/projects/vimage/src/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#17 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#17 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#25 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#14 integrate .. //depot/projects/vimage/src/sys/i386/include/npx.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/pcb.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xenpmap.h#4 integrate .. //depot/projects/vimage/src/sys/i386/isa/npx.c#8 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux.h#10 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/vimage/src/sys/i386/xen/mp_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/isa/syscons_isa.c#4 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#18 integrate .. //depot/projects/vimage/src/sys/kern/kern_ktrace.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_lock.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_prot.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#20 integrate .. //depot/projects/vimage/src/sys/kern/kern_tc.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_umtx.c#11 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#30 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#16 integrate .. //depot/projects/vimage/src/sys/kern/subr_param.c#8 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#24 integrate .. //depot/projects/vimage/src/sys/kern/sys_generic.c#13 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#10 integrate .. //depot/projects/vimage/src/sys/kern/sysv_shm.c#6 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sem.c#8 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#23 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#20 integrate .. //depot/projects/vimage/src/sys/kern/vfs_default.c#8 integrate .. //depot/projects/vimage/src/sys/kern/vfs_extattr.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#19 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#20 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#11 integrate .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/legacy/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#41 integrate .. //depot/projects/vimage/src/sys/modules/amdtemp/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/drm/radeon/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/k8temp/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ndis/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/usb/Makefile#6 delete .. //depot/projects/vimage/src/sys/net/bpf.c#33 integrate .. //depot/projects/vimage/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/vimage/src/sys/net/if.c#69 integrate .. //depot/projects/vimage/src/sys/net/if_gif.h#11 integrate .. //depot/projects/vimage/src/sys/net/netisr.h#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/igmp_var.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#28 integrate .. //depot/projects/vimage/src/sys/netinet/in.h#10 integrate .. //depot/projects/vimage/src/sys/netinet/in_gif.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#51 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#27 integrate .. //depot/projects/vimage/src/sys/netinet/in_proto.c#20 integrate .. //depot/projects/vimage/src/sys/netinet/in_var.h#17 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#49 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#32 integrate .. //depot/projects/vimage/src/sys/netinet/ip_var.h#17 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#43 integrate .. //depot/projects/vimage/src/sys/netinet/sctp.h#16 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#28 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#28 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#39 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#20 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#23 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.h#20 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#50 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#52 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#19 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#37 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#30 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#10 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/mpc85xx.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.c#16 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.h#11 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#18 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_audit.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#16 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#12 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet6.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#9 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_net.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_pipe.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#17 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_posix_sem.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_priv.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_process.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_socket.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_syscalls.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_system.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_msg.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_sem.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_shm.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_vfs.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#14 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#17 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#15 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#16 integrate .. //depot/projects/vimage/src/sys/security/mac_portacl/mac_portacl.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#16 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#16 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/sys/_pthreadtypes.h#2 integrate .. //depot/projects/vimage/src/sys/sys/aio.h#3 integrate .. //depot/projects/vimage/src/sys/sys/buf.h#5 integrate .. //depot/projects/vimage/src/sys/sys/diskpc98.h#2 integrate .. //depot/projects/vimage/src/sys/sys/fcntl.h#6 integrate .. //depot/projects/vimage/src/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/vimage/src/sys/sys/ktrace.h#3 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#16 integrate .. //depot/projects/vimage/src/sys/sys/mount.h#19 integrate .. //depot/projects/vimage/src/sys/sys/param.h#44 integrate .. //depot/projects/vimage/src/sys/sys/pipe.h#3 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#28 integrate .. //depot/projects/vimage/src/sys/sys/sem.h#2 integrate .. //depot/projects/vimage/src/sys/sys/shm.h#4 integrate .. //depot/projects/vimage/src/sys/sys/stat.h#4 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#33 integrate .. //depot/projects/vimage/src/sys/sys/syslog.h#2 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#17 integrate .. //depot/projects/vimage/src/sys/sys/termios.h#7 integrate .. //depot/projects/vimage/src/sys/sys/time.h#6 integrate .. //depot/projects/vimage/src/sys/sys/uio.h#2 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#81 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#19 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#14 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#20 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#15 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_init.c#3 integrate .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#12 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#7 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn_dev.c#4 integrate .. //depot/projects/vimage/src/sys/xen/features.c#3 integrate .. //depot/projects/vimage/src/sys/xen/features.h#1 branch .. //depot/projects/vimage/src/sys/xen/gnttab.c#7 integrate .. //depot/projects/vimage/src/sys/xen/gnttab.h#6 integrate .. //depot/projects/vimage/src/sys/xen/hypervisor.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/xen.h#3 integrate .. //depot/projects/vimage/src/sys/xen/interface/hvm/params.h#3 integrate .. //depot/projects/vimage/src/sys/xen/reboot.c#1 branch .. //depot/projects/vimage/src/sys/xen/xen_intr.h#2 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_probe.c#6 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_xs.c#7 integrate .. //depot/projects/vimage/src/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/vimage/src/usr.bin/kdump/kdump.c#2 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.441 2009/01/23 05:53:49 weongyo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.443 2009/03/13 16:42:24 rpaulo Exp $ MAN= aac.4 \ acpi.4 \ @@ -26,6 +26,7 @@ ale.4 \ altq.4 \ amd.4 \ + ${_amdtemp.4} \ ${_amdsmb.4} \ amr.4 \ an.4 \ @@ -129,6 +130,7 @@ if_bridge.4 \ ifmib.4 \ igb.4 \ + igmp.4 \ iic.4 \ iicbb.4 \ iicbus.4 \ @@ -155,7 +157,6 @@ ixgbe.4 \ jme.4 \ joy.4 \ - ${_k8temp.4} \ kbdmux.4 \ keyboard.4 \ kld.4 \ @@ -594,6 +595,7 @@ _acpi_sony.4= acpi_sony.4 _acpi_toshiba.4=acpi_toshiba.4 _amdsmb.4= amdsmb.4 +_amdtemp.4= amdtemp.4 _asmc.4= asmc.4 _coretemp.4= coretemp.4 _cpuctl.4= cpuctl.4 @@ -611,7 +613,6 @@ _io.4= io.4 _linux.4= linux.4 _ndis.4= ndis.4 -_k8temp.4= k8temp.4 _nfe.4= nfe.4 _nfsmb.4= nfsmb.4 _nve.4= nve.4 ==== //depot/projects/vimage/src/share/man/man4/altq.4#4 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/altq.4,v 1.37 2008/11/12 10:31:06 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.38 2009/03/12 01:21:48 yongari Exp $ .\" -.Dd November 12, 2008 +.Dd March 12, 2009 .Dt ALTQ 4 .Os .Sh NAME @@ -152,6 +152,7 @@ .Xr sk 4 , .Xr ste 4 , .Xr stge 4 , +.Xr txp 4 , .Xr udav 4 , .Xr ural 4 , .Xr vge 4 , ==== //depot/projects/vimage/src/share/man/man4/ip.4#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 -.\" $FreeBSD: src/share/man/man4/ip.4,v 1.49 2007/06/12 16:24:55 bms Exp $ +.\" $FreeBSD: src/share/man/man4/ip.4,v 1.51 2009/03/09 17:53:05 bms Exp $ .\" -.Dd April 9, 2007 +.Dd March 9, 2009 .Dt IP 4 .Os .Sh NAME @@ -404,8 +404,9 @@ Multicast datagrams with TTL greater than 1 may be forwarded to other networks if a multicast router is attached to the local network. .Pp -For hosts with multiple interfaces, each multicast transmission is -sent from the primary network interface. +For hosts with multiple interfaces, where an interface has not +been specified for a multicast group membership, +each multicast transmission is sent from the primary network interface. The .Dv IP_MULTICAST_IF option overrides the default for @@ -423,12 +424,25 @@ .Pp To specify an interface by index, an instance of .Vt ip_mreqn -should be passed instead. +may be passed instead. The .Vt imr_ifindex member should be set to the index of the desired interface, or 0 to specify the default interface. The kernel differentiates between these two structures by their size. +.Pp +The use of +.Vt IP_MULTICAST_IF +is +.Em not recommended , +as multicast memberships are scoped to each +individual interface. +It is supported for legacy use only by applications, +such as routing daemons, which expect to +be able to transmit link-local IPv4 multicast datagrams (224.0.0.0/24) +on multiple interfaces, +without requesting an individual membership for each interface. +.Pp .\" An interface's local IP address and multicast capability can be obtained via the @@ -452,13 +466,19 @@ .Pp This option improves performance for applications that may have no more than one -instance on a single host (such as a router daemon), by eliminating +instance on a single host (such as a routing daemon), by eliminating the overhead of receiving their own transmissions. It should generally not be used by applications for which there may be more than one instance on a single host (such as a conferencing program) or for which the sender does not belong to the destination group (such as a time querying program). .Pp +The sysctl setting +.Va net.inet.ip.mcast.loop +controls the default setting of the +.Dv IP_MULTICAST_LOOP +socket option for new sockets. +.Pp A multicast datagram sent with an initial TTL greater than 1 may be delivered to the sending host on a different interface from that on which it was sent, if the host belongs to the destination group on that other interface. @@ -485,24 +505,32 @@ .Ed .Pp .Va imr_interface -should be set to -.Dv INADDR_ANY -to choose the default multicast interface, -or the +should be set to the .Tn IP address of a particular multicast-capable interface if the host is multihomed. -.\" TODO: Remove this piece when the RFC 3678 API is implemented and -.\" the RFC 1724 hack is removed. -Since -.Fx 4.4 , +It may be set to +.Dv INADDR_ANY +to choose the default interface, although this is not recommended; +this is considered to be the first interface corresponding +to the default route. +Otherwise, the first multicast-capable interface +configured in the system will be used. +.Pp +Prior to +.Fx 7.0 , if the .Va imr_interface member is within the network range .Li 0.0.0.0/8 , it is treated as an interface index in the system interface MIB, as per the RIP Version 2 MIB Extension (RFC-1724). -.\" TODO: Update this piece when IPv4 source-address selection is implemented. +In versions of +.Fx +since 7.0, this behavior is no longer supported. +Developers should +instead use the RFC 3678 multicast source filter APIs; in particular, +.Dv MCAST_JOIN_GROUP . .Pp Up to .Dv IP_MAX_MEMBERSHIPS @@ -511,24 +539,130 @@ programs running on multihomed hosts may need to join the same group on more than one interface. .Pp +To drop a membership, use: +.Bd -literal +struct ip_mreq mreq; +setsockopt(s, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)); +.Ed +.Pp +where +.Fa mreq +contains the same values as used to add the membership. +Memberships are dropped when the socket is closed or the process exits. +.\" TODO: Update this piece when IPv4 source-address selection is implemented. +.Pp The IGMP protocol uses the primary IP address of the interface as its identifier for group membership. +This is the first IP address configured on the interface. +If this address is removed or changed, the results are +undefined, as the IGMP membership state will then be inconsistent. If multiple IP aliases are configured on the same interface, they will be ignored. +.Pp This shortcoming was addressed in IPv6; MLDv2 requires that the unique link-local address for an interface is used to identify an MLDv2 listener. +.Ss "Source-Specific Multicast Options" +Since +.Fx 8.0 , +the use of Source-Specific Multicast (SSM) is supported. +These extensions require an IGMPv3 multicast router in order to +make best use of them. +If a legacy multicast router is present on the link, +.Fx +will simply downgrade to the version of IGMP spoken by the router, +and the benefits of source filtering on the upstream link +will not be present, although the kernel will continue to +squelch transmissions from blocked sources. +.Pp +Each group membership on a socket now has a filter mode: +.Bl -tag -width MCAST_EXCLUDE +.It Dv MCAST_EXCLUDE +Datagrams sent to this group are accepted, +unless the source is in a list of blocked source addresses. +.It Dv MCAST_INCLUDE +Datagrams sent to this group are accepted +only if the source is in a list of accepted source addresses. +.El +.Pp +Groups joined using the legacy +.Dv IP_ADD_MEMBERSHIP +option are placed in exclusive-mode, +and are able to request that certain sources are blocked or allowed. +This is known as the +.Em delta-based API . .Pp -To drop a membership, use: +To block a multicast source on an existing group membership: .Bd -literal -struct ip_mreq mreq; -setsockopt(s, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)); +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_BLOCK_SOURCE, &mreqs, sizeof(mreqs)); .Ed .Pp where -.Fa mreq -contains the same values as used to add the membership. -Memberships are dropped when the socket is closed or the process exits. +.Fa mreqs +is the following structure: +.Bd -literal +struct ip_mreq_source { + struct in_addr imr_multiaddr; /* IP multicast address of group */ + struct in_addr imr_sourceaddr; /* IP address of source */ + struct in_addr imr_interface; /* local IP address of interface */ +} +.Ed +.Va imr_sourceaddr +should be set to the address of the source to be blocked. +.Pp +To unblock a multicast source on an existing group: +.Bd -literal +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_UNBLOCK_SOURCE, &mreqs, sizeof(mreqs)); +.Ed +.Pp +The +.Dv IP_BLOCK_SOURCE +and +.Dv IP_UNBLOCK_SOURCE +options are +.Em not permitted +for inclusive-mode group memberships. +.Pp +To join a multicast group in +.Dv MCAST_INCLUDE +mode with a single source, +or add another source to an existing inclusive-mode membership: +.Bd -literal +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_ADD_SOURCE_MEMBERSHIP, &mreqs, sizeof(mreqs)); +.Ed +.Pp +To leave a single source from an existing group in inclusive mode: +.Bd -literal +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP, &mreqs, sizeof(mreqs)); +.Ed +If this is the last accepted source for the group, the membership +will be dropped. +.Pp +The +.Dv IP_ADD_SOURCE_MEMBERSHIP +and +.Dv IP_DROP_SOURCE_MEMBERSHIP +options are +.Em not accepted +for exclusive-mode group memberships. +However, both exclusive and inclusive mode memberships +support the use of the +.Em full-state API +documented in RFC 3678. +For management of source filter lists using this API, +please refer to +.Xr sourcefilter 3 . +.Pp +The sysctl settings +.Va net.inet.ip.mcast.maxsocksrc +and +.Va net.inet.ip.mcast.maxgrpsrc +are used to specify an upper limit on the number of per-socket and per-group +source filter entries which the kernel may allocate. .\"----------------------- .Ss "Raw IP Sockets" .Pp @@ -674,9 +808,19 @@ .Xr send 2 , .Xr byteorder 3 , .Xr icmp 4 , +.Xr igmp 4 , .Xr inet 4 , .Xr intro 4 , -.Xr multicast 4 +.Xr multicast 4 , +.Xr sourcefilter 3 +.Rs +.%A D. Thaler +.%A B. Fenner +.%A B. Quinn +.%T "Socket Interface Extensions for Multicast Source Filters" +.%N RFC 3678 +.%D Jan 2004 +.Re .Sh HISTORY The .Nm ==== //depot/projects/vimage/src/share/man/man4/multicast.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.6 2007/03/18 15:34:57 bms Exp $ +.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.8 2009/03/09 17:53:05 bms Exp $ .\" -.Dd March 18, 2007 +.Dd February 13, 2009 .Dt MULTICAST 4 .Os .\" @@ -954,7 +954,9 @@ .Xr recvmsg 2 , .Xr setsockopt 2 , .Xr socket 2 , +.Xr sourcefilter 3 , .Xr icmp6 4 , +.Xr igmp 4 , .Xr inet 4 , .Xr inet6 4 , .Xr intro 4 , ==== //depot/projects/vimage/src/share/man/man4/txp.4#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/txp.4,v 1.13 2005/11/18 10:52:22 ru Exp $ +.\" $FreeBSD: src/share/man/man4/txp.4,v 1.14 2009/03/12 01:27:15 yongari Exp $ .\" -.Dd July 16, 2005 +.Dd March 12, 2009 .Dt TXP 4 .Os .Sh NAME @@ -134,6 +134,7 @@ 3Com 3cR990B-SRV .El .Sh SEE ALSO +.Xr altq 4 , .Xr arp 4 , .Xr inet 4 , .Xr intro 4 , ==== //depot/projects/vimage/src/share/man/man4/uplcom.4#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.17 2008/06/10 19:33:31 imp Exp $ +.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.18 2009/03/04 03:47:57 thompsa Exp $ .\" .Dd November 22, 2006 .Dt UPLCOM 4 @@ -98,6 +98,8 @@ .It I/O DATA USB-RSAQ3 .It +Mobile Action MA-620 Infrared Adapter +.It PLANEX USB-RS232 URS-03 .It RATOC REX-USB60 ==== //depot/projects/vimage/src/share/man/man5/rc.conf.5#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.356 2009/02/17 11:55:50 mtm Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.357 2009/03/13 07:12:25 brooks Exp $ .\" .Dd January 27, 2009 .Dt RC.CONF 5 @@ -1169,6 +1169,15 @@ .Xr wlan 4 devices must be created for each wireless devices as of .Fx 8.0 . +Debugging flags for +.Xr wlan 4 +devices as set by +.Xr wlandebug 8 +may be specified with an +.Va wlandebug_ Ns Aq Ar interface +variable. +The contents of this variable will be passed directly to +.Xr wlandebug 8 . .Pp If the .Va ifconfig_ Ns Aq Ar interface @@ -4065,6 +4074,7 @@ .Xr sysctl 8 , .Xr syslogd 8 , .Xr timed 8 , +.Xr wlandebug 8 , .Xr yp 8 , .Xr ypbind 8 , .Xr ypserv 8 , ==== //depot/projects/vimage/src/share/man/man7/tuning.7#3 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.79 2009/01/27 00:23:43 trhodes Exp $ +.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.80 2009/03/09 05:41:04 delphij Exp $ .\" .Dd January 23, 2009 .Dt TUNING 7 @@ -51,7 +51,9 @@ and use any remaining space for .Pa /home . .Pp -You should typically size your swap space to approximately 2x main memory. +You should typically size your swap space to approximately 2x main memory +for systems with less than 2GB of RAM, or approximately 1x main memory +if you have more. If you do not have a lot of RAM, though, you will generally want a lot more swap. It is not recommended that you configure any less than ==== //depot/projects/vimage/src/share/man/man8/diskless.8#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man8/diskless.8,v 1.30 2005/12/30 14:43:31 ceri Exp $ +.\" $FreeBSD: src/share/man/man8/diskless.8,v 1.31 2009/03/13 23:42:34 rwatson Exp $ .\" .Dd December 10, 2005 .Dt DISKLESS 8 @@ -376,7 +376,6 @@ .Bd -literal -offset indent : / nfs ro 0 0 :/usr /usr nfs ro 0 0 -proc /proc procfs rw 0 0 .Ed .Pp You also need to create a customized version of ==== //depot/projects/vimage/src/share/man/man9/VOP_VPTOCNP.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_VPTOCNP.9,v 1.1 2008/12/12 01:08:28 marcus Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_VPTOCNP.9,v 1.2 2009/03/08 19:07:44 marcus Exp $ .\" .Dd December 7, 2008 .Os @@ -57,7 +57,13 @@ .Pp The default implementation of .Nm -simply returns ENOENT. +scans through +.Fa vp Ns 's +parent directory looking for a dirent with a matching file number. If +.Fa vp +is not a directory, then +.Nm +returns ENOENT. .Sh LOCKS The vnode should be locked on entry and will still be locked on exit. The parent directory vnode will be unlocked on a successful exit. However, it ==== //depot/projects/vimage/src/sys/amd64/acpica/madt.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.26 2008/03/16 10:58:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.27 2009/03/05 16:03:44 jhb Exp $"); #include #include @@ -483,6 +483,10 @@ apic->Id); if (ioapics[apic->Id].io_apic != NULL) panic("%s: Double APIC ID %u", __func__, apic->Id); + if (apic->GlobalIrqBase >= FIRST_MSI_INT) { + printf("MADT: Ignoring bogus I/O APIC ID %u", apic->Id); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 15 06:49:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B711106566C; Sun, 15 Mar 2009 06:49:37 +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 5B8ED106564A for ; Sun, 15 Mar 2009 06:49:37 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2FEF08FC13 for ; Sun, 15 Mar 2009 06:49:37 +0000 (UTC) (envelope-from julian@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 n2F6nbLB055785 for ; Sun, 15 Mar 2009 06:49:37 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2F6nbu2055783 for perforce@freebsd.org; Sun, 15 Mar 2009 06:49:37 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Mar 2009 06:49:37 GMT Message-Id: <200903150649.n2F6nbu2055783@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 159230 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: Sun, 15 Mar 2009 06:49:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=159230 Change 159230 by julian@julian_trafmon1 on 2009/03/15 06:49:03 bring Makefile back from the dead Affected files ... .. //depot/projects/vimage/src/sys/modules/usb/Makefile#7 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Mar 15 07:02:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C84E1065670; Sun, 15 Mar 2009 07:02:51 +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 1B1A4106564A for ; Sun, 15 Mar 2009 07:02:51 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 076528FC0C for ; Sun, 15 Mar 2009 07:02:51 +0000 (UTC) (envelope-from julian@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 n2F72oI0058370 for ; Sun, 15 Mar 2009 07:02:50 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2F72od6058368 for perforce@freebsd.org; Sun, 15 Mar 2009 07:02:50 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Mar 2009 07:02:50 GMT Message-Id: <200903150702.n2F72od6058368@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 159231 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: Sun, 15 Mar 2009 07:02:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=159231 Change 159231 by julian@julian_trafmon1 on 2009/03/15 07:01:51 Resurect more stuff from the dead Affected files ... .. //depot/projects/vimage/src/sys/dev/usb/README.TXT#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/TODO.TXT#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ubtbcmfw.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_mbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_atmelarm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/image/uscanner.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/usb_rdesc.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_kue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_kuefw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_udav.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uark.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubsa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubser.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uchcom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ucycom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi_reg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ugensa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uipaq.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umoscom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uslcom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvisor.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvscom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/rio500_usb.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_cdce.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_msc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_mtp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ufm_ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_defs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_endian.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_error.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_if.m#5 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_ioctl.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mfunc.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_parse.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_parse.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_pci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_process.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_revision.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_util.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_util.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#45 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbhid.h#5 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumfw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydfw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/usb_wlan.h#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/dev/usb/README.TXT#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/bluetooth/TODO.TXT#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/bluetooth/ubtbcmfw.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ehci_mbus.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ohci.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ohci_atmelarm.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uhci.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/image/uscanner.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/input/uhid.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/input/ums.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/input/usb_rdesc.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/misc/udbp.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/misc/udbp.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/misc/ufm.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_aue.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_auereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_axereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_cdcereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_cue.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_cuereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_kue.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_kuefw.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_kuereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_rue.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_ruereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_udav.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_udavreg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uark.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ubsa.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ubser.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uchcom.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ucycom.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ufoma.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uftdi_reg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ugensa.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uipaq.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/umct.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/umoscom.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uslcom.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uvisor.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uvscom.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/storage/rio500_usb.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/storage/umass.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/storage/urio.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/storage/ustorage_fs.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/template/usb_template.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/template/usb_template.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/template/usb_template_cdce.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/template/usb_template_msc.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/template/usb_template_mtp.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/ufm_ioctl.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb.h#7 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_busdma.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_busdma.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_cdc.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_core.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_core.h#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_debug.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_debug.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_defs.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_dev.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_device.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_device.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_endian.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_error.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_error.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_generic.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_hub.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_ioctl.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_lookup.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_lookup.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_mfunc.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_msctest.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_msctest.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_parse.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_parse.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_pci.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_process.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_process.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_request.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_request.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_revision.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_transfer.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_util.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_util.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usbdevs#45 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumfw.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumreg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumvar.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralreg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralvar.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydfw.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydreg.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/usb_wlan.h#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Mar 15 07:04:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D8E81065672; Sun, 15 Mar 2009 07:04:53 +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 2D7BD106564A for ; Sun, 15 Mar 2009 07:04:53 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01E9D8FC15 for ; Sun, 15 Mar 2009 07:04:53 +0000 (UTC) (envelope-from julian@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 n2F74q82059383 for ; Sun, 15 Mar 2009 07:04:52 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2F74qOX059381 for perforce@freebsd.org; Sun, 15 Mar 2009 07:04:52 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Mar 2009 07:04:52 GMT Message-Id: <200903150704.n2F74qOX059381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 159232 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: Sun, 15 Mar 2009 07:04:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=159232 Change 159232 by julian@julian_trafmon1 on 2009/03/15 07:04:13 Fix more usb shrapnel Affected files ... .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#10 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.h#6 branch .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio_pcm.c#7 branch .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudioreg.h#5 branch Differences ... ==== //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#10 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Mar 15 07:43:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACEE21065674; Sun, 15 Mar 2009 07:43:32 +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 53E2F1065673 for ; Sun, 15 Mar 2009 07:43:32 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4148A8FC19 for ; Sun, 15 Mar 2009 07:43:32 +0000 (UTC) (envelope-from julian@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 n2F7hWSQ062319 for ; Sun, 15 Mar 2009 07:43:32 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2F7hWiP062317 for perforce@freebsd.org; Sun, 15 Mar 2009 07:43:32 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Mar 2009 07:43:32 GMT Message-Id: <200903150743.n2F7hWiP062317@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 159233 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: Sun, 15 Mar 2009 07:43:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=159233 Change 159233 by julian@julian_trafmon1 on 2009/03/15 07:42:35 IFC@159229 Affected files ... .. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#21 integrate .. //depot/projects/vimage/src/sys/kern/subr_lock.c#13 integrate .. //depot/projects/vimage/src/sys/sys/lock_profile.h#9 integrate Differences ... ==== //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#14 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.57 2009/03/14 14:08:53 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.58 2009/03/15 06:40:57 imp Exp $"); /* * PCI:PCI bridge support. @@ -413,12 +413,14 @@ } } else { ok = 1; +#if 0 /* * If we overlap with the subtractive range, then * pick the upper range to use. */ if (start < sc->iolimit && end > sc->iobase) start = sc->iolimit + 1; +#endif } if (end < start) { device_printf(dev, "ioport: end (%lx) < start (%lx)\n", @@ -478,6 +480,7 @@ } } else if (!ok) { ok = 1; /* subtractive bridge: always ok */ +#if 0 if (pcib_is_nonprefetch_open(sc)) { if (start < sc->memlimit && end > sc->membase) start = sc->memlimit + 1; @@ -486,6 +489,7 @@ if (start < sc->pmemlimit && end > sc->pmembase) start = sc->pmemlimit + 1; } +#endif } if (end < start) { device_printf(dev, "memory: end (%lx) < start (%lx)\n", ==== //depot/projects/vimage/src/sys/kern/kern_thread.c#21 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_witness.h" #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.282 2008/11/17 20:49:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.283 2009/03/15 06:41:47 jeff Exp $"); #include #include @@ -306,6 +306,8 @@ void thread_free(struct thread *td) { + + lock_profile_thread_exit(td); if (td->td_cpuset) cpuset_rel(td->td_cpuset); td->td_cpuset = NULL; @@ -439,6 +441,7 @@ /* Wait for any remaining threads to exit cpu_throw(). */ while (p->p_exitthreads) sched_relinquish(curthread); + lock_profile_thread_exit(td); cpuset_rel(td->td_cpuset); td->td_cpuset = NULL; cpu_thread_clean(td); ==== //depot/projects/vimage/src/sys/kern/subr_lock.c#13 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.24 2008/07/27 21:45:20 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.25 2009/03/15 06:41:47 jeff Exp $"); #include "opt_ddb.h" #include "opt_mprof.h" @@ -46,9 +46,11 @@ #include #include #include +#include #include #include #include +#include #include #include @@ -186,7 +188,8 @@ struct lock_prof_cpu *lp_cpu[MAXCPU]; -int lock_prof_enable = 0; +volatile int lock_prof_enable = 0; +static volatile int lock_prof_resetting; /* SWAG: sbuf size = avg stat. line size * number of locks */ #define LPROF_SBUF_SIZE 256 * 400 @@ -239,25 +242,77 @@ } SYSINIT(lockprof, SI_SUB_SMP, SI_ORDER_ANY, lock_prof_init, NULL); +/* + * To be certain that lock profiling has idled on all cpus before we + * reset, we schedule the resetting thread on all active cpus. Since + * all operations happen within critical sections we can be sure that + * it is safe to zero the profiling structures. + */ +static void +lock_prof_idle(void) +{ + struct thread *td; + int cpu; + + td = curthread; + thread_lock(td); + for (cpu = 0; cpu <= mp_maxid; cpu++) { + if (CPU_ABSENT(cpu)) + continue; + sched_bind(td, cpu); + } + sched_unbind(td); + thread_unlock(td); +} + +static void +lock_prof_reset_wait(void) +{ + + /* + * Spin relinquishing our cpu so that lock_prof_idle may + * run on it. + */ + while (lock_prof_resetting) + sched_relinquish(curthread); +} + static void lock_prof_reset(void) { struct lock_prof_cpu *lpc; int enabled, i, cpu; + /* + * We not only race with acquiring and releasing locks but also + * thread exit. To be certain that threads exit without valid head + * pointers they must see resetting set before enabled is cleared. + * Otherwise a lock may not be removed from a per-thread list due + * to disabled being set but not wait for reset() to remove it below. + */ + atomic_store_rel_int(&lock_prof_resetting, 1); enabled = lock_prof_enable; lock_prof_enable = 0; - pause("lpreset", hz / 10); + lock_prof_idle(); + /* + * Some objects may have migrated between CPUs. Clear all links + * before we zero the structures. Some items may still be linked + * into per-thread lists as well. + */ for (cpu = 0; cpu <= mp_maxid; cpu++) { lpc = lp_cpu[cpu]; for (i = 0; i < LPROF_CACHE_SIZE; i++) { LIST_REMOVE(&lpc->lpc_types[0].lpt_objs[i], lpo_link); LIST_REMOVE(&lpc->lpc_types[1].lpt_objs[i], lpo_link); } + } + for (cpu = 0; cpu <= mp_maxid; cpu++) { + lpc = lp_cpu[cpu]; bzero(lpc, sizeof(*lpc)); lock_prof_init_type(&lpc->lpc_types[0]); lock_prof_init_type(&lpc->lpc_types[1]); } + atomic_store_rel_int(&lock_prof_resetting, 0); lock_prof_enable = enabled; } @@ -351,7 +406,7 @@ "max", "wait_max", "total", "wait_total", "count", "avg", "wait_avg", "cnt_hold", "cnt_lock", "name"); enabled = lock_prof_enable; lock_prof_enable = 0; - pause("lpreset", hz / 10); + lock_prof_idle(); t = ticks; for (cpu = 0; cpu <= mp_maxid; cpu++) { if (lp_cpu[cpu] == NULL) @@ -461,16 +516,13 @@ if (l->lpo_obj == lo && l->lpo_file == file && l->lpo_line == line) return (l); - critical_enter(); type = &lp_cpu[PCPU_GET(cpuid)]->lpc_types[spin]; l = LIST_FIRST(&type->lpt_lpoalloc); if (l == NULL) { lock_prof_rejected++; - critical_exit(); return (NULL); } LIST_REMOVE(l, lpo_link); - critical_exit(); l->lpo_obj = lo; l->lpo_file = file; l->lpo_line = line; @@ -497,18 +549,49 @@ spin = (LOCK_CLASS(lo)->lc_flags & LC_SPINLOCK) ? 1 : 0; if (spin && lock_prof_skipspin == 1) return; + critical_enter(); + /* Recheck enabled now that we're in a critical section. */ + if (lock_prof_enable == 0) + goto out; l = lock_profile_object_lookup(lo, spin, file, line); if (l == NULL) - return; + goto out; l->lpo_cnt++; if (++l->lpo_ref > 1) - return; + goto out; l->lpo_contest_locking = contested; l->lpo_acqtime = nanoseconds(); if (waittime && (l->lpo_acqtime > waittime)) l->lpo_waittime = l->lpo_acqtime - waittime; else l->lpo_waittime = 0; +out: + critical_exit(); +} + +void +lock_profile_thread_exit(struct thread *td) +{ +#ifdef INVARIANTS + struct lock_profile_object *l; + + MPASS(curthread->td_critnest == 0); +#endif + /* + * If lock profiling was disabled we have to wait for reset to + * clear our pointers before we can exit safely. + */ + lock_prof_reset_wait(); +#ifdef INVARIANTS + LIST_FOREACH(l, &td->td_lprof[0], lpo_link) + printf("thread still holds lock acquired at %s:%d\n", + l->lpo_file, l->lpo_line); + LIST_FOREACH(l, &td->td_lprof[1], lpo_link) + printf("thread still holds lock acquired at %s:%d\n", + l->lpo_file, l->lpo_line); +#endif + MPASS(LIST_FIRST(&td->td_lprof[0]) == NULL); + MPASS(LIST_FIRST(&td->td_lprof[1]) == NULL); } void @@ -521,11 +604,20 @@ struct lpohead *head; int spin; - if (!lock_prof_enable || (lo->lo_flags & LO_NOPROFILE)) + if (lo->lo_flags & LO_NOPROFILE) return; spin = (LOCK_CLASS(lo)->lc_flags & LC_SPINLOCK) ? 1 : 0; head = &curthread->td_lprof[spin]; + if (LIST_FIRST(head) == NULL) + return; critical_enter(); + /* Recheck enabled now that we're in a critical section. */ + if (lock_prof_enable == 0 && lock_prof_resetting == 1) + goto out; + /* + * If lock profiling is not enabled we still want to remove the + * lpo from our queue. + */ LIST_FOREACH(l, head, lpo_link) if (l->lpo_obj == lo) break; ==== //depot/projects/vimage/src/sys/sys/lock_profile.h#9 (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/sys/lock_profile.h,v 1.18 2007/12/16 06:07:34 kmacy Exp $ + * $FreeBSD: src/sys/sys/lock_profile.h,v 1.19 2009/03/15 06:41:47 jeff Exp $ */ @@ -43,11 +43,13 @@ u_int64_t nanoseconds(void); #endif -extern int lock_prof_enable; +extern volatile int lock_prof_enable; void lock_profile_obtain_lock_success(struct lock_object *lo, int contested, uint64_t waittime, const char *file, int line); void lock_profile_release_lock(struct lock_object *lo); +void lock_profile_thread_exit(struct thread *td); + static inline void lock_profile_obtain_lock_failed(struct lock_object *lo, int *contested, @@ -61,21 +63,10 @@ #else /* !LOCK_PROFILING */ -static inline void -lock_profile_release_lock(struct lock_object *lo) -{ -} - -static inline void -lock_profile_obtain_lock_failed(struct lock_object *lo, int *contested, uint64_t *waittime) -{ -} - -static inline void -lock_profile_obtain_lock_success(struct lock_object *lo, int contested, uint64_t waittime, - const char *file, int line) -{ -} +#define lock_profile_release_lock(lo) +#define lock_profile_obtain_lock_failed(lo, contested, waittime) +#define lock_profile_obtain_lock_success(lo, contested, waittime, file, line) +#define lock_profile_thread_exit(td) #endif /* !LOCK_PROFILING */ From owner-p4-projects@FreeBSD.ORG Sun Mar 15 08:05:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99B81106568D; Sun, 15 Mar 2009 08:05:55 +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 566B410656E2 for ; Sun, 15 Mar 2009 08:05:55 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A7ED8FC19 for ; Sun, 15 Mar 2009 08:05:55 +0000 (UTC) (envelope-from julian@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 n2F85tMx064890 for ; Sun, 15 Mar 2009 08:05:55 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2F85tgV064888 for perforce@freebsd.org; Sun, 15 Mar 2009 08:05:55 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Mar 2009 08:05:55 GMT Message-Id: <200903150805.n2F85tgV064888@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 159234 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: Sun, 15 Mar 2009 08:05:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=159234 Change 159234 by julian@julian_trafmon1 on 2009/03/15 08:05:02 hey presto.. compile! Affected files ... .. //depot/projects/vimage/src/sys/netinet/igmp.c#27 edit .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#20 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#53 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/igmp.c#27 (text+ko) ==== @@ -1132,10 +1132,12 @@ nsrc = ntohs(igmpv3->igmp_numsrc); +#if 0 /* MARKO, what is this? */ SLIST_INIT(&V_router_info_head); +#endif if (!IS_DEFAULT_VNET(curvnet)) - return; + return (retval); /* * Deal with group-specific queries upfront. ==== //depot/projects/vimage/src/sys/netinet/in_mcast.c#20 (text+ko) ==== @@ -209,8 +209,7 @@ return (ifp == NULL); } -static struct ifnet * - ip_multicast_if(struct in_addr *a); +static struct ifnet *ip_multicast_if(const struct in_addr *a); /* * Initialize an in_mfilter structure to a known state at t0, t1 @@ -1834,7 +1833,7 @@ ifp = NULL; if (!in_nullhost(ina)) { - ifp = ip_multicast_if(&mreqs.imr_interface); + ifp = ip_multicast_if(&ina); } else { struct route ro; @@ -2895,10 +2894,11 @@ #endif /* KTR */ RB_GENERATE(ip_msource_tree, ip_msource, ims_link, ip_msource_cmp); +/* * following RFC1724 section 3.3, 0.0.0.0/8 is interpreted as interface index. */ static struct ifnet * -ip_multicast_if(struct in_addr *a) +ip_multicast_if(const struct in_addr *a) { INIT_VNET_NET(curvnet); INIT_VNET_INET(curvnet); ==== //depot/projects/vimage/src/sys/netinet/vinet.h#53 (text+ko) ==== @@ -313,7 +313,7 @@ #define V_reply_src VNET_INET(reply_src) #define V_ripcb VNET_INET(ripcb) #define V_ripcbinfo VNET_INET(ripcbinfo) -#define V_router_info_head VNET_INET(router_info_head) +/* #define V_router_info_head VNET_INET(router_info_head) */ #define V_rsvp_on VNET_INET(rsvp_on) #define V_rtq_minreallyold VNET_INET(rtq_minreallyold) #define V_rtq_reallyold VNET_INET(rtq_reallyold) From owner-p4-projects@FreeBSD.ORG Sun Mar 15 08:24:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8416B106566C; Sun, 15 Mar 2009 08:24:14 +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 298FD1065674 for ; Sun, 15 Mar 2009 08:24:14 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 174DD8FC0C for ; Sun, 15 Mar 2009 08:24:14 +0000 (UTC) (envelope-from julian@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 n2F8ODdd066219 for ; Sun, 15 Mar 2009 08:24:13 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2F8OD4F066217 for perforce@freebsd.org; Sun, 15 Mar 2009 08:24:13 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Mar 2009 08:24:13 GMT Message-Id: <200903150824.n2F8OD4F066217@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 159237 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: Sun, 15 Mar 2009 08:24:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=159237 Change 159237 by julian@julian_trafmon1 on 2009/03/15 08:23:28 pretty please let GENERIC compile? Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_lock.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#15 integrate Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_lock.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.139 2009/03/14 11:43:02 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.140 2009/03/15 08:03:54 jeff Exp $"); #include #include @@ -333,16 +333,17 @@ const char *wmesg, int pri, int timo, const char *file, int line) { GIANT_DECLARE; - uint64_t waittime; struct lock_class *class; const char *iwmesg; uintptr_t tid, v, x; u_int op; - int contested, error, ipri, itimo, queue, wakeup_swapper; + int error, ipri, itimo, queue, wakeup_swapper; +#ifdef LOCK_PROFILING + uint64_t waittime = 0; + int contested = 0; +#endif - contested = 0; error = 0; - waittime = 0; tid = (uintptr_t)curthread; op = (flags & LK_TYPE_MASK); iwmesg = (wmesg == LK_WMESG_DEFAULT) ? lk->lock_object.lo_name : wmesg; ==== //depot/projects/vimage/src/sys/kern/kern_mutex.c#14 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.208 2009/03/14 11:43:38 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.209 2009/03/15 08:03:54 jeff Exp $"); #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" @@ -254,8 +254,11 @@ int _mtx_trylock(struct mtx *m, int opts, const char *file, int line) { - int rval, contested = 0; +#ifdef LOCK_PROFILING uint64_t waittime = 0; + int contested = 0; +#endif + int rval; MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, @@ -296,15 +299,17 @@ int line) { struct turnstile *ts; + uintptr_t v; #ifdef ADAPTIVE_MUTEXES volatile struct thread *owner; #endif #ifdef KTR int cont_logged = 0; #endif +#ifdef LOCK_PROFILING int contested = 0; uint64_t waittime = 0; - uintptr_t v; +#endif if (mtx_owned(m)) { KASSERT((m->lock_object.lo_flags & LO_RECURSABLE) != 0, @@ -448,8 +453,11 @@ _mtx_lock_spin(struct mtx *m, uintptr_t tid, int opts, const char *file, int line) { - int i = 0, contested = 0; + int i = 0; +#ifdef LOCK_PROFILING + int contested = 0; uint64_t waittime = 0; +#endif if (LOCK_LOG_TEST(&m->lock_object, opts)) CTR1(KTR_LOCK, "_mtx_lock_spin: %p spinning", m); @@ -486,11 +494,13 @@ { struct mtx *m; uintptr_t tid; - int i, contested; - uint64_t waittime; + int i; +#ifdef LOCK_PROFILING + int contested = 0; + uint64_t waittime = 0; +#endif - contested = i = 0; - waittime = 0; + i = 0; tid = (uintptr_t)curthread; for (;;) { retry: ==== //depot/projects/vimage/src/sys/kern/kern_rwlock.c#16 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.43 2009/02/26 15:51:54 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.44 2009/03/15 08:03:54 jeff Exp $"); #include "opt_ddb.h" #include "opt_no_adaptive_rwlocks.h" @@ -282,8 +282,10 @@ int spintries = 0; int i; #endif +#ifdef LOCK_PROFILING uint64_t waittime = 0; int contested = 0; +#endif uintptr_t v; KASSERT(rw->rw_lock != RW_DESTROYED, @@ -584,9 +586,11 @@ int spintries = 0; int i; #endif + uintptr_t v, x; +#ifdef LOCK_PROFILING uint64_t waittime = 0; - uintptr_t v, x; int contested = 0; +#endif if (rw_wlocked(rw)) { KASSERT(rw->lock_object.lo_flags & RW_RECURSE, ==== //depot/projects/vimage/src/sys/kern/kern_sx.c#15 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.62 2008/09/10 19:13:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.63 2009/03/15 08:03:54 jeff Exp $"); #include #include @@ -431,9 +431,12 @@ #ifdef ADAPTIVE_SX volatile struct thread *owner; #endif + uintptr_t x; +#ifdef LOCK_PROFILING uint64_t waittime = 0; - uintptr_t x; - int contested = 0, error = 0; + int contested = 0; +#endif + int error = 0; /* If we already hold an exclusive lock, then recurse. */ if (sx_xlocked(sx)) { @@ -652,8 +655,10 @@ #ifdef ADAPTIVE_SX volatile struct thread *owner; #endif +#ifdef LOCK_PROFILING uint64_t waittime = 0; int contested = 0; +#endif uintptr_t x; int error = 0; From owner-p4-projects@FreeBSD.ORG Sun Mar 15 08:38:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DBFC1065674; Sun, 15 Mar 2009 08:38: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 325A71065672 for ; Sun, 15 Mar 2009 08:38: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 BB1648FC13 for ; Sun, 15 Mar 2009 08:38:28 +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 n2F8cSZQ067272 for ; Sun, 15 Mar 2009 08:38:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2F8cSDr067270 for perforce@freebsd.org; Sun, 15 Mar 2009 08:38:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 15 Mar 2009 08:38:28 GMT Message-Id: <200903150838.n2F8cSDr067270@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 159238 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: Sun, 15 Mar 2009 08:38:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=159238 Change 159238 by hselasky@hselasky_laptop001 on 2009/03/15 08:37:29 USB mass storage quirk patches from: Michael Gmelin Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#49 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#3 (text+ko) ==== @@ -609,7 +609,7 @@ }, {USB_VENDOR_MYSON, USB_PRODUCT_MYSON_HEDEN, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, - NO_INQUIRY | IGNORE_RESIDUE + NO_INQUIRY | IGNORE_RESIDUE | NO_SYNCHRONIZE_CACHE }, {USB_VENDOR_MYSON, USB_PRODUCT_MYSON_STARREADER, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, @@ -847,6 +847,10 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS }, + {USB_VENDOR_SUPERTOP, USB_PRODUCT_SUPERTOP_IDE, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + NO_INQUIRY | IGNORE_RESIDUE | NO_SYNCHRONIZE_CACHE + }, {USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE, RID_WILDCARD, UMASS_PROTO_SCSI, NO_QUIRKS ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#49 (text+ko) ==== @@ -593,6 +593,7 @@ vendor RALINK 0x148f Ralink Technology vendor IMAGINATION 0x149a Imagination Technologies vendor CONCEPTRONIC2 0x14b2 Conceptronic +vendor SUPERTOP 0x14cd Super Top vendor PLANEX3 0x14ea Planex Communications vendor SILICONPORTALS 0x1527 Silicon Portals vendor UBIQUAM 0x1529 UBIQUAM Co., Ltd. @@ -2313,6 +2314,9 @@ /* XXX The above is a North American PC style keyboard possibly */ product SUN MOUSE 0x0100 Type 6 USB mouse +/* Super Top products */ +product SUPERTOP IDE 0x6600 USB-IDE + /* Supra products */ product DIAMOND2 SUPRAEXPRESS56K 0x07da Supra Express 56K modem product DIAMOND2 SUPRA2890 0x0b4a SupraMax 2890 56K Modem From owner-p4-projects@FreeBSD.ORG Sun Mar 15 10:20:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 488721065672; Sun, 15 Mar 2009 10:20:12 +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 0829E106566C for ; Sun, 15 Mar 2009 10:20:12 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E9F9B8FC15 for ; Sun, 15 Mar 2009 10:20:11 +0000 (UTC) (envelope-from julian@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 n2FAKBum086613 for ; Sun, 15 Mar 2009 10:20:11 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2FAKB85086611 for perforce@freebsd.org; Sun, 15 Mar 2009 10:20:11 GMT (envelope-from julian@freebsd.org) Date: Sun, 15 Mar 2009 10:20:11 GMT Message-Id: <200903151020.n2FAKB85086611@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 159240 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: Sun, 15 Mar 2009 10:20:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=159240 Change 159240 by julian@julian_trafmon1 on 2009/03/15 10:19:29 Allow VIMAGE to compile Affected files ... .. //depot/projects/vimage/src/sys/netinet/igmp.c#28 edit .. //depot/projects/vimage/src/sys/netinet/in.c#29 edit .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#21 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#82 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/igmp.c#28 (text+ko) ==== @@ -335,6 +335,7 @@ static int sysctl_igmp_default_version(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnet); int error; int new; @@ -374,6 +375,7 @@ static int sysctl_igmp_gsr(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnet); int error; int i; @@ -415,6 +417,7 @@ sysctl_igmp_ifinfo(SYSCTL_HANDLER_ARGS) { INIT_VNET_NET(curvnet); + INIT_VNET_INET(curvnet); int *name; int error; u_int namelen; @@ -500,6 +503,7 @@ static __inline int igmp_isgroupreported(const struct in_addr addr) { + INIT_VNET_INET(curvnet); if (in_allhosts(addr) || ((!V_igmp_sendlocal && IN_LOCAL_GROUP(ntohl(addr.s_addr))))) @@ -562,6 +566,7 @@ static struct igmp_ifinfo * igi_alloc_locked(/*const*/ struct ifnet *ifp) { + INIT_VNET_INET(curvnet); struct igmp_ifinfo *igi; IGMP_LOCK_ASSERT(); @@ -701,6 +706,7 @@ static void igi_delete_locked(const struct ifnet *ifp) { + INIT_VNET_INET(curvnet); struct igmp_ifinfo *igi, *tigi; CTR3(KTR_IGMPV3, "%s: freeing igmp_ifinfo for ifp %p(%s)", @@ -824,6 +830,7 @@ igmp_input_v2_query(struct ifnet *ifp, const struct ip *ip, const struct igmp *igmp) { + INIT_VNET_INET(curvnet); struct ifmultiaddr *ifma; struct igmp_ifinfo *igi; struct in_multi *inm; @@ -915,6 +922,7 @@ static void igmp_v2_update_group(struct in_multi *inm, const int timer) { + INIT_VNET_INET(curvnet); CTR4(KTR_IGMPV3, "%s: %s/%s timer=%d", __func__, inet_ntoa(inm->inm_addr), inm->inm_ifp->if_xname, timer); @@ -962,6 +970,7 @@ igmp_input_v3_query(struct ifnet *ifp, const struct ip *ip, /*const*/ struct igmpv3 *igmpv3) { + INIT_VNET_INET(curvnet); struct igmp_ifinfo *igi; struct in_multi *inm; uint32_t maxresp, nsrc, qqi; @@ -1106,6 +1115,7 @@ igmp_input_v3_group_query(struct in_multi *inm, struct igmp_ifinfo *igi, int timer, /*const*/ struct igmpv3 *igmpv3) { + INIT_VNET_INET(curvnet); int retval; uint16_t nsrc; @@ -1215,6 +1225,7 @@ igmp_input_v1_report(struct ifnet *ifp, /*const*/ struct ip *ip, /*const*/ struct igmp *igmp) { + INIT_VNET_INET(curvnet); struct in_ifaddr *ia; struct in_multi *inm; @@ -1321,6 +1332,7 @@ igmp_input_v2_report(struct ifnet *ifp, /*const*/ struct ip *ip, /*const*/ struct igmp *igmp) { + INIT_VNET_INET(curvnet); struct in_ifaddr *ia; struct in_multi *inm; @@ -1612,7 +1624,6 @@ VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); - INIT_VNET_INET(vnet_iter); igmp_fasttimo_vnet(); CURVNET_RESTORE(); } @@ -1632,6 +1643,7 @@ static void igmp_fasttimo_vnet(void) { + INIT_VNET_INET(curvnet); struct ifqueue scq; /* State-change packets */ struct ifqueue qrq; /* Query response packets */ struct ifnet *ifp; @@ -1758,6 +1770,7 @@ static void igmp_v1v2_process_group_timer(struct in_multi *inm, const int version) { + INIT_VNET_INET(curvnet); int report_timer_expired; IN_MULTI_LOCK_ASSERT(); @@ -1806,6 +1819,7 @@ struct ifqueue *qrq, struct ifqueue *scq, struct in_multi *inm, const int uri_fasthz) { + INIT_VNET_INET(curvnet); int query_response_timer_expired; int state_change_retransmit_timer_expired; @@ -1995,6 +2009,7 @@ static void igmp_v3_cancel_link_timers(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifmultiaddr *ifma; struct ifnet *ifp; struct in_multi *inm; @@ -2071,6 +2086,7 @@ igmp_v1v2_process_querier_timers(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); IGMP_LOCK_ASSERT(); if (igi->igi_v1_timer == 0 && igi->igi_v2_timer == 0) { @@ -2152,7 +2168,6 @@ VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); - INIT_VNET_INET(vnet_iter); igmp_slowtimo_vnet(); CURVNET_RESTORE(); } @@ -2168,6 +2183,7 @@ static void igmp_slowtimo_vnet(void) { + INIT_VNET_INET(curvnet); struct igmp_ifinfo *igi; IGMP_LOCK(); @@ -2195,9 +2211,6 @@ IGMP_LOCK_ASSERT(); ifp = inm->inm_ifp; - /* XXX are these needed ? */ - INIT_VNET_NET(ifp->if_vnet); - INIT_VNET_INET(ifp->if_vnet); MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) @@ -2335,6 +2348,7 @@ static int igmp_initial_join(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; struct ifqueue *ifq; int error, retval, syncstates; @@ -2463,6 +2477,7 @@ static int igmp_handle_state_change(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; int retval; @@ -2522,6 +2537,7 @@ static void igmp_final_leave(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); int syncstates; syncstates = 1; @@ -3303,6 +3319,7 @@ static void igmp_v3_dispatch_general_query(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifmultiaddr *ifma, *tifma; struct ifnet *ifp; struct in_multi *inm; @@ -3388,7 +3405,9 @@ * indexes to guard against interface detach, they are * unique to each VIMAGE and must be retrieved. */ - CURVNET_SET(m->m_pkthdr.header); + CURVNET_SET((struct vnet *)(m->m_pkthdr.header)); + INIT_VNET_INET(curvnet); + INIT_VNET_NET(curvnet); ifindex = igmp_restore_context(m); /* @@ -3471,7 +3490,6 @@ static struct mbuf * igmp_v3_encap_report(struct ifnet *ifp, struct mbuf *m) { - INIT_VNET_NET(curvnet); INIT_VNET_INET(curvnet); struct igmp_report *igmp; struct ip *ip; @@ -3650,14 +3668,28 @@ return (0); } +struct vnet_igmp { + int dummy; +}; +#ifndef VIMAGE +#ifndef VIMAGE_GLOBALS +struct vnet_igmp vnet_igmp_0; +#endif +#endif + +/* XXX VIMAGE [julian] + * BMS seems unsure if this should be a separate module or not as he's + * put the extra fields into vnet_inet instead of a vnet_igmp. + * yet it has module setup functions.. + */ #ifdef VIMAGE static struct vnet_symmap vnet_igmp_symmap[] = { - VNET_SYMMAP(igmp, igi_head), - VNET_SYMMAP(igmp, igmpstat), + VNET_SYMMAP(inet, igi_head), + VNET_SYMMAP(inet, igmpstat), VNET_SYMMAP_END }; VNET_MOD_DECLARE(IGMP, igmp, vnet_igmp_iattach, vnet_igmp_idetach, - vnet_igmp_symmap); + INET, vnet_igmp_symmap); #endif /* VIMAGE */ static int ==== //depot/projects/vimage/src/sys/netinet/in.c#29 (text+ko) ==== @@ -1024,7 +1024,6 @@ static void in_purgemaddrs(struct ifnet *ifp) { - INIT_VNET_INET(ifp->if_vnet); LIST_HEAD(,in_multi) purgeinms; struct in_multi *inm, *tinm; struct ifmultiaddr *ifma; ==== //depot/projects/vimage/src/sys/netinet/in_mcast.c#21 (text+ko) ==== @@ -394,7 +394,6 @@ in_getmulti(struct ifnet *ifp, const struct in_addr *group, struct in_multi **pinm) { - INIT_VNET_INET(ifp->if_vnet); struct sockaddr_in gsin; struct ifmultiaddr *ifma; struct in_ifinfo *ii; @@ -1825,6 +1824,7 @@ inp_lookup_mcast_ifp(const struct inpcb *inp, const struct sockaddr_in *gsin, const struct in_addr ina) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; KASSERT(gsin->sin_family == AF_INET, ("%s: not AF_INET", __func__)); @@ -1870,7 +1870,6 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt) { INIT_VNET_NET(curvnet); - INIT_VNET_INET(curvnet); struct group_source_req gsr; sockunion_t *gsa, *ssa; struct ifnet *ifp; ==== //depot/projects/vimage/src/sys/sys/vimage.h#82 (text+ko) ==== @@ -181,6 +181,7 @@ #define VNET_MOD_IPX 9 #define VNET_MOD_ATALK 10 #define VNET_MOD_ACCF_HTTP 11 +#define VNET_MOD_IGMP 12 /* stateless modules */ #define VNET_MOD_NG_ETHER 20 #define VNET_MOD_NG_IFACE 21 From owner-p4-projects@FreeBSD.ORG Sun Mar 15 10:36:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20D201065672; Sun, 15 Mar 2009 10:36: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 D414B106564A for ; Sun, 15 Mar 2009 10:36:28 +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 B776F8FC21 for ; Sun, 15 Mar 2009 10:36:28 +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 n2FAaSOb088026 for ; Sun, 15 Mar 2009 10:36:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2FAaS9m088024 for perforce@freebsd.org; Sun, 15 Mar 2009 10:36:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 15 Mar 2009 10:36:28 GMT Message-Id: <200903151036.n2FAaS9m088024@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 159241 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: Sun, 15 Mar 2009 10:36:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=159241 Change 159241 by hselasky@hselasky_laptop001 on 2009/03/15 10:35:49 USB ulpt+uscanner fix: - Only send a ZLP before close. Some printers and scanners appear to be choking on force_short_xfer ! - Cleanup usage of dev_ep_index variable. - Make sure that fifo_index does not contain any direction specific bits. Reported by: Alexander Best Affected files ... .. //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#4 (text+ko) ==== @@ -149,7 +149,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .mh.bufsize = USCANNER_BSIZE, - .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,.proxy_buffer = 1,.force_short_xfer = 1,}, + .mh.flags = {.pipe_bof = 1,.proxy_buffer = 1,}, .mh.callback = &uscanner_write_callback, }, @@ -578,6 +578,7 @@ USCANNER_IFQ_MAXLEN)) { return (ENOMEM); } + usb2_fifo_set_close_zlp(fifo, 1); } return (0); } ==== //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#4 (text+ko) ==== @@ -200,7 +200,8 @@ DPRINTF("no FIFO\n"); return; } - DPRINTF("state=0x%x\n", USB_GET_STATE(xfer)); + DPRINTF("state=0x%x actlen=%u\n", + USB_GET_STATE(xfer), xfer->actlen); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -208,7 +209,6 @@ tr_setup: if (usb2_fifo_get_data(f, xfer->frbuffers, 0, xfer->max_data_length, &actlen, 0)) { - xfer->frlengths[0] = actlen; usb2_start_hardware(xfer); } @@ -339,7 +339,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .mh.bufsize = ULPT_BSIZE, - .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,.proxy_buffer = 1}, + .mh.flags = {.pipe_bof = 1,.proxy_buffer = 1}, .mh.callback = &ulpt_write_callback, }, @@ -440,6 +440,7 @@ } /* set which FIFO is opened */ sc->sc_fifo_open[USB_FIFO_TX] = fifo; + usb2_fifo_set_close_zlp(fifo, 1); } sc->sc_fflags |= fflags & (FREAD | FWRITE); return (0); ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#9 (text+ko) ==== @@ -161,7 +161,6 @@ { struct usb2_fifo **ppf; struct usb2_fifo *f; - int dev_ep_index; DPRINTFN(2, "usb2_ref_device, cpd=%p need uref=%d\n", cpd, need_uref); @@ -181,7 +180,6 @@ goto error; } /* check if we are doing an open */ - dev_ep_index = cpd->ep_addr; if (cpd->fflags == 0) { /* set defaults */ cpd->txfifo = NULL; @@ -207,11 +205,6 @@ if (f->fs_ep_max != 0) { cpd->is_usbfs = 1; } - /* - * Get real endpoint index associated with - * this FIFO: - */ - dev_ep_index = f->dev_ep_index; } else { cpd->txfifo = NULL; cpd->is_write = 0; /* no ref */ @@ -231,11 +224,6 @@ if (f->fs_ep_max != 0) { cpd->is_usbfs = 1; } - /* - * Get real endpoint index associated with - * this FIFO: - */ - dev_ep_index = f->dev_ep_index; } else { cpd->rxfifo = NULL; cpd->is_read = 0; /* no ref */ @@ -471,7 +459,7 @@ if (no_null == 0) { if (ep >= (USB_EP_MAX / 2)) { /* we don't create any endpoints in this range */ - DPRINTFN(5, "dev_ep_index out of range\n"); + DPRINTFN(5, "ep out of range\n"); return (is_busy ? EBUSY : EINVAL); } } @@ -681,6 +669,9 @@ goto done; } + /* reset short flag before open */ + f->flag_short = 0; + /* call open method */ err = (f->methods->f_open) (f, fflags); if (err) { @@ -893,18 +884,15 @@ usb2_close(void *arg) { struct usb2_cdev_privdata *cpd = arg; - struct usb2_device *udev; int err; - DPRINTFN(2, "usb2_close, cpd=%p\n", cpd); + DPRINTFN(2, "cpd=%p\n", cpd); err = usb2_ref_device(cpd, 1); if (err) { free(cpd, M_USBDEV); return; } - - udev = cpd->udev; if (cpd->fflags & FREAD) { usb2_fifo_close(cpd->rxfifo, cpd->fflags); } @@ -1618,7 +1606,6 @@ /* initialise FIFO structures */ f_tx->fifo_index = n + USB_FIFO_TX; - f_tx->dev_ep_index = (n / 2) + (USB_EP_MAX / 2); f_tx->priv_mtx = priv_mtx; f_tx->priv_sc0 = priv_sc; f_tx->methods = pm; @@ -1626,7 +1613,6 @@ f_tx->udev = udev; f_rx->fifo_index = n + USB_FIFO_RX; - f_rx->dev_ep_index = (n / 2) + (USB_EP_MAX / 2); f_rx->priv_mtx = priv_mtx; f_rx->priv_sc0 = priv_sc; f_rx->methods = pm; @@ -1681,12 +1667,13 @@ pd->bus_index = device_get_unit(udev->bus->bdev); pd->dev_index = udev->device_index; pd->ep_addr = -1; /* not an endpoint */ - pd->fifo_index = f_tx->fifo_index; + pd->fifo_index = f_tx->fifo_index & f_rx->fifo_index; pd->mode = FREAD|FWRITE; /* Now, create the device itself */ f_sc->dev = make_dev(&usb2_devsw, 0, uid, gid, mode, devname); + /* XXX setting si_drv1 and creating the device is not atomic! */ f_sc->dev->si_drv1 = pd; } @@ -1948,6 +1935,13 @@ break; } if (f->flag_flushing) { + /* check if we should send a short packet */ + if (f->flag_short != 0) { + f->flag_short = 0; + tr_data = 1; + break; + } + /* flushing complete */ f->flag_flushing = 0; usb2_fifo_wakeup(f); } @@ -2006,6 +2000,13 @@ break; } if (f->flag_flushing) { + /* check if we should send a short packet */ + if (f->flag_short != 0) { + f->flag_short = 0; + tr_data = 1; + break; + } + /* flushing complete */ f->flag_flushing = 0; usb2_fifo_wakeup(f); } @@ -2185,3 +2186,13 @@ sx_unlock(&usb2_sym_lock); return (error); } + +void +usb2_fifo_set_close_zlp(struct usb2_fifo *f, uint8_t onoff) +{ + if (f == NULL) + return; + + /* send a Zero Length Packet, ZLP, before close */ + f->flag_short = onoff; +} ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.h#6 (text+ko) ==== @@ -195,5 +195,6 @@ void usb2_free_symlink(struct usb2_symlink *ps); int usb2_read_symlink(uint8_t *user_ptr, uint32_t startentry, uint32_t user_len); +void usb2_fifo_set_close_zlp(struct usb2_fifo *, uint8_t); #endif /* _USB2_DEV_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Mar 15 15:31:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24A9F106577F; Sun, 15 Mar 2009 15:31:30 +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 D39E8106577D for ; Sun, 15 Mar 2009 15:31:29 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C0D8E8FC13 for ; Sun, 15 Mar 2009 15:31:29 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2FFVT2s025789 for ; Sun, 15 Mar 2009 15:31:29 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2FFVT0F025787 for perforce@freebsd.org; Sun, 15 Mar 2009 15:31:29 GMT (envelope-from zec@fer.hr) Date: Sun, 15 Mar 2009 15:31:29 GMT Message-Id: <200903151531.n2FFVT0F025787@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 159248 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: Sun, 15 Mar 2009 15:31:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=159248 Change 159248 by zec@zec_amdx2 on 2009/03/15 15:31:08 First pass at separating per-vnet initializer functions from existing functions for initializing global state. At this stage, the new initializer functions are directly called from the existing code, which should in most cases result in compiler inlining those new functions, hence yielding a near-zero functional change. Existing initializer functions which are invoked via protosw, like ip_init(), are modified to allow them to be invoked multiple times, i.e. per each vnet. Global state, if any, is initialized only if such functions are called within the context of vnet0 -> IS_DEFAULT_VNET(curvnet) check. While here, V_irtualize a few remaining global UMA zones used by net/netinet/netipsec networking code. While it is not yet clear to me or anybody else whether this is the right thing to do, at this stage this makes the code more readable, and makes it easier to track uncollected UMA-zone-backed objects on vnet removal. In the long run, it's quite possible that some form of shared use of UMA zone pools among multiple vnets should be considered. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#36 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#17 edit .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#19 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#29 edit .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#14 edit .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#27 edit .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#17 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#20 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#28 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#15 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#18 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#41 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#19 edit .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#27 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#17 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#19 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#24 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#13 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#24 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#24 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#13 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#13 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#11 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#14 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#29 edit .. //depot/projects/vimage/src/sys/net/route.c#41 edit .. //depot/projects/vimage/src/sys/net/vnet.h#21 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#36 (text+ko) ==== @@ -151,6 +151,8 @@ extern void nd6_setmtu(struct ifnet *); #endif +static int vnet_net_iattach(const void *); + #ifdef VIMAGE_GLOBALS struct ifnethead ifnet; /* depend on static init XXX */ struct ifgrouphead ifg_head; @@ -392,24 +394,33 @@ static void if_init(void *dummy __unused) { - INIT_VNET_NET(curvnet); #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_net_modinfo); #endif + vnet_net_iattach(NULL); + IFNET_LOCK_INIT(); + ifdev_setbyindex(0, make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, + 0600, "network")); + if_clone_init(); +} + +static int +vnet_net_iattach(const void *unused __unused) +{ + INIT_VNET_NET(curvnet); + V_if_index = 0; V_ifindex_table = NULL; V_if_indexlim = 8; - IFNET_LOCK_INIT(); TAILQ_INIT(&V_ifnet); TAILQ_INIT(&V_ifg_head); knlist_init(&V_ifklist, NULL, NULL, NULL, NULL); if_grow(); /* create initial table */ - ifdev_setbyindex(0, make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, - 0600, "network")); - if_clone_init(); + + return (0); } static void ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#17 (text+ko) ==== @@ -121,6 +121,7 @@ static void gif_start(struct ifnet *); static int gif_clone_create(struct if_clone *, int, caddr_t); static void gif_clone_destroy(struct ifnet *); +static int vnet_gif_iattach(const void *); IFC_SIMPLE_DECLARE(gif, 0); @@ -251,6 +252,26 @@ } static int +vnet_gif_iattach(const void *unused __unused) +{ + INIT_VNET_GIF(curvnet); + + LIST_INIT(&V_gif_softc_list); + V_max_gif_nesting = MAX_GIF_NEST; +#ifdef XBONEHACK + V_parallel_tunnels = 1; +#else + V_parallel_tunnels = 0; +#endif + V_ip_gif_ttl = GIF_TTL; +#ifdef INET6 + V_ip6_gif_hlim = GIF_HLIM; +#endif + + return (0); +} + +static int gifmodevent(mod, type, data) module_t mod; int type; @@ -261,19 +282,7 @@ case MOD_LOAD: mtx_init(&gif_mtx, "gif_mtx", NULL, MTX_DEF); - LIST_INIT(&V_gif_softc_list); - V_max_gif_nesting = MAX_GIF_NEST; -#ifdef XBONEHACK - V_parallel_tunnels = 1; -#else - V_parallel_tunnels = 0; -#endif -#ifdef INET - V_ip_gif_ttl = GIF_TTL; -#endif -#ifdef INET6 - V_ip6_gif_hlim = GIF_HLIM; -#endif + vnet_gif_iattach(NULL); if_clone_attach(&gif_cloner); break; @@ -281,7 +290,7 @@ if_clone_detach(&gif_cloner); mtx_destroy(&gif_mtx); #ifdef INET6 - V_ip6_gif_hlim = 0; + V_ip6_gif_hlim = 0; /* XXX -> vnet_gif_idetach() */ #endif break; default: ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#19 (text+ko) ==== @@ -100,6 +100,7 @@ struct sockaddr *dst, struct rtentry *rt); static int lo_clone_create(struct if_clone *, int, caddr_t); static void lo_clone_destroy(struct ifnet *); +static int vnet_loif_iattach(const void *); #ifdef VIMAGE_GLOBALS struct ifnet *loif; /* Used externally */ @@ -146,6 +147,15 @@ return (0); } +static int vnet_loif_iattach(const void *unused __unused) +{ + INIT_VNET_NET(curvnet); + + V_loif = NULL; + if_clone_attach(&lo_cloner); + return (0); +} + static int loop_modevent(module_t mod, int type, void *data) { @@ -153,8 +163,7 @@ switch (type) { case MOD_LOAD: - V_loif = NULL; - if_clone_attach(&lo_cloner); + vnet_loif_iattach(NULL); break; case MOD_UNLOAD: ==== //depot/projects/vimage-commit2/src/sys/net/route.c#29 (text+ko) ==== @@ -106,6 +106,7 @@ static void rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *); +static int vnet_route_iattach(const void *); /* compare two sockaddr structures */ #define sa_equal(a1, a2) (bcmp((a1), (a2), (a1)->sa_len) == 0) @@ -122,7 +123,9 @@ */ #define RNTORT(p) ((struct rtentry *)(p)) +#ifdef VIMAGE_GLOBALS static uma_zone_t rtzone; /* Routing table UMA zone. */ +#endif #if 0 /* default fib for tunnels to use */ @@ -150,20 +153,26 @@ static void route_init(void) { - INIT_VNET_INET(curvnet); - int table; - struct domain *dom; - int fam; /* whack the tunable ints into line. */ if (rt_numfibs > RT_MAXFIBS) rt_numfibs = RT_MAXFIBS; if (rt_numfibs == 0) rt_numfibs = 1; - rtzone = uma_zcreate("rtentry", sizeof(struct rtentry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, 0); rn_init(); /* initialize all zeroes, all ones, mask table */ + vnet_route_iattach(NULL); +} + +static int vnet_route_iattach(const void *unused __unused) +{ + INIT_VNET_INET(curvnet); + int table; + struct domain *dom; + int fam; + + V_rtzone = uma_zcreate("rtentry", sizeof(struct rtentry), NULL, NULL, + NULL, NULL, UMA_ALIGN_PTR, 0); for (dom = domains; dom; dom = dom->dom_next) { if (dom->dom_rtattach) { for (table = 0; table < rt_numfibs; table++) { @@ -186,6 +195,8 @@ } } } + + return (0); } #ifndef _SYS_SYSPROTO_H_ @@ -402,7 +413,7 @@ * and the rtentry itself of course */ RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); return; } done: @@ -958,7 +969,7 @@ if (info->rti_ifa == NULL && (error = rt_getifa_fib(info, fibnum))) senderr(error); ifa = info->rti_ifa; - rt = uma_zalloc(rtzone, M_NOWAIT | M_ZERO); + rt = uma_zalloc(V_rtzone, M_NOWAIT | M_ZERO); if (rt == NULL) senderr(ENOBUFS); RT_LOCK_INIT(rt); @@ -971,7 +982,7 @@ RT_LOCK(rt); if ((error = rt_setgate(rt, dst, gateway)) != 0) { RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); senderr(error); } @@ -1006,7 +1017,7 @@ } Free(rt_key(rt)); RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); senderr(EEXIST); } #endif @@ -1022,7 +1033,7 @@ IFAFREE(rt->rt_ifa); Free(rt_key(rt)); RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); senderr(EEXIST); } ==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#14 (text+ko) ==== @@ -47,6 +47,7 @@ struct rtstat _rtstat; struct radix_node_head *_rt_tables[RT_MAXFIBS][AF_MAX+1]; int _rttrash; + uma_zone_t _rtzone; struct ifnet *_loif; LIST_HEAD(, lo_softc) _lo_list; @@ -86,5 +87,6 @@ #define V_rt_tables VNET_NET(rt_tables) #define V_rtstat VNET_NET(rtstat) #define V_rttrash VNET_NET(rttrash) +#define V_rtzone VNET_NET(rtzone) #endif /* !_NET_VNET_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#27 (text+ko) ==== @@ -110,6 +110,7 @@ "Enable proxy ARP for all suitable requests"); static void arp_init(void); +static int arp_iattach(const void *); void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); static void arpintr(struct mbuf *); @@ -789,8 +790,8 @@ ifa->ifa_rtrequest = NULL; } -static void -arp_init(void) +static int +arp_iattach(const void *unused __unused) { INIT_VNET_INET(curvnet); @@ -799,6 +800,15 @@ V_useloopback = 1; /* use loopback interface for local traffic */ V_arp_proxyall = 0; + return (0); +} + +static void +arp_init(void) +{ + + arp_iattach(NULL); + arpintrq.ifq_maxlen = 50; mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF); netisr_register(NETISR_ARP, arpintr, &arpintrq, 0); ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#17 (text+ko) ==== @@ -126,6 +126,11 @@ INIT_VNET_INET(curvnet); struct ipoption *ra; + SLIST_INIT(&V_router_info_head); + + if (!IS_DEFAULT_VNET(curvnet)) + return; + /* * To avoid byte-swapping the same value over and over again. */ @@ -147,7 +152,6 @@ router_alert->m_len = sizeof(ra->ipopt_dst) + ra->ipopt_list[1]; mtx_init(&igmp_mtx, "igmp_mtx", NULL, MTX_DEF); - SLIST_INIT(&V_router_info_head); } static struct router_info * ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#20 (text+ko) ==== @@ -696,6 +696,7 @@ int _fw_debug; /* actually unused */ int _autoinc_step; ipfw_dyn_rule **_ipfw_dyn_v; + uma_zone_t _ipfw_dyn_rule_zone; struct ip_fw_chain _layer3_chain; u_int32_t _dyn_buckets; u_int32_t _curr_dyn_buckets; @@ -740,6 +741,7 @@ #define V_fw_debug VNET_IPFW(fw_debug) #define V_autoinc_step VNET_IPFW(autoinc_step) #define V_ipfw_dyn_v VNET_IPFW(ipfw_dyn_v) +#define V_ipfw_dyn_rule_zone VNET_IPFW(ipfw_dyn_rule_zone) #define V_layer3_chain VNET_IPFW(layer3_chain) #define V_dyn_buckets VNET_IPFW(dyn_buckets) #define V_curr_dyn_buckets VNET_IPFW(curr_dyn_buckets) ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#28 (text+ko) ==== @@ -242,6 +242,7 @@ V_rsvp_on = 0; V_ip_defttl = IPDEFTTL; V_ip_do_randomid = 0; + V_ip_id = time_second & 0xffff; V_ipforwarding = 0; V_ipstealth = 0; V_nipq = 0; /* Total # of reass queues */ @@ -270,6 +271,20 @@ TAILQ_INIT(&V_in_ifaddrhead); V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &V_in_ifaddrhmask); + + /* Initialize IP reassembly queue. */ + for (i = 0; i < IPREASS_NHASH; i++) + TAILQ_INIT(&V_ipq[i]); + V_maxnipq = nmbclusters / 32; + V_maxfragsperpacket = 16; + V_ipq_zone = uma_zcreate("ipq", sizeof(struct ipq), NULL, NULL, NULL, + NULL, UMA_ALIGN_PTR, 0); + maxnipq_update(); + + /* Skip initialization of globals for non-default instances. */ + if (!IS_DEFAULT_VNET(curvnet)) + return; + pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW); if (pr == NULL) panic("ip_init: PF_INET not found"); @@ -297,16 +312,6 @@ printf("%s: WARNING: unable to register pfil hook, " "error %d\n", __func__, i); - /* Initialize IP reassembly queue. */ - IPQ_LOCK_INIT(); - for (i = 0; i < IPREASS_NHASH; i++) - TAILQ_INIT(&V_ipq[i]); - V_maxnipq = nmbclusters / 32; - V_maxfragsperpacket = 16; - V_ipq_zone = uma_zcreate("ipq", sizeof(struct ipq), NULL, NULL, NULL, - NULL, UMA_ALIGN_PTR, 0); - maxnipq_update(); - /* Start ipport_tick. */ callout_init(&ipport_tick_callout, CALLOUT_MPSAFE); ipport_tick(NULL); @@ -316,7 +321,7 @@ NULL, EVENTHANDLER_PRI_ANY); /* Initialize various other remaining things. */ - V_ip_id = time_second & 0xffff; + IPQ_LOCK_INIT(); ipintrq.ifq_maxlen = ipqmaxlen; mtx_init(&ipintrq.ifq_mtx, "ip_inq", NULL, MTX_DEF); netisr_register(NETISR_IP, ip_input, &ipintrq, 0); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#15 (text+ko) ==== @@ -108,10 +108,12 @@ INIT_VNET_INET(curvnet); V_tcp_reass_maxseg = nmbclusters / 16; - uma_zone_set_max(tcp_reass_zone, V_tcp_reass_maxseg); + uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg); } +#ifdef VIMAGE_GLOBALS uma_zone_t tcp_reass_zone; +#endif void tcp_reass_init(void) @@ -126,9 +128,9 @@ V_tcp_reass_maxseg = nmbclusters / 16; TUNABLE_INT_FETCH("net.inet.tcp.reass.maxsegments", &V_tcp_reass_maxseg); - tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent), + V_tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(tcp_reass_zone, V_tcp_reass_maxseg); + uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg); EVENTHANDLER_REGISTER(nmbclusters_change, tcp_reass_zone_change, NULL, EVENTHANDLER_PRI_ANY); } @@ -180,7 +182,7 @@ * Allocate a new queue entry. If we can't, or hit the zone limit * just drop the pkt. */ - te = uma_zalloc(tcp_reass_zone, M_NOWAIT); + te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT); if (te == NULL) { V_tcpstat.tcps_rcvmemdrop++; m_freem(m); @@ -213,7 +215,7 @@ V_tcpstat.tcps_rcvduppack++; V_tcpstat.tcps_rcvdupbyte += *tlenp; m_freem(m); - uma_zfree(tcp_reass_zone, te); + uma_zfree(V_tcp_reass_zone, te); tp->t_segqlen--; V_tcp_reass_qsize--; /* @@ -250,7 +252,7 @@ nq = LIST_NEXT(q, tqe_q); LIST_REMOVE(q, tqe_q); m_freem(q->tqe_m); - uma_zfree(tcp_reass_zone, q); + uma_zfree(V_tcp_reass_zone, q); tp->t_segqlen--; V_tcp_reass_qsize--; q = nq; @@ -287,7 +289,7 @@ m_freem(q->tqe_m); else sbappendstream_locked(&so->so_rcv, q->tqe_m); - uma_zfree(tcp_reass_zone, q); + uma_zfree(V_tcp_reass_zone, q); tp->t_segqlen--; V_tcp_reass_qsize--; q = nq; ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#18 (text+ko) ==== @@ -123,9 +123,8 @@ #include +#ifdef VIMAGE_GLOBALS extern struct uma_zone *sack_hole_zone; - -#ifdef VIMAGE_GLOBALS int tcp_do_sack; int tcp_sack_maxholes; int tcp_sack_globalmaxholes; @@ -265,7 +264,7 @@ return NULL; } - hole = (struct sackhole *)uma_zalloc(sack_hole_zone, M_NOWAIT); + hole = (struct sackhole *)uma_zalloc(V_sack_hole_zone, M_NOWAIT); if (hole == NULL) return NULL; @@ -287,7 +286,7 @@ { INIT_VNET_INET(tp->t_vnet); - uma_zfree(sack_hole_zone, hole); + uma_zfree(V_sack_hole_zone, hole); tp->snd_numholes--; V_tcp_sack_globalholes--; ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#41 (text+ko) ==== @@ -243,7 +243,9 @@ CTLFLAG_RW, tcp_inflight_stab, 0, "Inflight Algorithm Stabilization 20 = 2 packets"); +#ifdef VIMAGE_GLOBALS uma_zone_t sack_hole_zone; +#endif static struct inpcb *tcp_notify(struct inpcb *, int); static void tcp_isn_tick(void *); @@ -269,7 +271,9 @@ struct tcp_timer tt; }; +#ifdef VIMAGE_GLOBALS static uma_zone_t tcpcb_zone; +#endif MALLOC_DEFINE(M_TCPLOG, "tcplog", "TCP address and flags print buffers"); struct callout isn_callout; static struct mtx isn_mtx; @@ -286,7 +290,7 @@ { uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets); - uma_zone_set_max(tcpcb_zone, maxsockets); + uma_zone_set_max(V_tcpcb_zone, maxsockets); tcp_tw_zone_change(); } @@ -348,18 +352,7 @@ V_tcp_sack_globalmaxholes = 65536; V_tcp_sack_globalholes = 0; - tcp_delacktime = TCPTV_DELACK; - tcp_keepinit = TCPTV_KEEP_INIT; - tcp_keepidle = TCPTV_KEEP_IDLE; - tcp_keepintvl = TCPTV_KEEPINTVL; - tcp_maxpersistidle = TCPTV_KEEP_IDLE; - tcp_msl = TCPTV_MSL; - tcp_rexmit_min = TCPTV_MIN; - if (tcp_rexmit_min < 1) - tcp_rexmit_min = 1; - tcp_rexmit_slop = TCPTV_CPU_VAR; V_tcp_inflight_rttthresh = TCPTV_INFLIGHT_RTTTHRESH; - tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT; TUNABLE_INT_FETCH("net.inet.tcp.sack.enable", &V_tcp_do_sack); @@ -372,7 +365,6 @@ printf("WARNING: TCB hash size not a power of 2\n"); hashsize = 512; /* safe default */ } - tcp_tcbhashsize = hashsize; V_tcbinfo.ipi_hashbase = hashinit(hashsize, M_PCB, &V_tcbinfo.ipi_hashmask); V_tcbinfo.ipi_porthashbase = hashinit(hashsize, M_PCB, @@ -380,6 +372,37 @@ V_tcbinfo.ipi_zone = uma_zcreate("inpcb", sizeof(struct inpcb), NULL, NULL, tcp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets); + /* + * These have to be type stable for the benefit of the timers. + */ + V_tcpcb_zone = uma_zcreate("tcpcb", sizeof(struct tcpcb_mem), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + uma_zone_set_max(V_tcpcb_zone, maxsockets); + tcp_tw_init(); + syncache_init(); + tcp_hc_init(); + tcp_reass_init(); + V_sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + + /* Skip initialization of globals for non-default instances. */ + if (!IS_DEFAULT_VNET(curvnet)) + return; + + /* XXX virtualize those bellow? */ + tcp_delacktime = TCPTV_DELACK; + tcp_keepinit = TCPTV_KEEP_INIT; + tcp_keepidle = TCPTV_KEEP_IDLE; + tcp_keepintvl = TCPTV_KEEPINTVL; + tcp_maxpersistidle = TCPTV_KEEP_IDLE; + tcp_msl = TCPTV_MSL; + tcp_rexmit_min = TCPTV_MIN; + if (tcp_rexmit_min < 1) + tcp_rexmit_min = 1; + tcp_rexmit_slop = TCPTV_CPU_VAR; + tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT; + tcp_tcbhashsize = hashsize; + #ifdef INET6 #define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr)) #else /* INET6 */ @@ -390,23 +413,12 @@ if (max_linkhdr + TCP_MINPROTOHDR > MHLEN) panic("tcp_init"); #undef TCP_MINPROTOHDR - /* - * These have to be type stable for the benefit of the timers. - */ - tcpcb_zone = uma_zcreate("tcpcb", sizeof(struct tcpcb_mem), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(tcpcb_zone, maxsockets); - tcp_tw_init(); - syncache_init(); - tcp_hc_init(); - tcp_reass_init(); + ISN_LOCK_INIT(); callout_init(&isn_callout, CALLOUT_MPSAFE); - tcp_isn_tick(NULL); + callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); EVENTHANDLER_REGISTER(shutdown_pre_sync, tcp_fini, NULL, SHUTDOWN_PRI_DEFAULT); - sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); EVENTHANDLER_REGISTER(maxsockets_change, tcp_zone_change, NULL, EVENTHANDLER_PRI_ANY); } @@ -686,7 +698,7 @@ int isipv6 = (inp->inp_vflag & INP_IPV6) != 0; #endif /* INET6 */ - tm = uma_zalloc(tcpcb_zone, M_NOWAIT | M_ZERO); + tm = uma_zalloc(V_tcpcb_zone, M_NOWAIT | M_ZERO); if (tm == NULL) return (NULL); tp = &tm->tcb; @@ -846,7 +858,7 @@ while ((q = LIST_FIRST(&tp->t_segq)) != NULL) { LIST_REMOVE(q, tqe_q); m_freem(q->tqe_m); - uma_zfree(tcp_reass_zone, q); + uma_zfree(V_tcp_reass_zone, q); tp->t_segqlen--; V_tcp_reass_qsize--; } @@ -856,7 +868,7 @@ tcp_free_sackholes(tp); inp->inp_ppcb = NULL; tp->t_inpcb = NULL; - uma_zfree(tcpcb_zone, tp); + uma_zfree(V_tcpcb_zone, tp); } /* @@ -929,7 +941,7 @@ != NULL) { LIST_REMOVE(te, tqe_q); m_freem(te->tqe_m); - uma_zfree(tcp_reass_zone, te); + uma_zfree(V_tcp_reass_zone, te); tcpb->t_segqlen--; V_tcp_reass_qsize--; } @@ -1546,8 +1558,8 @@ VNET_ITERATOR_DECL(vnet_iter); u_int32_t projected_offset; + VNET_LIST_RLOCK(); ISN_LOCK(); - VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); /* XXX appease INVARIANTS */ INIT_VNET_INET(curvnet); @@ -1560,9 +1572,9 @@ V_isn_offset_old = V_isn_offset; CURVNET_RESTORE(); } + ISN_UNLOCK(); VNET_LIST_RUNLOCK(); callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); - ISN_UNLOCK(); } /* ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#19 (text+ko) ==== @@ -94,7 +94,6 @@ #include -static uma_zone_t tcptw_zone; static int maxtcptw; /* @@ -104,6 +103,7 @@ * tcbinfo lock, which must be held over queue iteration and modification. */ #ifdef VIMAGE_GLOBALS +static uma_zone_t tcptw_zone; static TAILQ_HEAD(, tcptw) twq_2msl; int nolocaltimewait; #endif @@ -142,7 +142,7 @@ if (error == 0 && req->newptr) if (new >= 32) { maxtcptw = new; - uma_zone_set_max(tcptw_zone, maxtcptw); + uma_zone_set_max(V_tcptw_zone, maxtcptw); } return (error); } @@ -160,7 +160,7 @@ { if (maxtcptw == 0) - uma_zone_set_max(tcptw_zone, tcptw_auto_size()); + uma_zone_set_max(V_tcptw_zone, tcptw_auto_size()); } void @@ -168,13 +168,13 @@ { INIT_VNET_INET(curvnet); - tcptw_zone = uma_zcreate("tcptw", sizeof(struct tcptw), + V_tcptw_zone = uma_zcreate("tcptw", sizeof(struct tcptw), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); TUNABLE_INT_FETCH("net.inet.tcp.maxtcptw", &maxtcptw); if (maxtcptw == 0) - uma_zone_set_max(tcptw_zone, tcptw_auto_size()); + uma_zone_set_max(V_tcptw_zone, tcptw_auto_size()); else - uma_zone_set_max(tcptw_zone, maxtcptw); + uma_zone_set_max(V_tcptw_zone, maxtcptw); TAILQ_INIT(&V_twq_2msl); } @@ -204,7 +204,7 @@ return; } - tw = uma_zalloc(tcptw_zone, M_NOWAIT); + tw = uma_zalloc(V_tcptw_zone, M_NOWAIT); if (tw == NULL) { tw = tcp_tw_2msl_scan(1); if (tw == NULL) { @@ -477,7 +477,7 @@ tw->tw_cred = NULL; if (reuse) return; - uma_zfree(tcptw_zone, tw); + uma_zfree(V_tcptw_zone, tw); } int ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#27 (text+ko) ==== @@ -86,6 +86,11 @@ struct tcp_hostcache _tcp_hostcache; struct callout _tcp_hc_callout; + uma_zone_t _tcp_reass_zone; + uma_zone_t _tcpcb_zone; + uma_zone_t _tcptw_zone; + uma_zone_t _sack_hole_zone; + struct tcp_syncache _tcp_syncache; int _tcp_syncookies; int _tcp_syncookiesonly; @@ -287,12 +292,15 @@ #define V_rtq_timeout VNET_INET(rtq_timeout) #define V_rtq_timer VNET_INET(rtq_timer) #define V_rtq_toomany VNET_INET(rtq_toomany) +#define V_sack_hole_zone VNET_INET(sack_hole_zone) #define V_sameprefixcarponly VNET_INET(sameprefixcarponly) #define V_ss_fltsz VNET_INET(ss_fltsz) #define V_ss_fltsz_local VNET_INET(ss_fltsz_local) #define V_subnetsarelocal VNET_INET(subnetsarelocal) #define V_tcb VNET_INET(tcb) #define V_tcbinfo VNET_INET(tcbinfo) +#define V_tcpcb_zone VNET_INET(tcpcb_zone) +#define V_tcptw_zone VNET_INET(tcptw_zone) #define V_tcp_abc_l_var VNET_INET(tcp_abc_l_var) #define V_tcp_autorcvbuf_inc VNET_INET(tcp_autorcvbuf_inc) #define V_tcp_autorcvbuf_max VNET_INET(tcp_autorcvbuf_max) @@ -325,6 +333,7 @@ #define V_tcp_reass_maxseg VNET_INET(tcp_reass_maxseg) #define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) #define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) +#define V_tcp_reass_zone VNET_INET(tcp_reass_zone) #define V_tcp_sack_globalholes VNET_INET(tcp_sack_globalholes) #define V_tcp_sack_globalmaxholes VNET_INET(tcp_sack_globalmaxholes) #define V_tcp_sack_maxholes VNET_INET(tcp_sack_maxholes) ==== //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#17 (text+ko) ==== @@ -109,14 +109,16 @@ { INIT_VNET_INET6(curvnet); + V_ip6q.ip6q_next = V_ip6q.ip6q_prev = &V_ip6q; V_ip6_maxfragpackets = nmbclusters / 4; V_ip6_maxfrags = nmbclusters / 4; + + if (!IS_DEFAULT_VNET(curvnet)) + return; + + IP6Q_LOCK_INIT(); EVENTHANDLER_REGISTER(nmbclusters_change, frag6_change, NULL, EVENTHANDLER_PRI_ANY); - - IP6Q_LOCK_INIT(); - - V_ip6q.ip6q_next = V_ip6q.ip6q_prev = &V_ip6q; } /* ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#19 (text+ko) ==== @@ -920,8 +920,6 @@ void addrsel_policy_init(void) { - ADDRSEL_LOCK_INIT(); - ADDRSEL_SXLOCK_INIT(); INIT_VNET_INET6(curvnet); V_ip6_prefer_tempaddr = 0; @@ -931,6 +929,12 @@ /* initialize the "last resort" policy */ bzero(&V_defaultaddrpolicy, sizeof(V_defaultaddrpolicy)); V_defaultaddrpolicy.label = ADDR_LABEL_NOTAPP; + + if (!IS_DEFAULT_VNET(curvnet)) + return; + + ADDRSEL_LOCK_INIT(); + ADDRSEL_SXLOCK_INIT(); } static struct in6_addrpolicy * ==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#24 (text+ko) ==== @@ -234,6 +234,17 @@ /* 40 1K datagrams */ V_dad_init = 0; + scope6_init(); + addrsel_policy_init(); + nd6_init(); + frag6_init(); + + V_ip6_desync_factor = arc4random() % MAX_TEMP_DESYNC_FACTOR; + + /* Skip global initialization stuff for non-default instances. */ + if (!IS_DEFAULT_VNET(curvnet)) + return; + #ifdef DIAGNOSTIC if (sizeof(struct protosw) != sizeof(struct ip6protosw)) panic("sizeof(protosw) != sizeof(ip6protosw)"); @@ -265,18 +276,13 @@ printf("%s: WARNING: unable to register pfil hook, " "error %d\n", __func__, i); - ip6intrq.ifq_maxlen = V_ip6qmaxlen; + ip6intrq.ifq_maxlen = V_ip6qmaxlen; /* XXX */ mtx_init(&ip6intrq.ifq_mtx, "ip6_inq", NULL, MTX_DEF); netisr_register(NETISR_IPV6, ip6_input, &ip6intrq, 0); - scope6_init(); - addrsel_policy_init(); - nd6_init(); - frag6_init(); - V_ip6_desync_factor = arc4random() % MAX_TEMP_DESYNC_FACTOR; } -static void -ip6_init2(void *dummy) +static int +ip6_init2_vnet(const void *unused __unused) { INIT_VNET_INET6(curvnet); @@ -290,6 +296,15 @@ (V_ip6_temp_preferred_lifetime - V_ip6_desync_factor - V_ip6_temp_regen_advance) * hz, in6_tmpaddrtimer, NULL); + + return (0); +} + +static void +ip6_init2(void *dummy) +{ + + ip6_init2_vnet(NULL); } /* cheat */ ==== //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#13 (text+ko) ==== @@ -83,8 +83,12 @@ #else V_ip6_use_defzone = 0; #endif + bzero(&V_sid_default, sizeof(V_sid_default)); + + if (!IS_DEFAULT_VNET(curvnet)) + return; + SCOPE6_LOCK_INIT(); - bzero(&V_sid_default, sizeof(V_sid_default)); } struct scope6_id * ==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#24 (text+ko) ==== @@ -103,6 +103,8 @@ #endif #endif +static int ipsec_iattach(const void *); + #ifdef VIMAGE_GLOBALS /* NB: name changed so netstat doesn't use it. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 15 17:56:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E8AA106567F; Sun, 15 Mar 2009 17:56:20 +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 47B5E1065678 for ; Sun, 15 Mar 2009 17:56:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3335E8FC20 for ; Sun, 15 Mar 2009 17:56:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2FHuKcR049987 for ; Sun, 15 Mar 2009 17:56:20 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2FHu3Hf049969 for perforce@freebsd.org; Sun, 15 Mar 2009 17:56:03 GMT (envelope-from zec@fer.hr) Date: Sun, 15 Mar 2009 17:56:03 GMT Message-Id: <200903151756.n2FHu3Hf049969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 159253 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: Sun, 15 Mar 2009 17:56:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=159253 Change 159253 by zec@zec_amdx2 on 2009/03/15 17:55:11 IFC @ 159251 Affected files ... .. //depot/projects/vimage-commit/src/sys/Makefile#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/amd64_mem.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/msi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_sigtramp.S#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/apicreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/cpufunc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/cputypes.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/elf.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/legacyvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/md_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pcpu.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/specialreg.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_locore.s#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_feroceon.S#2 delete .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/swtch.S#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pmc.c#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_twireg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/files.at91#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_bus_at91usart.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA.hints#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/BWCT#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/vimage-commit/src/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/vimage-commit/src/sys/arm/conf/CRB#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/EP80219#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/GUMSTIX#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/HL200#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/KB920X#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/NSLU#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/armreg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/elf.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/ieee.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/intr.h#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/proc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/sysarch.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/common.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/files.mv#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/mv_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/obio.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/orion/std.db88f5xxx#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/i81342_mcu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/avila_ata.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/avila_led.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/files.avila#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/if_npereg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_iic.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_intr.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_mem.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_timer.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_wdog.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/std.avila#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxa_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/Makefile#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/Makefile.inc#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/load.c#3 delete .. //depot/projects/vimage-commit/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/module.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/mips/sysdep.c#1 branch .. //depot/projects/vimage-commit/src/sys/boot/ficl/mips/sysdep.h#1 branch .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.4th#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/pnp.4th#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/support.4th#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot2/boot1.S#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/btxldr/btxldr.S#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/gptzfsboot/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/bioscd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/bootinfo64.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/devicename.c#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/Makefile#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/main.c#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/pxeldr/pxeboot.8#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/common/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/efi/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/loader/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/ofw/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/uboot/conf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/devicename.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit.h#4 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_domain.h#1 branch .. //depot/projects/vimage-commit/src/sys/bsm/audit_errno.h#1 branch .. //depot/projects/vimage-commit/src/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_record.h#5 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/vimage-commit/src/sys/cam/cam_periph.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_sim.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_sim.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_all.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_signal.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#7 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/hal_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/pe_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/resource_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/usbd_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#10 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_types.h#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/NOTES#11 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#15 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.amd64#6 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.arm#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#10 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.ia64#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.mips#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.pc98#6 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.sparc64#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.sun4v#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/kern.mk#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/kern.post.mk#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/vimage-commit/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/newvers.sh#6 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#10 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.amd64#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.arm#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.i386#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.ia64#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.mips#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.pc98#4 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#8 integrate .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/COPYRIGHT#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/README#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/ah_desc.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/ah_devid.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/ah_soc.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/alpha-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap30.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap43.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap51.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap61.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/i386-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#4 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/wackelf.c#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/wisoc.inc#2 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/x86_64-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/version.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_if.c#6 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_ioctl.c#8 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_subr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_table.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/rdma/rdma_addr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/rdma/rdma_cma.c#5 integrate .. //depot/projects/vimage-commit/src/sys/crypto/rc4/rc4.c#3 integrate .. //depot/projects/vimage-commit/src/sys/crypto/via/padlock.c#6 integrate .. //depot/projects/vimage-commit/src/sys/crypto/via/padlock_hash.c#3 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_expr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adb.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_bus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adbvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_intel.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aic7xxx/ahd_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ale/if_ale.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-raid-ddf.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-acard.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-acerlabs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-highpoint.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-netcell.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-via.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ah_osdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ah_osdep.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_debug.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_decode.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_desc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_devid.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_internal.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_regdomain.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_soc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/boss.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar2316.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar2317.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar2413.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5112.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bcefw.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/bm/if_bm.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbus_device.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbusvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ce/if_ce.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_bus_ixp4xx.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_core.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_dev.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/bin2h.pl#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_ael1002.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_multiq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_t3fw.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_t3fw.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/dcons/dcons_crom.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/de/if_de.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/digi/con.CX-IBM.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/digi/con.CX.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/digi/con.EPCX.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/digi/con.MBank.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_drv.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_irq.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_lock.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drv.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drv.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_irq.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/drm/mach64_drv.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mach64_drv.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mach64_irq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_dma.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_drv.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_irq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r128_drv.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r128_drv.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r128_irq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_drm.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_drv.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_irq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/savage_drv.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/sis_drv.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/tdfx_drv.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/exca/exca.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fe/if_fe_pccard.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/fwohcireg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/fwphyreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/fxp/if_fxpreg.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_amd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_core.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_intel.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_logging.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/pmc_events.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ichsmb/ichsmb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndisvar.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/ad7418.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/ds1672.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/icee.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/if_ic.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iic.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iic.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iicbb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iicbus.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iicsmb.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ipmi/ipmi_acpi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ipmi/ipmi_smbios.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iscsi/initiator/isc_subr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/jme/if_jme.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/jme/if_jmereg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/jme/if_jmevar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/k8temp/k8temp.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/kbdmux/kbdmux.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/lmc/if_lmc.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/lmc/if_lmc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/malo/if_malo_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mca/mca_bus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/md/md.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfi.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/truephy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mmc/mmcreg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mpt/mpt_user.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/rss_eth_z8e.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/rss_ethp_z8e.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/my/if_my.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/nsp/nsp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ofw/ofw_bus_subr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ofw/ofw_bus_subr.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ofw/ofw_if.m#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ofw/ofw_iicbus.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ofw/ofw_standard.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ofw/ofwvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ofw/openfirm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ofw/openfirm.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ofw/openfirmio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ofw/openpromio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccarddevs#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccardvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pcib_private.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/vga_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pcn/if_pcn.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/immio.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/lpbb.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/lpt.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppb_1284.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppb_base.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppb_msq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppbconf.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppbconf.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/pps.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/vpoio.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc_acpi.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc_isa.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc_puc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppcreg.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppcvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/re/if_re.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/safe/safe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/scc/scc_if.m#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sdhci/sdhci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/si/si.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/sio/sio_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sis/if_sis.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sis/if_sisreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/smbus/smb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/smbus/smbus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/smbus/smbus.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/snp/snp.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/macio/aoa.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sound/macio/aoa.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sound/macio/davbus.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sound/macio/davbusreg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sound/macio/i2s.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sound/macio/snapper.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sound/macio/tumbler.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/au88x0.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/au88x0.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudioreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/speaker/spkr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/stg/tmc18c30.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/streams/streams.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/scterm-dumb.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/syscons/scterm-sc.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/syscons/scterm-teken.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/syscons/scterm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/sctermvar.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/syscons.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/gensequences#1 branch .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/sequences#1 branch .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken_demo.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken_scs.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken_stress.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken_subr.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken_subr_compat.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/syscons/teken/teken_wcwidth.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/tl/if_tl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/tsec/if_tsec.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/tsec/if_tsec.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/tsec/if_tsec_ocp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/tsec/if_tsecreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/txp/3c990img.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/txp/if_txpreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_cpu_mv.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/FILES#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/README.TXT#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/TODO.TXT#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ng_ubt.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ng_ubt_var.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ubtbcmfw.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci_atmelarm.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci_atmelarm.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_ixp4xx.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_mbus.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci_pci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg_atmelarm.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci_atmelarm.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci_pci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci_pci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/usb_controller.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci_atmelarm.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/dsbr100io.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/ehci.c#6 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/ehci_pci.c#5 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/ehcireg.h#5 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/ehcivar.h#6 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/hid.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/hid.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_aue.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_auereg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_axe.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_axereg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_cdce.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_cdcereg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_cue.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_cuereg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_kue.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_kuereg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_rue.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_ruereg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_rum.c#7 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_rumreg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_rumvar.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_udav.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_udavreg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_upgt.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_upgtvar.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_ural.c#5 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_uralreg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_uralvar.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_zyd.c#5 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_zydfw.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/if_zydreg.h#4 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/image/uscanner.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/input/uhid.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ukbd.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ums.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/input/usb_rdesc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/kue_fw.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/misc/udbp.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/misc/udbp.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/misc/ufm.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_aue.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_auereg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_axe.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_axereg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cdce.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cdcereg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cue.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cuereg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_kue.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_kuefw.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_kuereg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_rue.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_ruereg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_udav.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_udavreg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/usb_ethernet.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/net/usb_ethernet.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/ohci.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/ohci_pci.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/ohcireg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/ohcivar.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/quirk/usb_quirk.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/quirk/usb_quirk.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/rio500_usb.h#4 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/rt2573_ucode.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/u3g.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uark.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ubsa.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ubser.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uchcom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ucycom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ufoma.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uftdi.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uftdi_reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ugensa.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uipaq.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ulpt.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umct.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umodem.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umoscom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uplcom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/usb_serial.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/usb_serial.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uslcom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uvisor.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uvscom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/sl811hs.c#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/sl811hsreg.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/sl811hsvar.h#3 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/slhci_pccard.c#4 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/rio500_usb.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/umass.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/urio.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/ustorage_fs.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/template/usb_template.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/template/usb_template.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 15 18:02:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 191601065679; Sun, 15 Mar 2009 18:02:27 +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 CAC0F106566B for ; Sun, 15 Mar 2009 18:02:26 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B805E8FC28 for ; Sun, 15 Mar 2009 18:02:26 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2FI2QiS050413 for ; Sun, 15 Mar 2009 18:02:26 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2FI2QOE050411 for perforce@freebsd.org; Sun, 15 Mar 2009 18:02:26 GMT (envelope-from zec@fer.hr) Date: Sun, 15 Mar 2009 18:02:26 GMT Message-Id: <200903151802.n2FI2QOE050411@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 159254 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: Sun, 15 Mar 2009 18:02:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=159254 Change 159254 by zec@zec_amdx2 on 2009/03/15 18:02:08 Fix misintegrations Affected files ... .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-usb.c#4 edit .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.h#4 edit .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio_pcm.c#4 edit .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudioreg.h#4 edit .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_if.m#4 edit .. //depot/projects/vimage-commit/src/sys/dev/usb/usbhid.h#4 edit .. //depot/projects/vimage-commit/src/sys/modules/usb/Makefile#5 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/dev/ata/ata-usb.c#4 (text) ==== ==== //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.8 2007/03/16 17:19:03 ariff Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.10 2009/02/23 21:19:18 thompsa Exp $ */ /*- * Copyright (c) 2000-2002 Hiroyuki Aizu @@ -25,32 +25,39 @@ * SUCH DAMAGE. */ -#if 0 -#define NO_RECORDING /* XXX: some routines missing from uaudio.c */ -#endif +/* prototypes from "uaudio.c" used by "uaudio_pcm.c" */ + +struct uaudio_chan; +struct uaudio_softc; +struct snd_dbuf; +struct snd_mixer; +struct pcm_channel; -/* Defined in uaudio.c, used in uaudio_pcm,c */ +extern int uaudio_attach_sub(device_t dev, kobj_class_t mixer_class, + kobj_class_t chan_class); +extern int uaudio_detach_sub(device_t dev); +extern void *uaudio_chan_init(struct uaudio_softc *sc, struct snd_dbuf *b, + struct pcm_channel *c, int dir); +extern int uaudio_chan_free(struct uaudio_chan *ch); +extern int uaudio_chan_set_param_blocksize(struct uaudio_chan *ch, + uint32_t blocksize); +extern int uaudio_chan_set_param_fragments(struct uaudio_chan *ch, + uint32_t blocksize, uint32_t blockcount); +extern int uaudio_chan_set_param_speed(struct uaudio_chan *ch, + uint32_t speed); +extern int uaudio_chan_getptr(struct uaudio_chan *ch); +extern struct pcmchan_caps *uaudio_chan_getcaps(struct uaudio_chan *ch); +extern int uaudio_chan_set_param_format(struct uaudio_chan *ch, + uint32_t format); +extern int uaudio_chan_start(struct uaudio_chan *ch); +extern int uaudio_chan_stop(struct uaudio_chan *ch); +extern int uaudio_mixer_init_sub(struct uaudio_softc *sc, + struct snd_mixer *m); +extern int uaudio_mixer_uninit_sub(struct uaudio_softc *sc); +extern void uaudio_mixer_set(struct uaudio_softc *sc, unsigned type, + unsigned left, unsigned right); +extern uint32_t uaudio_mixer_setrecsrc(struct uaudio_softc *sc, uint32_t src); -void uaudio_chan_set_param_pcm_dma_buff(device_t dev, u_char *start, - u_char *end, struct pcm_channel *pc, int dir); -int uaudio_trigger_output(device_t dev); -int uaudio_halt_out_dma(device_t dev); -#ifndef NO_RECORDING -int uaudio_trigger_input(device_t dev); -int uaudio_halt_in_dma(device_t dev); -#endif -void uaudio_chan_set_param(device_t, u_char *, u_char *); -void uaudio_chan_set_param_blocksize(device_t dev, u_int32_t blocksize, int dir); -int uaudio_chan_set_param_speed(device_t dev, u_int32_t speed, int reqdir); -void uaudio_chan_set_param_format(device_t dev, u_int32_t format,int dir); -int uaudio_chan_getptr(device_t dev, int); -void uaudio_mixer_set(device_t dev, unsigned type, unsigned left, - unsigned right); -u_int32_t uaudio_mixer_setrecsrc(device_t dev, u_int32_t src); -u_int32_t uaudio_query_mix_info(device_t dev); -u_int32_t uaudio_query_recsrc_info(device_t dev); -unsigned uaudio_query_formats(device_t dev, int dir, unsigned maxfmt, struct pcmchan_caps *fmt); -void uaudio_sndstat_register(device_t dev); -int uaudio_get_vendor(device_t dev); -int uaudio_get_product(device_t dev); -int uaudio_get_release(device_t dev); +int uaudio_get_vendor(device_t dev); +int uaudio_get_product(device_t dev); +int uaudio_get_release(device_t dev); ==== //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio_pcm.c#4 (text+ko) ==== @@ -1,7 +1,8 @@ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.24 2007/06/17 06:10:43 ariff Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.26 2009/02/23 21:19:18 thompsa Exp $ */ /*- * Copyright (c) 2000-2002 Hiroyuki Aizu + * Copyright (c) 2006 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,241 +30,87 @@ #include #include #include - #include #include "mixer_if.h" -struct ua_info; - -struct ua_chinfo { - struct ua_info *parent; - struct pcm_channel *channel; - struct snd_dbuf *buffer; - u_char *buf; - int dir, hwch; - u_int32_t fmt, spd, blksz; /* XXXXX */ -}; - -struct ua_info { - device_t sc_dev; - u_int32_t bufsz; - struct ua_chinfo pch, rch; -#define FORMAT_NUM 32 - u_int32_t ua_playfmt[FORMAT_NUM*2+1]; /* FORMAT_NUM format * (stereo or mono) + endptr */ - u_int32_t ua_recfmt[FORMAT_NUM*2+1]; /* FORMAT_NUM format * (stereo or mono) + endptr */ - struct pcmchan_caps ua_playcaps; - struct pcmchan_caps ua_reccaps; - int vendor, product, release; -}; - -#define UAUDIO_DEFAULT_BUFSZ 16*1024 - -static const struct { - int vendor; - int product; - int release; - uint32_t dflags; -} ua_quirks[] = { - { 0x1130, 0xf211, 0x0101, SD_F_PSWAPLR }, -}; - /************************************************************/ static void * ua_chan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c, int dir) { - device_t pa_dev; - - struct ua_info *sc = devinfo; - struct ua_chinfo *ch = (dir == PCMDIR_PLAY)? &sc->pch : &sc->rch; - - ch->parent = sc; - ch->channel = c; - ch->buffer = b; - ch->dir = dir; - - pa_dev = device_get_parent(sc->sc_dev); - - ch->buf = malloc(sc->bufsz, M_DEVBUF, M_NOWAIT); - if (ch->buf == NULL) - return NULL; - if (sndbuf_setup(b, ch->buf, sc->bufsz) != 0) { - free(ch->buf, M_DEVBUF); - return NULL; - } - uaudio_chan_set_param_pcm_dma_buff(pa_dev, ch->buf, ch->buf+sc->bufsz, ch->channel, dir); - if (bootverbose) - device_printf(pa_dev, "%s buf %p\n", (dir == PCMDIR_PLAY)? - "play" : "rec", sndbuf_getbuf(ch->buffer)); - - ch->dir = dir; -#ifndef NO_RECORDING - ch->hwch = 1; - if (dir == PCMDIR_PLAY) - ch->hwch = 2; -#else - ch->hwch = 2; -#endif - - return ch; + return (uaudio_chan_init(devinfo, b, c, dir)); } static int ua_chan_free(kobj_t obj, void *data) { - struct ua_chinfo *ua = data; - - if (ua->buf != NULL) - free(ua->buf, M_DEVBUF); - return 0; + return (uaudio_chan_free(data)); } static int -ua_chan_setformat(kobj_t obj, void *data, u_int32_t format) +ua_chan_setformat(kobj_t obj, void *data, uint32_t format) { - device_t pa_dev; - struct ua_info *ua; - - struct ua_chinfo *ch = data; - /* - * At this point, no need to query as we shouldn't select an unsorted format + * At this point, no need to query as we + * shouldn't select an unsorted format */ - ua = ch->parent; - pa_dev = device_get_parent(ua->sc_dev); - uaudio_chan_set_param_format(pa_dev, format, ch->dir); - - ch->fmt = format; - return 0; + return (uaudio_chan_set_param_format(data, format)); } static int -ua_chan_setspeed(kobj_t obj, void *data, u_int32_t speed) +ua_chan_setspeed(kobj_t obj, void *data, uint32_t speed) { - struct ua_chinfo *ch; - device_t pa_dev; - int bestspeed; - - ch = data; - pa_dev = device_get_parent(ch->parent->sc_dev); - - if ((bestspeed = uaudio_chan_set_param_speed(pa_dev, speed, ch->dir))) - ch->spd = bestspeed; - - return ch->spd; + return (uaudio_chan_set_param_speed(data, speed)); } static int -ua_chan_setfragments(kobj_t obj, void *data, u_int32_t blksz, u_int32_t blkcnt) +ua_chan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) { - device_t pa_dev; - struct ua_chinfo *ch = data; - struct ua_info *ua = ch->parent; - - RANGE(blksz, 128, sndbuf_getmaxsize(ch->buffer) / 2); - RANGE(blkcnt, 2, 512); - - while ((blksz * blkcnt) > sndbuf_getmaxsize(ch->buffer)) { - if ((blkcnt >> 1) >= 2) - blkcnt >>= 1; - else if ((blksz >> 1) >= 128) - blksz >>= 1; - else - break; - } - - if ((sndbuf_getblksz(ch->buffer) != blksz || - sndbuf_getblkcnt(ch->buffer) != blkcnt) && - sndbuf_resize(ch->buffer, blkcnt, blksz) != 0) - device_printf(ua->sc_dev, "%s: failed blksz=%u blkcnt=%u\n", - __func__, blksz, blkcnt); - - ch->blksz = sndbuf_getblksz(ch->buffer); - - pa_dev = device_get_parent(ua->sc_dev); - uaudio_chan_set_param_pcm_dma_buff(pa_dev, ch->buf, - ch->buf + sndbuf_getsize(ch->buffer), ch->channel, ch->dir); - uaudio_chan_set_param_blocksize(pa_dev, ch->blksz, ch->dir); - - return 1; + return (uaudio_chan_set_param_blocksize(data, blocksize)); } static int -ua_chan_setblocksize(kobj_t obj, void *data, u_int32_t blksz) +ua_chan_setfragments(kobj_t obj, void *data, uint32_t blocksize, uint32_t blockcount) { - struct ua_chinfo *ch = data; - - ua_chan_setfragments(obj, data, blksz, - sndbuf_getmaxsize(ch->buffer) / blksz); - - return ch->blksz; + return (uaudio_chan_set_param_fragments(data, blocksize, blockcount)); } static int ua_chan_trigger(kobj_t obj, void *data, int go) { - device_t pa_dev; - struct ua_info *ua; - struct ua_chinfo *ch = data; - - if (!PCMTRIG_COMMON(go)) - return 0; - - ua = ch->parent; - pa_dev = device_get_parent(ua->sc_dev); - - /* XXXXX */ - if (ch->dir == PCMDIR_PLAY) { - if (go == PCMTRIG_START) { - uaudio_trigger_output(pa_dev); - } else { - uaudio_halt_out_dma(pa_dev); - } + if (!PCMTRIG_COMMON(go)) { + return (0); + } + if (go == PCMTRIG_START) { + return (uaudio_chan_start(data)); } else { -#ifndef NO_RECORDING - if (go == PCMTRIG_START) - uaudio_trigger_input(pa_dev); - else - uaudio_halt_in_dma(pa_dev); -#endif + return (uaudio_chan_stop(data)); } - - return 0; } static int ua_chan_getptr(kobj_t obj, void *data) { - device_t pa_dev; - struct ua_info *ua; - struct ua_chinfo *ch = data; - - ua = ch->parent; - pa_dev = device_get_parent(ua->sc_dev); - - return uaudio_chan_getptr(pa_dev, ch->dir); + return (uaudio_chan_getptr(data)); } static struct pcmchan_caps * ua_chan_getcaps(kobj_t obj, void *data) { - struct ua_chinfo *ch; - - ch = data; - return (ch->dir == PCMDIR_PLAY) ? &(ch->parent->ua_playcaps) : &(ch->parent->ua_reccaps); + return (uaudio_chan_getcaps(data)); } static kobj_method_t ua_chan_methods[] = { - KOBJMETHOD(channel_init, ua_chan_init), - KOBJMETHOD(channel_free, ua_chan_free), - KOBJMETHOD(channel_setformat, ua_chan_setformat), - KOBJMETHOD(channel_setspeed, ua_chan_setspeed), - KOBJMETHOD(channel_setblocksize, ua_chan_setblocksize), - KOBJMETHOD(channel_setfragments, ua_chan_setfragments), - KOBJMETHOD(channel_trigger, ua_chan_trigger), - KOBJMETHOD(channel_getptr, ua_chan_getptr), - KOBJMETHOD(channel_getcaps, ua_chan_getcaps), - { 0, 0 } + KOBJMETHOD(channel_init, ua_chan_init), + KOBJMETHOD(channel_free, ua_chan_free), + KOBJMETHOD(channel_setformat, ua_chan_setformat), + KOBJMETHOD(channel_setspeed, ua_chan_setspeed), + KOBJMETHOD(channel_setblocksize, ua_chan_setblocksize), + KOBJMETHOD(channel_setfragments, ua_chan_setfragments), + KOBJMETHOD(channel_trigger, ua_chan_trigger), + KOBJMETHOD(channel_getptr, ua_chan_getptr), + KOBJMETHOD(channel_getcaps, ua_chan_getcaps), + {0, 0} }; CHANNEL_DECLARE(ua_chan); @@ -272,62 +119,63 @@ static int ua_mixer_init(struct snd_mixer *m) { - u_int32_t mask; - device_t pa_dev; - struct ua_info *ua = mix_getdevinfo(m); + return (uaudio_mixer_init_sub(mix_getdevinfo(m), m)); +} - pa_dev = device_get_parent(ua->sc_dev); +static int +ua_mixer_set(struct snd_mixer *m, unsigned type, unsigned left, unsigned right) +{ + struct mtx *mtx = mixer_get_lock(m); + uint8_t do_unlock; - mask = uaudio_query_mix_info(pa_dev); - if (!(mask & SOUND_MASK_PCM)) { - /* - * Emulate missing pcm mixer controller - * through FEEDER_VOLUME - */ - pcm_setflags(ua->sc_dev, pcm_getflags(ua->sc_dev) | - SD_F_SOFTPCMVOL); + if (mtx_owned(mtx)) { + do_unlock = 0; + } else { + do_unlock = 1; + mtx_lock(mtx); } - if (!(mask & SOUND_MASK_VOLUME)) { - mix_setparentchild(m, SOUND_MIXER_VOLUME, SOUND_MASK_PCM); - mix_setrealdev(m, SOUND_MIXER_VOLUME, SOUND_MIXER_NONE); + uaudio_mixer_set(mix_getdevinfo(m), type, left, right); + if (do_unlock) { + mtx_unlock(mtx); } - mix_setdevs(m, mask); - - mask = uaudio_query_recsrc_info(pa_dev); - mix_setrecdevs(m, mask); - - return 0; + return (left | (right << 8)); } static int -ua_mixer_set(struct snd_mixer *m, unsigned type, unsigned left, unsigned right) +ua_mixer_setrecsrc(struct snd_mixer *m, uint32_t src) { - device_t pa_dev; - struct ua_info *ua = mix_getdevinfo(m); + struct mtx *mtx = mixer_get_lock(m); + int retval; + uint8_t do_unlock; - pa_dev = device_get_parent(ua->sc_dev); - uaudio_mixer_set(pa_dev, type, left, right); - - return left | (right << 8); + if (mtx_owned(mtx)) { + do_unlock = 0; + } else { + do_unlock = 1; + mtx_lock(mtx); + } + retval = uaudio_mixer_setrecsrc(mix_getdevinfo(m), src); + if (do_unlock) { + mtx_unlock(mtx); + } + return (retval); } static int -ua_mixer_setrecsrc(struct snd_mixer *m, u_int32_t src) +ua_mixer_uninit(struct snd_mixer *m) { - device_t pa_dev; - struct ua_info *ua = mix_getdevinfo(m); - - pa_dev = device_get_parent(ua->sc_dev); - return uaudio_mixer_setrecsrc(pa_dev, src); + return (uaudio_mixer_uninit_sub(mix_getdevinfo(m))); } static kobj_method_t ua_mixer_methods[] = { - KOBJMETHOD(mixer_init, ua_mixer_init), - KOBJMETHOD(mixer_set, ua_mixer_set), - KOBJMETHOD(mixer_setrecsrc, ua_mixer_setrecsrc), + KOBJMETHOD(mixer_init, ua_mixer_init), + KOBJMETHOD(mixer_uninit, ua_mixer_uninit), + KOBJMETHOD(mixer_set, ua_mixer_set), + KOBJMETHOD(mixer_setrecsrc, ua_mixer_setrecsrc), - { 0, 0 } + {0, 0} }; + MIXER_DECLARE(ua_mixer); /************************************************************/ @@ -335,137 +183,42 @@ static int ua_probe(device_t dev) { - char *s; struct sndcard_func *func; - /* The parent device has already been probed. */ + /* the parent device has already been probed */ func = device_get_ivars(dev); - if (func == NULL || func->func != SCF_PCM) + + if ((func == NULL) || + (func->func != SCF_PCM)) { return (ENXIO); + } + device_set_desc(dev, "USB audio"); - s = "USB Audio"; - - device_set_desc(dev, s); - return BUS_PROBE_DEFAULT; + return (BUS_PROBE_DEFAULT); } static int ua_attach(device_t dev) { - struct ua_info *ua; - struct sndcard_func *func; - char status[SND_STATUSLEN]; - device_t pa_dev; - u_int32_t nplay, nrec, flags; - int i; - - ua = malloc(sizeof(*ua), M_DEVBUF, M_WAITOK | M_ZERO); - ua->sc_dev = dev; - - /* Mark for existence */ - func = device_get_ivars(dev); - if (func != NULL) - func->varinfo = (void *)ua; - - pa_dev = device_get_parent(dev); - ua->vendor = uaudio_get_vendor(pa_dev); - ua->product = uaudio_get_product(pa_dev); - ua->release = uaudio_get_release(pa_dev); - - if (bootverbose) - device_printf(dev, - "USB Audio: " - "vendor=0x%04x, product=0x%04x, release=0x%04x\n", - ua->vendor, ua->product, ua->release); - - ua->bufsz = pcm_getbuffersize(dev, 4096, UAUDIO_DEFAULT_BUFSZ, 65536); - if (bootverbose) - device_printf(dev, "using a default buffer size of %jd\n", (intmax_t)ua->bufsz); - - if (mixer_init(dev, &ua_mixer_class, ua)) { - goto bad; - } - - snprintf(status, SND_STATUSLEN, "at ? %s", PCM_KLDSTRING(snd_uaudio)); - - ua->ua_playcaps.fmtlist = ua->ua_playfmt; - ua->ua_reccaps.fmtlist = ua->ua_recfmt; - nplay = uaudio_query_formats(pa_dev, PCMDIR_PLAY, FORMAT_NUM * 2, &ua->ua_playcaps); - nrec = uaudio_query_formats(pa_dev, PCMDIR_REC, FORMAT_NUM * 2, &ua->ua_reccaps); - - if (nplay > 1) - nplay = 1; - if (nrec > 1) - nrec = 1; - - flags = pcm_getflags(dev); - for (i = 0; i < (sizeof(ua_quirks) / sizeof(ua_quirks[0])); i++) { - if (ua->vendor == ua_quirks[i].vendor && - ua->product == ua_quirks[i].product && - ua->release == ua_quirks[i].release) - flags |= ua_quirks[i].dflags; - } - pcm_setflags(dev, flags); - -#ifndef NO_RECORDING - if (pcm_register(dev, ua, nplay, nrec)) { -#else - if (pcm_register(dev, ua, nplay, 0)) { -#endif - goto bad; - } - - sndstat_unregister(dev); - uaudio_sndstat_register(dev); - - for (i = 0; i < nplay; i++) { - pcm_addchan(dev, PCMDIR_PLAY, &ua_chan_class, ua); - } -#ifndef NO_RECORDING - for (i = 0; i < nrec; i++) { - pcm_addchan(dev, PCMDIR_REC, &ua_chan_class, ua); - } -#endif - pcm_setstatus(dev, status); - - return 0; - -bad: free(ua, M_DEVBUF); - return ENXIO; + return (uaudio_attach_sub(dev, &ua_mixer_class, &ua_chan_class)); } static int ua_detach(device_t dev) { - struct ua_info *sc; - struct sndcard_func *func; - int r; - - r = pcm_unregister(dev); - if (r) - return r; - - sc = pcm_getdevinfo(dev); - free(sc, M_DEVBUF); - - /* Mark for deletion */ - func = device_get_ivars(dev); - if (func != NULL) - func->varinfo = NULL; - - return 0; + return (uaudio_detach_sub(dev)); } /************************************************************/ static device_method_t ua_pcm_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, ua_probe), - DEVMETHOD(device_attach, ua_attach), - DEVMETHOD(device_detach, ua_detach), + DEVMETHOD(device_probe, ua_probe), + DEVMETHOD(device_attach, ua_attach), + DEVMETHOD(device_detach, ua_detach), - { 0, 0 } + {0, 0} }; static driver_t ua_pcm_driver = { @@ -474,7 +227,6 @@ PCM_SOFTC_SIZE, }; - DRIVER_MODULE(ua_pcm, uaudio, ua_pcm_driver, pcm_devclass, 0, 0); MODULE_DEPEND(ua_pcm, uaudio, 1, 1, 1); MODULE_DEPEND(ua_pcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); ==== //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudioreg.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudioreg.h,v 1.12 2004/11/05 19:08:29 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudioreg.h,v 1.4 2005/01/06 01:43:22 imp Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudioreg.h,v 1.6 2009/02/23 21:19:18 thompsa Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -38,30 +38,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define UAUDIO_VERSION 0x100 +#define UAUDIO_VERSION 0x100 -#define UDESC_CS_CONFIG 0x22 -#define UDESC_CS_STRING 0x23 -#define UDESC_CS_INTERFACE 0x24 -#define UDESC_CS_ENDPOINT 0x25 +#define UDESC_CS_CONFIG 0x22 +#define UDESC_CS_STRING 0x23 +#define UDESC_CS_INTERFACE 0x24 +#define UDESC_CS_ENDPOINT 0x25 -#define UDESCSUB_AC_HEADER 1 -#define UDESCSUB_AC_INPUT 2 -#define UDESCSUB_AC_OUTPUT 3 -#define UDESCSUB_AC_MIXER 4 -#define UDESCSUB_AC_SELECTOR 5 -#define UDESCSUB_AC_FEATURE 6 -#define UDESCSUB_AC_PROCESSING 7 -#define UDESCSUB_AC_EXTENSION 8 +#define UDESCSUB_AC_HEADER 1 +#define UDESCSUB_AC_INPUT 2 +#define UDESCSUB_AC_OUTPUT 3 +#define UDESCSUB_AC_MIXER 4 +#define UDESCSUB_AC_SELECTOR 5 +#define UDESCSUB_AC_FEATURE 6 +#define UDESCSUB_AC_PROCESSING 7 +#define UDESCSUB_AC_EXTENSION 8 -/* The first fields are identical to usb_endpoint_descriptor_t */ +/* The first fields are identical to struct usb2_endpoint_descriptor */ typedef struct { - uByte bLength; - uByte bDescriptorType; - uByte bEndpointAddress; - uByte bmAttributes; - uWord wMaxPacketSize; - uByte bInterval; + uByte bLength; + uByte bDescriptorType; + uByte bEndpointAddress; + uByte bmAttributes; + uWord wMaxPacketSize; + uByte bInterval; /* * The following two entries are only used by the Audio Class. * And according to the specs the Audio Class is the only one @@ -69,60 +69,62 @@ * Who knows what goes on in the minds of the people in the USB * standardization? :-( */ - uByte bRefresh; - uByte bSynchAddress; -} UPACKED usb_endpoint_descriptor_audio_t; + uByte bRefresh; + uByte bSynchAddress; +} __packed usb2_endpoint_descriptor_audio_t; -struct usb_audio_control_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uWord bcdADC; - uWord wTotalLength; - uByte bInCollection; - uByte baInterfaceNr[1]; -} UPACKED; +struct usb2_audio_control_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uWord bcdADC; + uWord wTotalLength; + uByte bInCollection; + uByte baInterfaceNr[1]; +} __packed; -struct usb_audio_streaming_interface_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalLink; - uByte bDelay; - uWord wFormatTag; -} UPACKED; +struct usb2_audio_streaming_interface_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalLink; + uByte bDelay; + uWord wFormatTag; +} __packed; -struct usb_audio_streaming_endpoint_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bmAttributes; -#define UA_SED_FREQ_CONTROL 0x01 -#define UA_SED_PITCH_CONTROL 0x02 -#define UA_SED_MAXPACKETSONLY 0x80 - uByte bLockDelayUnits; - uWord wLockDelay; -} UPACKED; +struct usb2_audio_streaming_endpoint_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bmAttributes; +#define UA_SED_FREQ_CONTROL 0x01 +#define UA_SED_PITCH_CONTROL 0x02 +#define UA_SED_MAXPACKETSONLY 0x80 + uByte bLockDelayUnits; + uWord wLockDelay; +} __packed; -struct usb_audio_streaming_type1_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bFormatType; - uByte bNrChannels; - uByte bSubFrameSize; - uByte bBitResolution; - uByte bSamFreqType; -#define UA_SAMP_CONTNUOUS 0 - uByte tSamFreq[3*2]; /* room for low and high */ -#define UA_GETSAMP(p, n) ((p)->tSamFreq[(n)*3+0] | ((p)->tSamFreq[(n)*3+1] << 8) | ((p)->tSamFreq[(n)*3+2] << 16)) -#define UA_SAMP_LO(p) UA_GETSAMP(p, 0) -#define UA_SAMP_HI(p) UA_GETSAMP(p, 1) -} UPACKED; +struct usb2_audio_streaming_type1_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bFormatType; + uByte bNrChannels; + uByte bSubFrameSize; + uByte bBitResolution; + uByte bSamFreqType; +#define UA_SAMP_CONTNUOUS 0 + uByte tSamFreq[0]; +#define UA_GETSAMP(p, n) (((p)->tSamFreq[((n)*3)+0]) | \ + ((p)->tSamFreq[((n)*3)+1] << 8) | \ + ((p)->tSamFreq[((n)*3)+2] << 16)) +#define UA_SAMP_LO(p) UA_GETSAMP(p, 0) +#define UA_SAMP_HI(p) UA_GETSAMP(p, 1) +} __packed; -struct usb_audio_cluster { - uByte bNrChannels; - uWord wChannelConfig; +struct usb2_audio_cluster { + uByte bNrChannels; + uWord wChannelConfig; #define UA_CHANNEL_LEFT 0x0001 #define UA_CHANNEL_RIGHT 0x0002 #define UA_CHANNEL_CENTER 0x0004 @@ -135,270 +137,270 @@ #define UA_CHANNEL_L_SIDE 0x0200 #define UA_CHANNEL_R_SIDE 0x0400 #define UA_CHANNEL_TOP 0x0800 - uByte iChannelNames; -} UPACKED; + uByte iChannelNames; +} __packed; /* Shared by all units and terminals */ -struct usb_audio_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; +struct usb2_audio_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; }; /* UDESCSUB_AC_INPUT */ -struct usb_audio_input_terminal { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalId; - uWord wTerminalType; - uByte bAssocTerminal; - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte iTerminal; -} UPACKED; +struct usb2_audio_input_terminal { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalId; + uWord wTerminalType; + uByte bAssocTerminal; + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; +/* uByte iTerminal; */ +} __packed; /* UDESCSUB_AC_OUTPUT */ -struct usb_audio_output_terminal { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalId; - uWord wTerminalType; - uByte bAssocTerminal; - uByte bSourceId; - uByte iTerminal; -} UPACKED; +struct usb2_audio_output_terminal { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalId; + uWord wTerminalType; + uByte bAssocTerminal; + uByte bSourceId; + uByte iTerminal; +} __packed; /* UDESCSUB_AC_MIXER */ -struct usb_audio_mixer_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ - /* struct usb_audio_mixer_unit_1 */ -} UPACKED; -struct usb_audio_mixer_unit_1 { - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte bmControls[255]; /* [bNrChannels] */ - /*uByte iMixer;*/ -} UPACKED; +struct usb2_audio_mixer_unit_0 { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ + /* struct usb2_audio_mixer_unit_1 */ +} __packed; +struct usb2_audio_mixer_unit_1 { + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; + uByte bmControls[0]; /* [see source code] */ + /* uByte iMixer; */ +} __packed; /* UDESCSUB_AC_SELECTOR */ -struct usb_audio_selector_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ +struct usb2_audio_selector_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ /* uByte iSelector; */ -} UPACKED; +} __packed; /* UDESCSUB_AC_FEATURE */ -struct usb_audio_feature_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bSourceId; - uByte bControlSize; - uByte bmaControls[255]; /* size for more than enough */ +struct usb2_audio_feature_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bSourceId; + uByte bControlSize; + uByte bmaControls[0]; /* [bControlSize * x] */ /* uByte iFeature; */ -} UPACKED; +} __packed; /* UDESCSUB_AC_PROCESSING */ -struct usb_audio_processing_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uWord wProcessType; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ - /* struct usb_audio_processing_unit_1 */ -} UPACKED; -struct usb_audio_processing_unit_1{ - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte bControlSize; - uByte bmControls[255]; /* [bControlSize] */ -#define UA_PROC_ENABLE_MASK 1 -} UPACKED; +struct usb2_audio_processing_unit_0 { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uWord wProcessType; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ + /* struct usb2_audio_processing_unit_1 */ +} __packed; +struct usb2_audio_processing_unit_1 { + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; + uByte bControlSize; + uByte bmControls[0]; /* [bControlSize] */ +#define UA_PROC_ENABLE_MASK 1 +} __packed; -struct usb_audio_processing_unit_updown { - uByte iProcessing; - uByte bNrModes; - uWord waModes[255]; /* [bNrModes] */ -} UPACKED; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 15 18:10:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1AFD1065673; Sun, 15 Mar 2009 18:10:45 +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 9FFBE1065672 for ; Sun, 15 Mar 2009 18:10:45 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C95D8FC26 for ; Sun, 15 Mar 2009 18:10:45 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2FIAhmx051952 for ; Sun, 15 Mar 2009 18:10:43 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2FIAZcD051943 for perforce@freebsd.org; Sun, 15 Mar 2009 18:10:35 GMT (envelope-from zec@fer.hr) Date: Sun, 15 Mar 2009 18:10:35 GMT Message-Id: <200903151810.n2FIAZcD051943@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 159255 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: Sun, 15 Mar 2009 18:10:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=159255 Change 159255 by zec@zec_tpx32 on 2009/03/15 18:10:18 IFC @ 159251 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/devicename.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/loader/Makefile#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/resource_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/usbd_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sysvec.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#17 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#24 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#9 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#14 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.pc98#10 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#21 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.amd64#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.arm#5 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_expr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ahci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-sis.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcefw.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_core.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_dev.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_ael1002.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_t3_hw.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_multiq.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_bufs.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_drv.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_drv.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_irq.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/savage_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/tdfx_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/exca/exca.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fe/if_fe_pccard.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/k8temp/k8temp.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/md/md.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmc.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccard_cis.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcireg.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/vga_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/lpbb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm-teken.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/txp/if_txpreg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/balloon/balloon.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkfront/blkfront.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/xencons_ring.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/netfront/netfront.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/xenpci/evtchn.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/xenpci/machine_reboot.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/xenpci/xenpci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/xenpci/xenpcivar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_redboot.c#1 branch .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_pc98.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#14 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/trap.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/npx.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pcb.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xenpmap.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/isa/npx.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/mp_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_conf.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_lock.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_thread.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sched_ule.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_bus.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_lock.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_param.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sys_generic.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_extattr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vnode_if.src#6 integrate .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#16 integrate .. //depot/projects/vimage-commit2/src/sys/modules/amdtemp/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/drm/radeon/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/k8temp/Makefile#2 delete .. //depot/projects/vimage-commit2/src/sys/modules/ndis/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/net/netisr.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan_sta.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#34 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_var.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#42 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netnatm/natm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/spr.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/mpc85xx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_audit.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet6.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_internal.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_net.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_policy.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_priv.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_process.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_syscalls.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/_pthreadtypes.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/aio.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/buf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/diskpc98.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/fcntl.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ktrace.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/lock_profile.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mbuf.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mount.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#28 integrate .. //depot/projects/vimage-commit2/src/sys/sys/pipe.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/proc.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sem.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/shm.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/stat.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#16 integrate .. //depot/projects/vimage-commit2/src/sys/sys/syslog.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/systm.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/sys/termios.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/time.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/uio.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#30 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_snapshot.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/inode.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_init.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vnode_pager.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn_dev.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/xen/features.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/features.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/gnttab.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/xen/gnttab.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/xen/hypervisor.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86/xen.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/params.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/reboot.c#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/xen_intr.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_probe.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_xs.c#8 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.26 2008/03/16 10:58:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.27 2009/03/05 16:03:44 jhb Exp $"); #include #include @@ -483,6 +483,10 @@ apic->Id); if (ioapics[apic->Id].io_apic != NULL) panic("%s: Double APIC ID %u", __func__, apic->Id); + if (apic->GlobalIrqBase >= FIRST_MSI_INT) { + printf("MADT: Ignoring bogus I/O APIC ID %u", apic->Id); + break; + } ioapics[apic->Id].io_apic = ioapic_create(apic->Address, apic->Id, apic->GlobalIrqBase); ioapics[apic->Id].io_vector = apic->GlobalIrqBase; ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.28 2008/11/22 12:36:15 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.29 2009/03/13 16:40:51 dchagin Exp $"); #include #include @@ -84,7 +84,8 @@ .interp_path = "/libexec/ld-elf.so.1", .sysvec = &elf64_freebsd_sysvec, .interp_newpath = NULL, - .flags = BI_CAN_EXEC_DYN, + .brand_note = &elf64_freebsd_brandnote, + .flags = BI_CAN_EXEC_DYN }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -99,7 +100,8 @@ .interp_path = "/usr/libexec/ld-elf.so.1", .sysvec = &elf64_freebsd_sysvec, .interp_newpath = NULL, - .flags = BI_CAN_EXEC_DYN, + .brand_note = &elf64_freebsd_brandnote, + .flags = BI_CAN_EXEC_DYN }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.161 2009/02/23 15:39:24 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.163 2009/03/05 19:42:11 jhb Exp $"); #include #include @@ -102,10 +102,11 @@ NULL, 1, "Floating point instructions executed in hardware"); static struct savefpu fpu_cleanstate; -static bool_t fpu_cleanstate_ready; /* - * Initialize floating point unit. + * Initialize the floating point unit. On the boot CPU we generate a + * clean state that is used to initialize the floating point unit when + * it is first used by a process. */ void fpuinit(void) @@ -115,22 +116,22 @@ u_short control; savecrit = intr_disable(); - PCPU_SET(fpcurthread, 0); stop_emulating(); fninit(); control = __INITIAL_FPUCW__; fldcw(&control); mxcsr = __INITIAL_MXCSR__; ldmxcsr(mxcsr); - fxsave(&fpu_cleanstate); - if (fpu_cleanstate.sv_env.en_mxcsr_mask) - cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask; - else - cpu_mxcsr_mask = 0xFFBF; + if (PCPU_GET(cpuid) == 0) { + fxsave(&fpu_cleanstate); + if (fpu_cleanstate.sv_env.en_mxcsr_mask) + cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask; + else + cpu_mxcsr_mask = 0xFFBF; + bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); + bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); + } start_emulating(); - bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); - bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); - fpu_cleanstate_ready = 1; intr_restore(savecrit); } @@ -384,18 +385,17 @@ static int err_count = 0; -int -fpudna() +void +fpudna(void) { struct pcb *pcb; register_t s; - u_short control; if (PCPU_GET(fpcurthread) == curthread) { printf("fpudna: fpcurthread == curthread %d times\n", ++err_count); stop_emulating(); - return (1); + return; } if (PCPU_GET(fpcurthread) != NULL) { printf("fpudna: fpcurthread = %p (%d), curthread = %p (%d)\n", @@ -420,16 +420,12 @@ * explicitly load sanitized registers. */ fxrstor(&fpu_cleanstate); - if (pcb->pcb_flags & PCB_32BIT) { - control = __INITIAL_FPUCW_I386__; - fldcw(&control); - } + if (pcb->pcb_initial_fpucw != __INITIAL_FPUCW__) + fldcw(&pcb->pcb_initial_fpucw); pcb->pcb_flags |= PCB_FPUINITDONE; } else fxrstor(&pcb->pcb_save); intr_restore(s); - - return (1); } /* @@ -457,10 +453,8 @@ register_t s; if ((td->td_pcb->pcb_flags & PCB_FPUINITDONE) == 0) { - if (fpu_cleanstate_ready) - bcopy(&fpu_cleanstate, addr, sizeof(fpu_cleanstate)); - else - bzero(addr, sizeof(*addr)); + bcopy(&fpu_cleanstate, addr, sizeof(fpu_cleanstate)); + addr->sv_env.en_cw = td->td_pcb->pcb_initial_fpucw; return (_MC_FPOWNED_NONE); } s = intr_disable(); ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.691 2009/02/03 09:01:45 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.693 2009/03/11 15:30:12 dfr Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -716,7 +716,7 @@ idle_sysctl, "A", "currently selected idle function"); /* - * Clear registers on exec + * Reset registers to default values on exec. */ void exec_setregs(td, entry, stack, ps_strings) @@ -743,6 +743,7 @@ pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; pcb->pcb_gs = _udatasel; + pcb->pcb_initial_fpucw = __INITIAL_FPUCW__; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; @@ -1493,6 +1494,14 @@ if (env != NULL) strlcpy(kernelname, env, sizeof(kernelname)); +#ifdef XENHVM + if (inw(0x10) == 0x49d2) { + if (bootverbose) + printf("Xen detected: disabling emulated block and network devices\n"); + outw(0x10, 3); + } +#endif + /* Location of kernel stack for locore */ return ((u_int64_t)thread0.td_pcb); } ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.299 2009/02/25 22:24:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.300 2009/03/08 05:01:39 sobomax Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1227,7 +1227,7 @@ #ifdef SCHED_ULE /* * SCHED_ULE doesn't allow enabling/disabling HT cores at - * run time. + * run-time. */ if (allowed != hyperthreading_allowed) return (ENOTSUP); ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#12 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.649 2009/02/25 20:26:48 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.656 2009/03/14 08:28:02 alc Exp $"); /* * Manages physical address maps. @@ -1278,7 +1278,6 @@ _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t *free) { - vm_offset_t pteva; /* * unmap the page table page @@ -1287,19 +1286,16 @@ /* PDP page */ pml4_entry_t *pml4; pml4 = pmap_pml4e(pmap, va); - pteva = (vm_offset_t) PDPmap + amd64_ptob(m->pindex - (NUPDE + NUPDPE)); *pml4 = 0; } else if (m->pindex >= NUPDE) { /* PD page */ pdp_entry_t *pdp; pdp = pmap_pdpe(pmap, va); - pteva = (vm_offset_t) PDmap + amd64_ptob(m->pindex - NUPDE); *pdp = 0; } else { /* PTE page */ pd_entry_t *pd; pd = pmap_pde(pmap, va); - pteva = (vm_offset_t) PTmap + amd64_ptob(m->pindex); *pd = 0; } --pmap->pm_stats.resident_count; @@ -1325,12 +1321,6 @@ */ atomic_subtract_rel_int(&cnt.v_wire_count, 1); - /* - * Do an invltlb to make the invalidated mapping - * take effect immediately. - */ - pmap_invalidate_page(pmap, pteva); - /* * Put page on a list so that it is released after * *ALL* TLB shootdown is done @@ -1452,8 +1442,6 @@ * it isn't already there. */ - pmap->pm_stats.resident_count++; - if (ptepindex >= (NUPDE + NUPDPE)) { pml4_entry_t *pml4; vm_pindex_t pml4index; @@ -1479,7 +1467,8 @@ if (_pmap_allocpte(pmap, NUPDE + NUPDPE + pml4index, flags) == NULL) { --m->wire_count; - vm_page_free(m); + atomic_subtract_int(&cnt.v_wire_count, 1); + vm_page_free_zero(m); return (NULL); } } else { @@ -1511,7 +1500,8 @@ if (_pmap_allocpte(pmap, NUPDE + pdpindex, flags) == NULL) { --m->wire_count; - vm_page_free(m); + atomic_subtract_int(&cnt.v_wire_count, 1); + vm_page_free_zero(m); return (NULL); } pdp = (pdp_entry_t *)PHYS_TO_DMAP(*pml4 & PG_FRAME); @@ -1524,7 +1514,9 @@ if (_pmap_allocpte(pmap, NUPDE + pdpindex, flags) == NULL) { --m->wire_count; - vm_page_free(m); + atomic_subtract_int(&cnt.v_wire_count, + 1); + vm_page_free_zero(m); return (NULL); } } else { @@ -1540,6 +1532,8 @@ *pd = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M; } + pmap->pm_stats.resident_count++; + return m; } @@ -2277,9 +2271,10 @@ pde_store(pde, newpde); /* - * Invalidate a stale mapping of the page table page. + * Invalidate a stale recursive mapping of the page table page. */ - pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va)); + if (va >= VM_MAXUSER_ADDRESS) + pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va)); /* * Demote the pv entry. This depends on the earlier demotion @@ -2347,6 +2342,7 @@ mpte = pmap_lookup_pt_page(pmap, sva); if (mpte != NULL) { pmap_remove_pt_page(pmap, mpte); + pmap->pm_stats.resident_count--; KASSERT(mpte->wire_count == NPTEPG, ("pmap_remove_pde: pte page wire count error")); mpte->wire_count = 0; @@ -3253,17 +3249,12 @@ return (mpte); } } + pte = (pt_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(mpte)); + pte = &pte[pmap_pte_index(va)]; } else { mpte = NULL; + pte = vtopte(va); } - - /* - * This call to vtopte makes the assumption that we are - * entering the page into the current pmap. In order to support - * quick entry into any pmap, one would likely use pmap_pte. - * But that isn't as quick as vtopte. - */ - pte = vtopte(va); if (*pte) { if (mpte != NULL) { mpte->wire_count--; @@ -3481,9 +3472,6 @@ if (dst_addr != src_addr) return; - if (!pmap_is_current(src_pmap)) - return; - vm_page_lock_queues(); if (dst_pmap < src_pmap) { PMAP_LOCK(dst_pmap); @@ -3545,14 +3533,17 @@ continue; } - srcmpte = PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME); + srcptepaddr &= PG_FRAME; + srcmpte = PHYS_TO_VM_PAGE(srcptepaddr); KASSERT(srcmpte->wire_count > 0, ("pmap_copy: source page table page is unused")); if (va_next > end_addr) va_next = end_addr; - src_pte = vtopte(addr); + src_pte = (pt_entry_t *)PHYS_TO_DMAP(srcptepaddr); + src_pte = &src_pte[pmap_pte_index(addr)]; + dstmpte = NULL; while (addr < va_next) { pt_entry_t ptetemp; ptetemp = *src_pte; @@ -3560,9 +3551,11 @@ * we only virtual copy managed pages */ if ((ptetemp & PG_MANAGED) != 0) { - dstmpte = pmap_allocpte(dst_pmap, addr, - M_NOWAIT); - if (dstmpte == NULL) + if (dstmpte != NULL && + dstmpte->pindex == pmap_pde_pindex(addr)) + dstmpte->wire_count++; + else if ((dstmpte = pmap_allocpte(dst_pmap, + addr, M_NOWAIT)) == NULL) break; dst_pte = (pt_entry_t *) PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpte)); @@ -3768,7 +3761,7 @@ void pmap_remove_pages(pmap_t pmap) { - pd_entry_t *pde; + pd_entry_t ptepde; pt_entry_t *pte, tpte; vm_page_t free = NULL; vm_page_t m, mpte, mt; @@ -3797,21 +3790,19 @@ pv = &pc->pc_pventry[idx]; inuse &= ~bitmask; - pde = vtopde(pv->pv_va); - tpte = *pde; - if ((tpte & PG_PS) != 0) - pte = pde; - else { - pte = vtopte(pv->pv_va); + pte = pmap_pdpe(pmap, pv->pv_va); + ptepde = *pte; + pte = pmap_pdpe_to_pde(pte, pv->pv_va); + tpte = *pte; + if ((tpte & (PG_PS | PG_V)) == PG_V) { + ptepde = tpte; + pte = (pt_entry_t *)PHYS_TO_DMAP(tpte & + PG_FRAME); + pte = &pte[pmap_pte_index(pv->pv_va)]; tpte = *pte & ~PG_PTE_PAT; } - - if (tpte == 0) { - printf( - "TPTE at %p IS ZERO @ VA %08lx\n", - pte, pv->pv_va); + if ((tpte & PG_V) == 0) panic("bad pte"); - } /* * We cannot remove wired pages from a process' mapping at this time @@ -3861,14 +3852,13 @@ mpte = pmap_lookup_pt_page(pmap, pv->pv_va); if (mpte != NULL) { pmap_remove_pt_page(pmap, mpte); + pmap->pm_stats.resident_count--; KASSERT(mpte->wire_count == NPTEPG, ("pmap_remove_pages: pte page wire count error")); mpte->wire_count = 0; pmap_add_delayed_free_list(mpte, &free, FALSE); atomic_subtract_int(&cnt.v_wire_count, 1); } - pmap_unuse_pt(pmap, pv->pv_va, - *pmap_pdpe(pmap, pv->pv_va), &free); } else { pmap->pm_stats.resident_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -3877,8 +3867,8 @@ if (TAILQ_EMPTY(&pvh->pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); } - pmap_unuse_pt(pmap, pv->pv_va, *pde, &free); } + pmap_unuse_pt(pmap, pv->pv_va, ptepde, &free); } } if (allfree) { @@ -4495,7 +4485,7 @@ if (!pmap_demote_pde(kernel_pmap, pde, tmpva)) return (ENOMEM); } - pte = vtopte(tmpva); + pte = pmap_pde_to_pte(pde, tmpva); if (*pte == 0) return (EINVAL); tmpva += PAGE_SIZE; @@ -4571,7 +4561,7 @@ } else { if (cache_bits_pte < 0) cache_bits_pte = pmap_cache_bits(mode, 0); - pte = vtopte(tmpva); + pte = pmap_pde_to_pte(pde, tmpva); if ((*pte & PG_PTE_CACHE) != cache_bits_pte) { pmap_pte_attr(pte, cache_bits_pte); if (!changed) ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.328 2008/09/08 09:55:51 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.330 2009/03/09 13:11:16 rwatson Exp $"); /* * AMD64 Trap and System call handling @@ -386,7 +386,6 @@ #ifdef DEV_ISA case T_NMI: /* machine/parity/power fail/"kitchen sink" faults */ - /* XXX Giant */ if (isa_nmi(code) == 0) { #ifdef KDB /* @@ -416,13 +415,8 @@ case T_DNA: /* transparent fault (due to context switch "late") */ - if (fpudna()) - goto userout; - printf("pid %d killed due to lack of floating point\n", - p->p_pid); - i = SIGKILL; - ucode = 0; - break; + fpudna(); + goto userout; case T_FPOPFLT: /* FPU operand fetch fault */ ucode = ILL_COPROC; @@ -450,11 +444,9 @@ * XXX this should be fatal unless the kernel has * registered such use. */ - if (fpudna()) { - printf("fpudna in kernel mode!\n"); - goto out; - } - break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 15 21:43:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE1AE1065674; Sun, 15 Mar 2009 21:43:22 +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 6199D106566B for ; Sun, 15 Mar 2009 21:43:22 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 367248FC08 for ; Sun, 15 Mar 2009 21:43:22 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2FLhLBM083028 for ; Sun, 15 Mar 2009 21:43:21 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2FLhL8w083021 for perforce@freebsd.org; Sun, 15 Mar 2009 21:43:21 GMT (envelope-from zec@fer.hr) Date: Sun, 15 Mar 2009 21:43:21 GMT Message-Id: <200903152143.n2FLhL8w083021@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 159261 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: Sun, 15 Mar 2009 21:43:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=159261 Change 159261 by zec@zec_amdx2 on 2009/03/15 21:42:54 Unbreak build. TODO: deal with the new IGMP code in the vimage branch. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#19 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#19 (text+ko) ==== @@ -1132,11 +1132,6 @@ nsrc = ntohs(igmpv3->igmp_numsrc); - SLIST_INIT(&V_router_info_head); - - if (!IS_DEFAULT_VNET(curvnet)) - return; - /* * Deal with group-specific queries upfront. * If any group query is already pending, purge any recorded From owner-p4-projects@FreeBSD.ORG Sun Mar 15 21:57:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 409D91065674; Sun, 15 Mar 2009 21:57:37 +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 F32AF106566C for ; Sun, 15 Mar 2009 21:57:36 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E0B1F8FC19 for ; Sun, 15 Mar 2009 21:57:36 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2FLva7C084063 for ; Sun, 15 Mar 2009 21:57:36 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2FLva7g084061 for perforce@freebsd.org; Sun, 15 Mar 2009 21:57:36 GMT (envelope-from zec@fer.hr) Date: Sun, 15 Mar 2009 21:57:36 GMT Message-Id: <200903152157.n2FLva7g084061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 159262 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: Sun, 15 Mar 2009 21:57:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=159262 Change 159262 by zec@zec_amdx2 on 2009/03/15 21:57:31 Integrate vc2 -> vc (vc and vc2 should be identical at this point). Affected files ... .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/pxe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_frag.c#5 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_state.c#6 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_sync.c#5 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_norm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/netinet/in4_cksum.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-usb.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio_pcm.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudioreg.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_if.m#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbhid.h#5 integrate .. //depot/projects/vimage-commit/src/sys/mips/include/sysarch.h#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/usb/Makefile#6 integrate .. //depot/projects/vimage-commit/src/sys/net/if.c#13 integrate .. //depot/projects/vimage-commit/src/sys/net/if_enc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gif.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net/if_loop.c#11 integrate .. //depot/projects/vimage-commit/src/sys/net/route.c#10 integrate .. //depot/projects/vimage-commit/src/sys/net/vnet.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_encap.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw.h#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_gre.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_cc_functions.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_os.h#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/vinet.h#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_src.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/key.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ah.c#8 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_esp.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipcomp.c#8 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipip.c#9 integrate .. //depot/projects/vimage-commit/src/sys/rpc/rpc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/vimage.h#10 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/boot/i386/libi386/pxe.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_frag.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_log.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_proxy.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_state.c#6 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_sync.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/if_pfsync.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_norm.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/netinet/in4_cksum.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/dev/ata/ata-usb.c#5 (text) ==== ==== //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.h#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio_pcm.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudioreg.h#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/dev/usb/usb_if.m#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/dev/usb/usbhid.h#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/mips/include/sysarch.h#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/modules/usb/Makefile#6 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if.c#13 (text+ko) ==== @@ -150,6 +150,8 @@ extern void nd6_setmtu(struct ifnet *); #endif +static int vnet_net_iattach(const void *); + #ifdef VIMAGE_GLOBALS struct ifnethead ifnet; /* depend on static init XXX */ struct ifgrouphead ifg_head; @@ -391,24 +393,33 @@ static void if_init(void *dummy __unused) { - INIT_VNET_NET(curvnet); #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_net_modinfo); #endif + vnet_net_iattach(NULL); + IFNET_LOCK_INIT(); + ifdev_setbyindex(0, make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, + 0600, "network")); + if_clone_init(); +} + +static int +vnet_net_iattach(const void *unused __unused) +{ + INIT_VNET_NET(curvnet); + V_if_index = 0; V_ifindex_table = NULL; V_if_indexlim = 8; - IFNET_LOCK_INIT(); TAILQ_INIT(&V_ifnet); TAILQ_INIT(&V_ifg_head); knlist_init(&V_ifklist, NULL, NULL, NULL, NULL); if_grow(); /* create initial table */ - ifdev_setbyindex(0, make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, - 0600, "network")); - if_clone_init(); + + return (0); } static void ==== //depot/projects/vimage-commit/src/sys/net/if_enc.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_gif.c#9 (text+ko) ==== @@ -121,6 +121,7 @@ static void gif_start(struct ifnet *); static int gif_clone_create(struct if_clone *, int, caddr_t); static void gif_clone_destroy(struct ifnet *); +static int vnet_gif_iattach(const void *); IFC_SIMPLE_DECLARE(gif, 0); @@ -251,6 +252,26 @@ } static int +vnet_gif_iattach(const void *unused __unused) +{ + INIT_VNET_GIF(curvnet); + + LIST_INIT(&V_gif_softc_list); + V_max_gif_nesting = MAX_GIF_NEST; +#ifdef XBONEHACK + V_parallel_tunnels = 1; +#else + V_parallel_tunnels = 0; +#endif + V_ip_gif_ttl = GIF_TTL; +#ifdef INET6 + V_ip6_gif_hlim = GIF_HLIM; +#endif + + return (0); +} + +static int gifmodevent(mod, type, data) module_t mod; int type; @@ -261,19 +282,7 @@ case MOD_LOAD: mtx_init(&gif_mtx, "gif_mtx", NULL, MTX_DEF); - LIST_INIT(&V_gif_softc_list); - V_max_gif_nesting = MAX_GIF_NEST; -#ifdef XBONEHACK - V_parallel_tunnels = 1; -#else - V_parallel_tunnels = 0; -#endif -#ifdef INET - V_ip_gif_ttl = GIF_TTL; -#endif -#ifdef INET6 - V_ip6_gif_hlim = GIF_HLIM; -#endif + vnet_gif_iattach(NULL); if_clone_attach(&gif_cloner); break; @@ -281,7 +290,7 @@ if_clone_detach(&gif_cloner); mtx_destroy(&gif_mtx); #ifdef INET6 - V_ip6_gif_hlim = 0; + V_ip6_gif_hlim = 0; /* XXX -> vnet_gif_idetach() */ #endif break; default: ==== //depot/projects/vimage-commit/src/sys/net/if_loop.c#11 (text+ko) ==== @@ -100,6 +100,7 @@ struct sockaddr *dst, struct rtentry *rt); static int lo_clone_create(struct if_clone *, int, caddr_t); static void lo_clone_destroy(struct ifnet *); +static int vnet_loif_iattach(const void *); #ifdef VIMAGE_GLOBALS struct ifnet *loif; /* Used externally */ @@ -146,6 +147,15 @@ return (0); } +static int vnet_loif_iattach(const void *unused __unused) +{ + INIT_VNET_NET(curvnet); + + V_loif = NULL; + if_clone_attach(&lo_cloner); + return (0); +} + static int loop_modevent(module_t mod, int type, void *data) { @@ -153,8 +163,7 @@ switch (type) { case MOD_LOAD: - V_loif = NULL; - if_clone_attach(&lo_cloner); + vnet_loif_iattach(NULL); break; case MOD_UNLOAD: ==== //depot/projects/vimage-commit/src/sys/net/route.c#10 (text+ko) ==== @@ -106,6 +106,7 @@ static void rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *); +static int vnet_route_iattach(const void *); /* compare two sockaddr structures */ #define sa_equal(a1, a2) (bcmp((a1), (a2), (a1)->sa_len) == 0) @@ -122,7 +123,9 @@ */ #define RNTORT(p) ((struct rtentry *)(p)) +#ifdef VIMAGE_GLOBALS static uma_zone_t rtzone; /* Routing table UMA zone. */ +#endif #if 0 /* default fib for tunnels to use */ @@ -150,20 +153,26 @@ static void route_init(void) { - INIT_VNET_INET(curvnet); - int table; - struct domain *dom; - int fam; /* whack the tunable ints into line. */ if (rt_numfibs > RT_MAXFIBS) rt_numfibs = RT_MAXFIBS; if (rt_numfibs == 0) rt_numfibs = 1; - rtzone = uma_zcreate("rtentry", sizeof(struct rtentry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, 0); rn_init(); /* initialize all zeroes, all ones, mask table */ + vnet_route_iattach(NULL); +} + +static int vnet_route_iattach(const void *unused __unused) +{ + INIT_VNET_INET(curvnet); + int table; + struct domain *dom; + int fam; + + V_rtzone = uma_zcreate("rtentry", sizeof(struct rtentry), NULL, NULL, + NULL, NULL, UMA_ALIGN_PTR, 0); for (dom = domains; dom; dom = dom->dom_next) { if (dom->dom_rtattach) { for (table = 0; table < rt_numfibs; table++) { @@ -186,6 +195,8 @@ } } } + + return (0); } #ifndef _SYS_SYSPROTO_H_ @@ -402,7 +413,7 @@ * and the rtentry itself of course */ RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); return; } done: @@ -958,7 +969,7 @@ if (info->rti_ifa == NULL && (error = rt_getifa_fib(info, fibnum))) senderr(error); ifa = info->rti_ifa; - rt = uma_zalloc(rtzone, M_NOWAIT | M_ZERO); + rt = uma_zalloc(V_rtzone, M_NOWAIT | M_ZERO); if (rt == NULL) senderr(ENOBUFS); RT_LOCK_INIT(rt); @@ -971,7 +982,7 @@ RT_LOCK(rt); if ((error = rt_setgate(rt, dst, gateway)) != 0) { RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); senderr(error); } @@ -1006,7 +1017,7 @@ } Free(rt_key(rt)); RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); senderr(EEXIST); } #endif @@ -1022,7 +1033,7 @@ IFAFREE(rt->rt_ifa); Free(rt_key(rt)); RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); senderr(EEXIST); } ==== //depot/projects/vimage-commit/src/sys/net/vnet.h#5 (text+ko) ==== @@ -47,6 +47,7 @@ struct rtstat _rtstat; struct radix_node_head *_rt_tables[RT_MAXFIBS][AF_MAX+1]; int _rttrash; + uma_zone_t _rtzone; struct ifnet *_loif; LIST_HEAD(, lo_softc) _lo_list; @@ -86,5 +87,6 @@ #define V_rt_tables VNET_NET(rt_tables) #define V_rtstat VNET_NET(rtstat) #define V_rttrash VNET_NET(rttrash) +#define V_rtzone VNET_NET(rtzone) #endif /* !_NET_VNET_H_ */ ==== //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#10 (text+ko) ==== @@ -111,6 +111,7 @@ "Enable proxy ARP for all suitable requests"); static void arp_init(void); +static int arp_iattach(const void *); void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); static void arpintr(struct mbuf *); @@ -790,8 +791,8 @@ ifa->ifa_rtrequest = NULL; } -static void -arp_init(void) +static int +arp_iattach(const void *unused __unused) { INIT_VNET_INET(curvnet); @@ -800,6 +801,15 @@ V_useloopback = 1; /* use loopback interface for local traffic */ V_arp_proxyall = 0; + return (0); +} + +static void +arp_init(void) +{ + + arp_iattach(NULL); + arpintrq.ifq_maxlen = 50; mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF); netisr_register(NETISR_ARP, arpintr, &arpintrq, 0); ==== //depot/projects/vimage-commit/src/sys/netinet/igmp.c#9 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_encap.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw.h#7 (text+ko) ==== @@ -696,6 +696,7 @@ int _fw_debug; /* actually unused */ int _autoinc_step; ipfw_dyn_rule **_ipfw_dyn_v; + uma_zone_t _ipfw_dyn_rule_zone; struct ip_fw_chain _layer3_chain; u_int32_t _dyn_buckets; u_int32_t _curr_dyn_buckets; @@ -740,6 +741,7 @@ #define V_fw_debug VNET_IPFW(fw_debug) #define V_autoinc_step VNET_IPFW(autoinc_step) #define V_ipfw_dyn_v VNET_IPFW(ipfw_dyn_v) +#define V_ipfw_dyn_rule_zone VNET_IPFW(ipfw_dyn_rule_zone) #define V_layer3_chain VNET_IPFW(layer3_chain) #define V_dyn_buckets VNET_IPFW(dyn_buckets) #define V_curr_dyn_buckets VNET_IPFW(curr_dyn_buckets) ==== //depot/projects/vimage-commit/src/sys/netinet/ip_gre.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#11 (text+ko) ==== @@ -242,6 +242,7 @@ V_rsvp_on = 0; V_ip_defttl = IPDEFTTL; V_ip_do_randomid = 0; + V_ip_id = time_second & 0xffff; V_ipforwarding = 0; V_ipstealth = 0; V_nipq = 0; /* Total # of reass queues */ @@ -270,6 +271,20 @@ TAILQ_INIT(&V_in_ifaddrhead); V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &V_in_ifaddrhmask); + + /* Initialize IP reassembly queue. */ + for (i = 0; i < IPREASS_NHASH; i++) + TAILQ_INIT(&V_ipq[i]); + V_maxnipq = nmbclusters / 32; + V_maxfragsperpacket = 16; + V_ipq_zone = uma_zcreate("ipq", sizeof(struct ipq), NULL, NULL, NULL, + NULL, UMA_ALIGN_PTR, 0); + maxnipq_update(); + + /* Skip initialization of globals for non-default instances. */ + if (!IS_DEFAULT_VNET(curvnet)) + return; + pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW); if (pr == NULL) panic("ip_init: PF_INET not found"); @@ -297,16 +312,6 @@ printf("%s: WARNING: unable to register pfil hook, " "error %d\n", __func__, i); - /* Initialize IP reassembly queue. */ - IPQ_LOCK_INIT(); - for (i = 0; i < IPREASS_NHASH; i++) - TAILQ_INIT(&V_ipq[i]); - V_maxnipq = nmbclusters / 32; - V_maxfragsperpacket = 16; - V_ipq_zone = uma_zcreate("ipq", sizeof(struct ipq), NULL, NULL, NULL, - NULL, UMA_ALIGN_PTR, 0); - maxnipq_update(); - /* Start ipport_tick. */ callout_init(&ipport_tick_callout, CALLOUT_MPSAFE); ipport_tick(NULL); @@ -316,7 +321,7 @@ NULL, EVENTHANDLER_PRI_ANY); /* Initialize various other remaining things. */ - V_ip_id = time_second & 0xffff; + IPQ_LOCK_INIT(); ipintrq.ifq_maxlen = ipqmaxlen; mtx_init(&ipintrq.ifq_mtx, "ip_inq", NULL, MTX_DEF); netisr_register(NETISR_IP, ip_input, &ipintrq, 0); ==== //depot/projects/vimage-commit/src/sys/netinet/sctp_cc_functions.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/sctp_os.h#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#9 (text+ko) ==== @@ -108,10 +108,12 @@ INIT_VNET_INET(curvnet); V_tcp_reass_maxseg = nmbclusters / 16; - uma_zone_set_max(tcp_reass_zone, V_tcp_reass_maxseg); + uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg); } +#ifdef VIMAGE_GLOBALS uma_zone_t tcp_reass_zone; +#endif void tcp_reass_init(void) @@ -126,9 +128,9 @@ V_tcp_reass_maxseg = nmbclusters / 16; TUNABLE_INT_FETCH("net.inet.tcp.reass.maxsegments", &V_tcp_reass_maxseg); - tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent), + V_tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(tcp_reass_zone, V_tcp_reass_maxseg); + uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg); EVENTHANDLER_REGISTER(nmbclusters_change, tcp_reass_zone_change, NULL, EVENTHANDLER_PRI_ANY); } @@ -180,7 +182,7 @@ * Allocate a new queue entry. If we can't, or hit the zone limit * just drop the pkt. */ - te = uma_zalloc(tcp_reass_zone, M_NOWAIT); + te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT); if (te == NULL) { V_tcpstat.tcps_rcvmemdrop++; m_freem(m); @@ -213,7 +215,7 @@ V_tcpstat.tcps_rcvduppack++; V_tcpstat.tcps_rcvdupbyte += *tlenp; m_freem(m); - uma_zfree(tcp_reass_zone, te); + uma_zfree(V_tcp_reass_zone, te); tp->t_segqlen--; V_tcp_reass_qsize--; /* @@ -250,7 +252,7 @@ nq = LIST_NEXT(q, tqe_q); LIST_REMOVE(q, tqe_q); m_freem(q->tqe_m); - uma_zfree(tcp_reass_zone, q); + uma_zfree(V_tcp_reass_zone, q); tp->t_segqlen--; V_tcp_reass_qsize--; q = nq; @@ -287,7 +289,7 @@ m_freem(q->tqe_m); else sbappendstream_locked(&so->so_rcv, q->tqe_m); - uma_zfree(tcp_reass_zone, q); + uma_zfree(V_tcp_reass_zone, q); tp->t_segqlen--; V_tcp_reass_qsize--; q = nq; ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#10 (text+ko) ==== @@ -123,9 +123,8 @@ #include +#ifdef VIMAGE_GLOBALS extern struct uma_zone *sack_hole_zone; - -#ifdef VIMAGE_GLOBALS int tcp_do_sack; int tcp_sack_maxholes; int tcp_sack_globalmaxholes; @@ -265,7 +264,7 @@ return NULL; } - hole = (struct sackhole *)uma_zalloc(sack_hole_zone, M_NOWAIT); + hole = (struct sackhole *)uma_zalloc(V_sack_hole_zone, M_NOWAIT); if (hole == NULL) return NULL; @@ -287,7 +286,7 @@ { INIT_VNET_INET(tp->t_vnet); - uma_zfree(sack_hole_zone, hole); + uma_zfree(V_sack_hole_zone, hole); tp->snd_numholes--; V_tcp_sack_globalholes--; ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#12 (text+ko) ==== @@ -243,7 +243,9 @@ CTLFLAG_RW, tcp_inflight_stab, 0, "Inflight Algorithm Stabilization 20 = 2 packets"); +#ifdef VIMAGE_GLOBALS uma_zone_t sack_hole_zone; +#endif static struct inpcb *tcp_notify(struct inpcb *, int); static void tcp_isn_tick(void *); @@ -269,7 +271,9 @@ struct tcp_timer tt; }; +#ifdef VIMAGE_GLOBALS static uma_zone_t tcpcb_zone; +#endif MALLOC_DEFINE(M_TCPLOG, "tcplog", "TCP address and flags print buffers"); struct callout isn_callout; static struct mtx isn_mtx; @@ -286,7 +290,7 @@ { uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets); - uma_zone_set_max(tcpcb_zone, maxsockets); + uma_zone_set_max(V_tcpcb_zone, maxsockets); tcp_tw_zone_change(); } @@ -348,18 +352,7 @@ V_tcp_sack_globalmaxholes = 65536; V_tcp_sack_globalholes = 0; - tcp_delacktime = TCPTV_DELACK; - tcp_keepinit = TCPTV_KEEP_INIT; - tcp_keepidle = TCPTV_KEEP_IDLE; - tcp_keepintvl = TCPTV_KEEPINTVL; - tcp_maxpersistidle = TCPTV_KEEP_IDLE; - tcp_msl = TCPTV_MSL; - tcp_rexmit_min = TCPTV_MIN; - if (tcp_rexmit_min < 1) - tcp_rexmit_min = 1; - tcp_rexmit_slop = TCPTV_CPU_VAR; V_tcp_inflight_rttthresh = TCPTV_INFLIGHT_RTTTHRESH; - tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT; TUNABLE_INT_FETCH("net.inet.tcp.sack.enable", &V_tcp_do_sack); @@ -372,7 +365,6 @@ printf("WARNING: TCB hash size not a power of 2\n"); hashsize = 512; /* safe default */ } - tcp_tcbhashsize = hashsize; V_tcbinfo.ipi_hashbase = hashinit(hashsize, M_PCB, &V_tcbinfo.ipi_hashmask); V_tcbinfo.ipi_porthashbase = hashinit(hashsize, M_PCB, @@ -380,6 +372,37 @@ V_tcbinfo.ipi_zone = uma_zcreate("inpcb", sizeof(struct inpcb), NULL, NULL, tcp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets); + /* + * These have to be type stable for the benefit of the timers. + */ + V_tcpcb_zone = uma_zcreate("tcpcb", sizeof(struct tcpcb_mem), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + uma_zone_set_max(V_tcpcb_zone, maxsockets); + tcp_tw_init(); + syncache_init(); + tcp_hc_init(); + tcp_reass_init(); + V_sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + + /* Skip initialization of globals for non-default instances. */ + if (!IS_DEFAULT_VNET(curvnet)) + return; + + /* XXX virtualize those bellow? */ + tcp_delacktime = TCPTV_DELACK; + tcp_keepinit = TCPTV_KEEP_INIT; + tcp_keepidle = TCPTV_KEEP_IDLE; + tcp_keepintvl = TCPTV_KEEPINTVL; + tcp_maxpersistidle = TCPTV_KEEP_IDLE; + tcp_msl = TCPTV_MSL; + tcp_rexmit_min = TCPTV_MIN; + if (tcp_rexmit_min < 1) + tcp_rexmit_min = 1; + tcp_rexmit_slop = TCPTV_CPU_VAR; + tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT; + tcp_tcbhashsize = hashsize; + #ifdef INET6 #define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr)) #else /* INET6 */ @@ -390,23 +413,12 @@ if (max_linkhdr + TCP_MINPROTOHDR > MHLEN) panic("tcp_init"); #undef TCP_MINPROTOHDR - /* - * These have to be type stable for the benefit of the timers. - */ - tcpcb_zone = uma_zcreate("tcpcb", sizeof(struct tcpcb_mem), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(tcpcb_zone, maxsockets); - tcp_tw_init(); - syncache_init(); - tcp_hc_init(); - tcp_reass_init(); + ISN_LOCK_INIT(); callout_init(&isn_callout, CALLOUT_MPSAFE); - tcp_isn_tick(NULL); + callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); EVENTHANDLER_REGISTER(shutdown_pre_sync, tcp_fini, NULL, SHUTDOWN_PRI_DEFAULT); - sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); EVENTHANDLER_REGISTER(maxsockets_change, tcp_zone_change, NULL, EVENTHANDLER_PRI_ANY); } @@ -686,7 +698,7 @@ int isipv6 = (inp->inp_vflag & INP_IPV6) != 0; #endif /* INET6 */ - tm = uma_zalloc(tcpcb_zone, M_NOWAIT | M_ZERO); + tm = uma_zalloc(V_tcpcb_zone, M_NOWAIT | M_ZERO); if (tm == NULL) return (NULL); tp = &tm->tcb; @@ -846,7 +858,7 @@ while ((q = LIST_FIRST(&tp->t_segq)) != NULL) { LIST_REMOVE(q, tqe_q); m_freem(q->tqe_m); - uma_zfree(tcp_reass_zone, q); + uma_zfree(V_tcp_reass_zone, q); tp->t_segqlen--; V_tcp_reass_qsize--; } @@ -856,7 +868,7 @@ tcp_free_sackholes(tp); inp->inp_ppcb = NULL; tp->t_inpcb = NULL; - uma_zfree(tcpcb_zone, tp); + uma_zfree(V_tcpcb_zone, tp); } /* @@ -929,7 +941,7 @@ != NULL) { LIST_REMOVE(te, tqe_q); m_freem(te->tqe_m); - uma_zfree(tcp_reass_zone, te); + uma_zfree(V_tcp_reass_zone, te); tcpb->t_segqlen--; V_tcp_reass_qsize--; } @@ -1546,8 +1558,8 @@ VNET_ITERATOR_DECL(vnet_iter); u_int32_t projected_offset; + VNET_LIST_RLOCK(); ISN_LOCK(); - VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); /* XXX appease INVARIANTS */ INIT_VNET_INET(curvnet); @@ -1560,9 +1572,9 @@ V_isn_offset_old = V_isn_offset; CURVNET_RESTORE(); } + ISN_UNLOCK(); VNET_LIST_RUNLOCK(); callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); - ISN_UNLOCK(); } /* ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#10 (text+ko) ==== @@ -94,7 +94,6 @@ #include -static uma_zone_t tcptw_zone; static int maxtcptw; /* @@ -104,6 +103,7 @@ * tcbinfo lock, which must be held over queue iteration and modification. */ #ifdef VIMAGE_GLOBALS +static uma_zone_t tcptw_zone; static TAILQ_HEAD(, tcptw) twq_2msl; int nolocaltimewait; #endif @@ -142,7 +142,7 @@ if (error == 0 && req->newptr) if (new >= 32) { maxtcptw = new; - uma_zone_set_max(tcptw_zone, maxtcptw); + uma_zone_set_max(V_tcptw_zone, maxtcptw); } return (error); } @@ -160,7 +160,7 @@ { if (maxtcptw == 0) - uma_zone_set_max(tcptw_zone, tcptw_auto_size()); + uma_zone_set_max(V_tcptw_zone, tcptw_auto_size()); } void @@ -168,13 +168,13 @@ { INIT_VNET_INET(curvnet); - tcptw_zone = uma_zcreate("tcptw", sizeof(struct tcptw), + V_tcptw_zone = uma_zcreate("tcptw", sizeof(struct tcptw), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); TUNABLE_INT_FETCH("net.inet.tcp.maxtcptw", &maxtcptw); if (maxtcptw == 0) - uma_zone_set_max(tcptw_zone, tcptw_auto_size()); + uma_zone_set_max(V_tcptw_zone, tcptw_auto_size()); else - uma_zone_set_max(tcptw_zone, maxtcptw); + uma_zone_set_max(V_tcptw_zone, maxtcptw); TAILQ_INIT(&V_twq_2msl); } @@ -204,7 +204,7 @@ return; } - tw = uma_zalloc(tcptw_zone, M_NOWAIT); + tw = uma_zalloc(V_tcptw_zone, M_NOWAIT); if (tw == NULL) { tw = tcp_tw_2msl_scan(1); if (tw == NULL) { @@ -477,7 +477,7 @@ tw->tw_cred = NULL; if (reuse) return; - uma_zfree(tcptw_zone, tw); + uma_zfree(V_tcptw_zone, tw); } int ==== //depot/projects/vimage-commit/src/sys/netinet/vinet.h#6 (text+ko) ==== @@ -86,6 +86,11 @@ struct tcp_hostcache _tcp_hostcache; struct callout _tcp_hc_callout; + uma_zone_t _tcp_reass_zone; + uma_zone_t _tcpcb_zone; + uma_zone_t _tcptw_zone; + uma_zone_t _sack_hole_zone; + struct tcp_syncache _tcp_syncache; int _tcp_syncookies; int _tcp_syncookiesonly; @@ -315,12 +320,15 @@ #define V_rtq_timeout VNET_INET(rtq_timeout) #define V_rtq_timer VNET_INET(rtq_timer) #define V_rtq_toomany VNET_INET(rtq_toomany) +#define V_sack_hole_zone VNET_INET(sack_hole_zone) #define V_sameprefixcarponly VNET_INET(sameprefixcarponly) #define V_ss_fltsz VNET_INET(ss_fltsz) #define V_ss_fltsz_local VNET_INET(ss_fltsz_local) #define V_subnetsarelocal VNET_INET(subnetsarelocal) #define V_tcb VNET_INET(tcb) #define V_tcbinfo VNET_INET(tcbinfo) +#define V_tcpcb_zone VNET_INET(tcpcb_zone) +#define V_tcptw_zone VNET_INET(tcptw_zone) #define V_tcp_abc_l_var VNET_INET(tcp_abc_l_var) #define V_tcp_autorcvbuf_inc VNET_INET(tcp_autorcvbuf_inc) #define V_tcp_autorcvbuf_max VNET_INET(tcp_autorcvbuf_max) @@ -353,6 +361,7 @@ #define V_tcp_reass_maxseg VNET_INET(tcp_reass_maxseg) #define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) #define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) +#define V_tcp_reass_zone VNET_INET(tcp_reass_zone) #define V_tcp_sack_globalholes VNET_INET(tcp_sack_globalholes) #define V_tcp_sack_globalmaxholes VNET_INET(tcp_sack_globalmaxholes) #define V_tcp_sack_maxholes VNET_INET(tcp_sack_maxholes) ==== //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#11 (text+ko) ==== @@ -109,14 +109,16 @@ { INIT_VNET_INET6(curvnet); + V_ip6q.ip6q_next = V_ip6q.ip6q_prev = &V_ip6q; V_ip6_maxfragpackets = nmbclusters / 4; V_ip6_maxfrags = nmbclusters / 4; + + if (!IS_DEFAULT_VNET(curvnet)) + return; + + IP6Q_LOCK_INIT(); EVENTHANDLER_REGISTER(nmbclusters_change, frag6_change, NULL, EVENTHANDLER_PRI_ANY); - - IP6Q_LOCK_INIT(); - - V_ip6q.ip6q_next = V_ip6q.ip6q_prev = &V_ip6q; } /* ==== //depot/projects/vimage-commit/src/sys/netinet6/in6_src.c#10 (text+ko) ==== @@ -920,8 +920,6 @@ void addrsel_policy_init(void) { - ADDRSEL_LOCK_INIT(); - ADDRSEL_SXLOCK_INIT(); INIT_VNET_INET6(curvnet); V_ip6_prefer_tempaddr = 0; @@ -931,6 +929,12 @@ /* initialize the "last resort" policy */ bzero(&V_defaultaddrpolicy, sizeof(V_defaultaddrpolicy)); V_defaultaddrpolicy.label = ADDR_LABEL_NOTAPP; + + if (!IS_DEFAULT_VNET(curvnet)) + return; + + ADDRSEL_LOCK_INIT(); + ADDRSEL_SXLOCK_INIT(); } static struct in6_addrpolicy * ==== //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#11 (text+ko) ==== @@ -234,6 +234,17 @@ /* 40 1K datagrams */ V_dad_init = 0; + scope6_init(); + addrsel_policy_init(); + nd6_init(); + frag6_init(); + + V_ip6_desync_factor = arc4random() % MAX_TEMP_DESYNC_FACTOR; + + /* Skip global initialization stuff for non-default instances. */ + if (!IS_DEFAULT_VNET(curvnet)) + return; + #ifdef DIAGNOSTIC if (sizeof(struct protosw) != sizeof(struct ip6protosw)) panic("sizeof(protosw) != sizeof(ip6protosw)"); @@ -265,18 +276,13 @@ printf("%s: WARNING: unable to register pfil hook, " "error %d\n", __func__, i); - ip6intrq.ifq_maxlen = V_ip6qmaxlen; + ip6intrq.ifq_maxlen = V_ip6qmaxlen; /* XXX */ mtx_init(&ip6intrq.ifq_mtx, "ip6_inq", NULL, MTX_DEF); netisr_register(NETISR_IPV6, ip6_input, &ip6intrq, 0); - scope6_init(); - addrsel_policy_init(); - nd6_init(); - frag6_init(); - V_ip6_desync_factor = arc4random() % MAX_TEMP_DESYNC_FACTOR; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 16 00:34:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEC8A1065673; Mon, 16 Mar 2009 00:34:17 +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 6B9C31065670 for ; Mon, 16 Mar 2009 00:34:17 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 299DC8FC13 for ; Mon, 16 Mar 2009 00:34:17 +0000 (UTC) (envelope-from gabor@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 n2G0YHLa098793 for ; Mon, 16 Mar 2009 00:34:17 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2G0YHYg098791 for perforce@freebsd.org; Mon, 16 Mar 2009 00:34:17 GMT (envelope-from gabor@freebsd.org) Date: Mon, 16 Mar 2009 00:34:17 GMT Message-Id: <200903160034.n2G0YHYg098791@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 159269 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: Mon, 16 Mar 2009 00:34:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=159269 Change 159269 by gabor@gabor_server on 2009/03/16 00:34:08 - Add a BSDL bc(1), which isn't completed yet Affected files ... .. //depot/projects/soc2008/gabor_textproc/bc/Makefile#1 add .. //depot/projects/soc2008/gabor_textproc/bc/USD.doc/Makefile#1 add .. //depot/projects/soc2008/gabor_textproc/bc/USD.doc/bc#1 add .. //depot/projects/soc2008/gabor_textproc/bc/bc.1#1 add .. //depot/projects/soc2008/gabor_textproc/bc/bc.library#1 add .. //depot/projects/soc2008/gabor_textproc/bc/bc.y#1 add .. //depot/projects/soc2008/gabor_textproc/bc/extern.h#1 add .. //depot/projects/soc2008/gabor_textproc/bc/pathnames.h#1 add .. //depot/projects/soc2008/gabor_textproc/bc/scan.l#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Mar 16 02:20:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64115106567C; Mon, 16 Mar 2009 02:20:05 +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 20321106566B for ; Mon, 16 Mar 2009 02:20:05 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E4348FC13 for ; Mon, 16 Mar 2009 02:20:05 +0000 (UTC) (envelope-from gabor@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 n2G2K48o018526 for ; Mon, 16 Mar 2009 02:20:04 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2G2K4s8018524 for perforce@freebsd.org; Mon, 16 Mar 2009 02:20:04 GMT (envelope-from gabor@freebsd.org) Date: Mon, 16 Mar 2009 02:20:04 GMT Message-Id: <200903160220.n2G2K4s8018524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 159272 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: Mon, 16 Mar 2009 02:20:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=159272 Change 159272 by gabor@gabor_server on 2009/03/16 02:19:37 - Add a new BSD-licensed sort, which has been written from scratch TODO: - Add numeric sort - Fix general numeric sort - Reduce preproc() calls by storing the preproc()'d value - Complete/review man page - Comment code Affected files ... .. //depot/projects/soc2008/gabor_textproc/newsort/Makefile#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/coll.c#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/file.c#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/mem.c#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/msort.c#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/nls/C.msg#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/nls/hu_HU.ISO8859-2.msg#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/sort.1#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/sort.c#1 add .. //depot/projects/soc2008/gabor_textproc/newsort/sort.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Mar 16 08:15:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B57E106568D; Mon, 16 Mar 2009 08:15:06 +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 D71BA1065687 for ; Mon, 16 Mar 2009 08:15:05 +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 C57498FC15 for ; Mon, 16 Mar 2009 08:15:05 +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 n2G8F5XM065893 for ; Mon, 16 Mar 2009 08:15:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2G8F5YS065891 for perforce@freebsd.org; Mon, 16 Mar 2009 08:15:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 16 Mar 2009 08:15:05 GMT Message-Id: <200903160815.n2G8F5YS065891@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 159275 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: Mon, 16 Mar 2009 08:15:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=159275 Change 159275 by hselasky@hselasky_laptop001 on 2009/03/16 08:14:46 USB UMASS: More patches from: Michael Gmelin Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#4 (text+ko) ==== @@ -849,7 +849,7 @@ }, {USB_VENDOR_SUPERTOP, USB_PRODUCT_SUPERTOP_IDE, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, - NO_INQUIRY | IGNORE_RESIDUE | NO_SYNCHRONIZE_CACHE + IGNORE_RESIDUE | NO_SYNCHRONIZE_CACHE }, {USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE, RID_WILDCARD, UMASS_PROTO_SCSI, @@ -2026,7 +2026,7 @@ residue = UGETDW(sc->csw.dCSWDataResidue); - if (!residue) { + if ((!residue) || (sc->sc_quirks & IGNORE_RESIDUE)) { residue = (sc->sc_transfer.data_len - sc->sc_transfer.actlen); } From owner-p4-projects@FreeBSD.ORG Mon Mar 16 14:50:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 188741065680; Mon, 16 Mar 2009 14:50:50 +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 9E8D1106567A for ; Mon, 16 Mar 2009 14:50:49 +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 892258FC29 for ; Mon, 16 Mar 2009 14:50:49 +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 n2GEonxh038855 for ; Mon, 16 Mar 2009 14:50:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2GEonPU038853 for perforce@freebsd.org; Mon, 16 Mar 2009 14:50:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 16 Mar 2009 14:50:49 GMT Message-Id: <200903161450.n2GEonPU038853@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 159292 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: Mon, 16 Mar 2009 14:50:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=159292 Change 159292 by hselasky@hselasky_laptop001 on 2009/03/16 14:50:28 USB parallell port driver patch: Don't send ZLP at close. Some printers apparently stop working at the first ZLP! Same patch for USB scanner driver. In other words: Revert behaviour back to USB1. Reported by: Alexander Best Affected files ... .. //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#5 (text+ko) ==== @@ -578,7 +578,6 @@ USCANNER_IFQ_MAXLEN)) { return (ENOMEM); } - usb2_fifo_set_close_zlp(fifo, 1); } return (0); } ==== //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#5 (text+ko) ==== @@ -440,7 +440,6 @@ } /* set which FIFO is opened */ sc->sc_fifo_open[USB_FIFO_TX] = fifo; - usb2_fifo_set_close_zlp(fifo, 1); } sc->sc_fflags |= fflags & (FREAD | FWRITE); return (0); From owner-p4-projects@FreeBSD.ORG Mon Mar 16 19:19:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FB511065673; Mon, 16 Mar 2009 19:19:55 +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 2FD7B106564A for ; Mon, 16 Mar 2009 19:19:55 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1DC2E8FC27 for ; Mon, 16 Mar 2009 19:19:55 +0000 (UTC) (envelope-from gabor@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 n2GJJtb6085953 for ; Mon, 16 Mar 2009 19:19:55 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2GJJsYX085951 for perforce@freebsd.org; Mon, 16 Mar 2009 19:19:54 GMT (envelope-from gabor@freebsd.org) Date: Mon, 16 Mar 2009 19:19:54 GMT Message-Id: <200903161919.n2GJJsYX085951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 159308 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: Mon, 16 Mar 2009 19:19:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=159308 Change 159308 by gabor@gabor_server on 2009/03/16 19:19:44 - Add some comments to the code Affected files ... .. //depot/projects/soc2008/gabor_textproc/newsort/coll.c#2 edit .. //depot/projects/soc2008/gabor_textproc/newsort/file.c#2 edit .. //depot/projects/soc2008/gabor_textproc/newsort/mem.c#2 edit .. //depot/projects/soc2008/gabor_textproc/newsort/msort.c#2 edit .. //depot/projects/soc2008/gabor_textproc/newsort/sort.c#2 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/newsort/coll.c#2 (text+ko) ==== @@ -38,6 +38,9 @@ static int numcoll(const wchar_t *, const wchar_t *); static int wcscasecoll(const wchar_t *, const wchar_t *); +/* + * Rips out leading blanks (-b). + */ static wchar_t *ignore_leading_blanks(wchar_t *str) { @@ -47,6 +50,9 @@ return (str); } +/* + * Rips out nonprinting characters (-i). + */ static wchar_t *ignore_nonprinting(wchar_t *str) { wchar_t *ret; @@ -64,6 +70,10 @@ } +/* + * Rips out any characters that are not alphanumeric characters + * nor blanks (-d). + */ static wchar_t *dictionary_order(wchar_t *str) { wchar_t *ret; @@ -80,6 +90,11 @@ return (ret); } +/* + * Preprocesses a line applying the necessary transformations + * specified by command line options and returns the preprocessed + * string, which can be used to compare. + */ static wchar_t *preproc(const wchar_t *s) { wchar_t *ret, *sp, *ep; @@ -120,6 +135,12 @@ return (ret); } +/* + * Compares the given strings. Returns a positive number if + * the first precedes the second, a negative number if the second is + * the preceding one, and zero if they are equal. This function calls + * the underlying collate functions, which done the actual comparison. + */ int coll(const wchar_t *s1, const wchar_t *s2) { wchar_t *ps1, *ps2; @@ -137,6 +158,9 @@ (rflag ? wcscoll(ps2, ps1) : wcscoll(ps1, ps2))); } +/* + * A case insensitive version of wcscoll(). + */ static int wcscasecoll(const wchar_t *s1, const wchar_t *s2) { int len1, len2; @@ -159,6 +183,9 @@ return (len2 - len1); } +/* + * Implements general numeric sort (-g). + */ static int numcoll(const wchar_t *s1, const wchar_t *s2) { int n1 = 0, n2 = 0; @@ -184,6 +211,11 @@ } } +/* + * A helper function for monthcoll. If a line matches + * a month name, it returns (number of the month - 1), + * while if there is no match, it just return -1. + */ static int month_score(const wchar_t *s) { char *tmp; @@ -231,6 +263,9 @@ return (-1); } +/* + * Implements month sort (-M). + */ static int monthcoll(const wchar_t *s1, const wchar_t *s2) { int val; ==== //depot/projects/soc2008/gabor_textproc/newsort/file.c#2 (text+ko) ==== @@ -36,6 +36,10 @@ #include "sort.h" +/* + * Prints the internal buffer to a file or to stdout if + * "-" is given as output filename. + */ void print(char *fn) { FILE *file = NULL; @@ -48,6 +52,10 @@ fclose(file); } +/* + * Checks if the given file is sorted. Stops at the first disorder, + * prints the disordered line and returns 1. + */ int check(char *fn) { int pos = 1; @@ -81,6 +89,10 @@ return (0); } +/* + * Opens a file. If the given filename is "-", stdout will be + * opened. + */ FILE *openfile(char *fn, char *mode) { FILE *file; @@ -104,6 +116,9 @@ return (file); } +/* + * Reads a file into the internal buffer. + */ int procfile(FILE *file) { wchar_t *line, *item; @@ -124,6 +139,9 @@ return (0); } +/* + * Calculates the optimal buffer size. + */ int optbufsize(char *fn) { struct stat st; @@ -142,6 +160,10 @@ return (st.st_size/OPT_SLICES); } +/* + * Prints the content of f1 to f2, which can also be + * stdout. + */ void printfile(FILE *f1, FILE *f2) { wchar_t *s, *tmp; @@ -156,6 +178,10 @@ fclose(f1); } +/* + * Merges the two given files into the third file, which can be + * stdout. + */ void merge_files(char *fn1, char *fn2, char *fn3) { FILE *f1, *f2, *f3; ==== //depot/projects/soc2008/gabor_textproc/newsort/mem.c#2 (text+ko) ==== @@ -29,6 +29,9 @@ #include "sort.h" +/* + * Safe malloc(). + */ void * sort_malloc(size_t size) { @@ -39,6 +42,9 @@ return (ptr); } +/* + * Safe realloc(). + */ void * sort_realloc(void *ptr, size_t size) { ==== //depot/projects/soc2008/gabor_textproc/newsort/msort.c#2 (text+ko) ==== @@ -28,6 +28,9 @@ #include "sort.h" +/* + * Merges two arrays and returns the result. + */ wchar_t **merge(wchar_t **left, int leftn, wchar_t **right, int rightn) { wchar_t **result; @@ -51,6 +54,10 @@ return (result); } +/* + * This is the well-known recursive merge sort + * algorithm. + */ wchar_t **merge_sort(wchar_t **arr, int len) { wchar_t **left, **right, **result; ==== //depot/projects/soc2008/gabor_textproc/newsort/sort.c#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Mar 17 21:39:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 561E71065675; Tue, 17 Mar 2009 21:39:55 +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 094611065679 for ; Tue, 17 Mar 2009 21:39:55 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E96698FC15 for ; Tue, 17 Mar 2009 21:39:54 +0000 (UTC) (envelope-from pgj@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 n2HLdsd2026751 for ; Tue, 17 Mar 2009 21:39:54 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2HLdsxU026749 for perforce@freebsd.org; Tue, 17 Mar 2009 21:39:54 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 17 Mar 2009 21:39:54 GMT Message-Id: <200903172139.n2HLdsxU026749@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 159353 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: Tue, 17 Mar 2009 21:39:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=159353 Change 159353 by pgj@beehive on 2009/03/17 21:38:56 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#24 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/fabient.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#18 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#18 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#20 integrate .. //depot/projects/docproj_hu/www/en/news/2008/Makefile#2 integrate .. //depot/projects/docproj_hu/www/en/news/2008/press.xml#2 delete .. //depot/projects/docproj_hu/www/en/projects/2009-freebsd-gsoc-thumbnail.jpg#1 branch .. //depot/projects/docproj_hu/www/en/projects/2009-freebsd-gsoc.pdf#1 branch .. //depot/projects/docproj_hu/www/en/projects/Makefile#2 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#9 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xsl#5 integrate .. //depot/projects/docproj_hu/www/en/projects/summerofcode.xsl#3 integrate .. //depot/projects/docproj_hu/www/en/releases/7.2R/Makefile#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.2R/docbook.css#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.2R/schedule.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/Makefile#3 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#15 integrate .. //depot/projects/docproj_hu/www/share/sgml/libcommon.xsl#7 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#43 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#12 integrate .. //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#6 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#24 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.473 2009/03/05 21:38:01 dhn Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.474 2009/03/17 14:52:00 fabient Exp $ --> aaron@FreeBSD.org"> @@ -330,6 +330,8 @@ erwin@FreeBSD.org"> +fabient@FreeBSD.org"> + fanf@FreeBSD.org"> farrokhi@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -356,6 +356,11 @@ &pgpkey.lippe; + + &a.fabient; + &pgpkey.fabient; + + &a.fanf; &pgpkey.fanf; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#18 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -84,6 +84,7 @@ + ==== //depot/projects/docproj_hu/www/en/developers.sgml#20 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.215 2009/03/05 21:46:33 dhn Exp $ +$FreeBSD: www/en/developers.sgml,v 1.216 2009/03/17 14:52:00 fabient Exp $ --> @@ -166,6 +166,7 @@ + ==== //depot/projects/docproj_hu/www/en/news/2008/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/news/2008/Makefile,v 1.1 2009/02/11 17:15:28 pgj Exp $ +# $FreeBSD: www/en/news/2008/Makefile,v 1.2 2009/03/16 07:58:53 pgj Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -10,7 +10,4 @@ XMLDOCS+= index:${XSL_NEWS_NEWSFLASH_OLD}:news.xml: DEPENDSET.index=transtable news -XMLDOCS+= press:${XSL_NEWS_PRESS_OLD}:: -DEPENDSET.press=transtable press - .include "${WEB_PREFIX}/share/mk/web.site.mk" ==== //depot/projects/docproj_hu/www/en/projects/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/projects/Makefile,v 1.32 2008/04/22 08:59:24 murray Exp $ +# $FreeBSD: www/en/projects/Makefile,v 1.33 2009/03/16 13:43:53 rwatson Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -15,6 +15,9 @@ DOCS+= summerofcode-2007.sgml DOCS+= summerofcode-2008.sgml +DATA= 2009-freebsd-gsoc-thumbnail.jpg +DATA+= 2009-freebsd-gsoc.pdf + XML_IDEAS= ${WEB_PREFIX}/en/projects/ideas/ideas.xml XSL_SOC= ${WEB_PREFIX}/en/projects/summerofcode.xsl ==== //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#9 (text+ko) ==== @@ -15,7 +15,7 @@ - $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.109 2009/03/13 15:28:47 brooks Exp $ + $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.123 2009/03/17 18:28:37 rpaulo Exp $ @@ -179,7 +179,7 @@ - + Improve the performance of dump/restore

A performance evaluation of the split cache (as is) and an unified cache @@ -535,58 +535,51 @@ - - Dynamic module references + + Kernel support for linux DVB device drivers - -

Technical contact: Sam Leffler

-

Kernel modules may have dynamic references created during operation. - For example net80211 key entries reference functions in the crypto module - that implements the key's cipher. Presently there is no standard mechanism - for expressing this dependency so that module unloading is disallowed; - instead modules must track references and implement their own semantics. - This task is to define and implement a general mechanism for tracking - these references and use them in handling module unload requests.

-

Requirements:

-
    -
  • Good knowledge of C.
    • -
  • Kernel awareness.
    • -
- - - - - Kernel support for linux device drivers -

Technical contact: Luigi Rizzo

-

Recently, a project was started to compile linux device drivers - on FreeBSD through an in-kernel emulation layer, which +

In early 2007 we started a project was started to support the + building of linux device drivers on FreeBSD. + This was done through an in-kernel emulation layer, which implements part of the linux kernel API on top of the FreeBSD kernel API. The initial implementation was good enough to support a few USB webcam drivers, and is documented here.

+href="http://info.iet.unipi.it/~luigi/FreeBSD/linux_bsd_kld.html">here. + The code is actually available as a port, devel/linux-kmod-compat, + and a popular driver that uses this infrastructure is + multimedia/linux-gspca-kmod . +

+

We would like to use a similar approach to add support + for DVB devices, which are widely supported in Linux + but not in FreeBSD. In particular we expect the project to provide, + within the FreeBSD kernel, enough of linux compatibility to build + the core components of the drivers/media/ linux kernel, and then + a few device drivers including one for a PCI DVB card (e.g. + saa7134-based). +

-

The goal of this project is to extend this emulation layer - to cover more of the linux kernel API. Two areas that need - further work are the API used by network/communication device drivers (e.g. - many USB wired and wireless device drivers; telephony cards), and the API used - by memory-mapped devices and drivers (e.g. analog or DVB video - acquisition cards, both USB and PCI).

- -

A Summer of Code applicant would be required to choose a significant set of - extensions to the existing work (e.g. one of those indicated - above), and select at least two linux device drivers to be - ported to FreeBSD using the newly implemented functions.

- -

Before the start of the project a Summer of Code applicant is expected to - have studied the above URL and understood the emulation technique - used, and to have/acquire access to at least some of the hardware - involved, so that actual functionality tests can be performed - in addition to the compile tests.

+

Before the start of the project, a Summer of Code applicant is expected to + i) become familiar with the approach used by linux-kmod-compat; + ii) set up a proper test environment, with a couple of DVB devices + supported by linux, and a working linux installation so that + one can compare results; + iii) become familiar with the architecture of the linux code in + drivers/media. +
+ Probably the attention should be focused in PCI devices, because + at this stage the USB stack is in a transition phase and would + pose some additional difficulties. +

+

+ Expected results are a working porting infrastructure, a working + linux-dvb-kmod device driver, and a working application to demonstrate + that the driver is working as expected. We suggest to look at + "kaffeine" for which a FreeBSD port already exists. +

 @@ -673,12 +666,9 @@ - + Implement and profile algorithms for powerd -

Technical contacts: Nate Lawson, Bruno Ducrot

Implement a range of predictive algorithms (and perhaps design your own) and profile them for power usage and performance loss. The best algorithm will save the most power while losing the least performance. This @@ -722,29 +712,95 @@ - - Pluggable Disk Scheduler + + Collective limits on set of processes (a.k.a. jobs) + + +

Technical contact: Brooks Davis

+ +

In SGI's Irix operating system, there is a concept of a job which is + a collection of processes. These processes share a set of resource + limits similar to those accessible through the set/getrlimit and + getrusage system calls. Schedulers such as Sun Grid Engine currently + implement tracking the processes that make up a job and enforcing + collective limits on them in an adhoc manner. Having first class + kernel support would be useful.

+ +

It seems most likely that implementing something like the Irix + interface would be the most useful approach since that would enable us + to leverage existing code. Implementers will need to make sure that + the job construct has no negative performance implications when not + enabled (ideally, processes that are not part of jobs should be + unaffected) and quantify the impact on perfomance when enabled.

+ +

References: Irix + Man Pages mentioning jid_t

+ +

Requirements:

+
    +
  • Good knowledge of C.
    • +
  • Kernel awareness.
    • +
  • Ability to implement functionality from interface specifications.
    • +
+ + + + + Geom-based Disk Schedulers

Technical contact: Emiliano Mennucci

+ href="mailto:luigi@freebsd.org">Luigi Rizzo

+

In a 2005 GSoC project, "Pluggable Disk Schedulers", Emiliano + Mennucci explored the feasibility of pluggable disk schedulers + for FreeBSD. The project was successful, but we could not explore + certain approaches (e.g. "anticipation", where requests are delayed + hoping that some future ones can served without a seek) due to + architectural limitations the kernel had at the time. +

+

+ Since then, the GEOM infrastructure has become available on FreeBSD + for interacting with disk I/O requests. GEOM has enabled us to + work on disk schedulers in a much more flexible way, allowing a + much faster development of disk scheduling algorithms. With + Fabio Checconi, we have developed a prototype + implementation of some anticipatory schedulers, see + GEOM_SCHED. +

+

+ GEOM_SCHED works within the geom layer, i.e. above the device driver + where queueing of requests may actually occur. The way GEOM_SCHED + does scheduling is by limiting the number of outstanding requests + to the device, and the performance implications of this approach + need to be measured. An alternative approach is to push the + scheduler (using the same algorithms developed in GEOM_SCHED, + and most likely the same code) within the device drivers. This less general + (as it needs to be replicated in all drivers) but it may be + an interesting thing to do e.g. for some popular device drivers + such as ATA. +

+

+ The proposed SoC work can address one or more of the following + aspects: +

    +
  • implement suitable classifiers for disk requests;
    • +
  • implement techniques for the auto-tuning of + the scheduler parameters;
    • +
  • measure the performance implications + of doing scheduling above the device driver, and possibly design + and implement a suitable mechanism to push the GEOM_SCHED + module within the device driver itself.
    • +
+ Ultimately, we expect to end up with a production quality subsystem + for use in FreeBSD. +

References: The Pluggable Disk Schedulers SoC project, Patches

-

Our "Pluggable Disk Schedulers" SoC 2005 project resulted in code which - solved the problem where large sequential I/O requests, or certain - access patterns from one or a few processes, might almost completely - starve other processes. It is available as a patch for RELENG_4 and - RELENG_5. Unfortunately the code in FreeBSD-current (and RELENG_6) - changed too much, so that the patches can not be committed. The goal - of this project is to port the pluggable disk schedulers to the GEOM - framework.

-

Interested people should also have a look at - a mail thread about this (Ulf is not working on this) and - further discussion of the corresponding GEOM aspects.

+

Requirements:

  • Ability to read and understand foreign C code.
    • @@ -771,13 +827,10 @@ - + Suspend to disk -

    Technical contacts: Nate Lawson, Bruno Ducrot

    Implement a suspend/resume from disk mechanism. Possibly use the dump functions to dump pages to disk, then use ACPI to put the system in S4 or power-off. Resume would require changes to the loader to load the memory @@ -842,26 +895,24 @@ - - VM Algorithm Improvement + + EFI support for FreeBSD/i386 and FreeBSD/amd64 + +

    Technical contact: Rui Paulo

    +

    Finish EFI support on the i386/amd64 ports. Final work + should be able to boot a FreeBSD kernel into single user + mode, at least.

    - -

    Technical contact: Jeff Roberson, Alan Cox

    +

    Requirements:

    +
      +
    • Good knowledge of C.
      • +
    • Deep understanding of the boot process and EFI.
      • +
    • A system running EFI 1.0 (Intel Macs, for example)
      • +
    -

    The vm uses a splay tree to lookup pages associated with an offset and a - file. This tree structure is space inefficient and cache inefficient for - large objects. This project will be to replace the splay with a dynamic - depth page-table like structure similar to a radix tree. This will improve - large object performance and reduce the size of the vm_page.

    -

    Requirements:

    -
      -
    • Strong knowledge of C.
      • -
    • Familiarity with concepts of virtual memory and advanced data - structures and algorithms.
      • -
     +     @@ -946,27 +997,6 @@     - - Update wi - - -

    Technical contact: Sam Leffler

    -

    Many new and useful features (e.g. crypto protocols like WPA) of the WLAN - infrastructure in the kernel are not used in wi(4). While wi(4) - cards are old and can not compete with recent wireless cards, they are still - in use in a lot of places. The goal of this item is to examine the WLAN - infrastructure and other WLAN drivers in the tree for nice features and - port/use them in the wi(4) driver.

    -

    Requirements:

    -
      -
    • Knowledge of C.
      • -
    • No fear of undocumented parts of the kernel.
      • -
    • One wi(4) card and one other wireless device to test against.
      • -
    -     -     - WPA2 preauthentication in hostapd @@ -1013,7 +1043,7 @@ - + SCPS, Space Communication Protocol Standards

    SCPS is a protocol suite @@ -1027,6 +1057,26 @@ others.)

         + + + Implement TCP UTO + +

    Technical contact: Rui Paulo

    + +

    Implement TCP UTO (User Timeout Option) as defined by RFC + 5482.

    + +

    Requirements:

    +
      +
    • Good knowledge of C and TCP.
      • +
    • Able to understand the FreeBSD TCP/IP stack.
      • +
    • A testbed with at least two machines.
      • +
    + +     +     + @@ -1287,6 +1337,37 @@     + + Path-based file system MAC policy + +

    Technical contact: Robert Watson, TrustedBSD discuss + mailing list

    +

    The TrustedBSD MAC Framework makes it easy to extend the FreeBSD + kernel security model using pluggable modules, which has provided + support for "traditional" mandatory access control, as well as + allowed a number of companies to build local security policy + extensions for workstation, server, and appliance products; one + such example is Apple's "Seatbelt" policy for Mac OS X. However, + the base system MAC policies are difficult to use, primarily + because they either don't extend security meta-data (ugidfw) or + they require extensive labeling (Biba, MLS). This project idea + involves crafting a new OS security policy extension along the + lines of ugidfw, the file system firewall, but using path names + instead of existing file properties to manage protection. This + requires careful thinking about what a file system path "is" in + the UNIX environment, as well as regarding what sorts of + policies would be useful.

    +

    Requirements:

    +
      +
    • Strong C programming skills.
      • +
    • Familiarity with OS security policies, including + discretionary and mandatory access control.
      • +
    +     +     + Security regression tests @@ -1506,12 +1587,13 @@ - + BSD-licensed Text-Processing Tools

    Technical contact: Diomidis Spinellis

    + href="mailto:dds@FreeBSD.org">Diomidis Spinellis, + Gábor Kövesdán

    Create/port BSD-licensed versions of one or more of the text processing tools that are currently missing from the FreeBSD distribution: sort, @@ -1530,7 +1612,9 @@ like the current GNU versions we use. Additionally this implementation has support for common vector fonts and unicode. If those utilities are option-compatible or not has to be analyzed. A port of this is already - available as textproc/heirloom-doctools. + available as textproc/heirloom-doctools. Alternativly, OpenBSD's + mdocml can replace groff's mdoc + functionality and may be sufficent for our purposes.

    Requirements:

      @@ -1635,7 +1719,7 @@ - + NDMP data server @@ -1682,7 +1766,7 @@ - + Proxy auto-config file support for libfetch ==== //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xsl#5 (text+ko) ==== @@ -7,7 +7,7 @@ %developers; ]> - + @@ -145,8 +145,7 @@ technical contacts below:

      @@ -82,13 +83,6 @@ become FreeBSD developers. It's also a great job networking opportunity!

      - -

      Current Student Projects

      - -

      We've recently announced the - successful students from the Summer of Code 2008.

      -

      Past Student Projects

      @@ -117,16 +111,129 @@

      Example Proposal Ideas

      -

      The application period for this year has closed, but students and - interested developers can always find interesting work that needs - to be done on the FreeBSD Project Ideas - list.

      +

      The following example project ideas are a subset of the general + FreeBSD Project + Ideas list that we think are the most suitable for Summer of + Code projects. You are not required to submit a proposal using one of + these ideas - original ideas, if of interest to the project, are + most welcome.

      + + +

      + +
        + +
      • + + ./ideas/index.html#p- + + + +
        • +         +
      +

      For additional ideas about upcoming development projects in FreeBSD, take a look at recent Developer Status Reports.

      + +

      Proposal Guidelines

      + +

      Students are responsible for writing a proposal and submitting it + to Google before the application deadline. The following outline + was adapted from the Perl Foundation open + source proposal HOWTO. The objective of the proposal is to identify + what is to be done, explain why this needs to be done, and convince us + that:

      + +
        +
      • You are qualified to do this project. This means both having the + necessary background and demonstrating a general understanding of the + problem.
        • +
      • You have the resources (especially time!) needed to complete the + project within the working period of the Summer of Code.
        • +
      + +

      A strong proposal will include (at least):

      + +

      General Information

      +
        +

      • Name

        • + +

      • Email

        • + +

      • Phone

        • + +

      • IM/IRC

        • + +

      • Availability

        + +

        How many hours per week will you spend working on this? How many on + other things? What other obligations (work, school, vacation, + weddings, etc) do you have this summer? Be as specific as possible: + when will the project begin and and? You should be ready to produce + a day by day schedule before the program starts.)

        + +

        Please note: participating in Google Summer of Code + is a significant time commitment, and you should not apply if you + already have another full-time job planned for the summer.

        • + +

      • Bio

        + +

        Who are you? What skills do you bring to this project? What is your + past involvement with The FreeBSD Project? (Past involvement is not + required, but ideally you will have at least installed FreeBSD and + perhaps fixed a bug or two) If your project includes programming in + a particular language, such as C, or in a specific environment, such + as the kernel or an embedded platform, what experience do you have + working in that area? Are you familiar with or a user of revision + control systems? Have you completed courses that will be relevant to + your project idea? What do you think you will need to learn to + complete this project?

        • + +

      • Possible Mentor

        + +

        Optional, but highly recommended. Do not put a name here if you have + not contacted them.

        • +
      + +

      Project Information

      +
        +

      • Project Title

        + +

        In forty characters or less, what you propose to do.

        • + +

      • Project Description

        + +

        A few paragraphs describing your project. Direct copies from the + ideas page will be rejected - proposals should reveal that you have + done some research into the problem and its solutions. Include both + what you will be doing and why it is a good thing for The FreeBSD + Project.

        • + +

      • Deliverables

        + +

        A list quantifiable results and related code milestones. We suggest + at least two milestones before the mid-term evaluations and two + after. Where appropriate, this schedule should include multiple + committable or releasable points so people can benefit from and/or + test your work as early as possible.

        • + +

      • Test Plan

        + +

        What parts of your code need testing and how do you plan to test + them? This might include both functionality and performance tests. +

        • + +

      • Project Schedule

        + +

        How long will the project take? When can you begin work?

        • + +
      +

      Mentors

      @@ -155,16 +262,84 @@

      Frequently Asked Questions

        -

      • I wasn't selected for funding by Google as part of the Google Summer of Code, can I still participate?

        +

      • When are proposals due, and how do I submit mine? +

        + +

        At the time of writing, Google has announced the following dates of + interest relating to the application process:

        + +
          +

        • 18 March - Google to announce what open source + organizations will participate in Google Summer of Code 2009.

          • + +

        • 23 March - Student application period opens. +

          • + +

        • 3 April - Student application period closes. +

          • + +

        • 15 April - Organizations finish reviewing + applications an mentors registered.

          • + +

        • 20 April - Accepted students announced.

          +
          • +
        + +

        Note that these dates may change, and the Google FAQ timeline is the + authoritative source of detailed schedule information:

        + + + +

        All students must register with, and submit applications via, the + Google Summer of Code home page:

        + +
        • + +

      • What advice do you have for a student who might want to + submit a proposal?

        + +

        Experience suggests that the strongest proposals come from students + who contact FreeBSD developers and potential mentors well in advance + of submitting their proposal, seek feedback on their proposal ideas, + and write proposals that reflect time spent exploring and understanding + the problem area to be addressed. Even if the FreeBSD developer(s) you + contact aren't the eventual mentor of the project, their feedback can + be invaluable.

        • + +

      • Can I submit multiple project proposals to the FreeBSD + Project?

        + +

        Yes, but do make sure you invest adequate time in each proposal. We + are not able to accept more than one project per student, so you may do + better spending more time on one or two detailed proposals than by + submitting lots of less-detailed ones.

        • + +

      • Will the FreeBSD Project accept more than one student for + the same idea?

        + +

        In general, we will accept only one student for any given proposal + idea, as most proposal ideas in our ideas list are sized with a single + student summer project in mind. This is a good reason to consider + coming up with your own idea, or at least, making sure that your + proposal for one of our project ideas reflects your unique contribution + and viewpoint. If you plan to submit multiple proposals, you might + consider doing one with an idea from the list, and another with an + original idea.

        • + +

      • What if my proposal is not selected in the application + process? Can I still participate?

        -

        Yes! By all means. Each year we have many more talented - student applications that there are available places and we are - very happy when students choose to get involved with FreeBSD. - Please mail soc-mentors@FreeBSD.org about how to proceed with - your project.

        • +

        We always have more good applications than student places, but that + doesn't mean you can't do the project anyway. The FreeBSD Project + always welcomes new volunteers to work on projects, and is generally + happy to provide mentoring and support for students whose proposals + could not be selected in order to allow them to work on their project + anyway. You will need to work with the FreeBSD Project GSoC + administrators to identify a possible mentor. However, Google will not + fund that participation.

      • What projects were completed successfully by students - last summer?

        + in previous summers?

        Please see the 2008 FreeBSD Summer of Code page, as well as older project pages from 2005 for a list of the completed projects from previous years.

        • +

      • How can I learn more about FreeBSD?

        + +

        The FreeBSD Project Home Page + is the best way to learn more about the project -- from there you can + reach the FreeBSD Handbook, FreeBSD Developer's Handbook, project + mailing list archives, regular project status reports, and more. If + you have questions about specific project ideas, e-mail the technical + contacts for those ideas. If you have general GSoC questions relating + to FreeBSD, such as if you are unable to reach a project technical + contact, need help finding documentation, or want to know who might be + a good person to talk to about your idea, send them to soc-admins@FreeBSD.org.

        +
        • + +

      • Is there an IRC channel I can join to talk about proposal + ideas or get help finding out more?

        + +

        You can join #freebsd-soc on the efnet IRC network to chat with + FreeBSD developers interested in mentoring student proposals and + projects, past FreeBSD/GSoC students, and other students applying to + FreeBSD/GSoC this year.

        • +
      + +

      Advertise on Your Campus

      + +

      Please help us advertise Google Summer of Code with FreeBSD at your + local university or college campus! You can forward around our e-mail + announcement to department and club mailing lists, and to department + secretaries to distribute. You can also print out and post copies of the + FreeBSD GSoC 2009 poster.

      + +

      [FreeBSD GSoC 2009 poster thumnail]

      +
      ==== //depot/projects/docproj_hu/www/en/releases/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/Makefile,v 1.52 2008/08/22 14:30:38 hrs Exp $ +# $FreeBSD: www/en/releases/Makefile,v 1.53 2009/03/17 13:40:36 rwatson Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -15,7 +15,7 @@ SUBDIR+= 4.6.2R 4.7R 4.8R 4.9R 4.10R 4.11R SUBDIR+= 5.0R 5.1R 5.2R 5.2.1R 5.3R 5.4R 5.5R SUBDIR+= 6.0R 6.1R 6.2R 6.3R 6.4R -SUBDIR+= 7.0R 7.1R +SUBDIR+= 7.0R 7.1R 7.2R .if defined $(NEW_BUILD) SUBDIR= ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#15 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -47,17 +47,10 @@ Information - - May 2009 - FreeBSD 7.2 -   + FreeBSD 7.2 + A draft release schedule has been announced. ==== //depot/projects/docproj_hu/www/share/sgml/libcommon.xsl#7 (text+ko) ==== @@ -1,7 +1,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 17 21:44:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9AA2106566C; Tue, 17 Mar 2009 21:43:59 +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 9A2CE106564A for ; Tue, 17 Mar 2009 21:43:59 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E61D8FC0C for ; Tue, 17 Mar 2009 21:43:59 +0000 (UTC) (envelope-from pgj@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 n2HLhx6l027071 for ; Tue, 17 Mar 2009 21:43:59 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2HLhxA5027069 for perforce@freebsd.org; Tue, 17 Mar 2009 21:43:59 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 17 Mar 2009 21:43:59 GMT Message-Id: <200903172143.n2HLhxA5027069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 159354 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: Tue, 17 Mar 2009 21:44:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=159354 Change 159354 by pgj@beehive on 2009/03/17 21:43:05 MFen (doc): 1.1109 -> 1.1110 hu_HU.ISO8859-2/books/faq/book.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#40 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#40 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -6771,7 +6771,7 @@ &prompt.root; newfs /dev/ad1s1a &prompt.root; mount /dev/ad1s1a /mnt &prompt.root; cd /mnt -&prompt.root; dump 0af - / | restore xf - +&prompt.root; dump 0af - / | restore rf - További munkát igényel, ha a dump parancs @@ -6792,9 +6792,9 @@ &prompt.root; newfs /dev/ad1s1a &prompt.root; mount /dev/ad1s1a /mnt &prompt.root; cd /mnt -&prompt.root; dump 0af - / | restore xf - +&prompt.root; dump 0af - / | restore rf - &prompt.root; cd var -&prompt.root; dump 0af - /var | restore xf - +&prompt.root; dump 0af - /var | restore rf - Egy könyvtárat, például /var tartalmát @@ -6815,7 +6815,7 @@ &prompt.root; mkdir /mnt/var &prompt.root; mount /dev/ad1s1d /mnt/var &prompt.root; cd /mnt -&prompt.root; dump 0af - / | restore xf - +&prompt.root; dump 0af - / | restore rf - A felhasználói adatok esetén a &man.cpio.1;, &man.pax.1;, &man.tar.1; és &man.dump.8; From owner-p4-projects@FreeBSD.ORG Tue Mar 17 21:57:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 207EA10656BE; Tue, 17 Mar 2009 21:57:13 +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 C332D1065697 for ; Tue, 17 Mar 2009 21:57:12 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B176D8FC1C for ; Tue, 17 Mar 2009 21:57:12 +0000 (UTC) (envelope-from pgj@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 n2HLvC6R028040 for ; Tue, 17 Mar 2009 21:57:12 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2HLvCWA028038 for perforce@freebsd.org; Tue, 17 Mar 2009 21:57:12 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 17 Mar 2009 21:57:12 GMT Message-Id: <200903172157.n2HLvCWA028038@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 159355 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: Tue, 17 Mar 2009 21:57:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=159355 Change 159355 by pgj@beehive on 2009/03/17 21:57:04 MFen (www): 1.232 -> 1.233 share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#6 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#6 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,15 @@ 3 + 16 + + +

      Új tag: Fabien + Thomas (src)

      +       +       + + 12 From owner-p4-projects@FreeBSD.ORG Wed Mar 18 05:04:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE3901065673; Wed, 18 Mar 2009 05:04:39 +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 6E26B1065670 for ; Wed, 18 Mar 2009 05:04:39 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5C78B8FC14 for ; Wed, 18 Mar 2009 05:04:39 +0000 (UTC) (envelope-from sson@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 n2I54dK3096492 for ; Wed, 18 Mar 2009 05:04:39 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2I54dY7096490 for perforce@freebsd.org; Wed, 18 Mar 2009 05:04:39 GMT (envelope-from sson@FreeBSD.org) Date: Wed, 18 Mar 2009 05:04:39 GMT Message-Id: <200903180504.n2I54dY7096490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 159366 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, 18 Mar 2009 05:04:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=159366 Change 159366 by sson@sson_amd64 on 2009/03/18 05:04:10 Remove convenience macros because of potential namespace pollution. The convenience field macros for struct au_session could cause problems for other code that includes bsm/audit.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#8 (text+ko) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#8 $ */ #ifndef _BSM_AUDIT_H @@ -230,11 +230,6 @@ struct au_session { auditinfo_addr_t *as_aia_p; /* Ptr to full audit info. */ -#define as_asid as_aia_p->ai_asid -#define as_auid as_aia_p->ai_auid -#define as_termid as_aia_p->ai_termid -#define as_flags as_aia_p->ai_flags - au_mask_t as_mask; /* Process Audit Masks. */ }; typedef struct au_session au_session_t; From owner-p4-projects@FreeBSD.ORG Wed Mar 18 10:40:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FD0F106568C; Wed, 18 Mar 2009 10:40:22 +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 C00DF106568A for ; Wed, 18 Mar 2009 10:40:21 +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 ABDA48FC08 for ; Wed, 18 Mar 2009 10:40:21 +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 n2IAeL0l036935 for ; Wed, 18 Mar 2009 10:40:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IAeJkh036933 for perforce@freebsd.org; Wed, 18 Mar 2009 10:40:19 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 18 Mar 2009 10:40:19 GMT Message-Id: <200903181040.n2IAeJkh036933@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 159368 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, 18 Mar 2009 10:40:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=159368 Change 159368 by hselasky@hselasky_laptop001 on 2009/03/18 10:39:44 IFC @ 159365 Affected files ... .. //depot/projects/usb/src/sys/amd64/acpica/Makefile#1 branch .. //depot/projects/usb/src/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/usb/src/sys/amd64/acpica/acpi_switch.S#1 branch .. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/usb/src/sys/amd64/acpica/genwakecode.sh#1 branch .. //depot/projects/usb/src/sys/amd64/acpica/genwakedata.sh#1 branch .. //depot/projects/usb/src/sys/amd64/amd64/amd64_mem.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#11 integrate .. //depot/projects/usb/src/sys/amd64/amd64/db_trace.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/genassym.c#11 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#19 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#17 integrate .. //depot/projects/usb/src/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/usb/src/sys/amd64/include/apicvar.h#7 integrate .. //depot/projects/usb/src/sys/amd64/include/elf.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/pcb.h#7 integrate .. //depot/projects/usb/src/sys/amd64/include/pcpu.h#6 integrate .. //depot/projects/usb/src/sys/amd64/include/smp.h#7 integrate .. //depot/projects/usb/src/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/usb/src/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/usb/src/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/usb/src/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/usb/src/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/usb/src/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#16 integrate .. //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#6 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#5 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/usb/src/sys/arm/include/elf.h#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#13 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/if_npe.c#8 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425.c#8 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_pci.c#6 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425reg.h#6 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/bioscd.c#4 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#8 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#9 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_emul.h#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#8 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_futex.h#6 integrate .. //depot/projects/usb/src/sys/compat/ndis/hal_var.h#3 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_hal.c#4 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#12 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#9 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/usb/src/sys/conf/NOTES#30 integrate .. //depot/projects/usb/src/sys/conf/files#55 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#18 integrate .. //depot/projects/usb/src/sys/conf/files.i386#20 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#17 integrate .. //depot/projects/usb/src/sys/conf/options#22 integrate .. //depot/projects/usb/src/sys/conf/options.amd64#8 integrate .. //depot/projects/usb/src/sys/conf/options.arm#10 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/usb/src/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/usb/src/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/usb/src/sys/dev/atkbdc/psm.c#10 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus.c#11 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus_cis.c#7 integrate .. //depot/projects/usb/src/sys/dev/cfi/cfi_disk.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#9 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#9 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#11 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#9 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#9 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_ioctl.h#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#13 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_multiq.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#11 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/usb/src/sys/dev/dcons/dcons_os.c#10 integrate .. //depot/projects/usb/src/sys/dev/drm/drmP.h#11 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_bufs.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#10 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_lock.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_vm.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/r600_cp.c#2 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_irq.c#7 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/usb/src/sys/dev/fe/if_fe_pccard.c#4 integrate .. //depot/projects/usb/src/sys/dev/firewire/firewire.c#11 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#20 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#15 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#11 integrate .. //depot/projects/usb/src/sys/dev/k8temp/k8temp.c#6 delete .. //depot/projects/usb/src/sys/dev/md/md.c#11 integrate .. //depot/projects/usb/src/sys/dev/mmc/mmc.c#9 integrate .. //depot/projects/usb/src/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccard_cis.c#7 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccarddevs#10 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_pci.c#9 integrate .. //depot/projects/usb/src/sys/dev/pci/pcib_private.h#6 integrate .. //depot/projects/usb/src/sys/dev/ppbus/lpbb.c#6 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#26 integrate .. //depot/projects/usb/src/sys/dev/txp/if_txp.c#7 integrate .. //depot/projects/usb/src/sys/dev/txp/if_txpreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#50 integrate .. //depot/projects/usb/src/sys/dev/xen/balloon/balloon.c#2 integrate .. //depot/projects/usb/src/sys/dev/xen/blkfront/blkfront.c#5 integrate .. //depot/projects/usb/src/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/usb/src/sys/dev/xen/console/xencons_ring.c#3 integrate .. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#7 integrate .. //depot/projects/usb/src/sys/dev/xen/xenpci/evtchn.c#1 branch .. //depot/projects/usb/src/sys/dev/xen/xenpci/machine_reboot.c#1 branch .. //depot/projects/usb/src/sys/dev/xen/xenpci/xenpci.c#1 branch .. //depot/projects/usb/src/sys/dev/xen/xenpci/xenpcivar.h#1 branch .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#18 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vnops.c#12 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vfsops.c#12 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.c#9 integrate .. //depot/projects/usb/src/sys/geom/geom_redboot.c#2 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#9 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#5 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#20 integrate .. //depot/projects/usb/src/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/i686_mem.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/k6_mem.c#4 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/usb/src/sys/i386/include/elf.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#12 integrate .. //depot/projects/usb/src/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/usb/src/sys/ia64/include/elf.h#4 integrate .. //depot/projects/usb/src/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_ktrace.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_mutex.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_poll.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_rwlock.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_sysctl.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_thread.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#10 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#15 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#19 integrate .. //depot/projects/usb/src/sys/kern/subr_lock.c#10 integrate .. //depot/projects/usb/src/sys/kern/subr_param.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_smp.c#11 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#13 integrate .. //depot/projects/usb/src/sys/kern/sys_pipe.c#11 integrate .. //depot/projects/usb/src/sys/kern/uipc_sem.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#16 integrate .. //depot/projects/usb/src/sys/kern/vnode_if.src#12 integrate .. //depot/projects/usb/src/sys/mips/include/elf.h#3 integrate .. //depot/projects/usb/src/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/usb/src/sys/modules/Makefile#28 integrate .. //depot/projects/usb/src/sys/modules/amdtemp/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/k8temp/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/netgraph/Makefile#7 integrate .. //depot/projects/usb/src/sys/net/if.c#19 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#13 integrate .. //depot/projects/usb/src/sys/net/if_loop.c#16 integrate .. //depot/projects/usb/src/sys/net/if_tap.c#9 integrate .. //depot/projects/usb/src/sys/net/if_var.h#13 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#10 integrate .. //depot/projects/usb/src/sys/netinet/in.c#19 integrate .. //depot/projects/usb/src/sys/netinet/in.h#11 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#11 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp.h#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#18 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.c#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_var.h#13 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#18 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.h#11 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#19 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#13 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#10 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#16 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#18 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#15 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#15 integrate .. //depot/projects/usb/src/sys/netinet6/mld6.c#11 integrate .. //depot/projects/usb/src/sys/netnatm/natm.c#5 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#18 integrate .. //depot/projects/usb/src/sys/pc98/conf/NOTES#15 integrate .. //depot/projects/usb/src/sys/pci/intpm.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/include/elf.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/usb/src/sys/powerpc/mpc85xx/mpc85xx.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate .. //depot/projects/usb/src/sys/powerpc/mpc85xx/ocpbus.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/usb/src/sys/security/mac/mac_audit.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_cred.c#3 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_inet.c#11 integrate .. //depot/projects/usb/src/sys/security/mac/mac_inet6.c#4 integrate .. //depot/projects/usb/src/sys/security/mac/mac_internal.h#9 integrate .. //depot/projects/usb/src/sys/security/mac/mac_net.c#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_pipe.c#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_posix_sem.c#9 integrate .. //depot/projects/usb/src/sys/security/mac/mac_posix_shm.c#4 integrate .. //depot/projects/usb/src/sys/security/mac/mac_priv.c#4 integrate .. //depot/projects/usb/src/sys/security/mac/mac_process.c#11 integrate .. //depot/projects/usb/src/sys/security/mac/mac_socket.c#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_syscalls.c#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_system.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_msg.c#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_sem.c#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_shm.c#7 integrate .. //depot/projects/usb/src/sys/security/mac/mac_vfs.c#9 integrate .. //depot/projects/usb/src/sys/security/mac_portacl/mac_portacl.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/usb/src/sys/sparc64/include/elf.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/elf_machdep.c#7 integrate .. //depot/projects/usb/src/sys/sun4v/include/elf.h#3 integrate .. //depot/projects/usb/src/sys/sys/_pthreadtypes.h#2 integrate .. //depot/projects/usb/src/sys/sys/aio.h#3 integrate .. //depot/projects/usb/src/sys/sys/buf.h#6 integrate .. //depot/projects/usb/src/sys/sys/diskpc98.h#2 integrate .. //depot/projects/usb/src/sys/sys/elf_common.h#11 integrate .. //depot/projects/usb/src/sys/sys/imgact.h#5 integrate .. //depot/projects/usb/src/sys/sys/imgact_elf.h#4 integrate .. //depot/projects/usb/src/sys/sys/ktrace.h#3 integrate .. //depot/projects/usb/src/sys/sys/lock_profile.h#6 integrate .. //depot/projects/usb/src/sys/sys/memrange.h#2 integrate .. //depot/projects/usb/src/sys/sys/mount.h#16 integrate .. //depot/projects/usb/src/sys/sys/param.h#25 integrate .. //depot/projects/usb/src/sys/sys/pipe.h#4 integrate .. //depot/projects/usb/src/sys/sys/proc.h#17 integrate .. //depot/projects/usb/src/sys/sys/sem.h#3 integrate .. //depot/projects/usb/src/sys/sys/shm.h#4 integrate .. //depot/projects/usb/src/sys/sys/smp.h#5 integrate .. //depot/projects/usb/src/sys/sys/stat.h#6 integrate .. //depot/projects/usb/src/sys/sys/syslog.h#2 integrate .. //depot/projects/usb/src/sys/sys/termios.h#6 integrate .. //depot/projects/usb/src/sys/sys/time.h#7 integrate .. //depot/projects/usb/src/sys/sys/uio.h#3 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#17 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vnops.c#12 integrate .. //depot/projects/usb/src/sys/ufs/ufs/inode.h#6 integrate .. //depot/projects/usb/src/sys/xen/evtchn/evtchn.c#5 integrate .. //depot/projects/usb/src/sys/xen/evtchn/evtchn_dev.c#3 integrate .. //depot/projects/usb/src/sys/xen/features.c#3 integrate .. //depot/projects/usb/src/sys/xen/features.h#1 branch .. //depot/projects/usb/src/sys/xen/gnttab.c#6 integrate .. //depot/projects/usb/src/sys/xen/gnttab.h#6 integrate .. //depot/projects/usb/src/sys/xen/hypervisor.h#2 integrate .. //depot/projects/usb/src/sys/xen/interface/arch-x86/xen.h#3 integrate .. //depot/projects/usb/src/sys/xen/interface/hvm/params.h#3 integrate .. //depot/projects/usb/src/sys/xen/reboot.c#1 branch .. //depot/projects/usb/src/sys/xen/xen_intr.h#2 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_probe.c#4 integrate .. //depot/projects/usb/src/sys/xen/xenbus/xenbus_xs.c#5 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ==== @@ -25,31 +25,56 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.18 2008/03/13 20:39:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.19 2009/03/17 00:48:11 jkim Exp $"); #include #include #include #include +#include #include #include #include +SYSCTL_DECL(_debug_acpi); + +uint32_t acpi_resume_beep; +TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep); +SYSCTL_UINT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep, + 0, "Beep the PC speaker when resuming"); +uint32_t acpi_reset_video; +TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video); + static int intr_model = ACPI_INTR_PIC; +static struct apm_clone_data acpi_clone; int acpi_machdep_init(device_t dev) { - struct acpi_softc *sc; + struct acpi_softc *sc; sc = devclass_get_softc(devclass_find("acpi"), 0); + + /* Create a fake clone for /dev/acpi. */ + STAILQ_INIT(&sc->apm_cdevs); + acpi_clone.cdev = sc->acpi_dev_t; + acpi_clone.acpi_sc = sc; + ACPI_LOCK(acpi); + STAILQ_INSERT_TAIL(&sc->apm_cdevs, &acpi_clone, entries); + ACPI_UNLOCK(acpi); + sc->acpi_clone = &acpi_clone; acpi_install_wakeup_handler(sc); if (intr_model != ACPI_INTR_PIC) acpi_SetIntrModel(intr_model); + SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx, + SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, + "reset_video", CTLFLAG_RW, &acpi_reset_video, 0, + "Call the VESA reset BIOS vector on the resume path"); + return (0); } ==== //depot/projects/usb/src/sys/amd64/acpica/acpi_wakeup.c#2 (text+ko) ==== @@ -1,6 +1,8 @@ /*- * Copyright (c) 2001 Takanori Watanabe * Copyright (c) 2001 Mitsuru IWASAKI + * Copyright (c) 2003 Peter Wemm + * Copyright (c) 2008-2009 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,21 +28,414 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.22 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.23 2009/03/17 00:48:11 jkim Exp $"); #include +#include #include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#ifdef SMP +#include +#include +#endif #include #include +#include "acpi_wakecode.h" +#include "acpi_wakedata.h" + +/* Make sure the code is less than a page and leave room for the stack. */ +CTASSERT(sizeof(wakecode) < PAGE_SIZE - 1024); + +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + +extern uint32_t acpi_resume_beep; +extern uint32_t acpi_reset_video; + +#ifdef SMP +extern struct xpcb *stopxpcbs; +#else +static struct xpcb *stopxpcbs; +#endif + +int acpi_restorecpu(struct xpcb *, vm_offset_t); +int acpi_savecpu(struct xpcb *); + +static void acpi_reset_tss(int cpu); +static void acpi_alloc_wakeup_handler(void); +static void acpi_stop_beep(void *); + +#ifdef SMP +static int acpi_wakeup_ap(struct acpi_softc *, int); +static void acpi_wakeup_cpus(struct acpi_softc *, cpumask_t); +#endif + +#define WAKECODE_VADDR(sc) ((sc)->acpi_wakeaddr + (3 * PAGE_SIZE)) +#define WAKECODE_PADDR(sc) ((sc)->acpi_wakephys + (3 * PAGE_SIZE)) +#define WAKECODE_FIXUP(offset, type, val) do { \ + type *addr; \ + addr = (type *)(WAKECODE_VADDR(sc) + offset); \ + *addr = val; \ +} while (0) + +/* Turn off bits 1&2 of the PIT, stopping the beep. */ +static void +acpi_stop_beep(void *arg) +{ + outb(0x61, inb(0x61) & ~0x3); +} + +#ifdef SMP +static int +acpi_wakeup_ap(struct acpi_softc *sc, int cpu) +{ + int vector = (WAKECODE_PADDR(sc) >> 12) & 0xff; + int apic_id = cpu_apic_ids[cpu]; + int ms; + + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[cpu]); + WAKECODE_FIXUP(wakeup_gdt, uint16_t, stopxpcbs[cpu].xpcb_gdt.rd_limit); + WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, + stopxpcbs[cpu].xpcb_gdt.rd_base); + WAKECODE_FIXUP(wakeup_cpu, int, cpu); + + acpi_reset_tss(cpu); + + /* do an INIT IPI: assert RESET */ + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, apic_id); + + /* wait for pending status end */ + lapic_ipi_wait(-1); + + /* do an INIT IPI: deassert RESET */ + lapic_ipi_raw(APIC_DEST_ALLESELF | APIC_TRIGMOD_LEVEL | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, 0); + + /* wait for pending status end */ + DELAY(10000); /* wait ~10mS */ + lapic_ipi_wait(-1); + + /* + * next we do a STARTUP IPI: the previous INIT IPI might still be + * latched, (P5 bug) this 1st STARTUP would then terminate + * immediately, and the previously started INIT IPI would continue. OR + * the previous INIT IPI has already run. and this STARTUP IPI will + * run. OR the previous INIT IPI was ignored. and this STARTUP IPI + * will run. + */ + + /* do a STARTUP IPI */ + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + vector, apic_id); + lapic_ipi_wait(-1); + DELAY(200); /* wait ~200uS */ + + /* + * finally we do a 2nd STARTUP IPI: this 2nd STARTUP IPI should run IF + * the previous STARTUP IPI was cancelled by a latched INIT IPI. OR + * this STARTUP IPI will be ignored, as only ONE STARTUP IPI is + * recognized after hardware RESET or INIT IPI. + */ + + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + vector, apic_id); + lapic_ipi_wait(-1); + DELAY(200); /* wait ~200uS */ + + /* Wait up to 5 seconds for it to start. */ + for (ms = 0; ms < 5000; ms++) { + if (*(int *)(WAKECODE_VADDR(sc) + wakeup_cpu) == 0) + return (1); /* return SUCCESS */ + DELAY(1000); + } + return (0); /* return FAILURE */ +} + +#define WARMBOOT_TARGET 0 +#define WARMBOOT_OFF (KERNBASE + 0x0467) +#define WARMBOOT_SEG (KERNBASE + 0x0469) + +#define CMOS_REG (0x70) +#define CMOS_DATA (0x71) +#define BIOS_RESET (0x0f) +#define BIOS_WARM (0x0a) + +static void +acpi_wakeup_cpus(struct acpi_softc *sc, cpumask_t wakeup_cpus) +{ + uint32_t mpbioswarmvec; + cpumask_t map; + int cpu; + u_char mpbiosreason; + + /* save the current value of the warm-start vector */ + mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF); + outb(CMOS_REG, BIOS_RESET); + mpbiosreason = inb(CMOS_DATA); + + /* setup a vector to our boot code */ + *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; + *((volatile u_short *)WARMBOOT_SEG) = WAKECODE_PADDR(sc) >> 4; + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ + + /* Wake up each AP. */ + for (cpu = 1; cpu < mp_ncpus; cpu++) { + map = 1ul << cpu; + if ((wakeup_cpus & map) != map) + continue; + if (acpi_wakeup_ap(sc, cpu) == 0) { + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)", + cpu, cpu_apic_ids[cpu]); + } + } + + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, mpbiosreason); +} +#endif + +static void +acpi_reset_tss(int cpu) +{ + uint32_t *tss; + + /* + * We have to clear "task busy" bit in TSS to restore + * task register later. Otherwise, ltr causes GPF. + */ + tss = (uint32_t *)&gdt[NGDT * cpu + GPROC0_SEL] + 1; + *tss &= ~((SDT_SYSBSY ^ SDT_SYSTSS) << 8); +} + int acpi_sleep_machdep(struct acpi_softc *sc, int state) { - return (0); + struct savefpu *stopfpu; +#ifdef SMP + cpumask_t wakeup_cpus; +#endif + register_t cr3, rf; + ACPI_STATUS status; + int ret; + + ret = -1; + + if (sc->acpi_wakeaddr == 0ul) + return (ret); + +#ifdef SMP + wakeup_cpus = PCPU_GET(other_cpus); +#endif + + AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc)); + + rf = intr_disable(); + intr_suspend(); + + /* + * Temporarily switch to the kernel pmap because it provides + * an identity mapping (setup at boot) for the low physical + * memory region containing the wakeup code. + */ + cr3 = rcr3(); + load_cr3(KPML4phys); + + stopfpu = &stopxpcbs[0].xpcb_pcb.pcb_save; + if (acpi_savecpu(&stopxpcbs[0])) { + fpugetregs(curthread, stopfpu); + +#ifdef SMP + if (wakeup_cpus != 0 && suspend_cpus(wakeup_cpus) == 0) { + device_printf(sc->acpi_dev, + "Failed to suspend APs: CPU mask = 0x%jx\n", + (uintmax_t)(wakeup_cpus & ~stopped_cpus)); + goto out; + } +#endif + + WAKECODE_FIXUP(resume_beep, uint32_t, acpi_resume_beep); + WAKECODE_FIXUP(reset_video, uint32_t, acpi_reset_video); + + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[0]); + WAKECODE_FIXUP(wakeup_gdt, uint16_t, + stopxpcbs[0].xpcb_gdt.rd_limit); + WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, + stopxpcbs[0].xpcb_gdt.rd_base); + WAKECODE_FIXUP(wakeup_cpu, int, 0); + + acpi_reset_tss(0); + + /* Call ACPICA to enter the desired sleep state */ + if (state == ACPI_STATE_S4 && sc->acpi_s4bios) + status = AcpiEnterSleepStateS4bios(); + else + status = AcpiEnterSleepState(state); + + if (status != AE_OK) { + device_printf(sc->acpi_dev, + "AcpiEnterSleepState failed - %s\n", + AcpiFormatException(status)); + goto out; + } + + for (;;) + ia32_pause(); + } else { + fpusetregs(curthread, stopfpu); + + WAKECODE_FIXUP(resume_beep, uint32_t, 0); + WAKECODE_FIXUP(reset_video, uint32_t, 0); +#ifdef SMP + if (wakeup_cpus != 0) + acpi_wakeup_cpus(sc, wakeup_cpus); +#endif + ret = 0; + } + +out: +#ifdef SMP + if (wakeup_cpus != 0) + restart_cpus(wakeup_cpus); +#endif + + load_cr3(cr3); + intr_resume(); + intr_restore(rf); + + AcpiSetFirmwareWakingVector(0); + + if (ret == 0 && mem_range_softc.mr_op != NULL && + mem_range_softc.mr_op->reinit != NULL) + mem_range_softc.mr_op->reinit(&mem_range_softc); + + /* If we beeped, turn it off after a delay. */ + if (acpi_resume_beep) + timeout(acpi_stop_beep, NULL, 3 * hz); + + return (ret); +} + +static vm_offset_t acpi_wakeaddr; + +static void +acpi_alloc_wakeup_handler(void) +{ + void *wakeaddr; + + if (!cold) + return; + + /* + * Specify the region for our wakeup code. We want it in the low 1 MB + * region, excluding video memory and above (0xa0000). We ask for + * it to be page-aligned, just to be safe. + */ + wakeaddr = contigmalloc(4 * PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0, 0x9ffff, + PAGE_SIZE, 0ul); + if (wakeaddr == NULL) { + printf("%s: can't alloc wake memory\n", __func__); + return; + } + stopxpcbs = malloc(mp_ncpus * sizeof(*stopxpcbs), M_DEVBUF, M_NOWAIT); + if (stopxpcbs == NULL) { + contigfree(wakeaddr, 4 * PAGE_SIZE, M_DEVBUF); + printf("%s: can't alloc CPU state memory\n", __func__); + return; + } + acpi_wakeaddr = (vm_offset_t)wakeaddr; } +SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0); + void acpi_install_wakeup_handler(struct acpi_softc *sc) { + uint64_t *pt4, *pt3, *pt2; + int i; + + if (acpi_wakeaddr == 0ul) + return; + + sc->acpi_wakeaddr = acpi_wakeaddr; + sc->acpi_wakephys = vtophys(acpi_wakeaddr); + + bcopy(wakecode, (void *)WAKECODE_VADDR(sc), sizeof(wakecode)); + + /* Patch GDT base address, ljmp targets and page table base address. */ + WAKECODE_FIXUP((bootgdtdesc + 2), uint32_t, + WAKECODE_PADDR(sc) + bootgdt); + WAKECODE_FIXUP((wakeup_sw32 + 2), uint32_t, + WAKECODE_PADDR(sc) + wakeup_32); + WAKECODE_FIXUP((wakeup_sw64 + 1), uint32_t, + WAKECODE_PADDR(sc) + wakeup_64); + WAKECODE_FIXUP(wakeup_pagetables, uint32_t, sc->acpi_wakephys); + + /* Save pointers to some global data. */ + WAKECODE_FIXUP(wakeup_retaddr, void *, acpi_restorecpu); + WAKECODE_FIXUP(wakeup_kpml4, uint64_t, KPML4phys); + WAKECODE_FIXUP(wakeup_ctx, vm_offset_t, + WAKECODE_VADDR(sc) + wakeup_ctx); + WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER)); + WAKECODE_FIXUP(wakeup_pat, uint64_t, rdmsr(MSR_PAT)); + WAKECODE_FIXUP(wakeup_star, uint64_t, rdmsr(MSR_STAR)); + WAKECODE_FIXUP(wakeup_lstar, uint64_t, rdmsr(MSR_LSTAR)); + WAKECODE_FIXUP(wakeup_cstar, uint64_t, rdmsr(MSR_CSTAR)); + WAKECODE_FIXUP(wakeup_sfmask, uint64_t, rdmsr(MSR_SF_MASK)); + + /* Build temporary page tables below realmode code. */ + pt4 = (uint64_t *)acpi_wakeaddr; + pt3 = pt4 + (PAGE_SIZE) / sizeof(uint64_t); + pt2 = pt3 + (PAGE_SIZE) / sizeof(uint64_t); + + /* Create the initial 1GB replicated page tables */ + for (i = 0; i < 512; i++) { + /* + * Each slot of the level 4 pages points + * to the same level 3 page + */ + pt4[i] = (uint64_t)(sc->acpi_wakephys + PAGE_SIZE); + pt4[i] |= PG_V | PG_RW | PG_U; + + /* + * Each slot of the level 3 pages points + * to the same level 2 page + */ + pt3[i] = (uint64_t)(sc->acpi_wakephys + (2 * PAGE_SIZE)); + pt3[i] |= PG_V | PG_RW | PG_U; + + /* The level 2 page slots are mapped with 2MB pages for 1GB. */ + pt2[i] = i * (2 * 1024 * 1024); + pt2[i] |= PG_V | PG_RW | PG_PS | PG_U; + } + + if (bootverbose) + device_printf(sc->acpi_dev, "wakeup code va %p pa %p\n", + (void *)sc->acpi_wakeaddr, (void *)sc->acpi_wakephys); } ==== //depot/projects/usb/src/sys/amd64/amd64/amd64_mem.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.31 2009/01/12 19:17:35 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.32 2009/03/17 00:48:11 jkim Exp $"); #include #include @@ -73,11 +73,13 @@ static int amd64_mrset(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg); static void amd64_mrAPinit(struct mem_range_softc *sc); +static void amd64_mrreinit(struct mem_range_softc *sc); static struct mem_range_ops amd64_mrops = { amd64_mrinit, amd64_mrset, - amd64_mrAPinit + amd64_mrAPinit, + amd64_mrreinit }; /* XXX for AP startup hook */ @@ -668,6 +670,30 @@ wrmsr(MSR_MTRRdefType, mtrrdef); } +/* + * Re-initialise running CPU(s) MTRRs to match the ranges in the descriptor + * list. + * + * XXX Must be called with interrupts enabled. + */ +static void +amd64_mrreinit(struct mem_range_softc *sc) +{ +#ifdef SMP + /* + * We should use ipi_all_but_self() to call other CPUs into a + * locking gate, then call a target function to do this work. + * The "proper" solution involves a generalised locking gate + * implementation, not ready yet. + */ + smp_rendezvous(NULL, (void *)amd64_mrAPinit, NULL, sc); +#else + disable_intr(); /* disable interrupts */ + amd64_mrAPinit(sc); + enable_intr(); +#endif +} + static void amd64_mem_drvinit(void *unused) { ==== //depot/projects/usb/src/sys/amd64/amd64/apic_vector.S#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.110 2006/12/17 06:48:39 kmacy Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.111 2009/03/17 00:48:11 jkim Exp $ */ /* @@ -224,6 +224,22 @@ iretq /* + * Executed by a CPU when it receives an IPI_SUSPEND from another CPU. + */ + .text + SUPERALIGN_TEXT +IDTVEC(cpususpend) + PUSH_FRAME + + movq lapic, %rax + movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ + + call cpususpend_handler + + POP_FRAME + iretq + +/* * Executed by a CPU when it receives a RENDEZVOUS IPI from another CPU. * * - Calls the generic rendezvous action function. ==== //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#11 (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/amd64/amd64/cpu_switch.S,v 1.166 2009/01/31 11:37:21 obrien Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.167 2009/03/17 00:48:11 jkim Exp $ */ #include @@ -325,9 +325,8 @@ movq %r11,%dr6 movq %rax,%dr7 jmp done_load_dr +END(cpu_switch) -END(cpu_switch) - /* * savectx(pcb) * Update pcb, saving current processor state. @@ -386,3 +385,74 @@ ret END(savectx) + +/* + * savectx2(xpcb) + * Update xpcb, saving current processor state. + */ +ENTRY(savectx2) + /* Fetch XPCB. */ + movq %rdi,%r8 + + /* Save caller's return address. */ + movq (%rsp),%rax + movq %rax,PCB_RIP(%r8) + + mov %ds,PCB_DS(%r8) + mov %es,PCB_ES(%r8) + mov %ss,XPCB_SS(%r8) + mov %fs,PCB_FS(%r8) + mov %gs,PCB_GS(%r8) + + movq %rbx,PCB_RBX(%r8) + movq %rsp,PCB_RSP(%r8) + movq %rbp,PCB_RBP(%r8) + movq %r12,PCB_R12(%r8) + movq %r13,PCB_R13(%r8) + movq %r14,PCB_R14(%r8) + movq %r15,PCB_R15(%r8) + + movq %cr0,%rax + movq %rax,XPCB_CR0(%r8) + movq %cr2,%rax + movq %rax,XPCB_CR2(%r8) + movq %cr4,%rax + movq %rax,XPCB_CR4(%r8) + + movq %dr0,%rax + movq %rax,PCB_DR0(%r8) + movq %dr1,%rax + movq %rax,PCB_DR1(%r8) + movq %dr2,%rax + movq %rax,PCB_DR2(%r8) + movq %dr3,%rax + movq %rax,PCB_DR3(%r8) + movq %dr6,%rax + movq %rax,PCB_DR6(%r8) + movq %dr7,%rax + movq %rax,PCB_DR7(%r8) + + sgdt XPCB_GDT(%r8) + sidt XPCB_IDT(%r8) + sldt XPCB_LDT(%r8) + str XPCB_TR(%r8) + + movl $MSR_FSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%rax + movq %rax,PCB_FSBASE(%r8) + movl $MSR_GSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%rax + movq %rax,PCB_GSBASE(%r8) + movl $MSR_KGSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%rax + movq %rax,XPCB_KGSBASE(%r8) + + movl $1, %eax + ret +END(savectx2) ==== //depot/projects/usb/src/sys/amd64/amd64/db_trace.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.83 2008/12/05 11:34:36 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.84 2009/03/17 00:48:11 jkim Exp $"); #include "opt_compat.h" @@ -316,6 +316,7 @@ strcmp(name, "Xtimerint") == 0 || strcmp(name, "Xipi_intr_bitmap_handler") == 0 || >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 18 11:16:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 713B31065676; Wed, 18 Mar 2009 11:16:08 +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 2C9FC1065670 for ; Wed, 18 Mar 2009 11:16:08 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1837D8FC16 for ; Wed, 18 Mar 2009 11:16:08 +0000 (UTC) (envelope-from trasz@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 n2IBG84s040728 for ; Wed, 18 Mar 2009 11:16:08 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IBFxJB040712 for perforce@freebsd.org; Wed, 18 Mar 2009 11:15:59 GMT (envelope-from trasz@freebsd.org) Date: Wed, 18 Mar 2009 11:15:59 GMT Message-Id: <200903181115.n2IBFxJB040712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 159370 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, 18 Mar 2009 11:16:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=159370 Change 159370 by trasz@trasz_victim7 on 2009/03/18 11:15:58 IFC, untested. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/MAINTAINERS#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/Makefile#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#21 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/cat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/ps/extern.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/ps/keyword.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/ps/print.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/miscbltin.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/Makefile.inc#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/csup/updater.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/c-opts.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/c-tree.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/doc/extend.texi#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/Q.ou0#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/Q.ou1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/Qtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/README#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/d.out#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/dI.out#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/dIsi.out#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/dItest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/dd.out#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/ddsi.out#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/ddtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/dt.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/dtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/dtst.out#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/f.out#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/ftest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/getround.c#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/makefile#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/obad/strtodt.out#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/obad/xL.out#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/rtestnos#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/strtoIdSI.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/strtoIddSI.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/strtodISI.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/strtodt.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/strtopddSI.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/strtorddSI.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/testnos#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/testnos1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/testnos3#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/x.ou0#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/x.ou1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/xL.ou0#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/xL.ou1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/xLtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/xQtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/xsum0.out#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/test/xtest.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/xsum0.out#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/COPYING#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ChangeLog#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/FREEBSD-Xlist#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/FREEBSD-upgrade#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/accounting.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/accounting.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/aes.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/aes.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/aes_wrap.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/aes_wrap.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ap.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ap_list.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ap_list.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/beacon.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/beacon.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/build_config.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/config.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/config.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/config_types.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/crypto.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/crypto.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ctrl_iface.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ctrl_iface.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/defconfig#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/defs.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/des.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/developer.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/doc/code_structure.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/doc/ctrl_iface.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/doc/doxygen.fast#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/doc/doxygen.full#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/doc/driver_wrapper.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/doc/eap.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/doc/hostapd.fig#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/doc/kerneldoc2doxygen.pl#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/doc/mainpage.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/doc/porting.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/driver.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/driver_test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_aka.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_defs.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_gpsk.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_gpsk_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_gpsk_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_gtc.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_i.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_identity.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_md5.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_methods.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_methods.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_mschapv2.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_pax.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_pax_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_pax_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_peap.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_psk.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_psk_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_psk_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_sake.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_sake_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_sake_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_sim.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_sim_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_sim_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_sim_db.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_sim_db.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_tls.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_tls_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_tls_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_tlv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_ttls.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_ttls.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eap_vendor_test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eapol_sm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eapol_sm.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eloop.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eloop.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eloop_none.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/eloop_win.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hlr_auc_gw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hlr_auc_gw.milenage_db#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostap_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd.8#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd.accept#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd.deny#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd.eap_user#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd.radius_clients#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd.sim_db#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd.vlan#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd.wpa_psk#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd_cli.1#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hostapd_cli.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hw_features.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/hw_features.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/iapp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/iapp.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ieee802_11.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ieee802_11.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ieee802_11_auth.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ieee802_11_auth.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ieee802_11h.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ieee802_11h.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ieee802_1x.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ieee802_1x.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/includes.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/l2_packet.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/l2_packet_none.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/logwatch/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/logwatch/hostapd#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/logwatch/hostapd.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/madwifi.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/md4.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/md5.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/md5.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/milenage.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/milenage.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/mlme.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/mlme.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ms_funcs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/ms_funcs.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/os.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/os_internal.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/os_none.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/os_unix.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/pmksa_cache.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/pmksa_cache.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/preauth.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/preauth.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/radius.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/radius.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/radius_client.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/radius_client.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/radius_server.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/radius_server.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/rc4.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/rc4.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/reconfig.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/sha1.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/sha1.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/sha256.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/sha256.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/sta_info.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/sta_info.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/state_machine.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/tls.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/tls_gnutls.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/tls_none.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/tls_openssl.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/version.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/vlan_init.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/vlan_init.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/wired.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/wme.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/wme.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/wpa.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/wpa.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/wpa_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/wpa_ctrl.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/hostapd/wpa_ctrl.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/less/line.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/CREDITS#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/NEWS#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/README#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/VERSION#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/audit/audit.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/audit/audit.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/audit_warn.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bin/auditd/auditd.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/auditd_lib.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/bsm/libbsm.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/config/config.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/etc/audit_event#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libauditd/auditd_lib.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/au_domain.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/au_errno.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_control.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_errno.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_io.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/telnet/libtelnet/pk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/top/install#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/top/install-sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/COPYING#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ChangeLog#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/README-WPS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/accounting.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/accounting.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ap.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ap_list.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ap_list.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/beacon.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/beacon.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/config.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/config.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ctrl_iface.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ctrl_iface.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/defconfig#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/doc/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/doc/doxygen.full#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/driver.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/drivers.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/eap_testing.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/eapol_sm.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/eapol_sm.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostap_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd.accept#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd.deny#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd.eap_user#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd.sim_db#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd.vlan#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd_cli.1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hostapd_cli.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hw_features.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/hw_features.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/iapp.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/iapp.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ieee802_11.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ieee802_11.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ieee802_1x.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/ieee802_1x.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/logwatch/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/logwatch/hostapd#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/mlme.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/mlme.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/nt_password_hash.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/peerkey.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/pmksa_cache.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/pmksa_cache.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/preauth.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/preauth.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/sta_info.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/sta_info.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/vlan_init.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/vlan_init.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/wired.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/wme.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/wme.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/wpa.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/wpa.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/wpa_auth_i.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/wpa_auth_ie.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/wpa_auth_ie.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/wpa_ft.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/wps_hostapd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/hostapd/wps_hostapd.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/defs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/eapol_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/ieee802_11_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/ieee802_11_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/ieee802_11_defs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/privsep_commands.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/version.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/wpa_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/wpa_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/wpa_ctrl.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/common/wpa_ctrl.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/aes.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/aes.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/aes_wrap.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/aes_wrap.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/crypto.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/crypto_cryptoapi.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/crypto_gnutls.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/crypto_internal.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/crypto_libtomcrypt.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/crypto_none.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/crypto_openssl.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/des.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/dh_groups.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/dh_groups.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/md4.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/md5.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/md5.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/ms_funcs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/ms_funcs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/rc4.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/rc4.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/sha1.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/sha1.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/sha256.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/sha256.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/tls.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/tls_gnutls.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/tls_internal.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/tls_none.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/tls_openssl.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/crypto/tls_schannel.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/drivers/driver.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/drivers/driver_ndis.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/drivers/driver_ndis.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/drivers/drivers.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/drivers/scan_helpers.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/chap.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/chap.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_defs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_fast_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_fast_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_gpsk_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_gpsk_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_ikev2_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_ikev2_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_pax_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_pax_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_peap_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_peap_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_psk_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_psk_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_sake_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_sake_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_sim_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_sim_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_tlv_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_ttls.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_wsc_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/eap_wsc_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/ikev2_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_common/ikev2_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_aka.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_config.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_fast.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_fast_pac.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_fast_pac.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_gpsk.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_gtc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_i.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_ikev2.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_leap.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_md5.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_methods.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_methods.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_mschapv2.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_otp.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_pax.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_peap.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_psk.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_sake.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_sim.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_tls.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_tls_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_tls_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_tnc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_ttls.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_vendor_test.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/eap_wsc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/ikev2.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/ikev2.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/mschapv2.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/mschapv2.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/tncc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_peer/tncc.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_aka.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_fast.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_gpsk.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_gtc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_i.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_identity.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_ikev2.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_md5.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_methods.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_methods.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_mschapv2.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_pax.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_peap.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_psk.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_sake.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_sim.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_sim_db.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_sim_db.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_tls.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_tls_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_tls_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_tnc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_ttls.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_vendor_test.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/eap_wsc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/ikev2.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/ikev2.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/tncs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eap_server/tncs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eapol_supp/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eapol_supp/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eapol_supp/eapol_supp_sm.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/eapol_supp/eapol_supp_sm.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/hlr_auc_gw/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/hlr_auc_gw/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/hlr_auc_gw/milenage.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/hlr_auc_gw/milenage.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/l2_packet/l2_packet.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/radius/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/radius/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/radius/radius.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/radius/radius.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/radius/radius_client.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/radius/radius_client.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/radius/radius_server.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/radius/radius_server.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/peerkey.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/peerkey.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/pmksa_cache.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/pmksa_cache.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/preauth.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/preauth.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/wpa.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/wpa.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/wpa_ft.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/wpa_i.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/wpa_ie.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/rsn_supp/wpa_ie.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/asn1.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/asn1.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/asn1_test.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/bignum.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/bignum.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/libtommath.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/rsa.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/rsa.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_client.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_client.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_client_i.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_client_read.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_client_write.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_cred.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_cred.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_record.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_record.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_server.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_server.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_server_i.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_server_read.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/tlsv1_server_write.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/x509v3.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/tls/x509v3.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/base64.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/base64.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/build_config.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/common.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/eloop.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/eloop.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/includes.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/ip_addr.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/ip_addr.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/os.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/os_internal.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/os_unix.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/pcsc_funcs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/pcsc_funcs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/state_machine.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/uuid.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/uuid.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/wpa_debug.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/wpa_debug.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/wpabuf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/utils/wpabuf.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/httpread.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/httpread.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_attr_build.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_attr_parse.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_attr_process.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_defs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_dev_attr.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_dev_attr.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_enrollee.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_i.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_registrar.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_upnp.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_upnp.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_upnp_event.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_upnp_i.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_upnp_ssdp.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/src/wps/wps_upnp_web.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/ChangeLog#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/README#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/README-WPS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/blacklist.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/blacklist.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/config.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/config.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/config_file.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/config_none.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/config_ssid.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/ctrl_iface.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/ctrl_iface.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.service#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/dbus_dict_helpers.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/dbus_dict_helpers.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/defconfig#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/manpage.links#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/manpage.refs#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/doc/wpa_supplicant.fig#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/eap_testing.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/eapol_test.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/events.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/examples/openCryptoki.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/examples/wpas-test.py#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/main.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/mlme.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/mlme.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/preauth_test.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/scan.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/link_test.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/test_aes.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/test_eap_sim_common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/test_md4.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/test_md5.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/test_ms_funcs.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/test_sha1.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/test_sha256.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/test_wpa.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/test_x509v3.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/todo.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/wpa_cli.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/wpa_passphrase.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/wpa_priv.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/wpa_supplicant.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/wpa_supplicant.conf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/wpa_supplicant.nsi#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/wpas_glue.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/wpas_glue.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/wps_supplicant.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa/wpa_supplicant/wps_supplicant.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/COPYING#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ChangeLog#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/FREEBSD-Xlist#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/FREEBSD-upgrade#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/Makefile#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/aes.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/aes.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/aes_wrap.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/aes_wrap.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/asn1.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/asn1.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/asn1_test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/base64.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/base64.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/bignum.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/bignum.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/build_config.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/config.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/config.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/config_file.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/config_none.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/config_ssid.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/config_types.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/crypto.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/crypto.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/crypto_cryptoapi.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/crypto_gnutls.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/crypto_internal.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/crypto_libtomcrypt.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/crypto_none.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ctrl_iface.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ctrl_iface.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ctrl_iface_dbus.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ctrl_iface_dbus.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ctrl_iface_udp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ctrl_iface_unix.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/dbus-wpa_supplicant.service#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/dbus_dict_helpers.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/dbus_dict_helpers.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/defconfig#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/defs.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/des.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/code_structure.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/Makefile#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/doxygen.fast#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/doxygen.full#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/eap.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/mainpage.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/porting.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/testing_tools.doxygen#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/driver.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/driver_ndis.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/driver_ndis.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/driver_wired.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/drivers.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_aka.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_defs.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_fast.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_gpsk.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_gpsk_common.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_gpsk_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_gtc.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_i.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_leap.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_md5.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_methods.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_methods.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_mschapv2.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_otp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_pax.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_pax_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_pax_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_peap.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_psk.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_psk_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_psk_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_sake.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_sake_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_sake_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_sim.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_sim_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_sim_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_testing.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_tls.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_tls_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_tls_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_tlv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_tlv.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_ttls.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_ttls.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eap_vendor_test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eapol_sm.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eapol_sm.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eapol_test.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eloop.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eloop.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/eloop_none.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/events.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/examples/ieee8021x.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/examples/plaintext.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/examples/wep.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/hostapd.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/includes.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/l2_packet.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/libtommath.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/main.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/md4.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/md5.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/md5.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/mlme.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/mlme.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ms_funcs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/ms_funcs.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/nmake.mak#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/os.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/os_internal.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/os_none.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/os_unix.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/pcsc_funcs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/pcsc_funcs.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/pmksa_cache.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/pmksa_cache.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/preauth.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/preauth.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/preauth_test.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/radius.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/radius.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/radius_client.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/radius_client.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/rc4.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/rc4.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/rsa.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/rsa.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/sha1.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/sha1.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/sha256.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/sha256.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/state_machine.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tests/test_aes.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tests/test_eap_sim_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tests/test_md4.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tests/test_md5.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tests/test_ms_funcs.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tests/test_sha1.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tests/test_sha256.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tests/test_x509v3.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tls.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tls_gnutls.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tls_internal.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tls_none.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tls_openssl.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tls_schannel.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tlsv1_client.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tlsv1_client.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tlsv1_common.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/tlsv1_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/todo.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/version.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_cli.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_common.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_ctrl.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_ctrl.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/main.cpp#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/scanresults.ui#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/wpagui.ui#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_gui/wpamsg.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_i.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_passphrase.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_supplicant.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_supplicant.conf#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_supplicant.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/wpa_supplicant_i.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/x509v3.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/wpa_supplicant/x509v3.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/swap1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/csu/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libssp/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/cc/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/gdbserver/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/gdbserver/reg-ppc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/arpa/inet.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/ctype.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/db.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/grp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/ndbm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/netdb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/pthread.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/pwd.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/setjmp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/signal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/stdio.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/stdlib.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/string.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/strings.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/unistd.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/wchar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/csu/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_endian.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_copy_stat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_entry_stat.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_disk.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_disk_entry_from_file.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_disk_private.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_disk_set_standard_lookup.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_all.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_gzip.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_compression_program.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_ar.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_empty.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_mtree.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_zip.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_string.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_string.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_util.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_virtual.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 18 12:36:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E73FB10656BB; Wed, 18 Mar 2009 12:36:35 +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 98ED31065697 for ; Wed, 18 Mar 2009 12:36:35 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 86B668FC0C for ; Wed, 18 Mar 2009 12:36:35 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2ICaZ54047730 for ; Wed, 18 Mar 2009 12:36:35 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2ICaZo5047728 for perforce@freebsd.org; Wed, 18 Mar 2009 12:36:35 GMT (envelope-from zec@fer.hr) Date: Wed, 18 Mar 2009 12:36:35 GMT Message-Id: <200903181236.n2ICaZo5047728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 159373 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, 18 Mar 2009 12:36:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=159373 Change 159373 by zec@zec_amdx2 on 2009/03/18 12:36:35 Remove useless lines that slipped in from random experiments. Affected files ... .. //depot/projects/vimage/src/sys/net/if.c#70 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if.c#70 (text+ko) ==== @@ -188,23 +188,6 @@ VNET_MOD_DECLARE(NET, net, vnet_net_iattach, vnet_net_idetach, NONE, vnet_net_symmap); - -static int foo_handler(module_t mod, int /*modeventtype_t*/ what, void *arg); - -static int -foo_handler(module_t mod, int /*modeventtype_t*/ what, void *arg) -{ - return (0); -} - -static moduledata_t mod_data= { - "vnet_net", - foo_handler, - 0 -}; - -MODULE_VERSION(vnet_net, 1); -DECLARE_MODULE(vnet_net, mod_data, SI_SUB_EXEC, SI_ORDER_ANY); #endif /* From owner-p4-projects@FreeBSD.ORG Wed Mar 18 13:47:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EBEB1065673; Wed, 18 Mar 2009 13:47:48 +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 E0780106566C for ; Wed, 18 Mar 2009 13:47:47 +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 CDAA48FC12 for ; Wed, 18 Mar 2009 13:47:47 +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 n2IDllLq063762 for ; Wed, 18 Mar 2009 13:47:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IDllaj063760 for perforce@freebsd.org; Wed, 18 Mar 2009 13:47:47 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 18 Mar 2009 13:47:47 GMT Message-Id: <200903181347.n2IDllaj063760@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 159375 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, 18 Mar 2009 13:47:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=159375 Change 159375 by hselasky@hselasky_laptop001 on 2009/03/18 13:47:14 USB serial: Further remove Giant dependancy. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#3 (text+ko) ==== @@ -244,8 +244,8 @@ req.wIndex[0] = sc->sc_iface_no; req.wIndex[1] = 0; USETW(req.wLength, 1); - error = usb2_do_request_flags - (uaa->device, &Giant, &req, &sc->sc_numser, + error = usb2_do_request_flags(uaa->device, NULL, + &req, &sc->sc_numser, 0, NULL, USB_DEFAULT_TIMEOUT); if (error || (sc->sc_numser == 0)) { ==== //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#3 (text+ko) ==== @@ -222,8 +222,7 @@ /* get report descriptor */ - error = usb2_req_get_hid_desc - (uaa->device, &Giant, + error = usb2_req_get_hid_desc(uaa->device, NULL, &urd_ptr, &urd_len, M_USBDEV, UCYCOM_IFACE_INDEX); ==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#5 (text+ko) ==== @@ -769,7 +769,7 @@ USETW(req.wLength, UCDC_ABSTRACT_STATE_LENGTH); USETW(ast.wState, state); - return (usb2_do_request(udev, &Giant, &req, &ast)); + return (usb2_do_request(udev, NULL, &req, &ast)); } static int ==== //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#3 (text+ko) ==== @@ -441,7 +441,7 @@ req.wIndex[1] = 0; USETW(req.wLength, 0); - return (usb2_do_request(udev, &Giant, &req, NULL)); + return (usb2_do_request(udev, NULL, &req, NULL)); } struct pl2303x_init { @@ -485,7 +485,7 @@ USETW(req.wIndex, pl2303x[i].index); USETW(req.wLength, pl2303x[i].length); - err = usb2_do_request(udev, &Giant, &req, buf); + err = usb2_do_request(udev, NULL, &req, buf); if (err) { DPRINTF("error=%s\n", usb2_errstr(err)); return (EIO); ==== //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#3 (text+ko) ==== @@ -373,8 +373,8 @@ USETW(req.wValue, 0); USETW(req.wIndex, 0); USETW(req.wLength, UVISOR_CONNECTION_INFO_SIZE); - err = usb2_do_request_flags - (udev, &Giant, &req, &coninfo, USB_SHORT_XFER_OK, + err = usb2_do_request_flags(udev, NULL, + &req, &coninfo, USB_SHORT_XFER_OK, &actlen, USB_DEFAULT_TIMEOUT); if (err) { @@ -427,7 +427,7 @@ USETW(req.wLength, UVISOR_GET_PALM_INFORMATION_LEN); err = usb2_do_request_flags - (udev, &Giant, &req, &pconinfo, USB_SHORT_XFER_OK, + (udev, NULL, &req, &pconinfo, USB_SHORT_XFER_OK, &actlen, USB_DEFAULT_TIMEOUT); if (err) { @@ -468,7 +468,7 @@ USETW(req.wIndex, 0); USETW(req.wLength, 1); - err = usb2_do_request(udev, &Giant, &req, buffer); + err = usb2_do_request(udev, NULL, &req, buffer); if (err) { goto done; } @@ -479,7 +479,7 @@ USETW(req.wValue, 0); USETW(req.wIndex, 0); USETW(req.wLength, 1); - err = usb2_do_request(udev, &Giant, &req, buffer); + err = usb2_do_request(udev, NULL, &req, buffer); if (err) { goto done; } @@ -490,7 +490,7 @@ USETW(req.wValue, 0); USETW(req.wIndex, 5); USETW(req.wLength, sizeof(wAvail)); - err = usb2_do_request(udev, &Giant, &req, &wAvail); + err = usb2_do_request(udev, NULL, &req, &wAvail); if (err) { goto done; } From owner-p4-projects@FreeBSD.ORG Wed Mar 18 13:48:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 586331065670; Wed, 18 Mar 2009 13:48:49 +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 145B7106564A for ; Wed, 18 Mar 2009 13:48:49 +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 021138FC0C for ; Wed, 18 Mar 2009 13:48:49 +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 n2IDmmBH063852 for ; Wed, 18 Mar 2009 13:48:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IDmmdk063850 for perforce@freebsd.org; Wed, 18 Mar 2009 13:48:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 18 Mar 2009 13:48:48 GMT Message-Id: <200903181348.n2IDmmdk063850@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 159376 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, 18 Mar 2009 13:48:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=159376 Change 159376 by hselasky@hselasky_laptop001 on 2009/03/18 13:48:22 USB input: Further remove Giant dependancy. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/uhid.c#4 (text+ko) ==== @@ -668,8 +668,8 @@ * feature report ID 2 before it'll start * returning digitizer data. */ - error = usb2_req_set_report - (uaa->device, &Giant, reportbuf, sizeof(reportbuf), + error = usb2_req_set_report(uaa->device, NULL, + reportbuf, sizeof(reportbuf), uaa->info.bIfaceIndex, UHID_FEATURE_REPORT, 2); if (error) { @@ -691,16 +691,16 @@ } if (sc->sc_repdesc_ptr == NULL) { - error = usb2_req_get_hid_desc - (uaa->device, &Giant, &sc->sc_repdesc_ptr, - &sc->sc_repdesc_size, M_USBDEV, uaa->info.bIfaceIndex); + error = usb2_req_get_hid_desc(uaa->device, NULL, + &sc->sc_repdesc_ptr, &sc->sc_repdesc_size, + M_USBDEV, uaa->info.bIfaceIndex); if (error) { device_printf(dev, "no report descriptor\n"); goto detach; } } - error = usb2_req_set_idle(uaa->device, &Giant, + error = usb2_req_set_idle(uaa->device, NULL, uaa->info.bIfaceIndex, 0, 0); if (error) { ==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#6 (text+ko) ==== @@ -338,7 +338,7 @@ (id->bInterfaceClass != UICLASS_HID)) return (ENXIO); - error = usb2_req_get_hid_desc(uaa->device, &Giant, + error = usb2_req_get_hid_desc(uaa->device, NULL, &d_ptr, &d_len, M_TEMP, uaa->info.bIfaceIndex); if (error) @@ -395,8 +395,7 @@ DPRINTF("error=%s\n", usb2_errstr(err)); goto detach; } - err = usb2_req_get_hid_desc - (uaa->device, &Giant, &d_ptr, + err = usb2_req_get_hid_desc(uaa->device, NULL, &d_ptr, &d_len, M_TEMP, uaa->info.bIfaceIndex); if (err) { From owner-p4-projects@FreeBSD.ORG Wed Mar 18 13:54:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E9B11065677; Wed, 18 Mar 2009 13:54:55 +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 5EB3F1065673 for ; Wed, 18 Mar 2009 13:54:55 +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 4CDAB8FC1D for ; Wed, 18 Mar 2009 13:54:55 +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 n2IDstrr064657 for ; Wed, 18 Mar 2009 13:54:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IDsts0064655 for perforce@freebsd.org; Wed, 18 Mar 2009 13:54:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 18 Mar 2009 13:54:55 GMT Message-Id: <200903181354.n2IDsts0064655@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 159377 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, 18 Mar 2009 13:54:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=159377 Change 159377 by hselasky@hselasky_laptop001 on 2009/03/18 13:54:54 USB storage: Further remove dependancy towards Giant. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#6 (text+ko) ==== @@ -1583,7 +1583,7 @@ * some devices need a delay after that the configuration value is * set to function properly: */ - usb2_pause_mtx(&Giant, hz); + usb2_pause_mtx(NULL, hz); /* register the SIM */ err = umass_cam_attach_sim(sc); @@ -1642,7 +1642,7 @@ req.wIndex[0] = sc->sc_iface_no; req.wIndex[1] = 0; USETW(req.wLength, sizeof(status)); - err = usb2_do_request(sc->sc_udev, &Giant, &req, &status); + err = usb2_do_request(sc->sc_udev, NULL, &req, &status); DPRINTF(sc, UDMASS_GEN, "Shuttle init returned 0x%02x%02x\n", status[0], status[1]); @@ -2161,7 +2161,7 @@ req.wIndex[1] = 0; USETW(req.wLength, 1); - err = usb2_do_request(sc->sc_udev, &Giant, &req, &buf); + err = usb2_do_request(sc->sc_udev, NULL, &req, &buf); if (err) { buf = 0; From owner-p4-projects@FreeBSD.ORG Wed Mar 18 14:04:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33B2F106566B; Wed, 18 Mar 2009 14:04:05 +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 DFF841065670 for ; Wed, 18 Mar 2009 14:04:04 +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 CCCEC8FC17 for ; Wed, 18 Mar 2009 14:04:04 +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 n2IE44Mi066272 for ; Wed, 18 Mar 2009 14:04:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IE44Lo066270 for perforce@freebsd.org; Wed, 18 Mar 2009 14:04:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 18 Mar 2009 14:04:04 GMT Message-Id: <200903181404.n2IE44Lo066270@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 159379 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, 18 Mar 2009 14:04:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=159379 Change 159379 by hselasky@hselasky_laptop001 on 2009/03/18 14:03:10 USB storage: Device side mode fixes for 8-bit and 16-bit compilation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#3 (text+ko) ==== @@ -60,10 +60,27 @@ /* Define some limits */ -#define USTORAGE_FS_BULK_SIZE (1 << 17) +#define USTORAGE_FS_BULK_SIZE (1UL << 17) #define USTORAGE_FS_MAX_LUN 8 -#define USTORAGE_FS_RELEASE 0x0101 -#define USTORAGE_FS_RAM_SECT (1 << 13) + +/* + * The SCSI ID string must be exactly 28 characters long + * exluding the terminating zero. + */ +#ifndef USTORAGE_FS_ID_STRING +#define USTORAGE_FS_ID_STRING \ + "FreeBSD " /* 8 */ \ + "File-Stor Gadget" /* 16 */ \ + "0101" /* 4 */ +#endif + +/* + * The following macro defines the number of + * sectors to be allocated for the RAM disk: + */ +#ifndef USTORAGE_FS_RAM_SECT +#define USTORAGE_FS_RAM_SECT (1UL << 13) +#endif static uint8_t *ustorage_fs_ramdisk; @@ -955,8 +972,6 @@ ustorage_fs_inquiry(struct ustorage_fs_softc *sc) { uint8_t *buf = sc->sc_transfer.data_ptr; - static const char vendor_id[] = "FreeBSD "; - static const char product_id[] = "File-Stor Gadget"; struct ustorage_fs_lun *currlun = sc->sc_transfer.currlun; @@ -978,12 +993,9 @@ buf[4] = 31; /* Additional length */ /* No special options */ - /* - * NOTE: We are writing an extra zero here, that is not - * transferred to the peer: - */ - snprintf(buf + 8, 28 + 1, "%-8s%-16s%04x", vendor_id, product_id, - USTORAGE_FS_RELEASE); + /* Copy in ID string */ + memcpy(buf + 8, USTORAGE_FS_ID_STRING, 28); + return (ustorage_fs_min_len(sc, 36, 0 - 1)); } @@ -1332,7 +1344,7 @@ * too big */ if (sc->sc_transfer.cmd_data[0] == SC_READ_6) { - lba = (sc->sc_transfer.cmd_data[1] << 16) | + lba = (((uint32_t)sc->sc_transfer.cmd_data[1]) << 16) | get_be16(&sc->sc_transfer.cmd_data[2]); } else { lba = get_be32(&sc->sc_transfer.cmd_data[2]); @@ -1391,7 +1403,7 @@ * too big. */ if (sc->sc_transfer.cmd_data[0] == SC_WRITE_6) - lba = (sc->sc_transfer.cmd_data[1] << 16) | + lba = (((uint32_t)sc->sc_transfer.cmd_data[1]) << 16) | get_be16(&sc->sc_transfer.cmd_data[2]); else { lba = get_be32(&sc->sc_transfer.cmd_data[2]); @@ -1539,7 +1551,7 @@ * non-zero. */ for (i = 0; i != min_cmd_size; i++) { - if (sc->sc_transfer.cmd_data[i] && !(mask & (1 << i))) { + if (sc->sc_transfer.cmd_data[i] && !(mask & (1UL << i))) { if (currlun) { currlun->sense_data = SS_INVALID_FIELD_IN_CDB; } @@ -1570,6 +1582,7 @@ { uint8_t error = 1; uint8_t i; + uint32_t temp; /* set default data transfer pointer */ sc->sc_transfer.data_ptr = sc->sc_qdata; @@ -1585,7 +1598,7 @@ break; } error = ustorage_fs_check_cmd(sc, 6, - (1 << 4) | 1, 0); + (1UL << 4) | 1, 0); if (error) { break; } @@ -1600,7 +1613,7 @@ break; } error = ustorage_fs_check_cmd(sc, 6, - (1 << 1) | (1 << 4) | 1, 0); + (1UL << 1) | (1UL << 4) | 1, 0); if (error) { break; } @@ -1616,7 +1629,7 @@ break; } error = ustorage_fs_check_cmd(sc, 10, - (1 << 1) | (3 << 7) | 1, 0); + (1UL << 1) | (3UL << 7) | 1, 0); if (error) { break; } @@ -1631,7 +1644,7 @@ break; } error = ustorage_fs_check_cmd(sc, 6, - (1 << 1) | (1 << 2) | (1 << 4) | 1, 0); + (1UL << 1) | (1UL << 2) | (1UL << 4) | 1, 0); if (error) { break; } @@ -1647,7 +1660,7 @@ break; } error = ustorage_fs_check_cmd(sc, 10, - (1 << 1) | (1 << 2) | (3 << 7) | 1, 0); + (1UL << 1) | (1UL << 2) | (3UL << 7) | 1, 0); if (error) { break; } @@ -1661,7 +1674,7 @@ break; } error = ustorage_fs_check_cmd(sc, 6, - (1 << 4) | 1, 0); + (1UL << 4) | 1, 0); if (error) { break; } @@ -1672,13 +1685,13 @@ case SC_READ_6: i = sc->sc_transfer.cmd_data[4]; sc->sc_transfer.cmd_dir = DIR_WRITE; - error = ustorage_fs_min_len(sc, - ((i == 0) ? 256 : i) << 9, 0 - (1 << 9)); + temp = ((i == 0) ? 256UL : i); + error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); if (error) { break; } error = ustorage_fs_check_cmd(sc, 6, - (7 << 1) | (1 << 4) | 1, 1); + (7UL << 1) | (1UL << 4) | 1, 1); if (error) { break; } @@ -1688,13 +1701,13 @@ case SC_READ_10: sc->sc_transfer.cmd_dir = DIR_WRITE; - error = ustorage_fs_min_len(sc, - get_be16(&sc->sc_transfer.cmd_data[7]) << 9, 0 - (1 << 9)); + temp = get_be16(&sc->sc_transfer.cmd_data[7]); + error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); if (error) { break; } error = ustorage_fs_check_cmd(sc, 10, - (1 << 1) | (0xf << 2) | (3 << 7) | 1, 1); + (1UL << 1) | (0xfUL << 2) | (3UL << 7) | 1, 1); if (error) { break; } @@ -1704,13 +1717,19 @@ case SC_READ_12: sc->sc_transfer.cmd_dir = DIR_WRITE; - error = ustorage_fs_min_len(sc, - get_be32(&sc->sc_transfer.cmd_data[6]) << 9, 0 - (1 << 9)); + temp = get_be32(&sc->sc_transfer.cmd_data[6]); + if (temp >= (1UL << (32 - 9))) { + /* numerical overflow */ + sc->sc_csw.bCSWStatus = CSWSTATUS_FAILED; + error = 1; + break; + } + error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); if (error) { break; } error = ustorage_fs_check_cmd(sc, 12, - (1 << 1) | (0xf << 2) | (0xf << 6) | 1, 1); + (1UL << 1) | (0xfUL << 2) | (0xfUL << 6) | 1, 1); if (error) { break; } @@ -1721,7 +1740,7 @@ case SC_READ_CAPACITY: sc->sc_transfer.cmd_dir = DIR_WRITE; error = ustorage_fs_check_cmd(sc, 10, - (0xf << 2) | (1 << 8) | 1, 1); + (0xfUL << 2) | (1UL << 8) | 1, 1); if (error) { break; } @@ -1737,7 +1756,7 @@ break; } error = ustorage_fs_check_cmd(sc, 10, - (3 << 7) | 1, 1); + (3UL << 7) | 1, 1); if (error) { break; } @@ -1752,7 +1771,7 @@ break; } error = ustorage_fs_check_cmd(sc, 6, - (1 << 4) | 1, 0); + (1UL << 4) | 1, 0); if (error) { break; } @@ -1766,7 +1785,7 @@ break; } error = ustorage_fs_check_cmd(sc, 6, - (1 << 1) | (1 << 4) | 1, 0); + (1UL << 1) | (1UL << 4) | 1, 0); if (error) { break; } @@ -1780,7 +1799,7 @@ break; } error = ustorage_fs_check_cmd(sc, 10, - (0xf << 2) | (3 << 7) | 1, 1); + (0xfUL << 2) | (3UL << 7) | 1, 1); if (error) { break; } @@ -1807,7 +1826,7 @@ break; } error = ustorage_fs_check_cmd(sc, 10, - (1 << 1) | (0xf << 2) | (3 << 7) | 1, 1); + (1UL << 1) | (0xfUL << 2) | (3UL << 7) | 1, 1); if (error) { break; } @@ -1818,13 +1837,13 @@ case SC_WRITE_6: i = sc->sc_transfer.cmd_data[4]; sc->sc_transfer.cmd_dir = DIR_READ; - error = ustorage_fs_min_len(sc, - ((i == 0) ? 256 : i) << 9, 0 - (1 << 9)); + temp = ((i == 0) ? 256UL : i); + error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); if (error) { break; } error = ustorage_fs_check_cmd(sc, 6, - (7 << 1) | (1 << 4) | 1, 1); + (7UL << 1) | (1UL << 4) | 1, 1); if (error) { break; } @@ -1834,13 +1853,13 @@ case SC_WRITE_10: sc->sc_transfer.cmd_dir = DIR_READ; - error = ustorage_fs_min_len(sc, - get_be16(&sc->sc_transfer.cmd_data[7]) << 9, 0 - (1 << 9)); + temp = get_be16(&sc->sc_transfer.cmd_data[7]); + error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); if (error) { break; } error = ustorage_fs_check_cmd(sc, 10, - (1 << 1) | (0xf << 2) | (3 << 7) | 1, 1); + (1UL << 1) | (0xfUL << 2) | (3UL << 7) | 1, 1); if (error) { break; } @@ -1850,13 +1869,19 @@ case SC_WRITE_12: sc->sc_transfer.cmd_dir = DIR_READ; - error = ustorage_fs_min_len(sc, - get_be32(&sc->sc_transfer.cmd_data[6]) << 9, 0 - (1 << 9)); + temp = get_be32(&sc->sc_transfer.cmd_data[6]); + if (temp >= (1UL << (32 - 9))) { + /* numerical overflow */ + sc->sc_csw.bCSWStatus = CSWSTATUS_FAILED; + error = 1; + break; + } + error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); if (error) { break; } error = ustorage_fs_check_cmd(sc, 12, - (1 << 1) | (0xf << 2) | (0xf << 6) | 1, 1); + (1UL << 1) | (0xfUL << 2) | (0xfUL << 6) | 1, 1); if (error) { break; } From owner-p4-projects@FreeBSD.ORG Wed Mar 18 14:05:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 907EA1065673; Wed, 18 Mar 2009 14:05:06 +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 133D1106564A for ; Wed, 18 Mar 2009 14:05:06 +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 019998FC0C for ; Wed, 18 Mar 2009 14:05:06 +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 n2IE55wJ066372 for ; Wed, 18 Mar 2009 14:05:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IE55NK066370 for perforce@freebsd.org; Wed, 18 Mar 2009 14:05:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 18 Mar 2009 14:05:05 GMT Message-Id: <200903181405.n2IE55NK066370@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 159380 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, 18 Mar 2009 14:05:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=159380 Change 159380 by hselasky@hselasky_laptop001 on 2009/03/18 14:04:59 USB CORE: Fixes for 8-bit and 16-bit compilation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_endian.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_endian.h#2 (text+ko) ==== @@ -48,19 +48,19 @@ #define UGETW(w) \ ((w)[0] | \ - ((w)[1] << 8)) + (((uint16_t)((w)[1])) << 8)) #define UGETDW(w) \ ((w)[0] | \ - ((w)[1] << 8) | \ - ((w)[2] << 16) | \ - ((w)[3] << 24)) + (((uint16_t)((w)[1])) << 8) | \ + (((uint32_t)((w)[2])) << 16) | \ + (((uint32_t)((w)[3])) << 24)) #define UGETQW(w) \ ((w)[0] | \ - ((w)[1] << 8) | \ - ((w)[2] << 16) | \ - ((w)[3] << 24) | \ + (((uint16_t)((w)[1])) << 8) | \ + (((uint32_t)((w)[2])) << 16) | \ + (((uint32_t)((w)[3])) << 24) | \ (((uint64_t)((w)[4])) << 32) | \ (((uint64_t)((w)[5])) << 40) | \ (((uint64_t)((w)[6])) << 48) | \ From owner-p4-projects@FreeBSD.ORG Wed Mar 18 15:50:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87D0E1065717; Wed, 18 Mar 2009 15:50:54 +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 15B0B1065706 for ; Wed, 18 Mar 2009 15:50:54 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 002118FC27 for ; Wed, 18 Mar 2009 15:50:53 +0000 (UTC) (envelope-from lulf@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 n2IFordi034485 for ; Wed, 18 Mar 2009 15:50:53 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IForgS034483 for perforce@freebsd.org; Wed, 18 Mar 2009 15:50:53 GMT (envelope-from lulf@FreeBSD.org) Date: Wed, 18 Mar 2009 15:50:53 GMT Message-Id: <200903181550.n2IForgS034483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 159386 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, 18 Mar 2009 15:50:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=159386 Change 159386 by lulf@lulf_carrot on 2009/03/18 15:50:49 - First try at implementing the devclk interface. A devclk structure describing each clock is added, using KOBJ to make specifying clocks quite easily. Clocks are specified where they belong logically, in our case within the power manager. The power manager also registers these clocks with the devclk manager at startup. There are several ways of constructing the clock trees, but right now, there is an oscilliator class which handles osc0, osc1, osc32, and a pll-class which handles the plls. Just for testing, I added one class for the pbb clock being used by MCI. During probing, the hints will specify which clock a device will use, so that when a device calls devclk_enable, the bus will lookup the appropriate clock, and call devclk_activate on the clock to activate it. Get/set rate should behave in the same way, and will be implemented next. Further, a clock may have a parent, so that it may call it's parents get_rate in order to determine it's rate. Also, a clock may have an index into the parent clock as the parent may cover several clocks. Exactly how this will be used is not clear yet. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32.c#7 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#3 edit .. //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#3 edit .. //depot/projects/avr32/src/sys/kern/devclk_if.m#2 edit .. //depot/projects/avr32/src/sys/kern/subr_devclk.c#2 edit .. //depot/projects/avr32/src/sys/sys/devclk.h#2 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32.c#7 (text+ko) ==== @@ -80,7 +80,7 @@ }; struct at32_ivar { struct resource_list resources; - int clk_bus; + char clk_name[32]; int clk_index; }; static device_method_t at32_methods[] = { @@ -106,6 +106,7 @@ DEVMETHOD(devclk_disable, at32_clk_disable), {0, 0}, }; + static driver_t at32_driver = { "at32bus", at32_methods, @@ -128,6 +129,9 @@ int rid; struct at32_softc *sc = device_get_softc(dev); + /* Initialize devclk manager. */ + devclk_init(); + /* Resource list for IRQ */ /* Reserve irqs from nexus ? */ sc->sc_irq_rman.rm_type = RMAN_ARRAY; @@ -185,9 +189,13 @@ static void at32_hinted_child(device_t bus, const char *dname, int dunit) { + /* XXX: Fetch ivar and set variables. */ device_t child; long maddr; int msize, irq, result; + const char *resval; + struct at32_ivar *ivar; + child = BUS_ADD_CHILD(bus, 0, dname, dunit); @@ -210,6 +218,14 @@ "warning: bus_set_resource() failed\n"); } } + ivar = device_get_ivars(child); + if (resource_string_value(dname, dunit, "clk", &resval) == 0) { + if (resource_int_value(dname, dunit, "clk_index", + &ivar->clk_index) != 0) + ivar->clk_index = 0; /* Default */ + strlcpy(ivar->clk_name, resval, sizeof(ivar->clk_name)); + } + } static struct resource * @@ -361,11 +377,19 @@ static void at32_clk_enable(device_t dev, device_t child) { - /* TODO: Implement */ + struct at32_ivar *ivar = device_get_ivars(child); + + /* Only activate if it actually has a clock. */ + if (strcmp(ivar->clk_name, "") != 0) + devclk_activate(ivar->clk_name, ivar->clk_index); } static void at32_clk_disable(device_t dev, device_t child) { - /* TODO: Implement */ + struct at32_ivar *ivar = device_get_ivars(child); + + /* Only deactivate if it actually has a clock. */ + if (strcmp(ivar->clk_name, "") != 0) + devclk_deactivate(ivar->clk_name, ivar->clk_index); } ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#3 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2009 Arnar Mar Sig + * Copyright (c) 2009 Ulf Lilleengen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -63,6 +65,13 @@ static int at32_pm_activate(device_t); static void at32_pm_deactivate(device_t); +static void at32_pbb_start(devclk_t, uint8_t); +static void at32_pbb_stop(devclk_t, uint8_t); +static void at32_pll_start(devclk_t, uint8_t); +static void at32_pll_stop(devclk_t, uint8_t); +static void at32_osc_start(devclk_t, uint8_t); +static void at32_osc_stop(devclk_t, uint8_t); + /* Driver variables and private data */ struct at32_pm_softc { struct resource *regs_res; @@ -70,11 +79,13 @@ bus_space_tag_t bst; bus_space_handle_t bsh; }; + static device_method_t at32_pm_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at32_pm_probe), DEVMETHOD(device_attach, at32_pm_attach), DEVMETHOD(device_detach, at32_pm_detach), + {0, 0}, }; static driver_t at32_pm_driver = { @@ -83,8 +94,39 @@ sizeof(struct at32_pm_softc), }; static devclass_t at32_pm_devclass; + DRIVER_MODULE(at32_pm, at32bus, at32_pm_driver, at32_pm_devclass, 0, 0); +/* Class defining our oscilliator. */ +static kobj_method_t at32_osc_methods[] = { + KOBJMETHOD(devclk_start, at32_osc_start), + KOBJMETHOD(devclk_stop, at32_osc_stop), +/* KOBJMETHOD(devclk_set_rate, at32_osc_set_rate), + KOBJMETHOD(devclk_get_rate, at32_osc_get_rate),*/ + {0, 0}, +}; +DEFINE_CLASS(at32_osc, at32_osc_methods, sizeof(struct devclk)); + +/* Class defining our PLLs. */ +static kobj_method_t at32_pll_methods[] = { + KOBJMETHOD(devclk_start, at32_pll_start), + KOBJMETHOD(devclk_stop, at32_pll_stop), +/* KOBJMETHOD(devclk_set_rate, at32_pll_set_rate), + KOBJMETHOD(devclk_get_rate, at32_pll_get_rate),*/ + {0, 0}, +}; +DEFINE_CLASS(at32_pll, at32_pll_methods, sizeof(struct devclk)); + +/* Class defining the PBB clock mask. */ +static kobj_method_t at32_pbb_methods[] = { + KOBJMETHOD(devclk_start, at32_pbb_start), + KOBJMETHOD(devclk_stop, at32_pbb_stop), +/* KOBJMETHOD(devclk_set_rate, at32_pbb_set_rate), + KOBJMETHOD(devclk_get_rate, at32_pbb_get_rate),*/ + {0, 0}, +}; +DEFINE_CLASS(at32_pbb, at32_pbb_methods, sizeof(struct devclk)); + /* Code */ static int at32_pm_probe(device_t dev) @@ -125,12 +167,29 @@ /* Set private data and map register space */ sc->regs_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->regs_rid, 0, ~0, 0, RF_ACTIVE); +/* sc->clock_res = bus_alloc_resource(dev, SYS_RES_CLOCK, &sc->clock_res, + RF_ACTIVE);*/ if (!sc->regs_res) { goto err; } sc->bsh = rman_get_bushandle(sc->regs_res); sc->bst = rman_get_bustag(sc->regs_res); + /* Register main clocks. */ + //devclk_register_clock(dev, "osc32", NULL); + devclk_register_clock(dev, &at32_osc_class, "osc0", NULL); + //devclk_register_clock(dev, &sc->osc1, "osc1", NULL); + + /* Register prescalers. */ + devclk_register_clock(dev, &at32_pll_class, "pll0", "osc0"); + //devclk_register_clock(dev, &sc->pll1, "pll1", &sc->osc0); + + /* Register master device clocks. */ + devclk_register_clock(dev, &at32_pbb_class, "pbb", "pll0"); +// devclk_register_clock(dev, &sc->cpu, "cpu", &sc->pll0); +// devclk_register_clock(dev, &sc->hsb, "hsb", &sc->cpu); +// devclk_register_clock(dev, &sc->pba, "pba", &sc->hsb); +// devclk_register_clock(dev, &sc->pbb, "pbb", &sc->hsb); return (0); err: @@ -151,3 +210,81 @@ /* Turn off device clock */ devclk_disable(dev); } + +static void +at32_pbb_start(devclk_t clk, uint8_t index) +{ + struct at32_pm_softc *sc; + uint32_t reg; + + KASSERT(clk != NULL, ("NULL clk")); + KASSERT(index < 31, ("index > register width")); + sc = device_get_softc(clk->dev); + reg = RD4(AT32_PM_PBBMASK); + WR4(AT32_PM_PBBMASK, reg | (1 << index)); +} + +static void +at32_pbb_stop(devclk_t clk, uint8_t index) +{ + struct at32_pm_softc *sc; + uint32_t reg; + + KASSERT(clk != NULL, ("NULL clk")); + KASSERT(index < 31, ("index > register width")); + sc = device_get_softc(clk->dev); + reg = RD4(AT32_PM_PBBMASK); + WR4(AT32_PM_PBBMASK, reg & ~(1 << index)); +} + +static void +at32_osc_start(devclk_t clk, uint8_t index) +{ + /* In this case, index means which oscilliator. */ + switch (index) { + case 0: /* OSC0 */ + break; + case 1: /* OSC1 */ + break; + case 2: /* OSC32 */ + break; + } +} + +static void +at32_osc_stop(devclk_t clk, uint8_t index) +{ + /* In this case, index means which oscilliator. */ + switch (index) { + case 0: /* OSC0 */ + break; + case 1: /* OSC1 */ + break; + case 2: /* OSC32 */ + break; + } +} + +static void +at32_pll_start(devclk_t clk, uint8_t index) +{ + /* Here, index means which pll. */ + switch (index) { + case 0: /* PLL0. */ + break; + case 1: /* PLL1. */ + break; + } +} + +static void +at32_pll_stop(devclk_t clk, uint8_t index) +{ + /* Here, index means which pll. */ + switch (index) { + case 0: /* PLL0. */ + break; + case 1: /* PLL1. */ + break; + } +} ==== //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#3 (text+ko) ==== @@ -160,6 +160,8 @@ hint.atmel_mci.0.maddr="0xFFF02400" hint.atmel_mci.0.msize="0x400" hint.atmel_mci.0.irq="28" +hint.atmel_mci.0.clk="pbb" +hint.atmel_mci.0.clk_index="9" hint.at32_ac97c.0.at="at32bus0" hint.at32_ac97c.0.maddr="0xFFF02800" ==== //depot/projects/avr32/src/sys/kern/devclk_if.m#2 (text+ko) ==== @@ -54,3 +54,15 @@ device_t _dev; device_t _child; }; + +# Enable a devclk +METHOD void start { + devclk_t _clk; + uint8_t _index; +}; + +# Disable a devclk +METHOD void stop { + devclk_t _clk; + uint8_t _index; +}; ==== //depot/projects/avr32/src/sys/kern/subr_devclk.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2009 Arnar Mar Sig + * Copyright (c) 2009 Ulf Lilleengen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,12 +31,24 @@ #include #include #include +#include #include #include #include +#include #include "devclk_if.h" +static devclk_list_t devclks; + +static devclk_t devclk_find_clock(const char *); + +void +devclk_init(void) +{ + STAILQ_INIT(&devclks); +} + uint64_t devclk_get_rate(device_t dev) { @@ -73,3 +86,60 @@ DEVCLK_DISABLE(parent, dev); } } + +/** + * Register clock name handled by device dev, with the parent clock parent + */ +void +devclk_register_clock(device_t dev, kobj_class_t cls, const char *name, + const char *parent) +{ + devclk_t clk; + + clk = malloc(sizeof(*clk), M_DEVBUF, M_WAITOK | M_ZERO); + clk->methods = kobj_create(cls, M_DEVBUF, M_WAITOK | M_ZERO); + clk->dev = dev; + strlcpy(clk->name, name, sizeof(clk->name)); + clk->parent = ((parent == NULL) ? NULL : devclk_find_clock(parent)); + + /* Insert clock into list. */ + STAILQ_INSERT_HEAD(&devclks, clk, link); +} + +static devclk_t +devclk_find_clock(const char *name) +{ + devclk_t clk; + + KASSERT(name != NULL, ("null name")); + STAILQ_FOREACH(clk, &devclks, link) { + if (strcmp(clk->name, name) == 0) + return (clk); + } + return (NULL); +} + +/* Start device clock name by activating index index. */ +void +devclk_activate(const char *name, uint8_t index) +{ + devclk_t clk; + + clk = devclk_find_clock(name); + if (clk == NULL) + return; + /* XXX: Enable parent too ? */ + DEVCLK_START(clk->methods, index); +} + +/* Stop device clock name by deactivating index index. */ +void +devclk_deactivate(const char *name, uint8_t index) +{ + devclk_t clk; + + clk = devclk_find_clock(name); + if (clk == NULL) + return; + DEVCLK_STOP(clk->methods, index); +} ==== //depot/projects/avr32/src/sys/sys/devclk.h#2 (text+ko) ==== @@ -1,9 +1,23 @@ #ifndef _SYS_DEVCLK_H_ #define _SYS_DEVCLK_H_ +#ifdef _KERNEL + +#include +struct devclk { + kobj_t methods; + device_t dev; /* Device responsible for clock. */ + char name[32]; /* Clock name. */ + struct devclk *parent; /* Clock we originate from. */ + int index; /* Our index in our parent. */ + STAILQ_ENTRY(devclk) link; +}; +typedef struct devclk* devclk_t; +typedef STAILQ_HEAD(, devclk) devclk_list_t; + #include "devclk_if.h" -#ifdef _KERNEL +void devclk_init(void); /** * Get device clock rate @@ -25,7 +39,14 @@ */ void devclk_disable(device_t); +void devclk_activate(const char *, uint8_t); +void devclk_deactivate(const char *, uint8_t); + +/** + * Add a clock to the devclk manager. + */ +void devclk_register_clock(device_t, kobj_class_t, const char *, const char *); + #endif /* _KERNEL */ #endif /* !_SYS_DEVCLK_H_ */ - From owner-p4-projects@FreeBSD.ORG Wed Mar 18 16:48:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15BF41065670; Wed, 18 Mar 2009 16:48:54 +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 BBEB6106567A for ; Wed, 18 Mar 2009 16:48:53 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A8E438FC0A for ; Wed, 18 Mar 2009 16:48:53 +0000 (UTC) (envelope-from lulf@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 n2IGmrF9066549 for ; Wed, 18 Mar 2009 16:48:53 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IGmrFi066538 for perforce@freebsd.org; Wed, 18 Mar 2009 16:48:53 GMT (envelope-from lulf@FreeBSD.org) Date: Wed, 18 Mar 2009 16:48:53 GMT Message-Id: <200903181648.n2IGmrFi066538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 159389 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, 18 Mar 2009 16:48:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=159389 Change 159389 by lulf@lulf_carrot on 2009/03/18 16:48:38 - Firsly, use KOBJ_FIELDS; in the devclk structure, so we avoid going via the methods, as it is not really any point in it. - Use ints instead of uint8_t for now. - Re-work the devclk interface a bit. Previously, one would have to go via the bus to get the mapping from a device to its clocks. However, this made the interface a bit ugly, as parts of it was used by the bus and parts by the clocks. Instead, register these mappings with the devclk manager. The tradeoff (for now a least), is that lookups involve looping over the maps and enable all clocks registered on a device. It could be made more efficient by just storing the mapping in the device itself, but it will have to do for now. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32.c#8 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#4 edit .. //depot/projects/avr32/src/sys/kern/devclk_if.m#3 edit .. //depot/projects/avr32/src/sys/kern/subr_devclk.c#3 edit .. //depot/projects/avr32/src/sys/sys/devclk.h#3 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32.c#8 (text+ko) ==== @@ -80,9 +80,8 @@ }; struct at32_ivar { struct resource_list resources; - char clk_name[32]; - int clk_index; }; + static device_method_t at32_methods[] = { DEVMETHOD(device_probe, at32_probe), DEVMETHOD(device_attach, at32_attach), @@ -100,10 +99,11 @@ DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), DEVMETHOD(bus_release_resource, at32_release_resource), +/* DEVMETHOD(devclk_get_rate, at32_clk_get_rate), DEVMETHOD(devclk_set_rate, at32_clk_set_rate), DEVMETHOD(devclk_enable, at32_clk_enable), - DEVMETHOD(devclk_disable, at32_clk_disable), + DEVMETHOD(devclk_disable, at32_clk_disable),*/ {0, 0}, }; @@ -189,12 +189,10 @@ static void at32_hinted_child(device_t bus, const char *dname, int dunit) { - /* XXX: Fetch ivar and set variables. */ device_t child; long maddr; - int msize, irq, result; + int msize, irq, result, clk_index; const char *resval; - struct at32_ivar *ivar; child = BUS_ADD_CHILD(bus, 0, dname, dunit); @@ -218,14 +216,12 @@ "warning: bus_set_resource() failed\n"); } } - ivar = device_get_ivars(child); if (resource_string_value(dname, dunit, "clk", &resval) == 0) { if (resource_int_value(dname, dunit, "clk_index", - &ivar->clk_index) != 0) - ivar->clk_index = 0; /* Default */ - strlcpy(ivar->clk_name, resval, sizeof(ivar->clk_name)); + &clk_index) != 0) + clk_index = 0; /* Default */ + devclk_register_map(child, resval, clk_index); } - } static struct resource * @@ -359,7 +355,7 @@ ivar = device_get_ivars(child); return (&(ivar->resources)); } - +#if 0 static uint64_t at32_clk_get_rate(device_t dev, device_t child) { @@ -393,3 +389,4 @@ if (strcmp(ivar->clk_name, "") != 0) devclk_deactivate(ivar->clk_name, ivar->clk_index); } +#endif ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#4 (text+ko) ==== @@ -65,12 +65,12 @@ static int at32_pm_activate(device_t); static void at32_pm_deactivate(device_t); -static void at32_pbb_start(devclk_t, uint8_t); -static void at32_pbb_stop(devclk_t, uint8_t); -static void at32_pll_start(devclk_t, uint8_t); -static void at32_pll_stop(devclk_t, uint8_t); -static void at32_osc_start(devclk_t, uint8_t); -static void at32_osc_stop(devclk_t, uint8_t); +static void at32_pbb_enable(devclk_t, int); +static void at32_pbb_disable(devclk_t, int); +static void at32_pll_enable(devclk_t, int); +static void at32_pll_disable(devclk_t, int); +static void at32_osc_enable(devclk_t, int); +static void at32_osc_disable(devclk_t, int); /* Driver variables and private data */ struct at32_pm_softc { @@ -99,8 +99,8 @@ /* Class defining our oscilliator. */ static kobj_method_t at32_osc_methods[] = { - KOBJMETHOD(devclk_start, at32_osc_start), - KOBJMETHOD(devclk_stop, at32_osc_stop), + KOBJMETHOD(devclk_enable, at32_osc_enable), + KOBJMETHOD(devclk_disable, at32_osc_disable), /* KOBJMETHOD(devclk_set_rate, at32_osc_set_rate), KOBJMETHOD(devclk_get_rate, at32_osc_get_rate),*/ {0, 0}, @@ -109,8 +109,8 @@ /* Class defining our PLLs. */ static kobj_method_t at32_pll_methods[] = { - KOBJMETHOD(devclk_start, at32_pll_start), - KOBJMETHOD(devclk_stop, at32_pll_stop), + KOBJMETHOD(devclk_enable, at32_pll_enable), + KOBJMETHOD(devclk_disable, at32_pll_disable), /* KOBJMETHOD(devclk_set_rate, at32_pll_set_rate), KOBJMETHOD(devclk_get_rate, at32_pll_get_rate),*/ {0, 0}, @@ -119,8 +119,8 @@ /* Class defining the PBB clock mask. */ static kobj_method_t at32_pbb_methods[] = { - KOBJMETHOD(devclk_start, at32_pbb_start), - KOBJMETHOD(devclk_stop, at32_pbb_stop), + KOBJMETHOD(devclk_enable, at32_pbb_enable), + KOBJMETHOD(devclk_disable, at32_pbb_disable), /* KOBJMETHOD(devclk_set_rate, at32_pbb_set_rate), KOBJMETHOD(devclk_get_rate, at32_pbb_get_rate),*/ {0, 0}, @@ -212,7 +212,7 @@ } static void -at32_pbb_start(devclk_t clk, uint8_t index) +at32_pbb_enable(devclk_t clk, int index) { struct at32_pm_softc *sc; uint32_t reg; @@ -225,7 +225,7 @@ } static void -at32_pbb_stop(devclk_t clk, uint8_t index) +at32_pbb_disable(devclk_t clk, int index) { struct at32_pm_softc *sc; uint32_t reg; @@ -238,7 +238,7 @@ } static void -at32_osc_start(devclk_t clk, uint8_t index) +at32_osc_enable(devclk_t clk, int index) { /* In this case, index means which oscilliator. */ switch (index) { @@ -252,7 +252,7 @@ } static void -at32_osc_stop(devclk_t clk, uint8_t index) +at32_osc_disable(devclk_t clk, int index) { /* In this case, index means which oscilliator. */ switch (index) { @@ -266,7 +266,7 @@ } static void -at32_pll_start(devclk_t clk, uint8_t index) +at32_pll_enable(devclk_t clk, int index) { /* Here, index means which pll. */ switch (index) { @@ -278,7 +278,7 @@ } static void -at32_pll_stop(devclk_t clk, uint8_t index) +at32_pll_disable(devclk_t clk, int index) { /* Here, index means which pll. */ switch (index) { ==== //depot/projects/avr32/src/sys/kern/devclk_if.m#3 (text+ko) ==== @@ -43,26 +43,14 @@ uint64_t _rate; }; -# Enable device clock +# Enable a device clock METHOD void enable { - device_t _dev; - device_t _child; + devclk_t _clk; + int _index; }; -# Disable device clock +# Disable a device clock METHOD void disable { - device_t _dev; - device_t _child; -}; - -# Enable a devclk -METHOD void start { devclk_t _clk; - uint8_t _index; -}; - -# Disable a devclk -METHOD void stop { - devclk_t _clk; - uint8_t _index; + int _index; }; ==== //depot/projects/avr32/src/sys/kern/subr_devclk.c#3 (text+ko) ==== @@ -39,7 +39,19 @@ #include "devclk_if.h" +/* TODO: + - Maybe a bit inefficient. + */ + +struct devclk_map { + device_t dev; + char clk_name[32]; + int clk_index; + STAILQ_ENTRY(devclk_map) link; +}; + static devclk_list_t devclks; +static STAILQ_HEAD(, devclk_map) devclk_maps; static devclk_t devclk_find_clock(const char *); @@ -47,43 +59,69 @@ devclk_init(void) { STAILQ_INIT(&devclks); + STAILQ_INIT(&devclk_maps); } uint64_t devclk_get_rate(device_t dev) { +#if 0 device_t parent = device_get_parent(dev); if (parent) { return (DEVCLK_GET_RATE(parent, dev)); } +#endif return (0); } int devclk_set_rate(device_t dev, uint64_t rate) { +#if 0 device_t parent = device_get_parent(dev); if (parent) { return (DEVCLK_SET_RATE(parent, dev, rate)); } +#endif return (EINVAL); } void devclk_enable(device_t dev) { - device_t parent = device_get_parent(dev); - if (parent) { - DEVCLK_ENABLE(parent, dev); + struct devclk_map *map; + devclk_t clk; + + /* Enable all clocks this device is mapped to. */ + /* + * XXX: This looks a bit silly right now, and this information should + * perhaps be retrieved from the device somehow, but that makes it + * machine dependant. + */ + STAILQ_FOREACH(map, &devclk_maps, link) { + if (map->dev != dev) + continue; + clk = devclk_find_clock(map->clk_name); + if (clk == NULL) + continue; + /* XXX: Enable parent too ? */ + DEVCLK_ENABLE(clk, map->clk_index); } } void devclk_disable(device_t dev) { - device_t parent = device_get_parent(dev); - if (parent) { - DEVCLK_DISABLE(parent, dev); + struct devclk_map *map; + devclk_t clk; + + /* Enable all clocks this device is mapped to. */ + STAILQ_FOREACH(map, &devclk_maps, link) { + clk = devclk_find_clock(map->clk_name); + if (clk == NULL) + continue; + /* XXX: Enable parent too ? */ + DEVCLK_DISABLE(clk, map->clk_index); } } @@ -96,8 +134,7 @@ { devclk_t clk; - clk = malloc(sizeof(*clk), M_DEVBUF, M_WAITOK | M_ZERO); - clk->methods = kobj_create(cls, M_DEVBUF, M_WAITOK | M_ZERO); + clk = kobj_create(cls, M_DEVBUF, M_WAITOK | M_ZERO); clk->dev = dev; strlcpy(clk->name, name, sizeof(clk->name)); clk->parent = ((parent == NULL) ? NULL : devclk_find_clock(parent)); @@ -106,6 +143,23 @@ STAILQ_INSERT_HEAD(&devclks, clk, link); } +/* + * Register a mapping between a clock and a device. + */ +void +devclk_register_map(device_t dev, const char *clk, int index) +{ + struct devclk_map *map; + + map = malloc(sizeof(*clk), M_DEVBUF, M_WAITOK | M_ZERO); + map->dev = dev; + strlcpy(map->clk_name, clk, sizeof(map->clk_name)); + map->clk_index = index; + + /* Insert into map. */ + STAILQ_INSERT_HEAD(&devclk_maps, map, link); +} + static devclk_t devclk_find_clock(const char *name) { @@ -118,28 +172,3 @@ } return (NULL); } - -/* Start device clock name by activating index index. */ -void -devclk_activate(const char *name, uint8_t index) -{ - devclk_t clk; - - clk = devclk_find_clock(name); - if (clk == NULL) - return; - /* XXX: Enable parent too ? */ - DEVCLK_START(clk->methods, index); -} - -/* Stop device clock name by deactivating index index. */ -void -devclk_deactivate(const char *name, uint8_t index) -{ - devclk_t clk; - - clk = devclk_find_clock(name); - if (clk == NULL) - return; - DEVCLK_STOP(clk->methods, index); -} ==== //depot/projects/avr32/src/sys/sys/devclk.h#3 (text+ko) ==== @@ -5,7 +5,7 @@ #include struct devclk { - kobj_t methods; + KOBJ_FIELDS; device_t dev; /* Device responsible for clock. */ char name[32]; /* Clock name. */ struct devclk *parent; /* Clock we originate from. */ @@ -39,14 +39,15 @@ */ void devclk_disable(device_t); -void devclk_activate(const char *, uint8_t); -void devclk_deactivate(const char *, uint8_t); - /** * Add a clock to the devclk manager. */ void devclk_register_clock(device_t, kobj_class_t, const char *, const char *); +/** + * Register a mapping from device to clock + */ +void devclk_register_map(device_t, const char *, int); #endif /* _KERNEL */ #endif /* !_SYS_DEVCLK_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Mar 18 18:13:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 720B7106577A; Wed, 18 Mar 2009 18:13:23 +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 0286D1065743 for ; Wed, 18 Mar 2009 18:13:23 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A35908FC15 for ; Wed, 18 Mar 2009 18:13:21 +0000 (UTC) (envelope-from trasz@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 n2IIDLhL089456 for ; Wed, 18 Mar 2009 18:13:21 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IIDLDL089194 for perforce@freebsd.org; Wed, 18 Mar 2009 18:13:21 GMT (envelope-from trasz@freebsd.org) Date: Wed, 18 Mar 2009 18:13:21 GMT Message-Id: <200903181813.n2IIDLDL089194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 159391 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, 18 Mar 2009 18:13:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=159391 Change 159391 by trasz@trasz_victim7 on 2009/03/18 18:12:22 Fix build. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudio.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_if.m#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/Makefile#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-usb.c#3 (text) ==== @@ -2,6 +2,9 @@ * Copyright (c) 2006 - 2008 Søren Schmidt * All rights reserved. * + * Copyright (c) 2006 Hans Petter Selasky + * All rights reserved. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -25,945 +28,1071 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.10 2009/02/19 12:47:24 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.14 2009/03/02 05:37:05 thompsa Exp $"); + +#include "usbdevs.h" +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include -#include "opt_ata.h" -#include -#include -#include -#include -#include #include -#include -#include -#include -#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include + #include #include +#define ATAUSB_BULK_SIZE (1<<17) + /* Command Block Wrapper */ struct bbb_cbw { - u_int8_t signature[4]; -#define CBWSIGNATURE 0x43425355 + uint8_t signature[4]; +#define CBWSIGNATURE 0x43425355 - u_int8_t tag[4]; - u_int8_t transfer_length[4]; - u_int8_t flags; -#define CBWFLAGS_OUT 0x00 -#define CBWFLAGS_IN 0x80 + uint8_t tag[4]; + uint8_t transfer_length[4]; + uint8_t flags; +#define CBWFLAGS_OUT 0x00 +#define CBWFLAGS_IN 0x80 - u_int8_t lun; - u_int8_t length; -#define CBWCDBLENGTH 16 + uint8_t lun; + uint8_t length; +#define CBWCDBLENGTH 16 - u_int8_t cdb[CBWCDBLENGTH]; -}; + uint8_t cdb[CBWCDBLENGTH]; +} __packed; /* Command Status Wrapper */ struct bbb_csw { - u_int8_t signature[4]; -#define CSWSIGNATURE 0x53425355 + uint8_t signature[4]; +#define CSWSIGNATURE 0x53425355 - u_int8_t tag[4]; - u_int8_t residue[4]; - u_int8_t status; -#define CSWSTATUS_GOOD 0x0 -#define CSWSTATUS_FAILED 0x1 -#define CSWSTATUS_PHASE 0x2 -}; + uint8_t tag[4]; + uint8_t residue[4]; + uint8_t status; +#define CSWSTATUS_GOOD 0x0 +#define CSWSTATUS_FAILED 0x1 +#define CSWSTATUS_PHASE 0x2 +} __packed; /* USB-ATA 'controller' softc */ -struct atausb_softc { - device_t dev; /* base device */ - usbd_interface_handle iface; /* interface */ - int ifaceno; /* interface number */ - u_int8_t bulkin; /* endpoint address's */ - u_int8_t bulkout; - u_int8_t bulkirq; - usbd_pipe_handle bulkin_pipe; /* pipe handle's */ - usbd_pipe_handle bulkout_pipe; - usbd_pipe_handle bulkirq_pipe; - int maxlun; - int timeout; - struct ata_request *ata_request; - usb_device_request_t usb_request; - struct bbb_cbw cbw; - struct bbb_csw csw; +struct atausb2_softc { + struct bbb_cbw cbw; + struct bbb_csw csw; + struct mtx locked_mtx; + + struct ata_channel *locked_ch; + struct ata_channel *restart_ch; + struct ata_request *ata_request; + +#define ATAUSB_T_BBB_RESET1 0 +#define ATAUSB_T_BBB_RESET2 1 +#define ATAUSB_T_BBB_RESET3 2 +#define ATAUSB_T_BBB_COMMAND 3 +#define ATAUSB_T_BBB_DATA_READ 4 +#define ATAUSB_T_BBB_DATA_RD_CS 5 +#define ATAUSB_T_BBB_DATA_WRITE 6 +#define ATAUSB_T_BBB_DATA_WR_CS 7 +#define ATAUSB_T_BBB_STATUS 8 +#define ATAUSB_T_BBB_MAX 9 + +#define ATAUSB_T_MAX ATAUSB_T_BBB_MAX -#define ATAUSB_T_BBB_CBW 0 -#define ATAUSB_T_BBB_DATA 1 -#define ATAUSB_T_BBB_DCLEAR 2 -#define ATAUSB_T_BBB_CSW1 3 -#define ATAUSB_T_BBB_CSW2 4 -#define ATAUSB_T_BBB_SCLEAR 5 -#define ATAUSB_T_BBB_RESET1 6 -#define ATAUSB_T_BBB_RESET2 7 -#define ATAUSB_T_BBB_RESET3 8 -#define ATAUSB_T_MAX 9 - usbd_xfer_handle transfer[ATAUSB_T_MAX]; + struct usb2_xfer *xfer[ATAUSB_T_MAX]; + caddr_t ata_data; + device_t dev; - int state; -#define ATAUSB_S_ATTACH 0 -#define ATAUSB_S_IDLE 1 -#define ATAUSB_S_BBB_COMMAND 2 -#define ATAUSB_S_BBB_DATA 3 -#define ATAUSB_S_BBB_DCLEAR 4 -#define ATAUSB_S_BBB_STATUS1 5 -#define ATAUSB_S_BBB_SCLEAR 6 -#define ATAUSB_S_BBB_STATUS2 7 -#define ATAUSB_S_BBB_RESET1 8 -#define ATAUSB_S_BBB_RESET2 9 -#define ATAUSB_S_BBB_RESET3 10 -#define ATAUSB_S_DETACH 11 + uint32_t timeout; + uint32_t ata_donecount; + uint32_t ata_bytecount; - struct mtx locked_mtx; - struct ata_channel *locked_ch; - struct ata_channel *restart_ch; + uint8_t last_xfer_no; + uint8_t usb2_speed; + uint8_t intr_stalled; + uint8_t maxlun; + uint8_t iface_no; + uint8_t status_try; }; -static int atausbdebug = 0; +static const int atausbdebug = 0; + +/* prototypes */ + +static device_probe_t atausb2_probe; +static device_attach_t atausb2_attach; +static device_detach_t atausb2_detach; + +static usb2_callback_t atausb2_t_bbb_reset1_callback; +static usb2_callback_t atausb2_t_bbb_reset2_callback; +static usb2_callback_t atausb2_t_bbb_reset3_callback; +static usb2_callback_t atausb2_t_bbb_command_callback; +static usb2_callback_t atausb2_t_bbb_data_read_callback; +static usb2_callback_t atausb2_t_bbb_data_rd_cs_callback; +static usb2_callback_t atausb2_t_bbb_data_write_callback; +static usb2_callback_t atausb2_t_bbb_data_wr_cs_callback; +static usb2_callback_t atausb2_t_bbb_status_callback; +static usb2_callback_t atausb2_tr_error; + +static void atausb2_cancel_request(struct atausb2_softc *sc); +static void atausb2_transfer_start(struct atausb2_softc *sc, uint8_t xfer_no); +static void atausb2_t_bbb_data_clear_stall_callback(struct usb2_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer); +static int ata_usbchannel_begin_transaction(struct ata_request *request); +static int ata_usbchannel_end_transaction(struct ata_request *request); -/* prototypes*/ -static usbd_status atausb_start(struct atausb_softc *sc, usbd_pipe_handle pipe, void *buffer, int buflen, int flags, usbd_xfer_handle xfer); -static usbd_status atausb_ctl_start(struct atausb_softc *sc, usbd_device_handle udev, usb_device_request_t *req, void *buffer, int buflen, int flags, usbd_xfer_handle xfer); -static void atausb_clear_stall(struct atausb_softc *sc, u_int8_t endpt, usbd_pipe_handle pipe, int state, usbd_xfer_handle xfer); -static void atausb_bbb_reset(struct atausb_softc *sc); -static int atausb_bbb_start(struct ata_request *request); -static void atausb_bbb_finish(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status err); -int ata_usbchannel_begin_transaction(struct ata_request *request); -int ata_usbchannel_end_transaction(struct ata_request *request); +static device_probe_t ata_usbchannel_probe; +static device_attach_t ata_usbchannel_attach; +static device_detach_t ata_usbchannel_detach; +static ata_setmode_t ata_usbchannel_setmode; +static ata_locking_t ata_usbchannel_locking; /* * USB frontend part */ -USB_DECLARE_DRIVER(atausb); -DRIVER_MODULE(atausb, uhub, atausb_driver, atausb_devclass, 0, 0); + +struct usb2_config atausb2_config[ATAUSB_T_BBB_MAX] = { + + [ATAUSB_T_BBB_RESET1] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_reset1_callback, + .mh.timeout = 5000, /* 5 seconds */ + .mh.interval = 500, /* 500 milliseconds */ + }, + + [ATAUSB_T_BBB_RESET2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_reset2_callback, + .mh.timeout = 5000, /* 5 seconds */ + .mh.interval = 50, /* 50 milliseconds */ + }, + + [ATAUSB_T_BBB_RESET3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_reset3_callback, + .mh.timeout = 5000, /* 5 seconds */ + .mh.interval = 50, /* 50 milliseconds */ + }, + + [ATAUSB_T_BBB_COMMAND] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .mh.bufsize = sizeof(struct bbb_cbw), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_command_callback, + .mh.timeout = 5000, /* 5 seconds */ + }, + + [ATAUSB_T_BBB_DATA_READ] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .mh.bufsize = ATAUSB_BULK_SIZE, + .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, + .mh.callback = &atausb2_t_bbb_data_read_callback, + .mh.timeout = 0, /* overwritten later */ + }, + + [ATAUSB_T_BBB_DATA_RD_CS] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_data_rd_cs_callback, + .mh.timeout = 5000, /* 5 seconds */ + }, + + [ATAUSB_T_BBB_DATA_WRITE] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .mh.bufsize = ATAUSB_BULK_SIZE, + .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, + .mh.callback = &atausb2_t_bbb_data_write_callback, + .mh.timeout = 0, /* overwritten later */ + }, + + [ATAUSB_T_BBB_DATA_WR_CS] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .mh.bufsize = sizeof(struct usb2_device_request), + .mh.flags = {}, + .mh.callback = &atausb2_t_bbb_data_wr_cs_callback, + .mh.timeout = 5000, /* 5 seconds */ + }, + + [ATAUSB_T_BBB_STATUS] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .mh.bufsize = sizeof(struct bbb_csw), + .mh.flags = {.short_xfer_ok = 1,}, + .mh.callback = &atausb2_t_bbb_status_callback, + .mh.timeout = 5000, /* ms */ + }, +}; + +static devclass_t atausb2_devclass; + +static device_method_t atausb2_methods[] = { + DEVMETHOD(device_probe, atausb2_probe), + DEVMETHOD(device_attach, atausb2_attach), + DEVMETHOD(device_detach, atausb2_detach), + {0, 0} +}; + +static driver_t atausb2_driver = { + .name = "atausb", + .methods = atausb2_methods, + .size = sizeof(struct atausb2_softc), +}; + +DRIVER_MODULE(atausb, uhub, atausb2_driver, atausb2_devclass, 0, 0); +MODULE_DEPEND(atausb, usb, 1, 1, 1); MODULE_VERSION(atausb, 1); static int -atausb_match(device_t dev) +atausb2_probe(device_t dev) { - struct usb_attach_arg *uaa = device_get_ivars(dev); - usb_interface_descriptor_t *id; + struct usb2_attach_arg *uaa = device_get_ivars(dev); + struct usb2_interface_descriptor *id; - if (uaa->iface == NULL) - return UMATCH_NONE; - - id = usbd_get_interface_descriptor(uaa->iface); - if (!id || id->bInterfaceClass != UICLASS_MASS) - return UMATCH_NONE; - - switch (id->bInterfaceSubClass) { - case UISUBCLASS_QIC157: - case UISUBCLASS_RBC: - case UISUBCLASS_SCSI: - case UISUBCLASS_SFF8020I: - case UISUBCLASS_SFF8070I: - case UISUBCLASS_UFI: - switch (id->bInterfaceProtocol) { - case UIPROTO_MASS_CBI: - case UIPROTO_MASS_CBI_I: - case UIPROTO_MASS_BBB: - case UIPROTO_MASS_BBB_OLD: - return UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO; + if (uaa->usb2_mode != USB_MODE_HOST) { + return (ENXIO); + } + if (uaa->use_generic == 0) { + /* give other drivers a try first */ + return (ENXIO); + } + id = usb2_get_interface_descriptor(uaa->iface); + if ((!id) || (id->bInterfaceClass != UICLASS_MASS)) { + return (ENXIO); + } + switch (id->bInterfaceSubClass) { + case UISUBCLASS_QIC157: + case UISUBCLASS_RBC: + case UISUBCLASS_SCSI: + case UISUBCLASS_SFF8020I: + case UISUBCLASS_SFF8070I: + case UISUBCLASS_UFI: + switch (id->bInterfaceProtocol) { + case UIPROTO_MASS_CBI: + case UIPROTO_MASS_CBI_I: + case UIPROTO_MASS_BBB: + case UIPROTO_MASS_BBB_OLD: + return (0); + default: + return (0); + } + break; default: - return UMATCH_IFACECLASS_IFACESUBCLASS; + return (0); } - break; - default: - return UMATCH_IFACECLASS; - } } static int -atausb_attach(device_t dev) +atausb2_attach(device_t dev) { - struct atausb_softc *sc = device_get_softc(dev); - struct usb_attach_arg *uaa = device_get_ivars(dev); - usb_interface_descriptor_t *id; - usb_endpoint_descriptor_t *ed; - usbd_device_handle udev; - usb_device_request_t request; - device_t child; - char devinfo[1024], *proto, *subclass; - u_int8_t maxlun; - int err, i; + struct atausb2_softc *sc = device_get_softc(dev); + struct usb2_attach_arg *uaa = device_get_ivars(dev); + struct usb2_interface_descriptor *id; + const char *proto, *subclass; + struct usb2_device_request request; + device_t child; + uint16_t i; + uint8_t maxlun; + uint8_t has_intr; + int err; - sc->dev = dev; - usbd_devinfo(uaa->device, 0, devinfo); - device_set_desc_copy(dev, devinfo); - sc->bulkin = sc->bulkout = sc->bulkirq = -1; - sc->bulkin_pipe = sc->bulkout_pipe= sc->bulkirq_pipe = NULL; - sc->iface = uaa->iface; - sc->ifaceno = uaa->ifaceno; - sc->maxlun = 0; - sc->timeout = 5000; - sc->locked_ch = NULL; - sc->restart_ch = NULL; - mtx_init(&sc->locked_mtx, "ATAUSB lock", NULL, MTX_DEF); + device_set_usb2_desc(dev); - id = usbd_get_interface_descriptor(sc->iface); - switch (id->bInterfaceProtocol) { - case UIPROTO_MASS_BBB: - case UIPROTO_MASS_BBB_OLD: - proto = "Bulk-Only"; - break; - case UIPROTO_MASS_CBI: - proto = "CBI"; - break; - case UIPROTO_MASS_CBI_I: - proto = "CBI with CCI"; - break; - default: - proto = "Unknown"; - } - switch (id->bInterfaceSubClass) { - case UISUBCLASS_RBC: - subclass = "RBC"; - break; - case UISUBCLASS_QIC157: - case UISUBCLASS_SFF8020I: - case UISUBCLASS_SFF8070I: - subclass = "ATAPI"; - break; - case UISUBCLASS_SCSI: - subclass = "SCSI"; - break; - case UISUBCLASS_UFI: - subclass = "UFI"; - break; - default: - subclass = "Unknown"; - } - device_printf(dev, "using %s over %s\n", subclass, proto); - if (strcmp(proto, "Bulk-Only") || - (strcmp(subclass, "ATAPI") && strcmp(subclass, "SCSI"))) - return ENXIO; + sc->dev = dev; + sc->maxlun = 0; + sc->locked_ch = NULL; + sc->restart_ch = NULL; + sc->usb2_speed = usb2_get_speed(uaa->device); + mtx_init(&sc->locked_mtx, "ATAUSB lock", NULL, (MTX_DEF | MTX_RECURSE)); - for (i = 0 ; i < id->bNumEndpoints ; i++) { - if (!(ed = usbd_interface2endpoint_descriptor(sc->iface, i))) { - device_printf(sc->dev, "could not read endpoint descriptor\n"); - return ENXIO; + id = usb2_get_interface_descriptor(uaa->iface); + switch (id->bInterfaceProtocol) { + case UIPROTO_MASS_BBB: + case UIPROTO_MASS_BBB_OLD: + proto = "Bulk-Only"; + break; + case UIPROTO_MASS_CBI: + proto = "CBI"; + break; + case UIPROTO_MASS_CBI_I: + proto = "CBI with CCI"; + break; + default: + proto = "Unknown"; } - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { - sc->bulkin = ed->bEndpointAddress; + + switch (id->bInterfaceSubClass) { + case UISUBCLASS_RBC: + subclass = "RBC"; + break; + case UISUBCLASS_QIC157: + case UISUBCLASS_SFF8020I: + case UISUBCLASS_SFF8070I: + subclass = "ATAPI"; + break; + case UISUBCLASS_SCSI: + subclass = "SCSI"; + break; + case UISUBCLASS_UFI: + subclass = "UFI"; + break; + default: + subclass = "Unknown"; } - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT && - (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { - sc->bulkout = ed->bEndpointAddress; + + has_intr = (id->bInterfaceProtocol == UIPROTO_MASS_CBI_I); + sc->iface_no = id->bInterfaceNumber; + + device_printf(dev, "using %s over %s\n", subclass, proto); + if (strcmp(proto, "Bulk-Only") || + (strcmp(subclass, "ATAPI") && strcmp(subclass, "SCSI"))) { + goto detach; } - if (id->bInterfaceProtocol == UIPROTO_MASS_CBI_I && - UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - (ed->bmAttributes & UE_XFERTYPE) == UE_INTERRUPT) { - sc->bulkirq = ed->bEndpointAddress; - } - } + err = usb2_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, + sc->xfer, atausb2_config, ATAUSB_T_BBB_MAX, sc, + &sc->locked_mtx); - /* check whether we found at least the endpoints we need */ - if (!sc->bulkin || !sc->bulkout) { - device_printf(sc->dev, "needed endpoints not found (%d,%d)\n", - sc->bulkin, sc->bulkout); - atausb_detach(dev); - return ENXIO; - } + /* skip reset first time */ + sc->last_xfer_no = ATAUSB_T_BBB_COMMAND; - /* open the pipes */ - if (usbd_open_pipe(sc->iface, sc->bulkout, - USBD_EXCLUSIVE_USE, &sc->bulkout_pipe)) { - device_printf(sc->dev, "cannot open bulkout pipe (%d)\n", sc->bulkout); - atausb_detach(dev); - return ENXIO; - } - if (usbd_open_pipe(sc->iface, sc->bulkin, - USBD_EXCLUSIVE_USE, &sc->bulkin_pipe)) { - device_printf(sc->dev, "cannot open bulkin pipe (%d)\n", sc->bulkin); - atausb_detach(dev); - return ENXIO; - } - if (id->bInterfaceProtocol == UIPROTO_MASS_CBI_I) { - if (usbd_open_pipe(sc->iface, sc->bulkirq, - USBD_EXCLUSIVE_USE, &sc->bulkirq_pipe)) { - device_printf(sc->dev, "cannot open bulkirq pipe (%d)\n", - sc->bulkirq); - atausb_detach(dev); - return ENXIO; + if (err) { + device_printf(sc->dev, "could not setup required " + "transfers, %s\n", usb2_errstr(err)); + goto detach; } - } - sc->state = ATAUSB_S_ATTACH; + /* get number of devices so we can add matching channels */ + request.bmRequestType = UT_READ_CLASS_INTERFACE; + request.bRequest = 0xfe; /* GET_MAX_LUN; */ + USETW(request.wValue, 0); + USETW(request.wIndex, sc->iface_no); + USETW(request.wLength, sizeof(maxlun)); + err = usb2_do_request(uaa->device, &Giant, &request, &maxlun); - /* alloc needed number of transfer handles */ - for (i = 0; i < ATAUSB_T_MAX; i++) { - sc->transfer[i] = usbd_alloc_xfer(uaa->device); - if (!sc->transfer[i]) { - device_printf(sc->dev, "out of memory\n"); - atausb_detach(dev); - return ENXIO; + if (err) { + if (bootverbose) { + device_printf(sc->dev, "get maxlun not supported %s\n", + usb2_errstr(err)); + } + } else { + sc->maxlun = maxlun; + if (bootverbose) { + device_printf(sc->dev, "maxlun=%d\n", sc->maxlun); + } } - } - /* driver is ready to process requests here */ - sc->state = ATAUSB_S_IDLE; + /* ata channels are children to this USB control device */ + for (i = 0; i <= sc->maxlun; i++) { + if ((child = device_add_child(sc->dev, "ata", + devclass_find_free_unit(ata_devclass, 2))) == NULL) { + device_printf(sc->dev, "failed to add ata child device\n"); + } else + device_set_ivars(child, (void *)(intptr_t)i); + } + bus_generic_attach(sc->dev); - /* get number of devices so we can add matching channels */ - usbd_interface2device_handle(sc->iface, &udev); - request.bmRequestType = UT_READ_CLASS_INTERFACE; - request.bRequest = 0xfe; //GET_MAX_LUN; - USETW(request.wValue, 0); - USETW(request.wIndex, sc->ifaceno); - USETW(request.wLength, sizeof(maxlun)); - switch ((err = usbd_do_request(udev, &request, &maxlun))) { - case USBD_NORMAL_COMPLETION: - if (bootverbose) - device_printf(sc->dev, "maxlun=%d\n", maxlun); - sc->maxlun = maxlun; - break; - default: - if (bootverbose) - device_printf(sc->dev, "get maxlun not supported %s\n", - usbd_errstr(err)); - } + return (0); - /* ata channels are children to this USB control device */ - for (i = 0; i <= sc->maxlun; i++) { - if ((child = device_add_child(sc->dev, "ata", - devclass_find_free_unit(ata_devclass, 2))) == NULL) { - device_printf(sc->dev, "failed to add ata child device\n"); - } else - device_set_ivars(child, (void *)(intptr_t)i); - } - bus_generic_attach(sc->dev); - return 0; +detach: + atausb2_detach(dev); + return (ENXIO); } static int -atausb_detach(device_t dev) +atausb2_detach(device_t dev) +{ + struct atausb2_softc *sc = device_get_softc(dev); + device_t *children; + int nchildren, i; + + /* teardown our statemachine */ + + usb2_transfer_unsetup(sc->xfer, ATAUSB_T_MAX); + + /* detach & delete all children, if any */ + + if (!device_get_children(dev, &children, &nchildren)) { + for (i = 0; i < nchildren; i++) { + device_delete_child(dev, children[i]); + } + free(children, M_TEMP); + } + mtx_destroy(&sc->locked_mtx); + return (0); +} + +static void +atausb2_transfer_start(struct atausb2_softc *sc, uint8_t xfer_no) +{ + if (atausbdebug) { + device_printf(sc->dev, "BBB transfer %d\n", xfer_no); + } + if (sc->xfer[xfer_no]) { + sc->last_xfer_no = xfer_no; + usb2_transfer_start(sc->xfer[xfer_no]); + } else { + atausb2_cancel_request(sc); + } +} + +static void +atausb2_t_bbb_reset1_callback(struct usb2_xfer *xfer) { - struct atausb_softc *sc = device_get_softc(dev); - usbd_device_handle udev; - device_t *children; - int nchildren, i; + struct atausb2_softc *sc = xfer->priv_sc; + struct usb2_device_request req; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + atausb2_transfer_start(sc, ATAUSB_T_BBB_RESET2); + return; - /* signal that device is going away */ - sc->state = ATAUSB_S_DETACH; + case USB_ST_SETUP: + req.bmRequestType = UT_WRITE_CLASS_INTERFACE; + req.bRequest = 0xff; /* bulk-only reset */ + USETW(req.wValue, 0); + req.wIndex[0] = sc->iface_no; + req.wIndex[1] = 0; + USETW(req.wLength, 0); - /* abort all the pipes in case there are active transfers */ - usbd_interface2device_handle(sc->iface, &udev); - usbd_abort_default_pipe(udev); - if (sc->bulkout_pipe) - usbd_abort_pipe(sc->bulkout_pipe); - if (sc->bulkin_pipe) - usbd_abort_pipe(sc->bulkin_pipe); - if (sc->bulkirq_pipe) - usbd_abort_pipe(sc->bulkirq_pipe); + usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); - /* detach & delete all children */ - if (!device_get_children(dev, &children, &nchildren)) { - for (i = 0; i < nchildren; i++) - device_delete_child(dev, children[i]); - free(children, M_TEMP); - } + xfer->frlengths[0] = sizeof(req); + xfer->nframes = 1; + usb2_start_hardware(xfer); + return; - /* free the transfers */ - for (i = 0; i < ATAUSB_T_MAX; i++) - if (sc->transfer[i]) - usbd_free_xfer(sc->transfer[i]); + default: /* Error */ + atausb2_tr_error(xfer); + return; - /* remove all the pipes */ - if (sc->bulkout_pipe) - usbd_close_pipe(sc->bulkout_pipe); - if (sc->bulkin_pipe) - usbd_close_pipe(sc->bulkin_pipe); - if (sc->bulkirq_pipe) - usbd_close_pipe(sc->bulkirq_pipe); + } +} - mtx_destroy(&sc->locked_mtx); - return 0; +static void +atausb2_t_bbb_reset2_callback(struct usb2_xfer *xfer) +{ + atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_RESET3, + ATAUSB_T_BBB_DATA_READ); } +static void +atausb2_t_bbb_reset3_callback(struct usb2_xfer *xfer) +{ + atausb2_t_bbb_data_clear_stall_callback(xfer, ATAUSB_T_BBB_COMMAND, + ATAUSB_T_BBB_DATA_WRITE); +} -/* - * Generic USB transfer routines - */ -static usbd_status -atausb_start(struct atausb_softc *sc, usbd_pipe_handle pipe, - void *buffer, int buflen, int flags, usbd_xfer_handle xfer) +static void +atausb2_t_bbb_data_clear_stall_callback(struct usb2_xfer *xfer, + uint8_t next_xfer, + uint8_t stall_xfer) { - usbd_status err; + struct atausb2_softc *sc = xfer->priv_sc; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: +tr_transferred: + atausb2_transfer_start(sc, next_xfer); + return; + + case USB_ST_SETUP: + if (usb2_clear_stall_callback(xfer, sc->xfer[stall_xfer])) { + goto tr_transferred; + } + return; - if (sc->state == ATAUSB_S_DETACH) - return USBD_NOT_STARTED; + default: /* Error */ + atausb2_tr_error(xfer); + return; - usbd_setup_xfer(xfer, pipe, (void *)sc, buffer, buflen, flags, - sc->timeout, atausb_bbb_finish); - err = usbd_transfer(xfer); - if (err && (err != USBD_IN_PROGRESS)) { - if (atausbdebug) - device_printf(sc->dev, "failed to setup transfer, %s\n", - usbd_errstr(err)); - return err; - } - return USBD_NORMAL_COMPLETION; + } } -static usbd_status -atausb_ctl_start(struct atausb_softc *sc, usbd_device_handle udev, - usb_device_request_t *req, void *buffer, int buflen, int flags, - usbd_xfer_handle xfer) +static void +atausb2_t_bbb_command_callback(struct usb2_xfer *xfer) { - usbd_status err; + struct atausb2_softc *sc = xfer->priv_sc; + struct ata_request *request = sc->ata_request; + struct ata_channel *ch; + uint32_t tag; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + atausb2_transfer_start + (sc, ((request->flags & ATA_R_READ) ? ATAUSB_T_BBB_DATA_READ : + (request->flags & ATA_R_WRITE) ? ATAUSB_T_BBB_DATA_WRITE : + ATAUSB_T_BBB_STATUS)); + return; + + case USB_ST_SETUP: + + sc->status_try = 0; + + if (request) { + ch = device_get_softc(request->parent); + + sc->timeout = (request->timeout * 1000) + 5000; + + tag = UGETDW(sc->cbw.tag) + 1; + + USETDW(sc->cbw.signature, CBWSIGNATURE); + USETDW(sc->cbw.tag, tag); + USETDW(sc->cbw.transfer_length, request->bytecount); + sc->cbw.flags = (request->flags & ATA_R_READ) ? CBWFLAGS_IN : CBWFLAGS_OUT; + sc->cbw.lun = ch->unit; + sc->cbw.length = 16; + bzero(sc->cbw.cdb, 16); + bcopy(request->u.atapi.ccb, sc->cbw.cdb, 12); /* XXX SOS */ + + usb2_copy_in(xfer->frbuffers, 0, &sc->cbw, sizeof(sc->cbw)); + + xfer->frlengths[0] = sizeof(sc->cbw); + usb2_start_hardware(xfer); + } + return; - if (sc->state == ATAUSB_S_DETACH) - return USBD_NOT_STARTED; + default: /* Error */ + atausb2_tr_error(xfer); + return; - usbd_setup_default_xfer(xfer, udev, (void *)sc, sc->timeout, req, - buffer, buflen, flags, atausb_bbb_finish); - err = usbd_transfer(xfer); - if (err && (err != USBD_IN_PROGRESS)) { - if (atausbdebug) - device_printf(sc->dev, "failed to setup ctl transfer, %s\n", - usbd_errstr(err)); - return err; - } - return USBD_NORMAL_COMPLETION; + } } static void -atausb_clear_stall(struct atausb_softc *sc, u_int8_t endpt, - usbd_pipe_handle pipe, int state, usbd_xfer_handle xfer) +atausb2_t_bbb_data_read_callback(struct usb2_xfer *xfer) { - usbd_device_handle udev; + struct atausb2_softc *sc = xfer->priv_sc; + uint32_t max_bulk = xfer->max_data_length; + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + + usb2_copy_out(xfer->frbuffers, 0, + sc->ata_data, xfer->actlen); + + sc->ata_bytecount -= xfer->actlen; + sc->ata_data += xfer->actlen; + sc->ata_donecount += xfer->actlen; + + if (xfer->actlen < xfer->sumlen) { + /* short transfer */ + sc->ata_bytecount = 0; + } + case USB_ST_SETUP: + + if (atausbdebug > 1) { + device_printf(sc->dev, "%s: max_bulk=%d, ata_bytecount=%d\n", + __FUNCTION__, max_bulk, sc->ata_bytecount); + } + if (sc->ata_bytecount == 0) { + atausb2_transfer_start(sc, ATAUSB_T_BBB_STATUS); + return; + } + if (max_bulk > sc->ata_bytecount) { + max_bulk = sc->ata_bytecount; + } + xfer->timeout = sc->timeout; + xfer->frlengths[0] = max_bulk; + + usb2_start_hardware(xfer); + return; + + default: /* Error */ + if (xfer->error == USB_ERR_CANCELLED) { + atausb2_tr_error(xfer); + } else { + atausb2_transfer_start(sc, ATAUSB_T_BBB_DATA_RD_CS); + } + return; - if (atausbdebug) - device_printf(sc->dev, "clear endpoint 0x%02x stall\n", endpt); - usbd_interface2device_handle(sc->iface, &udev); - sc->state = state; - usbd_clear_endpoint_toggle(pipe); - sc->usb_request.bmRequestType = UT_WRITE_ENDPOINT; - sc->usb_request.bRequest = UR_CLEAR_FEATURE; - USETW(sc->usb_request.wValue, UF_ENDPOINT_HALT); - USETW(sc->usb_request.wIndex, endpt); - USETW(sc->usb_request.wLength, 0); - atausb_ctl_start(sc, udev, &sc->usb_request, NULL, 0, 0, xfer); + } } +static void +atausb2_t_bbb_data_rd_cs_callback(struct usb2_xfer *xfer) +{ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 18 18:15:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A90B1065829; Wed, 18 Mar 2009 18:15:24 +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 E9A411065731 for ; Wed, 18 Mar 2009 18:15:23 +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 D54D98FC18 for ; Wed, 18 Mar 2009 18:15:23 +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 n2IIFNXa034904 for ; Wed, 18 Mar 2009 18:15:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IIFNAD034869 for perforce@freebsd.org; Wed, 18 Mar 2009 18:15:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 18 Mar 2009 18:15:23 GMT Message-Id: <200903181815.n2IIFNAD034869@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 159392 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, 18 Mar 2009 18:15:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=159392 Change 159392 by hselasky@hselasky_laptop001 on 2009/03/18 18:14:45 USB CORE shrinking. Refactor how we get the usb2_xfer_root structure from a usb2_dma_parent_tag structure. This saves a pointer and speeds up conversion. Add more defines which control inclusion and exclusion of code. This currently allows shrinking the USB stack into less than 70 kilobytes including an OS for embedded purpose. Defines added: USB_HAVE_STRINGS USB_HAVE_BUSDMA USB_HAVE_COMPAT_LINUX USB_HAVE_USER_IO USB_HAVE_MBUF The defines can be overwritten via "opt_usb.h". The kernel "options" file has not been updated yet. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_debug.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#129 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_util.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_util.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#2 (text+ko) ==== @@ -70,7 +70,7 @@ USB_P2U(&(((struct at91dci_softc *)0)->sc_bus)))) #define AT9100_DCI_PC2SC(pc) \ - AT9100_DCI_BUS2SC((pc)->tag_parent->info->bus) + AT9100_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) #if USB_DEBUG static int at91dcidebug = 0; ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#6 (text+ko) ==== @@ -63,7 +63,7 @@ USB_P2U(&(((struct atmegadci_softc *)0)->sc_bus)))) #define ATMEGA_PC2SC(pc) \ - ATMEGA_BUS2SC((pc)->tag_parent->info->bus) + ATMEGA_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) #if USB_DEBUG static int atmegadci_debug = 0; ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#2 (text+ko) ==== @@ -64,7 +64,7 @@ USB_P2U(&(((struct musbotg_softc *)0)->sc_bus)))) #define MUSBOTG_PC2SC(pc) \ - MUSBOTG_BUS2SC((pc)->tag_parent->info->bus) + MUSBOTG_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) #if USB_DEBUG static int musbotgdebug = 0; ==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#4 (text+ko) ==== @@ -50,15 +50,6 @@ static void usb2_attach_sub(device_t, struct usb2_bus *); static void usb2_post_init(void *); -static void usb2_bus_mem_flush_all_cb(struct usb2_bus *, - struct usb2_page_cache *, struct usb2_page *, uint32_t, - uint32_t); -static void usb2_bus_mem_alloc_all_cb(struct usb2_bus *, - struct usb2_page_cache *, struct usb2_page *, uint32_t, - uint32_t); -static void usb2_bus_mem_free_all_cb(struct usb2_bus *, - struct usb2_page_cache *, struct usb2_page *, uint32_t, - uint32_t); static void usb2_bus_roothub(struct usb2_proc_msg *pm); /* static variables */ @@ -488,16 +479,19 @@ /*------------------------------------------------------------------------* * usb2_bus_mem_flush_all_cb *------------------------------------------------------------------------*/ +#if USB_HAVE_BUSDMA static void usb2_bus_mem_flush_all_cb(struct usb2_bus *bus, struct usb2_page_cache *pc, struct usb2_page *pg, uint32_t size, uint32_t align) { usb2_pc_cpu_flush(pc); } +#endif /*------------------------------------------------------------------------* * usb2_bus_mem_flush_all - factored out code *------------------------------------------------------------------------*/ +#if USB_HAVE_BUSDMA void usb2_bus_mem_flush_all(struct usb2_bus *bus, usb2_bus_mem_cb_t *cb) { @@ -505,10 +499,12 @@ cb(bus, &usb2_bus_mem_flush_all_cb); } } +#endif /*------------------------------------------------------------------------* * usb2_bus_mem_alloc_all_cb *------------------------------------------------------------------------*/ +#if USB_HAVE_BUSDMA static void usb2_bus_mem_alloc_all_cb(struct usb2_bus *bus, struct usb2_page_cache *pc, struct usb2_page *pg, uint32_t size, uint32_t align) @@ -520,6 +516,7 @@ bus->alloc_failed = 1; } } +#endif /*------------------------------------------------------------------------* * usb2_bus_mem_alloc_all - factored out code @@ -542,9 +539,10 @@ TAILQ_INIT(&bus->intr_q.head); +#if USB_HAVE_BUSDMA usb2_dma_tag_setup(bus->dma_parent_tag, bus->dma_tags, - dmat, &bus->bus_mtx, NULL, NULL, 32, USB_BUS_DMA_TAG_MAX); - + dmat, &bus->bus_mtx, NULL, 32, USB_BUS_DMA_TAG_MAX); +#endif if ((bus->devices_max > USB_MAX_DEVICES) || (bus->devices_max < USB_MIN_DEVICES) || (bus->devices == NULL)) { @@ -552,9 +550,11 @@ "initialised properly!\n"); bus->alloc_failed = 1; /* failure */ } +#if USB_HAVE_BUSDMA if (cb) { cb(bus, &usb2_bus_mem_alloc_all_cb); } +#endif if (bus->alloc_failed) { usb2_bus_mem_free_all(bus, cb); } @@ -564,12 +564,14 @@ /*------------------------------------------------------------------------* * usb2_bus_mem_free_all_cb *------------------------------------------------------------------------*/ +#if USB_HAVE_BUSDMA static void usb2_bus_mem_free_all_cb(struct usb2_bus *bus, struct usb2_page_cache *pc, struct usb2_page *pg, uint32_t size, uint32_t align) { usb2_pc_free_mem(pc); } +#endif /*------------------------------------------------------------------------* * usb2_bus_mem_free_all - factored out code @@ -577,10 +579,12 @@ void usb2_bus_mem_free_all(struct usb2_bus *bus, usb2_bus_mem_cb_t *cb) { +#if USB_HAVE_BUSDMA if (cb) { cb(bus, &usb2_bus_mem_free_all_cb); } usb2_dma_tag_unsetup(bus->dma_parent_tag); +#endif mtx_destroy(&bus->bus_mtx); } ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ USB_P2U(&(((struct uss820dci_softc *)0)->sc_bus)))) #define USS820_DCI_PC2SC(pc) \ - USS820_DCI_BUS2SC((pc)->tag_parent->info->bus) + USS820_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) #if USB_DEBUG static int uss820dcidebug = 0; ==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#2 (text+ko) ==== @@ -42,20 +42,20 @@ #include #include +#if USB_HAVE_BUSDMA static void usb2_dma_tag_create(struct usb2_dma_tag *, uint32_t, uint32_t); static void usb2_dma_tag_destroy(struct usb2_dma_tag *); +#endif -#ifdef __FreeBSD__ +#if USB_HAVE_BUSDMA && defined(__FreeBSD__) static void usb2_dma_lock_cb(void *, bus_dma_lock_op_t); -static int32_t usb2_m_copy_in_cb(void *, void *, uint32_t); static void usb2_pc_alloc_mem_cb(void *, bus_dma_segment_t *, int, int); static void usb2_pc_load_mem_cb(void *, bus_dma_segment_t *, int, int); static void usb2_pc_common_mem_cb(void *, bus_dma_segment_t *, int, int, uint8_t); #endif -#ifdef __NetBSD__ -static int32_t usb2_m_copy_in_cb(void *, caddr_t, uint32_t); +#if USB_HAVE_BUSDMA && defined(__NetBSD__) static void usb2_pc_common_mem_cb(struct usb2_page_cache *, bus_dma_segment_t *, int, int, uint8_t); #endif @@ -72,6 +72,7 @@ { struct usb2_page *page; +#if USB_HAVE_BUSDMA if (pc->page_start) { /* Case 1 - something has been loaded into DMA */ @@ -106,14 +107,16 @@ res->buffer = USB_ADD_BYTES(page->buffer, offset); } - } else { + return; + } +#endif + /* Case 2 - Plain PIO */ - /* Case 2 - Plain PIO */ - - res->buffer = USB_ADD_BYTES(pc->buffer, offset); - res->length = 0 - 1; - res->physaddr = 0; - } + res->buffer = USB_ADD_BYTES(pc->buffer, offset); + res->length = 0 - 1; +#if USB_HAVE_BUSDMA + res->physaddr = 0; +#endif } /*------------------------------------------------------------------------* @@ -147,6 +150,7 @@ * 0: Success * Else: Failure *------------------------------------------------------------------------*/ +#if USB_HAVE_USER_IO int usb2_copy_in_user(struct usb2_page_cache *cache, uint32_t offset, const void *ptr, uint32_t len) @@ -171,10 +175,12 @@ } return (0); /* success */ } +#endif /*------------------------------------------------------------------------* * usb2_m_copy_in - copy a mbuf chain directly into DMA-able memory *------------------------------------------------------------------------*/ +#if USB_HAVE_MBUF struct usb2_m_copy_in_arg { struct usb2_page_cache *cache; uint32_t dst_offset; @@ -203,10 +209,12 @@ error = m_apply(m, src_offset, src_len, &usb2_m_copy_in_cb, &arg); } +#endif /*------------------------------------------------------------------------* * usb2_uiomove - factored out code *------------------------------------------------------------------------*/ +#if USB_HAVE_USER_IO int usb2_uiomove(struct usb2_page_cache *pc, struct uio *uio, uint32_t pc_offset, uint32_t len) @@ -235,6 +243,7 @@ } return (error); } +#endif /*------------------------------------------------------------------------* * usb2_copy_out - copy directly from DMA-able memory @@ -267,6 +276,7 @@ * 0: Success * Else: Failure *------------------------------------------------------------------------*/ +#if USB_HAVE_USER_IO int usb2_copy_out_user(struct usb2_page_cache *cache, uint32_t offset, void *ptr, uint32_t len) @@ -291,6 +301,7 @@ } return (0); /* success */ } +#endif /*------------------------------------------------------------------------* * usb2_bzero - zero DMA-able memory @@ -314,8 +325,7 @@ } } - -#ifdef __FreeBSD__ +#if USB_HAVE_BUSDMA && defined(__FreeBSD__) /*------------------------------------------------------------------------* * usb2_dma_lock_cb - dummy callback @@ -692,7 +702,7 @@ struct usb2_dma_tag *utag; /* get info */ - info = pc->tag_parent->info; + info = USB_DMATAG_TO_XROOT(pc->tag_parent); /* sanity check */ if (info == NULL) { @@ -732,7 +742,7 @@ #endif -#ifdef __NetBSD__ +#if USB_HAVE_BUSDMA && defined(__NetBSD__) /*------------------------------------------------------------------------* * usb2_dma_tag_create - allocate a DMA tag @@ -1063,7 +1073,7 @@ struct usb2_dma_tag *utag; /* get info */ - info = pc->tag_parent->info; + info = USB_DMATAG_TO_XROOT(pc->tag_parent); /* sanity check */ if (info == NULL) { @@ -1107,6 +1117,8 @@ #endif +#if USB_HAVE_BUSDMA + /*------------------------------------------------------------------------* * usb2_dma_tag_find - factored out code *------------------------------------------------------------------------*/ @@ -1149,8 +1161,7 @@ usb2_dma_tag_setup(struct usb2_dma_parent_tag *udpt, struct usb2_dma_tag *udt, bus_dma_tag_t dmat, struct mtx *mtx, usb2_dma_callback_t *func, - struct usb2_xfer_root *info, uint8_t ndmabits, - uint8_t nudt) + uint8_t ndmabits, uint8_t nudt) { bzero(udpt, sizeof(*udpt)); @@ -1168,7 +1179,6 @@ /* store some information */ udpt->mtx = mtx; - udpt->info = info; udpt->func = func; udpt->tag = dmat; udpt->utag_first = udt; @@ -1350,7 +1360,7 @@ { struct usb2_xfer_root *info; - info = udpt->info; + info = USB_DMATAG_TO_XROOT(udpt); mtx_assert(info->xfer_mtx, MA_OWNED); @@ -1424,3 +1434,5 @@ pc++; } } + +#endif ==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#2 (text+ko) ==== @@ -60,8 +60,10 @@ * address of a memory page having size USB_PAGE_SIZE. */ struct usb2_page { +#if USB_HAVE_BUSDMA bus_size_t physaddr; void *buffer; /* non Kernel Virtual Address */ +#endif }; /* @@ -71,7 +73,9 @@ */ struct usb2_page_search { void *buffer; +#if USB_HAVE_BUSDMA bus_size_t physaddr; +#endif uint32_t length; }; @@ -81,62 +85,67 @@ */ struct usb2_page_cache { -#ifdef __FreeBSD__ +#if USB_HAVE_BUSDMA && defined(__FreeBSD__) bus_dma_tag_t tag; bus_dmamap_t map; #endif -#ifdef __NetBSD__ +#if USB_HAVE_BUSDMA && defined(__NetBSD__) bus_dma_tag_t tag; bus_dmamap_t map; bus_dma_segment_t *p_seg; #endif +#if USB_HAVE_BUSDMA struct usb2_page *page_start; +#endif struct usb2_dma_parent_tag *tag_parent; /* always set */ void *buffer; /* virtual buffer pointer */ -#ifdef __NetBSD__ +#if USB_HAVE_BUSDMA && defined(_NetBSD__) int n_seg; #endif +#if USB_HAVE_BUSDMA uint32_t page_offset_buf; uint32_t page_offset_end; uint8_t isread:1; /* set if we are currently reading * from the memory. Else write. */ uint8_t ismultiseg:1; /* set if we can have multiple * segments */ +#endif }; /* * The following structure describes the parent USB DMA tag. */ struct usb2_dma_parent_tag { -#ifdef __FreeBSD__ +#if USB_HAVE_BUSDMA && defined(__FreeBSD__) struct cv cv[1]; /* internal condition variable */ #endif - +#if USB_HAVE_BUSDMA bus_dma_tag_t tag; /* always set */ struct mtx *mtx; /* private mutex, always set */ - struct usb2_xfer_root *info; /* used by the callback function */ usb2_dma_callback_t *func; /* load complete callback function */ struct usb2_dma_tag *utag_first;/* pointer to first USB DMA tag */ - uint8_t dma_error; /* set if DMA load operation failed */ uint8_t dma_bits; /* number of DMA address lines */ uint8_t utag_max; /* number of USB DMA tags */ +#endif }; /* * The following structure describes an USB DMA tag. */ struct usb2_dma_tag { -#ifdef __NetBSD__ +#if USB_HAVE_BUSDMA && defined(__NetBSD__) bus_dma_segment_t *p_seg; #endif +#if USB_HAVE_BUSDMA struct usb2_dma_parent_tag *tag_parent; bus_dma_tag_t tag; uint32_t align; uint32_t size; -#ifdef __NetBSD__ +#endif +#if USB_HAVE_BUSDMA && defined(__NetBSD__) uint32_t n_seg; #endif }; @@ -168,8 +177,7 @@ void *ptr, uint32_t len); void usb2_dma_tag_setup(struct usb2_dma_parent_tag *udpt, struct usb2_dma_tag *udt, bus_dma_tag_t dmat, struct mtx *mtx, - usb2_dma_callback_t *func, struct usb2_xfer_root *info, - uint8_t ndmabits, uint8_t nudt); + usb2_dma_callback_t *func, uint8_t ndmabits, uint8_t nudt); void usb2_dma_tag_unsetup(struct usb2_dma_parent_tag *udpt); void usb2_get_page(struct usb2_page_cache *pc, uint32_t offset, struct usb2_page_search *res); ==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#5 (text+ko) ==== @@ -32,16 +32,84 @@ #ifndef _USB2_CORE_H_ #define _USB2_CORE_H_ +/* Allow defines in "opt_usb.h" to override configuration */ + +#include "opt_usb.h" +#include "opt_bus.h" + /* Default USB configuration */ -#ifndef USB_USE_CONDVAR -#define USB_USE_CONDVAR 0 +/* + * The following macro defines if the code shall use cv_xxx() instead + * of msleep() and wakeup(). + */ +#ifndef USB_HAVE_CONDVAR +#define USB_HAVE_CONDVAR 0 #endif +/* + * The following macro defines if the code shall support + * /dev/usb/x.y.z. + */ #ifndef USB_HAVE_UGEN #define USB_HAVE_UGEN 1 #endif +/* + * The following macro defines if the code shall support any forms of + * ASCII strings. + */ +#ifndef USB_HAVE_STRINGS +#define USB_HAVE_STRINGS 1 +#endif + +/* + * The following macro defines if the code shall support BUS-DMA. + */ +#ifndef USB_HAVE_BUSDMA +#define USB_HAVE_BUSDMA 1 +#endif + +/* + * The following macro defines if the code shall support the Linux + * compatibility layer. + */ +#ifndef USB_HAVE_COMPAT_LINUX +#define USB_HAVE_COMPAT_LINUX 1 +#endif + +/* + * The following macro defines if the code shall support + * userland data transfer via copyin() and copyout() + */ +#ifndef USB_HAVE_USER_IO +#define USB_HAVE_USER_IO 1 +#endif + +/* + * The following macro defines if the code shall support copy in via + * bsd-mbufs to USB. + */ +#ifndef USB_HAVE_MBUF +#define USB_HAVE_MBUF 1 +#endif + +/* + * The following macro defines if the code shall compile a table + * describing USB vendor and product IDs. + */ +#ifndef USB_VERBOSE +#define USB_VERBOSE 1 +#endif + +/* + * The following macro defines if USB debugging support shall be + * compiled for the USB core and all drivers. + */ +#ifndef USB_DEBUG +#define USB_DEBUG 1 +#endif + #ifndef USB_TD_GET_PROC #define USB_TD_GET_PROC(td) (td)->td_proc #endif @@ -76,8 +144,6 @@ #include #include "usb_if.h" -#include "opt_usb.h" -#include "opt_bus.h" #define USB_STACK_VERSION 2000 /* 2.0 */ @@ -95,10 +161,6 @@ #define USB_MAX_IPACKET 8 /* maximum size of the initial USB * data packet */ -#ifndef USB_VERBOSE -#define USB_VERBOSE 1 -#endif - #define USB_HUB_MAX_DEPTH 5 /* USB transfer states */ @@ -226,12 +288,14 @@ uint8_t short_frames_ok:1; /* filtered version */ uint8_t short_xfer_ok:1; /* filtered version */ +#if USB_HAVE_BUSDMA uint8_t bdma_enable:1; /* filtered version (only set if * hardware supports DMA) */ uint8_t bdma_no_post_sync:1; /* set if the USB callback wrapper * should not do the BUS-DMA post sync * operation */ uint8_t bdma_setup:1; /* set if BUS-DMA has been setup */ +#endif uint8_t isochronous_xfr:1; /* set if isochronous transfer */ uint8_t usb2_mode:1; /* shadow copy of "udev->usb2_mode" */ uint8_t curr_dma_set:1; /* used by USB HC/DC driver */ ==== //depot/projects/usb/src/sys/dev/usb/usb_debug.h#2 (text+ko) ==== @@ -35,11 +35,6 @@ /* Declare global USB debug variable. */ extern int usb2_debug; -/* Force debugging until further */ -#ifndef USB_DEBUG -#define USB_DEBUG 1 -#endif - /* Check if USB debugging is enabled. */ #ifdef USB_DEBUG_VAR #if (USB_DEBUG != 0) ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#7 (text+ko) ==== @@ -45,9 +45,11 @@ #include #include #include +#include +#if USB_HAVE_UGEN #include -#include #include +#endif #include @@ -69,7 +71,9 @@ static void usb2_suspend_resume_sub(struct usb2_device *, device_t, uint8_t); static void usb2_clear_stall_proc(struct usb2_proc_msg *_pm); +#if USB_HAVE_STRINGS static void usb2_check_strings(struct usb2_device *); +#endif static usb2_error_t usb2_fill_iface_data(struct usb2_device *, uint8_t, uint8_t); static void usb2_notify_addq(const char *type, struct usb2_device *); @@ -483,11 +487,13 @@ /* mtx_assert() */ +#if USB_HAVE_COMPAT_LINUX /* free Linux compat device, if any */ if (udev->linux_dev) { usb_linux_free_device(udev->linux_dev); udev->linux_dev = NULL; } +#endif /* free all pipes, if any */ usb2_free_pipe_data(udev, 0, 0); @@ -1585,6 +1591,7 @@ /* assume 100mA bus powered for now. Changed when configured. */ udev->power = USB_MIN_POWER; +#if USB_HAVE_STRINGS /* get serial number string */ err = usb2_req_get_string_any (udev, NULL, (char *)scratch_ptr, @@ -1608,6 +1615,7 @@ /* finish up all the strings */ usb2_check_strings(udev); +#endif if (udev->flags.usb2_mode == USB_MODE_HOST) { uint8_t config_index; @@ -2033,6 +2041,7 @@ } } +#if USB_HAVE_STRINGS #if USB_VERBOSE /* * Descriptions of of known vendors and devices ("products"). @@ -2129,6 +2138,7 @@ sizeof(udev->product), "product 0x%04x", product_id); } } +#endif /* * Returns: ==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#7 (text+ko) ==== @@ -28,6 +28,7 @@ #define _USB2_DEVICE_H_ struct usb2_symlink; +struct usb_device; /* linux compat */ #define USB_DEFAULT_XFER_MAX 2 @@ -114,7 +115,9 @@ struct usb2_device *parent_hub; struct usb2_config_descriptor *cdesc; /* full config descr */ struct usb2_hub *hub; /* only if this is a hub */ +#if USB_HAVE_COMPAT_LINUX struct usb_device *linux_dev; +#endif struct usb2_xfer *default_xfer[USB_DEFAULT_XFER_MAX]; struct usb2_temp_data *usb2_template_ptr; struct usb2_pipe *pipe_curr; /* current clear stall pipe */ ==== //depot/projects/usb/src/sys/dev/usb/usb_request.c#2 (text+ko) ==== @@ -265,6 +265,10 @@ if (actlen) { *actlen = 0; } +#if (USB_HAVE_USER_IO == 0) + if (flags & USB_USER_DATA_PTR) + return (USB_ERR_INVAL); +#endif if (udev->flags.usb2_mode == USB_MODE_DEVICE) { DPRINTF("USB device mode\n"); (usb2_temp_get_desc_p) (udev, req, &desc, &temp); @@ -278,13 +282,14 @@ *actlen = length; } if (length > 0) { +#if USB_HAVE_USER_IO if (flags & USB_USER_DATA_PTR) { if (copyout(desc, data, length)) { return (USB_ERR_INVAL); } - } else { + } else +#endif bcopy(desc, data, length); - } } return (0); /* success */ } @@ -340,6 +345,7 @@ if (temp > 0) { if (!(req->bmRequestType & UT_READ)) { +#if USB_HAVE_USER_IO if (flags & USB_USER_DATA_PTR) { USB_XFER_UNLOCK(xfer); err = usb2_copy_in_user(xfer->frbuffers + 1, @@ -349,9 +355,10 @@ err = USB_ERR_INVAL; break; } - } else { - usb2_copy_in(xfer->frbuffers + 1, 0, data, temp); - } + } else +#endif + usb2_copy_in(xfer->frbuffers + 1, + 0, data, temp); } xfer->nframes = 2; } else { @@ -409,6 +416,7 @@ } if (temp > 0) { if (req->bmRequestType & UT_READ) { +#if USB_HAVE_USER_IO if (flags & USB_USER_DATA_PTR) { USB_XFER_UNLOCK(xfer); err = usb2_copy_out_user(xfer->frbuffers + 1, @@ -418,10 +426,10 @@ err = USB_ERR_INVAL; break; } - } else { + } else +#endif usb2_copy_out(xfer->frbuffers + 1, 0, data, temp); - } } } /* ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#129 (text+ko) ==== @@ -192,6 +192,7 @@ * 0: Success * Else: Failure *------------------------------------------------------------------------*/ +#if USB_HAVE_BUSDMA uint8_t usb2_transfer_setup_sub_malloc(struct usb2_setup_params *parm, struct usb2_page_cache **ppc, uint32_t size, uint32_t align, @@ -302,6 +303,7 @@ parm->dma_page_ptr = pg; return (0); } +#endif /*------------------------------------------------------------------------* * usb2_transfer_setup_sub - transfer setup subroutine @@ -644,6 +646,7 @@ if (parm->bufsize_max < parm->bufsize) { parm->bufsize_max = parm->bufsize; } +#if USB_HAVE_BUSDMA if (xfer->flags_int.bdma_enable) { /* * Setup "dma_page_ptr". @@ -671,6 +674,7 @@ parm->dma_page_ptr += (2 * n_frbuffers); parm->dma_page_ptr += (parm->bufsize / USB_PAGE_SIZE); } +#endif if (zmps) { /* correct maximum data length */ xfer->max_data_length = 0; @@ -695,7 +699,7 @@ for (x = 0; x != n_frbuffers; x++) { xfer->frbuffers[x].tag_parent = &xfer->xroot->dma_parent_tag; - +#if USB_HAVE_BUSDMA if (xfer->flags_int.bdma_enable && (parm->bufsize_max > 0)) { @@ -706,6 +710,7 @@ goto done; } } +#endif } } done: @@ -816,28 +821,31 @@ info->memory_base = buf; info->memory_size = parm.size[0]; +#if USB_HAVE_BUSDMA info->dma_page_cache_start = USB_ADD_BYTES(buf, parm.size[4]); info->dma_page_cache_end = USB_ADD_BYTES(buf, parm.size[5]); +#endif info->xfer_page_cache_start = USB_ADD_BYTES(buf, parm.size[5]); info->xfer_page_cache_end = USB_ADD_BYTES(buf, parm.size[2]); usb2_cv_init(&info->cv_drain, "WDRAIN"); info->xfer_mtx = xfer_mtx; - +#if USB_HAVE_BUSDMA usb2_dma_tag_setup(&info->dma_parent_tag, parm.dma_tag_p, udev->bus->dma_parent_tag[0].tag, - xfer_mtx, &usb2_bdma_done_event, info, 32, parm.dma_tag_max); + xfer_mtx, &usb2_bdma_done_event, 32, parm.dma_tag_max); +#endif info->bus = udev->bus; info->udev = udev; TAILQ_INIT(&info->done_q.head); info->done_q.command = &usb2_callback_wrapper; - +#if USB_HAVE_BUSDMA TAILQ_INIT(&info->dma_q.head); info->dma_q.command = &usb2_bdma_work_loop; - +#endif info->done_m[0].hdr.pm_callback = &usb2_callback_proc; info->done_m[0].xroot = info; info->done_m[1].hdr.pm_callback = &usb2_callback_proc; @@ -1085,6 +1093,7 @@ USB_BUS_UNLOCK(info->bus); +#if USB_HAVE_BUSDMA /* free DMA'able memory, if any */ pc = info->dma_page_cache_start; while (pc != info->dma_page_cache_end) { @@ -1101,6 +1110,7 @@ /* free all DMA tags */ usb2_dma_tag_unsetup(&info->dma_parent_tag); +#endif usb2_cv_destroy(&info->cv_drain); @@ -1162,9 +1172,10 @@ usb2_transfer_drain(xfer); +#if USB_HAVE_BUSDMA if (xfer->flags_int.bdma_enable) needs_delay = 1; - +#endif /* * NOTE: default pipe does not have an * interface, even if pipe->iface_index == 0 @@ -1413,9 +1424,10 @@ /* clear "did_close" flag */ xfer->flags_int.did_close = 0; +#if USB_HAVE_BUSDMA /* clear "bdma_setup" flag */ xfer->flags_int.bdma_setup = 0; - +#endif /* by default we cannot cancel any USB transfer immediately */ xfer->flags_int.can_cancel_immed = 0; @@ -1508,11 +1520,13 @@ * Check if BUS-DMA support is enabled and try to load virtual * buffers into DMA, if any: */ +#if USB_HAVE_BUSDMA if (xfer->flags_int.bdma_enable) { /* insert the USB transfer last in the BUS-DMA queue */ usb2_command_wrapper(&xfer->xroot->dma_q, xfer); return; } +#endif /* * Enter the USB transfer into the Host Controller or * Device Controller schedule: @@ -1924,12 +1938,13 @@ } else { /* set transferred state */ xfer->usb2_state = USB_ST_TRANSFERRED; - +#if USB_HAVE_BUSDMA /* sync DMA memory, if any */ if (xfer->flags_int.bdma_enable && (!xfer->flags_int.bdma_no_post_sync)) { usb2_bdma_post_sync(xfer); } +#endif } } @@ -2043,8 +2058,6 @@ void usb2_transfer_done(struct usb2_xfer *xfer, usb2_error_t error) { - struct usb2_xfer_queue *pq; - USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); DPRINTF("err=%s\n", usb2_errstr(error)); @@ -2071,7 +2084,10 @@ */ usb2_transfer_dequeue(xfer); +#if USB_HAVE_BUSDMA if (mtx_owned(xfer->xroot->xfer_mtx)) { + struct usb2_xfer_queue *pq; + /* * If the private USB lock is not locked, then we assume * that the BUS-DMA load stage has been passed: @@ -2083,6 +2099,7 @@ usb2_command_wrapper(pq, NULL); } } +#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 18 20:35:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0329B106567F; Wed, 18 Mar 2009 20:35:51 +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 B1F521065679 for ; Wed, 18 Mar 2009 20:35:50 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F9318FC0A for ; Wed, 18 Mar 2009 20:35:50 +0000 (UTC) (envelope-from lulf@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 n2IKZnTa013201 for ; Wed, 18 Mar 2009 20:35:49 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2IKZmsm013197 for perforce@freebsd.org; Wed, 18 Mar 2009 20:35:48 GMT (envelope-from lulf@FreeBSD.org) Date: Wed, 18 Mar 2009 20:35:48 GMT Message-Id: <200903182035.n2IKZmsm013197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 159402 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, 18 Mar 2009 20:35:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=159402 Change 159402 by lulf@lulf_carrot on 2009/03/18 20:35:04 - Change the set_rate and get_rate interface a bit to operate on the clocks themselves. Implement the set_rate and get_rate for the current clocks, and use this in atmel_mci. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32.c#9 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#5 edit .. //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#2 edit .. //depot/projects/avr32/src/sys/kern/devclk_if.m#4 edit .. //depot/projects/avr32/src/sys/kern/subr_devclk.c#4 edit .. //depot/projects/avr32/src/sys/sys/devclk.h#4 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32.c#9 (text+ko) ==== ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#5 (text+ko) ==== @@ -67,10 +67,18 @@ static void at32_pbb_enable(devclk_t, int); static void at32_pbb_disable(devclk_t, int); +static uint64_t at32_pbb_get_rate(devclk_t, int); +static int at32_pbb_set_rate(devclk_t, int, uint64_t); + static void at32_pll_enable(devclk_t, int); static void at32_pll_disable(devclk_t, int); +static uint64_t at32_pll_get_rate(devclk_t, int); +static int at32_pll_set_rate(devclk_t, int, uint64_t); + static void at32_osc_enable(devclk_t, int); static void at32_osc_disable(devclk_t, int); +static uint64_t at32_osc_get_rate(devclk_t, int); +static int at32_osc_set_rate(devclk_t, int, uint64_t); /* Driver variables and private data */ struct at32_pm_softc { @@ -101,8 +109,8 @@ static kobj_method_t at32_osc_methods[] = { KOBJMETHOD(devclk_enable, at32_osc_enable), KOBJMETHOD(devclk_disable, at32_osc_disable), -/* KOBJMETHOD(devclk_set_rate, at32_osc_set_rate), - KOBJMETHOD(devclk_get_rate, at32_osc_get_rate),*/ + KOBJMETHOD(devclk_set_rate, at32_osc_set_rate), + KOBJMETHOD(devclk_get_rate, at32_osc_get_rate), {0, 0}, }; DEFINE_CLASS(at32_osc, at32_osc_methods, sizeof(struct devclk)); @@ -111,8 +119,8 @@ static kobj_method_t at32_pll_methods[] = { KOBJMETHOD(devclk_enable, at32_pll_enable), KOBJMETHOD(devclk_disable, at32_pll_disable), -/* KOBJMETHOD(devclk_set_rate, at32_pll_set_rate), - KOBJMETHOD(devclk_get_rate, at32_pll_get_rate),*/ + KOBJMETHOD(devclk_set_rate, at32_pll_set_rate), + KOBJMETHOD(devclk_get_rate, at32_pll_get_rate), {0, 0}, }; DEFINE_CLASS(at32_pll, at32_pll_methods, sizeof(struct devclk)); @@ -121,8 +129,8 @@ static kobj_method_t at32_pbb_methods[] = { KOBJMETHOD(devclk_enable, at32_pbb_enable), KOBJMETHOD(devclk_disable, at32_pbb_disable), -/* KOBJMETHOD(devclk_set_rate, at32_pbb_set_rate), - KOBJMETHOD(devclk_get_rate, at32_pbb_get_rate),*/ + KOBJMETHOD(devclk_set_rate, at32_pbb_set_rate), + KOBJMETHOD(devclk_get_rate, at32_pbb_get_rate), {0, 0}, }; DEFINE_CLASS(at32_pbb, at32_pbb_methods, sizeof(struct devclk)); @@ -237,6 +245,21 @@ WR4(AT32_PM_PBBMASK, reg & ~(1 << index)); } +extern uint64_t clock_cpu_frequency; + +static uint64_t +at32_pbb_get_rate(devclk_t clk, int index) +{ + /* XXX: Temporary. */ + return (clock_cpu_frequency); +} + +static int +at32_pbb_set_rate(devclk_t clk, int index, uint64_t rate) +{ + return (0); +} + static void at32_osc_enable(devclk_t clk, int index) { @@ -265,6 +288,35 @@ } } +static uint64_t +at32_osc_get_rate(devclk_t clk, int index) +{ + /* In this case, index means which oscilliator. */ + switch (index) { + case 0: /* OSC0 */ + break; + case 1: /* OSC1 */ + break; + case 2: /* OSC32 */ + break; + } +} + +static int +at32_osc_set_rate(devclk_t clk, int index, uint64_t rate) +{ + /* In this case, index means which oscilliator. */ + switch (index) { + case 0: /* OSC0 */ + break; + case 1: /* OSC1 */ + break; + case 2: /* OSC32 */ + break; + } + return (0); +} + static void at32_pll_enable(devclk_t clk, int index) { @@ -288,3 +340,27 @@ break; } } + +static uint64_t +at32_pll_get_rate(devclk_t clk, int index) +{ + switch (index) { + case 0: /* PLL0 */ + break; + case 1: /* PLL1 */ + break; + } + return (0); +} + +static int +at32_pll_set_rate(devclk_t clk, int index, uint64_t rate) +{ + switch (index) { + case 0: /* PLL0 */ + break; + case 1: /* PLL1 */ + break; + } + return (0); +} ==== //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -65,7 +66,7 @@ #define BBSZ 512 /* XXX: Temporary. */ -extern uint64_t clock_cpu_frequency; +static uint64_t mci_clockfreq; struct atmel_mci_softc { void *intrhand; /* Interrupt handle */ @@ -200,8 +201,9 @@ atmel_MCI_LOCK_DESTROY(sc); goto out; } + mci_clockfreq = devclk_get_rate(dev); sc->host.f_min = 375000; //XXX - sc->host.f_max = clock_cpu_frequency / 2; /* Typically 65 MHz (XXX: too much?) */ + sc->host.f_max = mci_clockfreq / 2; /* Typically 65 MHz (XXX: too much?) */ sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340; if (sc->wire4) sc->host.caps = MMC_CAP_4_BIT_DATA; @@ -230,6 +232,9 @@ struct atmel_mci_softc *sc; int rid; + /* Enable device clock before writing. */ + devclk_enable(dev); + sc = device_get_softc(dev); rid = 0; sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, @@ -265,6 +270,9 @@ bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res), sc->irq_res); sc->irq_res = 0; + + /* Turn off device clock. */ + devclk_disable(dev); return; } @@ -292,10 +300,10 @@ clkdiv = 0; } else { WR4(sc, MCI_CR, MCI_CR_MCIEN); - if ((clock_cpu_frequency % (ios->clock * 2)) == 0) - clkdiv = ((clock_cpu_frequency / ios->clock) / 2) - 1; + if ((mci_clockfreq % (ios->clock * 2)) == 0) + clkdiv = ((mci_clockfreq / ios->clock) / 2) - 1; else - clkdiv = (clock_cpu_frequency / ios->clock) / 2; + clkdiv = (mci_clockfreq / ios->clock) / 2; } if (ios->bus_width == bus_width_4) WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) | MCI_SDCR_SDCBUS); @@ -339,10 +347,10 @@ if (!data) { // The no data case is fairly simple atmel_mci_pdc_disable(sc); -// printf("CMDR %x ARGR %x\n", cmdr, cmd->arg); + printf("CMDR %x ARGR %x\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); WR4(sc, MCI_CMDR, cmdr); - WR4(sc, MCI_IER, MCI_SR_ERROR | MCI_SR_CMDRDY); + WR4(sc, MCI_IER, 0xffffffff); //MCI_SR_ERROR | MCI_SR_CMDRDY); return; } if (data->flags & MMC_DATA_READ) ==== //depot/projects/avr32/src/sys/kern/devclk_if.m#4 (text+ko) ==== @@ -32,14 +32,14 @@ # Get device clock rate METHOD uint64_t get_rate { - device_t _dev; - device_t _child; + devclk_t _clk; + int _index; }; # Set device clock rate METHOD int set_rate { - device_t _dev; - device_t _child; + devclk_t _clk; + int _index; uint64_t _rate; }; ==== //depot/projects/avr32/src/sys/kern/subr_devclk.c#4 (text+ko) ==== @@ -65,24 +65,36 @@ uint64_t devclk_get_rate(device_t dev) { -#if 0 - device_t parent = device_get_parent(dev); - if (parent) { - return (DEVCLK_GET_RATE(parent, dev)); + struct devclk_map *map; + devclk_t clk; + /* XXX: We need to think of the mapping here. */ + STAILQ_FOREACH(map, &devclk_maps, link) { + if (map->dev != dev) + continue; + clk = devclk_find_clock(map->clk_name); + if (clk == NULL) + continue; + return (DEVCLK_GET_RATE(clk, map->clk_index)); } -#endif - return (0); + return (EINVAL); } int devclk_set_rate(device_t dev, uint64_t rate) { -#if 0 - device_t parent = device_get_parent(dev); - if (parent) { - return (DEVCLK_SET_RATE(parent, dev, rate)); + struct devclk_map *map; + devclk_t clk; + /* XXX: We need to think of the mapping here. */ + STAILQ_FOREACH(map, &devclk_maps, link) { + if (map->dev != dev) + continue; + clk = devclk_find_clock(map->clk_name); + if (clk == NULL) + continue; + /* XXX: Enable parent too ? */ + DEVCLK_SET_RATE(clk, map->clk_index, rate); + return (0); } -#endif return (EINVAL); } ==== //depot/projects/avr32/src/sys/sys/devclk.h#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Mar 19 07:58:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 864291065675; Thu, 19 Mar 2009 07:58:28 +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 444BD1065673 for ; Thu, 19 Mar 2009 07:58:28 +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 32A4C8FC2F for ; Thu, 19 Mar 2009 07:58:28 +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 n2J7wSr7010479 for ; Thu, 19 Mar 2009 07:58:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2J7wShI010477 for perforce@freebsd.org; Thu, 19 Mar 2009 07:58:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Mar 2009 07:58:28 GMT Message-Id: <200903190758.n2J7wShI010477@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 159423 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: Thu, 19 Mar 2009 07:58:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=159423 Change 159423 by hselasky@hselasky_laptop001 on 2009/03/19 07:57:54 USB generic: Return a Zero Length packet on read errors. Reported by: Weongyo Jeong Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#5 (text+ko) ==== @@ -417,6 +417,8 @@ default: /* Error */ if (xfer->error != USB_ERR_CANCELLED) { + /* send a zero length packet to userland */ + usb2_fifo_put_data(f, xfer->frbuffers, 0, 0, 1); f->flag_stall = 1; f->fifo_zlp = 0; usb2_transfer_start(f->xfer[1]); From owner-p4-projects@FreeBSD.ORG Thu Mar 19 08:02:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC7FF1065676; Thu, 19 Mar 2009 08:02:32 +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 82C68106566C for ; Thu, 19 Mar 2009 08:02:32 +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 707CD8FC0A for ; Thu, 19 Mar 2009 08:02:32 +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 n2J82WdA010785 for ; Thu, 19 Mar 2009 08:02:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2J82WQS010783 for perforce@freebsd.org; Thu, 19 Mar 2009 08:02:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Mar 2009 08:02:32 GMT Message-Id: <200903190802.n2J82WQS010783@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 159424 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: Thu, 19 Mar 2009 08:02:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=159424 Change 159424 by hselasky@hselasky_laptop001 on 2009/03/19 08:01:43 Add umass quirk. Reported by: Yoshihiro Ota PR: usb/132799 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#7 (text+ko) ==== @@ -458,6 +458,7 @@ {USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB2IDE, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, FORCE_SHORT_INQUIRY | NO_START_STOP | IGNORE_RESIDUE + | NO_SYNCHRONIZE_CACHE }, {USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB2IDE_2, RID_WILDCARD, UMASS_PROTO_ATAPI | UMASS_PROTO_BBB, From owner-p4-projects@FreeBSD.ORG Thu Mar 19 10:11:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D3D11065678; Thu, 19 Mar 2009 10:11:44 +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 C537E1065677 for ; Thu, 19 Mar 2009 10:11:43 +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 B17BD8FC17 for ; Thu, 19 Mar 2009 10:11:43 +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 n2JABhTT033118 for ; Thu, 19 Mar 2009 10:11:43 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JABhTg033116 for perforce@freebsd.org; Thu, 19 Mar 2009 10:11:43 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Mar 2009 10:11:43 GMT Message-Id: <200903191011.n2JABhTg033116@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 159430 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: Thu, 19 Mar 2009 10:11:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=159430 Change 159430 by hselasky@hselasky_laptop001 on 2009/03/19 10:11:01 USB CORE: usb_core.h + usb_defs.h: - Move tunable defines into "usb_core.h". - Leave hardcoded defines in "usb_defs.h". - Allow overriding all tunable defines. - Add more customisable typedefs. Other files: - Remove dependancy towards "usb_defs.h". - Correct maximum device number. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_debug.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_defs.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_sw_transfer.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#130 edit .. //depot/projects/usb/src/sys/dev/usb/usb_util.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#3 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include #include -#include #define USB_DEBUG_VAR at91dcidebug ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 (text+ko) ==== @@ -28,7 +28,6 @@ #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#7 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include #include -#include #define USB_DEBUG_VAR atmegadci_debug ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#5 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include #include -#include #define USB_DEBUG_VAR ehcidebug @@ -3168,7 +3167,7 @@ USETW(sc->sc_hub_desc.stat.wStatus, 0); break; case C(UR_SET_ADDRESS, UT_WRITE_DEVICE): - if (value >= USB_MAX_DEVICES) { + if (value >= EHCI_MAX_DEVICES) { std->err = USB_ERR_IOERROR; goto done; } ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#3 (text+ko) ==== @@ -38,7 +38,7 @@ #ifndef _EHCI_H_ #define _EHCI_H_ -#define EHCI_MAX_DEVICES USB_MAX_DEVICES +#define EHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) /* PCI config registers */ #define PCI_CBMEM 0x10 /* configuration base MEM */ ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_bus.h" #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#2 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_bus.h" #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#3 (text+ko) ==== @@ -53,7 +53,6 @@ */ #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#3 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include #include -#include #define USB_DEBUG_VAR musbotgdebug ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#4 (text+ko) ==== @@ -25,7 +25,6 @@ */ #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#2 (text+ko) ==== @@ -38,7 +38,6 @@ #include #include #include -#include #define USB_DEBUG_VAR ohcidebug @@ -2256,7 +2255,7 @@ USETW(sc->sc_hub_desc.stat.wStatus, 0); break; case C(UR_SET_ADDRESS, UT_WRITE_DEVICE): - if (value >= USB_MAX_DEVICES) { + if (value >= OHCI_MAX_DEVICES) { std->err = USB_ERR_IOERROR; goto done; } ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ #ifndef _OHCI_H_ #define _OHCI_H_ -#define OHCI_MAX_DEVICES USB_MAX_DEVICES +#define OHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) /* PCI config registers */ #define PCI_CBMEM 0x10 /* configuration base memory */ ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#2 (text+ko) ==== @@ -26,7 +26,6 @@ __FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_atmelarm.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $"); #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#3 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#2 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include #include -#include #define USB_DEBUG_VAR uhcidebug @@ -2626,7 +2625,7 @@ USETW(sc->sc_hub_desc.stat.wStatus, 0); break; case C(UR_SET_ADDRESS, UT_WRITE_DEVICE): - if (value >= USB_MAX_DEVICES) { + if (value >= UHCI_MAX_DEVICES) { std->err = USB_ERR_IOERROR; goto done; } ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ #ifndef _UHCI_H_ #define _UHCI_H_ -#define UHCI_MAX_DEVICES USB_MAX_DEVICES +#define UHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) /* PCI config registers */ #define PCI_USBREV 0x60 /* USB protocol revision */ ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#3 (text+ko) ==== @@ -49,7 +49,6 @@ */ #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#5 (text+ko) ==== @@ -25,7 +25,6 @@ */ #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#3 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include #include -#include #define USB_DEBUG_VAR uss820dcidebug ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 (text+ko) ==== @@ -28,7 +28,6 @@ */ #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#4 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include -#include #define USB_DEBUG_VAR cdce_debug ==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#5 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #define USB_DEBUG_VAR u3g_debug ==== //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#4 (text+ko) ==== @@ -80,7 +80,6 @@ #include #include #include -#include #define USB_DEBUG_VAR ubser_debug ==== //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#3 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include #include -#include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb/src/sys/dev/usb/serial/umct.c#3 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include #include -#include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#6 (text+ko) ==== @@ -86,7 +86,6 @@ #include #include #include -#include #define USB_DEBUG_VAR umodem_debug ==== //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include #include -#include #define USB_DEBUG_VAR ustorage_fs_debug ==== //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#2 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#3 (text+ko) ==== @@ -27,7 +27,6 @@ #include #include #include -#include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#30 (text+ko) ==== @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#6 (text+ko) ==== @@ -32,6 +32,8 @@ #ifndef _USB2_CORE_H_ #define _USB2_CORE_H_ +#define USB_STACK_VERSION 2000 /* 2.0 */ + /* Allow defines in "opt_usb.h" to override configuration */ #include "opt_usb.h" @@ -140,28 +142,53 @@ #include #include -#include +#include #include #include "usb_if.h" -#define USB_STACK_VERSION 2000 /* 2.0 */ - +#ifndef USB_HOST_ALIGN #define USB_HOST_ALIGN 8 /* bytes, must be power of two */ +#endif -#define USB_ISOC_TIME_MAX 128 /* ms */ +#ifndef USB_FS_ISOC_UFRAME_MAX #define USB_FS_ISOC_UFRAME_MAX 4 /* exclusive unit */ +#endif #if (USB_FS_ISOC_UFRAME_MAX > 6) #error "USB_FS_ISOC_UFRAME_MAX cannot be set higher than 6" #endif +#ifndef USB_BUS_MAX +#define USB_BUS_MAX 256 /* units */ +#endif + +#ifndef USB_MAX_DEVICES +#define USB_MAX_DEVICES 128 /* units */ +#endif + +#if (USB_MAX_DEVICES < USB_MIN_DEVICES) +#error "Minimum number of devices is greater than maximum number of devices." +#endif + +#ifndef USB_IFACE_MAX +#define USB_IFACE_MAX 32 /* units */ +#endif + +#ifndef USB_FIFO_MAX +#define USB_FIFO_MAX 128 /* units */ +#endif + +#if (USB_FIFO_MAX & 1) +#error "Number of FIFOs must be odd." +#endif + #define USB_MAX_FS_ISOC_FRAMES_PER_XFER (120) /* units */ #define USB_MAX_HS_ISOC_FRAMES_PER_XFER (8*120) /* units */ -#define USB_MAX_IPACKET 8 /* maximum size of the initial USB - * data packet */ -#define USB_HUB_MAX_DEPTH 5 +#ifndef USB_HUB_MAX_DEPTH +#define USB_HUB_MAX_DEPTH 5 +#endif /* USB transfer states */ @@ -219,9 +246,39 @@ /* typedefs */ -typedef uint8_t usb2_error_t; +typedef void (usb2_callback_t)(struct usb2_xfer *); + +#ifndef USB_HAVE_USB_ERROR_T +typedef uint8_t usb2_error_t; /* see "USB_ERR_XXX" */ +#endif + +#ifndef USB_HAVE_TIMEOUT_T +typedef uint32_t usb2_timeout_t; /* milliseconds */ +#endif + +#ifndef USB_HAVE_LENGTH_T +typedef uint32_t usb2_length_t; /* bytes */ +#endif + +#ifndef USB_HAVE_FRAMES_T +typedef uint32_t usb2_frames_t; /* units */ +#endif + +#ifndef USB_HAVE_INTERVAL_T +typedef uint32_t usb2_interval_t; /* milliseconds */ +#endif + +#ifndef USB_HAVE_SIZE_T +typedef uint32_t usb2_size_t; /* bytes */ +#endif + +#ifndef USB_HAVE_REFS_T +typedef uint32_t usb2_refs_t; /* units */ +#endif -typedef void (usb2_callback_t)(struct usb2_xfer *); +#ifndef USB_HAVE_TICKS_T +typedef uint32_t usb2_ticks_t; /* system defined */ +#endif /* structures */ ==== //depot/projects/usb/src/sys/dev/usb/usb_debug.c#2 (text+ko) ==== @@ -25,7 +25,6 @@ */ #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_defs.h#2 (text+ko) ==== @@ -27,22 +27,16 @@ #ifndef _USB2_DEFS_H_ #define _USB2_DEFS_H_ -/* Definition of some USB constants */ +/* Definition of some hardcoded USB constants. */ + +#define USB_MAX_IPACKET 8 /* initial USB packet size */ -#define USB_BUS_MAX 256 /* units */ -#define USB_DEV_MAX 128 /* units */ -#define USB_IFACE_MAX 32 /* units */ #define USB_EP_MAX (2*16) /* hardcoded */ -#define USB_FIFO_MAX (4 * USB_EP_MAX) #define USB_ROOT_HUB_ADDR 1 /* index */ #define USB_MIN_DEVICES 2 /* unused + root HUB */ -#define USB_MAX_DEVICES USB_DEV_MAX /* including virtual root HUB and - * address zero */ -#define USB_MAX_ENDPOINTS USB_EP_MAX /* 2 directions on 16 endpoints */ - #define USB_UNCONFIG_INDEX 0xFF /* internal use only */ #define USB_IFACE_INDEX_ANY 0xFF /* internal use only */ @@ -57,20 +51,10 @@ #define USB_FS_BYTES_PER_HS_UFRAME 188 /* bytes */ #define USB_HS_MICRO_FRAMES_MAX 8 /* units */ +#define USB_ISOC_TIME_MAX 128 /* ms */ + /* sanity checks */ -#if (USB_FIFO_MAX < USB_EP_MAX) -#error "There cannot be less FIFOs than USB endpoints." -#endif -#if (USB_FIFO_MAX & 1) -#error "Number of FIFOs must be odd." -#endif -#if (USB_EP_MAX < (2*16)) -#error "Number of hardware USB endpoints cannot be less than 32." -#endif -#if (USB_MAX_DEVICES < USB_MIN_DEVICES) -#error "Minimum number of devices is greater than maximum number of devices." -#endif #if (USB_ROOT_HUB_ADDR >= USB_MIN_DEVICES) #error "The root hub address must be less than USB_MIN_DEVICES." #endif ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#11 (text+ko) ==== @@ -29,7 +29,6 @@ #include #include -#include #include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#8 (text+ko) ==== @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#2 (text+ko) ==== @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#6 (text+ko) ==== @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#2 (text+ko) ==== @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#26 (text+ko) ==== @@ -43,7 +43,6 @@ #include #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#5 (text+ko) ==== @@ -30,7 +30,6 @@ * USB spec: http://www.usb.org/developers/docs/usbspec.zip */ -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.h#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#2 (text+ko) ==== @@ -32,7 +32,6 @@ * mass storage quirks for not supported SCSI commands! */ -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_request.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_sw_transfer.c#2 (text+ko) ==== @@ -27,7 +27,6 @@ #include #include #include -#include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#130 (text+ko) ==== @@ -27,7 +27,6 @@ #include #include #include -#include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb/src/sys/dev/usb/usb_util.c#3 (text+ko) ==== @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Thu Mar 19 10:27:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9DAE1065673; Thu, 19 Mar 2009 10:26:59 +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 5B90B1065688 for ; Thu, 19 Mar 2009 10:26:59 +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 48CE98FC13 for ; Thu, 19 Mar 2009 10:26:59 +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 n2JAQxkW034250 for ; Thu, 19 Mar 2009 10:26:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JAQxUr034248 for perforce@freebsd.org; Thu, 19 Mar 2009 10:26:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Mar 2009 10:26:59 GMT Message-Id: <200903191026.n2JAQxUr034248@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 159431 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: Thu, 19 Mar 2009 10:27:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=159431 Change 159431 by hselasky@hselasky_laptop001 on 2009/03/19 10:26:36 USB core + USB controller: - Remove a redundant zero subtraction. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#4 (text+ko) ==== @@ -66,7 +66,7 @@ #define AT9100_DCI_BUS2SC(bus) \ ((struct at91dci_softc *)(((uint8_t *)(bus)) - \ - USB_P2U(&(((struct at91dci_softc *)0)->sc_bus)))) + ((uint8_t *)&(((struct at91dci_softc *)0)->sc_bus)))) #define AT9100_DCI_PC2SC(pc) \ AT9100_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#8 (text+ko) ==== @@ -59,7 +59,7 @@ #define ATMEGA_BUS2SC(bus) \ ((struct atmegadci_softc *)(((uint8_t *)(bus)) - \ - USB_P2U(&(((struct atmegadci_softc *)0)->sc_bus)))) + ((uint8_t *)&(((struct atmegadci_softc *)0)->sc_bus)))) #define ATMEGA_PC2SC(pc) \ ATMEGA_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#6 (text+ko) ==== @@ -66,8 +66,9 @@ #include #include -#define EHCI_BUS2SC(bus) ((ehci_softc_t *)(((uint8_t *)(bus)) - \ - USB_P2U(&(((ehci_softc_t *)0)->sc_bus)))) +#define EHCI_BUS2SC(bus) \ + ((ehci_softc_t *)(((uint8_t *)(bus)) - \ + ((uint8_t *)&(((ehci_softc_t *)0)->sc_bus)))) #if USB_DEBUG static int ehcidebug = 0; ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#3 (text+ko) ==== @@ -55,8 +55,9 @@ #include #include -#define OHCI_BUS2SC(bus) ((ohci_softc_t *)(((uint8_t *)(bus)) - \ - USB_P2U(&(((ohci_softc_t *)0)->sc_bus)))) +#define OHCI_BUS2SC(bus) \ + ((ohci_softc_t *)(((uint8_t *)(bus)) - \ + ((uint8_t *)&(((ohci_softc_t *)0)->sc_bus)))) #if USB_DEBUG static int ohcidebug = 0; ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#3 (text+ko) ==== @@ -59,8 +59,9 @@ #include #define alt_next next -#define UHCI_BUS2SC(bus) ((uhci_softc_t *)(((uint8_t *)(bus)) - \ - USB_P2U(&(((uhci_softc_t *)0)->sc_bus)))) +#define UHCI_BUS2SC(bus) \ + ((uhci_softc_t *)(((uint8_t *)(bus)) - \ + ((uint8_t *)&(((uhci_softc_t *)0)->sc_bus)))) #if USB_DEBUG static int uhcidebug = 0; ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#4 (text+ko) ==== @@ -55,7 +55,7 @@ #define USS820_DCI_BUS2SC(bus) \ ((struct uss820dci_softc *)(((uint8_t *)(bus)) - \ - USB_P2U(&(((struct uss820dci_softc *)0)->sc_bus)))) + ((uint8_t *)&(((struct uss820dci_softc *)0)->sc_bus)))) #define USS820_DCI_PC2SC(pc) \ USS820_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#3 (text+ko) ==== @@ -39,8 +39,7 @@ #define USB_DMATAG_TO_XROOT(dpt) \ ((struct usb2_xfer_root *)( \ ((uint8_t *)(dpt)) - \ - ((uint8_t *)&((struct usb2_xfer_root *)0)->dma_parent_tag) + \ - ((uint8_t *)0))) + ((uint8_t *)&((struct usb2_xfer_root *)0)->dma_parent_tag))) /* * The following structure is used to keep information about memory From owner-p4-projects@FreeBSD.ORG Thu Mar 19 12:57:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CA801065673; Thu, 19 Mar 2009 12:57:35 +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 AFED1106566B for ; Thu, 19 Mar 2009 12:57:34 +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 9BD6F8FC16 for ; Thu, 19 Mar 2009 12:57:34 +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 n2JCvYEF058710 for ; Thu, 19 Mar 2009 12:57:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JCvY0L058708 for perforce@freebsd.org; Thu, 19 Mar 2009 12:57:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Mar 2009 12:57:34 GMT Message-Id: <200903191257.n2JCvY0L058708@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 159437 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: Thu, 19 Mar 2009 12:57:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=159437 Change 159437 by hselasky@hselasky_laptop001 on 2009/03/19 12:56:39 USB CORE: - start using the new USB typedefs in the USB core Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#11 edit .. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#8 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#8 edit .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#15 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_lookup.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_lookup.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_process.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_process.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_request.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_sw_transfer.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#131 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#7 (text+ko) ==== @@ -1730,7 +1730,7 @@ xfer->address, UE_GET_ADDR(xfer->endpoint), xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); - temp.average = xfer->max_usb2_frame_size; + temp.average = xfer->max_hc_frame_size; temp.max_frame_size = xfer->max_frame_size; temp.sc = EHCI_BUS2SC(xfer->xroot->bus); @@ -3564,7 +3564,7 @@ nqh = 1; nqtd = ((2 * xfer->nframes) + 1 /* STATUS */ - + (xfer->max_data_length / xfer->max_usb2_frame_size)); + + (xfer->max_data_length / xfer->max_hc_frame_size)); } else if (parm->methods == &ehci_device_bulk_methods) { @@ -3577,7 +3577,7 @@ nqh = 1; nqtd = ((2 * xfer->nframes) - + (xfer->max_data_length / xfer->max_usb2_frame_size)); + + (xfer->max_data_length / xfer->max_hc_frame_size)); } else if (parm->methods == &ehci_device_intr_methods) { @@ -3599,7 +3599,7 @@ nqh = 1; nqtd = ((2 * xfer->nframes) - + (xfer->max_data_length / xfer->max_usb2_frame_size)); + + (xfer->max_data_length / xfer->max_hc_frame_size)); } else if (parm->methods == &ehci_device_isoc_fs_methods) { ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#4 (text+ko) ==== @@ -1411,7 +1411,7 @@ xfer->address, UE_GET_ADDR(xfer->endpoint), xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); - temp.average = xfer->max_usb2_frame_size; + temp.average = xfer->max_hc_frame_size; temp.max_frame_size = xfer->max_frame_size; /* toggle the DMA set we are using */ @@ -2529,7 +2529,7 @@ nitd = 0; ntd = ((2 * xfer->nframes) + 1 /* STATUS */ - + (xfer->max_data_length / xfer->max_usb2_frame_size)); + + (xfer->max_data_length / xfer->max_hc_frame_size)); nqh = 1; } else if (parm->methods == &ohci_device_bulk_methods) { @@ -2539,7 +2539,7 @@ nitd = 0; ntd = ((2 * xfer->nframes) - + (xfer->max_data_length / xfer->max_usb2_frame_size)); + + (xfer->max_data_length / xfer->max_hc_frame_size)); nqh = 1; } else if (parm->methods == &ohci_device_intr_methods) { @@ -2549,7 +2549,7 @@ nitd = 0; ntd = ((2 * xfer->nframes) - + (xfer->max_data_length / xfer->max_usb2_frame_size)); + + (xfer->max_data_length / xfer->max_hc_frame_size)); nqh = 1; } else if (parm->methods == &ohci_device_isoc_methods) { ==== //depot/projects/usb/src/sys/dev/usb/usb_bus.h#3 (text+ko) ==== @@ -81,9 +81,9 @@ struct usb2_bus_methods *methods; /* filled by HC driver */ struct usb2_device **devices; - uint32_t hw_power_state; /* see USB_HW_POWER_XXX */ - uint32_t uframe_usage[USB_HS_MICRO_FRAMES_MAX]; - uint32_t transfer_count[4]; + usb2_power_mask_t hw_power_state; /* see USB_HW_POWER_XXX */ + usb2_size_t uframe_usage[USB_HS_MICRO_FRAMES_MAX]; + uint16_t isoc_time_last; /* in milliseconds */ uint8_t alloc_failed; /* Set if memory allocation failed. */ ==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #include #if USB_HAVE_BUSDMA -static void usb2_dma_tag_create(struct usb2_dma_tag *, uint32_t, uint32_t); +static void usb2_dma_tag_create(struct usb2_dma_tag *, usb2_size_t, usb2_size_t); static void usb2_dma_tag_destroy(struct usb2_dma_tag *); #endif @@ -66,7 +66,7 @@ * been properly initialized ! *------------------------------------------------------------------------*/ void -usb2_get_page(struct usb2_page_cache *pc, uint32_t offset, +usb2_get_page(struct usb2_page_cache *pc, usb2_frlength_t offset, struct usb2_page_search *res) { struct usb2_page *page; @@ -122,8 +122,8 @@ * usb2_copy_in - copy directly to DMA-able memory *------------------------------------------------------------------------*/ void -usb2_copy_in(struct usb2_page_cache *cache, uint32_t offset, - const void *ptr, uint32_t len) +usb2_copy_in(struct usb2_page_cache *cache, usb2_frlength_t offset, + const void *ptr, usb2_frlength_t len) { struct usb2_page_search buf_res; @@ -151,8 +151,8 @@ *------------------------------------------------------------------------*/ #if USB_HAVE_USER_IO int -usb2_copy_in_user(struct usb2_page_cache *cache, uint32_t offset, - const void *ptr, uint32_t len) +usb2_copy_in_user(struct usb2_page_cache *cache, usb2_frlength_t offset, + const void *ptr, usb2_frlength_t len) { struct usb2_page_search buf_res; int error; @@ -182,10 +182,10 @@ #if USB_HAVE_MBUF struct usb2_m_copy_in_arg { struct usb2_page_cache *cache; - uint32_t dst_offset; + usb2_frlength_t dst_offset; }; -static int32_t +static int #ifdef __FreeBSD__ usb2_m_copy_in_cb(void *arg, void *src, uint32_t count) #else @@ -200,11 +200,11 @@ } void -usb2_m_copy_in(struct usb2_page_cache *cache, uint32_t dst_offset, - struct mbuf *m, uint32_t src_offset, uint32_t src_len) +usb2_m_copy_in(struct usb2_page_cache *cache, usb2_frlength_t dst_offset, + struct mbuf *m, usb2_size_t src_offset, usb2_frlength_t src_len) { struct usb2_m_copy_in_arg arg = {cache, dst_offset}; - register int error; + int error; error = m_apply(m, src_offset, src_len, &usb2_m_copy_in_cb, &arg); } @@ -216,7 +216,7 @@ #if USB_HAVE_USER_IO int usb2_uiomove(struct usb2_page_cache *pc, struct uio *uio, - uint32_t pc_offset, uint32_t len) + usb2_frlength_t pc_offset, usb2_frlength_t len) { struct usb2_page_search res; int error = 0; @@ -248,8 +248,8 @@ * usb2_copy_out - copy directly from DMA-able memory *------------------------------------------------------------------------*/ void -usb2_copy_out(struct usb2_page_cache *cache, uint32_t offset, - void *ptr, uint32_t len) +usb2_copy_out(struct usb2_page_cache *cache, usb2_frlength_t offset, + void *ptr, usb2_frlength_t len) { struct usb2_page_search res; @@ -277,8 +277,8 @@ *------------------------------------------------------------------------*/ #if USB_HAVE_USER_IO int -usb2_copy_out_user(struct usb2_page_cache *cache, uint32_t offset, - void *ptr, uint32_t len) +usb2_copy_out_user(struct usb2_page_cache *cache, usb2_frlength_t offset, + void *ptr, usb2_frlength_t len) { struct usb2_page_search res; int error; @@ -306,7 +306,8 @@ * usb2_bzero - zero DMA-able memory *------------------------------------------------------------------------*/ void -usb2_bzero(struct usb2_page_cache *cache, uint32_t offset, uint32_t len) +usb2_bzero(struct usb2_page_cache *cache, usb2_frlength_t offset, + usb2_frlength_t len) { struct usb2_page_search res; @@ -343,7 +344,7 @@ *------------------------------------------------------------------------*/ static void usb2_dma_tag_create(struct usb2_dma_tag *udt, - uint32_t size, uint32_t align) + usb2_size_t size, usb2_size_t align) { bus_dma_tag_t tag; @@ -408,7 +409,7 @@ struct usb2_dma_parent_tag *uptag; struct usb2_page_cache *pc; struct usb2_page *pg; - uint32_t rem; + usb2_size_t rem; uint8_t owned; pc = arg; @@ -471,7 +472,7 @@ *------------------------------------------------------------------------*/ uint8_t usb2_pc_alloc_mem(struct usb2_page_cache *pc, struct usb2_page *pg, - uint32_t size, uint32_t align) + usb2_size_t size, usb2_size_t align) { struct usb2_dma_parent_tag *uptag; struct usb2_dma_tag *utag; @@ -594,7 +595,7 @@ * Else: Error *------------------------------------------------------------------------*/ uint8_t -usb2_pc_load_mem(struct usb2_page_cache *pc, uint32_t size, uint8_t sync) +usb2_pc_load_mem(struct usb2_page_cache *pc, usb2_size_t size, uint8_t sync) { /* setup page cache */ pc->page_offset_buf = 0; @@ -695,7 +696,7 @@ * Else: Failure *------------------------------------------------------------------------*/ uint8_t -usb2_pc_dmamap_create(struct usb2_page_cache *pc, uint32_t size) +usb2_pc_dmamap_create(struct usb2_page_cache *pc, usb2_size_t size) { struct usb2_xfer_root *info; struct usb2_dma_tag *utag; @@ -751,9 +752,9 @@ *------------------------------------------------------------------------*/ static void usb2_dma_tag_create(struct usb2_dma_tag *udt, - uint32_t size, uint32_t align) + usb2_size_t size, usb2_size_t align) { - uint32_t nseg; + usb2_size_t nseg; if (align == 1) { nseg = (2 + (size / USB_PAGE_SIZE)); @@ -789,7 +790,7 @@ { struct usb2_dma_parent_tag *uptag; struct usb2_page *pg; - uint32_t rem; + usb2_size_t rem; uint8_t ext_seg; /* extend last segment */ uptag = pc->tag_parent; @@ -855,7 +856,7 @@ *------------------------------------------------------------------------*/ uint8_t usb2_pc_alloc_mem(struct usb2_page_cache *pc, struct usb2_page *pg, - uint32_t size, uint32_t align) + usb2_size_t size, usb2_size_t align) { struct usb2_dma_parent_tag *uptag; struct usb2_dma_tag *utag; @@ -978,7 +979,7 @@ * Else: Error *------------------------------------------------------------------------*/ uint8_t -usb2_pc_load_mem(struct usb2_page_cache *pc, uint32_t size, uint8_t sync) +usb2_pc_load_mem(struct usb2_page_cache *pc, usb2_size_t size, uint8_t sync) { int error; @@ -1028,7 +1029,7 @@ void usb2_pc_cpu_invalidate(struct usb2_page_cache *pc) { - uint32_t len; + usb2_size_t len; len = pc->page_offset_end - pc->page_offset_buf; @@ -1046,7 +1047,7 @@ void usb2_pc_cpu_flush(struct usb2_page_cache *pc) { - uint32_t len; + usb2_size_t len; len = pc->page_offset_end - pc->page_offset_buf; @@ -1066,7 +1067,7 @@ * Else: Failure *------------------------------------------------------------------------*/ uint8_t -usb2_pc_dmamap_create(struct usb2_page_cache *pc, uint32_t size) +usb2_pc_dmamap_create(struct usb2_page_cache *pc, usb2_size_t size) { struct usb2_xfer_root *info; struct usb2_dma_tag *utag; @@ -1123,7 +1124,7 @@ *------------------------------------------------------------------------*/ struct usb2_dma_tag * usb2_dma_tag_find(struct usb2_dma_parent_tag *udpt, - uint32_t size, uint32_t align) + usb2_size_t size, usb2_size_t align) { struct usb2_dma_tag *udt; uint8_t nudt; @@ -1232,7 +1233,7 @@ { struct usb2_xfer_root *info; struct usb2_xfer *xfer; - uint32_t nframes; + usb2_frcount_t nframes; xfer = pq->curr; info = xfer->xroot; @@ -1248,7 +1249,7 @@ } if (!xfer->flags_int.bdma_setup) { struct usb2_page *pg; - uint32_t frlength_0; + usb2_frlength_t frlength_0; uint8_t isread; xfer->flags_int.bdma_setup = 1; @@ -1381,7 +1382,7 @@ usb2_bdma_pre_sync(struct usb2_xfer *xfer) { struct usb2_page_cache *pc; - uint32_t nframes; + usb2_frcount_t nframes; if (xfer->flags_int.isochronous_xfr) { /* only one frame buffer */ @@ -1414,7 +1415,7 @@ usb2_bdma_post_sync(struct usb2_xfer *xfer) { struct usb2_page_cache *pc; - uint32_t nframes; + usb2_frcount_t nframes; if (xfer->flags_int.isochronous_xfr) { /* only one frame buffer */ ==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#3 (text+ko) ==== @@ -76,7 +76,7 @@ #if USB_HAVE_BUSDMA bus_size_t physaddr; #endif - uint32_t length; + usb2_size_t length; }; /* @@ -103,8 +103,8 @@ int n_seg; #endif #if USB_HAVE_BUSDMA - uint32_t page_offset_buf; - uint32_t page_offset_end; + usb2_size_t page_offset_buf; + usb2_size_t page_offset_end; uint8_t isread:1; /* set if we are currently reading * from the memory. Else write. */ uint8_t ismultiseg:1; /* set if we can have multiple @@ -142,47 +142,47 @@ struct usb2_dma_parent_tag *tag_parent; bus_dma_tag_t tag; - uint32_t align; - uint32_t size; + usb2_size_t align; + usb2_size_t size; #endif #if USB_HAVE_BUSDMA && defined(__NetBSD__) - uint32_t n_seg; + usb2_size_t n_seg; #endif }; /* function prototypes */ int usb2_uiomove(struct usb2_page_cache *pc, struct uio *uio, - uint32_t pc_offset, uint32_t len); + usb2_frlength_t pc_offset, usb2_frlength_t len); struct usb2_dma_tag *usb2_dma_tag_find(struct usb2_dma_parent_tag *udpt, - uint32_t size, uint32_t align); + usb2_size_t size, usb2_size_t align); uint8_t usb2_pc_alloc_mem(struct usb2_page_cache *pc, struct usb2_page *pg, - uint32_t size, uint32_t align); -uint8_t usb2_pc_dmamap_create(struct usb2_page_cache *pc, uint32_t size); -uint8_t usb2_pc_load_mem(struct usb2_page_cache *pc, uint32_t size, + usb2_size_t size, usb2_size_t align); +uint8_t usb2_pc_dmamap_create(struct usb2_page_cache *pc, usb2_size_t size); +uint8_t usb2_pc_load_mem(struct usb2_page_cache *pc, usb2_size_t size, uint8_t sync); void usb2_bdma_done_event(struct usb2_dma_parent_tag *udpt); void usb2_bdma_post_sync(struct usb2_xfer *xfer); void usb2_bdma_pre_sync(struct usb2_xfer *xfer); void usb2_bdma_work_loop(struct usb2_xfer_queue *pq); -void usb2_bzero(struct usb2_page_cache *cache, uint32_t offset, - uint32_t len); -void usb2_copy_in(struct usb2_page_cache *cache, uint32_t offset, - const void *ptr, uint32_t len); -int usb2_copy_in_user(struct usb2_page_cache *cache, uint32_t offset, - const void *ptr, uint32_t len); -void usb2_copy_out(struct usb2_page_cache *cache, uint32_t offset, - void *ptr, uint32_t len); -int usb2_copy_out_user(struct usb2_page_cache *cache, uint32_t offset, - void *ptr, uint32_t len); +void usb2_bzero(struct usb2_page_cache *cache, usb2_frlength_t offset, + usb2_frlength_t len); +void usb2_copy_in(struct usb2_page_cache *cache, usb2_frlength_t offset, + const void *ptr, usb2_frlength_t len); +int usb2_copy_in_user(struct usb2_page_cache *cache, usb2_frlength_t offset, + const void *ptr, usb2_frlength_t len); +void usb2_copy_out(struct usb2_page_cache *cache, usb2_frlength_t offset, + void *ptr, usb2_frlength_t len); +int usb2_copy_out_user(struct usb2_page_cache *cache, usb2_frlength_t offset, + void *ptr, usb2_frlength_t len); void usb2_dma_tag_setup(struct usb2_dma_parent_tag *udpt, struct usb2_dma_tag *udt, bus_dma_tag_t dmat, struct mtx *mtx, usb2_dma_callback_t *func, uint8_t ndmabits, uint8_t nudt); void usb2_dma_tag_unsetup(struct usb2_dma_parent_tag *udpt); -void usb2_get_page(struct usb2_page_cache *pc, uint32_t offset, +void usb2_get_page(struct usb2_page_cache *pc, usb2_frlength_t offset, struct usb2_page_search *res); -void usb2_m_copy_in(struct usb2_page_cache *cache, uint32_t dst_offset, - struct mbuf *m, uint32_t src_offset, uint32_t src_len); +void usb2_m_copy_in(struct usb2_page_cache *cache, usb2_frlength_t dst_offset, + struct mbuf *m, usb2_size_t src_offset, usb2_frlength_t src_len); void usb2_pc_cpu_flush(struct usb2_page_cache *pc); void usb2_pc_cpu_invalidate(struct usb2_page_cache *pc); void usb2_pc_dmamap_destroy(struct usb2_page_cache *pc); ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#31 (text+ko) ==== @@ -67,7 +67,7 @@ static usb_complete_t usb_linux_wait_complete; static uint16_t usb_max_isoc_frames(struct usb_device *); -static int usb_start_wait_urb(struct urb *, uint32_t, uint16_t *); +static int usb_start_wait_urb(struct urb *, usb2_timeout_t, uint16_t *); static const struct usb_device_id *usb_linux_lookup_id( const struct usb_device_id *, struct usb2_attach_arg *); static struct usb_driver *usb_linux_get_usb_driver(struct usb_linux_softc *); @@ -564,7 +564,7 @@ * Linux USB transfers. *------------------------------------------------------------------------*/ static int -usb_start_wait_urb(struct urb *urb, uint32_t timeout, uint16_t *p_actlen) +usb_start_wait_urb(struct urb *urb, usb2_timeout_t timeout, uint16_t *p_actlen) { int err; @@ -620,7 +620,7 @@ usb_control_msg(struct usb_device *dev, struct usb_host_endpoint *uhe, uint8_t request, uint8_t requesttype, uint16_t value, uint16_t index, void *data, - uint16_t size, uint32_t timeout) + uint16_t size, usb2_timeout_t timeout) { struct usb2_device_request req; struct urb *urb; @@ -741,7 +741,7 @@ *------------------------------------------------------------------------*/ int usb_setup_endpoint(struct usb_device *dev, - struct usb_host_endpoint *uhe, uint32_t bufsize) + struct usb_host_endpoint *uhe, usb2_size_t bufsize) { struct usb2_config cfg[2]; uint8_t type = uhe->desc.bmAttributes & UE_XFERTYPE; @@ -836,7 +836,7 @@ struct usb_interface *p_ui = NULL; struct usb_host_interface *p_uhi = NULL; struct usb_host_endpoint *p_uhe = NULL; - uint32_t size; + usb2_size_t size; uint16_t niface_total; uint16_t nedesc; uint16_t iface_no_curr; @@ -971,7 +971,7 @@ usb_alloc_urb(uint16_t iso_packets, uint16_t mem_flags) { struct urb *urb; - uint32_t size; + usb2_size_t size; if (iso_packets == 0xFFFF) { /* @@ -1102,7 +1102,7 @@ * usb_buffer_alloc *------------------------------------------------------------------------*/ void * -usb_buffer_alloc(struct usb_device *dev, uint32_t size, uint16_t mem_flags, uint8_t *dma_addr) +usb_buffer_alloc(struct usb_device *dev, usb2_size_t size, uint16_t mem_flags, uint8_t *dma_addr) { return (malloc(size, M_USBDEV, M_WAITOK | M_ZERO)); } @@ -1193,7 +1193,7 @@ * usb_buffer_free *------------------------------------------------------------------------*/ void -usb_buffer_free(struct usb_device *dev, uint32_t size, +usb_buffer_free(struct usb_device *dev, usb2_size_t size, void *addr, uint8_t dma_addr) { free(addr, M_USBDEV); @@ -1326,9 +1326,9 @@ static void usb_linux_isoc_callback(struct usb2_xfer *xfer) { - uint32_t max_frame = xfer->max_frame_size; - uint32_t offset; - uint16_t x; + usb2_frlength_t max_frame = xfer->max_frame_size; + usb2_frlength_t offset; + usb2_frcount_t x; struct urb *urb = xfer->priv_fifo; struct usb_host_endpoint *uhe = xfer->priv_sc; struct usb_iso_packet_descriptor *uipd; @@ -1500,7 +1500,7 @@ struct urb *urb = xfer->priv_fifo; struct usb_host_endpoint *uhe = xfer->priv_sc; uint8_t *ptr; - uint32_t max_bulk = xfer->max_data_length; + usb2_frlength_t max_bulk = xfer->max_data_length; uint8_t data_frame = xfer->flags_int.control_xfr ? 1 : 0; DPRINTF("\n"); ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#11 (text+ko) ==== @@ -321,7 +321,7 @@ uint8_t *extra; /* Extra descriptors */ - uint32_t fbsd_buf_size; + usb2_frlength_t fbsd_buf_size; uint16_t extralen; @@ -406,10 +406,10 @@ void *context; /* (in) context for completion */ usb_complete_t *complete; /* (in) completion routine */ - uint32_t transfer_buffer_length;/* (in) data buffer length */ - uint32_t actual_length; /* (return) actual transfer length */ - uint32_t bsd_length_rem; - uint32_t timeout; /* FreeBSD specific */ + usb2_size_t transfer_buffer_length;/* (in) data buffer length */ + usb2_size_t bsd_length_rem; + usb2_size_t actual_length; /* (return) actual transfer length */ + usb2_timeout_t timeout; /* FreeBSD specific */ uint16_t transfer_flags; /* (in) */ #define URB_SHORT_NOT_OK 0x0001 /* report short transfers like errors */ @@ -420,8 +420,8 @@ #define URB_WAIT_WAKEUP 0x0010 /* custom flags */ #define URB_IS_SLEEPING 0x0020 /* custom flags */ - uint16_t start_frame; /* (modify) start frame (ISO) */ - uint16_t number_of_packets; /* (in) number of ISO packets */ + usb2_frcount_t start_frame; /* (modify) start frame (ISO) */ + usb2_frcount_t number_of_packets; /* (in) number of ISO packets */ uint16_t interval; /* (modify) transfer interval * (INT/ISO) */ uint16_t error_count; /* (return) number of ISO errors */ @@ -441,11 +441,11 @@ int usb_clear_halt(struct usb_device *dev, struct usb_host_endpoint *uhe); int usb_control_msg(struct usb_device *dev, struct usb_host_endpoint *pipe, uint8_t request, uint8_t requesttype, uint16_t value, - uint16_t index, void *data, uint16_t size, uint32_t timeout); + uint16_t index, void *data, uint16_t size, usb2_timeout_t timeout); int usb_set_interface(struct usb_device *dev, uint8_t ifnum, uint8_t alternate); int usb_setup_endpoint(struct usb_device *dev, - struct usb_host_endpoint *uhe, uint32_t bufsize); + struct usb_host_endpoint *uhe, usb2_frlength_t bufsize); struct usb_host_endpoint *usb_find_host_endpoint(struct usb_device *dev, uint8_t type, uint8_t ep); @@ -454,11 +454,11 @@ const struct usb_interface *intf, uint8_t alt_index); struct usb_interface *usb_ifnum_to_if(struct usb_device *dev, uint8_t iface_no); -void *usb_buffer_alloc(struct usb_device *dev, uint32_t size, +void *usb_buffer_alloc(struct usb_device *dev, usb2_size_t size, uint16_t mem_flags, uint8_t *dma_addr); void *usb_get_intfdata(struct usb_interface *intf); -void usb_buffer_free(struct usb_device *dev, uint32_t size, void *addr, uint8_t dma_addr); +void usb_buffer_free(struct usb_device *dev, usb2_size_t size, void *addr, uint8_t dma_addr); void usb_free_urb(struct urb *urb); void usb_init_urb(struct urb *urb); void usb_kill_urb(struct urb *urb); ==== //depot/projects/usb/src/sys/dev/usb/usb_controller.h#2 (text+ko) ==== @@ -45,7 +45,7 @@ /* typedefs */ -typedef void (usb2_bus_mem_sub_cb_t)(struct usb2_bus *bus, struct usb2_page_cache *pc, struct usb2_page *pg, uint32_t size, uint32_t align); +typedef void (usb2_bus_mem_sub_cb_t)(struct usb2_bus *bus, struct usb2_page_cache *pc, struct usb2_page *pg, usb2_size_t size, usb2_size_t align); typedef void (usb2_bus_mem_cb_t)(struct usb2_bus *bus, usb2_bus_mem_sub_cb_t *scb); /* @@ -175,7 +175,7 @@ */ struct usb2_temp_setup { void *buf; - uint32_t size; + usb2_size_t size; uint8_t usb2_speed; uint8_t self_powered; uint8_t bNumEndpoints; ==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#7 (text+ko) ==== @@ -190,6 +190,10 @@ #define USB_HUB_MAX_DEPTH 5 #endif +#ifndef USB_EP0_BUFSIZE +#define USB_EP0_BUFSIZE 1024 /* bytes */ +#endif + /* USB transfer states */ #define USB_ST_SETUP 0 @@ -256,28 +260,24 @@ typedef uint32_t usb2_timeout_t; /* milliseconds */ #endif -#ifndef USB_HAVE_LENGTH_T -typedef uint32_t usb2_length_t; /* bytes */ +#ifndef USB_HAVE_FRLENGTH_T +typedef uint32_t usb2_frlength_t; /* bytes */ #endif -#ifndef USB_HAVE_FRAMES_T -typedef uint32_t usb2_frames_t; /* units */ +#ifndef USB_HAVE_FRCOUNT_T +typedef uint32_t usb2_frcount_t; /* units */ #endif -#ifndef USB_HAVE_INTERVAL_T -typedef uint32_t usb2_interval_t; /* milliseconds */ -#endif - #ifndef USB_HAVE_SIZE_T typedef uint32_t usb2_size_t; /* bytes */ #endif -#ifndef USB_HAVE_REFS_T -typedef uint32_t usb2_refs_t; /* units */ +#ifndef USB_HAVE_TICKS_T +typedef uint32_t usb2_ticks_t; /* system defined */ #endif -#ifndef USB_HAVE_TICKS_T -typedef uint32_t usb2_ticks_t; /* system defined */ +#ifndef USB_HAVE_POWER_MASK_T +typedef uint32_t usb2_power_mask_t; /* see "USB_HW_POWER_XXX" */ #endif /* structures */ @@ -366,11 +366,11 @@ */ struct usb2_config_sub { usb2_callback_t *callback; /* USB transfer callback */ - uint32_t bufsize; /* total pipe buffer size in bytes */ - uint32_t frames; /* maximum number of USB frames */ - uint16_t interval; /* interval in milliseconds */ + usb2_frlength_t bufsize; /* total pipe buffer size in bytes */ + usb2_frcount_t frames; /* maximum number of USB frames */ + usb2_timeout_t interval; /* interval in milliseconds */ #define USB_DEFAULT_INTERVAL 0 - uint16_t timeout; /* transfer timeout in milliseconds */ + usb2_timeout_t timeout; /* transfer timeout in milliseconds */ struct usb2_xfer_flags flags; /* transfer flags */ }; @@ -409,29 +409,29 @@ void *priv_sc; /* device driver data pointer 1 */ void *priv_fifo; /* device driver data pointer 2 */ void *local_buffer; - uint32_t *frlengths; + usb2_frlength_t *frlengths; struct usb2_page_cache *frbuffers; usb2_callback_t *callback; - uint32_t max_usb2_frame_size; - uint32_t max_data_length; - uint32_t sumlen; /* sum of all lengths in bytes */ - uint32_t actlen; /* actual length in bytes */ - uint32_t timeout; /* milliseconds */ + usb2_frlength_t max_hc_frame_size; + usb2_frlength_t max_data_length; + usb2_frlength_t sumlen; /* sum of all lengths in bytes */ + usb2_frlength_t actlen; /* actual length in bytes */ + usb2_timeout_t timeout; /* milliseconds */ #define USB_NO_TIMEOUT 0 #define USB_DEFAULT_TIMEOUT 5000 /* 5000 ms = 5 seconds */ - uint32_t max_frame_count; /* initial value of "nframes" after + usb2_frcount_t max_frame_count; /* initial value of "nframes" after * setup */ - uint32_t nframes; /* number of USB frames to transfer */ - uint32_t aframes; /* actual number of USB frames + usb2_frcount_t nframes; /* number of USB frames to transfer */ + usb2_frcount_t aframes; /* actual number of USB frames * transferred */ uint16_t max_packet_size; uint16_t max_frame_size; uint16_t qh_pos; uint16_t isoc_time_complete; /* in ms */ - uint16_t interval; /* milliseconds */ + usb2_timeout_t interval; /* milliseconds */ uint8_t address; /* physical USB address */ uint8_t endpoint; /* physical USB endpoint */ @@ -516,9 +516,9 @@ const struct usb2_config *setup_start, uint16_t n_setup, void *priv_sc, struct mtx *priv_mtx); void usb2_set_frame_data(struct usb2_xfer *xfer, void *ptr, - uint32_t frindex); -void usb2_set_frame_offset(struct usb2_xfer *xfer, uint32_t offset, - uint32_t frindex); + usb2_frcount_t frindex); +void usb2_set_frame_offset(struct usb2_xfer *xfer, usb2_frlength_t offset, + usb2_frcount_t frindex); void usb2_start_hardware(struct usb2_xfer *xfer); void usb2_transfer_clear_stall(struct usb2_xfer *xfer); void usb2_transfer_drain(struct usb2_xfer *xfer); ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#12 (text+ko) ==== @@ -1688,7 +1688,7 @@ * Else failure *------------------------------------------------------------------------*/ int -usb2_fifo_alloc_buffer(struct usb2_fifo *f, uint32_t bufsize, +usb2_fifo_alloc_buffer(struct usb2_fifo *f, usb2_size_t bufsize, uint16_t nbuf) { usb2_fifo_free_buffer(f); @@ -1753,11 +1753,11 @@ DPRINTFN(2, "detached %p\n", f_sc); } -uint32_t +usb2_size_t usb2_fifo_put_bytes_max(struct usb2_fifo *f) { struct usb2_mbuf *m; - uint32_t len; + usb2_size_t len; USB_IF_POLL(&f->free_q, m); @@ -1778,10 +1778,10 @@ *------------------------------------------------------------------------*/ void usb2_fifo_put_data(struct usb2_fifo *f, struct usb2_page_cache *pc, - uint32_t offset, uint32_t len, uint8_t what) + usb2_frlength_t offset, usb2_frlength_t len, uint8_t what) { struct usb2_mbuf *m; - uint32_t io_len; + usb2_frlength_t io_len; while (len || (what == 1)) { @@ -1816,10 +1816,10 @@ void usb2_fifo_put_data_linear(struct usb2_fifo *f, void *ptr, - uint32_t len, uint8_t what) + usb2_size_t len, uint8_t what) { struct usb2_mbuf *m; - uint32_t io_len; + usb2_size_t io_len; while (len || (what == 1)) { @@ -1853,7 +1853,7 @@ } uint8_t -usb2_fifo_put_data_buffer(struct usb2_fifo *f, void *ptr, uint32_t len) +usb2_fifo_put_data_buffer(struct usb2_fifo *f, void *ptr, usb2_size_t len) { struct usb2_mbuf *m; @@ -1889,11 +1889,11 @@ *------------------------------------------------------------------------*/ uint8_t usb2_fifo_get_data(struct usb2_fifo *f, struct usb2_page_cache *pc, - uint32_t offset, uint32_t len, uint32_t *actlen, + usb2_frlength_t offset, usb2_frlength_t len, usb2_frlength_t *actlen, uint8_t what) { struct usb2_mbuf *m; - uint32_t io_len; + usb2_frlength_t io_len; uint8_t tr_data = 0; actlen[0] = 0; @@ -1955,10 +1955,10 @@ uint8_t usb2_fifo_get_data_linear(struct usb2_fifo *f, void *ptr, - uint32_t len, uint32_t *actlen, uint8_t what) + usb2_size_t len, usb2_size_t *actlen, uint8_t what) { struct usb2_mbuf *m; - uint32_t io_len; + usb2_size_t io_len; uint8_t tr_data = 0; actlen[0] = 0; @@ -2019,7 +2019,7 @@ } uint8_t -usb2_fifo_get_data_buffer(struct usb2_fifo *f, void **pptr, uint32_t *plen) +usb2_fifo_get_data_buffer(struct usb2_fifo *f, void **pptr, usb2_size_t *plen) { struct usb2_mbuf *m; ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.h#8 (text+ko) ==== @@ -135,9 +135,9 @@ void *priv_sc0; /* client data */ void *priv_sc1; /* client data */ void *queue_data; - uint32_t timeout; /* timeout in milliseconds */ - uint32_t bufsize; /* BULK and INTERRUPT buffer size */ - uint16_t nframes; /* for isochronous mode */ + usb2_timeout_t timeout; /* timeout in milliseconds */ + usb2_frlength_t bufsize; /* BULK and INTERRUPT buffer size */ + usb2_frcount_t nframes; /* for isochronous mode */ uint16_t dev_ep_index; /* our device endpoint index */ uint8_t flag_sleeping; /* set if FIFO is sleeping */ uint8_t flag_iscomplete; /* set if a USB transfer is complete */ @@ -175,17 +175,18 @@ void usb2_fifo_detach(struct usb2_fifo_sc *f_sc); uint32_t usb2_fifo_put_bytes_max(struct usb2_fifo *fifo); void usb2_fifo_put_data(struct usb2_fifo *fifo, struct usb2_page_cache *pc, - uint32_t offset, uint32_t len, uint8_t what); + usb2_frlength_t offset, usb2_frlength_t len, uint8_t what); void usb2_fifo_put_data_linear(struct usb2_fifo *fifo, void *ptr, - uint32_t len, uint8_t what); -uint8_t usb2_fifo_put_data_buffer(struct usb2_fifo *f, void *ptr, uint32_t len); + usb2_size_t len, uint8_t what); +uint8_t usb2_fifo_put_data_buffer(struct usb2_fifo *f, void *ptr, usb2_size_t len); void usb2_fifo_put_data_error(struct usb2_fifo *fifo); uint8_t usb2_fifo_get_data(struct usb2_fifo *fifo, struct usb2_page_cache *pc, - uint32_t offset, uint32_t len, uint32_t *actlen, uint8_t what); + usb2_frlength_t offset, usb2_frlength_t len, usb2_frlength_t *actlen, + uint8_t what); uint8_t usb2_fifo_get_data_linear(struct usb2_fifo *fifo, void *ptr, - uint32_t len, uint32_t *actlen, uint8_t what); + usb2_size_t len, usb2_size_t *actlen, uint8_t what); uint8_t usb2_fifo_get_data_buffer(struct usb2_fifo *f, void **pptr, - uint32_t *plen); + usb2_size_t *plen); void usb2_fifo_get_data_error(struct usb2_fifo *fifo); uint8_t usb2_fifo_opened(struct usb2_fifo *fifo); void usb2_fifo_free(struct usb2_fifo *f); ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#9 (text+ko) ==== @@ -1397,7 +1397,7 @@ udev->depth = depth; udev->bus = bus; udev->address = USB_START_ADDR; /* default value */ - udev->plugtime = (uint32_t)ticks; + udev->plugtime = (usb2_ticks_t)ticks; /* * We need to force the power mode to "on" because there are plenty * of USB devices out there that do not work very well with ==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#8 (text+ko) ==== @@ -87,10 +87,10 @@ * in this structure is protected by the USB BUS lock. */ struct usb2_power_save { - int last_xfer_time; /* copy of "ticks" */ - uint32_t type_refs[4]; /* transfer reference count */ - uint32_t read_refs; /* data read references */ - uint32_t write_refs; /* data write references */ + usb2_ticks_t last_xfer_time; /* copy of "ticks" */ + usb2_size_t type_refs[4]; /* transfer reference count */ + usb2_size_t read_refs; /* data read references */ + usb2_size_t write_refs; /* data write references */ uint8_t suspended; /* set if USB device is suspended */ }; @@ -128,7 +128,7 @@ LIST_HEAD(,usb2_fs_privdata) pd_list; - uint32_t plugtime; /* copy of "ticks" */ + usb2_ticks_t plugtime; /* copy of "ticks" */ uint16_t refcount; #define USB_DEV_REF_MAX 0xffff ==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#7 (text+ko) ==== @@ -430,7 +430,7 @@ ugen_default_write_callback(struct usb2_xfer *xfer) { struct usb2_fifo *f = xfer->priv_sc; - uint32_t actlen; + usb2_frlength_t actlen; DPRINTFN(4, "actlen=%u, aframes=%u\n", xfer->actlen, xfer->aframes); @@ -502,8 +502,8 @@ ugen_isoc_read_callback(struct usb2_xfer *xfer) { struct usb2_fifo *f = xfer->priv_sc; - uint32_t offset; - uint16_t n; + usb2_frlength_t offset; + usb2_frcount_t n; DPRINTFN(4, "actlen=%u, aframes=%u\n", xfer->actlen, xfer->aframes); @@ -541,9 +541,9 @@ ugen_isoc_write_callback(struct usb2_xfer *xfer) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 19 12:58:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 311B3106567A; Thu, 19 Mar 2009 12:58:36 +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 D76861065677 for ; Thu, 19 Mar 2009 12:58:35 +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 C46748FC0A for ; Thu, 19 Mar 2009 12:58:35 +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 n2JCwZYb058777 for ; Thu, 19 Mar 2009 12:58:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JCwZPF058775 for perforce@freebsd.org; Thu, 19 Mar 2009 12:58:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Mar 2009 12:58:35 GMT Message-Id: <200903191258.n2JCwZPF058775@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 159438 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: Thu, 19 Mar 2009 12:58:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=159438 Change 159438 by hselasky@hselasky_laptop001 on 2009/03/19 12:58:24 USB storage: - Remove usage of USB_ADD_BYTES() (suggested by DES). Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#5 (text+ko) ==== @@ -59,8 +59,11 @@ /* Define some limits */ -#define USTORAGE_FS_BULK_SIZE (1UL << 17) -#define USTORAGE_FS_MAX_LUN 8 +#ifndef USTORAGE_FS_BULK_SIZE +#define USTORAGE_FS_BULK_SIZE (1UL << 17) /* bytes */ +#endif + +#define USTORAGE_FS_MAX_LUN 8 /* units */ /* * The SCSI ID string must be exactly 28 characters long @@ -136,7 +139,7 @@ struct ustorage_fs_lun { - void *memory_image; + uint8_t *memory_image; uint32_t num_sectors; uint32_t sense_data; @@ -1370,8 +1373,7 @@ file_offset = lba; file_offset <<= 9; - sc->sc_transfer.data_ptr = - USB_ADD_BYTES(currlun->memory_image, (uint32_t)file_offset); + sc->sc_transfer.data_ptr = currlun->memory_image + file_offset; return (0); } @@ -1435,8 +1437,7 @@ file_offset = lba; file_offset <<= 9; - sc->sc_transfer.data_ptr = - USB_ADD_BYTES(currlun->memory_image, (uint32_t)file_offset); + sc->sc_transfer.data_ptr = currlun->memory_image + file_offset; return (0); } From owner-p4-projects@FreeBSD.ORG Thu Mar 19 14:51:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 871DA10656BB; Thu, 19 Mar 2009 14:51:31 +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 2FBA61065678 for ; Thu, 19 Mar 2009 14:51:31 +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 A685F8FC19 for ; Thu, 19 Mar 2009 14:51:30 +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 n2JEpU4k070317 for ; Thu, 19 Mar 2009 14:51:30 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JEpUxc070315 for perforce@freebsd.org; Thu, 19 Mar 2009 14:51:30 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Mar 2009 14:51:30 GMT Message-Id: <200903191451.n2JEpUxc070315@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 159445 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: Thu, 19 Mar 2009 14:51:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=159445 Change 159445 by hselasky@hselasky_laptop001 on 2009/03/19 14:50:30 USB CORE: - Fix conditional compilation without ugen and strings. - Remove a redundant KASSERT. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#9 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#10 (text+ko) ==== @@ -738,7 +738,6 @@ */ usb2_fifo_free_wrap(udev, iface_index, 0); #endif - err = usb2_fill_iface_data(udev, iface_index, alt_index); if (err) { goto done; @@ -1378,8 +1377,6 @@ usb2_cv_init(udev->default_cv, "WCTRL"); usb2_cv_init(udev->default_cv + 1, "UGONE"); - LIST_INIT(&udev->pd_list); - /* initialise our mutex */ mtx_init(udev->default_mtx, "USB device mutex", NULL, MTX_DEF); @@ -1449,18 +1446,21 @@ /* set device index */ udev->device_index = device_index; +#if USB_HAVE_STRINGS /* Create ugen name */ snprintf(udev->ugen_name, sizeof(udev->ugen_name), USB_GENERIC_NAME "%u.%u", device_get_unit(bus->bdev), device_index); +#endif #if USB_HAVE_UGEN + LIST_INIT(&udev->pd_list); + /* Create the control endpoint device */ udev->default_dev = usb2_make_dev(udev, 0, FREAD|FWRITE); /* Create a link from /dev/ugenX.X to the default endpoint */ make_dev_alias(udev->default_dev, udev->ugen_name); #endif - if (udev->flags.usb2_mode == USB_MODE_HOST) { err = usb2_req_set_address(udev, NULL, device_index); @@ -1713,13 +1713,15 @@ usb2_bus_port_set_device(bus, parent_hub ? parent_hub->hub->ports + port_index : NULL, udev, device_index); - /* Link and announce the ugen device name */ #if USB_HAVE_UGEN + /* Symlink the ugen device name */ udev->ugen_symlink = usb2_alloc_symlink(udev->ugen_name); #endif +#if USB_HAVE_STRINGS + /* Announce device */ printf("%s: <%s> at %s\n", udev->ugen_name, udev->manufacturer, device_get_nameunit(udev->bus->bdev)); - +#endif usb2_notify_addq("+", udev); done: if (err) { @@ -1824,7 +1826,6 @@ while ((pd = LIST_FIRST(&udev->pd_list)) != NULL) { KASSERT(pd->cdev->si_drv1 == pd, ("privdata corrupt")); - KASSERT(pd->ep_addr > 0, ("freeing EP0")); destroy_dev_sched_cb(pd->cdev, usb2_cdev_cleanup, pd); pd->cdev = NULL; @@ -1856,13 +1857,13 @@ printf("%s: <%s> at %s (disconnected)\n", udev->ugen_name, udev->manufacturer, device_get_nameunit(bus->bdev)); +#if USB_HAVE_UGEN /* Destroy UGEN symlink, if any */ if (udev->ugen_symlink) { -#if USB_HAVE_UGEN usb2_free_symlink(udev->ugen_symlink); -#endif udev->ugen_symlink = NULL; } +#endif /* * Unregister our device first which will prevent any further * references: @@ -1873,7 +1874,6 @@ #if USB_HAVE_UGEN /* wait for all pending references to go away: */ - mtx_lock(&usb2_ref_lock); udev->refcount--; while (udev->refcount != 0) { ==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#9 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef _USB2_DEVICE_H_ #define _USB2_DEVICE_H_ -struct usb2_symlink; +struct usb2_symlink; /* UGEN */ struct usb_device; /* linux compat */ #define USB_DEFAULT_XFER_MAX 2 @@ -121,13 +121,11 @@ struct usb2_xfer *default_xfer[USB_DEFAULT_XFER_MAX]; struct usb2_temp_data *usb2_template_ptr; struct usb2_pipe *pipe_curr; /* current clear stall pipe */ +#if USB_HAVE_UGEN struct usb2_fifo *fifo[USB_FIFO_MAX]; - - char ugen_name[20]; /* name of ugenX.X device */ struct usb2_symlink *ugen_symlink; /* our generic symlink */ - LIST_HEAD(,usb2_fs_privdata) pd_list; - +#endif usb2_ticks_t plugtime; /* copy of "ticks" */ uint16_t refcount; @@ -156,9 +154,12 @@ struct usb2_endpoint_descriptor default_ep_desc; /* for pipe 0 */ struct usb2_device_descriptor ddesc; /* device descriptor */ +#if USB_HAVE_STRINGS + char ugen_name[20]; /* name of ugenX.X device */ char serial[64]; /* serial number */ char manufacturer[64]; /* manufacturer string */ char product[64]; /* product string */ +#endif }; /* globals */ From owner-p4-projects@FreeBSD.ORG Thu Mar 19 14:58:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 575321065674; Thu, 19 Mar 2009 14:58:38 +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 156EA106566C for ; Thu, 19 Mar 2009 14:58:38 +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 038DC8FC0A for ; Thu, 19 Mar 2009 14:58:38 +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 n2JEwbD0070821 for ; Thu, 19 Mar 2009 14:58:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JEwbKE070819 for perforce@freebsd.org; Thu, 19 Mar 2009 14:58:37 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Mar 2009 14:58:37 GMT Message-Id: <200903191458.n2JEwbKE070819@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 159446 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: Thu, 19 Mar 2009 14:58:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=159446 Change 159446 by hselasky@hselasky_laptop001 on 2009/03/19 14:58:00 USB CORE: - Remove unused and depreciated function: usb2_get_devid(). Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_util.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_util.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_util.c#4 (text+ko) ==== @@ -203,20 +203,6 @@ #endif /*------------------------------------------------------------------------* - * usb2_get_devid - * - * This function returns the USB Vendor and Product ID like a 32-bit - * unsigned integer. - *------------------------------------------------------------------------*/ -uint32_t -usb2_get_devid(device_t dev) -{ - struct usb2_attach_arg *uaa = device_get_ivars(dev); - - return ((uaa->info.idVendor << 16) | (uaa->info.idProduct)); -} - -/*------------------------------------------------------------------------* * usb2_make_str_desc - convert an ASCII string into a UNICODE string *------------------------------------------------------------------------*/ uint8_t ==== //depot/projects/usb/src/sys/dev/usb/usb_util.h#3 (text+ko) ==== @@ -28,7 +28,6 @@ #define _USB2_UTIL_H_ int device_delete_all_children(device_t dev); -uint32_t usb2_get_devid(device_t dev); uint8_t usb2_make_str_desc(void *ptr, uint16_t max_len, const char *s); void device_set_usb2_desc(device_t dev); void usb2_pause_mtx(struct mtx *mtx, int _ticks); From owner-p4-projects@FreeBSD.ORG Thu Mar 19 16:53:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FC851065672; Thu, 19 Mar 2009 16:53:38 +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 37F77106566B for ; Thu, 19 Mar 2009 16:53:38 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 23FFF8FC0A for ; Thu, 19 Mar 2009 16:53:38 +0000 (UTC) (envelope-from jhb@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 n2JGraQE093485 for ; Thu, 19 Mar 2009 16:53:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JGrZQS093481 for perforce@freebsd.org; Thu, 19 Mar 2009 16:53:35 GMT (envelope-from jhb@freebsd.org) Date: Thu, 19 Mar 2009 16:53:35 GMT Message-Id: <200903191653.n2JGrZQS093481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 159454 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: Thu, 19 Mar 2009 16:53:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=159454 Change 159454 by jhb@jhb_jhbbsd on 2009/03/19 16:52:48 IFC @159449 Affected files ... .. //depot/projects/smpng/sys/amd64/acpica/Makefile#1 branch .. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#11 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_switch.S#1 branch .. //depot/projects/smpng/sys/amd64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/smpng/sys/amd64/acpica/genwakecode.sh#1 branch .. //depot/projects/smpng/sys/amd64/acpica/genwakedata.sh#1 branch .. //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#24 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#27 integrate .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#26 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#75 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#53 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#91 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#50 integrate .. //depot/projects/smpng/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/smpng/sys/amd64/include/apicvar.h#21 integrate .. //depot/projects/smpng/sys/amd64/include/elf.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/pcb.h#16 integrate .. //depot/projects/smpng/sys/amd64/include/pcpu.h#11 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#19 integrate .. //depot/projects/smpng/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/smpng/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/smpng/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/smpng/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/smpng/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/smpng/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#37 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#11 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA#6 integrate .. //depot/projects/smpng/sys/arm/include/elf.h#8 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#58 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bioscd.c#10 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#19 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/libi386.h#15 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#16 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#15 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#21 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/main.c#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#22 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.h#7 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.c#11 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.h#6 integrate .. //depot/projects/smpng/sys/compat/ndis/hal_var.h#10 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#23 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#49 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#30 integrate .. //depot/projects/smpng/sys/conf/NOTES#163 integrate .. //depot/projects/smpng/sys/conf/files#232 integrate .. //depot/projects/smpng/sys/conf/files.amd64#63 integrate .. //depot/projects/smpng/sys/conf/files.i386#120 integrate .. //depot/projects/smpng/sys/conf/files.pc98#97 integrate .. //depot/projects/smpng/sys/conf/options#163 integrate .. //depot/projects/smpng/sys/conf/options.amd64#25 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#110 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#46 integrate .. //depot/projects/smpng/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/smpng/sys/dev/ata/ata-card.c#33 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416.h#4 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/smpng/sys/dev/ath/if_ath.c#71 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#15 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#38 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#32 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_disk.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_multiq.c#5 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#16 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#23 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#14 integrate .. //depot/projects/smpng/sys/dev/drm/drm_irq.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_linux_list.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_lock.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_vm.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/i915_dma.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/i915_irq.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/i915_reg.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/i915_suspend.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/mga_irq.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/r600_cp.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#21 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#12 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#43 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_pccard.c#20 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#48 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#12 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#53 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#8 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#23 integrate .. //depot/projects/smpng/sys/dev/k8temp/k8temp.c#4 delete .. //depot/projects/smpng/sys/dev/md/md.c#88 integrate .. //depot/projects/smpng/sys/dev/mmc/mmc.c#11 integrate .. //depot/projects/smpng/sys/dev/pccard/card_if.m#18 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#29 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#63 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#71 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#39 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_private.h#15 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpbb.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#30 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#39 integrate .. //depot/projects/smpng/sys/dev/txp/if_txpreg.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/image/uscanner.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#131 integrate .. //depot/projects/smpng/sys/dev/xen/balloon/balloon.c#2 integrate .. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#5 integrate .. //depot/projects/smpng/sys/dev/xen/console/console.c#5 integrate .. //depot/projects/smpng/sys/dev/xen/console/xencons_ring.c#3 integrate .. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#7 integrate .. //depot/projects/smpng/sys/dev/xen/xenpci/evtchn.c#1 branch .. //depot/projects/smpng/sys/dev/xen/xenpci/machine_reboot.c#1 branch .. //depot/projects/smpng/sys/dev/xen/xenpci/xenpci.c#1 branch .. //depot/projects/smpng/sys/dev/xen/xenpci/xenpcivar.h#1 branch .. //depot/projects/smpng/sys/fs/cd9660/cd9660_vfsops.c#11 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#77 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#40 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#46 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#26 integrate .. //depot/projects/smpng/sys/geom/geom_redboot.c#2 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#16 integrate .. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#4 integrate .. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#9 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#6 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#141 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#17 integrate .. //depot/projects/smpng/sys/i386/i386/i686_mem.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/k6_mem.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#131 integrate .. //depot/projects/smpng/sys/i386/include/elf.h#10 integrate .. //depot/projects/smpng/sys/i386/include/xen/xenpmap.h#3 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#66 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#24 integrate .. //depot/projects/smpng/sys/ia64/include/elf.h#14 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#117 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#67 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#154 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#61 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#113 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#35 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#93 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#75 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#28 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#55 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#58 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#117 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#55 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#92 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#40 integrate .. //depot/projects/smpng/sys/mips/include/elf.h#3 integrate .. //depot/projects/smpng/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/smpng/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/smpng/sys/modules/Makefile#157 integrate .. //depot/projects/smpng/sys/modules/amdtemp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ip6_mroute_mod/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ip_mroute_mod/Makefile#11 integrate .. //depot/projects/smpng/sys/modules/k8temp/Makefile#2 delete .. //depot/projects/smpng/sys/modules/netgraph/Makefile#29 integrate .. //depot/projects/smpng/sys/net/if.c#113 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#55 integrate .. //depot/projects/smpng/sys/net/if_loop.c#52 integrate .. //depot/projects/smpng/sys/net/if_tap.c#50 integrate .. //depot/projects/smpng/sys/net/if_var.h#59 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#18 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#44 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_tdma.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#35 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#27 integrate .. //depot/projects/smpng/sys/netinet/igmp.h#7 integrate .. //depot/projects/smpng/sys/netinet/in.c#50 integrate .. //depot/projects/smpng/sys/netinet/in.h#46 integrate .. //depot/projects/smpng/sys/netinet/in_mcast.c#10 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#92 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#60 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#63 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.h#13 integrate .. //depot/projects/smpng/sys/netinet/sctp.h#11 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#21 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#22 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#28 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_timer.c#18 integrate .. //depot/projects/smpng/sys/netinet/sctp_var.h#13 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#28 integrate .. //depot/projects/smpng/sys/netinet/sctputil.h#15 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#123 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#108 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#45 integrate .. //depot/projects/smpng/sys/netinet/tcp_timewait.c#10 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#75 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#52 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#31 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#59 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#37 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.h#9 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#27 integrate .. //depot/projects/smpng/sys/netipsec/key.c#30 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#31 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#67 integrate .. //depot/projects/smpng/sys/pci/intpm.c#19 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/smpng/sys/powerpc/include/elf.h#9 integrate .. //depot/projects/smpng/sys/powerpc/include/spr.h#11 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/mpc85xx.c#3 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#17 integrate .. //depot/projects/smpng/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_audit.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_cred.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet.c#14 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet6.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#19 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#23 integrate .. //depot/projects/smpng/sys/security/mac/mac_pipe.c#15 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_sem.c#11 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_shm.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_priv.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#21 integrate .. //depot/projects/smpng/sys/security/mac/mac_socket.c#12 integrate .. //depot/projects/smpng/sys/security/mac/mac_syscalls.c#8 integrate .. //depot/projects/smpng/sys/security/mac/mac_system.c#13 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#10 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#10 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_shm.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#23 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#17 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#90 integrate .. //depot/projects/smpng/sys/sparc64/include/elf.h#14 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_disasm.c#8 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#23 integrate .. //depot/projects/smpng/sys/sun4v/include/elf.h#4 integrate .. //depot/projects/smpng/sys/sys/_pthreadtypes.h#2 integrate .. //depot/projects/smpng/sys/sys/aio.h#9 integrate .. //depot/projects/smpng/sys/sys/buf.h#53 integrate .. //depot/projects/smpng/sys/sys/diskpc98.h#9 integrate .. //depot/projects/smpng/sys/sys/elf_common.h#15 integrate .. //depot/projects/smpng/sys/sys/imgact.h#17 integrate .. //depot/projects/smpng/sys/sys/imgact_elf.h#12 integrate .. //depot/projects/smpng/sys/sys/ktrace.h#15 integrate .. //depot/projects/smpng/sys/sys/lock_profile.h#7 integrate .. //depot/projects/smpng/sys/sys/memrange.h#5 integrate .. //depot/projects/smpng/sys/sys/mount.h#73 integrate .. //depot/projects/smpng/sys/sys/param.h#138 integrate .. //depot/projects/smpng/sys/sys/proc.h#195 integrate .. //depot/projects/smpng/sys/sys/sem.h#10 integrate .. //depot/projects/smpng/sys/sys/shm.h#12 integrate .. //depot/projects/smpng/sys/sys/smp.h#20 integrate .. //depot/projects/smpng/sys/sys/stat.h#22 integrate .. //depot/projects/smpng/sys/sys/syslog.h#7 integrate .. //depot/projects/smpng/sys/sys/termios.h#9 integrate .. //depot/projects/smpng/sys/sys/time.h#27 integrate .. //depot/projects/smpng/sys/sys/uio.h#24 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#112 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#64 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#18 integrate .. //depot/projects/smpng/sys/xen/evtchn/evtchn.c#5 integrate .. //depot/projects/smpng/sys/xen/evtchn/evtchn_dev.c#3 integrate .. //depot/projects/smpng/sys/xen/features.c#3 integrate .. //depot/projects/smpng/sys/xen/features.h#1 branch .. //depot/projects/smpng/sys/xen/gnttab.c#5 integrate .. //depot/projects/smpng/sys/xen/gnttab.h#5 integrate .. //depot/projects/smpng/sys/xen/hypervisor.h#2 integrate .. //depot/projects/smpng/sys/xen/interface/arch-x86/xen.h#3 integrate .. //depot/projects/smpng/sys/xen/interface/hvm/params.h#3 integrate .. //depot/projects/smpng/sys/xen/reboot.c#1 branch .. //depot/projects/smpng/sys/xen/xen_intr.h#2 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus_probe.c#4 integrate .. //depot/projects/smpng/sys/xen/xenbus/xenbus_xs.c#5 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#11 (text+ko) ==== @@ -25,31 +25,56 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.18 2008/03/13 20:39:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.19 2009/03/17 00:48:11 jkim Exp $"); #include #include #include #include +#include #include #include #include +SYSCTL_DECL(_debug_acpi); + +uint32_t acpi_resume_beep; +TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep); +SYSCTL_UINT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep, + 0, "Beep the PC speaker when resuming"); +uint32_t acpi_reset_video; +TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video); + static int intr_model = ACPI_INTR_PIC; +static struct apm_clone_data acpi_clone; int acpi_machdep_init(device_t dev) { - struct acpi_softc *sc; + struct acpi_softc *sc; sc = devclass_get_softc(devclass_find("acpi"), 0); + + /* Create a fake clone for /dev/acpi. */ + STAILQ_INIT(&sc->apm_cdevs); + acpi_clone.cdev = sc->acpi_dev_t; + acpi_clone.acpi_sc = sc; + ACPI_LOCK(acpi); + STAILQ_INSERT_TAIL(&sc->apm_cdevs, &acpi_clone, entries); + ACPI_UNLOCK(acpi); + sc->acpi_clone = &acpi_clone; acpi_install_wakeup_handler(sc); if (intr_model != ACPI_INTR_PIC) acpi_SetIntrModel(intr_model); + SYSCTL_ADD_UINT(&sc->acpi_sysctl_ctx, + SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, + "reset_video", CTLFLAG_RW, &acpi_reset_video, 0, + "Call the VESA reset BIOS vector on the resume path"); + return (0); } ==== //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#5 (text+ko) ==== @@ -1,6 +1,8 @@ /*- * Copyright (c) 2001 Takanori Watanabe * Copyright (c) 2001 Mitsuru IWASAKI + * Copyright (c) 2003 Peter Wemm + * Copyright (c) 2008-2009 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,21 +28,414 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.22 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.23 2009/03/17 00:48:11 jkim Exp $"); #include +#include #include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#ifdef SMP +#include +#include +#endif #include #include +#include "acpi_wakecode.h" +#include "acpi_wakedata.h" + +/* Make sure the code is less than a page and leave room for the stack. */ +CTASSERT(sizeof(wakecode) < PAGE_SIZE - 1024); + +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + +extern uint32_t acpi_resume_beep; +extern uint32_t acpi_reset_video; + +#ifdef SMP +extern struct xpcb *stopxpcbs; +#else +static struct xpcb *stopxpcbs; +#endif + +int acpi_restorecpu(struct xpcb *, vm_offset_t); +int acpi_savecpu(struct xpcb *); + +static void acpi_reset_tss(int cpu); +static void acpi_alloc_wakeup_handler(void); +static void acpi_stop_beep(void *); + +#ifdef SMP +static int acpi_wakeup_ap(struct acpi_softc *, int); +static void acpi_wakeup_cpus(struct acpi_softc *, cpumask_t); +#endif + +#define WAKECODE_VADDR(sc) ((sc)->acpi_wakeaddr + (3 * PAGE_SIZE)) +#define WAKECODE_PADDR(sc) ((sc)->acpi_wakephys + (3 * PAGE_SIZE)) +#define WAKECODE_FIXUP(offset, type, val) do { \ + type *addr; \ + addr = (type *)(WAKECODE_VADDR(sc) + offset); \ + *addr = val; \ +} while (0) + +/* Turn off bits 1&2 of the PIT, stopping the beep. */ +static void +acpi_stop_beep(void *arg) +{ + outb(0x61, inb(0x61) & ~0x3); +} + +#ifdef SMP +static int +acpi_wakeup_ap(struct acpi_softc *sc, int cpu) +{ + int vector = (WAKECODE_PADDR(sc) >> 12) & 0xff; + int apic_id = cpu_apic_ids[cpu]; + int ms; + + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[cpu]); + WAKECODE_FIXUP(wakeup_gdt, uint16_t, stopxpcbs[cpu].xpcb_gdt.rd_limit); + WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, + stopxpcbs[cpu].xpcb_gdt.rd_base); + WAKECODE_FIXUP(wakeup_cpu, int, cpu); + + acpi_reset_tss(cpu); + + /* do an INIT IPI: assert RESET */ + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, apic_id); + + /* wait for pending status end */ + lapic_ipi_wait(-1); + + /* do an INIT IPI: deassert RESET */ + lapic_ipi_raw(APIC_DEST_ALLESELF | APIC_TRIGMOD_LEVEL | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, 0); + + /* wait for pending status end */ + DELAY(10000); /* wait ~10mS */ + lapic_ipi_wait(-1); + + /* + * next we do a STARTUP IPI: the previous INIT IPI might still be + * latched, (P5 bug) this 1st STARTUP would then terminate + * immediately, and the previously started INIT IPI would continue. OR + * the previous INIT IPI has already run. and this STARTUP IPI will + * run. OR the previous INIT IPI was ignored. and this STARTUP IPI + * will run. + */ + + /* do a STARTUP IPI */ + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + vector, apic_id); + lapic_ipi_wait(-1); + DELAY(200); /* wait ~200uS */ + + /* + * finally we do a 2nd STARTUP IPI: this 2nd STARTUP IPI should run IF + * the previous STARTUP IPI was cancelled by a latched INIT IPI. OR + * this STARTUP IPI will be ignored, as only ONE STARTUP IPI is + * recognized after hardware RESET or INIT IPI. + */ + + lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE | + APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP | + vector, apic_id); + lapic_ipi_wait(-1); + DELAY(200); /* wait ~200uS */ + + /* Wait up to 5 seconds for it to start. */ + for (ms = 0; ms < 5000; ms++) { + if (*(int *)(WAKECODE_VADDR(sc) + wakeup_cpu) == 0) + return (1); /* return SUCCESS */ + DELAY(1000); + } + return (0); /* return FAILURE */ +} + +#define WARMBOOT_TARGET 0 +#define WARMBOOT_OFF (KERNBASE + 0x0467) +#define WARMBOOT_SEG (KERNBASE + 0x0469) + +#define CMOS_REG (0x70) +#define CMOS_DATA (0x71) +#define BIOS_RESET (0x0f) +#define BIOS_WARM (0x0a) + +static void +acpi_wakeup_cpus(struct acpi_softc *sc, cpumask_t wakeup_cpus) +{ + uint32_t mpbioswarmvec; + cpumask_t map; + int cpu; + u_char mpbiosreason; + + /* save the current value of the warm-start vector */ + mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF); + outb(CMOS_REG, BIOS_RESET); + mpbiosreason = inb(CMOS_DATA); + + /* setup a vector to our boot code */ + *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; + *((volatile u_short *)WARMBOOT_SEG) = WAKECODE_PADDR(sc) >> 4; + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ + + /* Wake up each AP. */ + for (cpu = 1; cpu < mp_ncpus; cpu++) { + map = 1ul << cpu; + if ((wakeup_cpus & map) != map) + continue; + if (acpi_wakeup_ap(sc, cpu) == 0) { + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)", + cpu, cpu_apic_ids[cpu]); + } + } + + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, mpbiosreason); +} +#endif + +static void +acpi_reset_tss(int cpu) +{ + uint32_t *tss; + + /* + * We have to clear "task busy" bit in TSS to restore + * task register later. Otherwise, ltr causes GPF. + */ + tss = (uint32_t *)&gdt[NGDT * cpu + GPROC0_SEL] + 1; + *tss &= ~((SDT_SYSBSY ^ SDT_SYSTSS) << 8); +} + int acpi_sleep_machdep(struct acpi_softc *sc, int state) { - return (0); + struct savefpu *stopfpu; +#ifdef SMP + cpumask_t wakeup_cpus; +#endif + register_t cr3, rf; + ACPI_STATUS status; + int ret; + + ret = -1; + + if (sc->acpi_wakeaddr == 0ul) + return (ret); + +#ifdef SMP + wakeup_cpus = PCPU_GET(other_cpus); +#endif + + AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc)); + + rf = intr_disable(); + intr_suspend(); + + /* + * Temporarily switch to the kernel pmap because it provides + * an identity mapping (setup at boot) for the low physical + * memory region containing the wakeup code. + */ + cr3 = rcr3(); + load_cr3(KPML4phys); + + stopfpu = &stopxpcbs[0].xpcb_pcb.pcb_save; + if (acpi_savecpu(&stopxpcbs[0])) { + fpugetregs(curthread, stopfpu); + +#ifdef SMP + if (wakeup_cpus != 0 && suspend_cpus(wakeup_cpus) == 0) { + device_printf(sc->acpi_dev, + "Failed to suspend APs: CPU mask = 0x%jx\n", + (uintmax_t)(wakeup_cpus & ~stopped_cpus)); + goto out; + } +#endif + + WAKECODE_FIXUP(resume_beep, uint32_t, acpi_resume_beep); + WAKECODE_FIXUP(reset_video, uint32_t, acpi_reset_video); + + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[0]); + WAKECODE_FIXUP(wakeup_gdt, uint16_t, + stopxpcbs[0].xpcb_gdt.rd_limit); + WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, + stopxpcbs[0].xpcb_gdt.rd_base); + WAKECODE_FIXUP(wakeup_cpu, int, 0); + + acpi_reset_tss(0); + + /* Call ACPICA to enter the desired sleep state */ + if (state == ACPI_STATE_S4 && sc->acpi_s4bios) + status = AcpiEnterSleepStateS4bios(); + else + status = AcpiEnterSleepState(state); + + if (status != AE_OK) { + device_printf(sc->acpi_dev, + "AcpiEnterSleepState failed - %s\n", + AcpiFormatException(status)); + goto out; + } + + for (;;) + ia32_pause(); + } else { + fpusetregs(curthread, stopfpu); + + WAKECODE_FIXUP(resume_beep, uint32_t, 0); + WAKECODE_FIXUP(reset_video, uint32_t, 0); +#ifdef SMP + if (wakeup_cpus != 0) + acpi_wakeup_cpus(sc, wakeup_cpus); +#endif + ret = 0; + } + +out: +#ifdef SMP + if (wakeup_cpus != 0) + restart_cpus(wakeup_cpus); +#endif + + load_cr3(cr3); + intr_resume(); + intr_restore(rf); + + AcpiSetFirmwareWakingVector(0); + + if (ret == 0 && mem_range_softc.mr_op != NULL && + mem_range_softc.mr_op->reinit != NULL) + mem_range_softc.mr_op->reinit(&mem_range_softc); + + /* If we beeped, turn it off after a delay. */ + if (acpi_resume_beep) + timeout(acpi_stop_beep, NULL, 3 * hz); + + return (ret); +} + +static vm_offset_t acpi_wakeaddr; + +static void +acpi_alloc_wakeup_handler(void) +{ + void *wakeaddr; + + if (!cold) + return; + + /* + * Specify the region for our wakeup code. We want it in the low 1 MB + * region, excluding video memory and above (0xa0000). We ask for + * it to be page-aligned, just to be safe. + */ + wakeaddr = contigmalloc(4 * PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0, 0x9ffff, + PAGE_SIZE, 0ul); + if (wakeaddr == NULL) { + printf("%s: can't alloc wake memory\n", __func__); + return; + } + stopxpcbs = malloc(mp_ncpus * sizeof(*stopxpcbs), M_DEVBUF, M_NOWAIT); + if (stopxpcbs == NULL) { + contigfree(wakeaddr, 4 * PAGE_SIZE, M_DEVBUF); + printf("%s: can't alloc CPU state memory\n", __func__); + return; + } + acpi_wakeaddr = (vm_offset_t)wakeaddr; } +SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0); + void acpi_install_wakeup_handler(struct acpi_softc *sc) { + uint64_t *pt4, *pt3, *pt2; + int i; + + if (acpi_wakeaddr == 0ul) + return; + + sc->acpi_wakeaddr = acpi_wakeaddr; + sc->acpi_wakephys = vtophys(acpi_wakeaddr); + + bcopy(wakecode, (void *)WAKECODE_VADDR(sc), sizeof(wakecode)); + + /* Patch GDT base address, ljmp targets and page table base address. */ + WAKECODE_FIXUP((bootgdtdesc + 2), uint32_t, + WAKECODE_PADDR(sc) + bootgdt); + WAKECODE_FIXUP((wakeup_sw32 + 2), uint32_t, + WAKECODE_PADDR(sc) + wakeup_32); + WAKECODE_FIXUP((wakeup_sw64 + 1), uint32_t, + WAKECODE_PADDR(sc) + wakeup_64); + WAKECODE_FIXUP(wakeup_pagetables, uint32_t, sc->acpi_wakephys); + + /* Save pointers to some global data. */ + WAKECODE_FIXUP(wakeup_retaddr, void *, acpi_restorecpu); + WAKECODE_FIXUP(wakeup_kpml4, uint64_t, KPML4phys); + WAKECODE_FIXUP(wakeup_ctx, vm_offset_t, + WAKECODE_VADDR(sc) + wakeup_ctx); + WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER)); + WAKECODE_FIXUP(wakeup_pat, uint64_t, rdmsr(MSR_PAT)); + WAKECODE_FIXUP(wakeup_star, uint64_t, rdmsr(MSR_STAR)); + WAKECODE_FIXUP(wakeup_lstar, uint64_t, rdmsr(MSR_LSTAR)); + WAKECODE_FIXUP(wakeup_cstar, uint64_t, rdmsr(MSR_CSTAR)); + WAKECODE_FIXUP(wakeup_sfmask, uint64_t, rdmsr(MSR_SF_MASK)); + + /* Build temporary page tables below realmode code. */ + pt4 = (uint64_t *)acpi_wakeaddr; + pt3 = pt4 + (PAGE_SIZE) / sizeof(uint64_t); + pt2 = pt3 + (PAGE_SIZE) / sizeof(uint64_t); + + /* Create the initial 1GB replicated page tables */ + for (i = 0; i < 512; i++) { + /* + * Each slot of the level 4 pages points + * to the same level 3 page + */ + pt4[i] = (uint64_t)(sc->acpi_wakephys + PAGE_SIZE); + pt4[i] |= PG_V | PG_RW | PG_U; + + /* + * Each slot of the level 3 pages points + * to the same level 2 page + */ + pt3[i] = (uint64_t)(sc->acpi_wakephys + (2 * PAGE_SIZE)); + pt3[i] |= PG_V | PG_RW | PG_U; + + /* The level 2 page slots are mapped with 2MB pages for 1GB. */ + pt2[i] = i * (2 * 1024 * 1024); + pt2[i] |= PG_V | PG_RW | PG_PS | PG_U; + } + + if (bootverbose) + device_printf(sc->acpi_dev, "wakeup code va %p pa %p\n", + (void *)sc->acpi_wakeaddr, (void *)sc->acpi_wakephys); } ==== //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.31 2009/01/12 19:17:35 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.32 2009/03/17 00:48:11 jkim Exp $"); #include #include @@ -73,11 +73,13 @@ static int amd64_mrset(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg); static void amd64_mrAPinit(struct mem_range_softc *sc); +static void amd64_mrreinit(struct mem_range_softc *sc); static struct mem_range_ops amd64_mrops = { amd64_mrinit, amd64_mrset, - amd64_mrAPinit + amd64_mrAPinit, + amd64_mrreinit }; /* XXX for AP startup hook */ @@ -668,6 +670,30 @@ wrmsr(MSR_MTRRdefType, mtrrdef); } +/* + * Re-initialise running CPU(s) MTRRs to match the ranges in the descriptor + * list. + * + * XXX Must be called with interrupts enabled. + */ +static void +amd64_mrreinit(struct mem_range_softc *sc) +{ +#ifdef SMP + /* + * We should use ipi_all_but_self() to call other CPUs into a + * locking gate, then call a target function to do this work. + * The "proper" solution involves a generalised locking gate + * implementation, not ready yet. + */ + smp_rendezvous(NULL, (void *)amd64_mrAPinit, NULL, sc); +#else + disable_intr(); /* disable interrupts */ + amd64_mrAPinit(sc); + enable_intr(); +#endif +} + static void amd64_mem_drvinit(void *unused) { ==== //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#16 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.110 2006/12/17 06:48:39 kmacy Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.111 2009/03/17 00:48:11 jkim Exp $ */ /* @@ -224,6 +224,22 @@ iretq /* + * Executed by a CPU when it receives an IPI_SUSPEND from another CPU. + */ + .text + SUPERALIGN_TEXT +IDTVEC(cpususpend) + PUSH_FRAME + + movq lapic, %rax + movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ + + call cpususpend_handler + + POP_FRAME + iretq + +/* * Executed by a CPU when it receives a RENDEZVOUS IPI from another CPU. * * - Calls the generic rendezvous action function. ==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#24 (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/amd64/amd64/cpu_switch.S,v 1.166 2009/01/31 11:37:21 obrien Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.167 2009/03/17 00:48:11 jkim Exp $ */ #include @@ -325,9 +325,8 @@ movq %r11,%dr6 movq %rax,%dr7 jmp done_load_dr +END(cpu_switch) -END(cpu_switch) - /* * savectx(pcb) * Update pcb, saving current processor state. @@ -386,3 +385,74 @@ ret END(savectx) + +/* + * savectx2(xpcb) + * Update xpcb, saving current processor state. + */ +ENTRY(savectx2) + /* Fetch XPCB. */ + movq %rdi,%r8 + + /* Save caller's return address. */ + movq (%rsp),%rax + movq %rax,PCB_RIP(%r8) + + mov %ds,PCB_DS(%r8) + mov %es,PCB_ES(%r8) + mov %ss,XPCB_SS(%r8) + mov %fs,PCB_FS(%r8) + mov %gs,PCB_GS(%r8) + + movq %rbx,PCB_RBX(%r8) + movq %rsp,PCB_RSP(%r8) + movq %rbp,PCB_RBP(%r8) + movq %r12,PCB_R12(%r8) + movq %r13,PCB_R13(%r8) + movq %r14,PCB_R14(%r8) + movq %r15,PCB_R15(%r8) + + movq %cr0,%rax + movq %rax,XPCB_CR0(%r8) + movq %cr2,%rax + movq %rax,XPCB_CR2(%r8) + movq %cr4,%rax + movq %rax,XPCB_CR4(%r8) + + movq %dr0,%rax + movq %rax,PCB_DR0(%r8) + movq %dr1,%rax + movq %rax,PCB_DR1(%r8) + movq %dr2,%rax + movq %rax,PCB_DR2(%r8) + movq %dr3,%rax + movq %rax,PCB_DR3(%r8) + movq %dr6,%rax + movq %rax,PCB_DR6(%r8) + movq %dr7,%rax + movq %rax,PCB_DR7(%r8) + + sgdt XPCB_GDT(%r8) + sidt XPCB_IDT(%r8) + sldt XPCB_LDT(%r8) + str XPCB_TR(%r8) + + movl $MSR_FSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%rax + movq %rax,PCB_FSBASE(%r8) + movl $MSR_GSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%rax + movq %rax,PCB_GSBASE(%r8) + movl $MSR_KGSBASE,%ecx + rdmsr + shlq $32,%rdx + leaq (%rax,%rdx),%rax + movq %rax,XPCB_KGSBASE(%r8) + + movl $1, %eax + ret +END(savectx2) ==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#27 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.83 2008/12/05 11:34:36 kib Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 19 16:53:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FCF110656FC; Thu, 19 Mar 2009 16:53:38 +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 4916E1065670 for ; Thu, 19 Mar 2009 16:53:38 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 375338FC13 for ; Thu, 19 Mar 2009 16:53:38 +0000 (UTC) (envelope-from jhb@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 n2JGra8L093490 for ; Thu, 19 Mar 2009 16:53:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JGraxZ093488 for perforce@freebsd.org; Thu, 19 Mar 2009 16:53:36 GMT (envelope-from jhb@freebsd.org) Date: Thu, 19 Mar 2009 16:53:36 GMT Message-Id: <200903191653.n2JGraxZ093488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 159455 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: Thu, 19 Mar 2009 16:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=159455 Change 159455 by jhb@jhb_jhbbsd on 2009/03/19 16:53:25 IFC @159453 Affected files ... .. //depot/projects/smpng/sys/netipsec/key.c#31 integrate Differences ... ==== //depot/projects/smpng/sys/netipsec/key.c#31 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/key.c,v 1.44 2009/03/19 15:44:13 vanhu Exp $ */ +/* $FreeBSD: src/sys/netipsec/key.c,v 1.45 2009/03/19 15:50:45 vanhu Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ /*- @@ -4161,7 +4161,8 @@ if (sav->lft_s->addtime != 0 && now - sav->created > sav->lft_s->addtime) { key_sa_chgstate(sav, SADB_SASTATE_DYING); - /* Actually, only send expire message if SA has been used, as it + /* + * Actually, only send expire message if SA has been used, as it * was done before, but should we always send such message, and let IKE * daemon decide if it should be renegociated or not ? * XXX expire message will actually NOT be sent if SA is only used From owner-p4-projects@FreeBSD.ORG Thu Mar 19 17:13:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 721E51065676; Thu, 19 Mar 2009 17:13:58 +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 EEBC1106566C for ; Thu, 19 Mar 2009 17:13:57 +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 DD1848FC1E for ; Thu, 19 Mar 2009 17:13:57 +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 n2JHDvQt096302 for ; Thu, 19 Mar 2009 17:13:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JHDvTC096300 for perforce@freebsd.org; Thu, 19 Mar 2009 17:13:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Mar 2009 17:13:57 GMT Message-Id: <200903191713.n2JHDvTC096300@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 159457 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: Thu, 19 Mar 2009 17:13:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=159457 Change 159457 by hselasky@hselasky_laptop001 on 2009/03/19 17:13:21 USB CORE: - update a dummy DEVMETHOD() which is used by some scripts I have. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#3 (text+ko) ==== @@ -211,7 +211,7 @@ (iface->subdev != NULL) && device_is_attached(iface->subdev)) { #if 0 - DEVMETHOD(usb2_handle_request, NULL); /* dummy */ + DEVMETHOD(usb_handle_request, NULL); /* dummy */ #endif error = USB_HANDLE_REQUEST(iface->subdev, &req, ppdata, plen, From owner-p4-projects@FreeBSD.ORG Thu Mar 19 20:27:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06B641065672; Thu, 19 Mar 2009 20:27:26 +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 B91EB106566C for ; Thu, 19 Mar 2009 20:27:25 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A53498FC23 for ; Thu, 19 Mar 2009 20:27:25 +0000 (UTC) (envelope-from lulf@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 n2JKRP5W022230 for ; Thu, 19 Mar 2009 20:27:25 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JKRPa5022228 for perforce@freebsd.org; Thu, 19 Mar 2009 20:27:25 GMT (envelope-from lulf@FreeBSD.org) Date: Thu, 19 Mar 2009 20:27:25 GMT Message-Id: <200903192027.n2JKRPa5022228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 159469 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: Thu, 19 Mar 2009 20:27:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=159469 Change 159469 by lulf@lulf_carrot on 2009/03/19 20:27:12 - Re-add the device clock data to the ivar structure, which means that we need to look it up from devclk. This is done by having lookup routines which are supposed to registered for a devices' parent. This routine will be called when there is a need to lookup the appropriate clock for a device before operations are performed on it. Add these handlers to at32_tc as well, because it's children will need to lookup their clocks. - Add PBA clocks. - Add device clock for uart as an example. - Make sure pm is startup before other devices. Is there a prettier way than reordering the hints? or should this be considered a design flaw in devclk? Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32.c#10 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#6 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_tc.c#2 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_tc_channel.c#2 edit .. //depot/projects/avr32/src/sys/avr32/avr32/clock.c#6 edit .. //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#4 edit .. //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#3 edit .. //depot/projects/avr32/src/sys/dev/uart/uart_bus_atmel.c#3 edit .. //depot/projects/avr32/src/sys/dev/uart/uart_dev_atmel.c#5 edit .. //depot/projects/avr32/src/sys/kern/devclk_if.m#5 edit .. //depot/projects/avr32/src/sys/kern/subr_devclk.c#5 edit .. //depot/projects/avr32/src/sys/sys/devclk.h#5 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32.c#10 (text+ko) ==== @@ -72,6 +72,8 @@ static void at32_clk_enable(device_t, device_t); static void at32_clk_disable(device_t, device_t); +static const char *at32_clk_lookup_name(device_t, device_t); +static int at32_clk_lookup_index(device_t, device_t); /* Driver variables and private data */ struct at32_softc { struct rman sc_irq_rman; @@ -79,6 +81,8 @@ struct rman sc_mem_rman; }; struct at32_ivar { + char *clk_name; + int clk_index; struct resource_list resources; }; @@ -99,6 +103,8 @@ DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), DEVMETHOD(bus_release_resource, at32_release_resource), + DEVMETHOD(devclk_lookup_name, at32_clk_lookup_name), + DEVMETHOD(devclk_lookup_index, at32_clk_lookup_index), /* DEVMETHOD(devclk_get_rate, at32_clk_get_rate), DEVMETHOD(devclk_set_rate, at32_clk_set_rate), @@ -189,9 +195,10 @@ static void at32_hinted_child(device_t bus, const char *dname, int dunit) { + struct at32_ivar *ivar; device_t child; long maddr; - int msize, irq, result, clk_index; + int msize, irq, result; const char *resval; @@ -216,11 +223,15 @@ "warning: bus_set_resource() failed\n"); } } + ivar = device_get_ivars(child); + ivar->clk_name = NULL; if (resource_string_value(dname, dunit, "clk", &resval) == 0) { if (resource_int_value(dname, dunit, "clk_index", - &clk_index) != 0) - clk_index = 0; /* Default */ - devclk_register_map(child, resval, clk_index); + &ivar->clk_index) != 0) + ivar->clk_index = 0; /* Default */ + ivar->clk_name = malloc(strlen(resval) + 1, M_DEVBUF, M_WAITOK | + M_ZERO); + strlcpy(ivar->clk_name, resval, strlen(resval) + 1); } } @@ -355,6 +366,25 @@ ivar = device_get_ivars(child); return (&(ivar->resources)); } + +static const char * +at32_clk_lookup_name(device_t dev, device_t child) +{ + struct at32_ivar *ivar; + + ivar = device_get_ivars(child); + return (ivar->clk_name); +} + +static int +at32_clk_lookup_index(device_t dev, device_t child) +{ + struct at32_ivar *ivar; + + ivar = device_get_ivars(child); + return (ivar->clk_index); +} + #if 0 static uint64_t at32_clk_get_rate(device_t dev, device_t child) ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_pm.c#6 (text+ko) ==== @@ -65,6 +65,11 @@ static int at32_pm_activate(device_t); static void at32_pm_deactivate(device_t); +static void at32_pba_enable(devclk_t, int); +static void at32_pba_disable(devclk_t, int); +static uint64_t at32_pba_get_rate(devclk_t, int); +static int at32_pba_set_rate(devclk_t, int, uint64_t); + static void at32_pbb_enable(devclk_t, int); static void at32_pbb_disable(devclk_t, int); static uint64_t at32_pbb_get_rate(devclk_t, int); @@ -135,6 +140,17 @@ }; DEFINE_CLASS(at32_pbb, at32_pbb_methods, sizeof(struct devclk)); +/* Class defining the pba clock mask. */ +static kobj_method_t at32_pba_methods[] = { + KOBJMETHOD(devclk_enable, at32_pba_enable), + KOBJMETHOD(devclk_disable, at32_pba_disable), + KOBJMETHOD(devclk_set_rate, at32_pba_set_rate), + KOBJMETHOD(devclk_get_rate, at32_pba_get_rate), + {0, 0}, +}; +DEFINE_CLASS(at32_pba, at32_pba_methods, sizeof(struct devclk)); + + /* Code */ static int at32_pm_probe(device_t dev) @@ -194,6 +210,7 @@ /* Register master device clocks. */ devclk_register_clock(dev, &at32_pbb_class, "pbb", "pll0"); + devclk_register_clock(dev, &at32_pba_class, "pba", "pll0"); // devclk_register_clock(dev, &sc->cpu, "cpu", &sc->pll0); // devclk_register_clock(dev, &sc->hsb, "hsb", &sc->cpu); // devclk_register_clock(dev, &sc->pba, "pba", &sc->hsb); @@ -261,6 +278,45 @@ } static void +at32_pba_enable(devclk_t clk, int index) +{ + struct at32_pm_softc *sc; + uint32_t reg; + + KASSERT(clk != NULL, ("NULL clk")); + KASSERT(index < 31, ("index > register width")); + sc = device_get_softc(clk->dev); + reg = RD4(AT32_PM_PBAMASK); + WR4(AT32_PM_PBAMASK, reg | (1 << index)); +} + +static void +at32_pba_disable(devclk_t clk, int index) +{ + struct at32_pm_softc *sc; + uint32_t reg; + + KASSERT(clk != NULL, ("NULL clk")); + KASSERT(index < 31, ("index > register width")); + sc = device_get_softc(clk->dev); + reg = RD4(AT32_PM_PBAMASK); + WR4(AT32_PM_PBAMASK, reg & ~(1 << index)); +} + +static uint64_t +at32_pba_get_rate(devclk_t clk, int index) +{ + /* XXX: Temporary. */ + return (clock_cpu_frequency); +} + +static int +at32_pba_set_rate(devclk_t clk, int index, uint64_t rate) +{ + return (0); +} + +static void at32_osc_enable(devclk_t clk, int index) { /* In this case, index means which oscilliator. */ ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_tc.c#2 (text+ko) ==== @@ -67,6 +67,8 @@ u_long, u_long, u_long, u_int); static int at32_tc_release_resource(device_t, device_t, int, int, struct resource *); +static const char *at32_tc_clk_lookup_name(device_t, device_t); +static int at32_tc_clk_lookup_index(device_t, device_t); /*** Driver variables and private data */ struct at32_tc_softc { @@ -97,6 +99,9 @@ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(devclk_lookup_name, at32_tc_clk_lookup_name), + DEVMETHOD(devclk_lookup_index, at32_tc_clk_lookup_index), + {0, 0}, }; static driver_t at32_tc_driver = { @@ -348,3 +353,24 @@ return (0); } +static const char * +at32_tc_clk_lookup_name(device_t dev, device_t child) +{ + device_t parent; + + parent = device_get_parent(dev); + if (parent != NULL) + return (DEVCLK_LOOKUP_NAME(parent, dev)); + return (NULL); +} + +static int +at32_tc_clk_lookup_index(device_t dev, device_t child) +{ + device_t parent; + + parent = device_get_parent(dev); + if (parent != NULL) + return (DEVCLK_LOOKUP_INDEX(parent, dev)); + return (NULL); +} ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_tc_channel.c#2 (text+ko) ==== ==== //depot/projects/avr32/src/sys/avr32/avr32/clock.c#6 (text+ko) ==== ==== //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#4 (text+ko) ==== @@ -10,6 +10,11 @@ hint.at32_dmaca.0.msize="0x100000" hint.at32_dmaca.0.irq="2" +hint.at32_pm.0.at="at32bus0" +hint.at32_pm.0.maddr="0xFFF00000" +hint.at32_pm.0.msize="0x80" +hint.at32_pm.0.irq="20" + hint.atmel_spi.0.at="at32bus0" hint.atmel_spi.0.maddr="0xFFE00000" hint.atmel_spi.0.msize="0x400" @@ -29,21 +34,29 @@ hint.uart.0.maddr="0xFFE00C00" hint.uart.0.msize="0x400" hint.uart.0.irq="6" +hint.uart.0.clk="pba" +hint.uart.0.clk_index="3" hint.uart.1.at="at32bus0" hint.uart.1.maddr="0xFFE01000" hint.uart.1.msize="0x400" hint.uart.1.irq="7" +#hint.uart.1.clk="pba" +#hint.uart.1.clk_index="4" hint.uart.2.at="at32bus0" hint.uart.2.maddr="0xFFE01400" hint.uart.2.msize="0x400" hint.uart.2.irq="8" +#hint.uart.2.clk="pba" +#hint.uart.2.clk_index="5" hint.uart.3.at="at32bus0" hint.uart.3.maddr="0xFFE01800" hint.uart.3.msize="0x400" hint.uart.3.irq="9" +#hint.uart.3.clk="pba" +#hint.uart.3.clk_index="6" hint.atmel_ssc.0.at="at32bus0" hint.atmel_ssc.0.maddr="0xFFE01C00" @@ -90,11 +103,6 @@ hint.at32_psif.0.msize="0x124" hint.at32_psif.0.irq="18" -hint.at32_pm.0.at="at32bus0" -hint.at32_pm.0.maddr="0xFFF00000" -hint.at32_pm.0.msize="0x80" -hint.at32_pm.0.irq="20" - hint.at32_rtc.0.at="at32bus0" hint.at32_rtc.0.maddr="0xFFF00080" hint.at32_rtc.0.msize="0x30" ==== //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#3 (text+ko) ==== ==== //depot/projects/avr32/src/sys/dev/uart/uart_bus_atmel.c#3 (text+ko) ==== ==== //depot/projects/avr32/src/sys/dev/uart/uart_dev_atmel.c#5 (text+ko) ==== ==== //depot/projects/avr32/src/sys/kern/devclk_if.m#5 (text+ko) ==== @@ -54,3 +54,15 @@ devclk_t _clk; int _index; }; + +# Look for clock name +METHOD const char* lookup_name { + device_t _dev; + device_t _child; +}; + +# Look for clock index +METHOD int lookup_index { + device_t _dev; + device_t _child; +}; ==== //depot/projects/avr32/src/sys/kern/subr_devclk.c#5 (text+ko) ==== @@ -39,19 +39,7 @@ #include "devclk_if.h" -/* TODO: - - Maybe a bit inefficient. - */ - -struct devclk_map { - device_t dev; - char clk_name[32]; - int clk_index; - STAILQ_ENTRY(devclk_map) link; -}; - static devclk_list_t devclks; -static STAILQ_HEAD(, devclk_map) devclk_maps; static devclk_t devclk_find_clock(const char *); @@ -59,86 +47,101 @@ devclk_init(void) { STAILQ_INIT(&devclks); - STAILQ_INIT(&devclk_maps); } uint64_t devclk_get_rate(device_t dev) { - struct devclk_map *map; + device_t parent; devclk_t clk; - /* XXX: We need to think of the mapping here. */ - STAILQ_FOREACH(map, &devclk_maps, link) { - if (map->dev != dev) - continue; - clk = devclk_find_clock(map->clk_name); + const char *name; + int index; + + /* The device parent should know which clock to use. */ + parent = device_get_parent(dev); + if (parent != NULL) { + name = DEVCLK_LOOKUP_NAME(parent, dev); + if (name == NULL) + goto bad; + index = DEVCLK_LOOKUP_INDEX(parent, dev); + clk = devclk_find_clock(name); if (clk == NULL) - continue; - return (DEVCLK_GET_RATE(clk, map->clk_index)); + goto bad; + return (DEVCLK_GET_RATE(clk, index)); } +bad: return (EINVAL); } int devclk_set_rate(device_t dev, uint64_t rate) { - struct devclk_map *map; + device_t parent; devclk_t clk; - /* XXX: We need to think of the mapping here. */ - STAILQ_FOREACH(map, &devclk_maps, link) { - if (map->dev != dev) - continue; - clk = devclk_find_clock(map->clk_name); + const char *name; + int index; + + /* The device parent should know which clock to use. */ + parent = device_get_parent(dev); + if (parent != NULL) { + name = DEVCLK_LOOKUP_NAME(parent, dev); + if (name == NULL) + goto bad; + index = DEVCLK_LOOKUP_INDEX(parent, dev); + clk = devclk_find_clock(name); if (clk == NULL) - continue; - /* XXX: Enable parent too ? */ - DEVCLK_SET_RATE(clk, map->clk_index, rate); + goto bad; + DEVCLK_SET_RATE(clk, index, rate); return (0); } +bad: return (EINVAL); } void devclk_enable(device_t dev) { - struct devclk_map *map; + device_t parent; devclk_t clk; + const char *name; + int index; - /* Enable all clocks this device is mapped to. */ - /* - * XXX: This looks a bit silly right now, and this information should - * perhaps be retrieved from the device somehow, but that makes it - * machine dependant. - */ - STAILQ_FOREACH(map, &devclk_maps, link) { - if (map->dev != dev) - continue; - clk = devclk_find_clock(map->clk_name); - if (clk == NULL) - continue; - /* XXX: Enable parent too ? */ - DEVCLK_ENABLE(clk, map->clk_index); + /* The device parent should know which clock to use. */ + parent = device_get_parent(dev); + if (parent != NULL) { + name = DEVCLK_LOOKUP_NAME(parent, dev); + if (name == NULL) + return; + index = DEVCLK_LOOKUP_INDEX(parent, dev); + clk = devclk_find_clock(name); + if (clk != NULL) + DEVCLK_ENABLE(clk, index); } } void devclk_disable(device_t dev) { - struct devclk_map *map; + device_t parent; devclk_t clk; + const char *name; + int index; - /* Enable all clocks this device is mapped to. */ - STAILQ_FOREACH(map, &devclk_maps, link) { - clk = devclk_find_clock(map->clk_name); - if (clk == NULL) - continue; - /* XXX: Enable parent too ? */ - DEVCLK_DISABLE(clk, map->clk_index); + /* The device parent should know which clock to use. */ + parent = device_get_parent(dev); + if (parent != NULL) { + name = DEVCLK_LOOKUP_NAME(parent, dev); + if (name == NULL) + return; + index = DEVCLK_LOOKUP_INDEX(parent, dev); + clk = devclk_find_clock(name); + if (clk != NULL) + DEVCLK_DISABLE(clk, index); } } /** - * Register clock name handled by device dev, with the parent clock parent + * Register clock to be associated with dev */ void devclk_register_clock(device_t dev, kobj_class_t cls, const char *name, @@ -155,23 +158,6 @@ STAILQ_INSERT_HEAD(&devclks, clk, link); } -/* - * Register a mapping between a clock and a device. - */ -void -devclk_register_map(device_t dev, const char *clk, int index) -{ - struct devclk_map *map; - - map = malloc(sizeof(*clk), M_DEVBUF, M_WAITOK | M_ZERO); - map->dev = dev; - strlcpy(map->clk_name, clk, sizeof(map->clk_name)); - map->clk_index = index; - - /* Insert into map. */ - STAILQ_INSERT_HEAD(&devclk_maps, map, link); -} - static devclk_t devclk_find_clock(const char *name) { ==== //depot/projects/avr32/src/sys/sys/devclk.h#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Mar 19 21:02:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E03EA1065676; Thu, 19 Mar 2009 21:02:05 +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 8BE9E106567A for ; Thu, 19 Mar 2009 21:02:05 +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 77C408FC23 for ; Thu, 19 Mar 2009 21:02:05 +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 n2JL25aO035645 for ; Thu, 19 Mar 2009 21:02:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JL25iE035643 for perforce@freebsd.org; Thu, 19 Mar 2009 21:02:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 19 Mar 2009 21:02:05 GMT Message-Id: <200903192102.n2JL25iE035643@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 159479 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: Thu, 19 Mar 2009 21:02:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=159479 Change 159479 by hselasky@hselasky_laptop001 on 2009/03/19 21:01:59 USB controller + USB core - Workaround for buggy USB hardware not handling new SETUP packet before STATUS stage is complete! Reported by: Andrew Thompson Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#132 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#8 (text+ko) ==== @@ -117,7 +117,7 @@ uint8_t shortpkt; uint8_t auto_data_toggle; uint8_t setup_alt_next; - uint8_t short_frames_ok; + uint8_t last_frame; }; void @@ -1546,10 +1546,12 @@ uint32_t buf_offset; uint32_t average; uint32_t len_old; + uint32_t terminate; uint8_t shortpkt_old; uint8_t precompute; - qtd_altnext = htohc32(temp->sc, EHCI_LINK_TERMINATE); + terminate = htohc32(temp->sc, EHCI_LINK_TERMINATE); + qtd_altnext = terminate; td_alt_next = NULL; buf_offset = 0; shortpkt_old = temp->shortpkt; @@ -1696,14 +1698,17 @@ precompute = 0; /* setup alt next pointer, if any */ - if (temp->short_frames_ok) { + if (temp->last_frame) { + td_alt_next = NULL; + qtd_altnext = terminate; + } else { + /* we use this field internally */ + td_alt_next = td_next; if (temp->setup_alt_next) { - td_alt_next = td_next; qtd_altnext = td_next->qtd_self; + } else { + qtd_altnext = terminate; } - } else { - /* we use this field internally */ - td_alt_next = td_next; } /* restore */ @@ -1746,8 +1751,7 @@ temp.td = NULL; temp.td_next = td; temp.qtd_status = 0; - temp.setup_alt_next = xfer->flags_int.short_frames_ok; - temp.short_frames_ok = xfer->flags_int.short_frames_ok; + temp.last_frame = 0; if (xfer->flags_int.control_xfr) { if (xfer->pipe->toggle_next) { @@ -1780,7 +1784,14 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.shortpkt = temp.len ? 1 : 0; - + /* no "alt_next" for SETUP stage */ + temp.setup_alt_next = 0; + /* check for last frame */ + if (xfer->nframes == 1) { + /* no STATUS stage yet, SETUP is last */ + if (xfer->flags_int.control_act) + temp.last_frame = 1; + } ehci_setup_standard_chain_sub(&temp); } x = 1; @@ -1788,6 +1799,8 @@ x = 0; } + temp.setup_alt_next = xfer->flags_int.short_frames_ok; + while (x != xfer->nframes) { /* DATA0 / DATA1 message */ @@ -1798,7 +1811,16 @@ x++; if (x == xfer->nframes) { - temp.setup_alt_next = 0; + if (xfer->flags_int.control_xfr) { + /* no STATUS stage yet, DATA is last */ + if (xfer->flags_int.control_act) { + temp.last_frame = 1; + temp.setup_alt_next = 0; + } + } else { + temp.last_frame = 1; + temp.setup_alt_next = 0; + } } /* keep previous data toggle and error count */ @@ -1855,6 +1877,8 @@ temp.len = 0; temp.pc = NULL; temp.shortpkt = 0; + temp.last_frame = 1; + temp.setup_alt_next = 0; ehci_setup_standard_chain_sub(&temp); } ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#5 (text+ko) ==== @@ -115,7 +115,7 @@ uint16_t max_frame_size; uint8_t shortpkt; uint8_t setup_alt_next; - uint8_t short_frames_ok; + uint8_t last_frame; }; static struct ohci_hcca * @@ -1379,10 +1379,9 @@ precompute = 0; /* setup alt next pointer, if any */ - if (temp->short_frames_ok) { - if (temp->setup_alt_next) { - td_alt_next = td_next; - } + if (temp->last_frame) { + /* no alternate next */ + td_alt_next = NULL; } else { /* we use this field internally */ td_alt_next = td_next; @@ -1425,8 +1424,7 @@ temp.td = NULL; temp.td_next = td; - temp.setup_alt_next = xfer->flags_int.short_frames_ok; - temp.short_frames_ok = xfer->flags_int.short_frames_ok; + temp.last_frame = 0; methods = xfer->pipe->methods; @@ -1441,7 +1439,14 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.shortpkt = temp.len ? 1 : 0; - + /* no "alt_next" for SETUP stage */ + temp.setup_alt_next = 0; + /* check for last frame */ + if (xfer->nframes == 1) { + /* no STATUS stage yet, SETUP is last */ + if (xfer->flags_int.control_act) + temp.last_frame = 1; + } ohci_setup_standard_chain_sub(&temp); /* @@ -1455,6 +1460,7 @@ x = 0; } temp.td_flags = htole32(OHCI_TD_NOCC | OHCI_TD_NOINTR); + temp.setup_alt_next = xfer->flags_int.short_frames_ok; /* set data toggle */ @@ -1482,7 +1488,16 @@ x++; if (x == xfer->nframes) { - temp.setup_alt_next = 0; + if (xfer->flags_int.control_xfr) { + /* no STATUS stage yet, DATA is last */ + if (xfer->flags_int.control_act) { + temp.last_frame = 1; + temp.setup_alt_next = 0; + } + } else { + temp.last_frame = 1; + temp.setup_alt_next = 0; + } } if (temp.len == 0) { @@ -1523,11 +1538,14 @@ temp.len = 0; temp.pc = NULL; temp.shortpkt = 0; + temp.last_frame = 1; + temp.setup_alt_next = 0; ohci_setup_standard_chain_sub(&temp); } td = temp.td; + /* Ensure that last TD is terminating: */ td->td_next = htole32(OHCI_TD_NEXT_END); td->td_flags &= ~htole32(OHCI_TD_INTR_MASK); td->td_flags |= htole32(OHCI_TD_SET_DI(1)); ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#4 (text+ko) ==== @@ -124,7 +124,7 @@ uint16_t max_frame_size; uint8_t shortpkt; uint8_t setup_alt_next; - uint8_t short_frames_ok; + uint8_t last_frame; }; extern struct usb2_bus_methods uhci_bus_methods; @@ -1253,8 +1253,12 @@ td_self = td->td_self; td_alt_next = td->alt_next; + if ((xfer->flags_int.control_xfr) && + (!xfer->flags_int.control_act) && + (((void *)td) == xfer->td_transfer_last)) + goto skip; /* don't touch DT value on STATUS stage */ + if ((td->td_token ^ td_token) & htole32(UHCI_TD_SET_DT(1))) { - /* * The data toggle is wrong and * we need to switch it ! @@ -1277,6 +1281,8 @@ } } } +skip: + /* update the QH */ qh->qh_e_next = td_self; usb2_pc_cpu_flush(qh->page_cache); @@ -1631,10 +1637,8 @@ precompute = 0; /* setup alt next pointer, if any */ - if (temp->short_frames_ok) { - if (temp->setup_alt_next) { - td_alt_next = td_next; - } + if (temp->last_frame) { + td_alt_next = NULL; } else { /* we use this field internally */ td_alt_next = td_next; @@ -1673,8 +1677,7 @@ temp.td = NULL; temp.td_next = td; - temp.setup_alt_next = xfer->flags_int.short_frames_ok; - temp.short_frames_ok = xfer->flags_int.short_frames_ok; + temp.last_frame = 0; uhci_mem_layout_init(&temp.ml, xfer); @@ -1707,7 +1710,14 @@ temp.len = xfer->frlengths[0]; temp.ml.buf_pc = xfer->frbuffers + 0; temp.shortpkt = temp.len ? 1 : 0; - + /* no "alt_next" for SETUP stage */ + temp.setup_alt_next = 0; + /* check for last frame */ + if (xfer->nframes == 1) { + /* no STATUS stage yet, SETUP is last */ + if (xfer->flags_int.control_act) + temp.last_frame = 1; + } uhci_setup_standard_chain_sub(&temp); } x = 1; @@ -1715,6 +1725,8 @@ x = 0; } + temp.setup_alt_next = xfer->flags_int.short_frames_ok; + while (x != xfer->nframes) { /* DATA0 / DATA1 message */ @@ -1725,7 +1737,16 @@ x++; if (x == xfer->nframes) { - temp.setup_alt_next = 0; + if (xfer->flags_int.control_xfr) { + /* no STATUS stage yet, DATA is last */ + if (xfer->flags_int.control_act) { + temp.last_frame = 1; + temp.setup_alt_next = 0; + } + } else { + temp.last_frame = 1; + temp.setup_alt_next = 0; + } } /* * Keep previous data toggle, @@ -1780,11 +1801,14 @@ temp.len = 0; temp.ml.buf_pc = NULL; temp.shortpkt = 0; + temp.last_frame = 1; + temp.setup_alt_next = 0; uhci_setup_standard_chain_sub(&temp); } td = temp.td; + /* Ensure that last TD is terminating: */ td->td_next = htole32(UHCI_PTR_T); /* set interrupt bit */ ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#132 (text+ko) ==== @@ -1504,6 +1504,15 @@ if (xfer->flags.short_xfer_ok) { xfer->flags_int.short_xfer_ok = 1; + /* + * Due to sometimes buggy device side + * firmware we need to do a STATUS + * stage in case of short control + * transfers in USB host mode, via + * the "alt_next" feature! + */ + if (udev->flags.usb2_mode == USB_MODE_HOST) + xfer->flags_int.short_frames_ok = 1; } } else { From owner-p4-projects@FreeBSD.ORG Thu Mar 19 22:16:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35B4A106568D; Thu, 19 Mar 2009 22:16:26 +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 E5A6F1065680 for ; Thu, 19 Mar 2009 22:16:25 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C86CA8FC20 for ; Thu, 19 Mar 2009 22:16:25 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2JMGPQZ043836 for ; Thu, 19 Mar 2009 22:16:25 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JMGMxF043830 for perforce@freebsd.org; Thu, 19 Mar 2009 22:16:22 GMT (envelope-from peter@wemm.org) Date: Thu, 19 Mar 2009 22:16:22 GMT Message-Id: <200903192216.n2JMGMxF043830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 159486 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: Thu, 19 Mar 2009 22:16:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=159486 Change 159486 by peter@peter_daintree on 2009/03/19 22:16:22 IFC @159484 Affected files ... .. //depot/projects/hammer/Makefile#55 integrate .. //depot/projects/hammer/Makefile.inc1#144 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#65 integrate .. //depot/projects/hammer/UPDATING#130 integrate .. //depot/projects/hammer/bin/cat/Makefile#2 integrate .. //depot/projects/hammer/bin/sh/miscbltin.c#9 integrate .. //depot/projects/hammer/cddl/Makefile.inc#6 integrate .. //depot/projects/hammer/cddl/lib/libzpool/Makefile#6 integrate .. //depot/projects/hammer/cddl/usr.bin/ztest/Makefile#6 integrate .. //depot/projects/hammer/cddl/usr.sbin/zdb/Makefile#6 integrate .. //depot/projects/hammer/contrib/csup/updater.c#5 integrate .. //depot/projects/hammer/contrib/gcc/c-cppbuiltin.c#3 integrate .. //depot/projects/hammer/contrib/gcc/c-decl.c#13 integrate .. //depot/projects/hammer/contrib/gcc/c-opts.c#5 integrate .. //depot/projects/hammer/contrib/gcc/c-tree.h#7 integrate .. //depot/projects/hammer/contrib/gcc/c-typeck.c#11 integrate .. //depot/projects/hammer/contrib/gcc/doc/extend.texi#10 integrate .. //depot/projects/hammer/contrib/libpcap/savefile.c#7 integrate .. //depot/projects/hammer/contrib/top/install#2 delete .. //depot/projects/hammer/contrib/top/install-sh#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wme.h#2 integrate .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c#2 integrate .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#94 integrate .. //depot/projects/hammer/etc/netstart#10 integrate .. //depot/projects/hammer/etc/network.subr#27 integrate .. //depot/projects/hammer/etc/rc.d/swap1#10 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#86 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/Makefile.inc#5 integrate .. //depot/projects/hammer/include/arpa/inet.h#7 integrate .. //depot/projects/hammer/include/ctype.h#7 integrate .. //depot/projects/hammer/include/db.h#2 integrate .. //depot/projects/hammer/include/grp.h#5 integrate .. //depot/projects/hammer/include/ndbm.h#2 integrate .. //depot/projects/hammer/include/netdb.h#19 integrate .. //depot/projects/hammer/include/pthread.h#16 integrate .. //depot/projects/hammer/include/pwd.h#5 integrate .. //depot/projects/hammer/include/setjmp.h#3 integrate .. //depot/projects/hammer/include/signal.h#8 integrate .. //depot/projects/hammer/include/stdio.h#17 integrate .. //depot/projects/hammer/include/stdlib.h#19 integrate .. //depot/projects/hammer/include/string.h#13 integrate .. //depot/projects/hammer/include/unistd.h#29 integrate .. //depot/projects/hammer/lib/Makefile#76 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#52 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#19 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#39 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_copy_stat.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_stat.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_platform.h#24 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#28 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#26 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_disk.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_disk_entry_from_file.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_disk_private.h#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_disk_set_standard_lookup.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_open_filename.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_private.h#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_all.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_bzip2.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_compress.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_program.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_ar.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#25 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_empty.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_mtree.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#46 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#23 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.c#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.h#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_string_sprintf.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.c#19 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#20 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#22 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_private.h#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_program.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ar.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio_newc.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_mtree.c#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#38 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#22 integrate .. //depot/projects/hammer/lib/libarchive/config_freebsd.h#12 integrate .. //depot/projects/hammer/lib/libarchive/test/Makefile#18 integrate .. //depot/projects/hammer/lib/libarchive/test/main.c#17 integrate .. //depot/projects/hammer/lib/libarchive/test/read_open_memory.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test.h#10 integrate .. //depot/projects/hammer/lib/libarchive/test/test_acl_freebsd.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_bzip2.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_gzip.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_compat_zip.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_extattr_freebsd.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_fuzz.c#3 integrate .. //depot/projects/hammer/lib/libarchive/test/test_pax_filename_encoding.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_compress_program.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_disk.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_extract.c#7 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_file_nonexistent.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_Z.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_bin_gz.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_gtar_gz.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_iso_gz.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_isojoliet_bz2.c#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu#1 branch .. //depot/projects/hammer/lib/libarchive/test/test_read_format_pax_bz2.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tar.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tbz.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_tgz.c#4 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_format_zip.c#8 integrate .. //depot/projects/hammer/lib/libarchive/test/test_read_pax_truncated.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_compress_program.c#5 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk.c#10 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_disk_failures.c#2 integrate .. //depot/projects/hammer/lib/libbluetooth/Makefile#7 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.3#8 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.c#3 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.h#4 integrate .. //depot/projects/hammer/lib/libbluetooth/dev.c#1 branch .. //depot/projects/hammer/lib/libbluetooth/hci.c#1 branch .. //depot/projects/hammer/lib/libc/Makefile#32 integrate .. //depot/projects/hammer/lib/libc/nls/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libc/nls/ca_ES.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/de_DE.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/el_GR.ISO8859-7.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/es_ES.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/fi_FI.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/fr_FR.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/hu_HU.ISO8859-2.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/it_IT.ISO8859-15.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/mn_MN.UTF-8.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/nl_NL.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/no_NO.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/pt_BR.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/sk_SK.ISO8859-2.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/sv_SE.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/softfloat/fpgetmask.c#2 integrate .. //depot/projects/hammer/lib/libc/softfloat/fpgetround.c#2 integrate .. //depot/projects/hammer/lib/libc/softfloat/fpgetsticky.c#2 integrate .. //depot/projects/hammer/lib/libc/softfloat/fpsetmask.c#2 integrate .. //depot/projects/hammer/lib/libc/softfloat/fpsetround.c#2 integrate .. //depot/projects/hammer/lib/libc/softfloat/fpsetsticky.c#2 integrate .. //depot/projects/hammer/lib/libelf/Makefile#2 integrate .. //depot/projects/hammer/lib/libthr/Makefile#30 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_fork.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#16 integrate .. //depot/projects/hammer/lib/libusb/Makefile#1 branch .. //depot/projects/hammer/lib/libusb/libusb.3#1 branch .. //depot/projects/hammer/lib/libusb/libusb20.c#1 branch .. //depot/projects/hammer/lib/libusb/libusb20.h#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_compat01.c#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_compat10.c#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_compat10.h#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_desc.c#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_desc.h#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_int.h#1 branch .. //depot/projects/hammer/lib/libusb/libusb20_ugen20.c#1 branch .. //depot/projects/hammer/lib/libusb/usb.h#1 branch .. //depot/projects/hammer/lib/libusb20/Makefile#2 delete .. //depot/projects/hammer/lib/libusb20/libusb20.3#4 delete .. //depot/projects/hammer/lib/libusb20/libusb20.c#4 delete .. //depot/projects/hammer/lib/libusb20/libusb20.h#4 delete .. //depot/projects/hammer/lib/libusb20/libusb20_compat01.c#4 delete .. //depot/projects/hammer/lib/libusb20/libusb20_compat01.h#3 delete .. //depot/projects/hammer/lib/libusb20/libusb20_compat10.c#2 delete .. //depot/projects/hammer/lib/libusb20/libusb20_compat10.h#2 delete .. //depot/projects/hammer/lib/libusb20/libusb20_desc.c#4 delete .. //depot/projects/hammer/lib/libusb20/libusb20_desc.h#3 delete .. //depot/projects/hammer/lib/libusb20/libusb20_int.h#3 delete .. //depot/projects/hammer/lib/libusb20/libusb20_ugen20.c#4 delete .. //depot/projects/hammer/lib/msun/src/math.h#40 integrate .. //depot/projects/hammer/lib/msun/src/math_private.h#12 integrate .. //depot/projects/hammer/lib/msun/src/s_cimag.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_cimagf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_cimagl.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/map_object.c#12 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#45 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.h#13 integrate .. //depot/projects/hammer/release/amd64/boot_crunch.conf#11 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#53 integrate .. //depot/projects/hammer/release/i386/boot_crunch.conf#12 integrate .. //depot/projects/hammer/release/ia64/boot_crunch.conf#15 integrate .. //depot/projects/hammer/release/picobsd/build/picobsd#10 integrate .. //depot/projects/hammer/release/picobsd/tinyware/simple_httpd/Makefile#4 integrate .. //depot/projects/hammer/release/picobsd/tinyware/simple_httpd/simple_httpd.c#5 integrate .. //depot/projects/hammer/release/powerpc/boot_crunch.conf#8 integrate .. //depot/projects/hammer/release/sparc64/boot_crunch.conf#11 integrate .. //depot/projects/hammer/release/sun4v/boot_crunch.conf#6 integrate .. //depot/projects/hammer/sbin/devd/devd.conf.5#6 integrate .. //depot/projects/hammer/sbin/fdisk_pc98/fdisk.c#14 integrate .. //depot/projects/hammer/sbin/ifconfig/ifclone.c#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#43 integrate .. //depot/projects/hammer/sbin/ifconfig/ifgroup.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#71 integrate .. //depot/projects/hammer/sbin/recoverdisk/recoverdisk.1#2 integrate .. //depot/projects/hammer/sbin/recoverdisk/recoverdisk.c#3 integrate .. //depot/projects/hammer/share/man/man4/Makefile#117 integrate .. //depot/projects/hammer/share/man/man4/altq.4#21 integrate .. //depot/projects/hammer/share/man/man4/amdtemp.4#1 branch .. //depot/projects/hammer/share/man/man4/igmp.4#1 branch .. //depot/projects/hammer/share/man/man4/ip.4#23 integrate .. //depot/projects/hammer/share/man/man4/k8temp.4#2 delete .. //depot/projects/hammer/share/man/man4/lo.4#2 integrate .. //depot/projects/hammer/share/man/man4/multicast.4#7 integrate .. //depot/projects/hammer/share/man/man4/pccbb.4#9 integrate .. //depot/projects/hammer/share/man/man4/txp.4#11 integrate .. //depot/projects/hammer/share/man/man4/usb.4#13 integrate .. //depot/projects/hammer/share/man/man4/usb2_bluetooth.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_controller.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_ethernet.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_image.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_input.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_misc.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_ndis.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_quirk.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_serial.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_sound.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_storage.4#2 delete .. //depot/projects/hammer/share/man/man4/usb2_wlan.4#2 delete .. //depot/projects/hammer/share/man/man4/uscanner.4#22 delete .. //depot/projects/hammer/share/man/man5/devfs.rules.5#6 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#96 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#19 integrate .. //depot/projects/hammer/share/man/man8/diskless.8#15 integrate .. //depot/projects/hammer/share/man/man8/nanobsd.8#4 integrate .. //depot/projects/hammer/share/man/man9/VOP_VPTOCNP.9#2 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#19 integrate .. //depot/projects/hammer/share/misc/iso3166#10 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#19 integrate .. //depot/projects/hammer/share/zoneinfo/northamerica#17 integrate .. //depot/projects/hammer/sys/amd64/acpica/Makefile#1 branch .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#25 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_switch.S#1 branch .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#17 integrate .. //depot/projects/hammer/sys/amd64/acpica/genwakecode.sh#1 branch .. //depot/projects/hammer/sys/amd64/acpica/genwakedata.sh#1 branch .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#51 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#39 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#57 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#174 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#137 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#187 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#108 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#120 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#118 integrate .. //depot/projects/hammer/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/hammer/sys/amd64/include/apicvar.h#50 integrate .. //depot/projects/hammer/sys/amd64/include/elf.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#31 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#34 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#38 integrate .. //depot/projects/hammer/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/hammer/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/hammer/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/hammer/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/hammer/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/hammer/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#28 integrate .. //depot/projects/hammer/sys/arm/arm/elf_machdep.c#11 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA#17 integrate .. //depot/projects/hammer/sys/arm/conf/CAMBRIA#3 integrate .. //depot/projects/hammer/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/hammer/sys/arm/conf/HL200#9 integrate .. //depot/projects/hammer/sys/arm/conf/KB920X#14 integrate .. //depot/projects/hammer/sys/arm/include/elf.h#7 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/avila_machdep.c#12 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/files.ixp425#7 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/if_npe.c#10 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425.c#10 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_pci.c#6 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425reg.h#5 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#46 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/Makefile#12 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot1.S#8 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#21 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bioscd.c#8 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#17 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/devicename.c#8 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#15 integrate .. //depot/projects/hammer/sys/boot/i386/loader/Makefile#19 integrate .. //depot/projects/hammer/sys/boot/i386/loader/main.c#18 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#12 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/biosdisk.c#13 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#15 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/main.c#12 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#24 integrate .. //depot/projects/hammer/sys/compat/linux/linux_emul.h#5 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.h#6 integrate .. //depot/projects/hammer/sys/compat/ndis/hal_var.h#9 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#46 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#14 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#29 integrate .. //depot/projects/hammer/sys/compat/ndis/ntoskrnl_var.h#29 integrate .. //depot/projects/hammer/sys/compat/ndis/pe_var.h#12 integrate .. //depot/projects/hammer/sys/compat/ndis/resource_var.h#4 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_hal.c#20 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#50 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#51 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_pe.c#11 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_usbd.c#6 integrate .. //depot/projects/hammer/sys/compat/ndis/usbd_var.h#3 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#24 integrate .. //depot/projects/hammer/sys/conf/NOTES#158 integrate .. //depot/projects/hammer/sys/conf/files#196 integrate .. //depot/projects/hammer/sys/conf/files.amd64#112 integrate .. //depot/projects/hammer/sys/conf/files.i386#103 integrate .. //depot/projects/hammer/sys/conf/files.pc98#76 integrate .. //depot/projects/hammer/sys/conf/options#140 integrate .. //depot/projects/hammer/sys/conf/options.amd64#49 integrate .. //depot/projects/hammer/sys/conf/options.arm#18 integrate .. //depot/projects/hammer/sys/ddb/db_expr.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#88 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#43 integrate .. //depot/projects/hammer/sys/dev/agp/agp.c#6 integrate .. //depot/projects/hammer/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/hammer/sys/dev/agp/agp_i810.c#8 integrate .. //depot/projects/hammer/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/hammer/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/hammer/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#18 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/hammer/sys/dev/ata/ata-card.c#29 integrate .. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#17 integrate .. //depot/projects/hammer/sys/dev/ata/ata-isa.c#18 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#52 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/hammer/sys/dev/ath/if_ath.c#68 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#22 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#39 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#17 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#31 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#24 integrate .. //depot/projects/hammer/sys/dev/cfi/cfi_core.c#3 integrate .. //depot/projects/hammer/sys/dev/cfi/cfi_dev.c#3 integrate .. //depot/projects/hammer/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/hammer/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#12 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_common.h#12 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_cpl.h#9 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#14 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_xgmac.c#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#23 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_ioctl.h#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#32 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_multiq.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#27 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/hammer/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/hammer/sys/dev/dc/if_dc.c#18 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#19 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#21 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.c#11 integrate .. //depot/projects/hammer/sys/dev/drm/drm_irq.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_linux_list.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_lock.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#11 integrate .. //depot/projects/hammer/sys/dev/drm/drm_scatter.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_vm.c#5 integrate .. //depot/projects/hammer/sys/dev/drm/i915_dma.c#12 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.h#8 integrate .. //depot/projects/hammer/sys/dev/drm/i915_irq.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/i915_reg.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/i915_suspend.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/mach64_drv.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.c#13 integrate .. //depot/projects/hammer/sys/dev/drm/mga_irq.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.c#13 integrate .. //depot/projects/hammer/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/hammer/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#19 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#14 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.c#13 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#16 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#11 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#16 integrate .. //depot/projects/hammer/sys/dev/drm/savage_drv.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/sis_drv.c#10 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx_drv.c#12 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#38 integrate .. //depot/projects/hammer/sys/dev/exca/exca.c#19 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#20 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#45 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#40 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#71 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#16 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#70 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pccard.c#15 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis_usb.c#7 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#28 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#25 integrate .. //depot/projects/hammer/sys/dev/k8temp/k8temp.c#7 delete .. //depot/projects/hammer/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/md/md.c#70 integrate .. //depot/projects/hammer/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/hammer/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/hammer/sys/dev/mmc/mmc.c#8 integrate .. //depot/projects/hammer/sys/dev/pccard/card_if.m#13 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard_cis.c#21 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#54 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#53 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#71 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#26 integrate .. //depot/projects/hammer/sys/dev/pci/pcib_private.h#11 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpbb.c#9 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#68 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/smbus/smbus.c#6 integrate .. //depot/projects/hammer/sys/dev/smbus/smbus.h#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#26 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10kx.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#28 integrate .. //depot/projects/hammer/sys/dev/syscons/scterm-teken.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#51 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.h#18 integrate .. //depot/projects/hammer/sys/dev/syscons/teken/teken.c#3 integrate .. //depot/projects/hammer/sys/dev/syscons/teken/teken.h#3 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#31 integrate .. //depot/projects/hammer/sys/dev/txp/if_txpreg.h#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/image/uscanner.c#2 delete .. //depot/projects/hammer/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#117 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#21 integrate .. //depot/projects/hammer/sys/dev/xen/balloon/balloon.c#2 integrate .. //depot/projects/hammer/sys/dev/xen/blkfront/blkfront.c#5 integrate .. //depot/projects/hammer/sys/dev/xen/console/console.c#5 integrate .. //depot/projects/hammer/sys/dev/xen/console/xencons_ring.c#3 integrate .. //depot/projects/hammer/sys/dev/xen/netfront/netfront.c#7 integrate .. //depot/projects/hammer/sys/dev/xen/xenpci/evtchn.c#1 branch .. //depot/projects/hammer/sys/dev/xen/xenpci/machine_reboot.c#1 branch .. //depot/projects/hammer/sys/dev/xen/xenpci/xenpci.c#1 branch .. //depot/projects/hammer/sys/dev/xen/xenpci/xenpcivar.h#1 branch .. //depot/projects/hammer/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#65 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#37 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#36 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.c#20 integrate .. //depot/projects/hammer/sys/geom/geom_redboot.c#1 branch .. //depot/projects/hammer/sys/geom/part/g_part.c#20 integrate .. //depot/projects/hammer/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/hammer/sys/geom/part/g_part_pc98.c#10 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_fs.h#4 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#5 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#79 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#111 integrate .. //depot/projects/hammer/sys/i386/conf/XBOX#10 integrate .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#18 integrate .. //depot/projects/hammer/sys/i386/i386/i686_mem.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/in_cksum.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/k6_mem.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#80 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#118 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#64 integrate .. //depot/projects/hammer/sys/i386/include/elf.h#9 integrate .. //depot/projects/hammer/sys/i386/include/xen/xenpmap.h#3 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#39 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#25 integrate .. //depot/projects/hammer/sys/ia64/include/elf.h#8 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#52 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#56 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#88 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#55 integrate .. //depot/projects/hammer/sys/kern/kern_poll.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_sx.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#39 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#113 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#34 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#103 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#66 integrate .. //depot/projects/hammer/sys/kern/subr_lock.c#15 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#22 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#40 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#81 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#42 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#42 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#24 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#61 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#94 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#38 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#58 integrate .. //depot/projects/hammer/sys/kern/vfs_extattr.c#7 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#42 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#64 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#33 integrate .. //depot/projects/hammer/sys/legacy/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/hammer/sys/legacy/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/hammer/sys/legacy/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/hammer/sys/mips/include/elf.h#4 integrate .. //depot/projects/hammer/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/hammer/sys/modules/Makefile#139 integrate .. //depot/projects/hammer/sys/modules/amdtemp/Makefile#1 branch .. //depot/projects/hammer/sys/modules/drm/radeon/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/if_ndis/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/ip6_mroute_mod/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ip_mroute_mod/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/k8temp/Makefile#2 delete .. //depot/projects/hammer/sys/modules/ndis/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/netgraph/Makefile#25 integrate .. //depot/projects/hammer/sys/modules/usb/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/usb/uscanner/Makefile#2 delete .. //depot/projects/hammer/sys/net/bpf.c#68 integrate .. //depot/projects/hammer/sys/net/bpf_zerocopy.c#5 integrate .. //depot/projects/hammer/sys/net/if.c#87 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#47 integrate .. //depot/projects/hammer/sys/net/if_gif.h#13 integrate .. //depot/projects/hammer/sys/net/if_loop.c#42 integrate .. //depot/projects/hammer/sys/net/if_tap.c#38 integrate .. //depot/projects/hammer/sys/net/if_var.h#55 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#23 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#48 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#32 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#44 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#14 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_tdma.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#41 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#55 integrate .. //depot/projects/hammer/sys/netinet/igmp.c#21 integrate .. //depot/projects/hammer/sys/netinet/igmp.h#7 integrate .. //depot/projects/hammer/sys/netinet/igmp_var.h#5 integrate .. //depot/projects/hammer/sys/netinet/in.c#37 integrate .. //depot/projects/hammer/sys/netinet/in.h#32 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#25 integrate .. //depot/projects/hammer/sys/netinet/in_mcast.c#11 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#68 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#49 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#29 integrate .. //depot/projects/hammer/sys/netinet/in_var.h#20 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#80 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#46 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.h#11 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#34 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#62 integrate .. //depot/projects/hammer/sys/netinet/sctp.h#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#23 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#27 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#30 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#18 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#22 integrate .. //depot/projects/hammer/sys/netinet/sctp_var.h#18 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#34 integrate .. //depot/projects/hammer/sys/netinet/sctputil.h#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#95 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#92 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#38 integrate .. //depot/projects/hammer/sys/netinet/tcp_timewait.c#11 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#65 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#66 integrate .. //depot/projects/hammer/sys/netinet/vinet.h#5 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#39 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#21 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#30 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#45 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#29 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.h#8 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#28 integrate .. //depot/projects/hammer/sys/netipsec/key.c#28 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#24 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#69 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/hammer/sys/pc98/cbus/scterm-sck.c#5 integrate .. //depot/projects/hammer/sys/pc98/cbus/syscons_cbus.c#7 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#61 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#71 integrate .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#25 integrate .. //depot/projects/hammer/sys/pci/intpm.c#16 integrate .. //depot/projects/hammer/sys/powerpc/aim/mmu_oea.c#8 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#47 integrate .. //depot/projects/hammer/sys/powerpc/include/elf.h#6 integrate .. //depot/projects/hammer/sys/powerpc/include/spr.h#11 integrate .. //depot/projects/hammer/sys/powerpc/mpc85xx/mpc85xx.c#3 integrate .. //depot/projects/hammer/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate .. //depot/projects/hammer/sys/powerpc/mpc85xx/ocpbus.c#6 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#19 integrate .. //depot/projects/hammer/sys/security/audit/audit.c#22 integrate .. //depot/projects/hammer/sys/security/audit/audit.h#15 integrate .. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#18 integrate .. //depot/projects/hammer/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/hammer/sys/security/mac/mac_audit.c#5 integrate .. //depot/projects/hammer/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.c#4 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.h#17 integrate .. //depot/projects/hammer/sys/security/mac/mac_inet.c#13 integrate .. //depot/projects/hammer/sys/security/mac/mac_inet6.c#4 integrate .. //depot/projects/hammer/sys/security/mac/mac_internal.h#17 integrate .. //depot/projects/hammer/sys/security/mac/mac_net.c#18 integrate .. //depot/projects/hammer/sys/security/mac/mac_pipe.c#11 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#19 integrate .. //depot/projects/hammer/sys/security/mac/mac_posix_sem.c#10 integrate .. //depot/projects/hammer/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/hammer/sys/security/mac/mac_priv.c#3 integrate .. //depot/projects/hammer/sys/security/mac/mac_process.c#19 integrate .. //depot/projects/hammer/sys/security/mac/mac_socket.c#9 integrate .. //depot/projects/hammer/sys/security/mac/mac_syscalls.c#10 integrate .. //depot/projects/hammer/sys/security/mac/mac_system.c#10 integrate .. //depot/projects/hammer/sys/security/mac/mac_sysv_msg.c#7 integrate .. //depot/projects/hammer/sys/security/mac/mac_sysv_sem.c#7 integrate .. //depot/projects/hammer/sys/security/mac/mac_sysv_shm.c#6 integrate .. //depot/projects/hammer/sys/security/mac/mac_vfs.c#18 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#54 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#37 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/ugidfw_internal.h#3 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/ugidfw_vnode.c#3 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#40 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#53 integrate .. //depot/projects/hammer/sys/security/mac_portacl/mac_portacl.c#16 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#36 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#55 integrate .. //depot/projects/hammer/sys/sparc64/central/central.c#12 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#70 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#22 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc.c#14 integrate .. //depot/projects/hammer/sys/sparc64/include/elf.h#8 integrate .. //depot/projects/hammer/sys/sparc64/include/trap.h#6 integrate .. //depot/projects/hammer/sys/sparc64/isa/isa.c#18 integrate .. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.c#9 integrate .. //depot/projects/hammer/sys/sparc64/pci/apb.c#14 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib.c#11 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#22 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#45 integrate .. //depot/projects/hammer/sys/sparc64/pci/psychovar.h#15 integrate .. //depot/projects/hammer/sys/sparc64/pci/schizo.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sbus/dma_sbus.c#7 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#33 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbusvar.h#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_disasm.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom.c#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#22 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/jbusppm.c#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#57 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#28 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/nexus.c#16 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/rtc.c#8 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/sc_machdep.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/schppm.c#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#30 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/upa.c#8 integrate .. //depot/projects/hammer/sys/sun4v/conf/GENERIC#15 integrate .. //depot/projects/hammer/sys/sun4v/include/elf.h#3 integrate .. //depot/projects/hammer/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/trap.c#7 integrate .. //depot/projects/hammer/sys/sys/_pthreadtypes.h#2 integrate .. //depot/projects/hammer/sys/sys/aio.h#6 integrate .. //depot/projects/hammer/sys/sys/buf.h#38 integrate .. //depot/projects/hammer/sys/sys/diskpc98.h#8 integrate .. //depot/projects/hammer/sys/sys/elf_common.h#13 integrate .. //depot/projects/hammer/sys/sys/imgact.h#13 integrate .. //depot/projects/hammer/sys/sys/imgact_elf.h#9 integrate .. //depot/projects/hammer/sys/sys/ktrace.h#10 integrate .. //depot/projects/hammer/sys/sys/lock_profile.h#8 integrate .. //depot/projects/hammer/sys/sys/memrange.h#4 integrate .. //depot/projects/hammer/sys/sys/mount.h#63 integrate .. //depot/projects/hammer/sys/sys/param.h#127 integrate .. //depot/projects/hammer/sys/sys/pipe.h#11 integrate .. //depot/projects/hammer/sys/sys/proc.h#128 integrate .. //depot/projects/hammer/sys/sys/sem.h#7 integrate .. //depot/projects/hammer/sys/sys/shm.h#10 integrate .. //depot/projects/hammer/sys/sys/smp.h#17 integrate .. //depot/projects/hammer/sys/sys/stat.h#16 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#48 integrate .. //depot/projects/hammer/sys/sys/syslog.h#6 integrate .. //depot/projects/hammer/sys/sys/systm.h#60 integrate .. //depot/projects/hammer/sys/sys/termios.h#8 integrate .. //depot/projects/hammer/sys/sys/time.h#17 integrate .. //depot/projects/hammer/sys/sys/uio.h#14 integrate .. //depot/projects/hammer/sys/sys/vimage.h#6 integrate .. //depot/projects/hammer/sys/sys/vnode.h#89 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#59 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#83 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#55 integrate .. //depot/projects/hammer/sys/ufs/ufs/inode.h#16 integrate .. //depot/projects/hammer/sys/vm/vm_init.c#15 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#50 integrate .. //depot/projects/hammer/sys/xen/evtchn/evtchn.c#5 integrate .. //depot/projects/hammer/sys/xen/evtchn/evtchn_dev.c#3 integrate .. //depot/projects/hammer/sys/xen/features.c#3 integrate .. //depot/projects/hammer/sys/xen/features.h#1 branch .. //depot/projects/hammer/sys/xen/gnttab.c#5 integrate .. //depot/projects/hammer/sys/xen/gnttab.h#5 integrate .. //depot/projects/hammer/sys/xen/hypervisor.h#2 integrate .. //depot/projects/hammer/sys/xen/interface/arch-x86/xen.h#3 integrate .. //depot/projects/hammer/sys/xen/interface/hvm/params.h#3 integrate .. //depot/projects/hammer/sys/xen/reboot.c#1 branch .. //depot/projects/hammer/sys/xen/xen_intr.h#2 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_probe.c#4 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_xs.c#5 integrate .. //depot/projects/hammer/tools/regression/include/tgmath/Makefile#4 integrate .. //depot/projects/hammer/tools/regression/mac/mac_portacl/LICENSE#1 branch .. //depot/projects/hammer/tools/regression/mac/mac_portacl/misc.sh#1 branch .. //depot/projects/hammer/tools/regression/mac/mac_portacl/nobody.t#1 branch .. //depot/projects/hammer/tools/regression/mac/mac_portacl/root.t#1 branch .. //depot/projects/hammer/tools/regression/sockets/unix_gc/unix_gc.c#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-G.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-S.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-_g.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pgrep-_s.t#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pkill-G.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/pkill/pkill-_g.t#1 branch .. //depot/projects/hammer/tools/tools/ath/Makefile#9 integrate .. //depot/projects/hammer/tools/tools/ath/athdecode/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athdecode/main.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athpoke/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athpoke/athpoke.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athregs/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs.h#2 delete .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5210.c#2 delete .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5211.c#2 delete .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5212.c#2 delete .. //depot/projects/hammer/tools/tools/ath/athregs/dumpregs_5416.c#3 delete .. //depot/projects/hammer/tools/tools/ath/common/dumpregs.h#1 branch .. //depot/projects/hammer/tools/tools/ath/common/dumpregs_5210.c#1 branch .. //depot/projects/hammer/tools/tools/ath/common/dumpregs_5211.c#1 branch .. //depot/projects/hammer/tools/tools/ath/common/dumpregs_5212.c#1 branch .. //depot/projects/hammer/tools/tools/ath/common/dumpregs_5416.c#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/rescue/AMD64#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/rescue/I386#2 integrate .. //depot/projects/hammer/tools/tools/netrate/tcpp/Makefile#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/README#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/tcpp.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/tcpp.h#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/tcpp_client.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/tcpp_server.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/tcpp/tcpp_util.c#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#69 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.1#13 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#27 integrate .. //depot/projects/hammer/usr.bin/ktrace/ktrace.1#6 integrate .. //depot/projects/hammer/usr.bin/ktrace/ktrace.h#3 integrate .. //depot/projects/hammer/usr.bin/ktrace/subr.c#5 integrate .. //depot/projects/hammer/usr.bin/ministat/ministat.c#4 integrate .. //depot/projects/hammer/usr.bin/ncal/ncal.1#8 integrate .. //depot/projects/hammer/usr.bin/ncal/ncal.c#5 integrate .. //depot/projects/hammer/usr.bin/netstat/inet.c#31 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#31 integrate .. //depot/projects/hammer/usr.bin/netstat/mroute.c#9 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#25 integrate .. //depot/projects/hammer/usr.bin/sockstat/sockstat.c#14 integrate .. //depot/projects/hammer/usr.bin/systat/netstat.c#8 integrate .. //depot/projects/hammer/usr.bin/systat/vmstat.c#12 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#30 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#41 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#26 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#18 integrate .. //depot/projects/hammer/usr.bin/tar/cmdline.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/getdate.c#1 branch .. //depot/projects/hammer/usr.bin/tar/getdate.y#8 delete .. //depot/projects/hammer/usr.bin/tar/matching.c#15 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#29 integrate .. //depot/projects/hammer/usr.bin/tar/siginfo.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/tar/test/main.c#5 integrate .. //depot/projects/hammer/usr.bin/tar/test/test.h#4 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_0.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_basic.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_copy.c#3 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_getdate.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_option_T.c#3 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_option_s.c#1 branch .. //depot/projects/hammer/usr.bin/tar/test/test_patterns.c#3 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_patterns_2.tar.uu#1 branch .. //depot/projects/hammer/usr.bin/tar/test/test_patterns_2.tgz.uu#2 delete .. //depot/projects/hammer/usr.bin/tar/test/test_patterns_3.tar.uu#1 branch .. //depot/projects/hammer/usr.bin/tar/test/test_patterns_3.tgz.uu#2 delete .. //depot/projects/hammer/usr.bin/tar/test/test_patterns_4.tar.uu#1 branch .. //depot/projects/hammer/usr.bin/tar/test/test_strip_components.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_symlink_dir.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/test/test_version.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/tree.c#8 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#19 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#38 integrate .. //depot/projects/hammer/usr.bin/top/machine.c#28 integrate .. //depot/projects/hammer/usr.sbin/cxgbtool/cxgbtool.c#4 integrate .. //depot/projects/hammer/usr.sbin/cxgbtool/version.h#3 integrate .. //depot/projects/hammer/usr.sbin/eeprom/ofw_options.c#5 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.8#11 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.c#13 integrate .. //depot/projects/hammer/usr.sbin/ifmcstat/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/ifmcstat/ifmcstat.8#7 integrate .. //depot/projects/hammer/usr.sbin/ifmcstat/ifmcstat.c#9 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.8#12 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#18 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#32 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dispatch.c#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#53 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/modules.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#20 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#35 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/user.c#6 integrate .. //depot/projects/hammer/usr.sbin/usbconfig/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/usbconfig/usbconfig.c#4 integrate .. //depot/projects/hammer/usr.sbin/wpa/Makefile.inc#3 integrate Differences ... ==== //depot/projects/hammer/Makefile#55 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.356 2008/12/27 15:07:51 bz Exp $ +# $FreeBSD: src/Makefile,v 1.357 2009/03/13 07:23:58 imp Exp $ # # The user-driven targets are: # @@ -88,7 +88,7 @@ obj objlink regress rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ - build32 distribute32 install32 + build32 distribute32 install32 xdev xdev-build xdev-install TGTS+= ${SUBDIR_TARGETS} BITGTS= files includes ==== //depot/projects/hammer/Makefile.inc1#144 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.617 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.623 2009/03/19 00:44:22 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -232,7 +232,7 @@ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ - -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ + -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF # build-tools stage @@ -291,7 +291,7 @@ SHLIBDIR=/usr/lib32 LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ - -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \ + -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \ -DWITHOUT_HTML -DNO_CTF DESTDIR=${LIB32TMP} LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS .endif @@ -344,30 +344,13 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/sys usr/lib \ - usr/libexec usr/sbin usr/share/dict \ - usr/share/groff_font/devX100 \ - usr/share/groff_font/devX100-12 \ - usr/share/groff_font/devX75 \ - usr/share/groff_font/devX75-12 \ - usr/share/groff_font/devascii \ - usr/share/groff_font/devcp1047 \ - usr/share/groff_font/devdvi \ - usr/share/groff_font/devhtml \ - usr/share/groff_font/devkoi8-r \ - usr/share/groff_font/devlatin1 \ - usr/share/groff_font/devlbp \ - usr/share/groff_font/devlj4 \ - usr/share/groff_font/devps \ - usr/share/groff_font/devutf8 \ - usr/share/tmac/mdoc usr/share/tmac/mm - mkdir -p ${WORLDTMP}/legacy/${_dir} -.endfor -.for _dir in \ - lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ - usr/libexec usr/sbin usr/share/misc + lib usr legacy/usr mkdir -p ${WORLDTMP}/${_dir} .endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${WORLDTMP}/legacy/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${WORLDTMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} @@ -429,7 +412,7 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ - -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE libraries + -DWITHOUT_MAN -DWITHOUT_PROFILE libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -448,10 +431,9 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 5.1: building 32 bit shim libraries" @echo "--------------------------------------------------------------" -.for _dir in \ - usr/include usr/lib32 usr/share/misc - mkdir -p ${LIB32TMP}/${_dir} -.endfor + mkdir -p ${LIB32TMP}/usr/lib32 + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${LIB32TMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null mkdir -p ${WORLDTMP} @@ -620,8 +602,12 @@ # # Required install tools to be saved in a scratch dir for safety. # +.if ${MK_INFO} != "no" +_install-info= install-info +.endif + ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ + date echo egrep find grep ${_install-info} \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic @@ -1039,6 +1025,7 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ + usr.bin/ar \ usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ @@ -1337,3 +1324,92 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 20 05:29:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 186AB1065673; Fri, 20 Mar 2009 05:29:54 +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 C4845106564A for ; Fri, 20 Mar 2009 05:29:53 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from agogare.doit.wisc.edu (agogare.doit.wisc.edu [144.92.197.211]) by mx1.freebsd.org (Postfix) with ESMTP id 9850E8FC16 for ; Fri, 20 Mar 2009 05:29:53 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=ISO-8859-1; format=flowed Received: from avs-daemon.smtpauth2.wiscmail.wisc.edu by smtpauth2.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 6.3-7.04 (built Sep 26 2008; 32bit)) id <0KGS00B00F5SMW00@smtpauth2.wiscmail.wisc.edu> for perforce@freebsd.org; Thu, 19 Mar 2009 23:29:52 -0500 (CDT) Received: from comporellon.tachypleus.net ([76.201.152.222]) by smtpauth2.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 6.3-7.04 (built Sep 26 2008; 32bit)) with ESMTPSA id <0KGS009W3F5RJU00@smtpauth2.wiscmail.wisc.edu>; Thu, 19 Mar 2009 23:29:52 -0500 (CDT) Date: Thu, 19 Mar 2009 23:29:51 -0500 From: Nathan Whitehorn In-reply-to: <20090313084342.GT31961@hoeg.nl> To: Ed Schouten Message-id: <49C31BBF.7080009@freebsd.org> X-Spam-Report: AuthenticatedSender=yes, SenderIP=76.201.152.222 X-Spam-PmxInfo: Server=avs-10, Version=5.5.1.360522, Antispam-Engine: 2.6.1.350677, Antispam-Data: 2009.3.20.42226, SenderIP=76.201.152.222 References: <200903130246.n2D2kwvO021533@repoman.freebsd.org> <20090313084342.GT31961@hoeg.nl> User-Agent: Thunderbird 2.0.0.19 (X11/20090314) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 159145 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, 20 Mar 2009 05:29:55 -0000 Ed Schouten wrote: > * Nathan Whitehorn wrote: > >> IFC. Apparently syscons no longer works on G5 systems: this is item #1 >> on the todo list. >> > > Woops! Maybe I wrecked something? > > It does seems it was the teken import (rev. 186681), actually. The machine I'm using is a G5 iMac, which has a very high resolution, wide console. Maybe that is causing the problem? The symptom is that no text shows up on the console if syscons is enabled, and the machine will not boot. Any suggestions for where to look would be most appreciated. -Nathan From owner-p4-projects@FreeBSD.ORG Fri Mar 20 07:43:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32AC21065674; Fri, 20 Mar 2009 07:43:01 +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 D990C106564A for ; Fri, 20 Mar 2009 07:43:00 +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 AE16E8FC18 for ; Fri, 20 Mar 2009 07:43:00 +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 n2K7h0vE018743 for ; Fri, 20 Mar 2009 07:43:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2K7h0kE018741 for perforce@freebsd.org; Fri, 20 Mar 2009 07:43:00 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Mar 2009 07:43:00 GMT Message-Id: <200903200743.n2K7h0kE018741@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 159497 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, 20 Mar 2009 07:43:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=159497 Change 159497 by hselasky@hselasky_laptop001 on 2009/03/20 07:42:17 USB generic: - Allow for smaller buffer size. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#8 (text+ko) ==== @@ -1618,8 +1618,8 @@ { usb2_frlength_t t; - if (*(int *)addr < 1024) - t = 1024; + if (*(int *)addr < 0) + t = 0; /* use "wMaxPacketSize" */ else if (*(int *)addr < (256 * 1024)) t = *(int *)addr; else From owner-p4-projects@FreeBSD.ORG Fri Mar 20 09:35:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CB861065673; Fri, 20 Mar 2009 09:35:36 +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 CF9A81065672 for ; Fri, 20 Mar 2009 09:35:35 +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 BCA8B8FC13 for ; Fri, 20 Mar 2009 09:35:35 +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 n2K9ZZB9039823 for ; Fri, 20 Mar 2009 09:35:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2K9ZZm6039821 for perforce@freebsd.org; Fri, 20 Mar 2009 09:35:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Mar 2009 09:35:35 GMT Message-Id: <200903200935.n2K9ZZm6039821@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 159502 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, 20 Mar 2009 09:35:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=159502 Change 159502 by hselasky@hselasky_laptop001 on 2009/03/20 09:34:56 USB controller: - get Device Side drivers in line with Host Side drivers regarding the recent short control transfer patches. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#133 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#5 (text+ko) ==== @@ -887,7 +887,6 @@ temp.td = NULL; temp.td_next = xfer->td_start[0]; - temp.setup_alt_next = xfer->flags_int.short_frames_ok; temp.offset = 0; sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); @@ -902,6 +901,7 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.short_pkt = temp.len ? 1 : 0; + temp.setup_alt_next = 0; at91dci_setup_standard_chain_sub(&temp); } @@ -910,6 +910,8 @@ x = 0; } + temp.setup_alt_next = xfer->flags_int.short_frames_ok; + if (x != xfer->nframes) { if (xfer->endpoint & UE_DIR_IN) { temp.func = &at91dci_data_tx; @@ -933,7 +935,13 @@ x++; if (x == xfer->nframes) { - temp.setup_alt_next = 0; + if (xfer->flags_int.control_xfr) { + if (xfer->flags_int.control_act) { + temp.setup_alt_next = 0; + } + } else { + temp.setup_alt_next = 0; + } } if (temp.len == 0) { @@ -958,47 +966,46 @@ } } - /* always setup a valid "pc" pointer for status and sync */ - temp.pc = xfer->frbuffers + 0; + /* check for control transfer */ + if (xfer->flags_int.control_xfer) { - /* check if we need to sync */ - if (need_sync && xfer->flags_int.control_xfr) { - - /* we need a SYNC point after TX */ - temp.func = &at91dci_data_tx_sync; + /* always setup a valid "pc" pointer for status and sync */ + temp.pc = xfer->frbuffers + 0; temp.len = 0; temp.short_pkt = 0; + temp.setup_alt_next = 0; - at91dci_setup_standard_chain_sub(&temp); - } - /* check if we should append a status stage */ - if (xfer->flags_int.control_xfr && - !xfer->flags_int.control_act) { - - /* - * Send a DATA1 message and invert the current - * endpoint direction. - */ - if (xfer->endpoint & UE_DIR_IN) { - temp.func = &at91dci_data_rx; - need_sync = 0; - } else { - temp.func = &at91dci_data_tx; - need_sync = 1; - } - temp.len = 0; - temp.short_pkt = 0; - - at91dci_setup_standard_chain_sub(&temp); + /* check if we need to sync */ if (need_sync) { /* we need a SYNC point after TX */ temp.func = &at91dci_data_tx_sync; - temp.len = 0; - temp.short_pkt = 0; + at91dci_setup_standard_chain_sub(&temp); + } + + /* check if we should append a status stage */ + if (!xfer->flags_int.control_act) { + + /* + * Send a DATA1 message and invert the current + * endpoint direction. + */ + if (xfer->endpoint & UE_DIR_IN) { + temp.func = &at91dci_data_rx; + need_sync = 0; + } else { + temp.func = &at91dci_data_tx; + need_sync = 1; + } at91dci_setup_standard_chain_sub(&temp); + if (need_sync) { + /* we need a SYNC point after TX */ + temp.func = &at91dci_data_tx_sync; + at91dci_setup_standard_chain_sub(&temp); + } } } + /* must have at least one frame! */ td = temp.td; xfer->td_transfer_last = td; ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#9 (text+ko) ==== @@ -791,7 +791,6 @@ temp.td = NULL; temp.td_next = xfer->td_start[0]; - temp.setup_alt_next = xfer->flags_int.short_frames_ok; temp.offset = 0; sc = ATMEGA_BUS2SC(xfer->xroot->bus); @@ -806,6 +805,7 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.short_pkt = temp.len ? 1 : 0; + temp.setup_alt_next = 0; atmegadci_setup_standard_chain_sub(&temp); } @@ -814,6 +814,8 @@ x = 0; } + temp.setup_alt_next = xfer->flags_int.short_frames_ok; + if (x != xfer->nframes) { if (xfer->endpoint & UE_DIR_IN) { temp.func = &atmegadci_data_tx; @@ -837,7 +839,13 @@ x++; if (x == xfer->nframes) { - temp.setup_alt_next = 0; + if (xfer->flags_int.control_xfr) { + if (xfer->flags_int.control_act) { + temp.setup_alt_next = 0; + } + } else { + temp.setup_alt_next = 0; + } } if (temp.len == 0) { @@ -862,45 +870,42 @@ } } - /* always setup a valid "pc" pointer for status and sync */ - temp.pc = xfer->frbuffers + 0; + if (xfer->flags_int.control_xfr) { - /* check if we need to sync */ - if (need_sync && xfer->flags_int.control_xfr) { - - /* we need a SYNC point after TX */ - temp.func = &atmegadci_data_tx_sync; + /* always setup a valid "pc" pointer for status and sync */ + temp.pc = xfer->frbuffers + 0; temp.len = 0; temp.short_pkt = 0; + temp.setup_alt_next = 0; - atmegadci_setup_standard_chain_sub(&temp); - } - /* check if we should append a status stage */ - if (xfer->flags_int.control_xfr && - !xfer->flags_int.control_act) { - - /* - * Send a DATA1 message and invert the current - * endpoint direction. - */ - if (xfer->endpoint & UE_DIR_IN) { - temp.func = &atmegadci_data_rx; - need_sync = 0; - } else { - temp.func = &atmegadci_data_tx; - need_sync = 1; - } - temp.len = 0; - temp.short_pkt = 0; - - atmegadci_setup_standard_chain_sub(&temp); + /* check if we need to sync */ if (need_sync) { /* we need a SYNC point after TX */ temp.func = &atmegadci_data_tx_sync; - temp.len = 0; - temp.short_pkt = 0; + atmegadci_setup_standard_chain_sub(&temp); + } + + /* check if we should append a status stage */ + if (!xfer->flags_int.control_act) { + + /* + * Send a DATA1 message and invert the current + * endpoint direction. + */ + if (xfer->endpoint & UE_DIR_IN) { + temp.func = &atmegadci_data_rx; + need_sync = 0; + } else { + temp.func = &atmegadci_data_tx; + need_sync = 1; + } atmegadci_setup_standard_chain_sub(&temp); + if (need_sync) { + /* we need a SYNC point after TX */ + temp.func = &atmegadci_data_tx_sync; + atmegadci_setup_standard_chain_sub(&temp); + } } } /* must have at least one frame! */ ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#9 (text+ko) ==== @@ -1784,7 +1784,6 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.shortpkt = temp.len ? 1 : 0; - /* no "alt_next" for SETUP stage */ temp.setup_alt_next = 0; /* check for last frame */ if (xfer->nframes == 1) { ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#4 (text+ko) ==== @@ -1132,7 +1132,6 @@ temp.td = NULL; temp.td_next = xfer->td_start[0]; - temp.setup_alt_next = xfer->flags_int.short_frames_ok; temp.offset = 0; sc = MUSBOTG_BUS2SC(xfer->xroot->bus); @@ -1147,6 +1146,7 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.short_pkt = temp.len ? 1 : 0; + temp.setup_alt_next = 0; musbotg_setup_standard_chain_sub(&temp); } @@ -1155,6 +1155,8 @@ x = 0; } + temp.setup_alt_next = xfer->flags_int.short_frames_ok; + if (x != xfer->nframes) { if (xfer->endpoint & UE_DIR_IN) { if (xfer->flags_int.control_xfr) @@ -1180,7 +1182,13 @@ x++; if (x == xfer->nframes) { - temp.setup_alt_next = 0; + if (xfer->flags_int.control_xfr) { + if (xfer->flags_int.control_act) { + temp.setup_alt_next = 0; + } + } else { + temp.setup_alt_next = 0; + } } if (temp.len == 0) { @@ -1205,23 +1213,24 @@ } } - /* always setup a valid "pc" pointer for status and sync */ - temp.pc = xfer->frbuffers + 0; + /* check for control transfer */ + if (xfer->flags_int.control_xfr) { - /* check if we should append a status stage */ - - if (xfer->flags_int.control_xfr && - !xfer->flags_int.control_act) { - - /* - * Send a DATA1 message and invert the current - * endpoint direction. - */ - temp.func = &musbotg_setup_status; + /* always setup a valid "pc" pointer for status and sync */ + temp.pc = xfer->frbuffers + 0; temp.len = 0; temp.short_pkt = 0; + temp.setup_alt_next = 0; - musbotg_setup_standard_chain_sub(&temp); + /* check if we should append a status stage */ + if (!xfer->flags_int.control_act) { + /* + * Send a DATA1 message and invert the current + * endpoint direction. + */ + temp.func = &musbotg_setup_status; + musbotg_setup_standard_chain_sub(&temp); + } } /* must have at least one frame! */ td = temp.td; ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#6 (text+ko) ==== @@ -1439,7 +1439,6 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.shortpkt = temp.len ? 1 : 0; - /* no "alt_next" for SETUP stage */ temp.setup_alt_next = 0; /* check for last frame */ if (xfer->nframes == 1) { ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#5 (text+ko) ==== @@ -1253,32 +1253,29 @@ td_self = td->td_self; td_alt_next = td->alt_next; - if ((xfer->flags_int.control_xfr) && - (!xfer->flags_int.control_act) && - (((void *)td) == xfer->td_transfer_last)) - goto skip; /* don't touch DT value on STATUS stage */ + if (xfer->flags_int.control_xfr) + goto skip; /* don't touch the DT value! */ - if ((td->td_token ^ td_token) & htole32(UHCI_TD_SET_DT(1))) { - /* - * The data toggle is wrong and - * we need to switch it ! - */ + if (!((td->td_token ^ td_token) & htole32(UHCI_TD_SET_DT(1)))) + goto skip; /* data toggle has correct value */ - while (1) { + /* + * The data toggle is wrong and we need to toggle it ! + */ + while (1) { - td->td_token ^= htole32(UHCI_TD_SET_DT(1)); - usb2_pc_cpu_flush(td->page_cache); + td->td_token ^= htole32(UHCI_TD_SET_DT(1)); + usb2_pc_cpu_flush(td->page_cache); - if (td == xfer->td_transfer_last) { - /* last transfer */ - break; - } - td = td->obj_next; + if (td == xfer->td_transfer_last) { + /* last transfer */ + break; + } + td = td->obj_next; - if (td->alt_next != td_alt_next) { - /* next frame */ - break; - } + if (td->alt_next != td_alt_next) { + /* next frame */ + break; } } skip: @@ -1710,7 +1707,6 @@ temp.len = xfer->frlengths[0]; temp.ml.buf_pc = xfer->frbuffers + 0; temp.shortpkt = temp.len ? 1 : 0; - /* no "alt_next" for SETUP stage */ temp.setup_alt_next = 0; /* check for last frame */ if (xfer->nframes == 1) { ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#5 (text+ko) ==== @@ -836,7 +836,6 @@ temp.td = NULL; temp.td_next = xfer->td_start[0]; - temp.setup_alt_next = xfer->flags_int.short_frames_ok; temp.offset = 0; sc = USS820_DCI_BUS2SC(xfer->xroot->bus); @@ -851,6 +850,7 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.short_pkt = temp.len ? 1 : 0; + temp.setup_alt_next = 0; uss820dci_setup_standard_chain_sub(&temp); } @@ -859,6 +859,8 @@ x = 0; } + temp.setup_alt_next = xfer->flags_int.short_frames_ok; + if (x != xfer->nframes) { if (xfer->endpoint & UE_DIR_IN) { temp.func = &uss820dci_data_tx; @@ -878,7 +880,13 @@ x++; if (x == xfer->nframes) { - temp.setup_alt_next = 0; + if (xfer->flags_int.control_xfr) { + if (xfer->flags_int.control_act) { + temp.setup_alt_next = 0; + } + } else { + temp.setup_alt_next = 0; + } } if (temp.len == 0) { @@ -903,37 +911,39 @@ } } - /* always setup a valid "pc" pointer for status and sync */ - temp.pc = xfer->frbuffers + 0; - - /* check if we should append a status stage */ - - if (xfer->flags_int.control_xfr && - !xfer->flags_int.control_act) { + /* check for control transfer */ + if (xfer->flags_int.control_xfr) { uint8_t need_sync; - /* - * Send a DATA1 message and invert the current - * endpoint direction. - */ - if (xfer->endpoint & UE_DIR_IN) { - temp.func = &uss820dci_data_rx; - need_sync = 0; - } else { - temp.func = &uss820dci_data_tx; - need_sync = 1; - } + /* always setup a valid "pc" pointer for status and sync */ + temp.pc = xfer->frbuffers + 0; temp.len = 0; temp.short_pkt = 0; + temp.setup_alt_next = 0; - uss820dci_setup_standard_chain_sub(&temp); - if (need_sync) { - /* we need a SYNC point after TX */ - temp.func = &uss820dci_data_tx_sync; + /* check if we should append a status stage */ + if (!xfer->flags_int.control_act) { + + /* + * Send a DATA1 message and invert the current + * endpoint direction. + */ + if (xfer->endpoint & UE_DIR_IN) { + temp.func = &uss820dci_data_rx; + need_sync = 0; + } else { + temp.func = &uss820dci_data_tx; + need_sync = 1; + } temp.len = 0; temp.short_pkt = 0; uss820dci_setup_standard_chain_sub(&temp); + if (need_sync) { + /* we need a SYNC point after TX */ + temp.func = &uss820dci_data_tx_sync; + uss820dci_setup_standard_chain_sub(&temp); + } } } /* must have at least one frame! */ ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#133 (text+ko) ==== @@ -1251,6 +1251,20 @@ /* no longer active */ xfer->flags_int.control_act = 0; } + + /* Check for invalid number of frames */ + if (xfer->nframes > 2) { + /* + * If you need to split a control transfer, you + * have to do one part at a time. Only with + * non-control transfers you can do multiple + * parts a time. + */ + DPRINTFN(0, "Too many frames: %u\n", + (unsigned int)xfer->nframes); + goto error; + } + /* * Check if there is a control * transfer in progress: @@ -1495,32 +1509,28 @@ */ if (USB_GET_DATA_ISREAD(xfer)) { - if (xfer->flags_int.control_xfr) { + if (xfer->flags.short_frames_ok) { + xfer->flags_int.short_xfer_ok = 1; + xfer->flags_int.short_frames_ok = 1; + } else if (xfer->flags.short_xfer_ok) { + xfer->flags_int.short_xfer_ok = 1; - /* - * Control transfers do not support reception - * of multiple short USB frames ! - */ - - if (xfer->flags.short_xfer_ok) { - xfer->flags_int.short_xfer_ok = 1; + /* check for control transfer */ + if (xfer->flags_int.control_xfr) { /* - * Due to sometimes buggy device side - * firmware we need to do a STATUS - * stage in case of short control - * transfers in USB host mode, via - * the "alt_next" feature! + * 1) Control transfers do not support + * reception of multiple short USB + * frames in host mode and device side + * mode, with exception of: + * + * 2) Due to sometimes buggy device + * side firmware we need to do a + * STATUS stage in case of short + * control transfers in USB host mode. + * The STATUS stage then becomes the + * "alt_next" to the DATA stage. */ - if (udev->flags.usb2_mode == USB_MODE_HOST) - xfer->flags_int.short_frames_ok = 1; - } - } else { - - if (xfer->flags.short_frames_ok) { - xfer->flags_int.short_xfer_ok = 1; xfer->flags_int.short_frames_ok = 1; - } else if (xfer->flags.short_xfer_ok) { - xfer->flags_int.short_xfer_ok = 1; } } } From owner-p4-projects@FreeBSD.ORG Fri Mar 20 14:19:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 627C71065673; Fri, 20 Mar 2009 14:19:36 +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 1FAE9106564A for ; Fri, 20 Mar 2009 14:19:36 +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 E76228FC0A for ; Fri, 20 Mar 2009 14:19:35 +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 n2KEJZhh085880 for ; Fri, 20 Mar 2009 14:19:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2KEJZeg085878 for perforce@freebsd.org; Fri, 20 Mar 2009 14:19:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Mar 2009 14:19:35 GMT Message-Id: <200903201419.n2KEJZeg085878@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 159515 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, 20 Mar 2009 14:19:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=159515 Change 159515 by hselasky@hselasky_laptop001 on 2009/03/20 14:19:19 USB controller: - compile fix Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#6 (text+ko) ==== @@ -967,7 +967,7 @@ } /* check for control transfer */ - if (xfer->flags_int.control_xfer) { + if (xfer->flags_int.control_xfr) { /* always setup a valid "pc" pointer for status and sync */ temp.pc = xfer->frbuffers + 0; From owner-p4-projects@FreeBSD.ORG Fri Mar 20 14:20:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96D7910656CB; Fri, 20 Mar 2009 14:20:37 +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 40DFD1065680 for ; Fri, 20 Mar 2009 14:20:37 +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 230708FC29 for ; Fri, 20 Mar 2009 14:20:37 +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 n2KEKbwa086033 for ; Fri, 20 Mar 2009 14:20:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2KEKaJX086031 for perforce@freebsd.org; Fri, 20 Mar 2009 14:20:36 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Mar 2009 14:20:36 GMT Message-Id: <200903201420.n2KEKaJX086031@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 159516 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, 20 Mar 2009 14:20:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=159516 Change 159516 by hselasky@hselasky_laptop001 on 2009/03/20 14:20:11 USB controller: - fix IAR compiler warnings Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 (text+ko) ==== @@ -204,10 +204,10 @@ #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl); + NULL, (driver_intr_t *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl); #else err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (void *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl); + (driver_intr_t *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl); #endif if (err) { sc->sc_dci.sc_intr_hdl = NULL; @@ -215,10 +215,10 @@ } #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl); + NULL, (driver_intr_t *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl); #else err = bus_setup_intr(dev, sc->sc_vbus_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (void *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl); + (driver_intr_t *)at91_vbus_poll, sc, &sc->sc_vbus_intr_hdl); #endif if (err) { sc->sc_vbus_intr_hdl = NULL; ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#5 (text+ko) ==== @@ -113,7 +113,7 @@ device_set_ivars(sc->sc_otg.sc_bus.bdev, &sc->sc_otg.sc_bus); err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)atmegadci_interrupt, sc, &sc->sc_otg.sc_intr_hdl); + NULL, (driver_intr_t *)atmegadci_interrupt, sc, &sc->sc_otg.sc_intr_hdl); if (err) { sc->sc_otg.sc_intr_hdl = NULL; goto error; ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#4 (text+ko) ==== @@ -189,7 +189,7 @@ err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)(void *)ehci_interrupt, sc, &sc->sc_intr_hdl); + NULL, (driver_intr_t *)ehci_interrupt, sc, &sc->sc_intr_hdl); if (err) { device_printf(self, "Could not setup irq, %d\n", err); sc->sc_intr_hdl = NULL; ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#3 (text+ko) ==== @@ -210,7 +210,7 @@ MV_USB_DEVICE_UNDERFLOW); err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)(void *)ehci_interrupt, sc, &sc->sc_intr_hdl); + NULL, (driver_intr_t *)ehci_interrupt, sc, &sc->sc_intr_hdl); if (err) { device_printf(self, "Could not setup irq, %d\n", err); sc->sc_intr_hdl = NULL; ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#4 (text+ko) ==== @@ -338,10 +338,10 @@ #if (__FreeBSD_version >= 700031) err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)(void *)ehci_interrupt, sc, &sc->sc_intr_hdl); + NULL, (driver_intr_t *)ehci_interrupt, sc, &sc->sc_intr_hdl); #else err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (void *)(void *)ehci_interrupt, sc, &sc->sc_intr_hdl); + (driver_intr_t *)ehci_interrupt, sc, &sc->sc_intr_hdl); #endif if (err) { device_printf(self, "Could not setup irq, %d\n", err); ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#5 (text+ko) ==== @@ -130,10 +130,10 @@ #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)musbotg_interrupt, sc, &sc->sc_otg.sc_intr_hdl); + NULL, (driver_intr_t *)musbotg_interrupt, sc, &sc->sc_otg.sc_intr_hdl); #else err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (void *)musbotg_interrupt, sc, &sc->sc_otg.sc_intr_hdl); + (driver_intr_t *)musbotg_interrupt, sc, &sc->sc_otg.sc_intr_hdl); #endif if (err) { sc->sc_otg.sc_intr_hdl = NULL; ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#3 (text+ko) ==== @@ -111,10 +111,10 @@ #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); + NULL, (driver_intr_t *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); #else err = bus_setup_intr(dev, sc->sc_ohci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (void *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); + (driver_intr_t *)ohci_interrupt, sc, &sc->sc_ohci.sc_intr_hdl); #endif if (err) { sc->sc_ohci.sc_intr_hdl = NULL; ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#4 (text+ko) ==== @@ -289,10 +289,10 @@ #if (__FreeBSD_version >= 700031) err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)(void *)ohci_interrupt, sc, &sc->sc_intr_hdl); + NULL, (driver_intr_t *)ohci_interrupt, sc, &sc->sc_intr_hdl); #else err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (void *)(void *)ohci_interrupt, sc, &sc->sc_intr_hdl); + (driver_intr_t *)ohci_interrupt, sc, &sc->sc_intr_hdl); #endif if (err) { device_printf(self, "Could not setup irq, %d\n", err); ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#4 (text+ko) ==== @@ -323,10 +323,10 @@ #if (__FreeBSD_version >= 700031) err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)(void *)uhci_interrupt, sc, &sc->sc_intr_hdl); + NULL, (driver_intr_t *)uhci_interrupt, sc, &sc->sc_intr_hdl); #else err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (void *)(void *)uhci_interrupt, sc, &sc->sc_intr_hdl); + (driver_intr_t *)uhci_interrupt, sc, &sc->sc_intr_hdl); #endif if (err) { ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 (text+ko) ==== @@ -170,10 +170,10 @@ #if (__FreeBSD_version >= 700031) err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)uss820dci_interrupt, sc, &sc->sc_intr_hdl); + NULL, (driver_intr_t *)uss820dci_interrupt, sc, &sc->sc_intr_hdl); #else err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (void *)uss820dci_interrupt, sc, &sc->sc_intr_hdl); + (driver_intr_t *)uss820dci_interrupt, sc, &sc->sc_intr_hdl); #endif if (err) { sc->sc_intr_hdl = NULL; From owner-p4-projects@FreeBSD.ORG Fri Mar 20 14:24:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B920C106566C; Fri, 20 Mar 2009 14:24:41 +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 77521106564A for ; Fri, 20 Mar 2009 14:24:41 +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 63BA68FC19 for ; Fri, 20 Mar 2009 14:24:41 +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 n2KEOfjO086281 for ; Fri, 20 Mar 2009 14:24:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2KEOfCP086279 for perforce@freebsd.org; Fri, 20 Mar 2009 14:24:41 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Mar 2009 14:24:41 GMT Message-Id: <200903201424.n2KEOfCP086279@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 159517 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, 20 Mar 2009 14:24:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=159517 Change 159517 by hselasky@hselasky_laptop001 on 2009/03/20 14:24:19 USB: - more IAR compile fixes Affected files ... .. //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#134 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#7 (text+ko) ==== @@ -167,7 +167,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &uscanner_write_clear_stall_callback, .mh.timeout = 1000, .mh.interval = 50, /* 50ms */ @@ -178,7 +177,6 @@ .endpoint = 0x00, .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &uscanner_read_clear_stall_callback, .mh.timeout = 1000, .mh.interval = 50, /* 50ms */ ==== //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#3 (text+ko) ==== @@ -212,7 +212,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &udbp_bulk_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ .mh.interval = 50, /* 50ms */ @@ -223,7 +222,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &udbp_bulk_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ .mh.interval = 50, /* 50ms */ ==== //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#4 (text+ko) ==== @@ -121,7 +121,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = (sizeof(struct usb2_device_request) + UCYCOM_MAX_IOLEN), - .mh.flags = {}, .mh.callback = &ucycom_ctrl_write_callback, .mh.timeout = 1000, /* 1 second */ }, ==== //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#3 (text+ko) ==== @@ -252,7 +252,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = (sizeof(struct usb2_device_request) + 1), - .mh.flags = {}, .mh.callback = &ufoma_ctrl_write_callback, .mh.timeout = 1000, /* 1 second */ }, ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#8 (text+ko) ==== @@ -1064,7 +1064,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &umass_t_bbb_reset1_callback, .mh.timeout = 5000, /* 5 seconds */ .mh.interval = 500, /* 500 milliseconds */ @@ -1075,7 +1074,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &umass_t_bbb_reset2_callback, .mh.timeout = 5000, /* 5 seconds */ .mh.interval = 50, /* 50 milliseconds */ @@ -1086,7 +1084,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &umass_t_bbb_reset3_callback, .mh.timeout = 5000, /* 5 seconds */ .mh.interval = 50, /* 50 milliseconds */ @@ -1097,7 +1094,6 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .mh.bufsize = sizeof(umass_bbb_cbw_t), - .mh.flags = {}, .mh.callback = &umass_t_bbb_command_callback, .mh.timeout = 5000, /* 5 seconds */ }, @@ -1117,7 +1113,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &umass_t_bbb_data_rd_cs_callback, .mh.timeout = 5000, /* 5 seconds */ }, @@ -1137,7 +1132,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &umass_t_bbb_data_wr_cs_callback, .mh.timeout = 5000, /* 5 seconds */ }, @@ -1161,7 +1155,6 @@ .direction = UE_DIR_ANY, .mh.bufsize = (sizeof(struct usb2_device_request) + UMASS_CBI_DIAGNOSTIC_CMDLEN), - .mh.flags = {}, .mh.callback = &umass_t_cbi_reset1_callback, .mh.timeout = 5000, /* 5 seconds */ .mh.interval = 500, /* 500 milliseconds */ @@ -1172,7 +1165,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &umass_t_cbi_reset2_callback, .mh.timeout = 5000, /* 5 seconds */ .mh.interval = 50, /* 50 milliseconds */ @@ -1183,7 +1175,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &umass_t_cbi_reset3_callback, .mh.timeout = 5000, /* 5 seconds */ .mh.interval = 50, /* 50 milliseconds */ @@ -1195,7 +1186,6 @@ .direction = UE_DIR_ANY, .mh.bufsize = (sizeof(struct usb2_device_request) + UMASS_MAX_CMDLEN), - .mh.flags = {}, .mh.callback = &umass_t_cbi_command_callback, .mh.timeout = 5000, /* 5 seconds */ }, @@ -1215,7 +1205,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &umass_t_cbi_data_rd_cs_callback, .mh.timeout = 5000, /* 5 seconds */ }, @@ -1235,7 +1224,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &umass_t_cbi_data_wr_cs_callback, .mh.timeout = 5000, /* 5 seconds */ }, @@ -1255,7 +1243,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &umass_t_cbi_reset4_callback, .mh.timeout = 5000, /* ms */ }, ==== //depot/projects/usb/src/sys/dev/usb/storage/urio.c#4 (text+ko) ==== @@ -149,7 +149,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &urio_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ .mh.interval = 50, /* 50ms */ @@ -160,7 +159,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &urio_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ .mh.interval = 50, /* 50ms */ ==== //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#4 (text+ko) ==== @@ -138,7 +138,6 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .mh.bufsize = sizeof(struct bbb_cbw), - .mh.flags = {}, .mh.callback = &bbb_command_callback, .mh.timeout = 4 * USB_MS_HZ, /* 4 seconds */ }, @@ -158,7 +157,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &bbb_data_rd_cs_callback, .mh.timeout = 1 * USB_MS_HZ, /* 1 second */ }, @@ -178,7 +176,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &bbb_data_wr_cs_callback, .mh.timeout = 1 * USB_MS_HZ, /* 1 second */ }, ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#134 (text+ko) ==== @@ -113,7 +113,6 @@ .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, .mh.bufsize = sizeof(struct usb2_device_request), - .mh.flags = {}, .mh.callback = &usb2_do_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ .mh.interval = 50, /* 50ms */ @@ -2671,7 +2670,6 @@ * .interval = 50, //50 milliseconds * .bufsize = sizeof(struct usb2_device_request), * .mh.timeout = 1000, //1.000 seconds - * .mh.flags = { }, * .mh.callback = &my_clear_stall_callback, // ** * }; * From owner-p4-projects@FreeBSD.ORG Fri Mar 20 15:29:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D332C1065676; Fri, 20 Mar 2009 15:29:47 +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 9319E1065672 for ; Fri, 20 Mar 2009 15:29:47 +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 669678FC0C for ; Fri, 20 Mar 2009 15:29:47 +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 n2KFTluG093678 for ; Fri, 20 Mar 2009 15:29:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2KFTlaq093676 for perforce@freebsd.org; Fri, 20 Mar 2009 15:29:47 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Mar 2009 15:29:47 GMT Message-Id: <200903201529.n2KFTlaq093676@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 159519 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, 20 Mar 2009 15:29:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=159519 Change 159519 by hselasky@hselasky_laptop001 on 2009/03/20 15:29:06 USB core: Fix compilation without strings and busdma. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_bus.h#4 (text+ko) ==== @@ -75,9 +75,10 @@ device_t parent; device_t bdev; /* filled by HC driver */ +#if USB_HAVE_BUSDMA struct usb2_dma_parent_tag dma_parent_tag[1]; struct usb2_dma_tag dma_tags[USB_BUS_DMA_TAG_MAX]; - +#endif struct usb2_bus_methods *methods; /* filled by HC driver */ struct usb2_device **devices; ==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#4 (text+ko) ==== @@ -48,6 +48,7 @@ struct usb2_xfer_root; struct usb2_dma_parent_tag; +struct usb2_dma_tag; /* * The following typedef defines the USB DMA load done callback. @@ -115,11 +116,11 @@ /* * The following structure describes the parent USB DMA tag. */ +#if USB_HAVE_BUSDMA struct usb2_dma_parent_tag { -#if USB_HAVE_BUSDMA && defined(__FreeBSD__) +#if defined(__FreeBSD__) struct cv cv[1]; /* internal condition variable */ #endif -#if USB_HAVE_BUSDMA bus_dma_tag_t tag; /* always set */ struct mtx *mtx; /* private mutex, always set */ @@ -128,27 +129,31 @@ uint8_t dma_error; /* set if DMA load operation failed */ uint8_t dma_bits; /* number of DMA address lines */ uint8_t utag_max; /* number of USB DMA tags */ +}; +#else +struct usb2_dma_parent_tag {}; /* empty struct */ #endif -}; /* * The following structure describes an USB DMA tag. */ +#if USB_HAVE_BUSDMA struct usb2_dma_tag { -#if USB_HAVE_BUSDMA && defined(__NetBSD__) +#if defined(__NetBSD__) bus_dma_segment_t *p_seg; #endif -#if USB_HAVE_BUSDMA struct usb2_dma_parent_tag *tag_parent; bus_dma_tag_t tag; usb2_size_t align; usb2_size_t size; -#endif -#if USB_HAVE_BUSDMA && defined(__NetBSD__) +#if defined(__NetBSD__) usb2_size_t n_seg; #endif }; +#else +struct usb2_dma_tag {}; /* empty struct */ +#endif /* function prototypes */ ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#11 (text+ko) ==== @@ -2238,6 +2238,7 @@ static void usb2_notify_addq(const char *type, struct usb2_device *udev) { +#if USB_HAVE_STRINGS char *data = NULL; struct malloc_type *mt; @@ -2297,6 +2298,7 @@ device_get_nameunit(device_get_parent(udev->bus->bdev))); } devctl_queue_data(data); +#endif } #if USB_HAVE_UGEN From owner-p4-projects@FreeBSD.ORG Fri Mar 20 16:25:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E71D10656C4; Fri, 20 Mar 2009 16:25:49 +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 1B918106568E for ; Fri, 20 Mar 2009 16:25:49 +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 72FC78FC1D for ; Fri, 20 Mar 2009 16:25:46 +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 n2KGPkNd099478 for ; Fri, 20 Mar 2009 16:25:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2KGPkTM099476 for perforce@freebsd.org; Fri, 20 Mar 2009 16:25:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Mar 2009 16:25:46 GMT Message-Id: <200903201625.n2KGPkTM099476@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 159522 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, 20 Mar 2009 16:25:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=159522 Change 159522 by hselasky@hselasky_laptop001 on 2009/03/20 16:25:06 USB controller: - make sure that the OHCI picks up the alt_next Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#7 (text+ko) ==== @@ -1020,6 +1020,23 @@ usb2_pc_cpu_flush(ed->page_cache); DPRINTFN(13, "xfer=%p following alt next\n", xfer); + + /* + * Make sure that the OHCI re-scans the schedule by + * writing the BLF and CLF bits: + */ + + if (xfer->xroot->udev->pwr_save.suspended) { + /* nothing to do */ + } else if (xfer->pipe->methods == &ohci_device_bulk_methods) { + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); + + OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_BLF); + } else if (xfer->pipe->methods == &ohci_device_ctrl_methods) { + ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus); + + OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_CLF); + } } } From owner-p4-projects@FreeBSD.ORG Fri Mar 20 18:04:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7926D10656E2; Fri, 20 Mar 2009 18:04:28 +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 3297910656CF for ; Fri, 20 Mar 2009 18:04:27 +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 2D97B8FC12 for ; Fri, 20 Mar 2009 18:04:27 +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 n2KI4RuJ023275 for ; Fri, 20 Mar 2009 18:04:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2KI4RZt023273 for perforce@freebsd.org; Fri, 20 Mar 2009 18:04:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Mar 2009 18:04:27 GMT Message-Id: <200903201804.n2KI4RZt023273@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 159529 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, 20 Mar 2009 18:04:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=159529 Change 159529 by hselasky@hselasky_laptop001 on 2009/03/20 18:03:50 USB controller: - correctly setup alt_next - remove checking of ED_SKIP in OHCI, hence this flag is only writable by software and we never set it! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#7 (text+ko) ==== @@ -888,6 +888,7 @@ temp.td = NULL; temp.td_next = xfer->td_start[0]; temp.offset = 0; + temp.setup_alt_next = xfer->flags_int.short_frames_ok; sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); ep_no = (xfer->endpoint & UE_ADDR); @@ -901,7 +902,12 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.short_pkt = temp.len ? 1 : 0; - temp.setup_alt_next = 0; + /* check for last frame */ + if (xfer->nframes == 1) { + /* no STATUS stage yet, SETUP is last */ + if (xfer->flags_int.control_act) + temp.setup_alt_next = 0; + } at91dci_setup_standard_chain_sub(&temp); } @@ -910,8 +916,6 @@ x = 0; } - temp.setup_alt_next = xfer->flags_int.short_frames_ok; - if (x != xfer->nframes) { if (xfer->endpoint & UE_DIR_IN) { temp.func = &at91dci_data_tx; ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#10 (text+ko) ==== @@ -792,6 +792,7 @@ temp.td = NULL; temp.td_next = xfer->td_start[0]; temp.offset = 0; + temp.setup_alt_next = xfer->flags_int.short_frames_ok; sc = ATMEGA_BUS2SC(xfer->xroot->bus); ep_no = (xfer->endpoint & UE_ADDR); @@ -805,7 +806,12 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.short_pkt = temp.len ? 1 : 0; - temp.setup_alt_next = 0; + /* check for last frame */ + if (xfer->nframes == 1) { + /* no STATUS stage yet, SETUP is last */ + if (xfer->flags_int.control_act) + temp.setup_alt_next = 0; + } atmegadci_setup_standard_chain_sub(&temp); } @@ -814,8 +820,6 @@ x = 0; } - temp.setup_alt_next = xfer->flags_int.short_frames_ok; - if (x != xfer->nframes) { if (xfer->endpoint & UE_DIR_IN) { temp.func = &atmegadci_data_tx; ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#10 (text+ko) ==== @@ -1752,6 +1752,7 @@ temp.td_next = td; temp.qtd_status = 0; temp.last_frame = 0; + temp.setup_alt_next = xfer->flags_int.short_frames_ok; if (xfer->flags_int.control_xfr) { if (xfer->pipe->toggle_next) { @@ -1784,12 +1785,13 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.shortpkt = temp.len ? 1 : 0; - temp.setup_alt_next = 0; /* check for last frame */ if (xfer->nframes == 1) { /* no STATUS stage yet, SETUP is last */ - if (xfer->flags_int.control_act) + if (xfer->flags_int.control_act) { temp.last_frame = 1; + temp.setup_alt_next = 0; + } } ehci_setup_standard_chain_sub(&temp); } @@ -1798,8 +1800,6 @@ x = 0; } - temp.setup_alt_next = xfer->flags_int.short_frames_ok; - while (x != xfer->nframes) { /* DATA0 / DATA1 message */ ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#5 (text+ko) ==== @@ -1133,6 +1133,7 @@ temp.td = NULL; temp.td_next = xfer->td_start[0]; temp.offset = 0; + temp.setup_alt_next = xfer->flags_int.short_frames_ok; sc = MUSBOTG_BUS2SC(xfer->xroot->bus); ep_no = (xfer->endpoint & UE_ADDR); @@ -1146,7 +1147,6 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.short_pkt = temp.len ? 1 : 0; - temp.setup_alt_next = 0; musbotg_setup_standard_chain_sub(&temp); } @@ -1155,8 +1155,6 @@ x = 0; } - temp.setup_alt_next = xfer->flags_int.short_frames_ok; - if (x != xfer->nframes) { if (xfer->endpoint & UE_DIR_IN) { if (xfer->flags_int.control_xfr) ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#8 (text+ko) ==== @@ -1051,7 +1051,6 @@ ohci_check_transfer(struct usb2_xfer *xfer) { ohci_ed_t *ed; - uint32_t ed_flags; uint32_t ed_headp; uint32_t ed_tailp; @@ -1060,12 +1059,10 @@ ed = xfer->qh_start[xfer->flags_int.curr_dma_set]; usb2_pc_cpu_invalidate(ed->page_cache); - ed_flags = le32toh(ed->ed_flags); ed_headp = le32toh(ed->ed_headp); ed_tailp = le32toh(ed->ed_tailp); - if ((ed_flags & OHCI_ED_SKIP) || - (ed_headp & OHCI_HALTED) || + if ((ed_headp & OHCI_HALTED) || (((ed_headp ^ ed_tailp) & (~0xF)) == 0)) { if (xfer->pipe->methods == &ohci_device_isoc_methods) { /* isochronous transfer */ @@ -1442,6 +1439,7 @@ temp.td = NULL; temp.td_next = td; temp.last_frame = 0; + temp.setup_alt_next = xfer->flags_int.short_frames_ok; methods = xfer->pipe->methods; @@ -1456,12 +1454,13 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.shortpkt = temp.len ? 1 : 0; - temp.setup_alt_next = 0; /* check for last frame */ if (xfer->nframes == 1) { /* no STATUS stage yet, SETUP is last */ - if (xfer->flags_int.control_act) + if (xfer->flags_int.control_act) { temp.last_frame = 1; + temp.setup_alt_next = 0; + } } ohci_setup_standard_chain_sub(&temp); @@ -1476,7 +1475,6 @@ x = 0; } temp.td_flags = htole32(OHCI_TD_NOCC | OHCI_TD_NOINTR); - temp.setup_alt_next = xfer->flags_int.short_frames_ok; /* set data toggle */ ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#6 (text+ko) ==== @@ -1675,6 +1675,7 @@ temp.td = NULL; temp.td_next = td; temp.last_frame = 0; + temp.setup_alt_next = xfer->flags_int.short_frames_ok; uhci_mem_layout_init(&temp.ml, xfer); @@ -1707,12 +1708,13 @@ temp.len = xfer->frlengths[0]; temp.ml.buf_pc = xfer->frbuffers + 0; temp.shortpkt = temp.len ? 1 : 0; - temp.setup_alt_next = 0; /* check for last frame */ if (xfer->nframes == 1) { /* no STATUS stage yet, SETUP is last */ - if (xfer->flags_int.control_act) + if (xfer->flags_int.control_act) { temp.last_frame = 1; + temp.setup_alt_next = 0; + } } uhci_setup_standard_chain_sub(&temp); } @@ -1721,8 +1723,6 @@ x = 0; } - temp.setup_alt_next = xfer->flags_int.short_frames_ok; - while (x != xfer->nframes) { /* DATA0 / DATA1 message */ ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#6 (text+ko) ==== @@ -837,6 +837,7 @@ temp.td = NULL; temp.td_next = xfer->td_start[0]; temp.offset = 0; + temp.setup_alt_next = xfer->flags_int.short_frames_ok; sc = USS820_DCI_BUS2SC(xfer->xroot->bus); ep_no = (xfer->endpoint & UE_ADDR); @@ -850,7 +851,12 @@ temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; temp.short_pkt = temp.len ? 1 : 0; - temp.setup_alt_next = 0; + /* check for last frame */ + if (xfer->nframes == 1) { + /* no STATUS stage yet, SETUP is last */ + if (xfer->flags_int.control_act) + temp.setup_alt_next = 0; + } uss820dci_setup_standard_chain_sub(&temp); } @@ -859,8 +865,6 @@ x = 0; } - temp.setup_alt_next = xfer->flags_int.short_frames_ok; - if (x != xfer->nframes) { if (xfer->endpoint & UE_DIR_IN) { temp.func = &uss820dci_data_tx; From owner-p4-projects@FreeBSD.ORG Fri Mar 20 18:44:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1AAE10656C7; Fri, 20 Mar 2009 18:44:19 +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 B277510656C2 for ; Fri, 20 Mar 2009 18:44:19 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9EBAC8FC08 for ; Fri, 20 Mar 2009 18:44:19 +0000 (UTC) (envelope-from thompsa@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 n2KIiJwN026716 for ; Fri, 20 Mar 2009 18:44:19 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2KIiJ89026714 for perforce@freebsd.org; Fri, 20 Mar 2009 18:44:19 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 20 Mar 2009 18:44:19 GMT Message-Id: <200903201844.n2KIiJ89026714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 159535 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, 20 Mar 2009 18:44:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=159535 Change 159535 by thompsa@thompsa_burger on 2009/03/20 18:43:23 IFC @159534 Affected files ... .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#22 integrate .. //depot/projects/usb/src/sys/arm/conf/HL200#8 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#18 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#16 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/bioscd.c#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/biosdisk.c#5 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/loader/Makefile#5 integrate .. //depot/projects/usb/src/sys/boot/pc98/loader/main.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/usb/src/sys/conf/NOTES#31 integrate .. //depot/projects/usb/src/sys/conf/files#56 integrate .. //depot/projects/usb/src/sys/dev/agp/agp.c#7 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_amd64.c#4 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#8 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_intel.c#3 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_via.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.h#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#20 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#16 integrate .. //depot/projects/usb/src/sys/dev/dc/dcphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/dc/pnphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/ati_pcigart.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_irq.c#7 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_lock.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#7 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_vm.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_dma.c#10 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.h#7 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_irq.c#7 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_reg.h#2 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_suspend.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_irq.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_irq.c#8 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#8 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.c#6 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_subr.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#51 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vnops.c#13 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#15 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_ebr.c#3 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#22 integrate .. //depot/projects/usb/src/sys/i386/conf/XBOX#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#19 integrate .. //depot/projects/usb/src/sys/modules/ip6_mroute_mod/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/ip_mroute_mod/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/usb/Makefile#15 integrate .. //depot/projects/usb/src/sys/modules/usb/uscanner/Makefile#2 delete .. //depot/projects/usb/src/sys/net/if.c#20 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.h#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_input.c#13 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#17 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#11 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_tdma.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#17 integrate .. //depot/projects/usb/src/sys/netinet/igmp.h#4 integrate .. //depot/projects/usb/src/sys/netinet/ip_mroute.c#10 integrate .. //depot/projects/usb/src/sys/netinet/ip_mroute.h#5 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_mroute.h#6 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#12 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvkrpc.c#4 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#17 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#17 integrate .. //depot/projects/usb/src/sys/sparc64/central/central.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#16 integrate .. //depot/projects/usb/src/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/fhc/fhc.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/include/trap.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/isa/isa.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/isa/ofw_isa.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/pci/apb.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/pci/ofw_pcib.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/pci/ofw_pcibus.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psycho.c#11 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psychovar.h#6 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizo.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/dma_sbus.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/sbus.c#10 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/sbusvar.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/db_disasm.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/eeprom.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/jbusppm.c#2 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#13 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/nexus.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/rtc.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/sc_machdep.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/schppm.c#2 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/trap.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/upa.c#6 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#12 integrate .. //depot/projects/usb/src/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/trap.c#6 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#22 (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.521 2009/02/23 18:34:56 thompsa Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.522 2009/03/19 20:33:26 thompsa Exp $ cpu HAMMER ident GENERIC @@ -295,7 +295,6 @@ device ural # Ralink Technology RT2500USB wireless NICs device rum # Ralink Technology RT2501USB wireless NICs device urio # Diamond Rio 500 MP3 player -device uscanner # Scanners # USB Serial devices device uark # Technologies ARK3116 based serial adapters device ubsa # Belkin F5U103 and compatible serial adapters ==== //depot/projects/usb/src/sys/arm/conf/HL200#8 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/HL200,v 1.9 2009/02/23 18:34:56 thompsa Exp $ +# $FreeBSD: src/sys/arm/conf/HL200,v 1.10 2009/03/19 20:33:26 thompsa Exp $ ident HL200 @@ -103,7 +103,6 @@ device ural # Ralink Technology RT2500USB wireless NICs device rum # Ralink Technology RT2501USB wireless NICs device urio # Diamond Rio 500 MP3 player -device uscanner # Scanners # USB Ethernet, requires miibus device miibus device aue # ADMtek USB Ethernet ==== //depot/projects/usb/src/sys/arm/conf/KB920X#18 (text) ==== @@ -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/arm/conf/KB920X,v 1.22 2009/02/23 18:34:56 thompsa Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.23 2009/03/19 20:33:26 thompsa Exp $ ident KB920X @@ -105,7 +105,6 @@ device ural # Ralink Technology RT2500USB wireless NICs device rum # Ralink Technology RT2501USB wireless NICs device urio # Diamond Rio 500 MP3 player -device uscanner # Scanners device miibus device aue # ADMtek USB Ethernet ==== //depot/projects/usb/src/sys/boot/forth/loader.conf#16 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.137 2009/03/16 10:36:24 dchagin Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.138 2009/03/19 20:33:26 thompsa Exp $ ############################################################## ### Basic configuration options ############################ @@ -379,7 +379,6 @@ ums_load="NO" # Mouse umass_load="NO" # Mass Storage Devices umodem_load="NO" # Modems -uscanner_load="NO" # Scanners if_aue_load="NO" # ADMtek USB ethernet if_axe_load="NO" # ASIX Electronics AX88172 USB ethernet if_cue_load="NO" # CATC USB ethernet ==== //depot/projects/usb/src/sys/boot/pc98/libpc98/Makefile#3 (text+ko) ==== @@ -1,12 +1,13 @@ -# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.25 2008/02/29 05:06:06 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.26 2009/03/19 13:53:42 nyan Exp $ # LIB= pc98 INTERNALLIB= .PATH: ${.CURDIR}/../../i386/libi386 -SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c biossmap.c \ - bootinfo.c bootinfo32.c comconsole.c devicename.c elf32_freebsd.c \ +SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c \ + biospci.c biossmap.c bootinfo.c bootinfo32.c \ + comconsole.c devicename.c elf32_freebsd.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c ==== //depot/projects/usb/src/sys/boot/pc98/libpc98/bioscd.c#4 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/bioscd.c,v 1.3 2007/10/24 04:03:25 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/bioscd.c,v 1.5 2009/03/20 13:03:33 nyan Exp $"); /* * BIOS CD device handling for CD's that have been booted off of via no @@ -170,9 +170,9 @@ static void bc_print(int verbose) { + char line[80]; int i; - char line[80]; - + for (i = 0; i < nbcinfo; i++) { sprintf(line, " cd%d: Device 0x%x\n", i, bcinfo[i].bc_sp.sp_devicespec); @@ -232,7 +232,7 @@ if (dblk % (BIOSCD_SECSIZE / DEV_BSIZE) != 0) return (EINVAL); dblk /= (BIOSCD_SECSIZE / DEV_BSIZE); - DEBUG("read %d from %d to %p", blks, dblk, buf); + DEBUG("read %d from %lld to %p", blks, dblk, buf); if (rsize) *rsize = 0; @@ -241,9 +241,9 @@ return (EIO); } #ifdef BD_SUPPORT_FRAGS - DEBUG("bc_strategy: frag read %d from %d+%d to %p", + DEBUG("frag read %d from %lld+%d to %p", fragsize, dblk, blks, buf + (blks * BIOSCD_SECSIZE)); - if (fragsize && bc_read(unit, dblk + blks, 1, fragsize)) { + if (fragsize && bc_read(unit, dblk + blks, 1, fragbuf)) { DEBUG("frag read error"); return(EIO); } @@ -254,11 +254,14 @@ return (0); } +/* Max number of sectors to bounce-buffer at a time. */ +#define CD_BOUNCEBUF 8 + static int bc_read(int unit, daddr_t dblk, int blks, caddr_t dest) { - u_int result, retry; - static unsigned short packet[8]; + u_int maxfer, resid, result, retry, x; + caddr_t bbuf, p, xp; int biosdev; #ifdef DISK_DEBUG int error; @@ -272,40 +275,73 @@ if (blks == 0) return (0); + /* Decide whether we have to bounce */ + if (VTOP(dest) >> 20 != 0) { + /* + * The destination buffer is above first 1MB of + * physical memory so we have to arrange a suitable + * bounce buffer. + */ + x = min(CD_BOUNCEBUF, (unsigned)blks); + bbuf = alloca(x * BIOSCD_SECSIZE); + maxfer = x; + } else { + bbuf = NULL; + maxfer = 0; + } + biosdev = bc_unit2bios(unit); - /* - * Loop retrying the operation a couple of times. The BIOS - * may also retry. - */ - for (retry = 0; retry < 3; retry++) { - /* If retrying, reset the drive */ - if (retry > 0) { + resid = blks; + p = dest; + + while (resid > 0) { + if (bbuf) + xp = bbuf; + else + xp = p; + x = resid; + if (maxfer > 0) + x = min(x, maxfer); + + /* + * Loop retrying the operation a couple of times. The BIOS + * may also retry. + */ + for (retry = 0; retry < 3; retry++) { + /* If retrying, reset the drive */ + if (retry > 0) { + v86.ctl = V86_FLAGS; + v86.addr = 0x1b; + v86.eax = 0x0300 | biosdev; + v86int(); + } + v86.ctl = V86_FLAGS; v86.addr = 0x1b; - v86.eax = 0x0300 | biosdev; + v86.eax = 0x0600 | (biosdev & 0x7f); + v86.ebx = x * BIOSCD_SECSIZE; + v86.ecx = dblk & 0xffff; + v86.edx = (dblk >> 16) & 0xffff; + v86.ebp = VTOPOFF(xp); + v86.es = VTOPSEG(xp); v86int(); + result = (v86.efl & PSL_C); + if (result == 0) + break; } - - v86.ctl = V86_FLAGS; - v86.addr = 0x1b; - v86.eax = 0x0600 | (biosdev & 0x7f); - v86.ebx = blks * BIOSCD_SECSIZE; - v86.ecx = dblk & 0xffff; - v86.edx = (dblk >> 16) & 0xffff; - v86.ebp = VTOPOFF(dest); - v86.es = VTOPSEG(dest); - v86int(); - result = (v86.efl & PSL_C); - if (result == 0) - break; - } #ifdef DISK_DEBUG - error = (v86.eax >> 8) & 0xff; + error = (v86.eax >> 8) & 0xff; #endif - DEBUG("%d sectors from %ld to %p (0x%x) %s", blks, dblk, dest, - VTOP(dest), result ? "failed" : "ok"); - DEBUG("unit %d status 0x%x", unit, error); + DEBUG("%d sectors from %lld to %p (0x%x) %s", x, dblk, p, + VTOP(p), result ? "failed" : "ok"); + DEBUG("unit %d status 0x%x", unit, error); + if (bbuf != NULL) + bcopy(bbuf, p, x * BIOSCD_SECSIZE); + p += (x * BIOSCD_SECSIZE); + dblk += x; + resid -= x; + } /* hexdump(dest, (blks * BIOSCD_SECSIZE)); */ return(0); ==== //depot/projects/usb/src/sys/boot/pc98/libpc98/biosdisk.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.39 2008/02/29 04:56:51 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.41 2009/03/20 05:33:58 nyan Exp $"); /* * BIOS disk device handling. @@ -269,17 +269,8 @@ /* Check for a "dedicated" disk */ for (j = 0; j < od->od_nslices; j++) { - switch(dptr[j].dp_mid) { - case DOSMID_386BSD: - sprintf(line, " disk%ds%d", i, j + 1); - bd_printbsdslice(od, - dptr[j].dp_scyl * od->od_hds * od->od_sec + - dptr[j].dp_shd * od->od_sec + dptr[j].dp_ssect, - line, verbose); - break; - default: - break; - } + sprintf(line, " disk%ds%d", i, j + 1); + bd_printslice(od, &dptr[j], line, verbose); } } bd_closedisk(od); @@ -311,6 +302,52 @@ } /* + * Print information about slices on a disk. For the size calculations we + * assume a 512 byte sector. + */ +static void +bd_printslice(struct open_disk *od, struct pc98_partition *dp, char *prefix, + int verbose) +{ + int cylsecs, start, size; + char stats[80]; + char line[80]; + + cylsecs = od->od_hds * od->od_sec; + start = dp->dp_scyl * cylsecs + dp->dp_shd * od->od_sec + dp->dp_ssect; + size = (dp->dp_ecyl - dp->dp_scyl + 1) * cylsecs; + + if (verbose) + sprintf(stats, " %s (%d - %d)", display_size(size), + start, start + size); + else + stats[0] = '\0'; + + switch(dp->dp_mid & PC98_MID_MASK) { + case PC98_MID_386BSD: + bd_printbsdslice(od, start, prefix, verbose); + return; + case 0x00: /* unused partition */ + return; + case 0x01: + sprintf(line, "%s: FAT-12%s\n", prefix, stats); + break; + case 0x11: + case 0x20: + case 0x21: + case 0x22: + case 0x23: + case 0x24: + sprintf(line, "%s: FAT-16%s\n", prefix, stats); + break; + default: + sprintf(line, "%s: Unknown fs: 0x%x %s\n", prefix, dp->dp_mid, + stats); + } + pager_output(line); +} + +/* * Print out each valid partition in the disklabel of a FreeBSD slice. * For size calculations, we assume a 512 byte sector size. */ @@ -349,7 +386,7 @@ /* Only print out statistics in verbose mode */ if (verbose) - sprintf(line, " %s%c: %s %s (%d - %d)\n", prefix, 'a' + i, + sprintf(line, " %s%c: %s %s (%d - %d)\n", prefix, 'a' + i, (lp->d_partitions[i].p_fstype == FS_SWAP) ? "swap " : (lp->d_partitions[i].p_fstype == FS_VINUM) ? "vinum" : "FFS ", @@ -625,9 +662,9 @@ dp = &od->od_slicetab[0]; for (i = 0; i < od->od_nslices; i++, dp++) { - switch(dp->dp_mid & 0x7f) { - case DOSMID_386BSD & 0x7f: /* FreeBSD */ - if ((dp->dp_mid & 0x80) && + switch(dp->dp_mid & PC98_MID_MASK) { + case PC98_MID_386BSD: /* FreeBSD */ + if ((dp->dp_mid & PC98_MID_BOOTABLE) && (preflevel > PREF_FBSD_ACT)) { pref = i; preflevel = PREF_FBSD_ACT; @@ -643,7 +680,7 @@ case 0x22: case 0x23: case 0x63: - if ((dp->dp_mid & 0x80) && + if ((dp->dp_mid & PC98_MID_BOOTABLE) && (preflevel > PREF_DOS_ACT)) { pref = i; preflevel = PREF_DOS_ACT; ==== //depot/projects/usb/src/sys/boot/pc98/libpc98/time.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/time.c,v 1.6 2005/05/08 14:17:28 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/time.c,v 1.7 2009/03/20 05:21:29 nyan Exp $"); #include #include @@ -33,23 +33,21 @@ #include "bootstrap.h" #include "libi386.h" +static int bios_seconds(void); + /* - * Return the time in seconds since the beginning of the day. - * - * If we pass midnight, don't wrap back to 0. + * Return the BIOS time-of-day value. * * XXX uses undocumented BCD support from libstand. */ - -time_t -time(time_t *t) +static int +bios_seconds(void) { - static time_t lasttime, now; int hr, minute, sec; unsigned char bios_time[6]; - + v86.ctl = 0; - v86.addr = 0x1c; /* int 0x1c, function 0 */ + v86.addr = 0x1c; /* int 0x1c, function 0 */ v86.eax = 0x0000; v86.es = VTOPSEG(bios_time); v86.ebx = VTOPOFF(bios_time); @@ -59,7 +57,20 @@ minute = bcd2bin(bios_time[4]); sec = bcd2bin(bios_time[5]); - now = hr * 3600 + minute * 60 + sec; + return (hr * 3600 + minute * 60 + sec); +} + +/* + * Return the time in seconds since the beginning of the day. + */ +time_t +time(time_t *t) +{ + static time_t lasttime; + time_t now; + + now = bios_seconds(); + if (now < lasttime) now += 24 * 3600; lasttime = now; ==== //depot/projects/usb/src/sys/boot/pc98/loader/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.43 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.44 2009/03/19 13:53:42 nyan Exp $ .include MK_SSP= no @@ -18,6 +18,7 @@ CFLAGS+= -DLOADER_NFS_SUPPORT .endif +# Include bcache code. HAVE_BCACHE= yes # Enable PnP and ISA-PnP code. ==== //depot/projects/usb/src/sys/boot/pc98/loader/main.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.26 2008/08/08 19:41:20 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.27 2009/03/19 13:53:42 nyan Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -145,6 +145,14 @@ bc_add(initial_bootdev); } + archsw.arch_autoload = i386_autoload; + archsw.arch_getdev = i386_getdev; + archsw.arch_copyin = i386_copyin; + archsw.arch_copyout = i386_copyout; + archsw.arch_readin = i386_readin; + archsw.arch_isainb = isa_inb; + archsw.arch_isaoutb = isa_outb; + /* * March through the device switch probing for things. */ @@ -163,14 +171,6 @@ extract_currdev(); /* set $currdev and $loaddev */ setenv("LINES", "24", 1); /* optional */ - - archsw.arch_autoload = i386_autoload; - archsw.arch_getdev = i386_getdev; - archsw.arch_copyin = i386_copyin; - archsw.arch_copyout = i386_copyout; - archsw.arch_readin = i386_readin; - archsw.arch_isainb = isa_inb; - archsw.arch_isaoutb = isa_outb; interact(); /* doesn't return */ @@ -188,7 +188,8 @@ extract_currdev(void) { struct i386_devdesc new_currdev; - int major, biosdev = -1; + int major; + int biosdev = -1; /* Assume we are booting from a BIOS disk by default */ new_currdev.d_dev = &biosdisk; ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 (text+ko) ==== @@ -940,6 +940,8 @@ /* NB: we already did dmu_tx_wait() if necessary */ goto top; } + if (error == 0) + VOP_UNLOCK(*xvpp, 0); return (error); } ==== //depot/projects/usb/src/sys/conf/NOTES#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1531 2009/03/15 14:21:05 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1532 2009/03/19 20:33:26 thompsa Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2413,8 +2413,6 @@ device ums # Diamond Rio 500 MP3 player device urio -# USB scanners -device uscanner # # USB serial support device ucom ==== //depot/projects/usb/src/sys/conf/files#56 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1382 2009/03/15 14:21:05 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1383 2009/03/19 20:33:26 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1656,10 +1656,6 @@ dev/usb/template/usb_template_msc.c optional usb_template dev/usb/template/usb_template_mtp.c optional usb_template # -# USB image drivers -# -dev/usb/image/uscanner.c optional uscanner -# # USB END # dev/utopia/idtphy.c optional utopia ==== //depot/projects/usb/src/sys/dev/agp/agp.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.63 2009/03/09 13:27:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.64 2009/03/20 18:30:20 rnoland Exp $"); #include "opt_agp.h" #include "opt_bus.h" @@ -532,7 +532,7 @@ int error; /* Do some sanity checks first. */ - if (offset < 0 || (offset & (AGP_PAGE_SIZE - 1)) != 0 || + if ((offset & (AGP_PAGE_SIZE - 1)) != 0 || offset + mem->am_size > AGP_GET_APERTURE(dev)) { device_printf(dev, "binding memory at bad offset %#x\n", (int)offset); ==== //depot/projects/usb/src/sys/dev/agp/agp_amd64.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_amd64.c,v 1.18 2009/03/09 13:27:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_amd64.c,v 1.19 2009/03/20 18:30:20 rnoland Exp $"); #include "opt_bus.h" @@ -337,7 +337,7 @@ { struct agp_amd64_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return (EINVAL); sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = @@ -351,7 +351,7 @@ { struct agp_amd64_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return (EINVAL); sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = 0; ==== //depot/projects/usb/src/sys/dev/agp/agp_i810.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.50 2009/03/09 13:27:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.51 2009/03/20 18:30:20 rnoland Exp $"); #include "opt_bus.h" @@ -840,7 +840,7 @@ { struct agp_i810_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) { + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) { device_printf(dev, "failed: offset is 0x%08jx, shift is %d, entries is %d\n", (intmax_t)offset, AGP_PAGE_SHIFT, sc->gatt->ag_entries); return EINVAL; } @@ -862,7 +862,7 @@ { struct agp_i810_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return EINVAL; if ( sc->chiptype != CHIP_I810 ) { @@ -1016,7 +1016,7 @@ vm_offset_t i; /* Do some sanity checks first. */ - if (offset < 0 || (offset & (AGP_PAGE_SIZE - 1)) != 0 || + if ((offset & (AGP_PAGE_SIZE - 1)) != 0 || offset + mem->am_size > AGP_GET_APERTURE(dev)) { device_printf(dev, "binding memory at bad offset %#x\n", (int)offset); ==== //depot/projects/usb/src/sys/dev/agp/agp_intel.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_intel.c,v 1.37 2009/03/09 13:27:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_intel.c,v 1.38 2009/03/20 18:30:20 rnoland Exp $"); #include "opt_bus.h" @@ -371,7 +371,7 @@ sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return (EINVAL); sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = physical | 0x17; @@ -385,7 +385,7 @@ sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return (EINVAL); sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = 0; ==== //depot/projects/usb/src/sys/dev/agp/agp_via.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_via.c,v 1.28 2009/03/09 13:27:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_via.c,v 1.29 2009/03/20 18:30:20 rnoland Exp $"); #include "opt_bus.h" @@ -362,7 +362,7 @@ { struct agp_via_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return EINVAL; sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = physical; @@ -374,7 +374,7 @@ { struct agp_via_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return EINVAL; sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = 0; ==== //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.h#4 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ah.h,v 1.6 2009/02/24 01:07:06 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah.h,v 1.7 2009/03/19 19:29:10 sam Exp $ */ #ifndef _ATH_AH_H_ @@ -598,8 +598,6 @@ */ struct ath_hal { uint32_t ah_magic; /* consistency check magic number */ - uint32_t ah_abi; /* HAL ABI version */ -#define HAL_ABI_VERSION 0x08112800 /* YYMMDDnn */ uint16_t ah_devid; /* PCI device ID */ uint16_t ah_subvendorid; /* PCI subvendor ID */ HAL_SOFTC ah_sc; /* back pointer to driver/os state */ ==== //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c,v 1.4 2009/02/24 01:07:06 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c,v 1.5 2009/03/19 19:29:10 sam Exp $ */ #include "opt_ah.h" @@ -38,7 +38,6 @@ static const struct ath_hal_private ar5210hal = {{ .ah_magic = AR5210_MAGIC, - .ah_abi = HAL_ABI_VERSION, .ah_getRateTable = ar5210GetRateTable, .ah_detach = ar5210Detach, ==== //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c,v 1.5 2009/02/24 01:07:06 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c,v 1.6 2009/03/19 19:29:10 sam Exp $ */ #include "opt_ah.h" @@ -38,7 +38,6 @@ static const struct ath_hal_private ar5211hal = {{ .ah_magic = AR5211_MAGIC, - .ah_abi = HAL_ABI_VERSION, .ah_getRateTable = ar5211GetRateTable, .ah_detach = ar5211Detach, ==== //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c,v 1.4 2009/02/24 01:07:06 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c,v 1.5 2009/03/19 19:29:10 sam Exp $ */ #include "opt_ah.h" @@ -34,7 +34,6 @@ static const struct ath_hal_private ar5212hal = {{ .ah_magic = AR5212_MAGIC, - .ah_abi = HAL_ABI_VERSION, .ah_getRateTable = ar5212GetRateTable, .ah_detach = ar5212Detach, ==== //depot/projects/usb/src/sys/dev/ath/if_ath.c#20 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.240 2009/03/09 23:10:22 svn Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.242 2009/03/19 19:29:10 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -89,11 +89,6 @@ #endif /* - * We require a HAL w/ the changes for split tx/rx MIC. - */ -CTASSERT(HAL_ABI_VERSION > 0x06052200); - -/* * ATH_BCBUF determines the number of vap's that can transmit * beacons and also (currently) the number of vap's that can * have unique mac addresses/bssid. When staggering beacons @@ -225,7 +220,7 @@ const struct ieee80211_tdma_state *tdma); static void ath_tdma_config(struct ath_softc *sc, struct ieee80211vap *vap); static void ath_tdma_update(struct ieee80211_node *ni, - const struct ieee80211_tdma_param *tdma); + const struct ieee80211_tdma_param *tdma, int); static void ath_tdma_beacon_send(struct ath_softc *sc, struct ieee80211vap *vap); @@ -380,13 +375,6 @@ error = ENXIO; goto bad; } - if (ah->ah_abi != HAL_ABI_VERSION) { - if_printf(ifp, "HAL ABI mismatch detected " - "(HAL:0x%x != driver:0x%x)\n", - ah->ah_abi, HAL_ABI_VERSION); - error = ENXIO; - goto bad; - } sc->sc_ah = ah; sc->sc_invalid = 0; /* ready to go, enable interrupt handling */ #ifdef ATH_DEBUG @@ -2689,17 +2677,8 @@ u_int32_t rfilt; rfilt = HAL_RX_FILTER_UCAST | HAL_RX_FILTER_BCAST | HAL_RX_FILTER_MCAST; -#if HAL_ABI_VERSION < 0x08011600 - rfilt |= (ath_hal_getrxfilter(sc->sc_ah) & - (HAL_RX_FILTER_PHYRADAR | HAL_RX_FILTER_PHYERR)); -#elif HAL_ABI_VERSION < 0x08060100 - if (ic->ic_opmode == IEEE80211_M_STA && - !sc->sc_needmib && !sc->sc_scanning) - rfilt |= HAL_RX_FILTER_PHYERR; -#else if (!sc->sc_needmib && !sc->sc_scanning) rfilt |= HAL_RX_FILTER_PHYERR; -#endif if (ic->ic_opmode != IEEE80211_M_STA) rfilt |= HAL_RX_FILTER_PROBEREQ; if (ic->ic_opmode == IEEE80211_M_MONITOR || (ifp->if_flags & IFF_PROMISC)) @@ -6273,10 +6252,6 @@ break; case IEEE80211_MODE_TURBO_A: rt = ath_hal_getratetable(ah, HAL_MODE_108A); -#if HAL_ABI_VERSION < 0x07013100 - if (rt == NULL) /* XXX bandaid for old hal's */ - rt = ath_hal_getratetable(ah, HAL_MODE_TURBO); -#endif break; case IEEE80211_MODE_TURBO_G: rt = ath_hal_getratetable(ah, HAL_MODE_108G); @@ -7477,7 +7452,7 @@ */ static void ath_tdma_update(struct ieee80211_node *ni, - const struct ieee80211_tdma_param *tdma) + const struct ieee80211_tdma_param *tdma, int changed) { #define TSF_TO_TU(_h,_l) \ ((((u_int32_t)(_h)) << 22) | (((u_int32_t)(_l)) >> 10)) @@ -7498,7 +7473,7 @@ /* * Check for and adopt configuration changes. */ - if (isset(ATH_VAP(vap)->av_boff.bo_flags, IEEE80211_BEACON_TDMA)) { + if (changed != 0) { const struct ieee80211_tdma_state *ts = vap->iv_tdma; ath_tdma_bintvalsetup(sc, ts); ==== //depot/projects/usb/src/sys/dev/ath/if_athvar.h#16 (text+ko) ==== @@ -26,7 +26,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 20 18:50:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B11C1065677; Fri, 20 Mar 2009 18:50:26 +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 26DF81065674 for ; Fri, 20 Mar 2009 18:50:26 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE5408FC08 for ; Fri, 20 Mar 2009 18:50:25 +0000 (UTC) (envelope-from thompsa@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 n2KIoP6t027173 for ; Fri, 20 Mar 2009 18:50:25 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2KIoPkY027171 for perforce@freebsd.org; Fri, 20 Mar 2009 18:50:25 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 20 Mar 2009 18:50:25 GMT Message-Id: <200903201850.n2KIoPkY027171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 159536 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, 20 Mar 2009 18:50:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=159536 Change 159536 by thompsa@thompsa_burger on 2009/03/20 18:49:25 remove uscanner.c Affected files ... .. //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#8 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Mar 20 23:44:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6FE310656C1; Fri, 20 Mar 2009 23:44:32 +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 A517110656D0 for ; Fri, 20 Mar 2009 23:44:32 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 916408FC1A for ; Fri, 20 Mar 2009 23:44:32 +0000 (UTC) (envelope-from thompsa@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 n2KNiWB5082313 for ; Fri, 20 Mar 2009 23:44:32 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2KNiWhS082311 for perforce@freebsd.org; Fri, 20 Mar 2009 23:44:32 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 20 Mar 2009 23:44:32 GMT Message-Id: <200903202344.n2KNiWhS082311@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 159553 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, 20 Mar 2009 23:44:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=159553 Change 159553 by thompsa@thompsa_burger on 2009/03/20 23:44:19 IFC @159552 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#12 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_debug.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_debug.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_defs.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#10 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_endian.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#9 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#16 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_lookup.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_process.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_sw_transfer.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#135 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_util.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_util.h#4 integrate .. //depot/projects/usb/src/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs.h#7 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#19 integrate .. //depot/projects/usb/src/sys/nfsclient/nfsnode.h#7 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci.c,v 1.2 2009/02/24 03:39:13 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci.c,v 1.6 2009/03/20 21:57:54 thompsa Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci_atmelarm.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/at91dci_atmelarm.c,v 1.3 2009/03/20 21:57:54 thompsa Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/atmegadci.c,v 1.3 2009/03/11 04:58:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/atmegadci.c,v 1.7 2009/03/20 21:57:54 thompsa Exp $"); /*- * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/atmegadci_atmelarm.c,v 1.2 2009/03/11 04:58:21 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/atmegadci_atmelarm.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $"); /*- * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#11 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci.c,v 1.5 2009/03/07 19:49:47 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci.c,v 1.8 2009/03/20 21:57:54 thompsa Exp $"); #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/controller/ehci.h,v 1.2 2009/03/07 19:49:47 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/controller/ehci.h,v 1.3 2009/03/20 19:04:31 thompsa Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_ixp4xx.c,v 1.2 2009/03/07 19:49:47 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_ixp4xx.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $"); #include "opt_bus.h" ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_mbus.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_mbus.c,v 1.3 2009/03/20 21:57:54 thompsa Exp $"); #include "opt_bus.h" ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_pci.c,v 1.2 2009/03/09 13:23:54 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_pci.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $"); /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/controller/musb_otg.c,v 1.2 2009/02/24 03:39:13 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/controller/musb_otg.c,v 1.5 2009/03/20 21:57:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/controller/musb_otg_atmelarm.c,v 1.2 2009/03/09 20:05:46 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/controller/musb_otg_atmelarm.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci.c,v 1.2 2009/02/24 03:39:13 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci.c,v 1.5 2009/03/20 21:57:54 thompsa Exp $"); /* * USB Open Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/controller/ohci.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/controller/ohci.h,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_atmelarm.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_atmelarm.c,v 1.3 2009/03/20 21:57:54 thompsa Exp $"); #include #include ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_pci.c,v 1.2 2009/03/09 13:23:54 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_pci.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $"); /* * USB Open Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uhci.c,v 1.2 2009/02/24 03:39:13 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uhci.c,v 1.5 2009/03/20 21:57:54 thompsa Exp $"); /* * USB Universal Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/controller/uhci.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/controller/uhci.h,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uhci_pci.c,v 1.2 2009/03/09 13:23:54 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uhci_pci.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $"); /* Universal Host Controller Interface * ==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/controller/usb_controller.c,v 1.2 2009/03/11 04:56:30 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/controller/usb_controller.c,v 1.4 2009/03/20 21:48:11 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/controller/uss820dci.c,v 1.3 2009/02/24 17:15:29 ed Exp $ */ +/* $FreeBSD: src/sys/dev/usb/controller/uss820dci.c,v 1.7 2009/03/20 21:57:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uss820dci_atmelarm.c,v 1.2 2009/02/24 17:15:29 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/uss820dci_atmelarm.c,v 1.4 2009/03/20 21:57:54 thompsa Exp $"); /*- * Copyright (c) 2008 Hans Petter Selasky ==== //depot/projects/usb/src/sys/dev/usb/input/uhid.c#5 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/input/uhid.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/input/uhid.c,v 1.4 2009/03/20 18:56:27 thompsa Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/input/ums.c,v 1.5 2009/03/09 15:25:46 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/input/ums.c,v 1.6 2009/03/20 18:56:27 thompsa Exp $"); /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf ==== //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/misc/udbp.c,v 1.2 2009/03/02 05:37:05 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/misc/udbp.c,v 1.3 2009/03/20 22:10:36 thompsa Exp $"); /* Driver for arbitrary double bulk pipe devices. * The driver assumes that there will be the same driver on the other side. ==== //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#5 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/net/if_cdce.c,v 1.3 2009/03/08 06:56:13 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/net/if_cdce.c,v 1.4 2009/03/20 19:04:31 thompsa Exp $"); #include "usbdevs.h" #include ==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#6 (text+ko) ==== @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: src/sys/dev/usb/serial/u3g.c,v 1.5 2009/03/08 22:55:17 thompsa Exp $ + * $FreeBSD: src/sys/dev/usb/serial/u3g.c,v 1.6 2009/03/20 19:04:31 thompsa Exp $ */ /* ==== //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#5 (text+ko) ==== @@ -70,7 +70,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ubser.c,v 1.4 2009/03/02 05:37:05 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ubser.c,v 1.6 2009/03/20 19:04:31 thompsa Exp $"); /* * BWCT serial adapter driver ==== //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ucycom.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ucycom.c,v 1.5 2009/03/20 22:10:36 thompsa Exp $"); /*- * Copyright (c) 2004 Dag-Erling Coïdan Smørgrav ==== //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#4 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ufoma.c,v 1.4 2009/03/02 05:37:05 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ufoma.c,v 1.5 2009/03/20 22:10:36 thompsa Exp $"); #define UFOMA_HANDSFREE /*- * Copyright (c) 2005, Takanori Watanabe ==== //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/serial/ugensa.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/serial/ugensa.c,v 1.4 2009/03/20 19:04:31 thompsa Exp $ */ /* $NetBSD: ugensa.c,v 1.9.2.1 2007/03/24 14:55:50 yamt Exp $ */ /* ==== //depot/projects/usb/src/sys/dev/usb/serial/umct.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/serial/umct.c,v 1.4 2009/03/02 05:37:05 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/serial/umct.c,v 1.5 2009/03/20 19:04:31 thompsa Exp $"); /*- * Copyright (c) 2003 Scott Long ==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#7 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/serial/umodem.c,v 1.5 2009/03/05 16:15:07 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/serial/umodem.c,v 1.7 2009/03/20 19:04:31 thompsa Exp $"); /*- * Copyright (c) 2003, M. Warner Losh . ==== //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#4 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: uplcom.c,v 1.21 2001/11/13 06:24:56 lukem Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/serial/uplcom.c,v 1.4 2009/03/04 03:47:57 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/serial/uplcom.c,v 1.5 2009/03/20 18:56:27 thompsa Exp $"); /*- * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . ==== //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/serial/uvisor.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/serial/uvisor.c,v 1.4 2009/03/20 18:56:27 thompsa Exp $ */ /* Also already merged from NetBSD: * $NetBSD: uvisor.c,v 1.12 2001/11/13 06:24:57 lukem Exp $ ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.4 2009/03/17 01:42:46 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.7 2009/03/20 22:17:27 thompsa Exp $"); /*- * Copyright (c) 1999 MAEKAWA Masahide , @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.4 2009/03/17 01:42:46 thompsa Exp $ + * $FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.7 2009/03/20 22:17:27 thompsa Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ ==== //depot/projects/usb/src/sys/dev/usb/storage/urio.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/storage/urio.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/storage/urio.c,v 1.4 2009/03/20 22:10:36 thompsa Exp $"); /* ==== //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/storage/ustorage_fs.c,v 1.2 2009/03/02 05:37:05 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/storage/ustorage_fs.c,v 1.5 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (C) 2003-2005 Alan Stern * Copyright (C) 2008 Hans Petter Selasky ==== //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/template/usb_template.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/template/usb_template.c,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */ /*- * Copyright (c) 2007 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_bus.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_bus.h,v 1.2 2009/02/27 17:27:16 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_bus.h,v 1.4 2009/03/20 23:12:14 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_busdma.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_busdma.c,v 1.4 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_busdma.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_busdma.h,v 1.4 2009/03/20 23:12:14 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#32 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_compat_linux.c,v 1.2 2009/03/02 05:37:05 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_compat_linux.c,v 1.4 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved. * Copyright (c) 2007 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_compat_linux.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_compat_linux.h,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved. * Copyright (c) 2007 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/usb_controller.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_controller.h,v 1.2 2009/02/24 03:39:13 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_controller.h,v 1.3 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_core.h,v 1.4 2009/03/09 20:08:08 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_core.h,v 1.8 2009/03/20 22:04:33 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_debug.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_debug.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_debug.c,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_debug.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_debug.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_debug.h,v 1.2 2009/03/20 21:48:11 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_defs.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_defs.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_defs.h,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_dev.c,v 1.9 2009/03/17 01:46:40 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_dev.c,v 1.12 2009/03/20 23:12:14 thompsa Exp $ */ /*- * Copyright (c) 2006-2008 Hans Petter Selasky. All rights reserved. * @@ -54,6 +54,8 @@ #include +#if USB_HAVE_UGEN + #if USB_DEBUG static int usb2_fifo_debug = 0; @@ -2195,3 +2197,4 @@ /* send a Zero Length Packet, ZLP, before close */ f->flag_short = onoff; } +#endif /* USB_HAVE_UGEN */ ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_dev.h,v 1.4 2009/03/17 01:46:40 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_dev.h,v 1.5 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_device.c,v 1.7 2009/03/09 20:08:08 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_device.c,v 1.11 2009/03/20 23:12:14 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -75,9 +75,8 @@ #endif static usb2_error_t usb2_fill_iface_data(struct usb2_device *, uint8_t, uint8_t); +#if USB_HAVE_UGEN static void usb2_notify_addq(const char *type, struct usb2_device *); - -#if USB_HAVE_UGEN static void usb2_fifo_free_wrap(struct usb2_device *, uint8_t, uint8_t); static struct cdev *usb2_make_dev(struct usb2_device *, int, int); static void usb2_cdev_create(struct usb2_device *); @@ -1446,13 +1445,11 @@ /* set device index */ udev->device_index = device_index; -#if USB_HAVE_STRINGS +#if USB_HAVE_UGEN /* Create ugen name */ snprintf(udev->ugen_name, sizeof(udev->ugen_name), USB_GENERIC_NAME "%u.%u", device_get_unit(bus->bdev), device_index); -#endif -#if USB_HAVE_UGEN LIST_INIT(&udev->pd_list); /* Create the control endpoint device */ @@ -1716,13 +1713,14 @@ #if USB_HAVE_UGEN /* Symlink the ugen device name */ udev->ugen_symlink = usb2_alloc_symlink(udev->ugen_name); -#endif + + /* Announce device */ #if USB_HAVE_STRINGS - /* Announce device */ printf("%s: <%s> at %s\n", udev->ugen_name, udev->manufacturer, device_get_nameunit(udev->bus->bdev)); #endif usb2_notify_addq("+", udev); +#endif done: if (err) { /* free device */ @@ -1852,12 +1850,14 @@ DPRINTFN(4, "udev=%p port=%d\n", udev, udev->port_no); +#if USB_HAVE_UGEN usb2_notify_addq("-", udev); +#if USB_HAVE_STRINGS printf("%s: <%s> at %s (disconnected)\n", udev->ugen_name, udev->manufacturer, device_get_nameunit(bus->bdev)); +#endif -#if USB_HAVE_UGEN /* Destroy UGEN symlink, if any */ if (udev->ugen_symlink) { usb2_free_symlink(udev->ugen_symlink); @@ -1923,7 +1923,9 @@ usb2_cv_destroy(udev->default_cv + 1); mtx_destroy(udev->default_mtx); +#if USB_HAVE_UGEN KASSERT(LIST_FIRST(&udev->pd_list) == NULL, ("leaked cdev entries")); +#endif /* free device */ free(udev, M_USB); @@ -2026,14 +2028,24 @@ if (udd->bDeviceClass != 0xFF) { snprintf(dst_ptr, dst_len, "%s %s, class %d/%d, rev %x.%02x/" - "%x.%02x, addr %d", udev->manufacturer, udev->product, + "%x.%02x, addr %d", +#if USB_HAVE_STRINGS + udev->manufacturer, udev->product, +#else + "-", "-", +#endif udd->bDeviceClass, udd->bDeviceSubClass, (bcdUSB >> 8), bcdUSB & 0xFF, (bcdDevice >> 8), bcdDevice & 0xFF, udev->address); } else { snprintf(dst_ptr, dst_len, "%s %s, rev %x.%02x/" - "%x.%02x, addr %d", udev->manufacturer, udev->product, + "%x.%02x, addr %d", +#if USB_HAVE_STRINGS + udev->manufacturer, udev->product, +#else + "-", "-", +#endif (bcdUSB >> 8), bcdUSB & 0xFF, (bcdDevice >> 8), bcdDevice & 0xFF, udev->address); @@ -2230,6 +2242,7 @@ return (udev->device_index); } +#if USB_HAVE_UGEN /*------------------------------------------------------------------------* * usb2_notify_addq * @@ -2238,7 +2251,6 @@ static void usb2_notify_addq(const char *type, struct usb2_device *udev) { -#if USB_HAVE_STRINGS char *data = NULL; struct malloc_type *mt; @@ -2272,36 +2284,19 @@ UGETW(udev->ddesc.idProduct), udev->ddesc.bDeviceClass, udev->ddesc.bDeviceSubClass, +#if USB_HAVE_STRINGS udev->serial, +#else + "", +#endif udev->port_no, - udev->parent_hub->ugen_name); - } else { - snprintf(data, 1024, - "%s" - "%s " - "vendor=0x%04x " - "product=0x%04x " - "devclass=0x%02x " - "devsubclass=0x%02x " - "sernum=\"%s\" " - "at port=%u " - "on " - "%s\n", - type, - udev->ugen_name, - UGETW(udev->ddesc.idVendor), - UGETW(udev->ddesc.idProduct), - udev->ddesc.bDeviceClass, - udev->ddesc.bDeviceSubClass, - udev->serial, - udev->port_no, - device_get_nameunit(device_get_parent(udev->bus->bdev))); + udev->parent_hub != NULL ? + udev->parent_hub->ugen_name : + device_get_nameunit(device_get_parent(udev->bus->bdev))); } devctl_queue_data(data); -#endif } -#if USB_HAVE_UGEN /*------------------------------------------------------------------------* * usb2_fifo_free_wrap * ==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_device.h,v 1.6 2009/03/17 01:46:40 thompsa Exp $ */ +/* $FreeBSD: head/sys/dev/usb/usb_device.h 190191 2009-03-20 23:12:14Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -125,6 +125,7 @@ struct usb2_fifo *fifo[USB_FIFO_MAX]; struct usb2_symlink *ugen_symlink; /* our generic symlink */ LIST_HEAD(,usb2_fs_privdata) pd_list; + char ugen_name[20]; /* name of ugenX.X device */ #endif usb2_ticks_t plugtime; /* copy of "ticks" */ @@ -155,7 +156,6 @@ struct usb2_device_descriptor ddesc; /* device descriptor */ #if USB_HAVE_STRINGS - char ugen_name[20]; /* name of ugenX.X device */ char serial[64]; /* serial number */ char manufacturer[64]; /* manufacturer string */ char product[64]; /* product string */ ==== //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_dynamic.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_dynamic.c,v 1.2 2009/03/20 19:04:31 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_endian.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_endian.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_endian.h,v 1.2 2009/03/20 18:59:53 thompsa Exp $ */ /* * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_generic.c,v 1.4 2009/02/27 22:12:15 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_generic.c,v 1.8 2009/03/20 23:12:14 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -47,6 +47,8 @@ #include #include +#if USB_HAVE_UGEN + /* defines */ #define UGEN_BULK_FS_BUFFER_SIZE (64*32) /* bytes */ @@ -799,12 +801,14 @@ di->udi_bus = device_get_unit(udev->bus->bdev); di->udi_addr = udev->address; di->udi_index = udev->device_index; +#if USB_HAVE_STRINGS strlcpy(di->udi_serial, udev->serial, sizeof(di->udi_serial)); strlcpy(di->udi_vendor, udev->manufacturer, sizeof(di->udi_vendor)); strlcpy(di->udi_product, udev->product, sizeof(di->udi_product)); +#endif usb2_printBCD(di->udi_release, sizeof(di->udi_release), UGETW(udev->ddesc.bcdDevice)); di->udi_vendorNo = UGETW(udev->ddesc.idVendor); @@ -2183,3 +2187,4 @@ break; } } +#endif /* USB_HAVE_UGEN */ ==== //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_handle_request.c,v 1.2 2009/02/24 03:41:52 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_handle_request.c,v 1.4 2009/03/20 22:10:36 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#28 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_hid.c,v 1.6 2009/03/13 22:28:37 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_hid.c,v 1.8 2009/03/20 21:50:54 thompsa Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.h#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_hid.h,v 1.3 2009/03/08 22:58:19 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_hid.h,v 1.4 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_hub.c,v 1.4 2009/03/09 20:08:08 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_hub.c,v 1.7 2009/03/20 23:12:14 thompsa Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. @@ -978,7 +978,11 @@ UGETW(res.udev->ddesc.idProduct), res.udev->ddesc.bDeviceClass, res.udev->ddesc.bDeviceSubClass, +#if USB_HAVE_STRINGS res.udev->serial, +#else + "", +#endif iface->idesc->bInterfaceClass, iface->idesc->bInterfaceSubClass); } else { ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_hub.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: head/sys/dev/usb/usb_hub.h 190181 2009-03-20 21:50:54Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -27,11 +27,6 @@ #ifndef _USB2_HUB_H_ #define _USB2_HUB_H_ -#include - -struct usb2_bus; -struct usb2_device; - /* * The following structure defines an USB port. */ ==== //depot/projects/usb/src/sys/dev/usb/usb_lookup.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_lookup.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_lookup.c,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_lookup.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_lookup.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_lookup.h,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_mbuf.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_mbuf.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_mbuf.c,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_mbuf.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_mbuf.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_mbuf.h,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_msctest.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_msctest.c,v 1.4 2009/03/20 22:10:36 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_process.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_process.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_process.c,v 1.2 2009/03/20 21:50:54 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usb_process.h#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 21 02:25:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0AD9106566C; Sat, 21 Mar 2009 02:25:16 +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 AD84D106566B for ; Sat, 21 Mar 2009 02:25:16 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 817D88FC1D for ; Sat, 21 Mar 2009 02:25:16 +0000 (UTC) (envelope-from gabor@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 n2L2PGfg010939 for ; Sat, 21 Mar 2009 02:25:16 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2L2PGuv010937 for perforce@freebsd.org; Sat, 21 Mar 2009 02:25:16 GMT (envelope-from gabor@freebsd.org) Date: Sat, 21 Mar 2009 02:25:16 GMT Message-Id: <200903210225.n2L2PGuv010937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 159558 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: Sat, 21 Mar 2009 02:25:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=159558 Change 159558 by gabor@gabor_server on 2009/03/21 02:24:57 - Clean up Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#19 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#19 (text+ko) ==== @@ -30,10 +30,6 @@ NLS= es_ES.ISO8859-1 NLS+= hu_HU.ISO8859-2 NLS+= pt_BR.ISO8859-1 -NLSSRCFILES= ${NLS:S@$@.msg@} -.for lang in ${NLS} -NLSSRCDIR_${lang}= ${.CURDIR}/nls -.endfor .else CFLAGS+= -DWITHOUT_NLS .endif From owner-p4-projects@FreeBSD.ORG Sat Mar 21 04:14:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 084051065673; Sat, 21 Mar 2009 04:14:10 +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 B223A106566C for ; Sat, 21 Mar 2009 04:14:09 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DE118FC08 for ; Sat, 21 Mar 2009 04:14:09 +0000 (UTC) (envelope-from nwhitehorn@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 n2L4E9ED022037 for ; Sat, 21 Mar 2009 04:14:09 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2L4E7cS022035 for perforce@freebsd.org; Sat, 21 Mar 2009 04:14:07 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 21 Mar 2009 04:14:07 GMT Message-Id: <200903210414.n2L4E7cS022035@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 159560 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: Sat, 21 Mar 2009 04:14:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=159560 Change 159560 by nwhitehorn@nwhitehorn_comporellon on 2009/03/21 04:13:39 IFC. This brings in Altivec support, and machdep.c and trap_subr.S have been adjusted to support inserting the various 64-bit trap handling shims into the Altivec trap handlers on systems running in bridge mode. Affected files ... .. //depot/projects/ppc-g5/MAINTAINERS#3 integrate .. //depot/projects/ppc-g5/Makefile#4 integrate .. //depot/projects/ppc-g5/Makefile.inc1#8 integrate .. //depot/projects/ppc-g5/ObsoleteFiles.inc#11 integrate .. //depot/projects/ppc-g5/UPDATING#12 integrate .. //depot/projects/ppc-g5/bin/cat/Makefile#2 integrate .. //depot/projects/ppc-g5/cddl/Makefile.inc#3 integrate .. //depot/projects/ppc-g5/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/ppc-g5/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/ppc-g5/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/ppc-g5/contrib/gcc/c-cppbuiltin.c#2 integrate .. //depot/projects/ppc-g5/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/ppc-g5/contrib/gcc/c-opts.c#2 integrate .. //depot/projects/ppc-g5/contrib/gcc/c-tree.h#2 integrate .. //depot/projects/ppc-g5/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/ppc-g5/contrib/gcc/doc/extend.texi#2 integrate .. //depot/projects/ppc-g5/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wme.h#2 integrate .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c#2 integrate .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/ppc-g5/etc/defaults/rc.conf#8 integrate .. //depot/projects/ppc-g5/etc/netstart#2 integrate .. //depot/projects/ppc-g5/etc/network.subr#4 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/cc/Makefile.inc#2 integrate .. //depot/projects/ppc-g5/include/arpa/inet.h#2 integrate .. //depot/projects/ppc-g5/include/ctype.h#2 integrate .. //depot/projects/ppc-g5/include/db.h#2 integrate .. //depot/projects/ppc-g5/include/grp.h#2 integrate .. //depot/projects/ppc-g5/include/ndbm.h#2 integrate .. //depot/projects/ppc-g5/include/netdb.h#2 integrate .. //depot/projects/ppc-g5/include/pthread.h#2 integrate .. //depot/projects/ppc-g5/include/pwd.h#2 integrate .. //depot/projects/ppc-g5/include/setjmp.h#2 integrate .. //depot/projects/ppc-g5/include/signal.h#3 integrate .. //depot/projects/ppc-g5/include/stdio.h#3 integrate .. //depot/projects/ppc-g5/include/stdlib.h#4 integrate .. //depot/projects/ppc-g5/include/string.h#5 integrate .. //depot/projects/ppc-g5/include/unistd.h#4 integrate .. //depot/projects/ppc-g5/lib/libc/Makefile#3 integrate .. //depot/projects/ppc-g5/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/ppc-g5/lib/libc/nls/ca_ES.ISO8859-1.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/de_DE.ISO8859-1.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/el_GR.ISO8859-7.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/es_ES.ISO8859-1.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/fi_FI.ISO8859-1.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/fr_FR.ISO8859-1.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/hu_HU.ISO8859-2.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/it_IT.ISO8859-15.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/mn_MN.UTF-8.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/nl_NL.ISO8859-1.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/no_NO.ISO8859-1.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/pt_BR.ISO8859-1.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/sk_SK.ISO8859-2.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/sv_SE.ISO8859-1.msg#1 branch .. //depot/projects/ppc-g5/lib/libc/nls/uk_UA.UTF-8.msg#1 branch .. //depot/projects/ppc-g5/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/ppc-g5/lib/libusb/libusb20.h#2 integrate .. //depot/projects/ppc-g5/lib/msun/src/math.h#4 integrate .. //depot/projects/ppc-g5/lib/msun/src/math_private.h#3 integrate .. //depot/projects/ppc-g5/lib/msun/src/s_cimag.c#2 integrate .. //depot/projects/ppc-g5/lib/msun/src/s_cimagf.c#2 integrate .. //depot/projects/ppc-g5/lib/msun/src/s_cimagl.c#2 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.c#5 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/ppc-g5/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/projects/ppc-g5/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#3 integrate .. //depot/projects/ppc-g5/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#3 integrate .. //depot/projects/ppc-g5/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/ppc-g5/release/doc/zh_CN.GB2312/hardware/article.sgml#3 integrate .. //depot/projects/ppc-g5/release/picobsd/build/picobsd#3 integrate .. //depot/projects/ppc-g5/release/picobsd/tinyware/simple_httpd/Makefile#2 integrate .. //depot/projects/ppc-g5/release/picobsd/tinyware/simple_httpd/simple_httpd.c#2 integrate .. //depot/projects/ppc-g5/sbin/fdisk_pc98/fdisk.c#2 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifclone.c#3 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifconfig.c#5 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifgroup.c#2 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/ppc-g5/share/man/man4/Makefile#11 integrate .. //depot/projects/ppc-g5/share/man/man4/amdtemp.4#1 branch .. //depot/projects/ppc-g5/share/man/man4/k8temp.4#2 delete .. //depot/projects/ppc-g5/share/man/man4/lo.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/pccbb.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/usb.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/uscanner.4#3 delete .. //depot/projects/ppc-g5/share/man/man5/devfs.rules.5#2 integrate .. //depot/projects/ppc-g5/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/ppc-g5/share/man/man8/diskless.8#2 integrate .. //depot/projects/ppc-g5/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/ppc-g5/share/misc/committers-src.dot#7 integrate .. //depot/projects/ppc-g5/share/misc/iso3166#2 integrate .. //depot/projects/ppc-g5/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/northamerica#3 integrate .. //depot/projects/ppc-g5/sys/amd64/acpica/Makefile#1 branch .. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_switch.S#1 branch .. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/ppc-g5/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/acpica/genwakecode.sh#1 branch .. //depot/projects/ppc-g5/sys/amd64/acpica/genwakedata.sh#1 branch .. //depot/projects/ppc-g5/sys/amd64/amd64/amd64_mem.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/ppc-g5/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/ppc-g5/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/ppc-g5/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/ppc-g5/sys/amd64/include/elf.h#3 integrate .. //depot/projects/ppc-g5/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/ppc-g5/sys/amd64/include/smp.h#3 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/ppc-g5/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/ppc-g5/sys/arm/conf/HL200#6 integrate .. //depot/projects/ppc-g5/sys/arm/conf/KB920X#6 integrate .. //depot/projects/ppc-g5/sys/arm/include/elf.h#3 integrate .. //depot/projects/ppc-g5/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/ppc-g5/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/ppc-g5/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_emul.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/ppc-g5/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/ppc-g5/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/ppc-g5/sys/compat/svr4/svr4_sysvec.c#5 integrate .. //depot/projects/ppc-g5/sys/conf/NOTES#11 integrate .. //depot/projects/ppc-g5/sys/conf/files#14 integrate .. //depot/projects/ppc-g5/sys/conf/files.amd64#9 integrate .. //depot/projects/ppc-g5/sys/conf/files.i386#10 integrate .. //depot/projects/ppc-g5/sys/conf/files.pc98#8 integrate .. //depot/projects/ppc-g5/sys/conf/options#11 integrate .. //depot/projects/ppc-g5/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/agp/agp.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/agp/agp_amd64.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/agp/agp_i810.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/agp/agp_intel.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/agp/agp_via.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_athvar.h#9 integrate .. //depot/projects/ppc-g5/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/ppc-g5/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/dc/pnphy.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/drm/ati_pcigart.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_bufs.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_irq.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_lock.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_vm.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_dma.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_drv.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_drv.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_irq.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_reg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_suspend.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/r600_cp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/drm/radeon_irq.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/fe/if_fe_pccard.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/k8temp/k8temp.c#5 delete .. //depot/projects/ppc-g5/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/ppc-g5/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/usb/uaudio.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/syscons/teken/teken_subr.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/ehci_mbus.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/ohci.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/ohci_atmelarm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/uhci.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/image/uscanner.c#2 delete .. //depot/projects/ppc-g5/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_busdma.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_controller.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_defs.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_endian.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_handle_request.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_if.m#2 edit .. //depot/projects/ppc-g5/sys/dev/usb/usb_lookup.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_lookup.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_mbuf.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_mbuf.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_process.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_request.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_sw_transfer.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_util.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usb_util.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbhid.h#2 edit .. //depot/projects/ppc-g5/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/ppc-g5/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part.c#8 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_ebr.c#3 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/ppc-g5/sys/i386/conf/NOTES#7 integrate .. //depot/projects/ppc-g5/sys/i386/conf/XBOX#3 integrate .. //depot/projects/ppc-g5/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/i386/i386/i686_mem.c#4 integrate .. //depot/projects/ppc-g5/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/ppc-g5/sys/i386/include/elf.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/linux/linux_sysvec.c#7 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/elf_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/ia64/include/elf.h#3 integrate .. //depot/projects/ppc-g5/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/kern_exec.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/kern_lock.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_poll.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/kern_sx.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_thread.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/sched_ule.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/subr_lock.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_smp.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/ppc-g5/sys/mips/include/elf.h#3 integrate .. //depot/projects/ppc-g5/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/ppc-g5/sys/modules/Makefile#12 integrate .. //depot/projects/ppc-g5/sys/modules/amdtemp/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ip6_mroute_mod/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ip_mroute_mod/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/k8temp/Makefile#2 delete .. //depot/projects/ppc-g5/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/usb/Makefile#4 integrate .. //depot/projects/ppc-g5/sys/modules/usb/uscanner/Makefile#2 delete .. //depot/projects/ppc-g5/sys/net/if.c#12 integrate .. //depot/projects/ppc-g5/sys/net/if_bridge.c#7 integrate .. //depot/projects/ppc-g5/sys/net/if_loop.c#6 integrate .. //depot/projects/ppc-g5/sys/net/if_tap.c#5 integrate .. //depot/projects/ppc-g5/sys/net/if_var.h#8 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211.h#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_node.h#8 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_scan_sta.c#9 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_tdma.c#4 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_var.h#8 integrate .. //depot/projects/ppc-g5/sys/netinet/igmp.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/igmp.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet/in.c#11 integrate .. //depot/projects/ppc-g5/sys/netinet/in.h#6 integrate .. //depot/projects/ppc-g5/sys/netinet/in_mcast.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.c#12 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet/sctputil.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/sctputil.h#4 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_timewait.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6.c#11 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_ifattach.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_mroute.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet6/mld6.c#5 integrate .. //depot/projects/ppc-g5/sys/netipsec/key.c#6 integrate .. //depot/projects/ppc-g5/sys/netnatm/natm.c#3 integrate .. //depot/projects/ppc-g5/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs.h#4 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfsnode.h#3 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/ppc-g5/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/ppc-g5/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/ppc-g5/sys/pci/intpm.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#11 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/trap_subr.S#6 edit .. //depot/projects/ppc-g5/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/elf.h#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/spr.h#5 integrate .. //depot/projects/ppc-g5/sys/powerpc/mpc85xx/mpc85xx.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_audit.c#4 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_cred.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_framework.c#4 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_inet.c#4 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_inet6.c#4 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_internal.h#4 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_priv.c#4 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_socket.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_syscalls.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/ppc-g5/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/ppc-g5/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/central/central.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/ppc-g5/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/ppc-g5/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/include/elf.h#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/include/trap.h#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/isa/ofw_isa.c#4 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/apb.c#4 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/pci/schizo.c#7 integrate .. //depot/projects/ppc-g5/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/sbus/sbusvar.h#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/db_disasm.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/elf_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/jbusppm.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/machdep.c#9 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/mp_machdep.c#6 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/rtc.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/sc_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/schppm.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/ppc-g5/sys/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/ppc-g5/sys/sun4v/conf/GENERIC#5 integrate .. //depot/projects/ppc-g5/sys/sun4v/include/elf.h#3 integrate .. //depot/projects/ppc-g5/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/ppc-g5/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/ppc-g5/sys/sys/_pthreadtypes.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/aio.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/buf.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/elf_common.h#5 integrate .. //depot/projects/ppc-g5/sys/sys/imgact.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/lock_profile.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/memrange.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/param.h#12 integrate .. //depot/projects/ppc-g5/sys/sys/proc.h#7 integrate .. //depot/projects/ppc-g5/sys/sys/sem.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/shm.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/smp.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/stat.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/syslog.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/termios.h#4 integrate .. //depot/projects/ppc-g5/sys/sys/time.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/uio.h#2 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/ppc-g5/tools/regression/include/tgmath/Makefile#2 integrate .. //depot/projects/ppc-g5/tools/regression/mac/mac_portacl/LICENSE#1 branch .. //depot/projects/ppc-g5/tools/regression/mac/mac_portacl/misc.sh#1 branch .. //depot/projects/ppc-g5/tools/regression/mac/mac_portacl/nobody.t#1 branch .. //depot/projects/ppc-g5/tools/regression/mac/mac_portacl/root.t#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/rescue/AMD64#2 integrate .. //depot/projects/ppc-g5/tools/tools/nanobsd/rescue/I386#2 integrate .. //depot/projects/ppc-g5/usr.bin/ar/ar.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/ppc-g5/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/ministat/ministat.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/ncal/ncal.1#3 integrate .. //depot/projects/ppc-g5/usr.bin/ncal/ncal.c#3 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/inet.c#6 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/main.c#7 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/mroute.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/netstat/netstat.h#5 integrate .. //depot/projects/ppc-g5/usr.bin/systat/netstat.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/eeprom/ofw_options.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/mergemaster/mergemaster.8#4 integrate .. //depot/projects/ppc-g5/usr.sbin/mergemaster/mergemaster.sh#5 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/config.c#5 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/dispatch.c#4 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/menus.c#6 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/modules.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/sysinstall.8#5 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/sysinstall.h#7 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/user.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/usbconfig/usbconfig.c#6 integrate .. //depot/projects/ppc-g5/usr.sbin/wpa/Makefile.inc#3 integrate Differences ... ==== //depot/projects/ppc-g5/MAINTAINERS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.151 2009/03/01 14:44:03 sos Exp $ +$FreeBSD: src/MAINTAINERS,v 1.152 2009/03/20 18:51:13 rnoland Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -76,7 +76,7 @@ share/mk ru This is a vital component of the build system, so I offer a pre-commit review for anything non-trivial. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org -drm anholt Just keep me informed of changes, try not to break it. +drm rnoland Just keep me informed of changes, try not to break it. libufs jmallett Willing to handle problems, help with work. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. ==== //depot/projects/ppc-g5/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.356 2008/12/27 15:07:51 bz Exp $ +# $FreeBSD: src/Makefile,v 1.357 2009/03/13 07:23:58 imp Exp $ # # The user-driven targets are: # @@ -88,7 +88,7 @@ obj objlink regress rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ - build32 distribute32 install32 + build32 distribute32 install32 xdev xdev-build xdev-install TGTS+= ${SUBDIR_TARGETS} BITGTS= files includes ==== //depot/projects/ppc-g5/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.617 2009/02/21 15:04:31 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.623 2009/03/19 00:44:22 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -233,7 +233,7 @@ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ - -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ + -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF # build-tools stage @@ -292,7 +292,7 @@ SHLIBDIR=/usr/lib32 LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ - -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \ + -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \ -DWITHOUT_HTML -DNO_CTF DESTDIR=${LIB32TMP} LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*} -DNO_INCS .endif @@ -345,30 +345,13 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/sys usr/lib \ - usr/libexec usr/sbin usr/share/dict \ - usr/share/groff_font/devX100 \ - usr/share/groff_font/devX100-12 \ - usr/share/groff_font/devX75 \ - usr/share/groff_font/devX75-12 \ - usr/share/groff_font/devascii \ - usr/share/groff_font/devcp1047 \ - usr/share/groff_font/devdvi \ - usr/share/groff_font/devhtml \ - usr/share/groff_font/devkoi8-r \ - usr/share/groff_font/devlatin1 \ - usr/share/groff_font/devlbp \ - usr/share/groff_font/devlj4 \ - usr/share/groff_font/devps \ - usr/share/groff_font/devutf8 \ - usr/share/tmac/mdoc usr/share/tmac/mm - mkdir -p ${WORLDTMP}/legacy/${_dir} -.endfor -.for _dir in \ - lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ - usr/libexec usr/sbin usr/share/misc + lib usr legacy/usr mkdir -p ${WORLDTMP}/${_dir} .endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${WORLDTMP}/legacy/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${WORLDTMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} @@ -430,7 +413,7 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ - -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE libraries + -DWITHOUT_MAN -DWITHOUT_PROFILE libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -449,10 +432,9 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 5.1: building 32 bit shim libraries" @echo "--------------------------------------------------------------" -.for _dir in \ - usr/include usr/lib32 usr/share/misc - mkdir -p ${LIB32TMP}/${_dir} -.endfor + mkdir -p ${LIB32TMP}/usr/lib32 + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${LIB32TMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null mkdir -p ${WORLDTMP} @@ -613,8 +595,12 @@ # # Required install tools to be saved in a scratch dir for safety. # +.if ${MK_INFO} != "no" +_install-info= install-info +.endif + ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ + date echo egrep find grep ${_install-info} \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic @@ -1032,6 +1018,7 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ + usr.bin/ar \ usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ @@ -1329,3 +1316,92 @@ # showconfig: @${MAKE} -n -f bsd.own.mk -V dummy -dg1 | grep ^MK_ | sort + + +############### + +.if defined(XDEV) && defined(XDEV_ARCH) + +NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ + -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \ + -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS + +XDDIR=${XDEV}-freebsd +XDTP=/usr/${XDDIR} +CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ + TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} +CDENV= ${CDBENV} \ + _SHLIBDIRPREFIX=${XDTP} \ + TOOLS_PREFIX=${XDTP} +CD2ENV=${CDENV} \ + MACHINE=${XDEV} MACHINE_ARCH=${XDEV_ARCH} + +CDTMP= ${MAKEOBJDIRPREFIX}/${XDEV}/${.CURDIR}/tmp +CDMAKE=${CDENV} ${MAKE} ${NOFUN} +CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}${XDTP} +.if !defined(OSREL) +OSREL!= uname -r | sed -e 's/[-(].*//' +.endif + +.ORDER: xdev-build xdev-install +xdev: xdev-build xdev-install + +.ORDER: _xb-build-tools _xb-cross-tools +xdev-build: _xb-build-tools _xb-cross-tools + +_xb-build-tools: + ${_+_}cd ${.CURDIR}; \ + ${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools + +_xb-cross-tools: +.for _tool in \ + gnu/usr.bin/binutils \ + gnu/usr.bin/cc + ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ obj; \ + ${CDMAKE} DIRPRFX=${_tool}/ depend; \ + ${CDMAKE} DIRPRFX=${_tool}/ all +.endfor + +_xi-mtree: + ${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}" + mkdir -p ${XDDESTDIR} + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ + -p ${XDDESTDIR} >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${XDDESTDIR}/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${XDDESTDIR}/usr/include >/dev/null + +.ORDER: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links +xdev-install: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links + +_xi-cross-tools: + @echo "_xi-cross-tools" +.for _tool in \ + gnu/usr.bin/binutils \ + gnu/usr.bin/cc + ${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR} +.endfor + +_xi-includes: + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes \ + DESTDIR=${XDDESTDIR} + +_xi-libraries: + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \ + DESTDIR=${XDDESTDIR} + +_xi-links: + ${_+_}cd ${XDDESTDIR}/usr/bin; \ + for i in *; do \ + ln -sf ../../${XDTP}/usr/bin/$$i \ + ../../../../usr/bin/${XDDIR}-$$i; \ + ln -sf ../../${XDTP}/usr/bin/$$i \ + ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \ + done +.endif ==== //depot/projects/ppc-g5/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.176 2009/03/09 23:18:07 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.178 2009/03/19 20:33:26 thompsa Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090319: uscanner(4) has been removed +OLD_FILES+=usr/share/man/man4/uscanner.4.gz +# 20090313: k8temp(4) renamed to amdtemp(4) +OLD_FILES+=usr/share/man/man4/k8temp.4.gz # 20090308: libusb.so.1 renamed OLD_LIBS+=usr/lib/libusb20.so.1 OLD_FILES+=usr/lib/libusb20.a ==== //depot/projects/ppc-g5/UPDATING#12 (text+ko) ==== @@ -22,6 +22,56 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090320: + GEOM_PART has become the default partition slicer for storage devices, + replacing GEOM_MBR, GEOM_BSD, GEOM_PC98 and GEOM_GPT slicers. It + introduces some changes: + + MSDOS/EBR: the devices created from MSDOS extended partition entries + (EBR) can be named differently than with GEOM_MBR and are now symlinks + to devices with offset-based names. fstabs may need to be modified. + + BSD: the "geometry does not match label" warning is harmless in most + cases but it points to problems in file system misalignment with + disk geometry. The "c" partition is now implicit, covers the whole + top-level drive and cannot be (mis)used by users. + + General: Kernel dumps are now not allowed to be written to devices + whose partition types indicate they are meant to be used for file + systems (or, in case of MSDOS partitions, as something else than + the "386BSD" type). + + Most of these changes date approximately from 200812. + +20090319: + The uscanner(4) driver has been removed from the kernel. This follows + Linux removing theirs in 2.6 and making libusb the default interface + (supported by sane). + +20090319: + The multicast forwarding code has been cleaned up. netstat(1) + only relies on KVM now for printing bandwidth upcall meters. + The IPv4 and IPv6 modules are split into ip_mroute_mod and + ip6_mroute_mod respectively. The config(5) options for statically + compiling this code remain the same, i.e. 'options MROUTING'. + +20090315: + Support for the IFF_NEEDSGIANT network interface flag has been + removed, which means that non-MPSAFE network device drivers are no + longer supported. In particular, if_ar, if_sr, and network device + drivers from the old (legacy) USB stack can no longer be built or + used. + +20090313: + POSIX.1 Native Language Support (NLS) has been enabled in libc and + a bunch of new language catalog files have also been added. + This means that some common libc messages are now localized and + they depend on the LC_MESSAGES environmental variable. + +20090313: + The k8temp(4) driver has been renamed to amdtemp(4) since + support for K10 and K11 CPU families was added. + 20090309: IGMPv3 and Source-Specific Multicast (SSM) have been merged to the IPv4 stack. VIMAGE hooks are in but not yet used. @@ -1325,4 +1375,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.580 2009/03/09 22:43:00 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.587 2009/03/20 23:13:32 ivoras Exp $ ==== //depot/projects/ppc-g5/bin/cat/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/cat/Makefile,v 1.7 2001/12/04 01:57:37 obrien Exp $ +# $FreeBSD: src/bin/cat/Makefile,v 1.8 2009/03/16 12:16:17 des Exp $ PROG= cat +WARNS?= 6 .include ==== //depot/projects/ppc-g5/cddl/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.5 2008/11/05 19:35:09 rodrigc Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.6 2009/03/14 17:55:16 rdivacky Exp $ OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris @@ -6,3 +6,5 @@ IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN + +CSTD?= gnu89 ==== //depot/projects/ppc-g5/cddl/lib/libzpool/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.7 2008/11/17 20:49:29 pjd Exp $ +# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.8 2009/03/14 17:55:16 rdivacky Exp $ .include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files" @@ -33,8 +33,6 @@ ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \ ${UNICODE_SRCS} -CFLAGS+= -std=c99 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem @@ -60,4 +58,6 @@ # atomic.S doesn't like profiling. NO_PROFILE= +CSTD= c99 + .include ==== //depot/projects/ppc-g5/cddl/usr.bin/ztest/Makefile#3 (text+ko) ==== @@ -1,12 +1,10 @@ -# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.6 2008/11/17 20:49:29 pjd Exp $ +# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.7 2009/03/14 17:55:16 rdivacky Exp $ .PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest PROG= ztest NO_MAN= -CFLAGS+= -std=c99 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem @@ -21,4 +19,6 @@ ${LIBPTHREAD} ${LIBZ} ${LIBAVL} LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl +CSTD= c99 + .include ==== //depot/projects/ppc-g5/cddl/usr.sbin/zdb/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.6 2008/11/17 20:49:29 pjd Exp $ +# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.7 2009/03/14 17:55:16 rdivacky Exp $ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb @@ -6,8 +6,6 @@ MAN= zdb.8 SRCS= zdb.c zdb_il.c -CFLAGS+= -std=c99 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem @@ -25,4 +23,6 @@ ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool +CSTD= c99 + .include ==== //depot/projects/ppc-g5/contrib/gcc/c-cppbuiltin.c#2 (text+ko) ==== @@ -1,5 +1,6 @@ /* Define builtin-in macros for the C family front ends. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 + Free Software Foundation, Inc. This file is part of GCC. @@ -484,7 +485,10 @@ /* Misc. */ builtin_define_with_value ("__VERSION__", version_string, 1); - cpp_define (pfile, "__GNUC_GNU_INLINE__"); + if (flag_gnu89_inline) + cpp_define (pfile, "__GNUC_GNU_INLINE__"); + else + cpp_define (pfile, "__GNUC_STDC_INLINE__"); /* Definitions for LP64 model. */ if (TYPE_PRECISION (long_integer_type_node) == 64 ==== //depot/projects/ppc-g5/contrib/gcc/c-decl.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* Process declarations and variables for C compiler. Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GCC. @@ -19,7 +19,10 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.15 2007/05/19 02:12:19 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/c-decl.c,v 1.16 2009/03/14 19:36:13 das Exp $ */ +/* Merged C99 inline changes from gcc trunk 122565 2007-03-05 */ +/* Fixed problems with compiling inline-25.c and inline-26.c */ +/* XXX still fails inline-29.c, inline-31.c, and inline-32.c */ /* Process declarations and symbol lookup for C front end. Also constructs types; the standard scalar types at initialization, @@ -156,10 +159,6 @@ static int warn_about_return_type; -/* Nonzero when starting a function declared `extern inline'. */ - -static int current_extern_inline; - /* Nonzero when the current toplevel function contains a declaration of a nested function which is never defined. */ @@ -804,6 +803,15 @@ error ("nested function %q+D declared but never defined", p); undef_nested_function = true; } + /* C99 6.7.4p6: "a function with external linkage... declared + with an inline function specifier ... shall also be defined in the + same translation unit." */ + else if (DECL_DECLARED_INLINE_P (p) + && TREE_PUBLIC (p) + && !DECL_INITIAL (p) + && !flag_gnu89_inline) + pedwarn ("inline function %q+D declared but never defined", p); + goto common_symbol; case VAR_DECL: @@ -1294,10 +1302,11 @@ /* Function declarations can either be 'static' or 'extern' (no qualifier is equivalent to 'extern' - C99 6.2.2p5) and therefore - can never conflict with each other on account of linkage (6.2.2p4). - Multiple definitions are not allowed (6.9p3,5) but GCC permits - two definitions if one is 'extern inline' and one is not. The non- - extern-inline definition supersedes the extern-inline definition. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 21 10:35:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 652411065674; Sat, 21 Mar 2009 10:35:38 +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 18EF6106566B for ; Sat, 21 Mar 2009 10:35:38 +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 E0CCA8FC08 for ; Sat, 21 Mar 2009 10:35:37 +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 n2LAZbER079716 for ; Sat, 21 Mar 2009 10:35:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2LAZbFF079714 for perforce@freebsd.org; Sat, 21 Mar 2009 10:35:37 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 21 Mar 2009 10:35:37 GMT Message-Id: <200903211035.n2LAZbFF079714@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 159562 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: Sat, 21 Mar 2009 10:35:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=159562 Change 159562 by hselasky@hselasky_laptop001 on 2009/03/21 10:34:44 USB storage: - Compile fix for 64-bit target. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#7 (text+ko) ==== @@ -1583,6 +1583,7 @@ uint8_t error = 1; uint8_t i; uint32_t temp; + const uint32_t mask9 = (0xFFFFFFFFUL >> 9) << 9; /* set default data transfer pointer */ sc->sc_transfer.data_ptr = sc->sc_qdata; @@ -1686,7 +1687,7 @@ i = sc->sc_transfer.cmd_data[4]; sc->sc_transfer.cmd_dir = DIR_WRITE; temp = ((i == 0) ? 256UL : i); - error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); + error = ustorage_fs_min_len(sc, temp << 9, mask9); if (error) { break; } @@ -1702,7 +1703,7 @@ case SC_READ_10: sc->sc_transfer.cmd_dir = DIR_WRITE; temp = get_be16(&sc->sc_transfer.cmd_data[7]); - error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); + error = ustorage_fs_min_len(sc, temp << 9, mask9); if (error) { break; } @@ -1724,7 +1725,7 @@ error = 1; break; } - error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); + error = ustorage_fs_min_len(sc, temp << 9, mask9); if (error) { break; } @@ -1838,7 +1839,7 @@ i = sc->sc_transfer.cmd_data[4]; sc->sc_transfer.cmd_dir = DIR_READ; temp = ((i == 0) ? 256UL : i); - error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); + error = ustorage_fs_min_len(sc, temp << 9, mask9); if (error) { break; } @@ -1854,7 +1855,7 @@ case SC_WRITE_10: sc->sc_transfer.cmd_dir = DIR_READ; temp = get_be16(&sc->sc_transfer.cmd_data[7]); - error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); + error = ustorage_fs_min_len(sc, temp << 9, mask9); if (error) { break; } @@ -1870,13 +1871,13 @@ case SC_WRITE_12: sc->sc_transfer.cmd_dir = DIR_READ; temp = get_be32(&sc->sc_transfer.cmd_data[6]); - if (temp >= (1UL << (32 - 9))) { + if (temp > (mask9 >> 9)) { /* numerical overflow */ sc->sc_csw.bCSWStatus = CSWSTATUS_FAILED; error = 1; break; } - error = ustorage_fs_min_len(sc, temp << 9, 0 - (1UL << 9)); + error = ustorage_fs_min_len(sc, temp << 9, mask9); if (error) { break; } From owner-p4-projects@FreeBSD.ORG Sat Mar 21 15:59:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82ABB1065673; Sat, 21 Mar 2009 15:59:15 +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 1CBE3106564A for ; Sat, 21 Mar 2009 15:59:15 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09BFD8FC14 for ; Sat, 21 Mar 2009 15:59:15 +0000 (UTC) (envelope-from nwhitehorn@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 n2LFxETL020992 for ; Sat, 21 Mar 2009 15:59:14 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2LFxEmp020990 for perforce@freebsd.org; Sat, 21 Mar 2009 15:59:14 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sat, 21 Mar 2009 15:59:14 GMT Message-Id: <200903211559.n2LFxEmp020990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 159570 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: Sat, 21 Mar 2009 15:59:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=159570 Change 159570 by nwhitehorn@nwhitehorn_comporellon on 2009/03/21 15:58:27 Copy over powerpc arch bits of msun and libthr to ppc64 to get make kernel-toolchain working for a 64-bit target. Affected files ... .. //depot/projects/ppc-g5/lib/libthr/arch/ppc64/Makefile.inc#1 add .. //depot/projects/ppc-g5/lib/libthr/arch/ppc64/include/pthread_md.h#1 add .. //depot/projects/ppc-g5/lib/libthr/arch/ppc64/ppc64/pthread_md.c#1 add .. //depot/projects/ppc-g5/lib/msun/Makefile#2 edit Differences ... ==== //depot/projects/ppc-g5/lib/msun/Makefile#2 (text+ko) ==== @@ -14,6 +14,8 @@ .if ${MACHINE_ARCH} == "i386" ARCH_SUBDIR= i387 +.elif ${MACHINE_ARCH} == "ppc64" +ARCH_SUBDIR= powerpc .else ARCH_SUBDIR= ${MACHINE_ARCH} .endif