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

Remove "struct aubus_ohci_softc". As well as ohci_softc_t, it only had

Browse Source 
a copy of the interrupt cookie which isn't used outside the attach.  We
has also bogusly only told the autoconfiguration machinery that our softc
was as big as a ohci_softc_t, not a struct aubus_ohci_softc.
Also, disestablish the interrupt if OHCI initialisation fails.
This commit is contained in:
simonb 2003-10-23 04:58:32 +00:00
parent 8cfe8cd526
commit e93422fa5f
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sys/arch/mips/alchemy/dev/ohci_aubus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ohci_aubus.c,v 1.4 2003/10/18 04:34:30 simonb Exp $ */
/* $NetBSD: ohci_aubus.c,v 1.5 2003/10/23 04:58:32 simonb Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c,v 1.4 2003/10/18 04:34:30 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c,v 1.5 2003/10/23 04:58:32 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -67,11 +67,6 @@ static void ohci_aubus_attach(struct device *, struct device *, void *);
CFATTACH_DECL(ohci_aubus, sizeof (ohci_softc_t),
ohci_aubus_match, ohci_aubus_attach, NULL, NULL);
struct aubus_ohci_softc {
ohci_softc_t sc;
void *sc_ih;
};
int
ohci_aubus_match(struct device *parent, struct cfdata *match, void *aux)
{
@ -86,20 +81,21 @@ ohci_aubus_match(struct device *parent, struct cfdata *match, void *aux)
void
ohci_aubus_attach(struct device *parent, struct device *self, void *aux)
{
struct aubus_ohci_softc *sc = (struct aubus_ohci_softc *)self;
ohci_softc_t *sc = (ohci_softc_t *)self;
void *ih;
usbd_status r;
uint32_t x, tmp;
struct aubus_attach_args *aa = aux;
r = 0;
sc->sc.sc_size = USBH_SIZE;
sc->sc.iot = aa->aa_st;
sc->sc.sc_bus.dmatag = (bus_dma_tag_t)aa->aa_dt;
sc->sc_size = USBH_SIZE;
sc->iot = aa->aa_st;
sc->sc_bus.dmatag = (bus_dma_tag_t)aa->aa_dt;
if (bus_space_map(sc->sc.iot, USBH_BASE, USBH_SIZE, 0, &sc->sc.ioh)) {
if (bus_space_map(sc->iot, USBH_BASE, USBH_SIZE, 0, &sc->ioh)) {
printf("%s: Unable to map USBH registers\n",
sc->sc.sc_bus.bdev.dv_xname);
sc->sc_bus.bdev.dv_xname);
return;
}
/*
@ -111,26 +107,26 @@ ohci_aubus_attach(struct device *parent, struct device *self, void *aux)
* (3) Clear HCFS in OHCI_CONTROL.
* (4) Wait for RD bit to be set.
*/
x = bus_space_read_4(sc->sc.iot, sc->sc.ioh, USBH_ENABLE);
x = bus_space_read_4(sc->iot, sc->ioh, USBH_ENABLE);
x |= UE_CE;
bus_space_write_4(sc->sc.iot, sc->sc.ioh, USBH_ENABLE, x);
bus_space_write_4(sc->iot, sc->ioh, USBH_ENABLE, x);
delay(10);
x |= UE_E;
#ifdef __MIPSEB__
x |= UE_BE;
#endif
bus_space_write_4(sc->sc.iot, sc->sc.ioh, USBH_ENABLE, x);
bus_space_write_4(sc->iot, sc->ioh, USBH_ENABLE, x);
delay(10);
x = bus_space_read_4(sc->sc.iot, sc->sc.ioh, OHCI_CONTROL);
x = bus_space_read_4(sc->iot, sc->ioh, OHCI_CONTROL);
x &= ~(OHCI_HCFS_MASK);
bus_space_write_4(sc->sc.iot, sc->sc.ioh, OHCI_CONTROL, x);
bus_space_write_4(sc->iot, sc->ioh, OHCI_CONTROL, x);
delay(10);
/* Need to read USBH_ENABLE twice in succession according to
* au1500 Errata #7.
*/
for (x = 100; x; x--) {
bus_space_read_4(sc->sc.iot, sc->sc.ioh, USBH_ENABLE);
tmp = bus_space_read_4(sc->sc.iot, sc->sc.ioh, USBH_ENABLE);
bus_space_read_4(sc->iot, sc->ioh, USBH_ENABLE);
tmp = bus_space_read_4(sc->iot, sc->ioh, USBH_ENABLE);
if (tmp&UE_RD)
break;
delay(1000);
@ -138,26 +134,26 @@ ohci_aubus_attach(struct device *parent, struct device *self, void *aux)
printf(": Au1X00 OHCI\n");
/* Disable OHCI interrupts */
bus_space_write_4(sc->sc.iot, sc->sc.ioh, OHCI_INTERRUPT_DISABLE,
bus_space_write_4(sc->iot, sc->ioh, OHCI_INTERRUPT_DISABLE,
OHCI_ALL_INTRS);
/* hook interrupt */
sc->sc_ih = au_intr_establish(aa->aa_irq[0], 0, IPL_USB, IST_LEVEL_LOW,
ih = au_intr_establish(aa->aa_irq[0], 0, IPL_USB, IST_LEVEL_LOW,
ohci_intr, sc);
if (sc->sc_ih == NULL) {
if (ih == NULL) {
printf("%s: couldn't establish interrupt\n",
sc->sc.sc_bus.bdev.dv_xname);
sc->sc_bus.bdev.dv_xname);
}
if (x)
r = ohci_init(&sc->sc);
r = ohci_init(sc);
if (r != USBD_NORMAL_COMPLETION) {
printf("%s: init failed, error=%d\n",
sc->sc.sc_bus.bdev.dv_xname, r);
sc->sc_bus.bdev.dv_xname, r);
au_intr_disestablish(ih);
return;
}
/* Attach USB device */
sc->sc.sc_child = config_found((void *)sc, &sc->sc.sc_bus,
usbctlprint);
sc->sc_child = config_found((void *)sc, &sc->sc_bus, usbctlprint);
}