PERFORCE change 89181 for review

[Warner Losh]

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

Change 89181 by imp at 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;
 }