From ec4658731c7b03d16de04acf5f20aa4dc53635cb Mon Sep 17 00:00:00 2001 From: ed Date: Sat, 1 Nov 2008 08:07:02 +0000 Subject: Allow a read() on /dev/ams[0-9] to be interrupted. Right now ams_read() uses cv_wait() to wait for new data to arrive on the mouse device. This means that when you run `cat /dev/ams0', it cannot be interrupted directly. After you press ^C, you first need to move the mouse before cat will quit. Make this function use cv_wait_sig(), which allows it to be interrupted directly. Reviewed by: nwhitehorn --- sys/dev/adb/adb_mouse.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/adb/adb_mouse.c b/sys/dev/adb/adb_mouse.c index 8b9c7d1..b290d5e 100644 --- a/sys/dev/adb/adb_mouse.c +++ b/sys/dev/adb/adb_mouse.c @@ -382,6 +382,7 @@ ams_read(struct cdev *dev, struct uio *uio, int flag) struct adb_mouse_softc *sc; size_t len; int8_t outpacket[8]; + int error; sc = CDEV_GET_SOFTC(dev); if (sc == NULL) @@ -403,7 +404,11 @@ ams_read(struct cdev *dev, struct uio *uio, int flag) /* Otherwise, block on new data */ - cv_wait(&sc->sc_cv,&sc->sc_mtx); + error = cv_wait_sig(&sc->sc_cv, &sc->sc_mtx); + if (error) { + mtx_unlock(&sc->sc_mtx); + return (error); + } } sc->packet[0] = 1 << 7; -- cgit v1.1