From owner-p4-projects@FreeBSD.ORG Sun Oct 10 11:12:30 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 035D31065670; Sun, 10 Oct 2010 11:12: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 B95D2106564A for ; Sun, 10 Oct 2010 11:12:29 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A509C8FC21 for ; Sun, 10 Oct 2010 11:12:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9ABCTjM066568 for ; Sun, 10 Oct 2010 11:12:29 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9ABCTna066565 for perforce@freebsd.org; Sun, 10 Oct 2010 11:12:29 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 10 Oct 2010 11:12:29 GMT Message-Id: <201010101112.o9ABCTna066565@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184574 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Oct 2010 11:12:30 -0000 http://p4web.freebsd.org/@@184574?ac=10 Change 184574 by rene@rene_acer on 2010/10/10 11:12:16 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#73 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#53 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#27 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#89 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#46 integrate .. //depot/projects/docproj_nl/share/pgpkeys/jonathan.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#46 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#43 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pluknet.key#1 branch .. //depot/projects/docproj_nl/www/en/developers.sgml#44 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#36 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#24 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#91 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#73 (text+ko) ==== @@ -1,4 +1,4 @@ - + + [++] Status of these steps can be found in - ${arch}/${branch}/make.[0|1], - where make.0 is the log file used by - phase 1 of the package build and make.1 - is the log file used by phase 2. Individual ports will write + ${arch}/${branch}/make (old codebase) or + ${arch}/${branch}/journal (new codebase). + Individual ports will write their build logs to ${arch}/${branch}/logs and their error logs to @@ -1062,7 +1091,7 @@ &prompt.root; rsync -n -r -v -l -t -p --delete packages/ portmgr@ftp-master:w/ports/${arch}/${subdir}/ | tee log - Distfiles can be transferred with the + Distfiles should be transferred with the cpdistfiles script: &prompt.root; /var/portbuild/scripts/cpdistfiles ${arch} ${branch} @@ -1119,7 +1148,7 @@ In order to have a good control case with which to compare failures, you should first do a package build of the branch on which the experimental patches branch is based for the &i386; - architecture (currently this is 7). Then, when + architecture (currently this is 8). Then, when preparing for the experimental patches build, checkout a ports tree and a src tree with the same date as was used for the control build. This will ensure an apples-to-apples comparison @@ -1207,11 +1236,13 @@ Be sure to cvs update this tree to the same date as the experimental patches tree. + The following command will set up the control branch for - the partial build: + the partial build (old codebase): &prompt.user; /var/portbuild/scripts/dopackages.8 -noportscvs -nobuild -nocvs -nofinish + The builds must be performed from the packages/All directory. This directory should initially be empty except for the Makefile symlink. If this @@ -1624,6 +1655,7 @@ + Create usr/local/etc/rc.d/portbuild.sh, using the appropriate value for @@ -1954,7 +1986,8 @@ - Add a link from + (Only necessary for old codebase): + Add a link from /var/portbuild/scripts/dopackages to /var/portbuild/scripts/dopackages.branch. @@ -1966,12 +1999,15 @@ - Add the snap directory to + + (Only necessary for old codebase): + Add the snap directory to /var/portbuild/scripts/zexpire. - In the /var/portbuild/errorlogs/ + (Only necessary for old codebase): + In the /var/portbuild/errorlogs/ directory, create links for the webserver: ln -s ../arch/branch/builds/latest/bak/errors arch-branch-full ln -s ../arch/branch/builds/latest/bak/logs arch-branch-full-logs @@ -2119,7 +2155,8 @@ - As with the procedure for creating a new branch: + (Only necessary for old codebase): + As with the procedure for creating a new branch: in the /var/portbuild/errorlogs/ directory, create links for the webserver: ln -s ../arch/branch/builds/latest/bak/errors arch-branch-full @@ -2132,7 +2169,8 @@ - In that + (Only necessary for old codebase): + In that directory, create two more links for the webserver: ln -s ../arch/archive/buildlogs arch-buildlogs ln -s ../arch/archive/errorlogs arch-errorlogs ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#89 (text+ko) ==== @@ -1,7 +1,7 @@ 9.0-CURRENT after addition of the MAP_PREFAULT_READ flag to mmap(2). + + 900022 + October 2, 2010 + 9.0-CURRENT after addition of the BSDL man utilities + and retirement of GNU/GPL man utilities. + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#46 (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.526 2010/09/24 22:57:35 martymac Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.528 2010/10/07 17:57:50 jonathan Exp $ --> aaron@FreeBSD.org"> @@ -586,6 +586,8 @@ jon@FreeBSD.org"> +jonathan@FreeBSD.org"> + josef@FreeBSD.org"> jpaetzel@FreeBSD.org"> @@ -928,6 +930,8 @@ pjd@FreeBSD.org"> +pluknet@FreeBSD.org"> + proven@FreeBSD.org"> ps@FreeBSD.org"> ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#46 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -236,6 +236,11 @@ &pgpkey.jon; + + &a.jonathan; + &pgpkey.jonathan; + + &a.loader; &pgpkey.loader; @@ -621,6 +626,11 @@ &pgpkey.phk; + + &a.pluknet; + &pgpkey.pluknet; + + &a.cokane; &pgpkey.cokane; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#43 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -158,6 +158,7 @@ + @@ -259,6 +260,7 @@ + ==== //depot/projects/docproj_nl/www/en/developers.sgml#44 (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.267 2010/09/24 23:05:14 martymac Exp $ +$FreeBSD: www/en/developers.sgml,v 1.269 2010/10/07 17:59:17 jonathan Exp $ --> @@ -293,6 +293,7 @@ + @@ -464,6 +465,7 @@ + ==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#36 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2802,6 +2802,20 @@ dougb received + + + Olivier Cochard-Labbe + Sun Blade 150 + fjoe + received + + + + Andreas Thalau + Level One GSW-0502T gigabit switch + lme + received + &footer; ==== //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#24 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -36,6 +36,7 @@ Developer Country Equipment Desired Equipment Use + Date Added @@ -45,6 +46,7 @@ drives. Going to be in my home office, so I can sacrifice performance in favor of less noise pollution. + 2008/09/10 @@ -52,17 +54,8 @@ Norway Mac Mini with 1 GB RAM, no peripherals Tinderbox. - - - dfr @@ -71,6 +64,7 @@ acceptable. Debug and improve the performance of firewire, especially IP over firewire. + 2004/07/01 @@ -78,6 +72,7 @@ California, USA Apple G4 XServe Rackmount PowerPC machine for developer cluster. + 2004/07/24 @@ -86,6 +81,7 @@ Gigabit switch Development/build cluster. Any kind of switch could work. + 2005/08/11 @@ -93,6 +89,7 @@ Rishi Valley, India. 4-port USB KVM switch & USB<->PS/2 adapters Facilitate working with multiple machines. + 2008/09/02 @@ -100,6 +97,7 @@ Rishi Valley, India. Solar backed UPS (500W x 4-6 hrs) Permit work on FreeBSD in the absence of grid power. + 2008/09/02 @@ -108,6 +106,7 @@ Fast multiprocessor AMD64 capable machine (dual core CPU ok). General build box to support FreeBSD work including ARM and multi-arch testing of patches. + 2006/07/17 @@ -115,6 +114,7 @@ California, USA Tape drive, preferably SCSI DDS-3 or later bsdtar testing and development. + 2010/01/24 @@ -140,6 +140,7 @@ load distribution. Not all at once but in the long term. Most of this knowledge will be reverted to FreeBSD if I can. + 2003/04/14 @@ -150,6 +151,7 @@ DIMMs. Low-profile is a must. ECC is optional. More memory allows for better workloads when testing code in SMP setups. + 2007/05/26 @@ -158,6 +160,7 @@ Flexelint v8. (www.gimpel.com) (Semi-)automated code cleaning and cross-platform compiler needs cleaning. + 2002/09/23 @@ -166,6 +169,7 @@ ACPI laptops (also for lend) (1) ACPI laptops that work, to test new code on.
(2) ACPI laptops that don't work, (to try) to fix. + 2004/12/19 @@ -174,6 +178,7 @@ IBM ThinkPad Dock II (1) Enhance the acpi_ibm(4) driver.
(2) Enhance docking support. + 2005/06/13 @@ -182,6 +187,7 @@ 2-3 build machines:Pentium4 2GHz+,20GB+ ATA66+ HDD,256MB+RAM, 100base-TX NIC,serial, etc. Rebuild dying snapshots.jp.FreeBSD.org. + 2002/08/05 @@ -191,6 +197,7 @@ storage (RAID0+1 desirable),256MB+RAM, 100base-TX NIC,serial, etc. Rebuild dying snapshots.jp.FreeBSD.org. + 2002/08/05 @@ -202,6 +209,7 @@ if I still need the card. Fixed cards will go to the busdma project. Add support for unsupported and broken drivers. + 2003/02/03 @@ -210,7 +218,8 @@ Network cards listed on busdma project page. - Busdma conversion of network cards. + Busdma conversion of network cards. + 2003/01/03 @@ -218,6 +227,7 @@ France Relatively recent laptop with serial port Live kernel debugging. + 2003/01/03 @@ -225,6 +235,7 @@ Madison, WI, USA IBM PPC desktop or rackmount hardware with a POWER4/5/6/7 or Cell CPU Add support for these machines. + 2010/08/17 @@ -232,6 +243,7 @@ Silicon Valley, USA AlphaServer DS15. continued FreeBSD/alpha development and testing. + 2005/12/09 @@ -240,6 +252,7 @@ 1U or 2U rack-mount cases, with power supplies. Build into AMD64 reference machines for the FreeBSD.org cluster. + 2004/08/24 @@ -247,6 +260,7 @@ California, USA Rack mount AMD64 Opteron system. To make available on the developer cluster. + 2003/05/23 @@ -259,7 +273,9 @@ Add more capacity to i386 and sparc64 package building clusters. + 2009/07/23 + portmgr worldwide @@ -271,7 +287,9 @@ SunFire V120, V210, or V240) for our package building cluster in the US. + 2009/07/23 + rpaulo Portugal @@ -281,6 +299,7 @@ General FreeBSD kernel/userland development/testing. + 2008/08/29 @@ -288,6 +307,7 @@ Portugal Intel Mac, possibly Mac Mini for a small shipment fee EFI support under FreeBSD and other Mac development work. + 2008/08/29 @@ -296,68 +316,15 @@ crypto devices (pci, pcmcia, cardbus cards, CPUs with builtin crypto support) For improving hardware crypto support. + 2003/02/23 - simon / cperciva - Ontario, Canada - Fast 1U rack mountable server. Preferably 4 cores, 2GB - RAM, 2 x 36GB+ disks, decent hardware RAID controller for - RAID1, 100Mbit NIC, and not too electrical power - hungry. - Faster portsnap build system to reduce time between - portsnap builds and to introduce more redundancy in portsnap - to reduce downtime in case one build server fails. - - - - simon - Denmark - 12 port Remote Power Controller 220V 10A with serial or - Ethernet connection. It does not have to be one big power - controller and fewer than 12 ports can certainly also be a - good start. - Being able to remote power cycle servers hosted at home, - including tb3 / tb4.droso.net and all the - assosiated network equipment. - - - - simon - Denmark - 1KW - 1.5KW APC Smart-UPS or similar - Being able to have all local systems (including - tb[345].droso.net) turned on without current UPS complaining - about overload. - - - - simon - Denmark - 8 port serial console server. - Being able to remote manage servers hosted at home better, - including tb3 / tb4.droso.net. - - - - simon - Denmark - Dual Opteron server motherboard which supports Opteron - 875 CPU's, 2GB ECC RAM, 2xSATA disks (RAID1) - Replacement hardware for trillian.nitro.dk / tb3.droso.net - (it is currently running on my workstation) which is a - system I host where all FreeBSD committers can get an - account. It is mainly used by ports developers for testing, - but is also used by multiple SoC - 2006 students. - - - tanimura Japan Any Japanese laptop (Preferably IBM Thinkpad A30 or A31). Replace a recently stolen IBM. + 2003/04/15 ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#91 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.346 2010/09/24 23:29:32 martymac Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.348 2010/10/07 17:59:17 jonathan Exp $ @@ -33,6 +33,24 @@ 2010 + 10 + + + 7 + +

New committer: Jonathan Anderson

+ + + + + 5 + +

New committer: Sergey Kandaurov (src)

