summaryrefslogtreecommitdiffstats
path: root/sys/pc98
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/pc98
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/pc98')
-rw-r--r--sys/pc98/pc98/canbus.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/pc98/pc98/canbus.c b/sys/pc98/pc98/canbus.c
index daacdbd..8c3ee4e 100644
--- a/sys/pc98/pc98/canbus.c
+++ b/sys/pc98/pc98/canbus.c
@@ -84,7 +84,7 @@ static int canbus_detach(device_t);
static int canbus_print_child(device_t, device_t);
static device_t canbus_add_child(device_t, u_int, const char *, int);
static struct resource * canbus_alloc_resource(
- device_t, device_t, int, int *, u_long, u_long, u_long, u_int);
+ device_t, device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int);
static int canbus_activate_resource(
device_t, device_t, int, int, struct resource *);
static int canbus_deactivate_resource(
@@ -92,7 +92,7 @@ static int canbus_deactivate_resource(
static int canbus_release_resource(
device_t, device_t, int, int, struct resource *);
static int canbus_set_resource (
- device_t, device_t, int, int, u_long, u_long);
+ device_t, device_t, int, int, rman_res_t, rman_res_t);
static void canbus_delete_resource(device_t, device_t, int, int);
/* canbus local function */
@@ -254,7 +254,7 @@ canbus_add_child(device_t bus, u_int order, const char *name, int unit)
static struct resource *
canbus_alloc_resource(device_t dev, device_t child, int type,
- int *rid, u_long start, u_long end, u_long count, u_int flags)
+ int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
{
return (BUS_ALLOC_RESOURCE(device_get_parent(dev),
child, type, rid, start, end, count, flags));
@@ -286,7 +286,8 @@ canbus_release_resource(
static int
canbus_set_resource (
- device_t dev, device_t child, int type, int rid, u_long start, u_long count)
+ device_t dev, device_t child, int type, int rid, rman_res_t start,
+ rman_res_t count)
{
struct canbus_device *cbdev =
(struct canbus_device *)device_get_ivars(child);
OpenPOWER on IntegriCloud