diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 2000-05-14 16:59:31 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 2000-05-14 16:59:31 +0000 |
| commit | 923e94d40087c109f98d50d5eead16bc73ed8879 (patch) | |
| tree | 66b2de91e6f1c947da0f523b20525c62b83c7d88 | |
| parent | 91806b2f4894cd642c04f4565006f258fabd6746 (diff) | |
| download | FreeBSD-src-923e94d40087c109f98d50d5eead16bc73ed8879.zip FreeBSD-src-923e94d40087c109f98d50d5eead16bc73ed8879.tar.gz | |
Sync with NetBSD:
Fix the saving of the location at pop properly. Only save the position
and not the complete locator.
(sp? s/sav/saf/g if appropriate)
| -rw-r--r-- | sys/dev/usb/hid.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/hid.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c index 6946ddb..b061f2b 100644 --- a/sys/dev/usb/hid.c +++ b/sys/dev/usb/hid.c @@ -1,4 +1,4 @@ -/* $NetBSD: hid.c,v 1.13 2000/03/27 12:33:53 augustss Exp $ */ +/* $NetBSD: hid.c,v 1.15 2000/04/27 15:26:46 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -126,7 +126,7 @@ hid_get_item(s, h) { struct hid_item *c = &s->cur; unsigned int bTag, bType, bSize; - struct hid_location oldloc; + u_int32_t oldpos; u_char *data; int32_t dval; u_char *p; @@ -300,9 +300,9 @@ hid_get_item(s, h) break; case 11: /* Pop */ hi = c->next; - oldloc = c->loc; + oldpos = c->loc.pos; s->cur = *hi; - c->loc = oldloc; + c->loc.pos = oldpos; free(hi, M_TEMP); break; default: diff --git a/sys/dev/usb/hid.h b/sys/dev/usb/hid.h index 620cbf8..5953ce5 100644 --- a/sys/dev/usb/hid.h +++ b/sys/dev/usb/hid.h @@ -1,4 +1,4 @@ -/* $NetBSD: hid.h,v 1.2 1998/07/24 20:57:46 augustss Exp $ */ +/* $NetBSD: hid.h,v 1.5 2000/04/27 15:26:46 augustss Exp $ */ /* $FreeBSD$ */ /* |
