Fix device matching in saip.

ca_match functions should return positive value when matched.
This commit is contained in:
toshii 2001-05-01 12:36:54 +00:00
parent 377398dffd
commit c7df9e68f9
6 changed files with 11 additions and 12 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: sa1111.c,v 1.3 2001/03/31 12:49:21 toshii Exp $ */
/* $NetBSD: sa1111.c,v 1.4 2001/05/01 12:36:54 toshii Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -85,7 +85,7 @@ sacc_match(parent, match, aux)
struct cfdata *match;
void *aux;
{
return (0);
return (1);
}
static void

View File

@ -1,4 +1,4 @@
/* $NetBSD: sa11x0.c,v 1.8 2001/04/17 17:12:40 toshii Exp $ */
/* $NetBSD: sa11x0.c,v 1.9 2001/05/01 12:36:54 toshii Exp $ */
/*-
* Copyright (c) 2001, The NetBSD Foundation, Inc. All rights reserved.
@ -224,7 +224,7 @@ sa11x0_search(parent, cf, aux)
sa.sa_memsize = cf->cf_loc[SAIPCF_MEMSIZE];
sa.sa_intr = cf->cf_loc[SAIPCF_INTR];
if (((*cf->cf_attach->ca_match)(parent, cf, &sa) == sc->sc_pri))
if ((*cf->cf_attach->ca_match)(parent, cf, &sa) > 0)
config_attach(parent, cf, &sa, sa11x0_print);
return 0;

View File

@ -1,4 +1,4 @@
/* $NetBSD: sa11x0_com.c,v 1.6 2001/04/17 15:53:04 toshii Exp $ */
/* $NetBSD: sa11x0_com.c,v 1.7 2001/05/01 12:36:54 toshii Exp $ */
/*-
* Copyright (c) 1998, 1999, 2001 The NetBSD Foundation, Inc.
@ -203,7 +203,7 @@ sacom_match(parent, match, aux)
struct cfdata *match;
void *aux;
{
return(0);
return (1);
}
void

View File

@ -1,4 +1,4 @@
/* $NetBSD: sa11x0_lcd.c,v 1.2 2001/02/23 04:31:19 ichiro Exp $ */
/* $NetBSD: sa11x0_lcd.c,v 1.3 2001/05/01 12:36:55 toshii Exp $ */
#define SALCD_DEBUG
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -87,7 +87,7 @@ salcd_match(parent, match, aux)
struct cfdata *match;
void *aux;
{
return(0);
return (1);
}
void

View File

@ -1,4 +1,4 @@
/* $NetBSD: sa11x0_ost.c,v 1.6 2001/04/17 15:58:51 toshii Exp $ */
/* $NetBSD: sa11x0_ost.c,v 1.7 2001/05/01 12:36:55 toshii Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@ -90,7 +90,7 @@ saost_match(parent, match, aux)
struct cfdata *match;
void *aux;
{
return(0);
return (1);
}
void

View File

@ -1,4 +1,4 @@
/* $NetBSD: sa11x0_var.h,v 1.4 2001/03/21 17:42:37 toshii Exp $ */
/* $NetBSD: sa11x0_var.h,v 1.5 2001/05/01 12:36:55 toshii Exp $ */
/*-
* Copyright (c) 2001, The NetBSD Foundation, Inc. All rights reserved.
@ -47,7 +47,6 @@ struct sa11x0_softc {
bus_space_handle_t sc_ioh;
bus_space_handle_t sc_gpioh;
bus_space_handle_t sc_dmach;
int sc_pri; /* attaching device priority */
u_int32_t sc_intrmask;
};