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

Make the OPL information string more informative.

This commit is contained in:
augustss 1998-12-08 14:26:56 +00:00
parent 45f33dbecc
commit 1b499d8ce6
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/ic/opl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: opl.c,v 1.6 1998/11/25 22:17:06 augustss Exp $ */
/* $NetBSD: opl.c,v 1.7 1998/12/08 14:26:56 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -154,7 +154,7 @@ opl_attach(sc)
}
sc->syn.mets = &opl3_midi;
sprintf(sc->syn.name, "Yamaha OPL%d", sc->model);
sprintf(sc->syn.name, "%sYamaha OPL%d", sc->syn.name, sc->model);
sc->syn.data = sc;
sc->syn.nvoice = sc->model == OPL_2 ? OPL2_NVOICE : OPL3_NVOICE;
sc->syn.flags = MS_DOALLOC | MS_FREQXLATE;

4
sys/dev/isa/madreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: madreg.h,v 1.4 1998/01/19 22:18:27 augustss Exp $ */
/* $NetBSD: madreg.h,v 1.5 1998/12/08 14:26:57 augustss Exp $ */
/*
* Copyright (c) 1996 Lennart Augustsson
* Copyright (c) 1995 Hannu Savolainen
@ -74,7 +74,7 @@
#define MC1_SECIDE 0x08
#define MC1_PRIMIDE 0x0a
#define MC2_CDDISABLE 0x03
#define MC2_NO_CD_DRQ 0x03
#define MC2_OPL4 0x20
/* Possible WSS emulation ports */

3
sys/dev/isa/opl_ess.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: opl_ess.c,v 1.2 1998/08/26 12:10:22 augustss Exp $ */
/* $NetBSD: opl_ess.c,v 1.3 1998/12/08 14:26:57 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -98,6 +98,7 @@ opl_ess_attach(parent, self, aux)
sc->offs = 0;
sc->spkrctl = ess_speaker_ctl;
sc->spkrarg = ssc;
strcpy(sc->syn.name, "ESS ");
opl_attach(sc);
}

3
sys/dev/isa/opl_sb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: opl_sb.c,v 1.3 1998/11/25 22:17:06 augustss Exp $ */
/* $NetBSD: opl_sb.c,v 1.4 1998/12/08 14:26:57 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -97,6 +97,7 @@ opl_sb_attach(parent, self, aux)
sc->offs = 0;
sc->spkrctl = sbdsp_speaker_ctl;
sc->spkrarg = ssc;
strcpy(sc->syn.name, "SB ");
opl_attach(sc);
}

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

@ -1,4 +1,4 @@
/* $NetBSD: wss.c,v 1.53 1998/09/06 11:05:21 pk Exp $ */
/* $NetBSD: wss.c,v 1.54 1998/12/08 14:26:57 augustss Exp $ */
/*
* Copyright (c) 1994 John Brezak
@ -158,6 +158,14 @@ wssattach(sc)
ac->parent = sc;
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);
}
}
int
@ -166,7 +174,7 @@ wss_getdev(addr, retp)
struct audio_device *retp;
{
*retp = wss_device;
return 0;
return 0;
}
static ad1848_devmap_t mappings[] = {
@ -451,7 +459,7 @@ madattach(sc)
/* enable WSS emulation at the I/O port */
mad_write(sc, MC1_PORT, M_WSS_PORT_SELECT(sc->mad_ioindex) | joy);
mad_write(sc, MC2_PORT, 0x03); /* ? */
mad_write(sc, MC2_PORT, MC2_NO_CD_DRQ); /* disable CD */
mad_write(sc, MC3_PORT, 0xf0); /* Disable SB */
cs4231_mode =