diff options
author | ed <ed@FreeBSD.org> | 2008-11-01 08:07:02 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2008-11-01 08:07:02 +0000 |
commit | ec4658731c7b03d16de04acf5f20aa4dc53635cb (patch) | |
tree | 667258cfccee7d615d27bd3530c0ee9a3c09d537 /sys/dev/adb | |
parent | 782d4d3f4b0c1b4d04098fe4c267730b5adf34e1 (diff) | |
download | FreeBSD-src-ec4658731c7b03d16de04acf5f20aa4dc53635cb.zip FreeBSD-src-ec4658731c7b03d16de04acf5f20aa4dc53635cb.tar.gz |
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
Diffstat (limited to 'sys/dev/adb')
-rw-r--r-- | sys/dev/adb/adb_mouse.c | 7 |
1 files changed, 6 insertions, 1 deletions
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; |