Don't pretend to support ix86's with 16-bit ints by using longs just

to ensure 32-bit variables.  Doing so broke ix86's with 64-bit longs.

5 files changed, 18 insertions, 18 deletions

diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index 9a3542e..f1d6d86 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: busdma_machdep.c,v 1.7 1998/07/11 07:45:28 bde Exp $
+ *      $Id: busdma_machdep.c,v 1.8 1998/09/15 10:03:42 gibbs Exp $
  */
 
 #include <sys/param.h>
@@ -459,7 +459,7 @@ bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
 
 	if (buflen != 0) {
 		printf("bus_dmamap_load: Too many segs! buf_len = 0x%lx\n",
-		       buflen);
+		       (u_long)buflen);
 		error = EFBIG;
 	}
 
diff --git a/sys/amd64/include/bus.h b/sys/amd64/include/bus.h
index 3d1feca..75b2b73 100644
--- a/sys/amd64/include/bus.h
+++ b/sys/amd64/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.2 1998/04/19 15:28:30 bde Exp $ */
+/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -83,8 +83,8 @@
 /*
  * Bus address and size types
  */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
+typedef u_int bus_addr_t;
+typedef u_int bus_size_t;
 
 #define BUS_SPACE_MAXSIZE_24BIT	0xFFFFFF
 #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF
@@ -99,7 +99,7 @@ typedef u_long bus_size_t;
  * Access methods for bus resources and address space.
  */
 typedef	int bus_space_tag_t;
-typedef	u_long bus_space_handle_t;
+typedef	u_int bus_space_handle_t;
 
 /*
  * Map a region of device bus space into CPU virtual address space.
diff --git a/sys/amd64/include/bus_amd64.h b/sys/amd64/include/bus_amd64.h
index 3d1feca..75b2b73 100644
--- a/sys/amd64/include/bus_amd64.h
+++ b/sys/amd64/include/bus_amd64.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.2 1998/04/19 15:28:30 bde Exp $ */
+/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -83,8 +83,8 @@
 /*
  * Bus address and size types
  */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
+typedef u_int bus_addr_t;
+typedef u_int bus_size_t;
 
 #define BUS_SPACE_MAXSIZE_24BIT	0xFFFFFF
 #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF
@@ -99,7 +99,7 @@ typedef u_long bus_size_t;
  * Access methods for bus resources and address space.
  */
 typedef	int bus_space_tag_t;
-typedef	u_long bus_space_handle_t;
+typedef	u_int bus_space_handle_t;
 
 /*
  * Map a region of device bus space into CPU virtual address space.
diff --git a/sys/amd64/include/bus_at386.h b/sys/amd64/include/bus_at386.h
index 3d1feca..75b2b73 100644
--- a/sys/amd64/include/bus_at386.h
+++ b/sys/amd64/include/bus_at386.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.2 1998/04/19 15:28:30 bde Exp $ */
+/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -83,8 +83,8 @@
 /*
  * Bus address and size types
  */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
+typedef u_int bus_addr_t;
+typedef u_int bus_size_t;
 
 #define BUS_SPACE_MAXSIZE_24BIT	0xFFFFFF
 #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF
@@ -99,7 +99,7 @@ typedef u_long bus_size_t;
  * Access methods for bus resources and address space.
  */
 typedef	int bus_space_tag_t;
-typedef	u_long bus_space_handle_t;
+typedef	u_int bus_space_handle_t;
 
 /*
  * Map a region of device bus space into CPU virtual address space.
diff --git a/sys/amd64/include/bus_dma.h b/sys/amd64/include/bus_dma.h
index 3d1feca..75b2b73 100644
--- a/sys/amd64/include/bus_dma.h
+++ b/sys/amd64/include/bus_dma.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.2 1998/04/19 15:28:30 bde Exp $ */
+/* $Id: bus.h,v 1.3 1998/05/06 01:45:47 gibbs Exp $ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
@@ -83,8 +83,8 @@
 /*
  * Bus address and size types
  */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
+typedef u_int bus_addr_t;
+typedef u_int bus_size_t;
 
 #define BUS_SPACE_MAXSIZE_24BIT	0xFFFFFF
 #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF
@@ -99,7 +99,7 @@ typedef u_long bus_size_t;
  * Access methods for bus resources and address space.
  */
 typedef	int bus_space_tag_t;
-typedef	u_long bus_space_handle_t;
+typedef	u_int bus_space_handle_t;
 
 /*
  * Map a region of device bus space into CPU virtual address space.