From owner-freebsd-usb@FreeBSD.ORG Sun Dec 11 22:14:55 2011 Return-Path: Delivered-To: usb@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67708106564A; Sun, 11 Dec 2011 22:14:55 +0000 (UTC) (envelope-from mdf356@gmail.com) Received: from mail-pz0-f54.google.com (mail-pz0-f54.google.com [209.85.210.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3AD8F8FC08; Sun, 11 Dec 2011 22:14:55 +0000 (UTC) Received: by dakp5 with SMTP id p5so6230292dak.13 for ; Sun, 11 Dec 2011 14:14:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=hGKvbBt7OTElgwthSin8lQtYXaR8pbn0yTH3esNC6Tk=; b=f8SY0RXP0Z42jq1HyAFLC+wVWOfAsEEmCpGMykDs40CkBkZeNVDFc4zDWamN50/VAz mgToxhepi2tICODyYh4cKQko42M9xlgOuWRh5GTHqRVm0LcKo/31MnV5c0bmCfRLyG45 yz+/EOiOSvhoHLIpzo/zem8w/FqggNZAyRzwc= MIME-Version: 1.0 Received: by 10.68.73.197 with SMTP id n5mr27911520pbv.102.1323640118897; Sun, 11 Dec 2011 13:48:38 -0800 (PST) Sender: mdf356@gmail.com Received: by 10.68.197.198 with HTTP; Sun, 11 Dec 2011 13:48:38 -0800 (PST) In-Reply-To: <4EE51CB5.1060505@FreeBSD.org> References: <4EE51CB5.1060505@FreeBSD.org> Date: Sun, 11 Dec 2011 13:48:38 -0800 X-Google-Sender-Auth: CuN1Wy9vGWEcvAVA3vt0PIZGvIM Message-ID: From: mdf@FreeBSD.org To: Andriy Gapon Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: usb@freebsd.org, hackers@freebsd.org Subject: Re: kern_yield vs ukbd_yield X-BeenThere: freebsd-usb@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: FreeBSD support for USB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Dec 2011 22:14:55 -0000 On Sun, Dec 11, 2011 at 1:12 PM, Andriy Gapon wrote: > > Does the following change do what I think that it does? > Thank you! > > Author: Andriy Gapon > Date: =A0 Thu Sep 1 16:50:13 2011 +0300 > > =A0 =A0ukbd: drop local duplicate of kern_yield and use that instead > > diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c > index 086c178..8078cbb 100644 > --- a/sys/dev/usb/input/ukbd.c > +++ b/sys/dev/usb/input/ukbd.c > @@ -399,33 +399,6 @@ ukbd_put_key(struct ukbd_softc *sc, uint32_t key) > =A0} > > =A0static void > -ukbd_yield(void) > -{ > - =A0 =A0 =A0 struct thread *td =3D curthread; > - =A0 =A0 =A0 uint32_t old_prio; > - > - =A0 =A0 =A0 DROP_GIANT(); > - > - =A0 =A0 =A0 thread_lock(td); > - > - =A0 =A0 =A0 /* get current priority */ > - =A0 =A0 =A0 old_prio =3D td->td_base_pri; > - > - =A0 =A0 =A0 /* set new priority */ > - =A0 =A0 =A0 sched_prio(td, td->td_user_pri); > - > - =A0 =A0 =A0 /* cause a task switch */ > - =A0 =A0 =A0 mi_switch(SW_INVOL | SWT_RELINQUISH, NULL); > - > - =A0 =A0 =A0 /* restore priority */ > - =A0 =A0 =A0 sched_prio(td, old_prio); > - > - =A0 =A0 =A0 thread_unlock(td); > - > - =A0 =A0 =A0 PICKUP_GIANT(); > -} > - > -static void > =A0ukbd_do_poll(struct ukbd_softc *sc, uint8_t wait) > =A0{ > > @@ -439,7 +412,7 @@ ukbd_do_poll(struct ukbd_softc *sc, uint8_t wait) > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0while (sc->sc_inputs =3D=3D 0) { > > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* give USB threads a chan= ce to run */ > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ukbd_yield(); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 kern_yield(-1); Not quite. 1) -1 should be spelled PRI_UNCHANGED, except ukbd_yield() uses td_user_pri, but then puts it back again, so I think UNCHANGED is what is meant. 2) kern_yield() calls it a SW_VOL rather than SW_INVOL, which seems the desired behaviour here anyways, since this is an explicit (i.e. voluntary) yield. Thanks, matthew