+ + + + + 9 From owner-p4-projects@FreeBSD.ORG Sun Oct 10 11:15:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FADD1065672; Sun, 10 Oct 2010 11:15: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 2232E106566C for ; Sun, 10 Oct 2010 11:15:47 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 0F9308FC12 for ; Sun, 10 Oct 2010 11:15:47 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9ABFkK7067492 for ; Sun, 10 Oct 2010 11:15:46 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9ABFkb5067489 for perforce@freebsd.org; Sun, 10 Oct 2010 11:15:46 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 10 Oct 2010 11:15:46 GMT Message-Id: <201010101115.o9ABFkb5067489@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Oct 2010 11:15:47 -0000 http://p4web.freebsd.org/@@184575?ac=10 Change 184575 by rene@rene_acer on 2010/10/10 11:15:34 Add Olivier Duchateau [duchateau.olivier gmail.com] for sysutils/xfce4-cpugraph-plugin Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#74 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#74 (text+ko) ==== @@ -7584,6 +7584,11 @@ + Olivier Duchateau + duchateau.olivier@gmail.com + + + Olivier Tharan olive@oban.frmug.org From owner-p4-projects@FreeBSD.ORG Tue Oct 12 14:44:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF3201065674; Tue, 12 Oct 2010 14:44: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 641DA1065670 for ; Tue, 12 Oct 2010 14:44:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4E7C88FC0A for ; Tue, 12 Oct 2010 14:44:48 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9CEimcp013511 for ; Tue, 12 Oct 2010 14:44:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9CEim7A013508 for perforce@freebsd.org; Tue, 12 Oct 2010 14:44:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 12 Oct 2010 14:44:48 GMT Message-Id: <201010121444.o9CEim7A013508@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184619 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Oct 2010 14:44:49 -0000 http://p4web.freebsd.org/@@184619?ac=10 Change 184619 by hselasky@hselasky_laptop001 on 2010/10/12 14:44:02 IFC Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#48 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#19 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#81 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#60 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#188 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#48 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_dev.c,v 1.39 2010/06/11 19:27:21 avg Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_dev.c,v 1.41 2010/10/04 22:21:30 hselasky Exp $ */ /*- * Copyright (c) 2006-2008 Hans Petter Selasky. All rights reserved. * @@ -153,8 +153,6 @@ static TAILQ_HEAD(, usb_symlink) usb_sym_head; static struct sx usb_sym_lock; -static struct cv usb_enum_cv; -static int usb_enum_tick; struct mtx usb_ref_lock; @@ -174,21 +172,6 @@ } /*------------------------------------------------------------------------* - * usb_enum_broadcast - * - * This function is used to wakeup userland threads waiting for USB - * enumeration. - *------------------------------------------------------------------------*/ -void -usb_enum_broadcast(void) -{ - mtx_lock(&usb_ref_lock); - usb_enum_tick = ticks; - cv_broadcast(&usb_enum_cv); - mtx_unlock(&usb_ref_lock); -} - -/*------------------------------------------------------------------------* * usb_ref_device * * This function is used to atomically refer an USB device by its @@ -951,8 +934,6 @@ { mtx_init(&usb_ref_lock, "USB ref mutex", NULL, MTX_DEF); sx_init(&usb_sym_lock, "USB sym mutex"); - cv_init(&usb_enum_cv, "USB enumeration"); - TAILQ_INIT(&usb_sym_head); /* check the UGEN methods */ @@ -983,18 +964,9 @@ if (usb_dev != NULL) { destroy_dev(usb_dev); usb_dev = NULL; - } - - /* wake up any left-overs */ - usb_enum_broadcast(); - - /* wait for any left-overs to return */ - pause("WENUM", hz / 2); - mtx_destroy(&usb_ref_lock); sx_destroy(&usb_sym_lock); - cv_destroy(&usb_enum_cv); } SYSUNINIT(usb_dev_uninit, SI_SUB_KICK_SCHEDULER, SI_ORDER_ANY, usb_dev_uninit, NULL); @@ -1505,76 +1477,37 @@ { union { struct usb_read_dir *urd; - struct usb_wait_enumeration *uwe; void* data; } u; - int error; - int delta; - int timeout; + int err; u.data = data; switch (cmd) { case USB_READ_DIR: - error = usb_read_symlink(u.urd->urd_data, + err = usb_read_symlink(u.urd->urd_data, u.urd->urd_startentry, u.urd->urd_maxlen); break; case USB_DEV_QUIRK_GET: case USB_QUIRK_NAME_GET: case USB_DEV_QUIRK_ADD: case USB_DEV_QUIRK_REMOVE: - error = usb_quirk_ioctl_p(cmd, data, fflag, td); + err = usb_quirk_ioctl_p(cmd, data, fflag, td); break; case USB_GET_TEMPLATE: *(int *)data = usb_template; - error = 0; + err = 0; break; case USB_SET_TEMPLATE: - error = priv_check(curthread, PRIV_DRIVER); - if (error) + err = priv_check(curthread, PRIV_DRIVER); + if (err) break; usb_template = *(int *)data; break; - case USB_WAIT_ENUMERATION: - mtx_lock(&usb_ref_lock); - /* - * Check if there was a recent enumeration or - * detach event. Else wait for the next - * enumeration event. - */ - delta = ticks - usb_enum_tick; - if ((delta >= 0) && (delta <= (hz / 4))) { - error = 0; - } else if (u.uwe->timeout != 0) { - - /* subtract post-delay from timeout */ - timeout = u.uwe->timeout; - if (timeout >= 251) - timeout -= 250; - else - timeout = 1; - - /* wait for enumeration or timeout */ - error = cv_timedwait_sig(&usb_enum_cv, - &usb_ref_lock, USB_MS_TO_TICKS(timeout)); - - /* timeouts are not considered errors */ - if (error == EWOULDBLOCK) - error = 0; - } else { - /* wait for enumeration */ - error = cv_wait_sig(&usb_enum_cv, - &usb_ref_lock); - } - mtx_unlock(&usb_ref_lock); - - /* Wait a little bit for stuff to stabilise */ - usb_pause_mtx(NULL, hz / 4); - break; default: - error = ENOTTY; + err = ENOTTY; break; } - return (error); + return (err); } static int ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.h#19 (text+ko) ==== @@ -150,6 +150,5 @@ void usb_free_symlink(struct usb_symlink *ps); int usb_read_symlink(uint8_t *user_ptr, uint32_t startentry, uint32_t user_len); -void usb_enum_broadcast(void); #endif /* _USB_DEV_H_ */ ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#81 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_device.c,v 1.64 2010/09/02 04:39:45 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_device.c,v 1.65 2010/10/04 23:18:05 hselasky Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -145,28 +145,19 @@ const char * usb_get_manufacturer(struct usb_device *udev) { - if ((udev != NULL) && (udev->manufacturer != NULL)) - return (udev->manufacturer); - else - return ("Unknown"); + return (udev->manufacturer ? udev->manufacturer : "Unknown"); } const char * usb_get_product(struct usb_device *udev) { - if ((udev != NULL) && (udev->product != NULL)) - return (udev->product); - else - return (""); + return (udev->product ? udev->product : ""); } const char * usb_get_serial(struct usb_device *udev) { - if ((udev != NULL) && (udev->serial != NULL)) - return (udev->serial); - else - return (""); + return (udev->serial ? udev->serial : ""); } /*------------------------------------------------------------------------* @@ -2443,8 +2434,6 @@ device_get_nameunit(device_get_parent(udev->bus->bdev))); devctl_queue_data(data); - - usb_enum_broadcast(); } #endif ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#60 (text+ko) ==== @@ -1,8 +1,8 @@ -/* $FreeBSD: src/sys/dev/usb/usb_hub.c,v 1.41 2010/09/02 04:39:45 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_hub.c,v 1.43 2010/10/04 23:18:05 hselasky Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2010 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 @@ -798,8 +798,8 @@ * The subclass for USB HUBs is currently ignored because it * is 0 for some and 1 for others. */ - if ((uaa->info.bConfigIndex == 0) && - (uaa->info.bDeviceClass == UDCLASS_HUB)) + if (uaa->info.bConfigIndex == 0 && + uaa->info.bDeviceClass == UDCLASS_HUB) return (0); return (ENXIO); @@ -909,7 +909,7 @@ } if (!udev->flags.self_powered && parent_hub && - (!parent_hub->flags.self_powered)) { + !parent_hub->flags.self_powered) { DPRINTFN(0, "Bus powered HUB connected to " "bus powered HUB. HUB ignored\n"); goto error; @@ -2313,7 +2313,6 @@ /* check if all devices on the HUB are suspended */ for (x = 0; x != nports; x++) { - child = usb_bus_port_get_device(udev->bus, udev->hub->ports + x); @@ -2330,7 +2329,6 @@ if (usb_peer_can_wakeup(udev) && usb_device_20_compatible(udev)) { - /* * This request needs to be done before we set * "udev->flags.self_suspended": @@ -2362,7 +2360,6 @@ USB_BUS_UNLOCK(udev->bus); if (err != 0) { - if (usb_peer_can_wakeup(udev) && usb_device_20_compatible(udev)) { /* allow device to do remote wakeup */ ==== //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#18 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_msctest.c,v 1.15 2010/02/14 20:05:12 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_msctest.c,v 1.18 2010/10/12 09:41:42 glebius Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -97,6 +97,7 @@ static uint8_t scsi_huawei_eject[] = { 0x11, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static uint8_t scsi_tct_eject[] = { 0x06, 0xf5, 0x04, 0x02, 0x52, 0x70 }; #define BULK_SIZE 64 /* dummy */ #define ERR_CSW_FAILED -1 @@ -467,7 +468,6 @@ sc->data_rem = data_len; sc->data_timeout = (data_timeout + USB_MS_HZ); sc->actlen = 0; - sc->data_ptr = data_ptr; sc->cmd_len = cmd_len; bzero(&sc->cbw.CBWCDB, sizeof(sc->cbw.CBWCDB)); bcopy(cmd_ptr, &sc->cbw.CBWCDB, cmd_len); @@ -619,6 +619,15 @@ &scsi_huawei_eject, sizeof(scsi_huawei_eject), USB_MS_HZ); break; + case MSC_EJECT_TCT: + /* + * TCTMobile needs DIR_IN flag. To get it, we + * supply a dummy data with the command. + */ + err = bbb_command_start(sc, DIR_IN, 0, &sc->buffer, + sizeof(sc->buffer), &scsi_tct_eject, + sizeof(scsi_tct_eject), USB_MS_HZ); + break; default: printf("usb_msc_eject: unknown eject method (%d)\n", method); break; ==== //depot/projects/usb/src/sys/dev/usb/usb_msctest.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_msctest.h,v 1.7 2010/02/14 20:05:12 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_msctest.h,v 1.8 2010/10/06 14:29:00 glebius Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -33,6 +33,7 @@ MSC_EJECT_ZTESTOR, MSC_EJECT_CMOTECH, MSC_EJECT_HUAWEI, + MSC_EJECT_TCT, }; int usb_iface_is_cdrom(struct usb_device *udev, ==== //depot/projects/usb/src/sys/dev/usb/usb_request.c#44 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_request.c,v 1.30 2010/05/12 23:40:44 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_request.c,v 1.32 2010/10/04 23:18:05 hselasky Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. @@ -447,12 +447,6 @@ if (hr_func != NULL) { DPRINTF("Handle Request function is set\n"); - /* check for dry run */ - if (flags & USB_DRY_RUN) { - DPRINTF("Dry run\n"); - goto done; - } - desc = NULL; temp = 0; @@ -509,11 +503,6 @@ err = USB_ERR_NOMEM; goto done; } - /* check for dry run */ - if (flags & USB_DRY_RUN) { - DPRINTF("Dry run\n"); - goto done; - } #ifdef USB_REQ_DEBUG /* Get debug bits */ @@ -1035,14 +1024,13 @@ * and a few more to avoid any problems with scripts * and daemons. */ - if (((*s >= 'a') && (*s <= 'z')) || - ((*s >= 'A') && (*s <= 'Z')) || - ((*s >= '0') && (*s <= '9')) || - (*s == '-') || - (*s == '+') || - (*s == ' ') || - (*s == '.') || - (*s == ',')) { + if (isalpha(*s) || + isdigit(*s) || + *s == '-' || + *s == '+' || + *s == ' ' || + *s == '.' || + *s == ',') { /* allowed */ s++; } ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#188 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_transfer.c,v 1.41 2010/09/02 04:01:18 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_transfer.c,v 1.42 2010/10/04 23:18:05 hselasky Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -2630,10 +2630,10 @@ * If we have a non-hardware induced error we * need to do the DMA delay! */ - if ((xfer->error != 0) && (!xfer->flags_int.did_dma_delay) && - ((xfer->error == USB_ERR_CANCELLED) || - (xfer->error == USB_ERR_TIMEOUT) || - (bus->methods->start_dma_delay != NULL))) { + if (xfer->error != 0 && !xfer->flags_int.did_dma_delay && + (xfer->error == USB_ERR_CANCELLED || + xfer->error == USB_ERR_TIMEOUT || + bus->methods->start_dma_delay != NULL)) { usb_timeout_t temp; @@ -2917,10 +2917,10 @@ USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED); /* check that we have a valid case */ - if ((udev->flags.usb_mode == USB_MODE_HOST) && - (udev->parent_hub != NULL) && - (udev->bus->methods->clear_stall != NULL) && - (ep->methods != NULL)) { + if (udev->flags.usb_mode == USB_MODE_HOST && + udev->parent_hub != NULL && + udev->bus->methods->clear_stall != NULL && + ep->methods != NULL) { (udev->bus->methods->clear_stall) (udev, ep); } } ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#21 (text+ko) ==== @@ -1767,6 +1767,7 @@ struct ieee80211com *ic = vap->iv_ic; struct run_softc *sc = ic->ic_ifp->if_softc; struct run_vap *rvp = RUN_VAP(vap); + struct ieee80211_node *ni; enum ieee80211_state ostate; uint32_t sta[3]; uint32_t tmp; From owner-p4-projects@FreeBSD.ORG Tue Oct 12 14:45:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 462C41065672; Tue, 12 Oct 2010 14:45: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 08D3B106566C for ; Tue, 12 Oct 2010 14:45:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E8FF28FC1D for ; Tue, 12 Oct 2010 14:45:53 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9CEjrtX013538 for ; Tue, 12 Oct 2010 14:45:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9CEjrI7013535 for perforce@freebsd.org; Tue, 12 Oct 2010 14:45:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 12 Oct 2010 14:45:53 GMT Message-Id: <201010121445.o9CEjrI7013535@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Oct 2010 14:45:54 -0000 http://p4web.freebsd.org/@@184620?ac=10 Change 184620 by hselasky@hselasky_laptop001 on 2010/10/12 14:45:18 IFC Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_ioctl.h#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_ioctl.h#8 (text+ko) ==== @@ -67,11 +67,6 @@ uint8_t uai_alt_index; }; -struct usb_wait_enumeration { - uint16_t timeout; /* milliseconds, if set */ - uint16_t flag; -}; - struct usb_gen_descriptor { #ifdef COMPAT_32BIT uint64_t ugd_data; @@ -274,7 +269,6 @@ #define USB_GET_POWER_MODE _IOR ('U', 146, int) #define USB_SET_TEMPLATE _IOW ('U', 147, int) #define USB_GET_TEMPLATE _IOR ('U', 148, int) -#define USB_WAIT_ENUMERATION _IOW ('U', 149, struct usb_wait_enumeration) /* Modem device */ #define USB_GET_CM_OVER_DATA _IOR ('U', 180, int) From owner-p4-projects@FreeBSD.ORG Tue Oct 12 14:47:00 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16E341065698; Tue, 12 Oct 2010 14:47:00 +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 CDD2D1065695 for ; Tue, 12 Oct 2010 14:46:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B9D758FC15 for ; Tue, 12 Oct 2010 14:46:59 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9CEkxar013557 for ; Tue, 12 Oct 2010 14:46:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9CEkxZQ013554 for perforce@freebsd.org; Tue, 12 Oct 2010 14:46:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 12 Oct 2010 14:46:59 GMT Message-Id: <201010121446.o9CEkxZQ013554@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184621 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Oct 2010 14:47:00 -0000 http://p4web.freebsd.org/@@184621?ac=10 Change 184621 by hselasky@hselasky_laptop001 on 2010/10/12 14:46:43 IFC Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#57 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#57 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.37 2010/09/02 04:39:45 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.38 2010/10/04 23:30:44 hselasky 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.37 2010/09/02 04:39:45 thompsa Exp $ + * $FreeBSD: src/sys/dev/usb/storage/umass.c,v 1.38 2010/10/04 23:30:44 hselasky Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -231,7 +231,7 @@ /* Approximate maximum transfer speeds (assumes 33% overhead). */ #define UMASS_FULL_TRANSFER_SPEED 1000 #define UMASS_HIGH_TRANSFER_SPEED 40000 -#define UMASS_SUPER_TRANSFER_SPEED 100000 +#define UMASS_SUPER_TRANSFER_SPEED 400000 #define UMASS_FLOPPY_TRANSFER_SPEED 20 #define UMASS_TIMEOUT 5000 /* ms */ From owner-p4-projects@FreeBSD.ORG Tue Oct 12 14:52:26 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E9901065673; Tue, 12 Oct 2010 14:52: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 F14E21065670 for ; Tue, 12 Oct 2010 14:52:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DC9C38FC16 for ; Tue, 12 Oct 2010 14:52:25 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9CEqPgG015419 for ; Tue, 12 Oct 2010 14:52:25 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9CEqP2K015416 for perforce@freebsd.org; Tue, 12 Oct 2010 14:52:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 12 Oct 2010 14:52:25 GMT Message-Id: <201010121452.o9CEqP2K015416@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184622 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Oct 2010 14:52:26 -0000 http://p4web.freebsd.org/@@184622?ac=10 Change 184622 by hselasky@hselasky_laptop001 on 2010/10/12 14:51:38 IFC - Remove USB wait enumeration patch. Recommend use of devd events instead. Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb20.3#12 edit .. //depot/projects/usb/src/lib/libusb/libusb20.c#20 edit .. //depot/projects/usb/src/lib/libusb/libusb20.h#13 edit .. //depot/projects/usb/src/lib/libusb/libusb20_int.h#13 edit .. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#16 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb20.3#12 (text+ko) ==== @@ -177,8 +177,6 @@ .Ft int .Fn libusb20_be_set_template "struct libusb20_backend *pbe" "int temp" .Ft int -.Fn libusb20_be_wait_enumeration "struct libusb20_backend *pbe" "int timeout" "int flag" -.Ft int .Fn libusb20_be_get_dev_quirk "struct libusb20_backend *pber" "uint16_t index" "struct libusb20_quirk *pq" .Ft int .Fn libusb20_be_get_quirk_name "struct libusb20_backend *pbe" "uint16_t index" "struct libusb20_quirk *pq" @@ -833,23 +831,6 @@ . .Pp . -.Fn libusb20_be_wait_enumeration -will block until a new USB device is enumerated or an existing USB -device is detached. All devices belonging to the backend will be -dequeued and freed, but not the backend itself. -If the -.Fa timeout -argument is non-zero the function will return after the given number -of milliseconds. -A timeout is not regarded like an error. -The -.Fa flag -argument is current reserved and must be set to zero. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. .Fn libusb20_be_get_dev_quirk This function will return the device quirk according to .Fa index ==== //depot/projects/usb/src/lib/libusb/libusb20.c#20 (text+ko) ==== @@ -1114,21 +1114,6 @@ return (pbe->methods->root_get_template(pbe, ptemp)); } -int -libusb20_be_wait_enumeration(struct libusb20_backend *pbe, int timeout, int flag) -{ - struct libusb20_device *pdev; - - /* clean up all existing devices */ - - while ((pdev = libusb20_be_device_foreach(pbe, NULL))) { - libusb20_be_dequeue_device(pbe, pdev); - libusb20_dev_free(pdev); - } - - return (pbe->methods->root_wait_enumeration(pbe, timeout, flag)); -} - struct libusb20_device * libusb20_be_device_foreach(struct libusb20_backend *pbe, struct libusb20_device *pdev) { ==== //depot/projects/usb/src/lib/libusb/libusb20.h#13 (text+ko) ==== @@ -277,7 +277,6 @@ int libusb20_be_remove_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq); int libusb20_be_get_template(struct libusb20_backend *pbe, int *ptemp); int libusb20_be_set_template(struct libusb20_backend *pbe, int temp); -int libusb20_be_wait_enumeration(struct libusb20_backend *pbe, int, int); /* USB backend operations */ ==== //depot/projects/usb/src/lib/libusb/libusb20_int.h#13 (text+ko) ==== @@ -62,7 +62,6 @@ typedef void (libusb20_exit_backend_t)(struct libusb20_backend *pbe); typedef int (libusb20_root_set_template_t)(struct libusb20_backend *pbe, int temp); typedef int (libusb20_root_get_template_t)(struct libusb20_backend *pbe, int *ptemp); -typedef int (libusb20_root_wait_enumeration_t)(struct libusb20_backend *pbe, int, int); #define LIBUSB20_DEFINE(n,field) \ libusb20_##field##_t *field; @@ -84,7 +83,6 @@ m(n, root_remove_dev_quirk) \ m(n, root_set_template) \ m(n, root_get_template) \ - m(n, root_wait_enumeration) \ /* mandatory device methods */ \ m(n, open_device) \ m(n, close_device) \ ==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#16 (text+ko) ==== @@ -55,7 +55,6 @@ static libusb20_root_remove_dev_quirk_t ugen20_root_remove_dev_quirk; static libusb20_root_set_template_t ugen20_root_set_template; static libusb20_root_get_template_t ugen20_root_get_template; -static libusb20_root_wait_enumeration_t ugen20_root_wait_enumeration; const struct libusb20_backend_methods libusb20_ugen20_backend = { LIBUSB20_BACKEND(LIBUSB20_DECLARE, ugen20) @@ -1014,26 +1013,3 @@ return (ugen20_be_ioctl(USB_GET_TEMPLATE, ptemp)); } -static int -ugen20_root_wait_enumeration(struct libusb20_backend *pbe, int timeout, int flag) -{ - struct usb_wait_enumeration info; - int error; - - if (timeout < 0) - timeout = 0; - else if (timeout > 65535) - timeout = 65535; - - memset(&info, 0, sizeof(info)); - - info.timeout = timeout; - info.flag = flag; - - error = ugen20_be_ioctl(USB_WAIT_ENUMERATION, &info); - - if (error) - usleep(25000); /* nice it */ - - return (error); -} From owner-p4-projects@FreeBSD.ORG Wed Oct 13 06:49:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E84901065673; Wed, 13 Oct 2010 06:49: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 AA69E1065670 for ; Wed, 13 Oct 2010 06:49:44 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 95B618FC14 for ; Wed, 13 Oct 2010 06:49:44 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9D6niI2012748 for ; Wed, 13 Oct 2010 06:49:44 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9D6niT5012745 for perforce@freebsd.org; Wed, 13 Oct 2010 06:49:44 GMT (envelope-from dforsyth@FreeBSD.org) Date: Wed, 13 Oct 2010 06:49:44 GMT Message-Id: <201010130649.o9D6niT5012745@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to dforsyth@FreeBSD.org using -f From: David Forsythe To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 06:49:45 -0000 http://p4web.freebsd.org/@@184654?ac=10 Change 184654 by dforsyth@skunk on 2010/10/13 06:49:39 Committing mainly for back up. Packages are now created by databases. Logging isnt in this change. Affected files ... .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/Makefile#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.c#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.h#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/database_internal.h#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/depend.c#1 add .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/depend.h#1 add .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/file.c#1 add .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/file.h#1 add .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_database_directorydb.c#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_database_directorydb.h#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_plist.c#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_plist.h#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/internal.h#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.c#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.h#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_freebsd.c#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_freebsd.h#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_internal.h#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_pkg.h#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/pkg_install/pkg_dump/pkg_dump.c#2 edit Differences ... ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/Makefile#4 (text+ko) ==== @@ -14,12 +14,13 @@ property.c \ database.c \ repository.c \ - pkg_freebsd.c \ freebsd_plist.c \ freebsd_database_directorydb.c \ freebsd_repository_ftp.c \ util.c \ - exec.c + exec.c \ + file.c \ + depend.c CFLAGS+= -std=c99 ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.c#3 (text+ko) ==== @@ -18,10 +18,24 @@ #define MAGIC 0x00000001 -struct pkg_database * -pkg_database_create(void) +#include "freebsd_database_directorydb.h" + +/* + * Verify the magic value in a package database. If there is a mismatch, crash + * the client application. + */ +void +_pkg_db_check_magic(struct pkg_db *db, const char *func) +{ + if (db->magic != MAGIC) { + PKG_CLIENT_CRASH(func, "database magic number mismatch."); + } +} + +struct pkg_db * +pkg_db_create(void) { - struct pkg_database *db; + struct pkg_db *db; db = calloc(1, sizeof(*db)); if (db == NULL) { @@ -29,168 +43,158 @@ } db->magic = MAGIC; + /* If NULL, closed. If not NULL, open. */ db->internal = NULL; - db->vtable = NULL; - db->status = CLOSED; + + /* TODO: NULL out callback pointers. */ + db->open = fbsd_directorydb_open; + db->all = fbsd_directorydb_all; + db->get = fbsd_directorydb_get; return (db); } -/* - * Verify the magic value in a package database. If there is a mismatch, crash - * the client application. - */ -void -_pkg_database_check_magic(struct pkg_database *db, const char *func) -{ - if (db->magic != MAGIC) { - PKG_CLIENT_CRASH(func, "database magic number mismatch."); - } -} - -/* Release a package database from memory. */ int -pkg_database_release(struct pkg_database *db) +pkg_db_finish(struct pkg_db *db) { - _pkg_database_check_magic(db, __func__); - - if (db->status != CLOSED) { - if (db->vtable->close(db) != PKG_OK) { - warnx("db->vtable->close() failed."); + if (db->internal != NULL) { + if (pkg_db_close(db) != PKG_OK) { + warnx("Could not close pkg_db (%s)\n", db->path); return (PKG_NOT_OK); } } + free(db); return (PKG_OK); } -void -_pkg_database_set_vtable(struct pkg_database *db, struct pkg_database_vtable *vt) -{ - db->vtable = vt; -} - -/* - * Do a check on the magic value, attributes, and vtable of a database, then - * call its open callback. +/* + * Open a database. */ int -pkg_database_open(struct pkg_database *db, const char *location, u_int f) +pkg_db_open(struct pkg_db *db, const char *path) { int r; - _pkg_database_check_magic(db, __func__); + _pkg_db_check_magic(db, __func__); + + r = PKG_NOT_OK; + if ((r = db->open(db, path)) == PKG_OK) { + strcpy(db->path, path); + } -#if 0 - debug_logger(LOG_LIBRARY, "Open pkg_database at \"%s\".", location); -#endif - - if ((r = db->vtable->open(db, location, f)) == PKG_OK) { - db->status = OPEN; - } - /* Need the return value incase we caught a fatal. */ return (r); } -int -pkg_database_close(struct pkg_database *db) +struct pkg_list * +pkg_db_all(struct pkg_db *db) { - int r; + return (db->all(db)); +} - if (db->status != OPEN) { +uid_t +pkg_db_owner(struct pkg_db *db) +{ + if (db->internal == NULL) { return (PKG_NOT_OK); } - if ((r = db->vtable->close(db)) == PKG_OK) { - db->status = CLOSED; + return (db->owner(db)); +} + +const char * +pkg_db_path(struct pkg_db *db) +{ + if (db->internal == NULL) { + return (NULL); } - return (r); + + return (db->path); } -/* Get the next package in a database. */ int -pkg_database_get_next_pkg(struct pkg_database *db, struct pkg *p, u_int f) +pkg_db_close(struct pkg_db *db) { int r; - _pkg_check_magic(p, __func__); - _pkg_database_check_magic(db, __func__); + if (db->internal != NULL) { + if (db->close) { + r = db->close(db); + } else { + r = PKG_OK; + } + } else { + /* kaboom? */ + return (PKG_NOT_OK); + } + + return (r); +} + +struct pkg * +pkg_db_add(struct pkg_db *db, const char *key) +{ + struct pkg *pkg; - if (db->status != OPEN) { - return (PKG_NOT_OK); + pkg = pkg_alloc(); + if (pkg == NULL) { + return (NULL); } - /* - * The database and package have both been validated. Clear the package - * and pass it to the _get_next_pkg function in the vtable. - */ - pkg_clear(p); - r = db->vtable->get_next_pkg(db, p, f); - if (r == PKG_FATAL) { - PKG_CLIENT_CRASH(__func__, "Got PKG_FATAL"); + /* Do the add and set up pkg. */ + if (db->add(db, pkg, key) != PKG_OK) { + pkg_free(pkg); + return (NULL); } - return (r); + return (pkg); } -#if 0 -int -pkg_database_get_pkg(struct pkg_database *db, struct pkg *, u_int f) +struct pkg * +pkg_db_get(struct pkg_db *db, const char *key) { - int r; + /* XXX: This function is a perfect example of why I need error + * properties. */ + struct pkg *pkg; + + pkg = pkg_alloc(); + if (pkg == NULL) { + return (NULL); + } - _pkg_check_magic(p, __func__); - _pkg_database_check_magic(db, __func__); - - if (db->status != OPEN) { - PKG_CLIENT_CRASH(__func__, "Database is not open"); + strcpy(pkg->key, key); + if (db->get(db, pkg, key) != PKG_OK) { + return (NULL); } - r = db->vtable->get_pkg(db, p, f); - - PKG_CLIENT_CRASH(__func__, "Not implemented."); - - return (r) + return (pkg); } -#endif -void -pkg_database_rewind(struct pkg_database *db) +int +pkg_db_delete(struct pkg_db *db, const char *key) { - _pkg_database_check_magic(db, __func__); - db->vtable->rewind(db); + /* Does a complete removal of all information pertaining to pkg key from + * the database. Any pkg objects for this package or now invalid/stale. + * */ + return (db->delete(db, key)); } int -pkg_database_add_pkg(struct pkg_database *db, struct pkg *p, u_int f) +pkg_db_destroy(struct pkg_db *db, struct pkg *p) { -#if 0 - int r; -#endif - (void)f; + (void)db; + (void)p; + return (PKG_OK); +} - _pkg_check_magic(p, __func__); - - if (db->status != OPEN) { - PKG_CLIENT_CRASH(__func__, "db->status != OPEN"); - } - /* Log this action. */ - /* - * This functions will put weird shit in your logs if you haven't set - * the key_name attribute. - */ -#if 0 - r = pkg_logging_log_database_add(p, db->vtable->add, db, p, f); - return (r); -#endif - PKG_CLIENT_CRASH(__func__, "Not implemented."); - return (PKG_NOT_OK); +int +pkg_db_revert(struct pkg_db *db) +{ + return (db->revert(db)); } int -pkg_database_remove_pkg(struct pkg_database *db, const char *name) +pkg_db_sync(struct pkg_db *db) { - _pkg_database_check_magic(db, __func__); - - return (db->vtable->remove_pkg(db, name)); + return (db->sync(db)); } ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.h#3 (text+ko) ==== @@ -10,34 +10,59 @@ #include "pkg.h" -/* XXX: Init's for database types. */ -void pkg_database_directorydb_init(struct pkg_database *); +/* Allocate a new pkg_db object. */ +struct pkg_db *pkg_db_create(void); + +/* Free a pkg_db object. Closes with no sync if open. */ +int pkg_db_finish(struct pkg_db *); + +/* Get the path of a pkg_db . */ +const char *pkg_db_path(struct pkg_db *); + +struct pkg_list *pkg_db_all(struct pkg_db *); + +/* XXX: Get allocates a package if the package is already in the db. Add + * allocates a package if the package is NOT already in the db. */ + +/* Create a pkg in a pkg_db. If the pkg already exists, returns NULL. */ +struct pkg *pkg_db_add(struct pkg_db *, const char *); + +/* Get a pkg from a pkg_db. If the package does not exist, returns NULL. */ +struct pkg *pkg_db_get(struct pkg_db *, const char *); -struct pkg_database *pkg_database_create(void); +// /* Get all pkgs from a pkg_db that match an expressions. */ +// struct pkg_list *pkg_db_get(struct pkg_db *, const char *); -int pkg_database_release(struct pkg_database *); +/* Deletes a pkg from a pkg_db. */ +int pkg_db_delete(struct pkg_db *, const char *); -uid_t pkg_database_owner(struct pkg_database *); +/* Destroy a pkg object that was created by pkg_db. */ +int pkg_db_destroy(struct pkg_db *, struct pkg *); -/* Get the next package in a database. */ -int pkg_database_get_next_pkg(struct pkg_database *, struct pkg *, u_int); +/* Returns the uid of the owner of a pkg_db. */ +uid_t pkg_db_owner(struct pkg_db *); -/* Get the current package (again). */ -int pkg_database_get_pkg(struct pkg_database *, struct pkg *, u_int); +void pkg_db_set_callbacks(struct pkg_db *, + int (*close) (struct pkg_db *), + struct pkg *(*add) (struct pkg_db *, const char *), + int (*delete) (struct pkg_db *, const char *), + int (*open) (struct pkg_db *, const char *), + uid_t (*owner) (struct pkg_db *), + struct pkg *(*get) (struct pkg_db *, const char *, + uint32_t), + int (*revert) (struct pkg_db *), + int (*sync) (struct pkg_db *)); -/* Reset the cursor in a database. */ -void pkg_database_rewind(struct pkg_database *); +/* Undo all changes to a pkg_db. */ +int pkg_db_revert(struct pkg_db *); /* Open a database for interaction. */ -int pkg_database_open(struct pkg_database *, const char *, u_int); +int pkg_db_open(struct pkg_db *, const char *); /* Close a database. */ -int pkg_database_close(struct pkg_database *); +int pkg_db_close(struct pkg_db *); -/* Add a package to a database. */ -int pkg_database_add_pkg(struct pkg_database *, struct pkg *, u_int); - -/* Remove a package (by key) from a database. */ -int pkg_database_remove_pkg(struct pkg_database *, const char *); +/* Sync changes to a pkg_db to disk. */ +int pkg_db_sync(struct pkg_db *); #endif ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/database_internal.h#3 (text+ko) ==== @@ -8,29 +8,27 @@ #include "database.h" -struct pkg_database_vtable { - int (*add_pkg) (struct pkg_database *, struct pkg *, u_int); - int (*close) (struct pkg_database *); - int (*remove_pkg) (struct pkg_database *, const char *); - int (*get_next_pkg) (struct pkg_database *, struct pkg *, u_int); - int (*get_pkg) (struct pkg_database *, struct pkg *, u_int); - int (*rewind) (struct pkg_database *); - int (*open) (struct pkg_database *, const char *, u_int); - uid_t (*owner) (struct pkg_database *); -}; - /* Define the package database type. */ -struct pkg_database { +struct pkg_db { unsigned int magic; /* init */ + char path[PATH_MAX]; /* Internal db pointer for whatever backend is in use. */ void *internal; - status_t status; - struct pkg_database_vtable *vtable; + + int (*add) (struct pkg_db *, struct pkg *, const char *); + int (*close) (struct pkg_db *); + int (*contains) (struct pkg_db *, const char *); + int (*get) (struct pkg_db *, struct pkg *, + const char *); + struct pkg_list *(*all) (struct pkg_db *); + int (*open) (struct pkg_db *, const char *); + uid_t (*owner) (struct pkg_db *); + int (*delete) (struct pkg_db *, const char *); + int (*revert) (struct pkg_db *); + int (*sync) (struct pkg_db *); }; /* Check the magic value in a database. */ -void _pkg_database_check_magic(struct pkg_database *, const char *); +void _pkg_db_check_magic(struct pkg_db *, const char *); -void _pkg_database_set_vtable(struct pkg_database *, - struct pkg_database_vtable *); #endif ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_database_directorydb.c#3 (text+ko) ==== @@ -6,333 +6,596 @@ #include #include #include - +#include +#include +#include +#include #include #include -#include #include /* Cool kids club. */ #include "internal.h" #include "freebsd_database_directorydb.h" +#include "freebsd_plist.h" + +#include "file.h" + +struct _read_plist { + struct pkg_property *plist; + char key[PATH_MAX]; + uint32_t parsed; + RB_ENTRY(_read_plist) entry; +}; + struct _directorydb { - char *location[2]; - FTS *ftsp; + /* Location of the database. */ + char path[PATH_MAX]; + + /* Journal handle. */ + int journal; + char journal_path[PATH_MAX]; + char journal_dir_path[PATH_MAX]; + + /* A NULL terminated list of keys the db currently has. */ + char **keylist; + + /* + * The time of our last access. If this has changed, another + * directorydb instance has changes something, so we need to refresh. + */ + time_t last; + + RB_HEAD(plist_head, _read_plist) plist_head; }; -static int _fts_entry_compare(const FTSENT * const *, const FTSENT * const *); -static int _read_pkg(struct pkg_database *, FTSENT *, struct pkg *, u_int); -static int _write_pkg(struct pkg_database *, struct pkg *, u_int); -static int _pkg_database_directorydb_open(struct pkg_database *, const char *, - u_int); -static uid_t _pkg_database_directorydb_owner(struct pkg_database *); -static int _pkg_database_directorydb_rewind(struct pkg_database *); -static int _pkg_database_directorydb_close(struct pkg_database *); -static int _pkg_database_directorydb_add_pkg(struct pkg_database *, - struct pkg *, u_int); -static int _pkg_database_directorydb_remove_pkg(struct pkg_database *, - const char *); -static int _pkg_database_directorydb_get_next_pkg(struct pkg_database *, - struct pkg *, u_int); +#define CONTENTS 0x00000001 +#define DESCRIPTION 0x00000002 +#define COMMENT 0x00000004 +#define DISPLAY 0x00000008 -static struct pkg_database_vtable _vt = { - .open = _pkg_database_directorydb_open, - .close = _pkg_database_directorydb_close, - .add_pkg = _pkg_database_directorydb_add_pkg, - .remove_pkg = _pkg_database_directorydb_remove_pkg, - .rewind = _pkg_database_directorydb_rewind, - .get_next_pkg = _pkg_database_directorydb_get_next_pkg, - .owner = _pkg_database_directorydb_owner +static struct pkg_info { + uint32_t info_mask; + const char *info_name; + const char *file_name; +} pkg_entries [] = { + { CONTENTS, FBSD_METANAME_CONTENTS, "+CONTENTS" }, + { DESCRIPTION, FBSD_METANAME_DESCRIPTION, "+DESC" }, + { COMMENT, FBSD_METANAME_COMMENT, "+COMMENT" }, + { DISPLAY, FBSD_METANAME_DISPLAY, "+DISPLAY" }, + { 0, NULL, NULL }, }; +static const char *fbsd_directorydb_pkg_origin(struct pkg *); +static const char *fbsd_directorydb_pkg_name(struct pkg *); +static const char *fbsd_directorydb_pkg_comment(struct pkg *); +static const char *fbsd_directorydb_pkg_description(struct pkg *); +static const char *fbsd_directorydb_get_string_property( + struct _directorydb *, const char *, + const char *, uint32_t); +static struct pkg_property *fbsd_directorydb_get_plist( + struct _directorydb *, const char *); +static int fbsd_directorydb_read_pkg( + struct _directorydb *, const char *, + struct pkg_property *, uint32_t); +static char *read_file(const char *); +static int _read_plist_cmp(struct _read_plist *, + struct _read_plist *); +static int dselect(const struct dirent *ent); +static void fbsd_pkg_setup(struct pkg_db *, + struct pkg *pkg, const char *key); +static int fbsd_directorydb_property_to_file( + struct pkg_property *, struct pkg_file *file); + +RB_GENERATE_STATIC(plist_head, _read_plist, entry, _read_plist_cmp); + +#define PKG_DIRDB_MAGIC 0x11111111 +#define DB_DIRDB_MAGIC 0x11111111 + +/* The journal file. */ +#define JOURNAL ".journal" +/* Where the journaler can store files for changes before a sync. */ +#define JOURNAL_DIR ".journal_sav" + +#define journal_open(path) open(path, O_CREAT | O_APPEND | O_EXLOCK) -/* Initialize and return a static vtable for directorydb ops. */ -struct pkg_database_vtable * -pkg_database_directorydb_vtable(void) +#define _pkg_check_magic(p) assert(p->magic == PKG_DIRDB_MAGIC) +#define _db_check_magic(db) assert(db->magic == DB_DIRDB_MAGIC) + +static int +_read_plist_cmp(struct _read_plist *a, struct _read_plist *b) { -#if 0 - static struct pkg_database_vtable vt; - - vt.open = _pkg_database_directorydb_open; - vt.close = _pkg_database_directorydb_close; - vt.add_pkg = _pkg_database_directorydb_add_pkg; - vt.remove_pkg = _pkg_database_directorydb_remove_pkg; - vt.rewind = _pkg_database_directorydb_rewind; - vt.get_next_pkg = _pkg_database_directorydb_get_next_pkg; -#endif - return (&_vt); + return (strcmp(a->key, b->key)); } -void -pkg_database_directorydb_init(struct pkg_database *db) +static int +dselect(const struct dirent *ent) { - _pkg_database_set_vtable(db, &_vt); + return (ent->d_name[0] != '.' && ent->d_type == DT_DIR); } -const char * -pkg_database_directorydb_type_name(void) +/* Close a "connection" to a directorydb. */ +int +fbsd_directorydb_close(struct pkg_db *db) { - return ("directorydb"); + struct _directorydb *d = db->internal; + close(d->journal); + return (0); } -static uid_t -_pkg_database_directorydb_owner(struct pkg_database *db) +/* Open a "connection" to a directorydb. */ +int +fbsd_directorydb_open(struct pkg_db *db, const char *path) { struct _directorydb *d; struct stat sb; - - d = db->internal; - if (d == NULL || lstat(d->location[0], &sb) < 0) { - return (-1); - } + int jfd; - return (sb.st_uid); -} + printf("ddb open\n"); -static int -_pkg_database_directorydb_open(struct pkg_database *db, const char *path, - u_int flags) -{ - struct _directorydb *d; - (void)flags; - d = calloc(1, sizeof(*d)); if (d == NULL) { return (PKG_NOT_OK); } - /* Initialize everything. */ - d->location[0] = strdup(path); - d->location[1] = NULL; + strcpy(d->path, path); + printf("path: %s\n", d->path); + + db->magic = DB_DIRDB_MAGIC; + RB_INIT(&d->plist_head); + + (void)jfd; + (void)sb; +#if 0 + + /* Open the journal. */ + + strcpy(d->journal_path, d->path); + strcat(d->journal_path, JOURNAL); + + /* Grab the lock on the journal file, creating it if it doesn't exist. + * */ + if ((jfd = journal_open(d->journal_path)) < 0) { + return (PKG_NOT_OK); + } + + /* Make sure that the journal dir exists (create it if it doesn't). */ + strcpy(d->journal_dir_path, d->path); + strcpy(d->journal_dir_path, "/"); + strcpy(d->journal_dir_path, JOURNAL_DIR); - /* Use fts here so we can get ordering and a quick refresh. */ - d->ftsp = fts_open(d->location, FTS_LOGICAL | FTS_NOCHDIR | FTS_NOSTAT, - _fts_entry_compare); + if (stat(d->journal_dir_path, &sb) < 0) { + /* not there. */ + mkdir(d->journal_dir_path, 0755); + } else if (!S_ISDIR(sb.st_mode)) { + close(jfd); + return (PKG_NOT_OK); /* This could probably be FATAL */ + } - if (d->ftsp == NULL) { - PKG_CLIENT_CRASH(__func__, "Failed to open database."); + /* Let the journal file go. */ + if (close(jfd) < 0) { + return (PKG_FATAL); } +#endif + /* Annnnd... go. */ db->internal = d; return (PKG_OK); } -static int -_pkg_database_directorydb_rewind(struct pkg_database *db) +static void +fbsd_pkg_setup(struct pkg_db *db, struct pkg *pkg, const char *key) +{ + if (pkg == NULL) { + return; + } + + pkg->magic = PKG_DIRDB_MAGIC; + pkg->source = db; + strcpy(pkg->key, key); + + pkg->name = fbsd_directorydb_pkg_name; + pkg->origin = fbsd_directorydb_pkg_origin; + pkg->comment = fbsd_directorydb_pkg_comment; + pkg->description = fbsd_directorydb_pkg_description; + + pkg->files = fbsd_directorydb_files; +} + +struct pkg_list * +fbsd_directorydb_all(struct pkg_db *db) +{ + int c; + struct _directorydb *d; + struct dirent **ents; + struct pkg *pkg; + struct pkg_list *list; + + d = db->internal; + + c = scandir(d->path, &ents, dselect, alphasort); + if (c < 0) { + return (NULL); + } + + list = malloc(sizeof(*list)); + TAILQ_INIT(list); + for (int i = 0; i < c; ++i) { + pkg = pkg_alloc(); + fbsd_pkg_setup(db, pkg, ents[i]->d_name); + TAILQ_INSERT_TAIL(list, pkg, next); + free(ents[i]); + } + free(ents); + + return (list); +} + +#define fbsd_directorydb_list(fn_name, list_type, type, list_name, data_loc, converter) \ +struct list_type * \ +fn_name(struct pkg *pkg) \ +{ \ + struct type *a; \ + struct pkg_property *plist; \ + struct pkg_property *property_list; \ + struct pkg_property *property_node; \ + struct list_type *list; \ + struct _directorydb *d; \ + struct pkg_db *db; \ + const char *key; \ + list = malloc(sizeof(*list)); \ + if (list == NULL) return (NULL); \ + TAILQ_INIT(list); \ + db = pkg->source; \ + d = db->internal; \ + key = pkg->key; \ + plist = fbsd_directorydb_get_plist(d, key); \ + if (plist == NULL) return (NULL); \ + property_list = pkg_property_dict_get_property(plist, list_name); \ + if (property_list == NULL) { \ + fbsd_directorydb_read_pkg(d, key, plist, data_loc); \ + property_list = pkg_property_dict_get_property(plist, \ + list_name); \ + } \ + if (property_list == NULL) return (NULL); \ + property_node = NULL; \ + while ((property_node = pkg_property_list_get_next_property( \ + property_list, property_node)) != NULL) { \ + a = malloc(sizeof(*a)); \ + converter(property_node, a); \ + TAILQ_INSERT_TAIL(list, a, next); \ + } \ + return (list); \ +} + +fbsd_directorydb_list(fbsd_directorydb_files, pkg_file_list, pkg_file, FBSD_FILES, + CONTENTS, fbsd_directorydb_property_to_file); + +#if 0 +struct pkg_file_list * +fbsd_directorydb_files(struct pkg *pkg) { + struct pkg_file *file; + struct pkg_property *plist; + struct pkg_property *file_list; + struct pkg_property *file_node; + struct pkg_file_list *list; struct _directorydb *d; + struct pkg_db *db; + const char *key; + list = malloc(sizeof(*list)); + if (list == NULL) return (NULL); + TAILQ_INIT(list); + + db = pkg->source; d = db->internal; + key = pkg->key; + + plist = fbsd_directorydb_get_plist(d, key); + if (plist == NULL) { + return (NULL); + } + + + file_list = pkg_property_dict_get_property(plist, FBSD_FILES); + if (file_list == NULL) { + fbsd_directorydb_read_pkg(d, key, plist, CONTENTS); + file_list = pkg_property_dict_get_property(plist, FBSD_FILES); + } + if (file_list == NULL) { + return (NULL); + } - fts_close(d->ftsp); - d->ftsp = fts_open(d->location, FTS_LOGICAL | FTS_NOCHDIR | FTS_NOSTAT, - _fts_entry_compare); - if (d->ftsp == NULL) { - PKG_CLIENT_CRASH(__func__, "Failed ot open database"); + file_node = NULL; + while ((file_node = pkg_property_list_get_next_property(file_list, + file_node)) != NULL) { + file = pkg_file_alloc(); + fbsd_directorydb_property_to_file(file_node, file); + TAILQ_INSERT_TAIL(list, file, next); } + return (list); +} +#endif + +static int +fbsd_directorydb_property_to_file(struct pkg_property *node, + struct pkg_file *file) +{ + struct pkg_property *string; + + /* Should probably assert that node is a dict... */ + + string = pkg_property_dict_get_property(node, FBSD_PATHNAME); + strcpy(file->pathname, pkg_property_string_get_string(string)); + string = pkg_property_dict_get_property(node, FBSD_PREFIX); + strcpy(file->prefix, pkg_property_string_get_string(string)); + return (PKG_OK); } -static int -_pkg_database_directorydb_close(struct pkg_database *db) +int +fbsd_directorydb_contains(struct pkg_db *db, const char *key) { struct _directorydb *d; + struct stat sb; + char path[PATH_MAX]; d = db->internal; - fts_close(d->ftsp); - free(d->location[0]); - free(d); - return (PKG_OK); + + strcpy(path, d->path); + strcat(path, "/"); + strcat(path, key); + + if (stat(path, &sb) < 0) { + return (0); + } + + return (S_ISDIR(sb.st_mode)); } -static int -_pkg_database_directorydb_get_next_pkg(struct pkg_database *db, struct pkg *p, - u_int flags) +int +fbsd_directorydb_add(struct pkg_db *db, struct pkg *pkg, const char *name) { struct _directorydb *d; - FTSENT *f; + char path[PATH_MAX]; + int r; d = db->internal; - while ((f = fts_read(d->ftsp)) != NULL) { - /* make sure this is a directory. And that we're at the right - * level. This is basically just skipping the database basedir. - */ - if (f->fts_info != FTS_D || f->fts_level != 1) { - continue; - } + strcpy(path, d->path); + strcat(path, "/"); + strcat(path, name); + + r = mkdir(path, 0700); + + pkg->magic = PKG_DIRDB_MAGIC; + pkg->source = db; + pkg->plist = NULL; + + pkg->origin = fbsd_directorydb_pkg_origin; + pkg->name = fbsd_directorydb_pkg_name; + + return (r == 0 ? PKG_OK : PKG_NOT_OK); +} + +int +fbsd_directorydb_get(struct pkg_db *db, struct pkg *pkg, const char *name) +{ + struct _directorydb *d; + char path[PATH_MAX]; + struct stat sb; + + d = db->internal; - fts_set(d->ftsp, f, FTS_SKIP); /* We don't want the children. */ - /* Jump into _read_pkg and hope for the best. */ - return (_read_pkg(db, f, p, flags)); + strcpy(path, d->path); + strcat(path, "/"); + strcat(path, name); + + if (stat(path, &sb) < 0) { + printf("no stat %s\n", name); + return (PKG_NOT_OK); } + + pkg->magic = PKG_DIRDB_MAGIC; + pkg->source = db; + pkg->plist = NULL; - /* 'Cursor' is at the end. */ - return (PKG_NOT_OK); + pkg->origin = fbsd_directorydb_pkg_origin; + pkg->name = fbsd_directorydb_pkg_name; + + return (PKG_OK); } -static int -_pkg_database_directorydb_add_pkg(struct pkg_database *db, struct pkg *p, - u_int flags) +static const char * +fbsd_directorydb_pkg_origin(struct pkg *pkg) { - _write_pkg(db, p, flags); - _pkg_database_directorydb_rewind(db); + struct pkg_db *db; + struct _directorydb *d; + + _pkg_check_magic(pkg); + + db = pkg->source; + _db_check_magic(db); + d = db->internal; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 13 13:46:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E02311065679; Wed, 13 Oct 2010 13:46: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 A2902106564A for ; Wed, 13 Oct 2010 13:46:19 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 748CF8FC0A for ; Wed, 13 Oct 2010 13:46:19 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9DDkJ0T004097 for ; Wed, 13 Oct 2010 13:46:19 GMT (envelope-from kibab@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9DDkJfs004094 for perforce@freebsd.org; Wed, 13 Oct 2010 13:46:19 GMT (envelope-from kibab@FreeBSD.org) Date: Wed, 13 Oct 2010 13:46:19 GMT Message-Id: <201010131346.o9DDkJfs004094@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 13:46:20 -0000 http://p4web.freebsd.org/@@184664?ac=10 Change 184664 by kibab@kibab_kibab-nb on 2010/10/13 13:45:15 Made some style changes, suggested by netchild@. Affected files ... .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_lockstat.c#4 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_ntptime.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_pmc.c#3 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_mchain.c#4 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/libalias/alias.c#4 edit Differences ... ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_lockstat.c#4 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -FEATURE(kdtrace_hooks, "Kernel DTRACE hooks"); /* * The following must match the type definition of dtrace_probe. It is * defined this way to avoid having to rely on CDDL code. ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_ntptime.c#3 (text+ko) ==== @@ -52,7 +52,7 @@ #include #ifdef PPS_SYNC -FEATURE(pps_sync, "Support usage of external PPS signal by kernel PLL"); +FEATURE(pps_sync, "Support external PPS signals for the kernel PLL"); #endif /* ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_pmc.c#3 (text+ko) ==== @@ -41,6 +41,7 @@ #ifdef HWPMC_HOOKS FEATURE(hwpmc_hooks, "Kernel support for HW PMC"); + #define PMC_KERNEL_VERSION PMC_VERSION #else #define PMC_KERNEL_VERSION 0 ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_mchain.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #include -FEATURE(libmchain, "mchain library"); +FEATURE(libmchain, "libmchain library"); MODULE_VERSION(libmchain, 1); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/libalias/alias.c#4 (text+ko) ==== @@ -118,6 +118,7 @@ #include #include FEATURE(libalias, "libalias library"); + #else #include #include From owner-p4-projects@FreeBSD.ORG Wed Oct 13 13:48:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADBD11065672; Wed, 13 Oct 2010 13:48: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 70435106566B for ; Wed, 13 Oct 2010 13:48:31 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5CCE78FC0C for ; Wed, 13 Oct 2010 13:48:31 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9DDmVbE004280 for ; Wed, 13 Oct 2010 13:48:31 GMT (envelope-from kibab@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9DDmVB8004277 for perforce@freebsd.org; Wed, 13 Oct 2010 13:48:31 GMT (envelope-from kibab@FreeBSD.org) Date: Wed, 13 Oct 2010 13:48:31 GMT Message-Id: <201010131348.o9DDmVB8004277@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 13:48:31 -0000 http://p4web.freebsd.org/@@184665?ac=10 Change 184665 by kibab@kibab_kibab-nb on 2010/10/13 13:48:03 Updated documentation. Affected files ... .. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/gen/feature_present.3#2 edit Differences ... ==== //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/gen/feature_present.3#2 (text+ko) ==== @@ -50,7 +50,10 @@ argument specifies the name of the feature to check. The .Fn feature_present -function will return 1 if the specified feature is present, +checks if the given +.Fa feature +is present in the list specified by FEATURES_DISABLE environment variable. +Function will return 1 if the specified feature is present and is not hidden by FEATURES_DISABLED environment variable, otherwise it will return 0. If the .Fn feature_present From owner-p4-projects@FreeBSD.ORG Wed Oct 13 13:49:37 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C795A1065672; Wed, 13 Oct 2010 13: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 8A1661065670 for ; Wed, 13 Oct 2010 13:49:37 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 762FD8FC08 for ; Wed, 13 Oct 2010 13:49:37 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9DDnbdk004301 for ; Wed, 13 Oct 2010 13:49:37 GMT (envelope-from kibab@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9DDnbN8004298 for perforce@freebsd.org; Wed, 13 Oct 2010 13:49:37 GMT (envelope-from kibab@FreeBSD.org) Date: Wed, 13 Oct 2010 13:49:37 GMT Message-Id: <201010131349.o9DDnbN8004298@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 13:49:38 -0000 http://p4web.freebsd.org/@@184666?ac=10 Change 184666 by kibab@kibab_kibab-nb on 2010/10/13 13:48:56 Added documentation. Affected files ... .. //depot/projects/soc2010/kibab_sysctlreg/src_usr_bin/feature_present/Makefile#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_usr_bin/feature_present/feature_present.1#1 add Differences ... ==== //depot/projects/soc2010/kibab_sysctlreg/src_usr_bin/feature_present/Makefile#2 (text+ko) ==== @@ -2,6 +2,5 @@ # $FreeBSD$ PROG= feature_present -NO_MAN=1 .include From owner-p4-projects@FreeBSD.ORG Wed Oct 13 21:40:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 716821065693; Wed, 13 Oct 2010 21:40:11 +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 337DF10656B7 for ; Wed, 13 Oct 2010 21:40:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 05C968FC19 for ; Wed, 13 Oct 2010 21:40:11 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9DLeAUU005449 for ; Wed, 13 Oct 2010 21:40:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9DLeAN0005446 for perforce@freebsd.org; Wed, 13 Oct 2010 21:40:10 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 13 Oct 2010 21:40:10 GMT Message-Id: <201010132140.o9DLeAN0005446@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 21:40:11 -0000 http://p4web.freebsd.org/@@184689?ac=10 Change 184689 by hselasky@hselasky_laptop001 on 2010/10/13 21:40:07 IFC Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#20 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#28 (text+ko) ==== @@ -696,7 +696,6 @@ ieee80211_state_name[nstate]); IEEE80211_UNLOCK(ic); - RAL_LOCK(sc); usb_callout_stop(&uvp->ratectl_ch); @@ -728,18 +727,18 @@ if (m == NULL) { device_printf(sc->sc_dev, "could not allocate beacon\n"); - ieee80211_free_node(ni); RAL_UNLOCK(sc); IEEE80211_LOCK(ic); + ieee80211_free_node(ni); return (-1); } ieee80211_ref_node(ni); if (ural_tx_bcn(sc, m, ni) != 0) { device_printf(sc->sc_dev, "could not send beacon\n"); - ieee80211_free_node(ni); RAL_UNLOCK(sc); IEEE80211_LOCK(ic); + ieee80211_free_node(ni); return (-1); } } @@ -2255,10 +2254,8 @@ sum = ok+fail; retrycnt = sc->sta[8] + fail; - ni = ieee80211_ref_node(vap->iv_bss); ieee80211_ratectl_tx_update(vap, ni, &sum, &ok, &retrycnt); (void) ieee80211_ratectl_rate(ni, NULL, 0); - ieee80211_free_node(ni); ifp->if_oerrors += fail; /* count TX retry-fail as Tx errors */ ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#20 (text+ko) ==== @@ -1843,7 +1843,6 @@ sc->sc_state = nstate; IEEE80211_UNLOCK(ic); - URTW_LOCK(sc); usb_callout_stop(&sc->sc_led_ch); callout_stop(&sc->sc_watchdog_ch); @@ -1856,7 +1855,6 @@ break; case IEEE80211_S_RUN: ni = ieee80211_ref_node(vap->iv_bss); - /* setting bssid. */ urtw_write32_m(sc, URTW_BSSID, ((uint32_t *)ni->ni_bssid)[0]); urtw_write16_m(sc, URTW_BSSID + 4, @@ -1871,7 +1869,6 @@ if (error != 0) device_printf(sc->sc_dev, "could not control LED (%d)\n", error); - ieee80211_free_node(ni); break; default: From owner-p4-projects@FreeBSD.ORG Thu Oct 14 22:10:26 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3D9410656A4; Thu, 14 Oct 2010 22:10: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 6C18F1065679 for ; Thu, 14 Oct 2010 22:10:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 58BEC8FC1C for ; Thu, 14 Oct 2010 22:10:26 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9EMAQgG011349 for ; Thu, 14 Oct 2010 22:10:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9EMAQ2E011346 for perforce@freebsd.org; Thu, 14 Oct 2010 22:10:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 Oct 2010 22:10:26 GMT Message-Id: <201010142210.o9EMAQ2E011346@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184740 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Oct 2010 22:10:27 -0000 http://p4web.freebsd.org/@@184740?ac=10 Change 184740 by hselasky@hselasky_laptop001 on 2010/10/14 22:10:21 IFC Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#25 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#22 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#25 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/sys/dev/usb/controller/xhci.h,v 1.1 2010/10/03 08:12:17 hselasky Exp $ */ + /*- * Copyright (c) 2010 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb/usbdi.h#22 (text+ko) ==== @@ -81,7 +81,6 @@ #define USB_USER_DATA_PTR 0x0020 /* internal flag */ #define USB_MULTI_SHORT_OK 0x0040 /* allow multiple short frames */ #define USB_MANUAL_STATUS 0x0080 /* manual ctrl status */ -#define USB_DRY_RUN 0x0100 /* only setup control endpoint */ #define USB_NO_TIMEOUT 0 #define USB_DEFAULT_TIMEOUT 5000 /* 5000 ms = 5 seconds */ From owner-p4-projects@FreeBSD.ORG Thu Oct 14 22:29:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E0031065673; Thu, 14 Oct 2010 22:29: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 0F53F106566C for ; Thu, 14 Oct 2010 22:29:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B6CC68FC12 for ; Thu, 14 Oct 2010 22:29:05 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9EMT5D0015907 for ; Thu, 14 Oct 2010 22:29:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9EMT4VV015904 for perforce@freebsd.org; Thu, 14 Oct 2010 22:29:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 Oct 2010 22:29:04 GMT Message-Id: <201010142229.o9EMT4VV015904@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184744 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Oct 2010 22:29:06 -0000 http://p4web.freebsd.org/@@184744?ac=10 Change 184744 by hselasky@hselasky_laptop001 on 2010/10/14 22:28:03 IFC @ 184742 Affected files ... .. //depot/projects/usb/src/lib/libusb/Makefile#9 integrate .. //depot/projects/usb/src/lib/libusb/libusb.3#26 integrate .. //depot/projects/usb/src/lib/libusb/libusb.h#18 integrate .. //depot/projects/usb/src/lib/libusb/libusb10.c#28 integrate .. //depot/projects/usb/src/lib/libusb/libusb10_io.c#16 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.3#13 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.c#21 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#12 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_int.h#14 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#17 integrate .. //depot/projects/usb/src/lib/libusb/usb.h#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#24 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#35 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#20 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#12 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#11 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#12 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#26 integrate .. //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#11 integrate .. //depot/projects/usb/src/sys/arm/at91/at91.c#17 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_machdep.c#6 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_mci.c#12 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pio.c#11 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pio_rm9200.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pio_sam9.h#2 delete .. //depot/projects/usb/src/sys/arm/at91/at91_pio_sam9g20.h#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91_pioreg.h#4 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pit.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pmc.c#10 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pmcreg.h#4 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pmcvar.h#3 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_reset.S#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91_rst.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91_rstreg.h#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91_twi.c#11 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_twireg.h#5 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_wdt.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91_wdtreg.h#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91reg.h#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91rm9200.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91rm92reg.h#6 integrate .. //depot/projects/usb/src/sys/arm/at91/at91sam9.c#2 delete .. //depot/projects/usb/src/sys/arm/at91/at91sam9260.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91sam9260reg.h#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91sam9_machdep.c#2 delete .. //depot/projects/usb/src/sys/arm/at91/at91sam9g20.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/at91sam9g20reg.h#2 integrate .. //depot/projects/usb/src/sys/arm/at91/at91var.h#4 integrate .. //depot/projects/usb/src/sys/arm/at91/board_hl201.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/board_kb920x.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/board_qila9g20.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/board_sam9g20ek.c#1 branch .. //depot/projects/usb/src/sys/arm/at91/files.at91#11 integrate .. //depot/projects/usb/src/sys/arm/at91/files.at91sam9#2 integrate .. //depot/projects/usb/src/sys/arm/at91/if_ate.c#20 integrate .. //depot/projects/usb/src/sys/arm/at91/if_atereg.h#5 integrate .. //depot/projects/usb/src/sys/arm/at91/if_macb.c#2 integrate .. //depot/projects/usb/src/sys/arm/at91/std.at91sam9#2 integrate .. //depot/projects/usb/src/sys/arm/at91/std.kb920x#6 integrate .. //depot/projects/usb/src/sys/arm/at91/std.qila9g20#1 branch .. //depot/projects/usb/src/sys/arm/at91/std.sam9g20ek#1 branch .. //depot/projects/usb/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#7 integrate .. //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#13 integrate .. //depot/projects/usb/src/sys/arm/conf/QILA9G20#1 branch .. //depot/projects/usb/src/sys/arm/conf/QILA9G20.hints#1 branch .. //depot/projects/usb/src/sys/arm/conf/SAM9G20EK#1 branch .. //depot/projects/usb/src/sys/arm/conf/SAM9G20EK.hints#1 branch .. //depot/projects/usb/src/sys/boot/common/loader.8#10 integrate .. //depot/projects/usb/src/sys/boot/i386/gptboot/Makefile#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#2 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#23 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#14 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_util.h#6 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#14 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysvec.c#9 integrate .. //depot/projects/usb/src/sys/compat/x86bios/x86bios.c#8 integrate .. //depot/projects/usb/src/sys/conf/NOTES#58 integrate .. //depot/projects/usb/src/sys/conf/files#101 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#32 integrate .. //depot/projects/usb/src/sys/conf/options#51 integrate .. //depot/projects/usb/src/sys/conf/options.arm#15 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/acpica_prep.sh#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#12 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/adisasm.c#9 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#9 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompile.c#11 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#11 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asldefine.h#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmain.c#10 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmessages.h#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslresource.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype1i.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2d.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2e.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2q.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2w.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltypes.h#11 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslutils.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtcompile.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dttemplate.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfregn.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acapps.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/aclocal.h#9 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#12 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/platform/acenv.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/osunixxf.c#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utglobal.c#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utids.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utosi.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate .. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#4 integrate .. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/msg/privmsg.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/msg/uni_ie.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/sig/sig_call.c#2 integrate .. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/sig/sig_reset.c#2 integrate .. //depot/projects/usb/src/sys/contrib/pf/netinet/in4_cksum.c#2 integrate .. //depot/projects/usb/src/sys/crypto/aesni/aeskeys_i386.S#2 integrate .. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdHardware.c#9 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#31 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_ec.c#11 integrate .. //depot/projects/usb/src/sys/dev/age/if_age.c#15 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#4 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#4 integrate .. //depot/projects/usb/src/sys/dev/alc/if_alc.c#11 integrate .. //depot/projects/usb/src/sys/dev/ale/if_ale.c#10 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#30 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#19 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#34 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#19 integrate .. //depot/projects/usb/src/sys/dev/bwn/if_bwn.c#7 integrate .. //depot/projects/usb/src/sys/dev/ce/if_ce.c#11 integrate .. //depot/projects/usb/src/sys/dev/cp/if_cp.c#11 integrate .. //depot/projects/usb/src/sys/dev/dc/dcphy.c#7 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#14 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dcreg.h#9 integrate .. //depot/projects/usb/src/sys/dev/dc/pnphy.c#6 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#19 integrate .. //depot/projects/usb/src/sys/dev/hptrr/hptrr_osm_bsd.c#5 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/pmc_events.h#11 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#37 integrate .. //depot/projects/usb/src/sys/dev/iwi/if_iwi.c#17 integrate .. //depot/projects/usb/src/sys/dev/iwi/if_iwivar.h#9 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jme.c#12 integrate .. //depot/projects/usb/src/sys/dev/kbd/kbd.c#8 integrate .. //depot/projects/usb/src/sys/dev/kbdmux/kbdmux.c#12 integrate .. //depot/projects/usb/src/sys/dev/mii/acphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/amphy.c#7 integrate .. //depot/projects/usb/src/sys/dev/mii/axphy.c#3 integrate .. //depot/projects/usb/src/sys/dev/mii/axphyreg.h#2 delete .. //depot/projects/usb/src/sys/dev/mii/bmtphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/brgphy.c#17 integrate .. //depot/projects/usb/src/sys/dev/mii/gentbi.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/inphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/lxtphy.c#6 integrate .. //depot/projects/usb/src/sys/dev/mii/mii.c#8 integrate .. //depot/projects/usb/src/sys/dev/mii/mii.h#3 integrate .. //depot/projects/usb/src/sys/dev/mii/miivar.h#4 integrate .. //depot/projects/usb/src/sys/dev/mii/nsphy.c#7 integrate .. //depot/projects/usb/src/sys/dev/mii/qsphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/rlphy.c#8 integrate .. //depot/projects/usb/src/sys/dev/mii/ruephy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/tdkphy.c#7 integrate .. //depot/projects/usb/src/sys/dev/mii/tlphy.c#7 integrate .. //depot/projects/usb/src/sys/dev/mii/ukphy_subr.c#4 integrate .. //depot/projects/usb/src/sys/dev/mps/mps.c#2 integrate .. //depot/projects/usb/src/sys/dev/mps/mps_ioctl.h#2 integrate .. //depot/projects/usb/src/sys/dev/mps/mps_sas.c#2 integrate .. //depot/projects/usb/src/sys/dev/mps/mps_user.c#2 integrate .. //depot/projects/usb/src/sys/dev/mps/mpsvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/sge/if_sge.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.c#10 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/spicds.c#7 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#46 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#61 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#19 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehcireg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#35 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#40 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#45 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axereg.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdcereg.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/net/uhso.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#39 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#38 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/usb.h#55 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#17 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#29 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#42 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#35 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#19 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_ioctl.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_parse.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.h#15 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#20 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#142 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#23 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi_util.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#35 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#26 integrate .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_mount.h#2 integrate .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vfsops.c#12 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs.h#7 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_int.h#9 integrate .. //depot/projects/usb/src/sys/fs/hpfs/hpfs_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/fs/hpfs/hpfsmount.h#2 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_denode.c#11 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#16 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfsmount.h#5 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#15 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfsmount.h#2 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#18 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#28 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_ebr.c#8 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_mbr.c#12 integrate .. //depot/projects/usb/src/sys/geom/virstor/g_virstor.c#5 integrate .. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_mount.h#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#21 integrate .. //depot/projects/usb/src/sys/i386/i386/locore.s#7 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#31 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#38 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysvec.c#6 integrate .. //depot/projects/usb/src/sys/i386/include/pmap.h#19 integrate .. //depot/projects/usb/src/sys/i386/include/specialreg.h#20 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#20 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#20 integrate .. //depot/projects/usb/src/sys/kern/kern_conf.c#24 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#28 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#23 integrate .. //depot/projects/usb/src/sys/kern/kern_kthread.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_malloc.c#18 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#32 integrate .. //depot/projects/usb/src/sys/kern/kern_resource.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_shutdown.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#30 integrate .. //depot/projects/usb/src/sys/kern/kern_thr.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_thread.c#20 integrate .. //depot/projects/usb/src/sys/kern/kern_time.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#19 integrate .. //depot/projects/usb/src/sys/kern/subr_smp.c#17 integrate .. //depot/projects/usb/src/sys/kern/subr_taskqueue.c#14 integrate .. //depot/projects/usb/src/sys/kern/sys_process.c#22 integrate .. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#15 integrate .. //depot/projects/usb/src/sys/kern/vfs_aio.c#15 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#38 integrate .. //depot/projects/usb/src/sys/mips/cavium/files.octeon1#5 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/cavium-ethernet.h#3 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-mdio.c#3 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-mv88e61xx.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet.c#3 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/mv88e61xxphy.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octe/mv88e61xxphyreg.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octe/octe.c#3 integrate .. //depot/projects/usb/src/sys/mips/conf/OCTEON1#7 integrate .. //depot/projects/usb/src/sys/mips/rmi/board.c#6 integrate .. //depot/projects/usb/src/sys/mips/rmi/board.h#5 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/nlge/if_nlge.c#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/nlge/if_nlge.h#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/fmn.c#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/rmi_mips_exts.h#4 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlr_pci.c#7 integrate .. //depot/projects/usb/src/sys/modules/cryptodev/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/mem/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/mii/Makefile#8 integrate .. //depot/projects/usb/src/sys/modules/sysvipc/sysvmsg/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/sysvipc/sysvsem/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb/Makefile#30 integrate .. //depot/projects/usb/src/sys/netgraph/ng_UI.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_async.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_frame_relay.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_gif_demux.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_iface.c#21 integrate .. //depot/projects/usb/src/sys/netgraph/ng_rfc1490.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_socket.c#11 integrate .. //depot/projects/usb/src/sys/netgraph/ng_tty.c#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.c#19 integrate .. //depot/projects/usb/src/sys/netinet6/in6_cksum.c#6 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec_output.c#14 integrate .. //depot/projects/usb/src/sys/pc98/pc98/machdep.c#21 integrate .. //depot/projects/usb/src/sys/pci/if_rl.c#17 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#21 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#17 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#17 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap.c#11 integrate .. //depot/projects/usb/src/sys/powerpc/include/altivec.h#2 integrate .. //depot/projects/usb/src/sys/powerpc/include/memdev.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/include/pcb.h#8 integrate .. //depot/projects/usb/src/sys/powerpc/include/trap_aim.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/mem.c#7 integrate .. //depot/projects/usb/src/sys/rpc/clnt_dg.c#9 integrate .. //depot/projects/usb/src/sys/rpc/clnt_vc.c#10 integrate .. //depot/projects/usb/src/sys/rpc/rpc_generic.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/include/endian.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#25 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mp_machdep.c#16 integrate .. //depot/projects/usb/src/sys/sun4v/include/endian.h#2 integrate .. //depot/projects/usb/src/sys/sys/_task.h#5 integrate .. //depot/projects/usb/src/sys/sys/conf.h#25 integrate .. //depot/projects/usb/src/sys/sys/exec.h#2 integrate .. //depot/projects/usb/src/sys/sys/module.h#4 integrate .. //depot/projects/usb/src/sys/sys/mount.h#26 integrate .. //depot/projects/usb/src/sys/sys/param.h#57 integrate .. //depot/projects/usb/src/sys/sys/proc.h#31 integrate .. //depot/projects/usb/src/sys/sys/signalvar.h#11 integrate .. //depot/projects/usb/src/sys/sys/taskqueue.h#7 integrate .. //depot/projects/usb/src/sys/sys/time.h#11 integrate .. //depot/projects/usb/src/sys/sys/user.h#15 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#28 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufsmount.h#6 integrate .. //depot/projects/usb/src/sys/vm/vm_map.c#29 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libusb/Makefile,v 1.8 2010/01/02 09:58:07 ed Exp $ +# $FreeBSD: src/lib/libusb/Makefile,v 1.9 2010/10/14 20:38:18 hselasky Exp $ # # Makefile for the FreeBSD specific LibUSB 2.0 # ==== //depot/projects/usb/src/lib/libusb/libusb.3#26 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.10 2010/08/06 14:33:42 joel Exp $ +.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.12 2010/10/14 20:50:33 hselasky Exp $ .\" -.Dd June 22, 2009 +.Dd October 14, 2010 .Dt LIBUSB 3 .Os .Sh NAME ==== //depot/projects/usb/src/lib/libusb/libusb.h#18 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb.h,v 1.13 2010/05/13 00:25:30 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb.h,v 1.15 2010/10/14 20:50:33 hselasky Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb10.c#28 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.9 2010/05/13 00:25:30 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.11 2010/10/14 20:50:33 hselasky Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.7 2010/05/13 00:25:30 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.8 2010/10/14 20:18:39 hselasky Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb20.3#13 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb/libusb20.3,v 1.7 2010/08/16 15:18:30 joel Exp $ +.\" $FreeBSD: src/lib/libusb/libusb20.3,v 1.8 2010/10/14 20:50:33 hselasky Exp $ .\" -.Dd November 18, 2009 +.Dd October 14, 2010 .Dt LIBUSB20 3 .Os .Sh NAME ==== //depot/projects/usb/src/lib/libusb/libusb20.c#21 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.9 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.10 2010/10/14 20:38:18 hselasky Exp $ */ /*- * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_compat01.c,v 1.7 2010/05/13 00:26:30 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_compat01.c,v 1.8 2010/10/14 20:04:36 hselasky Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb20_int.h#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.5 2010/01/29 02:44:06 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.6 2010/10/14 20:38:18 hselasky Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.9 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.10 2010/10/14 20:38:18 hselasky Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/usb.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/usb.h,v 1.3 2010/02/13 09:45:50 wkoszek Exp $ */ +/* $FreeBSD: src/lib/libusb/usb.h,v 1.4 2010/10/14 20:04:36 hselasky Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#24 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.182 2010/07/22 09:13:49 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.183 2010/10/05 15:31:56 kib Exp $"); #include "opt_cpu.h" @@ -278,7 +278,7 @@ "\017xTPR" /* Send Task Priority Messages*/ "\020PDCM" /* Perf/Debug Capability MSR */ "\021" - "\022" + "\022PCID" /* Process-context Identifiers */ "\023DCA" /* Direct Cache Access */ "\024SSE4.1" "\025SSE4.2" ==== //depot/projects/usb/src/sys/amd64/amd64/machdep.c#35 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.724 2010/09/13 07:25:35 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.726 2010/10/12 20:53:12 jkim Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -795,7 +795,8 @@ if (strcmp(idle_tbl[i].id_name, "acpi") == 0 && cpu_idle_hook == NULL) continue; - p += sprintf(p, "%s, ", idle_tbl[i].id_name); + p += sprintf(p, "%s%s", p != avail ? ", " : "", + idle_tbl[i].id_name); } error = sysctl_handle_string(oidp, avail, 0, req); free(avail, M_TEMP); @@ -1799,7 +1800,7 @@ pcb->pcb_rbp = tf->tf_rbp; pcb->pcb_rbx = tf->tf_rbx; pcb->pcb_rip = tf->tf_rip; - pcb->pcb_rsp = (ISPL(tf->tf_cs)) ? tf->tf_rsp : (long)(tf + 1) - 8; + pcb->pcb_rsp = tf->tf_rsp; } int ==== //depot/projects/usb/src/sys/amd64/include/specialreg.h#20 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.65 2010/07/29 19:08:22 delphij Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.66 2010/10/05 15:31:56 kib Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -126,6 +126,7 @@ #define CPUID2_CX16 0x00002000 #define CPUID2_XTPR 0x00004000 #define CPUID2_PDCM 0x00008000 +#define CPUID2_PCID 0x00020000 #define CPUID2_DCA 0x00040000 #define CPUID2_SSE41 0x00080000 #define CPUID2_SSE42 0x00100000 ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#12 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.41 2010/07/23 21:31:03 kib Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.42 2010/10/08 07:19:05 kib Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 213544 2010-10-08 07:18:44Z kib */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.40 2010/07/23 21:31:03 kib Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.41 2010/10/08 07:19:05 kib Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 213544 2010-10-08 07:18:44Z kib */ #define LINUX_SYS_exit 1 ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#12 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.42 2010/07/23 21:31:03 kib Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.43 2010/10/08 07:19:05 kib Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 213544 2010-10-08 07:18:44Z kib */ #include "opt_compat.h" @@ -267,7 +267,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 245 = linux_io_setup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 246 = linux_io_destroy */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 247 = linux_io_getevents */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 248 = inux_io_submit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 248 = linux_io_submit */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 249 = linux_io_cancel */ { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 250 = linux_fadvise64 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 251 = */ ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#26 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.58 2010/07/28 04:47:40 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.59 2010/10/12 09:18:17 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_FREEBSD32 @@ -1210,4 +1210,4 @@ 0 }; -DECLARE_MODULE(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); +DECLARE_MODULE_TIED(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); ==== //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#11 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.37 2010/07/23 21:30:33 kib Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.38 2010/10/08 07:18:44 kib Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -416,7 +416,7 @@ 245 AUE_NULL UNIMPL linux_io_setup 246 AUE_NULL UNIMPL linux_io_destroy 247 AUE_NULL UNIMPL linux_io_getevents -248 AUE_NULL UNIMPL inux_io_submit +248 AUE_NULL UNIMPL linux_io_submit 249 AUE_NULL UNIMPL linux_io_cancel 250 AUE_NULL STD { int linux_fadvise64(void); } 251 AUE_NULL UNIMPL ==== //depot/projects/usb/src/sys/arm/at91/at91.c#17 (text) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2005 Olivier Houchard. All rights reserved. + * Copyright (c) 2010 Greg Ansley. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -24,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.25 2009/06/09 18:18:41 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.26 2010/10/06 22:25:21 cognet Exp $"); #include #include @@ -43,14 +44,23 @@ #include #include -#include #include +#include +#include static struct at91_softc *at91_softc; static void at91_eoi(void *); +extern const struct pmap_devmap at91_devmap[]; + +uint32_t at91_chip_id; + +#ifdef AT91C_MASTER_CLOCK uint32_t at91_master_clock = AT91C_MASTER_CLOCK; +#else +uint32_t at91_master_clock; +#endif static int at91_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, @@ -99,6 +109,19 @@ { } +struct arm32_dma_range * +bus_dma_get_range(void) +{ + + return (NULL); +} + +int +bus_dma_get_range_nb(void) +{ + return (0); +} + bs_protos(generic); bs_protos(generic_armv4); @@ -212,6 +235,7 @@ static int at91_probe(device_t dev) { + device_set_desc(dev, "AT91 device bus"); arm_post_filter = at91_eoi; return (0); @@ -224,324 +248,38 @@ BUS_ADD_CHILD(parent, 0, "atmelarm", 0); } -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - return (0); -} - -extern void irq_entry(void); - -static void -at91_add_child(device_t dev, int prio, const char *name, int unit, - bus_addr_t addr, bus_size_t size, int irq0, int irq1, int irq2) -{ - device_t kid; - struct at91_ivar *ivar; - - kid = device_add_child_ordered(dev, prio, name, unit); - if (kid == NULL) { - printf("Can't add child %s%d ordered\n", name, unit); - return; - } - ivar = malloc(sizeof(*ivar), M_DEVBUF, M_NOWAIT | M_ZERO); - if (ivar == NULL) { - device_delete_child(dev, kid); - printf("Can't add alloc ivar\n"); - return; - } - device_set_ivars(kid, ivar); - resource_list_init(&ivar->resources); - if (irq0 != -1) - bus_set_resource(kid, SYS_RES_IRQ, 0, irq0, 1); - if (irq1 != 0) - bus_set_resource(kid, SYS_RES_IRQ, 1, irq1, 1); - if (irq2 != 0) - bus_set_resource(kid, SYS_RES_IRQ, 2, irq2, 1); - if (addr != 0) - bus_set_resource(kid, SYS_RES_MEMORY, 0, addr, size); -} - -struct cpu_devs -{ - const char *name; - int unit; - bus_addr_t mem_base; - bus_size_t mem_len; - int irq0; - int irq1; - int irq2; -}; - -struct cpu_devs at91rm9200_devs[] = -{ - // All the "system" devices - { - "at91_st", 0, - AT91RM92_BASE + AT91RM92_ST_BASE, AT91RM92_ST_SIZE, - AT91RM92_IRQ_SYSTEM - }, - { - "at91_pio", 0, - AT91RM92_BASE + AT91RM92_PIOA_BASE, AT91RM92_PIO_SIZE, - AT91RM92_IRQ_SYSTEM - }, - { - "at91_pio", 1, - AT91RM92_BASE + AT91RM92_PIOB_BASE, AT91RM92_PIO_SIZE, - AT91RM92_IRQ_SYSTEM - }, - { - "at91_pio", 2, - AT91RM92_BASE + AT91RM92_PIOC_BASE, AT91RM92_PIO_SIZE, - AT91RM92_IRQ_SYSTEM - }, - { - "at91_pio", 3, - AT91RM92_BASE + AT91RM92_PIOD_BASE, AT91RM92_PIO_SIZE, - AT91RM92_IRQ_SYSTEM - }, - { - "at91_pmc", 0, - AT91RM92_BASE + AT91RM92_PMC_BASE, AT91RM92_PMC_SIZE, - AT91RM92_IRQ_SYSTEM - }, - { - "at91_aic", 0, - AT91RM92_BASE + AT91RM92_AIC_BASE, AT91RM92_AIC_SIZE, - 0 // Interrupt controller has no interrupts! - }, - { - "at91_rtc", 0, - AT91RM92_BASE + AT91RM92_RTC_BASE, AT91RM92_RTC_SIZE, - AT91RM92_IRQ_SYSTEM - }, - { - "at91_mc", 0, - AT91RM92_BASE + AT91RM92_MC_BASE, AT91RM92_MC_SIZE, - AT91RM92_IRQ_SYSTEM - }, - - // All other devices - { - "at91_tc", 0, - AT91RM92_BASE + AT91RM92_TC0_BASE, AT91RM92_TC_SIZE, - AT91RM92_IRQ_TC0, AT91RM92_IRQ_TC1, AT91RM92_IRQ_TC2 - }, - { - "at91_tc", 1, - AT91RM92_BASE + AT91RM92_TC1_BASE, AT91RM92_TC_SIZE, - AT91RM92_IRQ_TC3, AT91RM92_IRQ_TC4, AT91RM92_IRQ_TC5 - }, - { - "at91_udp", 0, - AT91RM92_BASE + AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE, - AT91RM92_IRQ_UDP, AT91RM92_IRQ_PIOB - }, - { - "at91_mci", 0, - AT91RM92_BASE + AT91RM92_MCI_BASE, AT91RM92_MCI_SIZE, - AT91RM92_IRQ_MCI - }, - { - "at91_twi", 0, - AT91RM92_BASE + AT91RM92_TWI_BASE, AT91RM92_TWI_SIZE, - AT91RM92_IRQ_TWI - }, - { - "ate", 0, - AT91RM92_BASE + AT91RM92_EMAC_BASE, AT91RM92_EMAC_SIZE, - AT91RM92_IRQ_EMAC - }, -#ifndef SKYEYE_WORKAROUNDS - { - "uart", 0, - AT91RM92_BASE + AT91RM92_DBGU_BASE, AT91RM92_DBGU_SIZE, - AT91RM92_IRQ_SYSTEM - }, - { - "uart", 1, - AT91RM92_BASE + AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, - AT91RM92_IRQ_USART0 - }, - { - "uart", 2, - AT91RM92_BASE + AT91RM92_USART1_BASE, AT91RM92_USART_SIZE, - AT91RM92_IRQ_USART1 - }, - { - "uart", 3, - AT91RM92_BASE + AT91RM92_USART2_BASE, AT91RM92_USART_SIZE, - AT91RM92_IRQ_USART2 - }, - { - "uart", 4, - AT91RM92_BASE + AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, - AT91RM92_IRQ_USART3 - }, -#else - { - "uart", 0, - AT91RM92_BASE + AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, - AT91RM92_IRQ_USART0 - }, -#endif - { - "at91_ssc", 0, - AT91RM92_BASE + AT91RM92_SSC0_BASE, AT91RM92_SSC_SIZE, - AT91RM92_IRQ_SSC0 - }, - { - "at91_ssc", 1, - AT91RM92_BASE + AT91RM92_SSC1_BASE, AT91RM92_SSC_SIZE, - AT91RM92_IRQ_SSC1 - }, - { - "at91_ssc", 2, - AT91RM92_BASE + AT91RM92_SSC2_BASE, AT91RM92_SSC_SIZE, - AT91RM92_IRQ_SSC2 - }, - { - "spi", 0, - AT91RM92_BASE + AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE, - AT91RM92_IRQ_SPI - }, - { - "ohci", 0, - AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE, - AT91RM92_IRQ_UHP - }, - { - "at91_cfata", 0, - AT91RM92_CF_BASE, AT91RM92_CF_SIZE, - -1 - }, - { 0, 0, 0, 0, 0 } -}; - -static void -at91_cpu_add_builtin_children(device_t dev, struct at91_softc *sc) -{ - int i; - struct cpu_devs *walker; - - // XXX should look at the device id in the DBGU register and - // XXX based on the CPU load in these devices - for (i = 0, walker = at91rm9200_devs; walker->name; i++, walker++) { - at91_add_child(dev, i, walker->name, walker->unit, - walker->mem_base, walker->mem_len, walker->irq0, - walker->irq1, walker->irq2); - } -} - -#define NORMDEV 50 - -/* - * Standard priority levels for the system. 0 is lowest and 7 is highest. - * These values are the ones Atmel uses for its Linux port, which differ - * a little form the ones that are in the standard distribution. Also, - * the ones marked with 'TWEEK' are different based on experience. - */ -static int irq_prio[32] = -{ - 7, /* Advanced Interrupt Controller (FIQ) */ - 7, /* System Peripherals */ - 1, /* Parallel IO Controller A */ - 1, /* Parallel IO Controller B */ - 1, /* Parallel IO Controller C */ - 1, /* Parallel IO Controller D */ - 5, /* USART 0 */ - 5, /* USART 1 */ - 5, /* USART 2 */ - 5, /* USART 3 */ - 0, /* Multimedia Card Interface */ - 2, /* USB Device Port */ - 4, /* Two-Wire Interface */ /* TWEEK */ - 5, /* Serial Peripheral Interface */ - 4, /* Serial Synchronous Controller 0 */ - 6, /* Serial Synchronous Controller 1 */ /* TWEEK */ - 4, /* Serial Synchronous Controller 2 */ - 0, /* Timer Counter 0 */ - 6, /* Timer Counter 1 */ /* TWEEK */ - 0, /* Timer Counter 2 */ - 0, /* Timer Counter 3 */ - 0, /* Timer Counter 4 */ - 0, /* Timer Counter 5 */ - 2, /* USB Host port */ - 3, /* Ethernet MAC */ - 0, /* Advanced Interrupt Controller (IRQ0) */ - 0, /* Advanced Interrupt Controller (IRQ1) */ - 0, /* Advanced Interrupt Controller (IRQ2) */ - 0, /* Advanced Interrupt Controller (IRQ3) */ - 0, /* Advanced Interrupt Controller (IRQ4) */ - 0, /* Advanced Interrupt Controller (IRQ5) */ - 0 /* Advanced Interrupt Controller (IRQ6) */ -}; - static int at91_attach(device_t dev) { struct at91_softc *sc = device_get_softc(dev); - int i; + const struct pmap_devmap *pdevmap; at91_softc = sc; sc->sc_st = &at91_bs_tag; - sc->sc_sh = AT91RM92_BASE; + sc->sc_sh = AT91_BASE; sc->dev = dev; - if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_SYS_BASE, - AT91RM92_SYS_SIZE, &sc->sc_sys_sh) != 0) - panic("Enable to map IRQ registers"); + sc->sc_irq_rman.rm_type = RMAN_ARRAY; sc->sc_irq_rman.rm_descr = "AT91 IRQs"; - sc->sc_mem_rman.rm_type = RMAN_ARRAY; - sc->sc_mem_rman.rm_descr = "AT91 Memory"; if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) panic("at91_attach: failed to set up IRQ rman"); - if (rman_init(&sc->sc_mem_rman) != 0 || - rman_manage_region(&sc->sc_mem_rman, 0xdff00000ul, - 0xdffffffful) != 0) + + sc->sc_mem_rman.rm_type = RMAN_ARRAY; + sc->sc_mem_rman.rm_descr = "AT91 Memory"; + if (rman_init(&sc->sc_mem_rman) != 0) panic("at91_attach: failed to set up memory rman"); - if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_OHCI_BASE, - AT91RM92_OHCI_BASE + AT91RM92_OHCI_SIZE - 1) != 0) - panic("at91_attach: failed to set up ohci memory"); - if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_CF_BASE, - AT91RM92_CF_BASE + AT91RM92_CF_SIZE - 1) != 0) - panic("at91_attach: failed to set up CompactFlash ATA memory"); - - for (i = 0; i < 32; i++) { - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SVR + - i * 4, i); - /* Priority. */ - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SMR + i * 4, - irq_prio[i]); - if (i < 8) - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_EOICR, - 1); + for ( pdevmap = at91_devmap; pdevmap->pd_va != 0; pdevmap++) { + if (rman_manage_region(&sc->sc_mem_rman, pdevmap->pd_va, + pdevmap->pd_va + pdevmap->pd_size - 1) != 0) + panic("at91_attach: failed to set up memory rman"); } - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SPU, 32); - /* No debug. */ - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_DCR, 0); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 14 22:31:17 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E072D1065670; Thu, 14 Oct 2010 22:31: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 8AD90106564A for ; Thu, 14 Oct 2010 22:31:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 76D668FC18 for ; Thu, 14 Oct 2010 22:31:16 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9EMVGb8016946 for ; Thu, 14 Oct 2010 22:31:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9EMVGn9016942 for perforce@freebsd.org; Thu, 14 Oct 2010 22:31:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 Oct 2010 22:31:16 GMT Message-Id: <201010142231.o9EMVGn9016942@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Oct 2010 22:31:17 -0000 http://p4web.freebsd.org/@@184745?ac=10 Change 184745 by hselasky@hselasky_laptop001 on 2010/10/14 22:30:29 IFC Affected files ... .. //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_iphethvar.h#4 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#5 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/dev/net/if_ipheth.c $ */ /*- * Copyright (c) 2010 Hans Petter Selasky. All rights reserved. * Copyright (c) 2009 Diego Giagio. All rights reserved. @@ -31,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/net/if_ipheth.c $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/net/if_ipheth.c,v 1.1 2010/10/13 21:36:42 hselasky Exp $"); #include #include @@ -68,8 +67,6 @@ static device_probe_t ipheth_probe; static device_attach_t ipheth_attach; static device_detach_t ipheth_detach; -static device_suspend_t ipheth_suspend; -static device_resume_t ipheth_resume; static usb_callback_t ipheth_bulk_write_callback; static usb_callback_t ipheth_bulk_read_callback; @@ -119,8 +116,6 @@ DEVMETHOD(device_probe, ipheth_probe), DEVMETHOD(device_attach, ipheth_attach), DEVMETHOD(device_detach, ipheth_detach), - DEVMETHOD(device_suspend, ipheth_suspend), - DEVMETHOD(device_resume, ipheth_resume), {0, 0} }; @@ -155,16 +150,16 @@ USB_IFACE_PROTOCOL(pt) static const struct usb_device_id ipheth_devs[] = { - {IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE, + {IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE, IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, IPHETH_USBINTF_PROTO)}, - {IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3G, + {IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G, IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, IPHETH_USBINTF_PROTO)}, - {IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3GS, + {IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3GS, IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, IPHETH_USBINTF_PROTO)}, - {IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4G, + {IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4, IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, IPHETH_USBINTF_PROTO)}, }; @@ -271,20 +266,6 @@ return (0); } -static int -ipheth_suspend(device_t dev) -{ - device_printf(dev, "Suspending\n"); - return (0); -} - -static int -ipheth_resume(device_t dev) -{ - device_printf(dev, "Resuming\n"); - return (0); -} - static void ipheth_start(struct usb_ether *ue) { ==== //depot/projects/usb/src/sys/dev/usb/net/if_iphethvar.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/net/if_iphethvar.h $ */ +/* $FreeBSD: src/sys/dev/usb/net/if_iphethvar.h,v 1.1 2010/10/13 21:36:42 hselasky Exp $ */ /*- * Copyright (c) 2010 Hans Petter Selasky. All rights reserved. * Copyright (c) 2009 Diego Giagio. All rights reserved. @@ -33,12 +33,6 @@ #ifndef _IF_IPHETHVAR_H_ #define _IF_IPHETHVAR_H_ -#define USB_VENDOR_APPLE 0x05ac -#define USB_PRODUCT_IPHONE 0x1290 -#define USB_PRODUCT_IPHONE_3G 0x1292 -#define USB_PRODUCT_IPHONE_3GS 0x1294 -#define USB_PRODUCT_IPHONE_4G 0x1297 - #define IPHETH_USBINTF_CLASS 255 #define IPHETH_USBINTF_SUBCLASS 253 #define IPHETH_USBINTF_PROTO 1 From owner-p4-projects@FreeBSD.ORG Thu Oct 14 22:32:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78DA51065673; Thu, 14 Oct 2010 22:32: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 3BB5B106566C for ; Thu, 14 Oct 2010 22:32:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2802F8FC16 for ; Thu, 14 Oct 2010 22:32:22 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9EMWMPo017772 for ; Thu, 14 Oct 2010 22:32:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9EMWMZe017769 for perforce@freebsd.org; Thu, 14 Oct 2010 22:32:22 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 Oct 2010 22:32:22 GMT Message-Id: <201010142232.o9EMWMZe017769@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184746 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Oct 2010 22:32:22 -0000 http://p4web.freebsd.org/@@184746?ac=10 Change 184746 by hselasky@hselasky_laptop001 on 2010/10/14 22:31:31 IFC Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#36 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#36 (text+ko) ==== @@ -708,7 +708,6 @@ ieee80211_state_name[nstate]); IEEE80211_UNLOCK(ic); - RUM_LOCK(sc); usb_callout_stop(&rvp->ratectl_ch); @@ -746,7 +745,6 @@ tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) rum_ratectl_start(sc, ni); - ieee80211_free_node(ni); break; default: From owner-p4-projects@FreeBSD.ORG Thu Oct 14 22:33:28 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E8401065673; Thu, 14 Oct 2010 22:33: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 50A2C106566B for ; Thu, 14 Oct 2010 22:33:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3D1518FC1D for ; Thu, 14 Oct 2010 22:33:28 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9EMXS2b017808 for ; Thu, 14 Oct 2010 22:33:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9EMXSQ8017805 for perforce@freebsd.org; Thu, 14 Oct 2010 22:33:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 Oct 2010 22:33:28 GMT Message-Id: <201010142233.o9EMXSQ8017805@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184747 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Oct 2010 22:33:28 -0000 http://p4web.freebsd.org/@@184747?ac=10 Change 184747 by hselasky@hselasky_laptop001 on 2010/10/14 22:33:19 IFC Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#27 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#27 (text+ko) ==== @@ -709,7 +709,6 @@ break; case IEEE80211_S_RUN: ni = ieee80211_ref_node(vap->iv_bss); - /* XXX monitor mode isn't tested yet. */ if (vap->iv_opmode == IEEE80211_M_MONITOR) { filter->type = htole16(UPGT_FILTER_TYPE_MONITOR); @@ -733,7 +732,6 @@ filter->rxhw = htole32(sc->sc_eeprom_hwrx); filter->unknown3 = htole16(UPGT_FILTER_UNKNOWN3); } - ieee80211_free_node(ni); break; default: @@ -1060,7 +1058,6 @@ sc->sc_state = nstate; IEEE80211_UNLOCK(ic); - UPGT_LOCK(sc); callout_stop(&sc->sc_led_ch); callout_stop(&sc->sc_watchdog_ch); From owner-p4-projects@FreeBSD.ORG Thu Oct 14 22:42:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8137106566B; Thu, 14 Oct 2010 22:42: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 6ACFF106566C for ; Thu, 14 Oct 2010 22:42:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3CD3C8FC08 for ; Thu, 14 Oct 2010 22:42:15 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9EMgFs7019706 for ; Thu, 14 Oct 2010 22:42:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9EMgFVM019703 for perforce@freebsd.org; Thu, 14 Oct 2010 22:42:15 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 Oct 2010 22:42:15 GMT Message-Id: <201010142242.o9EMgFVM019703@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184749 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Oct 2010 22:42:15 -0000 http://p4web.freebsd.org/@@184749?ac=10 Change 184749 by hselasky@hselasky_laptop001 on 2010/10/14 22:41:28 EHCI: Wait for IAA IRQ and not only the clearing of the IAAD bit in the CMD register, before issuing a new IAAD command. Might fix some IRQ-hang issues. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#62 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#62 (text+ko) ==== @@ -1589,6 +1589,10 @@ usb_callout_reset(&sc->sc_tmo_pcd, hz, (void *)&ehci_pcd_enable, sc); } + /* if there was a doorbell, clear the doorbell busy flag */ + if (status & EHCI_STS_IAA) + sc->sc_flags &= ~EHCI_SCFLG_IAADBUSY; + status &= ~(EHCI_STS_INT | EHCI_STS_ERRINT | EHCI_STS_PCD | EHCI_STS_IAA); if (status != 0) { @@ -2313,7 +2317,7 @@ * XXX Certain nVidia chipsets choke when using the IAAD * feature too frequently. */ - if (sc->sc_flags & EHCI_SCFLG_IAADBUG) + if (sc->sc_flags & (EHCI_SCFLG_IAADBUG | EHCI_SCFLG_IAADBUSY)) return; /* XXX Performance quirk: Some Host Controllers have a too low @@ -2321,8 +2325,10 @@ * Controller after queueing the BULK transfer. */ temp = EOREAD4(sc, EHCI_USBCMD); - if (!(temp & EHCI_CMD_IAAD)) + if (!(temp & EHCI_CMD_IAAD)) { EOWRITE4(sc, EHCI_USBCMD, temp | EHCI_CMD_IAAD); + sc->sc_flags |= EHCI_SCFLG_IAADBUSY; + } } struct usb_pipe_methods ehci_device_bulk_methods = ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#20 (text+ko) ==== @@ -347,6 +347,7 @@ #define EHCI_SCFLG_TT 0x0020 /* transaction translator present */ #define EHCI_SCFLG_LOSTINTRBUG 0x0040 /* workaround for VIA / ATI chipsets */ #define EHCI_SCFLG_IAADBUG 0x0080 /* workaround for nVidia chipsets */ +#define EHCI_SCFLG_IAADBUSY 0x0100 /* doorbell is busy */ uint8_t sc_offs; /* offset to operational registers */ uint8_t sc_doorbell_disable; /* set on doorbell failure */ From owner-p4-projects@FreeBSD.ORG Fri Oct 15 06:25:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82B8D1065679; Fri, 15 Oct 2010 06:25:56 +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 4512E106566B for ; Fri, 15 Oct 2010 06:25:56 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 17DC08FC14 for ; Fri, 15 Oct 2010 06:25:56 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9F6Ptek014414 for ; Fri, 15 Oct 2010 06:25:55 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9F6Ptlq014411 for perforce@freebsd.org; Fri, 15 Oct 2010 06:25:55 GMT (envelope-from stas@freebsd.org) Date: Fri, 15 Oct 2010 06:25:55 GMT Message-Id: <201010150625.o9F6Ptlq014411@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184756 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Oct 2010 06:25:56 -0000 http://p4web.freebsd.org/@@184756?ac=10 Change 184756 by stas@stas_orion on 2010/10/15 06:25:27 - Fix structure definitions for shmat. PR: ports/149621 Reported by: Stephen Sanders Affected files ... .. //depot/projects/valgrind/include/vki/vki-freebsd.h#21 edit Differences ... ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#21 (text+ko) ==== @@ -1232,22 +1232,6 @@ char machine[VKI_SYS_NMLN]; /* Hardware type. */ }; -//---------------------------------------------------------------------- -// From sys/ipc.h -//---------------------------------------------------------------------- - -/* Obsolete, used only for backwards compatibility and libc5 compiles */ -struct vki_ipc_perm -{ - vki_uint16_t cuid; - vki_uint16_t cgid; - vki_uint16_t uid; - vki_uint16_t gid; - vki_uint16_t mode; - vki_uint16_t seq; - vki_uint16_t key; -}; - #define VKI_IPC_CREAT 00001000 /* create if key is nonexistent */ #define VKI_IPC_EXCL 00002000 /* fail if key exists */ #define VKI_IPC_NOWAIT 00004000 /* return error on wait */ @@ -1257,7 +1241,16 @@ #define VKI_IPC_STAT 2 /* get ipc_perm options */ #define VKI_IPC_INFO 3 /* see ipcs */ -// not here #define VKI_IPC_64 0x0100 /* New version (support 32-bit UIDs, bigger message sizes, etc. */ +struct vki_ipc_perm +{ + vki_uid_t cuid; + vki_gid_t cgid; + vki_uid_t uid; + vki_gid_t gid; + vki_mode_t mode; + unsigned short seq; + vki_key_t key; +}; //---------------------------------------------------------------------- // From sys/sem.h @@ -1491,14 +1484,13 @@ struct vki_shmid_ds { struct vki_ipc_perm shm_perm; /* operation perms */ - vki_int32_t shm_segsz; /* size of segment (bytes) */ + vki_size_t shm_segsz; /* size of segment (bytes) */ vki_pid_t shm_lpid; /* pid of last operator */ vki_pid_t shm_cpid; /* pid of creator */ - vki_int16_t shm_nattch; /* no. of current attaches */ + int shm_nattch; /* no. of current attaches */ vki_time_t shm_atime; /* last attach time */ vki_time_t shm_dtime; /* last detach time */ vki_time_t shm_ctime; /* last change time */ - void *shm_internal; }; #define VKI_SHM_RDONLY 010000 /* read-only access */ From owner-p4-projects@FreeBSD.ORG Fri Oct 15 07:44:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECA861065670; Fri, 15 Oct 2010 07:44: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 A22AA106564A for ; Fri, 15 Oct 2010 07:44:47 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8EF0E8FC16 for ; Fri, 15 Oct 2010 07:44:47 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9F7il5l031501 for ; Fri, 15 Oct 2010 07:44:47 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9F7ilM5031498 for perforce@freebsd.org; Fri, 15 Oct 2010 07:44:47 GMT (envelope-from stas@freebsd.org) Date: Fri, 15 Oct 2010 07:44:47 GMT Message-Id: <201010150744.o9F7ilM5031498@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Oct 2010 07:44:48 -0000 http://p4web.freebsd.org/@@184758?ac=10 Change 184758 by stas@stas_orion on 2010/10/15 07:44:12 - Implement shmctl syscall wrapper. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#22 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#48 edit .. //depot/projects/valgrind/include/vki/vki-freebsd.h#22 edit .. //depot/projects/valgrind/include/vki/vki-scnums-freebsd.h#9 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#22 (text+ko) ==== @@ -119,6 +119,7 @@ DECL_TEMPLATE(freebsd, sys_msgrcv); DECL_TEMPLATE(freebsd, sys_shmat); DECL_TEMPLATE(freebsd, sys_shmctl); +DECL_TEMPLATE(freebsd, sys_shmctl7); DECL_TEMPLATE(freebsd, sys_shmdt); DECL_TEMPLATE(freebsd, sys_shmget); DECL_TEMPLATE(freebsd, sys_clock_gettime); ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#48 (text+ko) ==== @@ -2642,13 +2642,56 @@ { PRINT("sys_shmctl ( %ld, %ld, %#lx )",ARG1,ARG2,ARG3); PRE_REG_READ3(long, "shmctl", - int, shmid, int, cmd, struct shmid_ds *, buf); - ML_(generic_PRE_sys_shmctl)(tid, ARG1,ARG2,ARG3); + int, shmid, int, cmd, struct vki_shmid_ds *, buf); + switch (ARG2 /* cmd */) { + case VKI_IPC_STAT: + PRE_MEM_WRITE( "shmctl(IPC_STAT, buf)", + ARG3, sizeof(struct vki_shmid_ds) ); + break; + case VKI_IPC_SET: + PRE_MEM_READ( "shmctl(IPC_SET, buf)", + ARG3, sizeof(struct vki_shmid_ds) ); + break; + case VKI_IPC_RMID: + PRE_MEM_READ( "shmctl(IPC_RMID, buf)", + ARG3, sizeof(struct vki_shmid_ds) ); + break; + } +} + +PRE(sys_shmctl7) +{ + PRINT("sys_shmctl7 ( %ld, %ld, %#lx )",ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "shmctl", + int, shmid, int, cmd, struct vki_shmid_ds7 *, buf); + switch (ARG2 /* cmd */) { + case VKI_IPC_STAT: + PRE_MEM_WRITE( "shmctl7(IPC_STAT, buf)", + ARG3, sizeof(struct vki_shmid_ds7) ); + break; + case VKI_IPC_SET: + PRE_MEM_READ( "shmctl7(IPC_SET, buf)", + ARG3, sizeof(struct vki_shmid_ds7) ); + break; + case VKI_IPC_RMID: + PRE_MEM_READ( "shmctl7(IPC_RMID, buf)", + ARG3, sizeof(struct vki_shmid_ds7) ); + break; + } } POST(sys_shmctl) { - ML_(generic_POST_sys_shmctl)(tid, RES,ARG1,ARG2,ARG3); + if (ARG2 == VKI_IPC_STAT) { + POST_MEM_WRITE( ARG3, sizeof(struct vki_shmid_ds) ); + } +} + +POST(sys_shmctl7) +{ + if (ARG2 == VKI_IPC_STAT) { + POST_MEM_WRITE( ARG3, sizeof(struct vki_shmid_ds7) ); + } } PRE(sys_semget) @@ -3563,7 +3606,7 @@ // BSDXY(__NR_msgrcv, sys_msgrcv), // 227 BSDXY(__NR_shmat, sys_shmat), // 228 - BSDXY(__NR_shmctl, sys_shmctl), // 229 + BSDXY(__NR_shmctl7, sys_shmctl7), // 229 BSDXY(__NR_shmdt, sys_shmdt), // 230 BSDX_(__NR_shmget, sys_shmget), // 231 @@ -3910,6 +3953,7 @@ // posix_openpt 504 BSDXY(__NR___semctl, sys___semctl), // 510 + BSDXY(__NR_shmctl, sys_shmctl), // 512 }; ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#22 (text+ko) ==== @@ -1236,7 +1236,7 @@ #define VKI_IPC_EXCL 00002000 /* fail if key exists */ #define VKI_IPC_NOWAIT 00004000 /* return error on wait */ -//#define VKI_IPC_RMID 0 /* remove resource */ +#define VKI_IPC_RMID 0 /* remove resource */ #define VKI_IPC_SET 1 /* set ipc_perm options */ #define VKI_IPC_STAT 2 /* get ipc_perm options */ #define VKI_IPC_INFO 3 /* see ipcs */ @@ -1252,6 +1252,17 @@ vki_key_t key; }; +struct vki_ipc_perm7 +{ + unsigned short cuid; + unsigned short cgid; + unsigned short uid; + unsigned short gid; + unsigned short mode; + unsigned short seq; + vki_key_t key; +}; + //---------------------------------------------------------------------- // From sys/sem.h //---------------------------------------------------------------------- @@ -1493,6 +1504,18 @@ vki_time_t shm_ctime; /* last change time */ }; +struct vki_shmid_ds7 { + struct vki_ipc_perm7 shm_perm; /* operation perms */ + int shm_segsz; /* size of segment (bytes) */ + vki_pid_t shm_lpid; /* pid of last operator */ + vki_pid_t shm_cpid; /* pid of creator */ + short shm_nattch; /* no. of current attaches */ + vki_time_t shm_atime; /* last attach time */ + vki_time_t shm_dtime; /* last detach time */ + vki_time_t shm_ctime; /* last change time */ + void *shm_internal; /* sysv stupidity */ +}; + #define VKI_SHM_RDONLY 010000 /* read-only access */ #if 0 /* not in freebsd abi */ ==== //depot/projects/valgrind/include/vki/vki-scnums-freebsd.h#9 (text+ko) ==== @@ -194,7 +194,7 @@ #define __NR_msgsnd 226 #define __NR_msgrcv 227 #define __NR_shmat 228 -#define __NR_shmctl 229 +#define __NR_shmctl7 229 #define __NR_shmdt 230 #define __NR_shmget 231 #define __NR_clock_gettime 232 @@ -406,5 +406,6 @@ #define __NR_unlinkat 503 #define __NR_posix_openpt 504 #define __NR___semctl 510 +#define __NR_shmctl 512 #endif /* __VKI_UNISTD_FREEBSD_H */