Index: aac.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/aac/aac.c,v
retrieving revision 1.73
diff -u -r1.73 aac.c
--- aac.c	9 Jul 2003 21:16:23 -0000	1.73
+++ aac.c	18 Aug 2003 23:11:13 -0000
@@ -1113,7 +1113,7 @@
 	 * intermediate stage may have destroyed them.  They're left
 	 * initialised here for debugging purposes only.
 	 */
-	cm->cm_fib->Header.SenderFibAddress = (u_int32_t)cm->cm_fib;
+	cm->cm_fib->Header.SenderFibAddress = (u_int32_t)(uintptr_t)cm->cm_fib;
 	cm->cm_fib->Header.ReceiverFibAddress = (u_int32_t)cm->cm_fibphys;
 	cm->cm_fib->Header.SenderData = 0;
 
@@ -1582,11 +1582,11 @@
 	 * virtue of a table.
 	 */
 	qaddr = &sc->aac_common->ac_qbuf[0] + AAC_QUEUE_ALIGN;
-	qaddr -= (u_int32_t)qaddr % AAC_QUEUE_ALIGN;
+	qaddr -= (u_int32_t)(uintptr_t)qaddr % AAC_QUEUE_ALIGN;
 	sc->aac_queues = (struct aac_queue_table *)qaddr;
 	ip->CommHeaderAddress = sc->aac_common_busaddr +
-				((u_int32_t)sc->aac_queues -
-				(u_int32_t)sc->aac_common);
+				((uintptr_t)sc->aac_queues -
+				(uintptr_t)sc->aac_common);
 
 	sc->aac_queues->qt_qindex[AAC_HOST_NORM_CMD_QUEUE][AAC_PRODUCER_INDEX] =
 		AAC_HOST_NORM_CMD_ENTRIES;
@@ -1757,7 +1757,7 @@
 	fib->Header.StructType = AAC_FIBTYPE_TFIB;
 	fib->Header.Size = sizeof(struct aac_fib) + datasize;
 	fib->Header.SenderSize = sizeof(struct aac_fib);
-	fib->Header.SenderFibAddress = (u_int32_t)fib;
+	fib->Header.SenderFibAddress = (u_int32_t)(uintptr_t)fib;
 	fib->Header.ReceiverFibAddress = sc->aac_common_busaddr +
 					 offsetof(struct aac_common,
 						  ac_sync_fib);
@@ -2434,7 +2434,7 @@
 		 * Here, we give it the proc pointer of the per-adapter aif 
 		 * thread. It's only used as a sanity check in other calls.
 		 */
-		i = (int)sc->aifthread;
+		i = (int)(uintptr_t)sc->aifthread;
 		error = copyout(&i, arg, sizeof(i));
 		break;
 	case FSACTL_GET_NEXT_ADAPTER_FIB:
@@ -2531,7 +2531,7 @@
 		goto out;
 	size = cm->cm_fib->Header.Size + sizeof(struct aac_fib_header);
 	if (size > sizeof(struct aac_fib)) {
-		device_printf(sc->aac_dev, "incoming FIB oversized (%d > %d)\n",
+		device_printf(sc->aac_dev, "incoming FIB oversized (%d > %zd)\n",
 			      size, sizeof(struct aac_fib));
 		size = sizeof(struct aac_fib);
 	}
@@ -2554,7 +2554,7 @@
 	 */
 	size = cm->cm_fib->Header.Size;
 	if (size > sizeof(struct aac_fib)) {
-		device_printf(sc->aac_dev, "outbound FIB oversized (%d > %d)\n",
+		device_printf(sc->aac_dev, "outbound FIB oversized (%d > %zd)\n",
 			      size, sizeof(struct aac_fib));
 		size = sizeof(struct aac_fib);
 	}
@@ -2776,7 +2776,7 @@
 		/*
 		 * Check the magic number that we gave the caller.
 		 */
-		if (agf.AdapterFibContext != (int)sc->aifthread) {
+		if (agf.AdapterFibContext != (int)(uintptr_t)sc->aifthread) {
 			error = EFAULT;
 		} else {
 			error = aac_return_aif(sc, agf.AifFib);
Index: aac_cam.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/aac/aac_cam.c,v
retrieving revision 1.11
diff -u -r1.11 aac_cam.c
--- aac_cam.c	26 Mar 2003 17:50:11 -0000	1.11
+++ aac_cam.c	18 Aug 2003 23:12:09 -0000
@@ -341,7 +341,7 @@
 				if (ccb->ccb_h.flags & CAM_DATA_PHYS) {
 					srb->sg_map32.SgCount = 1;
 					srb->sg_map32.SgEntry[0].SgAddress =
-					    (u_int32_t)csio->data_ptr;
+					    (u_int32_t)(uintptr_t)csio->data_ptr;
 					srb->sg_map32.SgEntry[0].SgByteCount =
 					    csio->dxfer_len;
 				} else {
Index: aac_disk.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/aac/aac_disk.c,v
retrieving revision 1.32
diff -u -r1.32 aac_disk.c
--- aac_disk.c	19 Jun 2003 01:49:04 -0000	1.32
+++ aac_disk.c	18 Aug 2003 23:08:54 -0000
@@ -272,7 +272,7 @@
 		size = fib->Header.Size + sizeof(struct aac_blockwrite);
 
 		if (aac_sync_fib(sc, ContainerCommand, 0, fib, size)) {
-			printf("Error dumping block 0x%x\n", physical);
+			printf("Error dumping block 0x%lx\n", (long)physical);
 			return (EIO);
 		}