Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Unify the name of the device property to hold a MAC addr...
details: https://anonhg.NetBSD.org/src/rev/ad6c87b5812b
branches: trunk
changeset: 751024:ad6c87b5812b
user: martin <martin%NetBSD.org@localhost>
date: Fri Jan 22 08:56:04 2010 +0000
description:
Unify the name of the device property to hold a MAC address - there was
no clear majority for either "mac-addr" vs. "mac-address", but a quick
gallup poll among developers selected the latter.
diffstat:
sys/arch/algor/algor/autoconf.c | 6 +++---
sys/arch/arm/at91/at91emac.c | 8 ++++----
sys/arch/arm/ep93xx/epe.c | 6 +++---
sys/arch/evbarm/armadillo/armadillo9_machdep.c | 6 +++---
sys/arch/evbarm/mpcsa/mpcsa_machdep.c | 8 ++++----
sys/arch/evbmips/adm5120/autoconf.c | 8 ++++----
sys/arch/evbmips/adm5120/machdep.c | 6 +++---
sys/arch/evbmips/alchemy/autoconf.c | 6 +++---
sys/arch/iyonix/iyonix/autoconf.c | 6 +++---
sys/arch/mips/adm5120/dev/if_admsw.c | 6 +++---
sys/arch/mips/alchemy/dev/if_aumac.c | 6 +++---
sys/arch/mips/atheros/ar5312.c | 6 +++---
sys/arch/mips/atheros/ar5315.c | 8 ++++----
sys/arch/mips/atheros/dev/if_ae.c | 6 +++---
sys/arch/powerpc/ibm4xx/dev/if_emac.c | 6 +++---
sys/arch/powerpc/ibm4xx/ibm4xx_autoconf.c | 6 +++---
sys/dev/pci/if_wm.c | 6 +++---
17 files changed, 55 insertions(+), 55 deletions(-)
diffs (truncated from 476 to 300 lines):
diff -r 1499edb8a9c8 -r ad6c87b5812b sys/arch/algor/algor/autoconf.c
--- a/sys/arch/algor/algor/autoconf.c Fri Jan 22 08:32:05 2010 +0000
+++ b/sys/arch/algor/algor/autoconf.c Fri Jan 22 08:56:04 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.17 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: autoconf.c,v 1.18 2010/01/22 08:56:04 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.17 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2010/01/22 08:56:04 martin Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -115,7 +115,7 @@
algor_ethaddr, ETHER_ADDR_LEN);
KASSERT(pd != NULL);
if (prop_dictionary_set(device_properties(dev),
- "mac-addr", pd) == false) {
+ "mac-address", pd) == false) {
printf("WARNING: unable to set mac-addr "
"property for %s\n", dev->dv_xname);
}
diff -r 1499edb8a9c8 -r ad6c87b5812b sys/arch/arm/at91/at91emac.c
--- a/sys/arch/arm/at91/at91emac.c Fri Jan 22 08:32:05 2010 +0000
+++ b/sys/arch/arm/at91/at91emac.c Fri Jan 22 08:56:04 2010 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91emac.c,v 1.7 2010/01/19 22:06:19 pooka Exp $ */
-/* $NetBSD: at91emac.c,v 1.7 2010/01/19 22:06:19 pooka Exp $ */
+/* $Id: at91emac.c,v 1.8 2010/01/22 08:56:04 martin Exp $ */
+/* $NetBSD: at91emac.c,v 1.8 2010/01/22 08:56:04 martin Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.7 2010/01/19 22:06:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.8 2010/01/22 08:56:04 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -171,7 +171,7 @@
EMAC_WRITE(ETH_RSR, (u & (ETH_RSR_OVR|ETH_RSR_REC|ETH_RSR_BNA)));
/* Fetch the Ethernet address from property if set. */
- enaddr = prop_dictionary_get(device_properties(self), "mac-addr");
+ enaddr = prop_dictionary_get(device_properties(self), "mac-address");
if (enaddr != NULL) {
KASSERT(prop_object_type(enaddr) == PROP_TYPE_DATA);
diff -r 1499edb8a9c8 -r ad6c87b5812b sys/arch/arm/ep93xx/epe.c
--- a/sys/arch/arm/ep93xx/epe.c Fri Jan 22 08:32:05 2010 +0000
+++ b/sys/arch/arm/ep93xx/epe.c Fri Jan 22 08:56:04 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.23 2010/01/19 22:06:19 pooka Exp $ */
+/* $NetBSD: epe.c,v 1.24 2010/01/22 08:56:04 martin Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.23 2010/01/19 22:06:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.24 2010/01/22 08:56:04 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -143,7 +143,7 @@
panic("%s: Cannot map registers", self->dv_xname);
/* Fetch the Ethernet address from property if set. */
- enaddr = prop_dictionary_get(device_properties(self), "mac-addr");
+ enaddr = prop_dictionary_get(device_properties(self), "mac-address");
if (enaddr != NULL) {
KASSERT(prop_object_type(enaddr) == PROP_TYPE_DATA);
KASSERT(prop_data_size(enaddr) == ETHER_ADDR_LEN);
diff -r 1499edb8a9c8 -r ad6c87b5812b sys/arch/evbarm/armadillo/armadillo9_machdep.c
--- a/sys/arch/evbarm/armadillo/armadillo9_machdep.c Fri Jan 22 08:32:05 2010 +0000
+++ b/sys/arch/evbarm/armadillo/armadillo9_machdep.c Fri Jan 22 08:56:04 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.18 2009/12/26 16:01:23 uebayasi Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.19 2010/01/22 08:56:04 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.18 2009/12/26 16:01:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.19 2010/01/22 08:56:04 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -315,7 +315,7 @@
armadillo9_ethaddr, ETHER_ADDR_LEN);
KASSERT(pd != NULL);
if (prop_dictionary_set(device_properties(dev),
- "mac-addr", pd) == false) {
+ "mac-address", pd) == false) {
printf("WARNING: unable to set mac-addr property "
"for %s\n", dev->dv_xname);
}
diff -r 1499edb8a9c8 -r ad6c87b5812b sys/arch/evbarm/mpcsa/mpcsa_machdep.c
--- a/sys/arch/evbarm/mpcsa/mpcsa_machdep.c Fri Jan 22 08:32:05 2010 +0000
+++ b/sys/arch/evbarm/mpcsa/mpcsa_machdep.c Fri Jan 22 08:56:04 2010 +0000
@@ -1,5 +1,5 @@
-/* $Id: mpcsa_machdep.c,v 1.3 2008/11/11 06:46:41 dyoung Exp $ */
-/* $NetBSD: mpcsa_machdep.c,v 1.3 2008/11/11 06:46:41 dyoung Exp $ */
+/* $Id: mpcsa_machdep.c,v 1.4 2010/01/22 08:56:05 martin Exp $ */
+/* $NetBSD: mpcsa_machdep.c,v 1.4 2010/01/22 08:56:05 martin Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.3 2008/11/11 06:46:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.4 2010/01/22 08:56:05 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -383,7 +383,7 @@
eth_addr, ETHER_ADDR_LEN);
KASSERT(pd != NULL);
if (prop_dictionary_set(device_properties(dev),
- "mac-addr", pd) == FALSE) {
+ "mac-address", pd) == FALSE) {
printf("WARNING: unable to set mac-addr property "
"for %s\n", dev->dv_xname);
}
diff -r 1499edb8a9c8 -r ad6c87b5812b sys/arch/evbmips/adm5120/autoconf.c
--- a/sys/arch/evbmips/adm5120/autoconf.c Fri Jan 22 08:32:05 2010 +0000
+++ b/sys/arch/evbmips/adm5120/autoconf.c Fri Jan 22 08:56:04 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.3 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: autoconf.c,v 1.4 2010/01/22 08:56:05 martin Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.3 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2010/01/22 08:56:05 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,10 +113,10 @@
prop_object_release(po);
}
if (device_is_a(dev, "admsw") &&
- (po = prop_dictionary_get(properties, "mac-addr")) != NULL) {
+ (po = prop_dictionary_get(properties, "mac-address")) != NULL) {
if (prop_dictionary_set(device_properties(dev),
- "mac-addr", po) == FALSE) {
+ "mac-address", po) == FALSE) {
printf("WARNING: unable to set mac-addr "
"property for %s\n", dev->dv_xname);
}
diff -r 1499edb8a9c8 -r ad6c87b5812b sys/arch/evbmips/adm5120/machdep.c
--- a/sys/arch/evbmips/adm5120/machdep.c Fri Jan 22 08:32:05 2010 +0000
+++ b/sys/arch/evbmips/adm5120/machdep.c Fri Jan 22 08:56:04 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.14 2009/12/14 00:46:00 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.15 2010/01/22 08:56:05 martin Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2009/12/14 00:46:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2010/01/22 08:56:05 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -290,7 +290,7 @@
printf("%s: prop_data_create_data\n", __func__);
continue;
}
- if (!prop_dictionary_set(properties, "mac-addr", pd)) {
+ if (!prop_dictionary_set(properties, "mac-address", pd)) {
printf("%s: prop_dictionary_set(mac)\n",
__func__);
}
diff -r 1499edb8a9c8 -r ad6c87b5812b sys/arch/evbmips/alchemy/autoconf.c
--- a/sys/arch/evbmips/alchemy/autoconf.c Fri Jan 22 08:32:05 2010 +0000
+++ b/sys/arch/evbmips/alchemy/autoconf.c Fri Jan 22 08:56:04 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.16 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: autoconf.c,v 1.17 2010/01/22 08:56:05 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.16 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.17 2010/01/22 08:56:05 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,7 +119,7 @@
pd = prop_data_create_data(ethaddr, ETHER_ADDR_LEN);
KASSERT(pd != NULL);
if (prop_dictionary_set(device_properties(dev),
- "mac-addr", pd) == false) {
+ "mac-address", pd) == false) {
printf("WARNING: unable to set mac-addr "
"property for %s\n", dev->dv_xname);
}
diff -r 1499edb8a9c8 -r ad6c87b5812b sys/arch/iyonix/iyonix/autoconf.c
--- a/sys/arch/iyonix/iyonix/autoconf.c Fri Jan 22 08:32:05 2010 +0000
+++ b/sys/arch/iyonix/iyonix/autoconf.c Fri Jan 22 08:56:04 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.11 2009/08/02 11:32:05 gavan Exp $ */
+/* $NetBSD: autoconf.c,v 1.12 2010/01/22 08:56:05 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11 2009/08/02 11:32:05 gavan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.12 2010/01/22 08:56:05 martin Exp $");
#include "opt_md.h"
@@ -134,7 +134,7 @@
ETHER_ADDR_LEN);
KASSERT(mac != NULL);
- SETPROP("mac-addr", mac);
+ SETPROP("mac-address", mac);
SETPROP("i82543-cfg1", cfg1);
SETPROP("i82543-cfg2", cfg2);
SETPROP("i82543-swdpin", swdpin);
diff -r 1499edb8a9c8 -r ad6c87b5812b sys/arch/mips/adm5120/dev/if_admsw.c
--- a/sys/arch/mips/adm5120/dev/if_admsw.c Fri Jan 22 08:32:05 2010 +0000
+++ b/sys/arch/mips/adm5120/dev/if_admsw.c Fri Jan 22 08:56:04 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_admsw.c,v 1.6 2010/01/19 22:06:21 pooka Exp $ */
+/* $NetBSD: if_admsw.c,v 1.7 2010/01/22 08:56:05 martin Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.6 2010/01/19 22:06:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v 1.7 2010/01/22 08:56:05 martin Exp $");
#include <sys/param.h>
@@ -341,7 +341,7 @@
sc->sc_dmat = aa->oba_dt;
sc->sc_st = aa->oba_st;
- pd = prop_dictionary_get(device_properties(&sc->sc_dev), "mac-addr");
+ pd = prop_dictionary_get(device_properties(&sc->sc_dev), "mac-address");
if (pd == NULL) {
enaddr[0] = 0x02;
diff -r 1499edb8a9c8 -r ad6c87b5812b sys/arch/mips/alchemy/dev/if_aumac.c
--- a/sys/arch/mips/alchemy/dev/if_aumac.c Fri Jan 22 08:32:05 2010 +0000
+++ b/sys/arch/mips/alchemy/dev/if_aumac.c Fri Jan 22 08:56:04 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aumac.c,v 1.26 2010/01/19 22:06:21 pooka Exp $ */
+/* $NetBSD: if_aumac.c,v 1.27 2010/01/22 08:56:05 martin Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.26 2010/01/19 22:06:21 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.27 2010/01/22 08:56:05 martin Exp $");
#include "rnd.h"
@@ -238,7 +238,7 @@
sc->sc_st = aa->aa_st;
/* Get the MAC address. */
Home |
Main Index |
Thread Index |
Old Index