summaryrefslogtreecommitdiff
path: root/sys/dev/usb/ucycom.c
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2014-04-15 09:14:28 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2014-04-15 09:14:28 +0000
commit7b3d33ade85bbb91644090b39e1d10645747a407 (patch)
tree067cb6ae84b43262aee298b2502debdca9eb4e9c /sys/dev/usb/ucycom.c
parenta26bb7a1ed69631c46838721abd3907e153d0a98 (diff)
Modify the uhidev_*_report() methods to always take a report ID argument
instead of using the default, per-driver, one. This is a step to move away from the 1 report ID <-> 1 driver design which is no longer true since the addition of upd(4). ok andre@
Diffstat (limited to 'sys/dev/usb/ucycom.c')
-rw-r--r--sys/dev/usb/ucycom.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index 80fa2e1b13e..10ee32d5f18 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ucycom.c,v 1.25 2014/03/19 08:59:36 mpi Exp $ */
+/* $OpenBSD: ucycom.c,v 1.26 2014/04/15 09:14:27 mpi Exp $ */
/* $NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $ */
/*
@@ -459,7 +459,7 @@ ucycom_param(void *addr, int portno, struct termios *t)
report[3] = (baud >> 24) & 0xff;
report[4] = cfg;
err = uhidev_set_report(&sc->sc_hdev, UHID_FEATURE_REPORT,
- report, sc->sc_flen);
+ sc->sc_hdev.sc_report_id, report, sc->sc_flen);
if (err != 0) {
DPRINTF(("ucycom_param: uhidev_set_report %d %s\n",
err, usbd_errstr(err)));
@@ -562,7 +562,7 @@ ucycom_get_cfg(struct ucycom_softc *sc)
uint8_t report[5];
err = uhidev_get_report(&sc->sc_hdev, UHID_FEATURE_REPORT,
- report, sc->sc_flen);
+ sc->sc_hdev.sc_report_id, report, sc->sc_flen);
cfg = report[4];
baud = (report[3] << 24) + (report[2] << 16) + (report[1] << 8) + report[0];
DPRINTF(("ucycom_configure: device reports %d baud, %d-%c-%d (%d)\n", baud,