summaryrefslogtreecommitdiff
path: root/sys/dev/mca
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2002-10-04 15:22:27 +0000
committertsutsui <tsutsui@NetBSD.org>2002-10-04 15:22:27 +0000
commitfdedb8dbd62a65e90fc95e84127d21cdfe23b433 (patch)
tree13c305f6049a5b64d121d13506e9eab3991fbda0 /sys/dev/mca
parent9dd05d2197872d42499a026d0010e597985601b7 (diff)
- Merge dev/ic/ate_subr.c into dev/ic/mb86960.c since it only has EEPROM
read function which can also be used for other MB86965 based boards. - Rewrite EEPROM read function as per 93C06 EEPROM datasheet. - Misc cleanup.
Diffstat (limited to 'sys/dev/mca')
-rw-r--r--sys/dev/mca/if_ate_mca.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/mca/if_ate_mca.c b/sys/dev/mca/if_ate_mca.c
index 8960b085942..77bd1336939 100644
--- a/sys/dev/mca/if_ate_mca.c
+++ b/sys/dev/mca/if_ate_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ate_mca.c,v 1.7 2002/10/02 16:34:10 thorpej Exp $ */
+/* $NetBSD: if_ate_mca.c,v 1.8 2002/10/04 15:22:31 tsutsui Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.7 2002/10/02 16:34:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.8 2002/10/04 15:22:31 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.7 2002/10/02 16:34:10 thorpej Exp $
#include <dev/ic/mb86960reg.h>
#include <dev/ic/mb86960var.h>
-#include <dev/ic/ate_subr.h>
#include <dev/mca/mcavar.h>
#include <dev/mca/mcadevs.h>
@@ -228,9 +227,9 @@ ate_mca_detect(iot, ioh, enaddr)
bus_space_handle_t ioh;
u_int8_t enaddr[ETHER_ADDR_LEN];
{
- u_char eeprom[FE_EEPROM_SIZE];
+ u_int8_t eeprom[FE_EEPROM_SIZE];
/* Get our station address from EEPROM. */
- ate_read_eeprom(iot, ioh, eeprom);
- bcopy(eeprom + FE_ATI_EEP_ADDR, enaddr, ETHER_ADDR_LEN);
+ mb86965_read_eeprom(iot, ioh, eeprom);
+ memcpy(enaddr, eeprom + FE_ATI_EEP_ADDR, ETHER_ADDR_LEN);
}