Module Name: src
Committed By: mrg
Date: Tue Mar 6 02:49:03 UTC 2012
Modified Files:
src/sys/dev/usb: ehci.c ehcivar.h ohci.c ohcivar.h uhci.c uhcivar.h
usb.c usb.h
Log Message:
pull down from usbmp:
kill the !USE_USE_SOFTINTR code.
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/usb/ehcivar.h
cvs rdiff -u -r1.219 -r1.220 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/usb/ohcivar.h
cvs rdiff -u -r1.243 -r1.244 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/usb/uhcivar.h
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/usb/usb.h
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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.184 src/sys/dev/usb/ehci.c:1.185
--- src/sys/dev/usb/ehci.c:1.184 Tue Mar 6 02:36:45 2012
+++ src/sys/dev/usb/ehci.c Tue Mar 6 02:49:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.184 2012/03/06 02:36:45 mrg Exp $ */
+/* $NetBSD: ehci.c,v 1.185 2012/03/06 02:49:02 mrg Exp $ */
/*
* Copyright (c) 2004-2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.184 2012/03/06 02:36:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.185 2012/03/06 02:49:02 mrg Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -709,12 +709,10 @@ ehci_softintr(void *v)
callout_reset(&(sc->sc_tmo_intrlist),
(hz), (ehci_intrlist_timeout), (sc));
-#ifdef USB_USE_SOFTINTR
if (sc->sc_softwake) {
sc->sc_softwake = 0;
wakeup(&sc->sc_softwake);
}
-#endif /* USB_USE_SOFTINTR */
sc->sc_bus.intr_context--;
}
@@ -2980,13 +2978,9 @@ ehci_abort_xfer(usbd_xfer_handle xfer, u
*/
ehci_sync_hc(sc);
s = splusb();
-#ifdef USB_USE_SOFTINTR
sc->sc_softwake = 1;
-#endif /* USB_USE_SOFTINTR */
usb_schedsoftintr(&sc->sc_bus);
-#ifdef USB_USE_SOFTINTR
tsleep(&sc->sc_softwake, PZERO, "ehciab", 0);
-#endif /* USB_USE_SOFTINTR */
splx(s);
/*
@@ -3109,13 +3103,9 @@ ehci_abort_isoc_xfer(usbd_xfer_handle xf
splx(s);
s = splusb();
-#ifdef USB_USE_SOFTINTR
sc->sc_softwake = 1;
-#endif /* USB_USE_SOFTINTR */
usb_schedsoftintr(&sc->sc_bus);
-#ifdef USB_USE_SOFTINTR
tsleep(&sc->sc_softwake, PZERO, "ehciab", 0);
-#endif /* USB_USE_SOFTINTR */
splx(s);
#ifdef DIAGNOSTIC
Index: src/sys/dev/usb/ehcivar.h
diff -u src/sys/dev/usb/ehcivar.h:1.38 src/sys/dev/usb/ehcivar.h:1.39
--- src/sys/dev/usb/ehcivar.h:1.38 Tue Jan 18 08:29:24 2011
+++ src/sys/dev/usb/ehcivar.h Tue Mar 6 02:49:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcivar.h,v 1.38 2011/01/18 08:29:24 matt Exp $ */
+/* $NetBSD: ehcivar.h,v 1.39 2012/03/06 02:49:02 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -152,9 +152,7 @@ typedef struct ehci_softc {
u_int8_t sc_conf; /* device configuration */
usbd_xfer_handle sc_intrxfer;
char sc_isreset[EHCI_MAX_PORTS];
-#ifdef USB_USE_SOFTINTR
char sc_softwake;
-#endif /* USB_USE_SOFTINTR */
u_int32_t sc_eintrs;
ehci_soft_qh_t *sc_async_head;
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.219 src/sys/dev/usb/ohci.c:1.220
--- src/sys/dev/usb/ohci.c:1.219 Tue Mar 6 02:36:46 2012
+++ src/sys/dev/usb/ohci.c Tue Mar 6 02:49:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.219 2012/03/06 02:36:46 mrg Exp $ */
+/* $NetBSD: ohci.c,v 1.220 2012/03/06 02:49:03 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.219 2012/03/06 02:36:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.220 2012/03/06 02:49:03 mrg Exp $");
#include "opt_usb.h"
@@ -1457,12 +1457,10 @@ ohci_softintr(void *v)
}
}
-#ifdef USB_USE_SOFTINTR
if (sc->sc_softwake) {
sc->sc_softwake = 0;
wakeup(&sc->sc_softwake);
}
-#endif /* USB_USE_SOFTINTR */
sc->sc_bus.intr_context--;
DPRINTFN(10,("ohci_softintr: done:\n"));
@@ -2288,13 +2286,9 @@ ohci_abort_xfer(usbd_xfer_handle xfer, u
*/
usb_delay_ms(opipe->pipe.device->bus, 20); /* Hardware finishes in 1ms */
s = splusb();
-#ifdef USB_USE_SOFTINTR
sc->sc_softwake = 1;
-#endif /* USB_USE_SOFTINTR */
usb_schedsoftintr(&sc->sc_bus);
-#ifdef USB_USE_SOFTINTR
tsleep(&sc->sc_softwake, PZERO, "ohciab", 0);
-#endif /* USB_USE_SOFTINTR */
splx(s);
/*
Index: src/sys/dev/usb/ohcivar.h
diff -u src/sys/dev/usb/ohcivar.h:1.51 src/sys/dev/usb/ohcivar.h:1.52
--- src/sys/dev/usb/ohcivar.h:1.51 Sat May 28 15:47:17 2011
+++ src/sys/dev/usb/ohcivar.h Tue Mar 6 02:49:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ohcivar.h,v 1.51 2011/05/28 15:47:17 tsutsui Exp $ */
+/* $NetBSD: ohcivar.h,v 1.52 2012/03/06 02:49:03 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.13 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -109,9 +109,7 @@ typedef struct ohci_softc {
#define OHCI_BIG_ENDIAN 1 /* big endian OHCI? never seen it */
#define OHCI_HOST_ENDIAN 2 /* if OHCI always matches CPU */
-#ifdef USB_USE_SOFTINTR
char sc_softwake;
-#endif /* USB_USE_SOFTINTR */
ohci_soft_ed_t *sc_freeeds;
ohci_soft_td_t *sc_freetds;
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.243 src/sys/dev/usb/uhci.c:1.244
--- src/sys/dev/usb/uhci.c:1.243 Tue Mar 6 02:36:46 2012
+++ src/sys/dev/usb/uhci.c Tue Mar 6 02:49:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.243 2012/03/06 02:36:46 mrg Exp $ */
+/* $NetBSD: uhci.c,v 1.244 2012/03/06 02:49:03 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.243 2012/03/06 02:36:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.244 2012/03/06 02:49:03 mrg Exp $");
#include "opt_usb.h"
@@ -1370,12 +1370,10 @@ uhci_softintr(void *v)
uhci_check_intr(sc, ii);
}
-#ifdef USB_USE_SOFTINTR
if (sc->sc_softwake) {
sc->sc_softwake = 0;
wakeup(&sc->sc_softwake);
}
-#endif /* USB_USE_SOFTINTR */
sc->sc_bus.intr_context--;
}
@@ -2130,14 +2128,10 @@ uhci_abort_xfer(usbd_xfer_handle xfer, u
*/
usb_delay_ms(upipe->pipe.device->bus, 2); /* Hardware finishes in 1ms */
s = splusb();
-#ifdef USB_USE_SOFTINTR
sc->sc_softwake = 1;
-#endif /* USB_USE_SOFTINTR */
usb_schedsoftintr(&sc->sc_bus);
-#ifdef USB_USE_SOFTINTR
DPRINTFN(1,("uhci_abort_xfer: tsleep\n"));
tsleep(&sc->sc_softwake, PZERO, "uhciab", 0);
-#endif /* USB_USE_SOFTINTR */
splx(s);
/*
Index: src/sys/dev/usb/uhcivar.h
diff -u src/sys/dev/usb/uhcivar.h:1.49 src/sys/dev/usb/uhcivar.h:1.50
--- src/sys/dev/usb/uhcivar.h:1.49 Fri Feb 24 06:48:25 2012
+++ src/sys/dev/usb/uhcivar.h Tue Mar 6 02:49:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uhcivar.h,v 1.49 2012/02/24 06:48:25 mrg Exp $ */
+/* $NetBSD: uhcivar.h,v 1.50 2012/03/06 02:49:03 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.14 1999/11/17 22:33:42 n_hibma Exp $ */
/*
@@ -157,9 +157,7 @@ typedef struct uhci_softc {
u_int8_t sc_saved_sof;
u_int16_t sc_saved_frnum;
-#ifdef USB_USE_SOFTINTR
char sc_softwake;
-#endif /* USB_USE_SOFTINTR */
char sc_isreset;
char sc_suspend;
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.127 src/sys/dev/usb/usb.c:1.128
--- src/sys/dev/usb/usb.c:1.127 Fri Dec 23 00:51:48 2011
+++ src/sys/dev/usb/usb.c Tue Mar 6 02:49:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.127 2011/12/23 00:51:48 jakllsch Exp $ */
+/* $NetBSD: usb.c,v 1.128 2012/03/06 02:49:03 mrg Exp $ */
/*
* Copyright (c) 1998, 2002, 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.127 2011/12/23 00:51:48 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.128 2012/03/06 02:49:03 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usb.h"
@@ -228,7 +228,6 @@ usb_doattach(device_t self)
ue->u.ue_ctrlr.ue_bus = device_unit(self);
usb_add_event(USB_EVENT_CTRLR_ATTACH, ue);
-#ifdef USB_USE_SOFTINTR
/* XXX we should have our own level */
sc->sc_bus->soft = softint_establish(SOFTINT_NET,
sc->sc_bus->methods->soft_intr, sc->sc_bus);
@@ -238,7 +237,6 @@ usb_doattach(device_t self)
sc->sc_dying = 1;
return;
}
-#endif
err = usbd_new_device(self, sc->sc_bus, 0, speed, 0,
&sc->sc_port);
@@ -910,15 +908,11 @@ void
usb_schedsoftintr(usbd_bus_handle bus)
{
DPRINTFN(10,("usb_schedsoftintr: polling=%d\n", bus->use_polling));
-#ifdef USB_USE_SOFTINTR
if (bus->use_polling) {
bus->methods->soft_intr(bus);
} else {
softint_schedule(bus->soft);
}
-#else
- bus->methods->soft_intr(bus);
-#endif /* USB_USE_SOFTINTR */
}
int
@@ -973,12 +967,10 @@ usb_detach(device_t self, int flags)
}
DPRINTF(("usb_detach: event thread dead\n"));
-#ifdef USB_USE_SOFTINTR
if (sc->sc_bus->soft != NULL) {
softint_disestablish(sc->sc_bus->soft);
sc->sc_bus->soft = NULL;
}
-#endif
ue = usb_alloc_event();
ue->u.ue_ctrlr.ue_bus = device_unit(self);
Index: src/sys/dev/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.93 src/sys/dev/usb/usb.h:1.94
--- src/sys/dev/usb/usb.h:1.93 Tue Aug 23 16:16:43 2011
+++ src/sys/dev/usb/usb.h Tue Mar 6 02:49:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.h,v 1.93 2011/08/23 16:16:43 christos Exp $ */
+/* $NetBSD: usb.h,v 1.94 2012/03/06 02:49:03 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */
/*
@@ -51,8 +51,6 @@ MALLOC_DECLARE(M_USBHC);
#endif
-#define USB_USE_SOFTINTR
-
#ifdef USB_DEBUG
#define UKBD_DEBUG 1
#define UHIDEV_DEBUG 1
