[src/netbsd-1-5]: src/sys/dev/eisa Pull up rev. 1.6:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e90d5d3f2c68
branches:  netbsd-1-5
changeset: 489110:e90d5d3f2c68
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Aug 14 14:38:28 2000 +0000

description:
Pull up rev. 1.6:
Account for changes to how the SROM is read made some time
ago to the PCI and CardBus front-ends.  Sigh, DE425, the
bastard child, no one pays enough attention...

diffstat:

 sys/dev/eisa/if_tlp_eisa.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 6d3bddeb87f3 -r e90d5d3f2c68 sys/dev/eisa/if_tlp_eisa.c
--- a/sys/dev/eisa/if_tlp_eisa.c        Mon Aug 14 07:59:58 2000 +0000
+++ b/sys/dev/eisa/if_tlp_eisa.c        Mon Aug 14 14:38:28 2000 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: if_tlp_eisa.c,v 1.5 2000/03/15 18:39:52 thorpej Exp $  */
+/*     $NetBSD: if_tlp_eisa.c,v 1.5.4.1 2000/08/14 14:38:28 thorpej Exp $      */
 
 /*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -254,7 +254,8 @@
        /*
         * ...and now read the contents of the Ethernet Address ROM.
         */
-       memset(sc->sc_srom, 0, sizeof(sc->sc_srom));
+       sc->sc_srom = malloc(32, M_DEVBUF, M_WAITOK);
+       memset(sc->sc_srom, 32, sizeof(sc->sc_srom));
        for (i = 0; i < 32; i++)
                sc->sc_srom[i] = bus_space_read_1(iot, ioh, DE425_ENETROM);