diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-11-08 18:10:40 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-11-08 18:10:40 +0000 |
| commit | 96193b435e7220a9f8f67ac9bfc6b65078b640dd (patch) | |
| tree | 74eb2fdcb11cee875aa2f839f567d32c10c92b5f /sys/dev/usb/ums.c | |
| parent | 20c739f74e8cfbfe57d19328e02606c2ed711946 (diff) | |
Sync with NetBSD. Too many changes to mention. For now I have skipped
umass.c and ukbd.c as the diffs are a bit hairier.
Diffstat (limited to 'sys/dev/usb/ums.c')
| -rw-r--r-- | sys/dev/usb/ums.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index 00efafc9e36..bf013a2d675 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -1,5 +1,5 @@ -/* $NetBSD: ums.c,v 1.44 2000/06/01 14:29:01 augustss Exp $ */ -/* $OpenBSD: ums.c,v 1.2 2000/09/07 22:17:48 matthieu Exp $ */ +/* $OpenBSD: ums.c,v 1.3 2000/11/08 18:10:38 aaron Exp $ */ +/* $NetBSD: ums.c,v 1.45 2000/10/08 20:52:18 augustss Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -261,7 +261,7 @@ USB_ATTACH(ums) hid_input, &loc_btn, 0)) break; sc->nbuttons = i - 1; - sc->sc_loc_btn = malloc(sizeof(struct hid_location)*sc->nbuttons, + sc->sc_loc_btn = malloc(sizeof(struct hid_location) * sc->nbuttons, M_USBDEV, M_NOWAIT); if (!sc->sc_loc_btn) { printf("%s: no memory\n", USBDEVNAME(sc->sc_dev)); @@ -269,8 +269,8 @@ USB_ATTACH(ums) } printf("%s: %d button%s%s\n", USBDEVNAME(sc->sc_dev), - sc->nbuttons, sc->nbuttons == 1 ? "" : "s", - sc->flags & UMS_Z ? " and Z dir." : ""); + sc->nbuttons, sc->nbuttons == 1 ? "" : "s", + sc->flags & UMS_Z ? " and Z dir." : ""); for (i = 1; i <= sc->nbuttons; i++) hid_locate(desc, size, HID_USAGE2(HUP_BUTTON, i), |