Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Jan 2016 02:23:54 +0000 (UTC)
From:      Justin Hibbits <jhibbits@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r294883 - in head: lib/libdevinfo share/man/man9 sys/arm/arm sys/arm/at91 sys/arm/cavium/cns11xx sys/arm/mv sys/arm/versatile sys/arm/xscale/i8134x sys/arm/xscale/ixp425 sys/arm/xscale/...
Message-ID:  <201601270223.u0R2NsQj062076@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhibbits
Date: Wed Jan 27 02:23:54 2016
New Revision: 294883
URL: https://svnweb.freebsd.org/changeset/base/294883

Log:
  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

Modified:
  head/lib/libdevinfo/devinfo.3
  head/lib/libdevinfo/devinfo.h
  head/share/man/man9/bus_adjust_resource.9
  head/share/man/man9/bus_alloc_resource.9
  head/share/man/man9/bus_get_resource.9
  head/share/man/man9/bus_set_resource.9
  head/share/man/man9/rman.9
  head/sys/arm/arm/nexus.c
  head/sys/arm/at91/at91.c
  head/sys/arm/cavium/cns11xx/econa.c
  head/sys/arm/mv/mv_localbus.c
  head/sys/arm/mv/mv_pci.c
  head/sys/arm/versatile/versatile_pci.c
  head/sys/arm/xscale/i8134x/i81342.c
  head/sys/arm/xscale/i8134x/i81342_pci.c
  head/sys/arm/xscale/i8134x/obio.c
  head/sys/arm/xscale/ixp425/avila_ata.c
  head/sys/arm/xscale/ixp425/ixp425.c
  head/sys/arm/xscale/ixp425/ixp425_pci.c
  head/sys/arm/xscale/pxa/pxa_obio.c
  head/sys/arm/xscale/pxa/pxa_smi.c
  head/sys/arm64/arm64/gic_v3_fdt.c
  head/sys/arm64/arm64/nexus.c
  head/sys/arm64/cavium/thunder_pcie.c
  head/sys/arm64/cavium/thunder_pcie_pem.c
  head/sys/dev/acpica/acpi.c
  head/sys/dev/acpica/acpi_hpet.c
  head/sys/dev/acpica/acpi_pcib_acpi.c
  head/sys/dev/acpica/acpi_resource.c
  head/sys/dev/acpica/acpi_timer.c
  head/sys/dev/acpica/acpivar.h
  head/sys/dev/advansys/adv_isa.c
  head/sys/dev/ahci/ahci.c
  head/sys/dev/ahci/ahci.h
  head/sys/dev/ata/ata-cbus.c
  head/sys/dev/ata/ata-isa.c
  head/sys/dev/ata/ata-pci.c
  head/sys/dev/ata/ata-pci.h
  head/sys/dev/atkbdc/atkbdc_ebus.c
  head/sys/dev/atkbdc/atkbdc_isa.c
  head/sys/dev/atkbdc/atkbdc_subr.c
  head/sys/dev/cs/if_cs.c
  head/sys/dev/ctau/if_ct.c
  head/sys/dev/cx/if_cx.c
  head/sys/dev/ed/if_ed_3c503.c
  head/sys/dev/ed/if_ed_cbus.c
  head/sys/dev/ed/if_ed_hpp.c
  head/sys/dev/ed/if_ed_wd80x3.c
  head/sys/dev/eisa/eisaconf.c
  head/sys/dev/fdt/simplebus.c
  head/sys/dev/fe/if_fe_cbus.c
  head/sys/dev/fe/if_fe_isa.c
  head/sys/dev/gpio/gpiobus.c
  head/sys/dev/mca/mca_bus.c
  head/sys/dev/mvs/mvs_pci.c
  head/sys/dev/mvs/mvs_soc.c
  head/sys/dev/ncv/ncr53c500_pccard.c
  head/sys/dev/nsp/nsp_pccard.c
  head/sys/dev/ofw/ofwbus.c
  head/sys/dev/pccard/pccard.c
  head/sys/dev/pccard/pccardvarp.h
  head/sys/dev/pccbb/pccbb.c
  head/sys/dev/pccbb/pccbb_pci.c
  head/sys/dev/pccbb/pccbbvar.h
  head/sys/dev/pcf/pcf_isa.c
  head/sys/dev/pci/hostb_pci.c
  head/sys/dev/pci/isa_pci.c
  head/sys/dev/pci/pci.c
  head/sys/dev/pci/pci_host_generic.c
  head/sys/dev/pci/pci_iov.c
  head/sys/dev/pci/pci_pci.c
  head/sys/dev/pci/pci_private.h
  head/sys/dev/pci/pci_subr.c
  head/sys/dev/pci/pcib_private.h
  head/sys/dev/pci/pcivar.h
  head/sys/dev/pci/vga_pci.c
  head/sys/dev/ppc/ppc.c
  head/sys/dev/ppc/ppcvar.h
  head/sys/dev/puc/puc.c
  head/sys/dev/puc/puc_bfe.h
  head/sys/dev/quicc/quicc_bfe.h
  head/sys/dev/quicc/quicc_core.c
  head/sys/dev/scc/scc_bfe.h
  head/sys/dev/scc/scc_core.c
  head/sys/dev/siba/siba.c
  head/sys/dev/siba/siba_bwn.c
  head/sys/dev/siba/siba_pcib.c
  head/sys/dev/siis/siis.c
  head/sys/dev/snc/if_snc_cbus.c
  head/sys/dev/sound/isa/gusc.c
  head/sys/dev/sound/isa/sbc.c
  head/sys/dev/sound/pci/csa.c
  head/sys/dev/sound/pci/fm801.c
  head/sys/dev/sound/pci/vibes.c
  head/sys/dev/stg/tmc18c30_subr.c
  head/sys/dev/wl/if_wl.c
  head/sys/isa/isa_common.c
  head/sys/isa/isa_common.h
  head/sys/kern/bus_if.m
  head/sys/kern/subr_bus.c
  head/sys/kern/subr_rman.c
  head/sys/mips/adm5120/admpci.c
  head/sys/mips/adm5120/obio.c
  head/sys/mips/alchemy/obio.c
  head/sys/mips/atheros/apb.c
  head/sys/mips/atheros/ar71xx_pci.c
  head/sys/mips/atheros/ar724x_pci.c
  head/sys/mips/atheros/qca955x_pci.c
  head/sys/mips/beri/beri_simplebus.c
  head/sys/mips/cavium/ciu.c
  head/sys/mips/cavium/obio.c
  head/sys/mips/cavium/octopci.c
  head/sys/mips/idt/idtpci.c
  head/sys/mips/idt/obio.c
  head/sys/mips/malta/gt.c
  head/sys/mips/malta/gt_pci.c
  head/sys/mips/malta/obio.c
  head/sys/mips/mips/cpu.c
  head/sys/mips/mips/nexus.c
  head/sys/mips/nlm/xlp_simplebus.c
  head/sys/mips/rmi/iodi.c
  head/sys/mips/rmi/xlr_pci.c
  head/sys/mips/rt305x/obio.c
  head/sys/mips/rt305x/rt305x_gpio.c
  head/sys/mips/rt305x/rt305x_pci.c
  head/sys/mips/sentry5/obio.c
  head/sys/mips/sibyte/sb_zbbus.c
  head/sys/mips/sibyte/sb_zbpci.c
  head/sys/pc98/pc98/canbus.c
  head/sys/powerpc/mpc85xx/lbc.c
  head/sys/powerpc/ofw/ofw_pci.c
  head/sys/powerpc/powermac/macgpio.c
  head/sys/powerpc/powermac/macio.c
  head/sys/powerpc/powermac/uninorth.c
  head/sys/powerpc/psim/ata_iobus.c
  head/sys/powerpc/psim/iobus.c
  head/sys/sparc64/central/central.c
  head/sys/sparc64/ebus/ebus.c
  head/sys/sparc64/fhc/fhc.c
  head/sys/sparc64/isa/isa.c
  head/sys/sparc64/pci/apb.c
  head/sys/sparc64/pci/fire.c
  head/sys/sparc64/pci/ofw_pci.c
  head/sys/sparc64/pci/psycho.c
  head/sys/sparc64/pci/sbbc.c
  head/sys/sparc64/pci/schizo.c
  head/sys/sparc64/sbus/sbus.c
  head/sys/sparc64/sparc64/nexus.c
  head/sys/sparc64/sparc64/upa.c
  head/sys/sys/_types.h
  head/sys/sys/bus.h
  head/sys/sys/rman.h
  head/sys/sys/types.h
  head/sys/x86/include/legacyvar.h
  head/sys/x86/include/pci_cfgreg.h
  head/sys/x86/isa/atrtc.c
  head/sys/x86/isa/clock.c
  head/sys/x86/isa/isa.c
  head/sys/x86/pci/pci_bus.c
  head/sys/x86/pci/qpi.c
  head/sys/x86/x86/mptable_pci.c
  head/sys/x86/x86/nexus.c

