From fd7e9d6d329e51eeeb9f1a8391582d5b5e21ca2b Mon Sep 17 00:00:00 2001 From: bjh21 Date: Sat, 2 Jun 2001 12:07:34 +0000 Subject: [PATCH] Clean up hcsc_match: Don't check the manufacturer ID, since podule IDs are unique anyway. Do check whether the description starts with "SCSI", since HCCS used the same ID for their IDE podule. --- sys/dev/podulebus/hcsc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/podulebus/hcsc.c b/sys/dev/podulebus/hcsc.c index ab58a6b93168..97a6e374649e 100644 --- a/sys/dev/podulebus/hcsc.c +++ b/sys/dev/podulebus/hcsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: hcsc.c,v 1.3 2001/06/02 11:43:40 bjh21 Exp $ */ +/* $NetBSD: hcsc.c,v 1.4 2001/06/02 12:07:34 bjh21 Exp $ */ /* * Copyright (c) 2001 Ben Harris @@ -72,7 +72,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: hcsc.c,v 1.3 2001/06/02 11:43:40 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hcsc.c,v 1.4 2001/06/02 12:07:34 bjh21 Exp $"); #include #include @@ -127,10 +127,10 @@ hcsc_match(struct device *parent, struct cfdata *cf, void *aux) { struct podulebus_attach_args *pa = aux; - if (matchpodule(pa, MANUFACTURER_HCCS, PODULE_HCCS_IDESCSI, -1) == 0) - return(0); - - return(1); + if (pa->pa_product == PODULE_HCCS_IDESCSI && + strncmp(pa->pa_descr, "SCSI", 4) == 0) + return 1; + return 0; } /*