Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it compile without debug.

This commit is contained in:
augustss 2001-11-21 16:22:58 +00:00
parent 9dae283057
commit bc136d1c2e
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/dev/usb/ehci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ehci.c,v 1.23 2001/11/21 16:05:13 augustss Exp $ */ /* $NetBSD: ehci.c,v 1.24 2001/11/21 16:22:58 augustss Exp $ */
/* /*
* Copyright (c) 2001 The NetBSD Foundation, Inc. * Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -47,7 +47,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.23 2001/11/21 16:05:13 augustss Exp $"); __KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.24 2001/11/21 16:22:58 augustss Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -647,7 +647,9 @@ void
ehci_idone(struct ehci_xfer *ex) ehci_idone(struct ehci_xfer *ex)
{ {
usbd_xfer_handle xfer = &ex->xfer; usbd_xfer_handle xfer = &ex->xfer;
#ifdef EHCI_DEBUG
struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe; struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe;
#endif
ehci_soft_qtd_t *sqtd; ehci_soft_qtd_t *sqtd;
u_int32_t status = 0, nstatus; u_int32_t status = 0, nstatus;
int actlen; int actlen;
@ -1132,12 +1134,6 @@ ehci_open(usbd_pipe_handle pipe)
struct ehci_pipe *epipe = (struct ehci_pipe *)pipe; struct ehci_pipe *epipe = (struct ehci_pipe *)pipe;
ehci_soft_qh_t *sqh; ehci_soft_qh_t *sqh;
usbd_status err; usbd_status err;
#if 0
ehci_soft_itd_t *sitd;
ehci_physaddr_t tdphys;
u_int32_t fmt;
int ival;
#endif
int s; int s;
int speed, naks; int speed, naks;
@ -1161,6 +1157,7 @@ ehci_open(usbd_pipe_handle pipe)
return (USBD_NORMAL_COMPLETION); return (USBD_NORMAL_COMPLETION);
} }
/* XXX All this stuff is only valid for async. */
switch (dev->speed) { switch (dev->speed) {
case USB_SPEED_LOW: speed = EHCI_QH_SPEED_LOW; break; case USB_SPEED_LOW: speed = EHCI_QH_SPEED_LOW; break;
case USB_SPEED_FULL: speed = EHCI_QH_SPEED_FULL; break; case USB_SPEED_FULL: speed = EHCI_QH_SPEED_FULL; break;
@ -1212,6 +1209,12 @@ ehci_open(usbd_pipe_handle pipe)
ehci_add_qh(sqh, sc->sc_async_head); ehci_add_qh(sqh, sc->sc_async_head);
splx(s); splx(s);
break; break;
case UE_INTERRUPT:
pipe->methods = &ehci_device_intr_methods;
return (USBD_INVAL);
case UE_ISOCHRONOUS:
pipe->methods = &ehci_device_isoc_methods;
return (USBD_INVAL);
default: default:
return (USBD_INVAL); return (USBD_INVAL);
} }
@ -1810,13 +1813,13 @@ ehci_root_ctrl_start(usbd_xfer_handle xfer)
void void
ehci_disown(ehci_softc_t *sc, int index, int lowspeed) ehci_disown(ehci_softc_t *sc, int index, int lowspeed)
{ {
int i, port; int port;
u_int32_t v; u_int32_t v;
DPRINTF(("ehci_disown: index=%d lowspeed=%d\n", index, lowspeed)); DPRINTF(("ehci_disown: index=%d lowspeed=%d\n", index, lowspeed));
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC
if (sc->sc_npcomp != 0) { if (sc->sc_npcomp != 0) {
i = (index-1) / sc->sc_npcomp; int i = (index-1) / sc->sc_npcomp;
if (i >= sc->sc_ncomp) if (i >= sc->sc_ncomp)
printf("%s: strange port\n", printf("%s: strange port\n",
USBDEVNAME(sc->sc_bus.bdev)); USBDEVNAME(sc->sc_bus.bdev));
@ -2146,16 +2149,10 @@ void
ehci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) ehci_abort_xfer(usbd_xfer_handle xfer, usbd_status status)
{ {
struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe; struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe;
ehci_soft_qh_t *sqh = epipe->sqh;
ehci_softc_t *sc = (ehci_softc_t *)epipe->pipe.device->bus; ehci_softc_t *sc = (ehci_softc_t *)epipe->pipe.device->bus;
#if 0
ehci_soft_td_t *p, *n;
ehci_physaddr_t headp;
int hit;
#endif
int s; int s;
DPRINTF(("ehci_abort_xfer: xfer=%p pipe=%p sqh=%p\n", xfer, epipe,sqh)); DPRINTF(("ehci_abort_xfer: xfer=%p pipe=%p\n", xfer, epipe));
if (sc->sc_dying) { if (sc->sc_dying) {
/* If we're dying, just do the software part. */ /* If we're dying, just do the software part. */