d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the disabling of interrupts right before the allocation of the

Browse Source 
resource. Avoids useless interrupts occurring between the allocation
of the interrupt resource and the final initialisation of the
kernel. Cause of these interrupts is unknown (a resuming device?).
This commit is contained in:
Nick Hibma 1999-05-01 23:30:09 +00:00
parent ff082a67de
commit 1a7cfd07a3
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/usb/uhci.c
View File

@ -319,7 +319,9 @@ uhci_init(sc)
}
uhci_run(sc, 0); /* stop the controller */
#if defined(__NetBSD__)
UWRITE2(sc, UHCI_INTR, 0); /* disable interrupts */
#endif
uhci_busreset(sc);

17
sys/dev/usb/uhci_pci.c
View File

@ -1,4 +1,4 @@
/* FreeBSD $Id: uhci_pci.c,v 1.5 1999/04/11 14:24:20 n_hibma Exp $ */
/* FreeBSD $Id: uhci_pci.c,v 1.6 1999/04/16 21:22:53 peter Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,6 +37,16 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/* Universal Host Controller Interface
*
* UHCI spec: http://www.intel.com/
*/
/* The low level controller code for UHCI has been split into
* PCI probes and UHCI specific code. This was done to facilitate the
* sharing of code between *BSD's
*/
#include "opt_bus.h"
#include <sys/param.h>
@ -47,6 +57,9 @@
#include <sys/device.h>
#include <sys/proc.h>
#include <sys/queue.h>
#if defined(__FreeBSD__)
#include <machine/bus_pio.h>
#endif
#include <machine/bus.h>
#include <sys/rman.h>
#include <machine/resource.h>
@ -135,6 +148,8 @@ uhci_pci_attach(device_t dev)
sc->iot = rman_get_bustag(res);
sc->ioh = rman_get_bushandle(res);
bus_space_write_2(sc->iot, sc->ioh, UHCI_INTR, 0); /* disable interrupts */
rid = 0;
res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
RF_SHAREABLE | RF_ACTIVE);

17
sys/pci/uhci_pci.c
View File

@ -1,4 +1,4 @@
/* FreeBSD $Id: uhci_pci.c,v 1.5 1999/04/11 14:24:20 n_hibma Exp $ */
/* FreeBSD $Id: uhci_pci.c,v 1.6 1999/04/16 21:22:53 peter Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,6 +37,16 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/* Universal Host Controller Interface
*
* UHCI spec: http://www.intel.com/
*/
/* The low level controller code for UHCI has been split into
* PCI probes and UHCI specific code. This was done to facilitate the
* sharing of code between *BSD's
*/
#include "opt_bus.h"
#include <sys/param.h>
@ -47,6 +57,9 @@
#include <sys/device.h>
#include <sys/proc.h>
#include <sys/queue.h>
#if defined(__FreeBSD__)
#include <machine/bus_pio.h>
#endif
#include <machine/bus.h>
#include <sys/rman.h>
#include <machine/resource.h>
@ -135,6 +148,8 @@ uhci_pci_attach(device_t dev)
sc->iot = rman_get_bustag(res);
sc->ioh = rman_get_bushandle(res);
bus_space_write_2(sc->iot, sc->ioh, UHCI_INTR, 0); /* disable interrupts */
rid = 0;
res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
RF_SHAREABLE | RF_ACTIVE);