Modified: head/lib/libdevinfo/devinfo.3
==============================================================================
--- head/lib/libdevinfo/devinfo.3	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/lib/libdevinfo/devinfo.3	Wed Jan 27 02:23:54 2016	(r294883)
@@ -110,8 +110,8 @@ struct devinfo_dev {
 
 struct devinfo_rman {
     devinfo_handle_t	dm_handle;	/* resource manager handle */
-    u_long		dm_start;	/* resource start */
-    u_long		dm_size;	/* resource size */
+    rman_res_t		dm_start;	/* resource start */
+    rman_res_t		dm_size;	/* resource size */
     char		*dm_desc;	/* resource description */
 };
 
@@ -119,8 +119,8 @@ struct devinfo_res {
     devinfo_handle_t	dr_handle;	/* resource handle */
     devinfo_handle_t	dr_rman;	/* resource manager handle */
     devinfo_handle_t	dr_device;	/* owning device */
-    u_long		dr_start;	/* region start */
-    u_long		dr_size;	/* region size */
+    rman_res_t		dr_start;	/* region start */
+    rman_res_t		dr_size;	/* region size */
 };
 .Ed
 .Pp

Modified: head/lib/libdevinfo/devinfo.h
==============================================================================
--- head/lib/libdevinfo/devinfo.h	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/lib/libdevinfo/devinfo.h	Wed Jan 27 02:23:54 2016	(r294883)
@@ -56,8 +56,8 @@ struct devinfo_dev {
 struct devinfo_rman {
 	devinfo_handle_t	dm_handle;	/* resource manager handle */
 
-	unsigned long		dm_start;	/* resource start */
-	unsigned long		dm_size;	/* resource size */
+	rman_res_t		dm_start;	/* resource start */
+	rman_res_t		dm_size;	/* resource size */
     
 	char			*dm_desc;	/* resource description */
 };
@@ -67,8 +67,8 @@ struct devinfo_res {
 	devinfo_handle_t	dr_rman;	/* resource manager handle */
 	devinfo_handle_t	dr_device;	/* owning device */
 
-	unsigned long		dr_start;	/* region start */
-	unsigned long		dr_size;	/* region size */
+	rman_res_t		dr_start;	/* region start */
+	rman_res_t		dr_size;	/* region size */
 	/* XXX add flags */
 };
 

Modified: head/share/man/man9/bus_adjust_resource.9
==============================================================================
--- head/share/man/man9/bus_adjust_resource.9	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/share/man/man9/bus_adjust_resource.9	Wed Jan 27 02:23:54 2016	(r294883)
@@ -41,7 +41,8 @@
 .In sys/rman.h
 .In machine/resource.h
 .Ft int
-.Fn bus_adjust_resource "device_t dev" "int type" "struct resource *r" "u_long start" "u_long end"
+.Fo bus_adjust_resource
+.Fa "device_t dev" "int type" "struct resource *r" "rman_res_t start" "rman_res_t end"
 .Sh DESCRIPTION
 This function is used to ask the parent bus to adjust the resource range
 assigned to an allocated resource.

Modified: head/share/man/man9/bus_alloc_resource.9
==============================================================================
--- head/share/man/man9/bus_alloc_resource.9	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/share/man/man9/bus_alloc_resource.9	Wed Jan 27 02:23:54 2016	(r294883)
@@ -43,7 +43,10 @@
 .In sys/rman.h
 .In machine/resource.h
 .Ft struct resource *
-.Fn bus_alloc_resource "device_t dev" "int type" "int *rid" "u_long start" "u_long end" "u_long count" "u_int flags"
+.Fo bus_alloc_resource
+.Fa "device_t dev" "int type" "int *rid" "rman_res_t start" "rman_res_t end"
+.Fa "rman_res_t count" "u_int flags"
+.Fc
 .Ft struct resource *
 .Fn bus_alloc_resource_any "device_t dev" "int type" "int *rid" "u_int flags"
 .Sh DESCRIPTION

Modified: head/share/man/man9/bus_get_resource.9
==============================================================================
--- head/share/man/man9/bus_get_resource.9	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/share/man/man9/bus_get_resource.9	Wed Jan 27 02:23:54 2016	(r294883)
@@ -44,7 +44,7 @@
 .In sys/rman.h
 .Ft int
 .Fo bus_get_resource
-.Fa "device_t dev" "int type" "int rid" "u_long *startp" "u_long *countp"
+.Fa "device_t dev" "int type" "int rid" "rman_res_t *startp" "rman_res_t *countp"
 .Fc
 .Sh DESCRIPTION
 The

Modified: head/share/man/man9/bus_set_resource.9
==============================================================================
--- head/share/man/man9/bus_set_resource.9	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/share/man/man9/bus_set_resource.9	Wed Jan 27 02:23:54 2016	(r294883)
@@ -43,7 +43,7 @@
 .In machine/resource.h
 .Ft int
 .Fo bus_set_resource
-.Fa "device_t dev" "int type" "int rid" "u_long start" "u_long count"
+.Fa "device_t dev" "int type" "int rid" "rman_res_t start" "rman_res_t count"
 .Fc
 .Sh DESCRIPTION
 The

Modified: head/share/man/man9/rman.9
==============================================================================
--- head/share/man/man9/rman.9	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/share/man/man9/rman.9	Wed Jan 27 02:23:54 2016	(r294883)
@@ -65,7 +65,7 @@
 .Ft int
 .Fn rman_activate_resource "struct resource *r"
 .Ft int
-.Fn rman_adjust_resource "struct resource *r" "u_long start" "u_long end"
+.Fn rman_adjust_resource "struct resource *r" "rman_res_t start" "rman_res_t end"
 .Ft int
 .Fn rman_await_resource "struct resource *r" "int pri2" "int timo"
 .Ft int
@@ -79,32 +79,32 @@
 .Ft int
 .Fn rman_is_region_manager "struct resource *r" "struct rman *rm"
 .Ft int
-.Fn rman_manage_region "struct rman *rm" "u_long start" "u_long end"
+.Fn rman_manage_region "struct rman *rm" "rman_res_t start" "rman_res_t end"
 .Ft int
-.Fn rman_first_free_region "struct rman *rm" "u_long *start" "u_long *end"
+.Fn rman_first_free_region "struct rman *rm" "rman_res_t *start" "rman_res_t *end"
 .Ft int
-.Fn rman_last_free_region "struct rman *rm" "u_long *start" "u_long *end"
+.Fn rman_last_free_region "struct rman *rm" "rman_res_t *start" "rman_res_t *end"
 .Ft int
 .Fn rman_release_resource "struct resource *r"
 .Ft "struct resource *"
 .Fo rman_reserve_resource
-.Fa "struct rman *rm" "u_long start" "u_long end" "u_long count"
+.Fa "struct rman *rm" "rman_res_t start" "rman_res_t end" "rman_res_t count"
 .Fa "u_int flags" "struct device *dev"
 .Fc
 .Ft "struct resource *"
 .Fo rman_reserve_resource_bound
-.Fa "struct rman *rm" "u_long start" "u_long end" "u_long count"
-.Fa "u_long bound" "u_int flags" "struct device *dev"
+.Fa "struct rman *rm" "rman_res_t start" "rman_res_t end" "rman_res_t count"
+.Fa "rman_res_t bound" "u_int flags" "struct device *dev"
 .Fc
 .Ft uint32_t
 .Fn rman_make_alignment_flags "uint32_t size"
-.Ft u_long
+.Ft rman_res_t
 .Fn rman_get_start "struct resource *r"
-.Ft u_long
+.Ft rman_res_t
 .Fn rman_get_end "struct resource *r"
 .Ft "struct device *"
 .Fn rman_get_device "struct resource *r"
-.Ft u_long
+.Ft rman_res_t
 .Fn rman_get_size "struct resource *r"
 .Ft u_int
 .Fn rman_get_flags "struct resource *r"

Modified: head/sys/arm/arm/nexus.c
==============================================================================
--- head/sys/arm/arm/nexus.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/arm/nexus.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -82,7 +82,7 @@ static	int nexus_attach(device_t);
 static	int nexus_print_child(device_t, device_t);
 static	device_t nexus_add_child(device_t, u_int, const char *, int);
 static	struct resource *nexus_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 nexus_activate_resource(device_t, device_t, int, int,
     struct resource *);
 #ifdef ARM_INTRNG
@@ -212,7 +212,7 @@ nexus_add_child(device_t bus, u_int orde
  */
 static struct resource *
 nexus_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 resource *rv;
 	struct rman *rm;

Modified: head/sys/arm/at91/at91.c
==============================================================================
--- head/sys/arm/at91/at91.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/at91/at91.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -147,7 +147,7 @@ at91_attach(device_t dev)
 
 static struct resource *
 at91_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 at91_softc *sc = device_get_softc(dev);
 	struct resource_list_entry *rle;
@@ -255,7 +255,7 @@ at91_activate_resource(device_t bus, dev
     struct resource *r)
 {
 #if 0
-	u_long p;
+	rman_res_t p;
 	int error;
 	
 	if (type == SYS_RES_MEMORY) {

Modified: head/sys/arm/cavium/cns11xx/econa.c
==============================================================================
--- head/sys/arm/cavium/cns11xx/econa.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/cavium/cns11xx/econa.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -408,7 +408,7 @@ econa_attach(device_t dev)
 
 static struct resource *
 econa_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 econa_softc *sc = device_get_softc(dev);
 	struct resource_list_entry *rle;

Modified: head/sys/arm/mv/mv_localbus.c
==============================================================================
--- head/sys/arm/mv/mv_localbus.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/mv/mv_localbus.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -100,7 +100,7 @@ static int localbus_attach(device_t);
 static int localbus_print_child(device_t, device_t);
 
 static struct resource *localbus_alloc_resource(device_t, device_t, int,
-    int *, u_long, u_long, u_long, u_int);
+    int *, rman_res_t, rman_res_t, rman_res_t, u_int);
 static struct resource_list *localbus_get_resource_list(device_t, device_t);
 
 static ofw_bus_get_devinfo_t localbus_get_devinfo;
@@ -332,7 +332,7 @@ localbus_print_child(device_t dev, devic
 
 static struct resource *
 localbus_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 localbus_devinfo *di;
 	struct resource_list_entry *rle;

Modified: head/sys/arm/mv/mv_pci.c
==============================================================================
--- head/sys/arm/mv/mv_pci.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/mv/mv_pci.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -332,7 +332,7 @@ static int mv_pcib_probe(device_t);
 static int mv_pcib_attach(device_t);
 
 static struct resource *mv_pcib_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 mv_pcib_release_resource(device_t, device_t, int, int,
     struct resource *);
 static int mv_pcib_read_ivar(device_t, device_t, int, uintptr_t *);
@@ -830,7 +830,7 @@ mv_pcib_init_all_bars(struct mv_pcib_sof
 
 static struct resource *
 mv_pcib_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 mv_pcib_softc *sc = device_get_softc(dev);
 	struct rman *rm = NULL;

Modified: head/sys/arm/versatile/versatile_pci.c
==============================================================================
--- head/sys/arm/versatile/versatile_pci.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/versatile/versatile_pci.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -305,7 +305,7 @@ versatile_pci_write_ivar(device_t dev, d
 
 static struct resource *
 versatile_pci_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 versatile_pci_softc *sc = device_get_softc(bus);

Modified: head/sys/arm/xscale/i8134x/i81342.c
==============================================================================
--- head/sys/arm/xscale/i8134x/i81342.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/xscale/i8134x/i81342.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -409,7 +409,7 @@ i81342_attach(device_t dev)
 
 static struct resource *
 i81342_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 i81342_softc *sc = device_get_softc(dev);
 	struct resource *rv;

Modified: head/sys/arm/xscale/i8134x/i81342_pci.c
==============================================================================
--- head/sys/arm/xscale/i8134x/i81342_pci.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/xscale/i8134x/i81342_pci.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -328,7 +328,7 @@ i81342_pci_write_config(device_t dev, u_
 
 static struct resource *
 i81342_pci_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 i81342_pci_softc *sc = device_get_softc(bus);	
 	struct resource *rv;
@@ -383,7 +383,7 @@ static int
 i81342_pci_activate_resource(device_t bus, device_t child, int type, int rid,
     struct resource *r)
 {
-	u_long p;
+	bus_space_handle_t p;
 	int error;
 	
 	if (type == SYS_RES_MEMORY) {

Modified: head/sys/arm/xscale/i8134x/obio.c
==============================================================================
--- head/sys/arm/xscale/i8134x/obio.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/xscale/i8134x/obio.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -91,7 +91,7 @@ obio_attach(device_t dev)
 
 static struct resource *
 obio_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 resource *rv;
 	struct rman *rm;

Modified: head/sys/arm/xscale/ixp425/avila_ata.c
==============================================================================
--- head/sys/arm/xscale/ixp425/avila_ata.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/xscale/ixp425/avila_ata.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -282,7 +282,7 @@ ata_avila_intr(void *xsc)
 
 static struct resource *
 ata_avila_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 ata_avila_softc *sc = device_get_softc(dev);
 

Modified: head/sys/arm/xscale/ixp425/ixp425.c
==============================================================================
--- head/sys/arm/xscale/ixp425/ixp425.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/xscale/ixp425/ixp425.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -496,7 +496,7 @@ getvbase(uint32_t hwbase, uint32_t size,
 
 static struct resource *
 ixp425_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 ixp425_softc *sc = device_get_softc(dev);
 	const struct hwvtrans *vtrans;

Modified: head/sys/arm/xscale/ixp425/ixp425_pci.c
==============================================================================
--- head/sys/arm/xscale/ixp425/ixp425_pci.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/xscale/ixp425/ixp425_pci.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -269,7 +269,7 @@ ixppcib_teardown_intr(device_t dev, devi
 
 static struct resource *
 ixppcib_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 ixppcib_softc *sc = device_get_softc(bus);
 	struct rman *rmanp;

Modified: head/sys/arm/xscale/pxa/pxa_obio.c
==============================================================================
--- head/sys/arm/xscale/pxa/pxa_obio.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/xscale/pxa/pxa_obio.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -50,14 +50,14 @@ static int	pxa_read_ivar(device_t, devic
 
 static struct resource_list *	pxa_get_resource_list(device_t, device_t);
 static struct resource *	pxa_alloc_resource(device_t, device_t, int,
-				    int *, u_long, u_long, u_long, u_int);
+				    int *, rman_res_t, rman_res_t, rman_res_t, u_int);
 static int			pxa_release_resource(device_t, device_t, int,
 				    int, struct resource *);
 static int			pxa_activate_resource(device_t, device_t,
 				    int, int, struct resource *);
 
 static struct resource *	pxa_alloc_gpio_irq(device_t, device_t, int,
-				    int *, u_long, u_long, u_long, u_int);
+				    int *, rman_res_t, rman_res_t, rman_res_t, u_int);
 
 struct obio_device {
 	const char	*od_name;
@@ -224,7 +224,7 @@ pxa_get_resource_list(device_t dev, devi
 
 static struct resource *
 pxa_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	obio_softc *sc;
 	struct	obio_device *od;
@@ -351,7 +351,7 @@ DRIVER_MODULE(pxa, nexus, pxa_driver, px
 
 static struct resource *
 pxa_alloc_gpio_irq(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	obio_softc *sc;
 	struct	obio_device *od;

Modified: head/sys/arm/xscale/pxa/pxa_smi.c
==============================================================================
--- head/sys/arm/xscale/pxa/pxa_smi.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm/xscale/pxa/pxa_smi.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -70,7 +70,7 @@ static int	pxa_smi_print_child(device_t,
 static int	pxa_smi_read_ivar(device_t, device_t, int, uintptr_t *);
 
 static struct resource *	pxa_smi_alloc_resource(device_t, device_t,
-				    int, int *, u_long, u_long, u_long, u_int);
+				    int, int *, rman_res_t, rman_res_t, rman_res_t, u_int);
 static int			pxa_smi_release_resource(device_t, device_t,
 				    int, int, struct resource *);
 static int			pxa_smi_activate_resource(device_t, device_t,
@@ -176,7 +176,7 @@ pxa_smi_read_ivar(device_t dev, device_t
 
 static struct resource *
 pxa_smi_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	pxa_smi_softc *sc;
 	struct	smi_ivars *smid;

Modified: head/sys/arm64/arm64/gic_v3_fdt.c
==============================================================================
--- head/sys/arm64/arm64/gic_v3_fdt.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm64/arm64/gic_v3_fdt.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -54,7 +54,7 @@ static int gic_v3_fdt_probe(device_t);
 static int gic_v3_fdt_attach(device_t);
 
 static struct resource *gic_v3_ofw_bus_alloc_res(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 const struct ofw_bus_devinfo *gic_v3_ofw_get_devinfo(device_t, device_t);
 
 static device_method_t gic_v3_fdt_methods[] = {
@@ -174,7 +174,7 @@ gic_v3_ofw_get_devinfo(device_t bus __un
 
 static struct resource *
 gic_v3_ofw_bus_alloc_res(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 gic_v3_ofw_devinfo *di;
 	struct resource_list_entry *rle;

Modified: head/sys/arm64/arm64/nexus.c
==============================================================================
--- head/sys/arm64/arm64/nexus.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm64/arm64/nexus.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -99,13 +99,14 @@ static device_attach_t	nexus_acpi_attach
 static	int nexus_print_child(device_t, device_t);
 static	device_t nexus_add_child(device_t, u_int, const char *, int);
 static	struct resource *nexus_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 nexus_activate_resource(device_t, device_t, int, int,
     struct resource *);
 static int nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
     enum intr_polarity pol);
 static struct resource_list *nexus_get_reslist(device_t, device_t);
-static	int nexus_set_resource(device_t, device_t, int, int, u_long, u_long);
+static	int nexus_set_resource(device_t, device_t, int, int,
+    rman_res_t, rman_res_t);
 static	int nexus_deactivate_resource(device_t, device_t, int, int,
     struct resource *);
 
@@ -201,7 +202,7 @@ nexus_add_child(device_t bus, u_int orde
  */
 static struct resource *
 nexus_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 nexus_device *ndev = DEVTONX(child);
 	struct resource *rv;
@@ -332,7 +333,7 @@ nexus_get_reslist(device_t dev, device_t
 
 static int
 nexus_set_resource(device_t dev, device_t child, int type, int rid,
-    u_long start, u_long count)
+    rman_res_t start, rman_res_t count)
 {
 	struct nexus_device	*ndev = DEVTONX(child);
 	struct resource_list	*rl = &ndev->nx_resources;

Modified: head/sys/arm64/cavium/thunder_pcie.c
==============================================================================
--- head/sys/arm64/cavium/thunder_pcie.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm64/cavium/thunder_pcie.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -110,7 +110,7 @@ SYSCTL_INT(_hw, OID_AUTO, thunder_pcie_m
 
 /* Forward prototypes */
 static struct resource *thunder_pcie_alloc_resource(device_t,
-    device_t, int, int *, u_long, u_long, u_long, u_int);
+    device_t, int, int *, rman_res_t, rman_res_t, rman_res_t, u_int);
 static int thunder_pcie_attach(device_t);
 static int thunder_pcie_identify_pcib(device_t);
 static int thunder_pcie_maxslots(device_t);
@@ -431,7 +431,7 @@ thunder_pcie_release_resource(device_t d
 
 static struct resource *
 thunder_pcie_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 thunder_pcie_softc *sc = device_get_softc(dev);
 	struct rman *rm = NULL;
@@ -519,7 +519,7 @@ static int
 thunder_pcie_identify_pcib(device_t dev)
 {
 	struct thunder_pcie_softc *sc;
-	u_long start;
+	rman_res_t start;
 
 	sc = device_get_softc(dev);
 	start = bus_get_resource_start(dev, SYS_RES_MEMORY, 0);

Modified: head/sys/arm64/cavium/thunder_pcie_pem.c
==============================================================================
--- head/sys/arm64/cavium/thunder_pcie_pem.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/arm64/cavium/thunder_pcie_pem.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -126,7 +126,7 @@ struct thunder_pem_softc {
 };
 
 static struct resource * thunder_pem_alloc_resource(device_t, device_t, int,
-    int *, u_long, u_long, u_long, u_int);
+    int *, rman_res_t, rman_res_t, rman_res_t, u_int);
 static int thunder_pem_attach(device_t);
 static int thunder_pem_detach(device_t);
 static uint64_t thunder_pem_config_reg_read(struct thunder_pem_softc *, int);
@@ -230,7 +230,7 @@ static int
 thunder_pem_identify(device_t dev)
 {
 	struct thunder_pem_softc *sc;
-	u_long start;
+	rman_res_t start;
 
 	sc = device_get_softc(dev);
 	start = rman_get_start(sc->reg);
@@ -426,7 +426,7 @@ thunder_pem_write_config(device_t dev, u
 
 static struct resource *
 thunder_pem_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 thunder_pem_softc *sc = device_get_softc(dev);
 	struct rman *rm = NULL;

Modified: head/sys/dev/acpica/acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/acpica/acpi.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -121,12 +121,12 @@ static struct resource_list *acpi_get_rl
 static void	acpi_reserve_resources(device_t dev);
 static int	acpi_sysres_alloc(device_t dev);
 static int	acpi_set_resource(device_t dev, device_t child, int type,
-			int rid, u_long start, u_long count);
+			int rid, rman_res_t start, rman_res_t count);
 static struct resource *acpi_alloc_resource(device_t bus, device_t child,
-			int type, int *rid, u_long start, u_long end,
-			u_long count, u_int flags);
+			int type, int *rid, rman_res_t start, rman_res_t end,
+			rman_res_t count, u_int flags);
 static int	acpi_adjust_resource(device_t bus, device_t child, int type,
-			struct resource *r, u_long start, u_long end);
+			struct resource *r, rman_res_t start, rman_res_t end);
 static int	acpi_release_resource(device_t bus, device_t child, int type,
 			int rid, struct resource *r);
 static void	acpi_delete_resource(device_t bus, device_t child, int type,
@@ -1247,13 +1247,13 @@ acpi_reserve_resources(device_t dev)
 
 static int
 acpi_set_resource(device_t dev, device_t child, int type, int rid,
-    u_long start, u_long count)
+    rman_res_t start, rman_res_t count)
 {
     struct acpi_softc *sc = device_get_softc(dev);
     struct acpi_device *ad = device_get_ivars(child);
     struct resource_list *rl = &ad->ad_rl;
     ACPI_DEVICE_INFO *devinfo;
-    u_long end;
+    rman_res_t end;
     
     /* Ignore IRQ resources for PCI link devices. */
     if (type == SYS_RES_IRQ && ACPI_ID_PROBE(dev, child, pcilink_ids) != NULL)
@@ -1323,7 +1323,7 @@ acpi_set_resource(device_t dev, device_t
 
 static struct resource *
 acpi_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)
 {
     ACPI_RESOURCE ares;
     struct acpi_device *ad;
@@ -1399,8 +1399,8 @@ acpi_alloc_resource(device_t bus, device
  * system resources.
  */
 struct resource *
-acpi_alloc_sysres(device_t child, int type, int *rid, u_long start, u_long end,
-    u_long count, u_int flags)
+acpi_alloc_sysres(device_t child, int type, int *rid, rman_res_t start,
+    rman_res_t end, rman_res_t count, u_int flags)
 {
     struct rman *rm;
     struct resource *res;
@@ -1450,7 +1450,7 @@ acpi_is_resource_managed(int type, struc
 
 static int
 acpi_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
-    u_long start, u_long end)
+    rman_res_t start, rman_res_t end)
 {
 
     if (acpi_is_resource_managed(type, r))

Modified: head/sys/dev/acpica/acpi_hpet.c
==============================================================================
--- head/sys/dev/acpica/acpi_hpet.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/acpica/acpi_hpet.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -322,7 +322,7 @@ hpet_find(ACPI_HANDLE handle, UINT32 lev
 static int
 hpet_find_irq_rid(device_t dev, u_long start, u_long end)
 {
-	u_long irq;
+	rman_res_t irq;
 	int error, rid;
 
 	for (rid = 0;; rid++) {

Modified: head/sys/dev/acpica/acpi_pcib_acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi_pcib_acpi.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/acpica/acpi_pcib_acpi.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -91,12 +91,12 @@ static int		acpi_pcib_alloc_msix(device_
 			    int *irq);
 static struct resource *acpi_pcib_acpi_alloc_resource(device_t dev,
 			    device_t child, int type, int *rid,
-			    u_long start, u_long end, u_long count,
+			    rman_res_t start, rman_res_t end, rman_res_t count,
 			    u_int flags);
 #ifdef NEW_PCIB
 static int		acpi_pcib_acpi_adjust_resource(device_t dev,
 			    device_t child, int type, struct resource *r,
-			    u_long start, u_long end);
+			    rman_res_t start, rman_res_t end);
 #ifdef PCI_RES_BUS
 static int		acpi_pcib_acpi_release_resource(device_t dev,
 			    device_t child, int type, int rid,
@@ -283,7 +283,7 @@ acpi_pcib_producer_handler(ACPI_RESOURCE
 
 #if defined(NEW_PCIB) && defined(PCI_RES_BUS)
 static int
-first_decoded_bus(struct acpi_hpcib_softc *sc, u_long *startp)
+first_decoded_bus(struct acpi_hpcib_softc *sc, rman_res_t *startp)
 {
 	struct resource_list_entry *rle;
 
@@ -304,7 +304,7 @@ acpi_pcib_acpi_attach(device_t dev)
     u_int slot, func, busok;
 #if defined(NEW_PCIB) && defined(PCI_RES_BUS)
     struct resource *bus_res;
-    u_long start;
+    rman_res_t start;
     int rid;
 #endif
     uint8_t busno;
@@ -584,7 +584,7 @@ acpi_pcib_map_msi(device_t pcib, device_
 
 struct resource *
 acpi_pcib_acpi_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)
 {
 #ifdef NEW_PCIB
     struct acpi_hpcib_softc *sc;
@@ -625,7 +625,7 @@ acpi_pcib_acpi_alloc_resource(device_t d
 #ifdef NEW_PCIB
 int
 acpi_pcib_acpi_adjust_resource(device_t dev, device_t child, int type,
-    struct resource *r, u_long start, u_long end)
+    struct resource *r, rman_res_t start, rman_res_t end)
 {
 	struct acpi_hpcib_softc *sc;
 

Modified: head/sys/dev/acpica/acpi_resource.c
==============================================================================
--- head/sys/dev/acpica/acpi_resource.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/acpica/acpi_resource.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -671,7 +671,7 @@ acpi_sysres_attach(device_t dev)
     struct resource_list_entry *bus_rle, *dev_rle;
     struct resource_list *bus_rl, *dev_rl;
     int done, type;
-    u_long start, end, count;
+    rman_res_t start, end, count;
 
     /*
      * Loop through all current resources to see if the new one overlaps

Modified: head/sys/dev/acpica/acpi_timer.c
==============================================================================
--- head/sys/dev/acpica/acpi_timer.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/acpica/acpi_timer.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -122,7 +122,7 @@ static void
 acpi_timer_identify(driver_t *driver, device_t parent)
 {
     device_t dev;
-    u_long rlen, rstart;
+    rman_res_t rlen, rstart;
     int rid, rtype;
 
     ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);

Modified: head/sys/dev/acpica/acpivar.h
==============================================================================
--- head/sys/dev/acpica/acpivar.h	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/acpica/acpivar.h	Wed Jan 27 02:23:54 2016	(r294883)
@@ -383,7 +383,8 @@ ACPI_STATUS	acpi_lookup_irq_resource(dev
 ACPI_STATUS	acpi_parse_resources(device_t dev, ACPI_HANDLE handle,
 		    struct acpi_parse_resource_set *set, void *arg);
 struct resource *acpi_alloc_sysres(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);
 
 /* ACPI event handling */
 UINT32		acpi_event_power_button_sleep(void *context);

Modified: head/sys/dev/advansys/adv_isa.c
==============================================================================
--- head/sys/dev/advansys/adv_isa.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/advansys/adv_isa.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -109,7 +109,7 @@ adv_isa_probe(device_t dev)
 {
 	int	port_index;
 	int	max_port_index;
-	u_long	iobase, iocount, irq;
+	rman_res_t	iobase, iocount, irq;
 	int	user_iobase = 0;
 	int	rid = 0;
 	void	*ih;

Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/ahci/ahci.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -523,7 +523,7 @@ ahci_intr_one_edge(void *data)
 
 struct resource *
 ahci_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 ahci_controller *ctlr = device_get_softc(dev);
 	struct resource *res;

Modified: head/sys/dev/ahci/ahci.h
==============================================================================
--- head/sys/dev/ahci/ahci.h	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/ahci/ahci.h	Wed Jan 27 02:23:54 2016	(r294883)
@@ -626,7 +626,7 @@ int ahci_detach(device_t dev);
 int ahci_setup_interrupt(device_t dev);
 int ahci_print_child(device_t dev, device_t child);
 struct resource *ahci_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);
 int ahci_release_resource(device_t dev, device_t child, int type, int rid,
     struct resource *r);
 int ahci_setup_intr(device_t dev, device_t child, struct resource *irq, 

Modified: head/sys/dev/ata/ata-cbus.c
==============================================================================
--- head/sys/dev/ata/ata-cbus.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/ata/ata-cbus.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -67,7 +67,7 @@ ata_cbus_probe(device_t dev)
 {
     struct resource *io;
     int rid;
-    u_long tmp;
+    rman_res_t tmp;
 
     /* dont probe PnP devices */
     if (isa_get_vendorid(dev))
@@ -168,7 +168,8 @@ ata_cbus_attach(device_t dev)
 
 static struct resource *
 ata_cbus_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 ata_cbus_controller *ctlr = device_get_softc(dev);
 

Modified: head/sys/dev/ata/ata-isa.c
==============================================================================
--- head/sys/dev/ata/ata-isa.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/ata/ata-isa.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -60,7 +60,7 @@ static int
 ata_isa_probe(device_t dev)
 {
     struct resource *io = NULL, *ctlio = NULL;
-    u_long tmp;
+    rman_res_t tmp;
     int rid;
 
     /* check isapnp ids */
@@ -100,7 +100,7 @@ ata_isa_attach(device_t dev)
 {
     struct ata_channel *ch = device_get_softc(dev);
     struct resource *io = NULL, *ctlio = NULL;
-    u_long tmp;
+    rman_res_t tmp;
     int i, rid;
 
     if (ch->attached)

Modified: head/sys/dev/ata/ata-pci.c
==============================================================================
--- head/sys/dev/ata/ata-pci.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/ata/ata-pci.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -217,7 +217,8 @@ ata_pci_write_config(device_t dev, devic
 
 struct resource *
 ata_pci_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 ata_pci_controller *controller = device_get_softc(dev);
 	struct resource *res = NULL;

Modified: head/sys/dev/ata/ata-pci.h
==============================================================================
--- head/sys/dev/ata/ata-pci.h	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/ata/ata-pci.h	Wed Jan 27 02:23:54 2016	(r294883)
@@ -535,7 +535,7 @@ void ata_pci_write_config(device_t dev, 
 int ata_pci_print_child(device_t dev, device_t child);
 int ata_pci_child_location_str(device_t dev, device_t child, char *buf,
     size_t buflen);
-struct resource * ata_pci_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags);
+struct resource * ata_pci_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags);
 int ata_pci_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r);
 int ata_pci_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, driver_filter_t *filter, driver_intr_t *function, void *argument, void **cookiep);
  int ata_pci_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie);

Modified: head/sys/dev/atkbdc/atkbdc_ebus.c
==============================================================================
--- head/sys/dev/atkbdc/atkbdc_ebus.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/atkbdc/atkbdc_ebus.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -91,7 +91,7 @@ static int
 atkbdc_ebus_probe(device_t dev)
 {
 	struct resource *port0, *port1;
-	u_long count, start;
+	rman_res_t count, start;
 	int error, rid;
 
 	if (strcmp(ofw_bus_get_name(dev), "8042") != 0)
@@ -176,7 +176,7 @@ atkbdc_ebus_attach(device_t dev)
 	atkbdc_device_t *adi;
 	device_t cdev;
 	phandle_t child;
-	u_long count, intr, start;
+	rman_res_t count, intr, start;
 	int children, error, rid, unit;
 	char *cname, *dname;
 

Modified: head/sys/dev/atkbdc/atkbdc_isa.c
==============================================================================
--- head/sys/dev/atkbdc/atkbdc_isa.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/atkbdc/atkbdc_isa.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -50,8 +50,8 @@ static int	atkbdc_isa_attach(device_t de
 static device_t	atkbdc_isa_add_child(device_t bus, u_int order, const char *name,
 		    int unit);
 static struct resource *atkbdc_isa_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 type, int *rid, rman_res_t start, rman_res_t end,
+		    rman_res_t count, u_int flags);
 static int	atkbdc_isa_release_resource(device_t dev, device_t child,
 		    int type, int rid, struct resource *r);
 
@@ -97,8 +97,8 @@ atkbdc_isa_probe(device_t dev)
 {
 	struct resource	*port0;
 	struct resource	*port1;
-	u_long		start;
-	u_long		count;
+	rman_res_t	start;
+	rman_res_t	count;
 	int		error;
 	int		rid;
 #if defined(__i386__) || defined(__amd64__)
@@ -295,7 +295,7 @@ atkbdc_isa_add_child(device_t bus, u_int
 
 struct resource *
 atkbdc_isa_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)
 {
 	atkbdc_softc_t	*sc;
 	

Modified: head/sys/dev/atkbdc/atkbdc_subr.c
==============================================================================
--- head/sys/dev/atkbdc/atkbdc_subr.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/atkbdc/atkbdc_subr.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -51,7 +51,7 @@ int
 atkbdc_print_child(device_t bus, device_t dev)
 {
 	atkbdc_device_t *kbdcdev;
-	u_long irq;
+	rman_res_t irq;
 	int flags;
 	int retval = 0;
 

Modified: head/sys/dev/cs/if_cs.c
==============================================================================
--- head/sys/dev/cs/if_cs.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/cs/if_cs.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -258,7 +258,7 @@ cs_cs89x0_probe(device_t dev)
 {
 	int i;
 	int error;
-	u_long irq, junk;
+	rman_res_t irq, junk;
 	struct cs_softc *sc = device_get_softc(dev);
 	unsigned rev_type = 0;
 	uint16_t id;

Modified: head/sys/dev/ctau/if_ct.c
==============================================================================
--- head/sys/dev/ctau/if_ct.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/ctau/if_ct.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -317,8 +317,8 @@ static	short porttab [] = {
 static	char dmatab [] = { 7, 6, 5, 0 };
 static	char irqtab [] = { 5, 10, 11, 7, 3, 15, 12, 0 };
 
-static int ct_is_free_res (device_t dev, int rid, int type, u_long start,
-	u_long end, u_long count)
+static int ct_is_free_res (device_t dev, int rid, int type, rman_res_t start,
+	rman_res_t end, rman_res_t count)
 {
 	struct resource *res;
 	
@@ -332,7 +332,7 @@ static int ct_is_free_res (device_t dev,
 
 static void ct_identify (driver_t *driver, device_t dev)
 {
-	u_long iobase, rescount;
+	rman_res_t iobase, rescount;
 	int devcount;
 	device_t *devices;
 	device_t child;
@@ -440,7 +440,7 @@ static void ct_identify (driver_t *drive
 static int ct_probe (device_t dev)
 {
 	int unit = device_get_unit (dev);
-	u_long iobase, rescount;
+	rman_res_t iobase, rescount;
 
 	if (!device_get_desc (dev) ||
 	    strcmp (device_get_desc (dev), "Cronyx Tau-ISA"))
@@ -529,7 +529,7 @@ ct_bus_dma_mem_free (ct_dma_mem_t *dmem)
 static int ct_attach (device_t dev)
 {
 	bdrv_t *bd = device_get_softc (dev);
-	u_long iobase, drq, irq, rescount;
+	rman_res_t iobase, drq, irq, rescount;
 	int unit = device_get_unit (dev);
 	char *ct_ln = CT_LOCK_NAME;
 	ct_board_t *b;

Modified: head/sys/dev/cx/if_cx.c
==============================================================================
--- head/sys/dev/cx/if_cx.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/cx/if_cx.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -405,8 +405,8 @@ static short porttab [] = {
 static char dmatab [] = { 7, 6, 5, 0 };
 static char irqtab [] = { 5, 10, 11, 7, 3, 15, 12, 0 };
 
-static int cx_is_free_res (device_t dev, int rid, int type, u_long start,
-	u_long end, u_long count)
+static int cx_is_free_res (device_t dev, int rid, int type, rman_res_t start,
+	rman_res_t end, rman_res_t count)
 {
 	struct resource *res;
 	
@@ -420,7 +420,7 @@ static int cx_is_free_res (device_t dev,
 
 static void cx_identify (driver_t *driver, device_t dev)
 {
-	u_long iobase, rescount;
+	rman_res_t iobase, rescount;
 	int devcount;
 	device_t *devices;
 	device_t child;
@@ -530,7 +530,7 @@ static int cx_probe (device_t dev)
 {
 	int unit = device_get_unit (dev);
 	int i;
-	u_long iobase, rescount;
+	rman_res_t iobase, rescount;
 
 	if (!device_get_desc (dev) ||
 	    strcmp (device_get_desc (dev), "Cronyx Sigma"))
@@ -629,7 +629,7 @@ cx_bus_dma_mem_free (cx_dma_mem_t *dmem)
 static int cx_attach (device_t dev)
 {
 	bdrv_t *bd = device_get_softc (dev);
-	u_long iobase, drq, irq, rescount;
+	rman_res_t iobase, drq, irq, rescount;
 	int unit = device_get_unit (dev);
 	char *cx_ln = CX_LOCK_NAME;
 	cx_board_t *b;

Modified: head/sys/dev/ed/if_ed_3c503.c
==============================================================================
--- head/sys/dev/ed/if_ed_3c503.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/ed/if_ed_3c503.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -74,7 +74,7 @@ ed_probe_3Com(device_t dev, int port_rid
 	int     i;
 	u_int   memsize;
 	u_char  isa16bit;
-	u_long	conf_maddr, conf_msize, irq, junk, pmem;
+	rman_res_t	conf_maddr, conf_msize, irq, junk, pmem;
 
 	error = ed_alloc_port(dev, 0, ED_3COM_IO_PORTS);
 	if (error)

Modified: head/sys/dev/ed/if_ed_cbus.c
==============================================================================
--- head/sys/dev/ed/if_ed_cbus.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/ed/if_ed_cbus.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -607,7 +607,7 @@ ed98_alloc_memory(dev, rid)
 {
 	struct ed_softc *sc = device_get_softc(dev);
 	int error;
-	u_long conf_maddr, conf_msize;
+	rman_res_t conf_maddr, conf_msize;
 
 	error = bus_get_resource(dev, SYS_RES_MEMORY, 0, &conf_maddr,
 	    &conf_msize);
@@ -1001,7 +1001,7 @@ ed_probe_CNET98(device_t dev, int port_r
 	struct ed_softc *sc = device_get_softc(dev);
 	int error;
 	u_char tmp;
-	u_long conf_irq, junk;
+	rman_res_t conf_irq, junk;
 #ifdef DIAGNOSTIC
 	u_char tmp_s;
 #endif
@@ -1157,7 +1157,7 @@ ed_probe_CNET98EL(device_t dev, int port
 	int error;
 	int i;
 	u_char romdata[ETHER_ADDR_LEN * 2], tmp;
-	u_long conf_irq, junk;
+	rman_res_t conf_irq, junk;
 
 	error = ed98_alloc_port(dev, port_rid);
 	if (error)
@@ -1251,7 +1251,7 @@ ed_probe_NEC77(device_t dev, int port_ri
 	struct ed_softc *sc = device_get_softc(dev);
 	int error;
 	u_char tmp;
-	u_long conf_irq, junk;
+	rman_res_t conf_irq, junk;
 
 	error = ed98_probe_Novell(dev, port_rid, flags);
 	if (error)
@@ -1303,7 +1303,7 @@ ed_probe_NW98X(device_t dev, int port_ri
 	struct ed_softc *sc = device_get_softc(dev);
 	int error;
 	u_char tmp;
-	u_long conf_irq, junk;
+	rman_res_t conf_irq, junk;
 
 	error = ed98_probe_Novell(dev, port_rid, flags);
 	if (error)
@@ -1427,7 +1427,7 @@ ed_probe_SB98(device_t dev, int port_rid
 	struct ed_softc *sc = device_get_softc(dev);
 	int error;
 	u_char tmp;
-	u_long conf_irq, junk;
+	rman_res_t conf_irq, junk;
 
 	error = ed98_alloc_port(dev, port_rid);
 	if (error)

Modified: head/sys/dev/ed/if_ed_hpp.c
==============================================================================
--- head/sys/dev/ed/if_ed_hpp.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/ed/if_ed_hpp.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -126,7 +126,7 @@ ed_probe_HP_pclanp(device_t dev, int por
 	u_char irq;			/* board configured IRQ */
 	uint8_t test_pattern[ED_HPP_TEST_SIZE];	/* read/write areas for */
 	uint8_t test_buffer[ED_HPP_TEST_SIZE];	/* probing card */
-	u_long conf_maddr, conf_msize, conf_irq, junk;
+	rman_res_t conf_maddr, conf_msize, conf_irq, junk;
 
 	error = ed_alloc_port(dev, 0, ED_HPP_IO_PORTS);
 	if (error)

Modified: head/sys/dev/ed/if_ed_wd80x3.c
==============================================================================
--- head/sys/dev/ed/if_ed_wd80x3.c	Wed Jan 27 02:22:31 2016	(r294882)
+++ head/sys/dev/ed/if_ed_wd80x3.c	Wed Jan 27 02:23:54 2016	(r294883)
@@ -97,7 +97,7 @@ ed_probe_WD80x3_generic(device_t dev, in
 	int     i;
 	u_int   memsize;
 	u_char  iptr, isa16bit, sum, totalsum;
-	u_long	irq, junk, pmem;
+	rman_res_t	irq, junk, pmem;
 
 	sc->chip_type = ED_CHIP_TYPE_DP8390;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601270223.u0R2NsQj062076>