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

The introduction of config_stdsubmatch() lost an important feature of 

upc_submatch() whereby it made sure that the correct driver attached.
Since this didn't really belong in the submatch function anyway,
reintroduce it in the match functions for upc's children.

This allows my A5000 to find at least one of its hard disks.
This commit is contained in:
bjh21 2009-01-25 14:34:14 +00:00
parent 293645aa72
commit 1cd868fdf2
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/ic/com_upc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_upc.c,v 1.10 2008/03/14 15:09:11 cube Exp $ */
/* $NetBSD: com_upc.c,v 1.11 2009/01/25 14:34:14 bjh21 Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@ -28,7 +28,7 @@
/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: com_upc.c,v 1.10 2008/03/14 15:09:11 cube Exp $");
__KERNEL_RCSID(0, "$NetBSD: com_upc.c,v 1.11 2009/01/25 14:34:14 bjh21 Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -50,9 +50,9 @@ CFATTACH_DECL_NEW(com_upc, sizeof(struct com_softc),
static int
com_upc_match(device_t parent, cfdata_t cf, void *aux)
{
struct upc_attach_args *ua = aux;
/* upc_submatch does it all anyway */
return 1;
return !strcmp(ua->ua_devtype, "com");
}
static void

8
sys/dev/ic/lpt_upc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lpt_upc.c,v 1.9 2008/03/07 17:15:51 cube Exp $ */
/* $NetBSD: lpt_upc.c,v 1.10 2009/01/25 14:34:14 bjh21 Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@ -28,7 +28,7 @@
/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lpt_upc.c,v 1.9 2008/03/07 17:15:51 cube Exp $");
__KERNEL_RCSID(0, "$NetBSD: lpt_upc.c,v 1.10 2009/01/25 14:34:14 bjh21 Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -49,9 +49,9 @@ CFATTACH_DECL_NEW(lpt_upc, sizeof(struct lpt_softc),
static int
lpt_upc_match(device_t parent, cfdata_t cf, void *aux)
{
struct upc_attach_args *ua = aux;
/* upc_submatch does it all anyway */
return 1;
return !strcmp(ua->ua_devtype, "lpt");
}
static void

8
sys/dev/ic/wdc_upc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc_upc.c,v 1.25 2008/03/18 20:46:36 cube Exp $ */
/* $NetBSD: wdc_upc.c,v 1.26 2009/01/25 14:34:14 bjh21 Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@ -28,7 +28,7 @@
/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wdc_upc.c,v 1.25 2008/03/18 20:46:36 cube Exp $");
__KERNEL_RCSID(0, "$NetBSD: wdc_upc.c,v 1.26 2009/01/25 14:34:14 bjh21 Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -61,9 +61,9 @@ CFATTACH_DECL_NEW(wdc_upc, sizeof(struct wdc_upc_softc),
static int
wdc_upc_match(device_t parent, cfdata_t cf, void *aux)
{
struct upc_attach_args *ua = aux;
/* upc_submatch does it all anyway */
return 1;
return !strcmp(ua->ua_devtype, "wdc");
}
static void