Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Dec 2011 23:12:21 +0200
From:      Andriy Gapon <avg@FreeBSD.org>
To:        hackers@FreeBSD.org, usb@FreeBSD.org
Subject:   kern_yield vs ukbd_yield
Message-ID:  <4EE51CB5.1060505@FreeBSD.org>

next in thread | raw e-mail | index | archive | help

Does the following change do what I think that it does?
Thank you!

Author: Andriy Gapon <avg@icyb.net.ua>
Date:   Thu Sep 1 16:50:13 2011 +0300

    ukbd: 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)
 }

 static void
-ukbd_yield(void)
-{
-	struct thread *td = curthread;
-	uint32_t old_prio;
-
-	DROP_GIANT();
-
-	thread_lock(td);
-
-	/* get current priority */
-	old_prio = td->td_base_pri;
-
-	/* set new priority */
-	sched_prio(td, td->td_user_pri);
-
-	/* cause a task switch */
-	mi_switch(SW_INVOL | SWT_RELINQUISH, NULL);
-
-	/* restore priority */
-	sched_prio(td, old_prio);
-
-	thread_unlock(td);
-
-	PICKUP_GIANT();
-}
-
-static void
 ukbd_do_poll(struct ukbd_softc *sc, uint8_t wait)
 {

@@ -439,7 +412,7 @@ ukbd_do_poll(struct ukbd_softc *sc, uint8_t wait)
 		while (sc->sc_inputs == 0) {

 			/* give USB threads a chance to run */
-			ukbd_yield();
+			kern_yield(-1);

 			/* check if we should wait */
 			if (!wait)

-- 
Andriy Gapon



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4EE51CB5.1060505>