diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 2001-09-01 09:38:45 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 2001-09-01 09:38:45 +0000 |
| commit | 600918fc15c1e973a0d39d91d58083678363ecec (patch) | |
| tree | 290d9b35aad1535d2ed7f2e373f843bc5c05d368 | |
| parent | 7346657593b41c0f0cf0c287015d6cdf79d913fc (diff) | |
| download | FreeBSD-src-600918fc15c1e973a0d39d91d58083678363ecec.zip FreeBSD-src-600918fc15c1e973a0d39d91d58083678363ecec.tar.gz | |
First check whether the USB transfer was cancelled before starting to
use the data structures related to that keyboard.
| -rw-r--r-- | sys/dev/usb/ukbd.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index 4e531bf..ad2c8f1 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -683,25 +683,21 @@ Static int ukbd_interrupt(keyboard_t *kbd, void *arg) { usbd_status status = (usbd_status)arg; - ukbd_state_t *state = (ukbd_state_t *)kbd->kb_data; - struct ukbd_data *ud = &state->ks_ndata; + ukbd_state_t *state; + struct ukbd_data *ud; struct timeval tv; u_long now; int mod, omod; int key, c; int i, j; -#define ADDKEY1(c) \ - if (state->ks_inputs < INPUTBUFSIZE) { \ - state->ks_input[state->ks_inputtail] = (c); \ - ++state->ks_inputs; \ - state->ks_inputtail = (state->ks_inputtail + 1)%INPUTBUFSIZE; \ - } - DPRINTFN(5, ("ukbd_intr: status=%d\n", status)); if (status == USBD_CANCELLED) return 0; + state = (ukbd_state_t *)kbd->kb_data; + ud = &state->ks_ndata; + if (status != USBD_NORMAL_COMPLETION) { DPRINTF(("ukbd_intr: status=%d\n", status)); usbd_clear_endpoint_stall_async(state->ks_intrpipe); @@ -714,6 +710,13 @@ ukbd_interrupt(keyboard_t *kbd, void *arg) getmicrouptime(&tv); now = (u_long)tv.tv_sec*1000 + (u_long)tv.tv_usec/1000; +#define ADDKEY1(c) \ + if (state->ks_inputs < INPUTBUFSIZE) { \ + state->ks_input[state->ks_inputtail] = (c); \ + ++state->ks_inputs; \ + state->ks_inputtail = (state->ks_inputtail + 1)%INPUTBUFSIZE; \ + } + mod = ud->modifiers; omod = state->ks_odata.modifiers; if (mod != omod) { |
