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

Initialize the opl softc lock pointer to the parent's interrupt lock. 

Briefly tested only on wss@isapnp.
This commit is contained in:
jakllsch 2011-12-07 17:38:50 +00:00
parent 3974ddef5c
commit f3842730f2
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/isa/opl_wss.c
View File

@ -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 @@ opl_wss_attach(device_t parent, device_t self, void *aux)
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);

5
sys/dev/isa/opl_ym.c
View File

@ -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 @@ opl_ym_attach(device_t parent, device_t self, void *aux)
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);

5
sys/dev/pci/opl_cmpci.c
View File

@ -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 @@ opl_cmpci_attach(device_t parent, device_t self, void *aux)
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);

5
sys/dev/pci/opl_fms.c
View File

@ -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 @@ opl_fms_attach(device_t parent, device_t self, void *aux)
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;*/

5
sys/dev/pci/opl_sv.c
View File

@ -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 @@ opl_sv_attach(device_t parent, device_t self, void *aux)
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;*/

5
sys/dev/pci/opl_yds.c
View File

@ -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 @@ opl_yds_attach(device_t parent, device_t self, void *aux)
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);