diff options
| author | Nathan Binkert <nate@cvs.openbsd.org> | 2003-07-05 16:52:05 +0000 |
|---|---|---|
| committer | Nathan Binkert <nate@cvs.openbsd.org> | 2003-07-05 16:52:05 +0000 |
| commit | 3b679d353582d6ebd6b99787693540bde50787a4 (patch) | |
| tree | e599942f6e3decf4f2c3917ae5e40c8c7986b3db /sys/dev | |
| parent | d540e9bc6a7680f0fb405f9381beb3053bd622c3 (diff) | |
sync with NetBSD
remove unused global.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/uhidev.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c index 4f3589d14ef..f53c87bdd35 100644 --- a/sys/dev/usb/uhidev.c +++ b/sys/dev/usb/uhidev.c @@ -1,5 +1,5 @@ -/* $OpenBSD: uhidev.c,v 1.8 2003/05/19 04:17:53 nate Exp $ */ -/* $NetBSD: uhidev.c,v 1.10 2002/10/09 06:27:09 fair Exp $ */ +/* $OpenBSD: uhidev.c,v 1.9 2003/07/05 16:52:04 nate Exp $ */ +/* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -101,8 +101,6 @@ USB_MATCH(uhidev) return (UMATCH_IFACECLASS_GENERIC); } -int repproto = 1; - USB_ATTACH(uhidev) { USB_ATTACH_START(uhidev, sc, uaa); @@ -486,17 +484,23 @@ uhidev_close(struct uhidev *scd) usbd_status uhidev_set_report(struct uhidev *scd, int type, void *data, int len) { - /* XXX */ - char buf[100]; - if (scd->sc_report_id) { - buf[0] = scd->sc_report_id; - memcpy(buf+1, data, len); - len++; - data = buf; - } + char *buf; + usbd_status retstat; - return usbd_set_report(scd->sc_parent->sc_iface, type, - scd->sc_report_id, data, len); + if (scd->sc_report_id == 0) + return usbd_set_report(scd->sc_parent->sc_iface, type, + scd->sc_report_id, data, len); + + buf = malloc(len + 1, M_TEMP, M_WAITOK); + buf[0] = scd->sc_report_id; + memcpy(buf+1, data, len); + + retstat = usbd_set_report(scd->sc_parent->sc_iface, type, + scd->sc_report_id, data, len + 1); + + free(buf, M_TEMP); + + return retstat; } void |