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

fix compile failure.

Browse Source
This commit is contained in:
nonaka 2011-06-02 12:51:52 +00:00
parent 577c48bd00
commit 26a17089a0
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/acpi/wss_acpi.c
View File

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

6
sys/dev/acpi/ym_acpi.c
View File

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

8
sys/dev/isa/ad1848_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ad1848_isa.c,v 1.36 2008/04/28 20:23:51 martin Exp $ */
/* $NetBSD: ad1848_isa.c,v 1.37 2011/06/02 12:51:52 nonaka Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.36 2008/04/28 20:23:51 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.37 2011/06/02 12:51:52 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -454,7 +454,7 @@ ad1848_isa_attach(struct ad1848_isa_softc *isc)
error = isa_dmamap_create(isc->sc_ic, isc->sc_playdrq,
isc->sc_play_maxsize, BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW);
if (error) {
aprint_error_dev(&sc->sc_dev, "can't create map for drq %d\n",
aprint_error_dev(sc->sc_dev, "can't create map for drq %d\n",
isc->sc_playdrq);
return;
}
@ -465,7 +465,7 @@ ad1848_isa_attach(struct ad1848_isa_softc *isc)
error = isa_dmamap_create(isc->sc_ic, isc->sc_recdrq,
isc->sc_rec_maxsize, BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW);
if (error) {
aprint_error_dev(&sc->sc_dev, "can't create map for drq %d\n",
aprint_error_dev(sc->sc_dev, "can't create map for drq %d\n",
isc->sc_recdrq);
isa_dmamap_destroy(isc->sc_ic, isc->sc_playdrq);
return;

10
sys/dev/isa/wss.c
View File

@ -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 @@ wssattach(struct wss_softc *sc)
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 @@ madattach(struct wss_softc *sc)
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);

10
sys/dev/isa/wss_isa.c
View File

@ -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 @@ wss_isa_probe(device_t parent, cfdata_t match, void *aux)
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 @@ wssfind(device_t parent, struct wss_softc *sc, int probing,
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 @@ wss_isa_attach(device_t parent, device_t self, void *aux)
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;
}

14
sys/dev/isa/ym.c
View File

@ -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_attach(struct ym_softc *sc)
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 @@ ym_attach(struct ym_softc *sc)
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 @@ ym_attach(struct ym_softc *sc)
#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