Utilize the centralized probe function.

This commit is contained in:
christos 1998-07-23 19:32:42 +00:00
parent fe7d31fe1e
commit 1253bfdf46
1 changed files with 3 additions and 12 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: joy_isapnp.c,v 1.13 1998/06/08 06:47:15 thorpej Exp $ */
/* $NetBSD: joy_isapnp.c,v 1.14 1998/07/23 19:32:42 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -46,6 +46,7 @@
#include <dev/isa/isavar.h>
#include <dev/isapnp/isapnpreg.h>
#include <dev/isapnp/isapnpvar.h>
#include <dev/isapnp/isapnpdevs.h>
#include <i386/isa/joyvar.h>
@ -62,17 +63,7 @@ joy_isapnp_match(parent, match, aux)
struct cfdata *match;
void *aux;
{
struct isapnp_attach_args *ipa = aux;
if (strcmp(ipa->ipa_devcompat, "PNPB02F") && /* generic */
strcmp(ipa->ipa_devlogic, "CSCA801") && /* Terratec EWS64XL */
strcmp(ipa->ipa_devlogic, "CTL7002") && /* Creative Vibra16CL */
strcmp(ipa->ipa_devlogic, "ESS0001") && /* ESS1868 */
strcmp(ipa->ipa_devlogic, "OPT0001") && /* OPTi Audio 16 */
strcmp(ipa->ipa_devlogic, "PNPB02F")) /* XXX broken GUS PnP */
return (0);
return 1;
return isapnp_devmatch(aux, &isapnp_joy_devinfo);
}
void