From owner-p4-projects@FreeBSD.ORG  Wed Jan  4 21:33:11 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D7DE016A425; Wed,  4 Jan 2006 21:33:10 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8F8B916A423
	for <perforce@freebsd.org>; Wed,  4 Jan 2006 21:33:10 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7B1AF43D8A
	for <perforce@freebsd.org>; Wed,  4 Jan 2006 21:31:23 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k04LVIDR033915
	for <perforce@freebsd.org>; Wed, 4 Jan 2006 21:31:18 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k04LVIBx033912
	for perforce@freebsd.org; Wed, 4 Jan 2006 21:31:18 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 4 Jan 2006 21:31:18 GMT
Message-Id: <200601042131.k04LVIBx033912@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89181 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2006 21:33:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=89181

Change 89181 by imp@imp_plunger on 2006/01/04 21:30:54

	More

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/if_ate.c#4 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#4 (text+ko) ====

@@ -32,15 +32,18 @@
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/rman.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
+#include <machine/bus.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_mib.h>
 #include <net/if_types.h>
-#include <net/if_mib.h>
 
 #ifdef INET
 #include <netinet/in.h>
@@ -72,13 +75,13 @@
 };
 
 static inline uint32_t
-RD4(struct ate_softc *sc, bus_offset_t off)
+RD4(struct ate_softc *sc, bus_size_t off)
 {
 	return bus_read_4(sc->mem_res, off);
 }
 
 static inline void
-WR4(struct ate_softc *sc, bus_offset_t off, uint32_t val)
+WR4(struct ate_softc *sc, bus_size_t off, uint32_t val)
 {
 	bus_write_4(sc->mem_res, off, val);
 }
@@ -217,12 +220,12 @@
 		bus_teardown_intr(dev, sc->irq_res, sc->intrhand);
 	sc->intrhand = 0;
 	if (sc->mem_res)
-		bus_release_resource(dev, SYS_RES_IOPORT, sc->port_rid, 
-		    sc->mem_res);
+		bus_release_resource(dev, SYS_RES_IOPORT,
+		    rman_get_rid(sc->mem_res), sc->mem_res);
 	sc->mem_res = 0;
 	if (sc->irq_res)
-		bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, 
-		    sc->irq_res);
+		bus_release_resource(dev, SYS_RES_IRQ,
+		    rman_get_rid(sc->irq_res), sc->irq_res);
 	sc->irq_res = 0;
 	return;
 }