Move the bus_space_subregion function from the puc driver to the bus_space

sutff.

Reviewed by:	jhay

4 files changed, 42 insertions, 21 deletions

diff --git a/sys/amd64/include/bus_amd64.h b/sys/amd64/include/bus_amd64.h
index 4914c54..5cd35d3 100644
--- a/sys/amd64/include/bus_amd64.h
+++ b/sys/amd64/include/bus_amd64.h
@@ -131,9 +131,20 @@ void	bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh,
  * Get a new handle for a subregion of an already-mapped area of bus space.
  */
 
-int	bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
-			    bus_size_t offset, bus_size_t size,
-			    bus_space_handle_t *nbshp);
+static __inline int bus_space_subregion(bus_space_tag_t t,
+					bus_space_handle_t bsh,
+					bus_size_t offset, bus_size_t size,
+					bus_space_handle_t *nbshp);
+
+static __inline int
+bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
+		    bus_size_t offset, bus_size_t site,
+		    bus_space_handle_t *nbshp)
+{
+
+	*nbshp = bsh + offset;
+	return (0);
+}
 
 /*
  * Allocate a region of memory that is accessible to devices in bus space.
diff --git a/sys/amd64/include/bus_at386.h b/sys/amd64/include/bus_at386.h
index 4914c54..5cd35d3 100644
--- a/sys/amd64/include/bus_at386.h
+++ b/sys/amd64/include/bus_at386.h
@@ -131,9 +131,20 @@ void	bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh,
  * Get a new handle for a subregion of an already-mapped area of bus space.
  */
 
-int	bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
-			    bus_size_t offset, bus_size_t size,
-			    bus_space_handle_t *nbshp);
+static __inline int bus_space_subregion(bus_space_tag_t t,
+					bus_space_handle_t bsh,
+					bus_size_t offset, bus_size_t size,
+					bus_space_handle_t *nbshp);
+
+static __inline int
+bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
+		    bus_size_t offset, bus_size_t site,
+		    bus_space_handle_t *nbshp)
+{
+
+	*nbshp = bsh + offset;
+	return (0);
+}
 
 /*
  * Allocate a region of memory that is accessible to devices in bus space.
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index 83da26c..563633f 100644
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -537,18 +537,6 @@ puc_print_resource_list(struct resource_list *rl)
 }
 #endif
 
-/* XXX
- * This function should be part of the general bus_space_* functions. It
- * should also handle the PC98 case where bus_space_handle_t is a structure.
- */
-int
-bus_space_subregion(bus_space_tag_t t, bus_space_handle_t h, bus_size_t offset,
-    bus_size_t s, bus_space_handle_t *newhandle)
-{
-	*newhandle = h + offset;
-	return (0);
-}
-
 static struct resource *
 puc_alloc_resource(device_t dev, device_t child, int type, int *rid,
     u_long start, u_long end, u_long count, u_int flags)
diff --git a/sys/i386/include/bus_at386.h b/sys/i386/include/bus_at386.h
index 4914c54..5cd35d3 100644
--- a/sys/i386/include/bus_at386.h
+++ b/sys/i386/include/bus_at386.h
@@ -131,9 +131,20 @@ void	bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh,
  * Get a new handle for a subregion of an already-mapped area of bus space.
  */
 
-int	bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
-			    bus_size_t offset, bus_size_t size,
-			    bus_space_handle_t *nbshp);
+static __inline int bus_space_subregion(bus_space_tag_t t,
+					bus_space_handle_t bsh,
+					bus_size_t offset, bus_size_t size,
+					bus_space_handle_t *nbshp);
+
+static __inline int
+bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
+		    bus_size_t offset, bus_size_t site,
+		    bus_space_handle_t *nbshp)
+{
+
+	*nbshp = bsh + offset;
+	return (0);
+}
 
 /*
  * Allocate a region of memory that is accessible to devices in bus space.