Attachment 19969 Details for Bug 35356 – file.diff

[patch] file.diff

file.diff (text/plain), 1.33 KB, created by peter.jeremy on 2002-02-26 21:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: peter.jeremy

Created: 2002-02-26 21:40:01 UTC

Size: 1.33 KB

patch

obsolete

>Index: uhci.c
>===================================================================
>RCS file: /home/CVSROOT/src/sys/dev/usb/uhci.c,v
>retrieving revision 1.82
>diff -u -r1.82 uhci.c
>--- uhci.c	16 Feb 2002 00:51:26 -0000	1.82
>+++ uhci.c	26 Feb 2002 21:24:37 -0000
>@@ -161,7 +161,6 @@
> Static LIST_HEAD(, uhci_intr_info) uhci_ii_free;
> 
> Static void		uhci_busreset(uhci_softc_t *);
>-Static void		uhci_reset(uhci_softc_t *);
> Static usbd_status	uhci_run(uhci_softc_t *, int run);
> Static uhci_soft_td_t  *uhci_alloc_std(uhci_softc_t *);
> Static void		uhci_free_std(uhci_softc_t *, uhci_soft_td_t *);
>@@ -280,8 +279,6 @@
> #define UHCICMD(sc, cmd) UWRITE2(sc, UHCI_CMD, cmd)
> #define UHCISTS(sc) UREAD2(sc, UHCI_STS)
> 
>-#define UHCI_RESET_TIMEOUT 100	/* ms, reset timeout */
>-
> #define UHCI_CURFRAME(sc) (UREAD2(sc, UHCI_FRNUM) & UHCI_FRNUM_MASK)
> 
> #define UHCI_INTR_ENDPT 1
>@@ -1473,21 +1470,6 @@
> 
> 	if (UREAD2(sc, UHCI_STS) & UHCI_STS_USBINT)
> 		uhci_intr(sc);
>-}
>-
>-void
>-uhci_reset(uhci_softc_t *sc)
>-{
>-	int n;
>-
>-	UHCICMD(sc, UHCI_CMD_HCRESET);
>-	/* The reset bit goes low when the controller is done. */
>-	for (n = 0; n < UHCI_RESET_TIMEOUT &&
>-		    (UREAD2(sc, UHCI_CMD) & UHCI_CMD_HCRESET); n++)
>-		usb_delay_ms(&sc->sc_bus, 1);
>-	if (n >= UHCI_RESET_TIMEOUT)
>-		printf("%s: controller did not reset\n",
>-		       USBDEVNAME(sc->sc_bus.bdev));
> }
> 
> usbd_status

Actions: View | Diff

Attachments on bug 35356: 19969