Module Name: src
Committed By: nonaka
Date: Thu Jun 2 13:02:40 UTC 2011
Modified Files:
src/sys/dev/acpi: wss_acpi.c ym_acpi.c
src/sys/dev/isa: wss.c wss_isa.c ym.c
Log Message:
fix compile failure.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/acpi/wss_acpi.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/acpi/ym_acpi.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/isa/wss.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/isa/wss_isa.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/isa/ym.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/wss_acpi.c
diff -u src/sys/dev/acpi/wss_acpi.c:1.27 src/sys/dev/acpi/wss_acpi.c:1.28
--- src/sys/dev/acpi/wss_acpi.c:1.27 Sat Oct 2 18:06:47 2010
+++ src/sys/dev/acpi/wss_acpi.c Thu Jun 2 13:02:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.27 2010/10/02 18:06:47 gsutre Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.28 2011/06/02 13:02:40 nonaka Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.27 2010/10/02 18:06:47 gsutre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.28 2011/06/02 13:02:40 nonaka Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -121,7 +121,7 @@
wss_acpi_hints_index(aa->aa_node->ad_devinfo->HardwareId.String)];
/* Parse our resources */
- rv = acpi_resource_parse(&sc->sc_ad1848.sc_ad1848.sc_dev,
+ rv = acpi_resource_parse(sc->sc_ad1848.sc_ad1848.sc_dev,
aa->aa_node->ad_handle, "_CRS", &res,
&acpi_resource_parse_ops_default);
if (ACPI_FAILURE(rv))
@@ -132,17 +132,17 @@
dspio = acpi_res_io(&res, wah->io_region_idx_ad1848);
oplio = acpi_res_io(&res, wah->io_region_idx_opl);
if (dspio == NULL || oplio == NULL) {
- aprint_error_dev(&sc->sc_ad1848.sc_ad1848.sc_dev, "unable to find i/o registers resource\n");
+ aprint_error_dev(sc->sc_ad1848.sc_ad1848.sc_dev, "unable to find i/o registers resource\n");
goto out;
}
if (bus_space_map(sc->sc_iot, dspio->ar_base, dspio->ar_length,
0, &sc->sc_ioh) != 0) {
- aprint_error_dev(&sc->sc_ad1848.sc_ad1848.sc_dev, "unable to map i/o registers\n");
+ aprint_error_dev(sc->sc_ad1848.sc_ad1848.sc_dev, "unable to map i/o registers\n");
goto out;
}
if (bus_space_map(sc->sc_iot, oplio->ar_base, oplio->ar_length,
0, &sc->sc_opl_ioh) != 0) {
- aprint_error_dev(&sc->sc_ad1848.sc_ad1848.sc_dev, "unable to map opl i/o registers\n");
+ aprint_error_dev(sc->sc_ad1848.sc_ad1848.sc_dev, "unable to map opl i/o registers\n");
goto out;
}
@@ -151,7 +151,7 @@
/* Find our IRQ */
irq = acpi_res_irq(&res, 0);
if (irq == NULL) {
- aprint_error_dev(&sc->sc_ad1848.sc_ad1848.sc_dev, "unable to find irq resource\n");
+ aprint_error_dev(sc->sc_ad1848.sc_ad1848.sc_dev, "unable to find irq resource\n");
/* XXX bus_space_unmap */
goto out;
}
@@ -161,7 +161,7 @@
playdrq = acpi_res_drq(&res, 0);
recdrq = acpi_res_drq(&res, 1);
if (playdrq == NULL || recdrq == NULL) {
- aprint_error_dev(&sc->sc_ad1848.sc_ad1848.sc_dev, " unable to find drq resources\n");
+ aprint_error_dev(sc->sc_ad1848.sc_ad1848.sc_dev, " unable to find drq resources\n");
/* XXX bus_space_unmap */
goto out;
}
@@ -174,12 +174,12 @@
/* Look for the ad1848 */
if (!ad1848_isa_probe(&sc->sc_ad1848)) {
- aprint_error_dev(&sc->sc_ad1848.sc_ad1848.sc_dev, "ad1848 probe failed\n");
+ aprint_error_dev(sc->sc_ad1848.sc_ad1848.sc_dev, "ad1848 probe failed\n");
/* XXX cleanup */
goto out;
}
- aprint_normal_dev(&sc->sc_ad1848.sc_ad1848.sc_dev, "");
+ aprint_normal_dev(sc->sc_ad1848.sc_ad1848.sc_dev, "");
/* Attach our wss device */
wssattach(sc);
Index: src/sys/dev/acpi/ym_acpi.c
diff -u src/sys/dev/acpi/ym_acpi.c:1.12 src/sys/dev/acpi/ym_acpi.c:1.13
--- src/sys/dev/acpi/ym_acpi.c:1.12 Sat Oct 2 18:06:47 2010
+++ src/sys/dev/acpi/ym_acpi.c Thu Jun 2 13:02:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_acpi.c,v 1.12 2010/10/02 18:06:47 gsutre Exp $ */
+/* $NetBSD: ym_acpi.c,v 1.13 2011/06/02 13:02:40 nonaka Exp $ */
/*
* Copyright (c) 2006 Jasper Wallace <jas...@pointless.net>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.12 2010/10/02 18:06:47 gsutre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.13 2011/06/02 13:02:40 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,7 +92,7 @@
ACPI_STATUS rv;
/* Parse our resources */
- rv = acpi_resource_parse(&sc->sc_ad1848.sc_ad1848.sc_dev,
+ rv = acpi_resource_parse(sc->sc_ad1848.sc_ad1848.sc_dev,
aa->aa_node->ad_handle, "_CRS", &res,
&acpi_resource_parse_ops_default);
if (ACPI_FAILURE(rv))
Index: src/sys/dev/isa/wss.c
diff -u src/sys/dev/isa/wss.c:1.68 src/sys/dev/isa/wss.c:1.69
--- src/sys/dev/isa/wss.c:1.68 Fri Oct 19 12:00:24 2007
+++ src/sys/dev/isa/wss.c Thu Jun 2 13:02:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wss.c,v 1.68 2007/10/19 12:00:24 ad Exp $ */
+/* $NetBSD: wss.c,v 1.69 2011/06/02 13:02:40 nonaka Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.68 2007/10/19 12:00:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.69 2011/06/02 13:02:40 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -161,14 +161,14 @@
ac->parent = sc;
- audio_attach_mi(&wss_hw_if, &sc->sc_ad1848, &ac->sc_dev);
+ audio_attach_mi(&wss_hw_if, &sc->sc_ad1848, ac->sc_dev);
if (sc->mad_chip_type != MAD_NONE) {
struct audio_attach_args arg;
arg.type = AUDIODEV_TYPE_OPL;
arg.hwif = 0;
arg.hdl = 0;
- (void)config_found(&ac->sc_dev, &arg, audioprint);
+ (void)config_found(ac->sc_dev, &arg, audioprint);
}
}
@@ -449,7 +449,7 @@
return;
/* Do we want the joystick disabled? */
- joy = device_cfdata(&ac->sc_dev)->cf_flags & 2 ? MC1_JOYDISABLE : 0;
+ joy = device_cfdata(ac->sc_dev)->cf_flags & 2 ? MC1_JOYDISABLE : 0;
/* enable WSS emulation at the I/O port */
mad_write(sc, MC1_PORT, M_WSS_PORT_SELECT(sc->mad_ioindex) | joy);
Index: src/sys/dev/isa/wss_isa.c
diff -u src/sys/dev/isa/wss_isa.c:1.27 src/sys/dev/isa/wss_isa.c:1.28
--- src/sys/dev/isa/wss_isa.c:1.27 Tue May 12 09:10:16 2009
+++ src/sys/dev/isa/wss_isa.c Thu Jun 2 13:02:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_isa.c,v 1.27 2009/05/12 09:10:16 cegger Exp $ */
+/* $NetBSD: wss_isa.c,v 1.28 2011/06/02 13:02:40 nonaka Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.27 2009/05/12 09:10:16 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.28 2011/06/02 13:02:40 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,7 +108,7 @@
return 0;
memset(sc, 0, sizeof *sc);
- ac->sc_dev.dv_cfdata = match;
+ ac->sc_dev->dv_cfdata = match;
if (wssfind(parent, sc, 1, aux)) {
bus_space_unmap(sc->sc_iot, sc->sc_ioh, WSS_CODEC);
ad1848_isa_unmap(&sc->sc_ad1848);
@@ -132,7 +132,7 @@
ac = &sc->sc_ad1848.sc_ad1848;
sc->sc_iot = ia->ia_iot;
- if (device_cfdata(&ac->sc_dev)->cf_flags & 1)
+ if (device_cfdata(ac->sc_dev)->cf_flags & 1)
madprobe(sc, ia->ia_io[0].ir_addr);
else
sc->mad_chip_type = MAD_NONE;
@@ -242,7 +242,7 @@
ac = (struct ad1848_softc *)&sc->sc_ad1848;
ia = (struct isa_attach_args *)aux;
if (!wssfind(parent, sc, 0, ia)) {
- aprint_error_dev(&ac->sc_dev, "wssfind failed\n");
+ aprint_error_dev(ac->sc_dev, "wssfind failed\n");
return;
}
Index: src/sys/dev/isa/ym.c
diff -u src/sys/dev/isa/ym.c:1.39 src/sys/dev/isa/ym.c:1.40
--- src/sys/dev/isa/ym.c:1.39 Wed Feb 24 22:37:59 2010
+++ src/sys/dev/isa/ym.c Thu Jun 2 13:02:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ym.c,v 1.39 2010/02/24 22:37:59 dyoung Exp $ */
+/* $NetBSD: ym.c,v 1.40 2011/06/02 13:02:40 nonaka Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.39 2010/02/24 22:37:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.40 2011/06/02 13:02:40 nonaka Exp $");
#include "mpu_ym.h"
#include "opt_ym.h"
@@ -258,14 +258,14 @@
ym_write(sc, SA3_HVOL_INTR_CNF, SA3_HVOL_INTR_CNF_A);
/* audio at ym attachment */
- sc->sc_audiodev = audio_attach_mi(&ym_hw_if, ac, &ac->sc_dev);
+ sc->sc_audiodev = audio_attach_mi(&ym_hw_if, ac, ac->sc_dev);
/* opl at ym attachment */
if (sc->sc_opl_ioh) {
arg.type = AUDIODEV_TYPE_OPL;
arg.hwif = 0;
arg.hdl = 0;
- (void)config_found(&ac->sc_dev, &arg, audioprint);
+ (void)config_found(ac->sc_dev, &arg, audioprint);
}
#if NMPU_YM > 0
@@ -274,7 +274,7 @@
arg.type = AUDIODEV_TYPE_MPU;
arg.hwif = 0;
arg.hdl = 0;
- sc->sc_mpudev = config_found(&ac->sc_dev, &arg, audioprint);
+ sc->sc_mpudev = config_found(ac->sc_dev, &arg, audioprint);
}
#endif
@@ -297,8 +297,8 @@
#endif
ym_powerdown_blocks(sc);
- if (!pmf_device_register(&ac->sc_dev, ym_suspend, ym_resume)) {
- aprint_error_dev(&ac->sc_dev,
+ if (!pmf_device_register(ac->sc_dev, ym_suspend, ym_resume)) {
+ aprint_error_dev(ac->sc_dev,
"cannot set power mgmt handler\n");
}
#endif
