diff options
author | Justin Hibbits <jhibbits@FreeBSD.org> | 2016-01-27 02:23:54 +0000 |
---|---|---|
committer | Justin Hibbits <jhibbits@FreeBSD.org> | 2016-01-27 02:23:54 +0000 |
commit | 2dd1bdf1834c53d048d3d9a7079b45afea5cecd7 (patch) | |
tree | 5ac500b634909ff3fe2556201aef7e16d85316d2 /sys/dev/sound | |
parent | 1cdc5f0b8794e82f0cbf9dca07967ca2559ba331 (diff) | |
download | src-2dd1bdf1834c53d048d3d9a7079b45afea5cecd7.tar.gz src-2dd1bdf1834c53d048d3d9a7079b45afea5cecd7.zip |
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
Notes
Notes:
svn path=/head/; revision=294883
Diffstat (limited to 'sys/dev/sound')
-rw-r--r-- | sys/dev/sound/isa/gusc.c | 4 | ||||
-rw-r--r-- | sys/dev/sound/isa/sbc.c | 4 | ||||
-rw-r--r-- | sys/dev/sound/pci/csa.c | 5 | ||||
-rw-r--r-- | sys/dev/sound/pci/fm801.c | 3 | ||||
-rw-r--r-- | sys/dev/sound/pci/vibes.c | 3 |
5 files changed, 11 insertions, 8 deletions
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c index a45e7e693fb0..d6fd90f73417 100644 --- a/sys/dev/sound/isa/gusc.c +++ b/sys/dev/sound/isa/gusc.c @@ -91,7 +91,7 @@ static int gusc_attach(device_t dev); static int gusisa_probe(device_t dev); static void gusc_intr(void *); static struct resource *gusc_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); static int gusc_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r); @@ -350,7 +350,7 @@ gusc_intr(void *arg) static struct resource * gusc_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) { sc_p scp; int *alloced, rid_max, alloced_max; diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c index 6f8f64e084c5..3a323651b116 100644 --- a/sys/dev/sound/isa/sbc.c +++ b/sys/dev/sound/isa/sbc.c @@ -80,7 +80,7 @@ static int sbc_attach(device_t dev); static void sbc_intr(void *p); static struct resource *sbc_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); static int sbc_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r); static int sbc_setup_intr(device_t dev, device_t child, struct resource *irq, @@ -573,7 +573,7 @@ sbc_teardown_intr(device_t dev, device_t child, struct resource *irq, static struct resource * sbc_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 sbc_softc *scp; int *alloced, rid_max, alloced_max; diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index e40641066f3c..5dbc7be0c586 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -81,7 +81,8 @@ typedef struct csa_softc *sc_p; static int csa_probe(device_t dev); static int csa_attach(device_t dev); static struct resource *csa_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); static int csa_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r); static int csa_setup_intr(device_t bus, device_t child, @@ -396,7 +397,7 @@ csa_resume(device_t dev) static struct resource * csa_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) { sc_p scp; csa_res *resp; diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 969d53261ea9..82b1d7780bcb 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -716,7 +716,8 @@ fm801_pci_probe( device_t dev ) static struct resource * fm801_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 fm801_info *fm801; diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index f0cb57fbaacc..2c7453604471 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -721,9 +721,10 @@ sv_probe(device_t dev) static int sv_attach(device_t dev) { struct sc_info *sc; + rman_res_t count, midi_start, games_start; u_int32_t data; char status[SND_STATUSLEN]; - u_long midi_start, games_start, count, sdmaa, sdmac, ml, mu; + u_long sdmaa, sdmac, ml, mu; sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->dev = dev; |