summaryrefslogtreecommitdiff
path: root/sys/dev/usb/ucom.c
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2001-01-28 09:43:44 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2001-01-28 09:43:44 +0000
commit068c901929c8e128152d9695e219c78a5c15d162 (patch)
tree2d13c329b2bb4222759f39870f2dbeb46cd477a5 /sys/dev/usb/ucom.c
parentc4aeeb204ccb14898a9115b35ae590f15a16124f (diff)
Another USB sync with NetBSD. We are still lacking an up-to-date umass(4)
driver. I would appreciate it if someone with the hardware looked into it. I also have to take a closer look at changes to the USB Ethernet drivers, as well as import some drivers we are missing (uftdi, if_upl, yap, etc.)
Diffstat (limited to 'sys/dev/usb/ucom.c')
-rw-r--r--sys/dev/usb/ucom.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 1fdf8aa071f..00107ea2bca 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ucom.c,v 1.6 2000/11/08 18:10:37 aaron Exp $ */
+/* $OpenBSD: ucom.c,v 1.7 2001/01/28 09:43:41 aaron Exp $ */
/* $NetBSD: ucom.c,v 1.30 2000/09/23 04:33:04 augustss Exp $ */
/*
@@ -966,6 +966,9 @@ ucomwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
}
usbd_get_xfer_status(xfer, NULL, NULL, &cc, NULL);
+#if defined(__NetBSD__) && NRND > 0
+ rnd_add_uint32(&sc->sc_rndsource, cc);
+#endif
DPRINTFN(5,("ucomwritecb: cc=%d\n", cc));
/* convert from USB bytes to tty bytes */
cc -= sc->sc_opkthdrlen;
@@ -1021,6 +1024,9 @@ ucomreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
}
usbd_get_xfer_status(xfer, NULL, (void **)&cp, &cc, NULL);
+#if defined(__NetBSD__) && NRND > 0
+ rnd_add_uint32(&sc->sc_rndsource, cc);
+#endif
DPRINTFN(5,("ucomreadcb: got %d chars, tp=%p\n", cc, tp));
if (sc->sc_methods->ucom_read != NULL)
sc->sc_methods->ucom_read(sc->sc_parent, sc->sc_portno,