summaryrefslogtreecommitdiffstats
path: root/sys/powerpc/psim
diff options
context:
space:
mode:
authorjhibbits <jhibbits@FreeBSD.org>2016-01-27 02:23:54 +0000
committerjhibbits <jhibbits@FreeBSD.org>2016-01-27 02:23:54 +0000
commit31bb8ee5bdf9a6332a86e4774ebdccba877ce42e (patch)
tree5ac500b634909ff3fe2556201aef7e16d85316d2 /sys/powerpc/psim
parentd2ca0a07825355904475b1fe585efdd49eeae0b3 (diff)
downloadFreeBSD-src-31bb8ee5bdf9a6332a86e4774ebdccba877ce42e.zip
FreeBSD-src-31bb8ee5bdf9a6332a86e4774ebdccba877ce42e.tar.gz
Convert rman to use rman_res_t instead of u_long
Summary: Migrate to using the semi-opaque type rman_res_t to specify rman resources. For now, this is still compatible with u_long. This is step one in migrating rman to use uintmax_t for resources instead of u_long. Going forward, this could feasibly be used to specify architecture-specific definitions of resource ranges, rather than baking a specific integer type into the API. This change has been broken out to facilitate MFC'ing drivers back to 10 without breaking ABI. Reviewed By: jhb Sponsored by: Alex Perez/Inertial Computing Differential Revision: https://reviews.freebsd.org/D5075
Diffstat (limited to 'sys/powerpc/psim')
-rw-r--r--sys/powerpc/psim/ata_iobus.c6
-rw-r--r--sys/powerpc/psim/iobus.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/powerpc/psim/ata_iobus.c b/sys/powerpc/psim/ata_iobus.c
index 69c2036..bf059b7 100644
--- a/sys/powerpc/psim/ata_iobus.c
+++ b/sys/powerpc/psim/ata_iobus.c
@@ -59,7 +59,8 @@ static int ata_iobus_attach(device_t dev);
static int ata_iobus_probe(device_t dev);
static int ata_iobus_print_child(device_t dev, device_t child);
struct resource *ata_iobus_alloc_resource(device_t, device_t, int, int *,
- u_long, u_long, u_long, u_int);
+ rman_res_t, rman_res_t, rman_res_t,
+ u_int);
static int ata_iobus_release_resource(device_t, device_t, int, int,
struct resource *);
@@ -135,7 +136,8 @@ ata_iobus_print_child(device_t dev, device_t child)
struct resource *
ata_iobus_alloc_resource(device_t dev, device_t child, int type, int *rid,
- u_long start, u_long end, u_long count, u_int flags)
+ rman_res_t start, rman_res_t end, rman_res_t count,
+ u_int flags)
{
struct resource *res = NULL;
int myrid;
diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c
index 6a6ac27..21f53f1 100644
--- a/sys/powerpc/psim/iobus.c
+++ b/sys/powerpc/psim/iobus.c
@@ -72,7 +72,8 @@ static void iobus_probe_nomatch(device_t, device_t);
static int iobus_read_ivar(device_t, device_t, int, uintptr_t *);
static int iobus_write_ivar(device_t, device_t, int, uintptr_t);
static struct resource *iobus_alloc_resource(device_t, device_t, int, int *,
- u_long, u_long, u_long, u_int);
+ rman_res_t, rman_res_t, rman_res_t,
+ u_int);
static int iobus_activate_resource(device_t, device_t, int, int,
struct resource *);
static int iobus_deactivate_resource(device_t, device_t, int, int,
@@ -305,7 +306,8 @@ iobus_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
static struct resource *
iobus_alloc_resource(device_t bus, device_t child, int type, int *rid,
- u_long start, u_long end, u_long count, u_int flags)
+ rman_res_t start, rman_res_t end, rman_res_t count,
+ u_int flags)
{
struct iobus_softc *sc;
int needactivate;
OpenPOWER on IntegriCloud