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

Fix ESS/SB confusion for 1868 and 1869 chips: because isapnpdevs is parsed by an awk script, you *must* comment out each line separately, which is why ess was still trying to attach chips it couldn't cope with. Note that this leaves isapnp ess with no matches -- shouldn't the 188X be in here? Also, add another isapnp PCIC.

This commit is contained in:
tls 1999-02-08 22:10:09 +00:00
parent 3fafc185a5
commit e8690f9bd1
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/isapnp/isapnpdevs
View File

@ -1,4 +1,4 @@
$NetBSD: isapnpdevs,v 1.16 1999/02/05 01:15:01 augustss Exp $
$NetBSD: isapnpdevs,v 1.17 1999/02/08 22:10:09 tls Exp $
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -94,9 +94,8 @@ devlogic ep TCM5098 3Com 3c509B-8
* ess
*/
/* XXX not working yet
devlogic ess ESS1868 ESS1868
devlogic ess ESS1869 ESS1869
*/
/* devlogic ess ESS1868 ESS1868 */
/* devlogic ess ESS1869 ESS1869 */
/*
* joy
@ -130,6 +129,7 @@ devlogic ne @@@1980 OvisLink LE-8019R
* pcic
*/
devcompat pcic PNP0E00 PCIC Compatible PCMCIA Bridge
devlogic pcic AEI0218 Actiontec PnP PCMCIA Adapter
/*
* sb
@ -150,6 +150,7 @@ devcompat sb PNPB001 Generic SB 2.0
devcompat sb PNPB002 Generic SB Pro
devcompat sb PNPB003 Generic SB 16
devlogic sb ESS1868 ESS1868
devlogic sb ESS1869 ESS1869
/*

9
sys/dev/isapnp/isapnpdevs.c
View File

@ -1,10 +1,10 @@
/* $NetBSD: isapnpdevs.c,v 1.15 1999/01/04 22:41:58 augustss Exp $ */
/* $NetBSD: isapnpdevs.c,v 1.16 1999/02/08 22:10:09 tls Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* NetBSD: isapnpdevs,v 1.15 1999/01/04 22:39:42 augustss Exp
* NetBSD: isapnpdevs,v 1.16 1999/02/05 01:15:01 augustss Exp
*/
/*-
@ -112,8 +112,6 @@ const struct isapnp_devinfo isapnp_ep_devinfo = {
/* ESS Audio Drive */
static const char *isapnp_ess_devlogic[] = {
"ESS1868", /* ESS1868 */
"ESS1869", /* ESS1869 */
NULL
};
static const char *isapnp_ess_devcompat[] = {
@ -181,6 +179,7 @@ const struct isapnp_devinfo isapnp_ne_devinfo = {
/* PCMCIA bridge */
static const char *isapnp_pcic_devlogic[] = {
"AEI0218", /* Actiontec PnP PCMCIA Adapter */
NULL
};
static const char *isapnp_pcic_devcompat[] = {
@ -204,6 +203,8 @@ static const char *isapnp_sb_devlogic[] = {
"CTL0045", /* SB AWE64 Value */
"OPT9250", /* Televideo card, Opti */
"@X@0001", /* CMI8330. Audio Adapter */
"ESS1868", /* ESS1868 */
"ESS1869", /* ESS1869 */
NULL
};
static const char *isapnp_sb_devcompat[] = {

4
sys/dev/isapnp/isapnpdevs.h
View File

@ -1,10 +1,10 @@
/* $NetBSD: isapnpdevs.h,v 1.15 1999/01/04 22:41:58 augustss Exp $ */
/* $NetBSD: isapnpdevs.h,v 1.16 1999/02/08 22:10:09 tls Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* NetBSD: isapnpdevs,v 1.15 1999/01/04 22:39:42 augustss Exp
* NetBSD: isapnpdevs,v 1.16 1999/02/05 01:15:01 augustss Exp
*/