d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow a read() on /dev/ams[0-9] to be interrupted.

Browse Source 
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
This commit is contained in:
Ed Schouten 2008-11-01 08:07:02 +00:00
parent ee6aa68c9c
commit b75d197096
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/adb/adb_mouse.c
View File

@ -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;