src - FreeBSD source tree

diff options


context:
space:
mode:

author	Justin Hibbits <jhibbits@FreeBSD.org>	2016-02-20 01:32:58 +0000
committer	Justin Hibbits <jhibbits@FreeBSD.org>	2016-02-20 01:32:58 +0000
commit	7915adb56014e31e8ed8a4418060625c2e223fc0 (patch)
tree	1d99680c416ab999716f7e3fb78956be8804e81f /sys/mips
parent	2bc4747cc49351d47d2bdacd5c5d82bf4b44474b (diff)
download	src-7915adb56014e31e8ed8a4418060625c2e223fc0.tar.gz src-7915adb56014e31e8ed8a4418060625c2e223fc0.zip

Introduce a RMAN_IS_DEFAULT_RANGE() macro, and use it.

This simplifies checking for default resource range for bus_alloc_resource(), and improves readability. This is part of, and related to, the migration of rman_res_t from u_long to uintmax_t. Discussed with: jhb Suggested by: marcel

Notes

Notes: svn path=/head/; revision=295832

Diffstat (limited to 'sys/mips')

-rw-r--r--

sys/mips/adm5120/obio.c

-rw-r--r--

sys/mips/alchemy/obio.c

-rw-r--r--

sys/mips/atheros/apb.c

-rw-r--r--

sys/mips/beri/beri_simplebus.c

-rw-r--r--

sys/mips/idt/obio.c

-rw-r--r--

sys/mips/mips/nexus.c

-rw-r--r--

sys/mips/nlm/xlp_simplebus.c

-rw-r--r--

sys/mips/rt305x/obio.c

-rw-r--r--

sys/mips/sibyte/sb_zbbus.c

9 files changed, 9 insertions, 9 deletions

diff --git a/sys/mips/adm5120/obio.c b/sys/mips/adm5120/obio.c
index 46c09b7ab8ee..8b62629c977a 100644
--- a/sys/mips/adm5120/obio.c
+++ b/sys/mips/adm5120/obio.c

