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

Detach self and children. Use device_t and accessors. Use PMF_FN_*.

This commit is contained in:
dyoung 2008-02-23 01:54:44 +00:00
parent 8346a6360d
commit d0f117b7d2
2 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
sys/dev/pci/auvia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: auvia.c,v 1.62 2008/01/14 06:32:10 tsutsui Exp $ */ /* $NetBSD: auvia.c,v 1.63 2008/02/23 01:54:44 dyoung Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -47,7 +47,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.62 2008/01/14 06:32:10 tsutsui Exp $"); __KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.63 2008/02/23 01:54:44 dyoung Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -86,8 +86,10 @@ struct auvia_dma_op {
#define AUVIA_DMAOP_COUNT(x) ((x)&0x00FFFFFF) #define AUVIA_DMAOP_COUNT(x) ((x)&0x00FFFFFF)
}; };
static int auvia_match(struct device *, struct cfdata *, void *); static int auvia_match(device_t, struct cfdata *, void *);
static void auvia_attach(struct device *, struct device *, void *); static void auvia_attach(device_t, device_t, void *);
static int auvia_detach(device_t, int);
static void auvia_childdet(device_t, device_t);
static int auvia_open(void *, int); static int auvia_open(void *, int);
static void auvia_close(void *); static void auvia_close(void *);
static int auvia_query_encoding(void *, struct audio_encoding *); static int auvia_query_encoding(void *, struct audio_encoding *);
@ -118,7 +120,7 @@ static int auvia_trigger_output(void *, void *, void *, int,
static int auvia_trigger_input(void *, void *, void *, int, static int auvia_trigger_input(void *, void *, void *, int,
void (*)(void *), void *, void (*)(void *), void *,
const audio_params_t *); const audio_params_t *);
static bool auvia_resume(device_t); static bool auvia_resume(device_t PMF_FN_PROTO);
static int auvia_intr(void *); static int auvia_intr(void *);
static int auvia_attach_codec(void *, struct ac97_codec_if *); static int auvia_attach_codec(void *, struct ac97_codec_if *);
@ -129,8 +131,8 @@ static int auvia_waitready_codec(struct auvia_softc *);
static int auvia_waitvalid_codec(struct auvia_softc *); static int auvia_waitvalid_codec(struct auvia_softc *);
static void auvia_spdif_event(void *, bool); static void auvia_spdif_event(void *, bool);
CFATTACH_DECL(auvia, sizeof (struct auvia_softc), CFATTACH_DECL2(auvia, sizeof (struct auvia_softc),
auvia_match, auvia_attach, NULL, NULL); auvia_match, auvia_attach, auvia_detach, NULL, NULL, auvia_childdet);
/* VIA VT823xx revision number */ /* VIA VT823xx revision number */
#define VIA_REV_8233PRE 0x10 #define VIA_REV_8233PRE 0x10
@ -270,8 +272,7 @@ static const struct audio_format auvia_spdif_formats[AUVIA_SPDIF_NFORMATS] = {
static int static int
auvia_match(struct device *parent, struct cfdata *match, auvia_match(device_t parent, struct cfdata *match, void *aux)
void *aux)
{ {
struct pci_attach_args *pa; struct pci_attach_args *pa;
@ -290,7 +291,40 @@ auvia_match(struct device *parent, struct cfdata *match,
} }
static void static void
auvia_attach(struct device *parent, struct device *self, void *aux) auvia_childdet(device_t self, device_t child)
{
/* we hold no child references, so do nothing */
}
static int
auvia_detach(device_t self, int flags)
{
int rc;
struct auvia_softc *sc = device_private(self);
if ((rc = config_detach_children(self, flags)) != 0)
return rc;
pmf_device_deregister(self);
auconv_delete_encodings(sc->sc_encodings);
auconv_delete_encodings(sc->sc_spdif_encodings);
if (sc->codec_if != NULL)
sc->codec_if->vtbl->detach(sc->codec_if);
/* XXX restore compatibility? */
if (sc->sc_ih != NULL)
pci_intr_disestablish(sc->sc_pc, sc->sc_ih);
bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize);
return 0;
}
static void
auvia_attach(device_t parent, device_t self, void *aux)
{ {
struct pci_attach_args *pa; struct pci_attach_args *pa;
struct auvia_softc *sc; struct auvia_softc *sc;
@ -298,13 +332,12 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
pci_chipset_tag_t pc; pci_chipset_tag_t pc;
pcitag_t pt; pcitag_t pt;
pci_intr_handle_t ih; pci_intr_handle_t ih;
bus_size_t iosize;
pcireg_t pr; pcireg_t pr;
int r; int r;
const char *revnum; /* VT823xx revision number */ const char *revnum; /* VT823xx revision number */
pa = aux; pa = aux;
sc = (struct auvia_softc *)self; sc = device_private(self);
intrstr = NULL; intrstr = NULL;
pc = pa->pa_pc; pc = pa->pa_pc;
pt = pa->pa_tag; pt = pa->pa_tag;
@ -320,7 +353,7 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
} }
if (pci_mapreg_map(pa, 0x10, PCI_MAPREG_TYPE_IO, 0, &sc->sc_iot, if (pci_mapreg_map(pa, 0x10, PCI_MAPREG_TYPE_IO, 0, &sc->sc_iot,
&sc->sc_ioh, NULL, &iosize)) { &sc->sc_ioh, NULL, &sc->sc_iosize)) {
aprint_error(": can't map i/o space\n"); aprint_error(": can't map i/o space\n");
return; return;
} }
@ -375,7 +408,7 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
if (pci_intr_map(pa, &ih)) { if (pci_intr_map(pa, &ih)) {
aprint_error(": couldn't map interrupt\n"); aprint_error(": couldn't map interrupt\n");
bus_space_unmap(sc->sc_iot, sc->sc_ioh, iosize); bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize);
return; return;
} }
intrstr = pci_intr_string(pc, ih); intrstr = pci_intr_string(pc, ih);
@ -387,7 +420,7 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
if (intrstr != NULL) if (intrstr != NULL)
aprint_normal(" at %s", intrstr); aprint_normal(" at %s", intrstr);
aprint_normal("\n"); aprint_normal("\n");
bus_space_unmap(sc->sc_iot, sc->sc_ioh, iosize); bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize);
return; return;
} }
@ -417,7 +450,7 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
aprint_error("%s: can't attach codec (error 0x%X)\n", aprint_error("%s: can't attach codec (error 0x%X)\n",
sc->sc_dev.dv_xname, r); sc->sc_dev.dv_xname, r);
pci_intr_disestablish(pc, sc->sc_ih); pci_intr_disestablish(pc, sc->sc_ih);
bus_space_unmap(sc->sc_iot, sc->sc_ioh, iosize); bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize);
return; return;
} }
@ -442,14 +475,14 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
&sc->sc_encodings)) { &sc->sc_encodings)) {
sc->codec_if->vtbl->detach(sc->codec_if); sc->codec_if->vtbl->detach(sc->codec_if);
pci_intr_disestablish(pc, sc->sc_ih); pci_intr_disestablish(pc, sc->sc_ih);
bus_space_unmap(sc->sc_iot, sc->sc_ioh, iosize); bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize);
return; return;
} }
if (0 != auconv_create_encodings(auvia_spdif_formats, if (0 != auconv_create_encodings(auvia_spdif_formats,
AUVIA_SPDIF_NFORMATS, &sc->sc_spdif_encodings)) { AUVIA_SPDIF_NFORMATS, &sc->sc_spdif_encodings)) {
sc->codec_if->vtbl->detach(sc->codec_if); sc->codec_if->vtbl->detach(sc->codec_if);
pci_intr_disestablish(pc, sc->sc_ih); pci_intr_disestablish(pc, sc->sc_ih);
bus_space_unmap(sc->sc_iot, sc->sc_ioh, iosize); bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize);
return; return;
} }
@ -1112,7 +1145,7 @@ auvia_intr(void *arg)
} }
static bool static bool
auvia_resume(device_t dv) auvia_resume(device_t dv PMF_FN_ARGS)
{ {
struct auvia_softc *sc = device_private(dv); struct auvia_softc *sc = device_private(dv);

3
sys/dev/pci/auviavar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: auviavar.h,v 1.12 2007/12/09 20:28:06 jmcneill Exp $ */ /* $NetBSD: auviavar.h,v 1.13 2008/02/23 01:54:44 dyoung Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -65,6 +65,7 @@ struct auvia_softc {
bus_space_tag_t sc_iot; bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh; bus_space_handle_t sc_ioh;
bus_size_t sc_iosize;
bus_dma_tag_t sc_dmat; bus_dma_tag_t sc_dmat;
struct ac97_host_if host_if; struct ac97_host_if host_if;