Module Name: src
Committed By: skrll
Date: Thu Dec 10 09:19:42 UTC 2015
Modified Files:
src/sys/dev/usb: usb_subr.c
Log Message:
Make this actually compile with USB_DEBUG. oops.
To generate a diff of this commit:
cvs rdiff -u -r1.205 -r1.206 src/sys/dev/usb/usb_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.205 src/sys/dev/usb/usb_subr.c:1.206
--- src/sys/dev/usb/usb_subr.c:1.205 Thu Dec 10 09:04:08 2015
+++ src/sys/dev/usb/usb_subr.c Thu Dec 10 09:19:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.205 2015/12/10 09:04:08 skrll Exp $ */
+/* $NetBSD: usb_subr.c,v 1.206 2015/12/10 09:19:42 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.205 2015/12/10 09:04:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.206 2015/12/10 09:19:42 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -615,7 +615,7 @@ usbd_set_config_index(usbd_device_handle
selfpowered = !!(cdp->bmAttributes & UC_SELF_POWERED);
DPRINTF("addr %d cno=%d attr=0x%02x, selfpowered=%d",
- dev->addr, cdp->bConfigurationValue, cdp->bmAttributes,
+ dev->address, cdp->bConfigurationValue, cdp->bmAttributes,
selfpowered);
DPRINTF("max power=%d", cdp->bMaxPower * 2, 0, 0, 0);
@@ -640,7 +640,7 @@ usbd_set_config_index(usbd_device_handle
#endif
power = cdp->bMaxPower * 2;
if (power > dev->powersrc->power) {
- DPRINTF("power exceeded %d %d", power, dev->powersrc->up_power,
+ DPRINTF("power exceeded %d %d", power, dev->powersrc->power,
0, 0);
/* XXX print nicer message. */
if (msg)
@@ -707,6 +707,8 @@ usbd_setup_pipe_flags(usbd_device_handle
usbd_pipe_handle p;
usbd_status err;
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
p = malloc(dev->bus->pipe_size, M_USB, M_NOWAIT);
DPRINTFN(1, "dev=%p iface=%p ep=%p pipe=%p", dev, iface, ep, p);
if (p == NULL)
@@ -726,7 +728,7 @@ usbd_setup_pipe_flags(usbd_device_handle
err = dev->bus->methods->open_pipe(p);
if (err) {
DPRINTF("endpoint=0x%x failed, error=%d",
- ep->ue_edesc->bEndpointAddress, err, 0, 0);
+ ep->edesc->bEndpointAddress, err, 0, 0);
free(p, M_USB);
return (err);
}
@@ -859,6 +861,8 @@ usbd_attachinterfaces(device_t parent, u
int i, j, loc;
device_t dv;
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
nifaces = dev->cdesc->bNumInterface;
ifaces = malloc(nifaces * sizeof(*ifaces), M_USB, M_NOWAIT|M_ZERO);
if (!ifaces)
@@ -1572,7 +1576,7 @@ usb_disconnect_port(struct usbd_port *up
int i, rc;
USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
- DPRINTFN(3, "up=%p dev=%p port=%d", up, dev, up->up_portno, 0);
+ DPRINTFN(3, "up=%p dev=%p port=%d", up, dev, up->portno, 0);
if (dev == NULL) {
#ifdef DIAGNOSTIC
