Fri Dec 9 08:56:55 2011 UTC ()
provide a lock for mpu_attach.


(mrg)
diff -r1.12 -r1.13 src/sys/dev/acpi/mpu_acpi.c
cvs diff -r1.12 -r1.13 src/sys/dev/acpi/mpu_acpi.c (expand / switch to unified diff)

--- src/sys/dev/acpi/mpu_acpi.c 2011/11/24 03:35:57 1.12
+++ src/sys/dev/acpi/mpu_acpi.c 2011/12/09 08:56:54 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: mpu_acpi.c,v 1.12 2011/11/24 03:35:57 mrg Exp $ */ 1/* $NetBSD: mpu_acpi.c,v 1.13 2011/12/09 08:56:54 mrg Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca> 4 * Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
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. The name of the author may not be used to endorse or promote products 12 * 2. The name of the author may not be used to endorse or promote products
13 * derived from this software without specific prior written permission. 13 * derived from this software without specific prior written permission.
14 * 14 *
@@ -20,43 +20,44 @@ @@ -20,43 +20,44 @@
20 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 20 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 21 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
22 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 22 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
23 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE. 25 * SUCH DAMAGE.
26 */ 26 */
27 27
28/* 28/*
29 * ACPI mpu(4) attachment based in lpt_acpi.c by Jared D. McNeill. 29 * ACPI mpu(4) attachment based in lpt_acpi.c by Jared D. McNeill.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.12 2011/11/24 03:35:57 mrg Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.13 2011/12/09 08:56:54 mrg Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/device.h> 36#include <sys/device.h>
37#include <sys/systm.h> 37#include <sys/systm.h>
38 38
39#include <dev/acpi/acpivar.h> 39#include <dev/acpi/acpivar.h>
40 40
41#include <dev/ic/mpuvar.h> 41#include <dev/ic/mpuvar.h>
42 42
43#include <dev/isa/isadmavar.h> 43#include <dev/isa/isadmavar.h>
44 44
45static int mpu_acpi_match(device_t, cfdata_t, void *); 45static int mpu_acpi_match(device_t, cfdata_t, void *);
46static void mpu_acpi_attach(device_t, device_t, void *); 46static void mpu_acpi_attach(device_t, device_t, void *);
47 47
48struct mpu_acpi_softc { 48struct mpu_acpi_softc {
49 struct mpu_softc sc_mpu; 49 struct mpu_softc sc_mpu;
 50 kmutex_t sc_lock;
50}; 51};
51 52
52CFATTACH_DECL_NEW(mpu_acpi, sizeof(struct mpu_acpi_softc), mpu_acpi_match, 53CFATTACH_DECL_NEW(mpu_acpi, sizeof(struct mpu_acpi_softc), mpu_acpi_match,
53 mpu_acpi_attach, NULL, NULL); 54 mpu_acpi_attach, NULL, NULL);
54 55
55/* 56/*
56 * Supported device IDs 57 * Supported device IDs
57 */ 58 */
58 59
59static const char * const mpu_acpi_ids[] = { 60static const char * const mpu_acpi_ids[] = {
60 "PNPB006", /* Roland MPU-401 (compatible) MIDI UART */ 61 "PNPB006", /* Roland MPU-401 (compatible) MIDI UART */
61 NULL 62 NULL
62}; 63};
@@ -108,22 +109,24 @@ mpu_acpi_attach(device_t parent, device_ @@ -108,22 +109,24 @@ mpu_acpi_attach(device_t parent, device_
108 if (irq == NULL) { 109 if (irq == NULL) {
109 aprint_error_dev(self, "unable to find irq resource\n"); 110 aprint_error_dev(self, "unable to find irq resource\n");
110 goto out; 111 goto out;
111 } 112 }
112 113
113 sc->iot = aa->aa_iot; 114 sc->iot = aa->aa_iot;
114 if (bus_space_map(sc->iot, io->ar_base, io->ar_length, 0, &sc->ioh)) { 115 if (bus_space_map(sc->iot, io->ar_base, io->ar_length, 0, &sc->ioh)) {
115 aprint_error_dev(self, "can't map i/o space\n"); 116 aprint_error_dev(self, "can't map i/o space\n");
116 goto out; 117 goto out;
117 } 118 }
118 119
119 sc->model = "Roland MPU-401 MIDI UART"; 120 sc->model = "Roland MPU-401 MIDI UART";
120 sc->sc_dev = self; 121 sc->sc_dev = self;
 122 sc->lock = &asc->sc_lock;
 123 mutex_init(&asc->sc_lock, MUTEX_DEFAULT, IPL_AUDIO);
121 mpu_attach(sc); 124 mpu_attach(sc);
122 125
123 sc->arg = isa_intr_establish(aa->aa_ic, irq->ar_irq, 126 sc->arg = isa_intr_establish(aa->aa_ic, irq->ar_irq,
124 (irq->ar_type == ACPI_EDGE_SENSITIVE) ? IST_EDGE : IST_LEVEL, 127 (irq->ar_type == ACPI_EDGE_SENSITIVE) ? IST_EDGE : IST_LEVEL,
125 IPL_AUDIO, mpu_intr, sc); 128 IPL_AUDIO, mpu_intr, sc);
126 129
127 out: 130 out:
128 acpi_resource_cleanup(&res); 131 acpi_resource_cleanup(&res);
129} 132}