From c38c755c41dce7ce53fd89df7fa05e8358de8ece Mon Sep 17 00:00:00 2001
From: kiyohara <kiyohara@NetBSD.org>
Date: Mon, 16 Oct 2006 18:14:35 +0000
Subject: [PATCH] do bus_space_map() to get bus space handle in emacs_attach()

---
 sys/arch/powerpc/ibm4xx/dev/emacreg.h |  5 ++++-
 sys/arch/powerpc/ibm4xx/dev/if_emac.c | 11 ++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/sys/arch/powerpc/ibm4xx/dev/emacreg.h b/sys/arch/powerpc/ibm4xx/dev/emacreg.h
index dd90dba3569f..84601704b444 100644
--- a/sys/arch/powerpc/ibm4xx/dev/emacreg.h
+++ b/sys/arch/powerpc/ibm4xx/dev/emacreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: emacreg.h,v 1.1 2002/08/13 04:57:48 simonb Exp $	*/
+/*	$NetBSD: emacreg.h,v 1.2 2006/10/16 18:14:35 kiyohara Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -38,6 +38,9 @@
 #ifndef _IBM4XX_EMACREG_H_
 #define	_IBM4XX_EMACREG_H_
 
+/* Number of Ethernet MAC Registers */
+#define	EMAC_NREG		0x70
+
 /* Ethernet MAC Registers */
 #define	EMAC_MR0		0x00	/* Mode Register 0 */
 #define	  MR0_RXI		  0x80000000	/* Receive MAC Idle */
diff --git a/sys/arch/powerpc/ibm4xx/dev/if_emac.c b/sys/arch/powerpc/ibm4xx/dev/if_emac.c
index 398c3a04e02b..3f02d9ac9a3b 100644
--- a/sys/arch/powerpc/ibm4xx/dev/if_emac.c
+++ b/sys/arch/powerpc/ibm4xx/dev/if_emac.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_emac.c,v 1.26 2006/05/05 18:04:42 thorpej Exp $	*/
+/*	$NetBSD: if_emac.c,v 1.27 2006/10/16 18:14:35 kiyohara Exp $	*/
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.26 2006/05/05 18:04:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.27 2006/10/16 18:14:35 kiyohara Exp $");
 
 #include "bpfilter.h"
 
@@ -307,8 +307,8 @@ emac_attach(struct device *parent, struct device *self, void *aux)
 	const uint8_t *enaddr;
 	prop_data_t ea;
 
+	bus_space_map(oaa->opb_bt, oaa->opb_addr, EMAC_NREG, 0, &sc->sc_sh);
 	sc->sc_st = oaa->opb_bt;
-	sc->sc_sh = oaa->opb_addr;
 	sc->sc_dmat = oaa->opb_dmat;
 
 	printf(": 405GP EMAC\n");
@@ -812,6 +812,11 @@ emac_init(struct ifnet *ifp)
 	    (ifp->if_flags & IFF_PROMISC ? RMR_PME : 0) |
 	    (ifp->if_flags & IFF_BROADCAST ? RMR_BAE : 0));
 
+	/*
+	 * Set multicast filter.
+	 */
+	emac_set_filter(sc);
+
 	/*
 	 * Set low- and urgent-priority request thresholds.
 	 */