[src/trunk]: src/sys/dev Initialize the opl softc lock pointer to the parent'...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6dc892b0df24
branches:  trunk
changeset: 771907:6dc892b0df24
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Wed Dec 07 17:38:50 2011 +0000

description:
Initialize the opl softc lock pointer to the parent's interrupt lock.
Briefly tested only on wss@isapnp.

diffstat:

 sys/dev/isa/opl_wss.c   |  5 +++--
 sys/dev/isa/opl_ym.c    |  5 +++--
 sys/dev/pci/opl_cmpci.c |  5 +++--
 sys/dev/pci/opl_fms.c   |  5 +++--
 sys/dev/pci/opl_sv.c    |  5 +++--
 sys/dev/pci/opl_yds.c   |  5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)

diffs (156 lines):

diff -r 24ee29b7b468 -r 6dc892b0df24 sys/dev/isa/opl_wss.c
--- a/sys/dev/isa/opl_wss.c     Wed Dec 07 17:35:01 2011 +0000
+++ b/sys/dev/isa/opl_wss.c     Wed Dec 07 17:38:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: opl_wss.c,v 1.13 2008/04/28 20:23:52 martin Exp $      */
+/*     $NetBSD: opl_wss.c,v 1.14 2011/12/07 17:38:50 jakllsch Exp $    */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.13 2008/04/28 20:23:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.14 2011/12/07 17:38:50 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -81,6 +81,7 @@
        sc->ioh = ssc->sc_opl_ioh;
        sc->iot = ssc->sc_iot;
        sc->offs = 0;
+       sc->lock = &ssc->sc_ad1848.sc_ad1848.sc_intr_lock;
        strcpy(sc->syn.name, "WSS ");
 
        opl_attach(sc);
diff -r 24ee29b7b468 -r 6dc892b0df24 sys/dev/isa/opl_ym.c
--- a/sys/dev/isa/opl_ym.c      Wed Dec 07 17:35:01 2011 +0000
+++ b/sys/dev/isa/opl_ym.c      Wed Dec 07 17:38:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: opl_ym.c,v 1.16 2008/04/28 20:23:52 martin Exp $       */
+/*     $NetBSD: opl_ym.c,v 1.17 2011/12/07 17:38:50 jakllsch Exp $     */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.16 2008/04/28 20:23:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.17 2011/12/07 17:38:50 jakllsch Exp $");
 
 #include "mpu_ym.h"
 
@@ -91,6 +91,7 @@
        sc->powerctl = opl_ym_power_ctl;
        sc->powerarg = ssc;
 #endif
+       sc->lock = &ssc->sc_ad1848.sc_ad1848.sc_intr_lock;
        snprintf(sc->syn.name, sizeof(sc->syn.name), "%s ",
            ssc->sc_ad1848.sc_ad1848.chip_name);
 
diff -r 24ee29b7b468 -r 6dc892b0df24 sys/dev/pci/opl_cmpci.c
--- a/sys/dev/pci/opl_cmpci.c   Wed Dec 07 17:35:01 2011 +0000
+++ b/sys/dev/pci/opl_cmpci.c   Wed Dec 07 17:38:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: opl_cmpci.c,v 1.15 2008/04/28 20:23:55 martin Exp $    */
+/*     $NetBSD: opl_cmpci.c,v 1.16 2011/12/07 17:38:50 jakllsch Exp $  */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.15 2008/04/28 20:23:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.16 2011/12/07 17:38:50 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -77,6 +77,7 @@
        sc->ioh = ssc->sc_ioh;
        sc->iot = ssc->sc_iot;
        sc->offs = CMPCI_REG_FM_BASE;
+       sc->lock = &ssc->sc_intr_lock;
        strcpy(sc->syn.name, "CMPCI ");
 
        opl_attach(sc);
diff -r 24ee29b7b468 -r 6dc892b0df24 sys/dev/pci/opl_fms.c
--- a/sys/dev/pci/opl_fms.c     Wed Dec 07 17:35:01 2011 +0000
+++ b/sys/dev/pci/opl_fms.c     Wed Dec 07 17:38:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: opl_fms.c,v 1.15 2008/04/28 20:23:55 martin Exp $      */
+/*     $NetBSD: opl_fms.c,v 1.16 2011/12/07 17:38:50 jakllsch Exp $    */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.15 2008/04/28 20:23:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.16 2011/12/07 17:38:50 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -77,6 +77,7 @@
        sc->ioh = ssc->sc_opl_ioh;
        sc->iot = ssc->sc_iot;
        sc->offs = 0;
+       sc->lock = &ssc->sc_intr_lock;
        strcpy(sc->syn.name, "FMS ");
        /*sc->spkrctl = 0;
          sc->spkrarg = 0;*/
diff -r 24ee29b7b468 -r 6dc892b0df24 sys/dev/pci/opl_sv.c
--- a/sys/dev/pci/opl_sv.c      Wed Dec 07 17:35:01 2011 +0000
+++ b/sys/dev/pci/opl_sv.c      Wed Dec 07 17:38:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: opl_sv.c,v 1.14 2008/04/28 20:23:55 martin Exp $       */
+/*     $NetBSD: opl_sv.c,v 1.15 2011/12/07 17:38:50 jakllsch Exp $     */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.14 2008/04/28 20:23:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.15 2011/12/07 17:38:50 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -76,6 +76,7 @@
        sc->ioh = ssc->sc_oplioh;
        sc->iot = ssc->sc_opliot;
        sc->offs = 0;
+       sc->lock = &ssc->sc_intr_lock;
        strcpy(sc->syn.name, "SV ");
        /*sc->spkrctl = 0;
          sc->spkrarg = 0;*/
diff -r 24ee29b7b468 -r 6dc892b0df24 sys/dev/pci/opl_yds.c
--- a/sys/dev/pci/opl_yds.c     Wed Dec 07 17:35:01 2011 +0000
+++ b/sys/dev/pci/opl_yds.c     Wed Dec 07 17:38:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: opl_yds.c,v 1.15 2008/04/28 20:23:55 martin Exp $      */
+/*     $NetBSD: opl_yds.c,v 1.16 2011/12/07 17:38:50 jakllsch Exp $    */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.15 2008/04/28 20:23:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.16 2011/12/07 17:38:50 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,6 +79,7 @@
        sc->ioh = ssc->sc_opl_ioh;
        sc->iot = ssc->sc_opl_iot;
        sc->offs = 0;
+       sc->lock = &ssc->sc_intr_lock;
        strcpy(sc->syn.name, "DS-1 integrated ");
 
        opl_attach(sc);