@@ -231,7 +231,7 @@ obio_alloc_resource(device_t bus, device_t child, int type, int *rid,

struct rman *rm;

int isdefault, needactivate, passthrough;

- isdefault = (start == 0UL && end == ~0UL && count == 1);

+ isdefault = (RMAN_IS_DEFAULT_RANGE(start, end) && count == 1);

needactivate = flags & RF_ACTIVE;

passthrough = (device_get_parent(child) != bus);

rle = NULL;

diff --git a/sys/mips/alchemy/obio.c b/sys/mips/alchemy/obio.c
index 3c0fecbdac16..96b1f1d75b39 100644
--- a/sys/mips/alchemy/obio.c
+++ b/sys/mips/alchemy/obio.c

@@ -232,7 +232,7 @@ obio_alloc_resource(device_t bus, device_t child, int type, int *rid,

struct rman *rm;

int isdefault, needactivate, passthrough;

- isdefault = (start == 0UL && end == ~0UL && count == 1);

+ isdefault = (RMAN_IS_DEFAULT_RANGE(start, end) && count == 1);

needactivate = flags & RF_ACTIVE;

passthrough = (device_get_parent(child) != bus);

rle = NULL;

diff --git a/sys/mips/atheros/apb.c b/sys/mips/atheros/apb.c
index c072567854c8..8d230a7f1bf6 100644
--- a/sys/mips/atheros/apb.c
+++ b/sys/mips/atheros/apb.c

@@ -170,7 +170,7 @@ apb_alloc_resource(device_t bus, device_t child, int type, int *rid,

struct rman *rm;

int isdefault, needactivate, passthrough;

- isdefault = (start == 0UL && end == ~0UL);

+ isdefault = (RMAN_IS_DEFAULT_RANGE(start, end));

needactivate = flags & RF_ACTIVE;

* Pass memory requests to nexus device

diff --git a/sys/mips/beri/beri_simplebus.c b/sys/mips/beri/beri_simplebus.c
index 31771a5617f2..dd219a5e1282 100644
--- a/sys/mips/beri/beri_simplebus.c
+++ b/sys/mips/beri/beri_simplebus.c

@@ -260,7 +260,7 @@ simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid,

* Request for the default allocation with a given rid: use resource

* list stored in the local device info.

- if ((start == 0UL) && (end == ~0UL)) {

+ if (RMAN_IS_DEFAULT_RANGE(start, end)) {

if ((di = device_get_ivars(child)) == NULL)

return (NULL);

diff --git a/sys/mips/idt/obio.c b/sys/mips/idt/obio.c
index c8b4fef677ff..b95b11ac66cf 100644
--- a/sys/mips/idt/obio.c
+++ b/sys/mips/idt/obio.c

@@ -165,7 +165,7 @@ obio_alloc_resource(device_t bus, device_t child, int type, int *rid,

struct rman *rm;

int isdefault, needactivate, passthrough;

- isdefault = (start == 0UL && end == ~0UL);

+ isdefault = (RMAN_IS_DEFAULT_RANGE(start, end));

needactivate = flags & RF_ACTIVE;

passthrough = (device_get_parent(child) != bus);

rle = NULL;

diff --git a/sys/mips/mips/nexus.c b/sys/mips/mips/nexus.c
index 1e3d4093cb6f..ba7db318df88 100644
--- a/sys/mips/mips/nexus.c
+++ b/sys/mips/mips/nexus.c

@@ -281,7 +281,7 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,

(void *)(intptr_t)end, count, flags);

dprintf("%s: requested rid is %d\n", __func__, *rid);

- isdefault = (start == 0UL && end == ~0UL && count == 1);

+ isdefault = (RMAN_IS_DEFAULT_RANGE(start, end) && count == 1);

needactivate = flags & RF_ACTIVE;

passthrough = (device_get_parent(child) != bus);

rle = NULL;

diff --git a/sys/mips/nlm/xlp_simplebus.c b/sys/mips/nlm/xlp_simplebus.c
index 7d2f697d83a0..790955bb70f6 100644
--- a/sys/mips/nlm/xlp_simplebus.c
+++ b/sys/mips/nlm/xlp_simplebus.c

@@ -192,7 +192,7 @@ xlp_simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid,

bustag = NULL;

if (!passthrough) {

- isdefault = (start == 0UL && end == ~0UL);

+ isdefault = RMAN_IS_DEFAULT_RANGE(start, end);

if (isdefault) {

rle = resource_list_find(&di->rl, type, *rid);

if (rle == NULL)

diff --git a/sys/mips/rt305x/obio.c b/sys/mips/rt305x/obio.c
index 34cec413fd25..ff7ba037dbe9 100644
--- a/sys/mips/rt305x/obio.c
+++ b/sys/mips/rt305x/obio.c

@@ -287,7 +287,7 @@ obio_alloc_resource(device_t bus, device_t child, int type, int *rid,

struct rman *rm;

int isdefault, needactivate, passthrough;

- isdefault = (start == 0UL && end == ~0UL && count == 1);

+ isdefault = (RMAN_IS_DEFAULT_RANGE(start, end) && count == 1);

needactivate = flags & RF_ACTIVE;

passthrough = (device_get_parent(child) != bus);

rle = NULL;

diff --git a/sys/mips/sibyte/sb_zbbus.c b/sys/mips/sibyte/sb_zbbus.c
index 28584217de03..f87b6b8bceef 100644
--- a/sys/mips/sibyte/sb_zbbus.c
+++ b/sys/mips/sibyte/sb_zbbus.c

@@ -288,7 +288,7 @@ zbbus_alloc_resource(device_t bus, device_t child, int type, int *rid,

struct resource_list_entry *rle;

struct zbbus_devinfo *dinfo;

- isdefault = (start == 0UL && end == ~0UL && count == 1);

+ isdefault = (RMAN_IS_DEFAULT_RANGE(start, end) && count == 1);

* Our direct child is asking for a default resource allocation.