Tue May 5 12:10:07 2009 UTC ()
struct device * -> device_t


(cegger)
diff -r1.19 -r1.20 src/sys/dev/isapnp/ess_isapnp.c
cvs diff -r1.19 -r1.20 src/sys/dev/isapnp/ess_isapnp.c (expand / switch to unified diff)

--- src/sys/dev/isapnp/ess_isapnp.c 2008/04/08 20:09:27 1.19
+++ src/sys/dev/isapnp/ess_isapnp.c 2009/05/05 12:10:07 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ess_isapnp.c,v 1.19 2008/04/08 20:09:27 cegger Exp $ */ 1/* $NetBSD: ess_isapnp.c,v 1.20 2009/05/05 12:10:07 cegger Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1991-1993 Regents of the University of California. 4 * Copyright (c) 1991-1993 Regents of the University of California.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -25,85 +25,83 @@ @@ -25,85 +25,83 @@
25 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 25 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 26 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE. 33 * SUCH DAMAGE.
34 * 34 *
35 */ 35 */
36 36
37#include <sys/cdefs.h> 37#include <sys/cdefs.h>
38__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.19 2008/04/08 20:09:27 cegger Exp $"); 38__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.20 2009/05/05 12:10:07 cegger Exp $");
39 39
40#include <sys/param.h> 40#include <sys/param.h>
41#include <sys/systm.h> 41#include <sys/systm.h>
42#include <sys/errno.h> 42#include <sys/errno.h>
43#include <sys/ioctl.h> 43#include <sys/ioctl.h>
44#include <sys/syslog.h> 44#include <sys/syslog.h>
45#include <sys/device.h> 45#include <sys/device.h>
46#include <sys/proc.h> 46#include <sys/proc.h>
47 47
48#include <sys/bus.h> 48#include <sys/bus.h>
49 49
50#include <sys/audioio.h> 50#include <sys/audioio.h>
51#include <dev/audio_if.h> 51#include <dev/audio_if.h>
52#include <dev/mulaw.h> 52#include <dev/mulaw.h>
53 53
54#include <dev/isa/isavar.h> 54#include <dev/isa/isavar.h>
55#include <dev/isa/isadmavar.h> 55#include <dev/isa/isadmavar.h>
56 56
57#include <dev/isapnp/isapnpreg.h> 57#include <dev/isapnp/isapnpreg.h>
58#include <dev/isapnp/isapnpvar.h> 58#include <dev/isapnp/isapnpvar.h>
59#include <dev/isapnp/isapnpdevs.h> 59#include <dev/isapnp/isapnpdevs.h>
60 60
61#include <dev/isa/essreg.h> 61#include <dev/isa/essreg.h>
62#include <dev/isa/essvar.h> 62#include <dev/isa/essvar.h>
63 63
64int ess_isapnp_match(struct device *, struct cfdata *, void *); 64int ess_isapnp_match(device_t, cfdata_t, void *);
65void ess_isapnp_attach(struct device *, struct device *, void *); 65void ess_isapnp_attach(device_t, device_t, void *);
66 66
67CFATTACH_DECL(ess_isapnp, sizeof(struct ess_softc), 67CFATTACH_DECL(ess_isapnp, sizeof(struct ess_softc),
68 ess_isapnp_match, ess_isapnp_attach, NULL, NULL); 68 ess_isapnp_match, ess_isapnp_attach, NULL, NULL);
69 69
70/* 70/*
71 * Probe / attach routines. 71 * Probe / attach routines.
72 */ 72 */
73 73
74/* 74/*
75 * Probe for the ess hardware. 75 * Probe for the ess hardware.
76 */ 76 */
77int 77int
78ess_isapnp_match(struct device *parent, struct cfdata *match, 78ess_isapnp_match(device_t parent, cfdata_t match, void *aux)
79 void *aux) 
80{ 79{
81 int pri, variant; 80 int pri, variant;
82 81
83 pri = isapnp_devmatch(aux, &isapnp_ess_devinfo, &variant); 82 pri = isapnp_devmatch(aux, &isapnp_ess_devinfo, &variant);
84 if (pri && variant > 0) 83 if (pri && variant > 0)
85 pri = 0; 84 pri = 0;
86 return pri; 85 return pri;
87} 86}
88 87
89 88
90/* 89/*
91 * Attach hardware to driver, attach hardware driver to audio 90 * Attach hardware to driver, attach hardware driver to audio
92 * pseudo-device driver. 91 * pseudo-device driver.
93 */ 92 */
94void 93void
95ess_isapnp_attach(struct device *parent, struct device *self, 94ess_isapnp_attach(device_t parent, device_t self, void *aux)
96 void *aux) 
97{ 95{
98 struct ess_softc *sc; 96 struct ess_softc *sc;
99 struct isapnp_attach_args *ipa; 97 struct isapnp_attach_args *ipa;
100 98
101 sc = device_private(self); 99 sc = device_private(self);
102 ipa = aux; 100 ipa = aux;
103 printf("\n"); 101 printf("\n");
104 102
105 if (isapnp_config(ipa->ipa_iot, ipa->ipa_memt, ipa)) { 103 if (isapnp_config(ipa->ipa_iot, ipa->ipa_memt, ipa)) {
106 aprint_error_dev(&sc->sc_dev, "error in region allocation\n"); 104 aprint_error_dev(&sc->sc_dev, "error in region allocation\n");
107 return; 105 return;
108 } 106 }
109 107