diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-07-11 08:43:39 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-07-11 08:43:39 +0000 |
| commit | 7ac89c665cab932a30141f1195a8b09502ce550f (patch) | |
| tree | f8a33d33a9a7bf587a53e39c9b7c09df4a8d68ec | |
| parent | dfe9707271f66fb378a3918393e4e3da1e89c1c4 (diff) | |
Be less verbose with task debug messages and kill some trailing
whitespaces while here.
| -rw-r--r-- | sys/dev/usb/usb.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 364fe7e28d8..8b5dc95161b 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.c,v 1.98 2014/07/09 18:15:04 mpi Exp $ */ +/* $OpenBSD: usb.c,v 1.99 2014/07/11 08:43:38 mpi Exp $ */ /* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */ /* @@ -121,24 +121,21 @@ void usb_fill_di_task(void *); void usb_fill_udc_task(void *); void usb_fill_udf_task(void *); -int usb_match(struct device *, void *, void *); -void usb_attach(struct device *, struct device *, void *); -int usb_detach(struct device *, int); -int usb_activate(struct device *, int); +int usb_match(struct device *, void *, void *); +void usb_attach(struct device *, struct device *, void *); +int usb_detach(struct device *, int); +int usb_activate(struct device *, int); int usb_attach_roothub(struct usb_softc *); void usb_detach_roothub(struct usb_softc *); -struct cfdriver usb_cd = { - NULL, "usb", DV_DULL -}; +struct cfdriver usb_cd = { + NULL, "usb", DV_DULL +}; -const struct cfattach usb_ca = { - sizeof(struct usb_softc), - usb_match, - usb_attach, - usb_detach, - usb_activate, +const struct cfattach usb_ca = { + sizeof(struct usb_softc), usb_match, usb_attach, usb_detach, + usb_activate, }; int @@ -295,13 +292,13 @@ usb_add_task(struct usbd_device *dev, struct usb_task *task) { int s; - DPRINTFN(2,("%s: task=%p state=%d type=%d\n", __func__, task, - task->state, task->type)); - /* Don't add task if the device's root hub is dying. */ if (usbd_is_dying(dev)) return; + DPRINTFN(2,("%s: task=%p state=%d type=%d\n", __func__, task, + task->state, task->type)); + s = splusb(); if (!(task->state & USB_TASK_STATE_ONQ)) { switch (task->type) { @@ -330,12 +327,12 @@ usb_rem_task(struct usbd_device *dev, struct usb_task *task) { int s; - DPRINTFN(2,("%s: task=%p state=%d type=%d\n", __func__, task, - task->state, task->type)); - if (!(task->state & USB_TASK_STATE_ONQ)) return; + DPRINTFN(2,("%s: task=%p state=%d type=%d\n", __func__, task, + task->state, task->type)); + s = splusb(); switch (task->type) { |