kill questionable uses of config(8) generated xxxlocnames[]

locator information does belong elsewhere and definitely shouldn't
be in the global namespace
This commit is contained in:
drochner 2005-06-28 19:46:47 +00:00
parent d7185c5796
commit 2b1a908048
2 changed files with 6 additions and 8 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.15 2005/06/28 18:29:58 drochner Exp $ */ /* $NetBSD: mainbus.c,v 1.16 2005/06/28 19:46:47 drochner Exp $ */
/*- /*-
* Copyright (c) 2001 The NetBSD Foundation, Inc. * Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.15 2005/06/28 18:29:58 drochner Exp $"); __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16 2005/06/28 19:46:47 drochner Exp $");
#include "opt_algor_p4032.h" #include "opt_algor_p4032.h"
#include "opt_algor_p5064.h" #include "opt_algor_p5064.h"
@ -248,8 +248,7 @@ mainbus_print(void *aux, const char *pnp)
if (pnp) if (pnp)
aprint_normal("%s at %s", ma->ma_name, pnp); aprint_normal("%s at %s", ma->ma_name, pnp);
if (ma->ma_addr != (bus_addr_t) -1) if (ma->ma_addr != (bus_addr_t) -1)
aprint_normal(" %s 0x%lx", mainbuscf_locnames[MAINBUSCF_ADDR], aprint_normal(" addr 0x%lx", ma->ma_addr);
ma->ma_addr);
return (UNCONF); return (UNCONF);
} }

View File

@ -1,4 +1,4 @@
/* $NetBSD: aubus.c,v 1.12 2004/09/13 14:57:31 drochner Exp $ */ /* $NetBSD: aubus.c,v 1.13 2005/06/28 19:46:47 drochner Exp $ */
/* /*
* Copyright 2001 Wasabi Systems, Inc. * Copyright 2001 Wasabi Systems, Inc.
@ -66,7 +66,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.12 2004/09/13 14:57:31 drochner Exp $"); __KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.13 2005/06/28 19:46:47 drochner Exp $");
#include "locators.h" #include "locators.h"
@ -248,8 +248,7 @@ aubus_print(void *aux, const char *pnp)
aprint_normal("%s at %s", aa->aa_name, pnp); aprint_normal("%s at %s", aa->aa_name, pnp);
if (aa->aa_addr != AUBUSCF_ADDR_DEFAULT) if (aa->aa_addr != AUBUSCF_ADDR_DEFAULT)
aprint_normal(" %s 0x%lx", aubuscf_locnames[AUBUSCF_ADDR], aprint_normal(" addr 0x%lx", aa->aa_addr);
aa->aa_addr);
if (aa->aa_irq[0] >= 0) if (aa->aa_irq[0] >= 0)
aprint_normal(" irq %d", aa->aa_irq[0]); aprint_normal(" irq %d", aa->aa_irq[0]);
if (aa->aa_irq[1] >= 0) if (aa->aa_irq[1] >= 0)