From d7989f8724f11c5c016615d1714a760ade29b858 Mon Sep 17 00:00:00 2001 From: Jeroen Ruigrok/asmodai Date: Mon, 10 Nov 2003 19:29:42 +0000 Subject: [PATCH] Make sure to skip the PC98 architecture on the OPTi detection, since it obscures a CS sound card. Submitted by: Watanabe Kazuhiro FreeBSD PR: kern/45673 --- sys/dev/sound/isa/mss.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c index 7f18df9a46..4231ad84ca 100644 --- a/sys/dev/sound/isa/mss.c +++ b/sys/dev/sound/isa/mss.c @@ -27,12 +27,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.48.2.11 2002/12/24 21:17:41 semenu Exp $ - * $DragonFly: src/sys/dev/sound/isa/mss.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/mss.c,v 1.3 2003/11/10 19:29:42 asmodai Exp $ */ #include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/mss.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/mss.c,v 1.3 2003/11/10 19:29:42 asmodai Exp $"); /* board-specific include files */ #include @@ -1352,6 +1352,7 @@ mss_detect(device_t dev, struct mss_info *mss) name = "AD1848"; mss->bd_id = MD_AD1848; /* AD1848 or CS4248 */ +#ifndef PC98 if (opti_detect(dev, mss)) { switch (mss->bd_id) { case MD_OPTI924: @@ -1364,6 +1365,7 @@ mss_detect(device_t dev, struct mss_info *mss) printf("Found OPTi device %s\n", name); if (opti_init(dev, mss) == 0) goto gotit; } +#endif /* * Check that the I/O address is in use. -- 2.32.0