diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc/include/autoconf.h | 13 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/autoconf.c | 22 | ||||
| -rw-r--r-- | sys/arch/sparc64/include/autoconf.h | 13 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/autoconf.c | 16 |
4 files changed, 6 insertions, 58 deletions
diff --git a/sys/arch/sparc/include/autoconf.h b/sys/arch/sparc/include/autoconf.h index 35865505f8c..a8ff8e3e515 100644 --- a/sys/arch/sparc/include/autoconf.h +++ b/sys/arch/sparc/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.12 2003/06/02 23:27:54 millert Exp $ */ +/* $OpenBSD: autoconf.h,v 1.13 2005/03/15 18:46:30 miod Exp $ */ /* $NetBSD: autoconf.h,v 1.20 1997/05/24 20:03:03 pk Exp $ */ /* @@ -156,16 +156,6 @@ extern int optionsnode; int romprop(struct romaux *ra, const char *name, int node); /* - * The matchbyname function is useful in drivers that are matched - * by romaux name, i.e., all `mainbus attached' devices. It expects - * its aux pointer to point to a pointer to the name (the address of - * a romaux structure suffices, for instance). - */ -struct device; -struct cfdata; -int matchbyname(struct device *, void *cf, void *aux); - -/* * `clockfreq' produces a printable representation of a clock frequency * (this is just a frill). */ @@ -188,6 +178,7 @@ int makememarr(struct memarr *, int max, int which); void rominterpret(char *); /* Openprom V2 style boot path */ +struct device; struct bootpath { char name[16]; /* name of this node */ int val[3]; /* up to three optional values */ diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index b05e4bc4ace..25247f57696 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.60 2004/12/25 23:02:25 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.61 2005/03/15 18:46:37 miod Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -146,26 +146,6 @@ int intr_sbus2ipl_4m[] = { }; /* - * Most configuration on the SPARC is done by matching OPENPROM Forth - * device names with our internal names. - */ -int -matchbyname(parent, vcf, aux) - struct device *parent; - void *aux, *vcf; -{ - struct cfdata *cf = vcf; - struct confargs *ca = aux; - - if (CPU_ISSUN4) { - printf("WARNING: matchbyname not valid on sun4!"); - printf("%s\n", cf->cf_driver->cd_name); - return (0); - } - return (strcmp(cf->cf_driver->cd_name, ca->ca_ra.ra_name) == 0); -} - -/* * Convert hex ASCII string to a value. Returns updated pointer. * Depends on ASCII order (this *is* machine-dependent code, you know). */ diff --git a/sys/arch/sparc64/include/autoconf.h b/sys/arch/sparc64/include/autoconf.h index d317bfb178e..9bf7a0292fd 100644 --- a/sys/arch/sparc64/include/autoconf.h +++ b/sys/arch/sparc64/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.9 2003/06/02 23:27:56 millert Exp $ */ +/* $OpenBSD: autoconf.h,v 1.10 2005/03/15 18:46:38 miod Exp $ */ /* $NetBSD: autoconf.h,v 1.10 2001/07/24 19:32:11 eeh Exp $ */ /*- @@ -135,22 +135,13 @@ extern int optionsnode; char *getpropstringA(int, char *, char *); /* - * The matchbyname function is useful in drivers that are matched - * by romaux name, i.e., all `mainbus attached' devices. It expects - * its aux pointer to point to a pointer to the name (the address of - * a romaux structure suffices, for instance). (OBSOLETE) - */ -struct device; -struct cfdata; -int matchbyname(struct device *, struct cfdata *cf, void *aux); - -/* * `clockfreq' produces a printable representation of a clock frequency * (this is just a frill). */ char *clockfreq(long freq); /* Openprom V2 style boot path */ +struct device; struct bootpath { char name[16]; /* name of this node */ char compatible[16]; /* "compatible" name of this node */ diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c index 1bbed64ee62..5de0ad1b132 100644 --- a/sys/arch/sparc64/sparc64/autoconf.c +++ b/sys/arch/sparc64/sparc64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.37 2004/12/25 23:02:25 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.38 2005/03/15 18:46:39 miod Exp $ */ /* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */ /* @@ -159,20 +159,6 @@ int autoconf_debug = 0x0; #endif /* - * Most configuration on the SPARC is done by matching OPENPROM Forth - * device names with our internal names. - */ -int -matchbyname(parent, cf, aux) - struct device *parent; - struct cfdata *cf; - void *aux; -{ - printf("%s: WARNING: matchbyname\n", cf->cf_driver->cd_name); - return (0); -} - -/* * Convert hex ASCII string to a value. Returns updated pointer. * Depends on ASCII order (this *is* machine-dependent code, you know). */ |