Use [u]intptr_t instead of [u_]long for casts between pointers and

integers.  Don't forget to cast to (void *) as well.

9 files changed, 35 insertions, 29 deletions

diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 8694e2a..0677ede 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -27,7 +27,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: ibcs2_xenix.c,v 1.14 1997/11/06 19:28:46 phk Exp $
+ *	$Id: ibcs2_xenix.c,v 1.15 1998/06/02 05:39:07 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -168,7 +168,8 @@ xenix_utsname(struct proc *p, struct xenix_utsname_args *uap)
 	ibcs2_sco_uname.sysorigin = 0xFFFF;
 	ibcs2_sco_uname.sysoem = 0xFFFF;
 	ibcs2_sco_uname.numcpu = 1;
-	return copyout((caddr_t)&ibcs2_sco_uname, (caddr_t)uap->addr,
+	return copyout((caddr_t)&ibcs2_sco_uname,
+		       (caddr_t)(void *)(intptr_t)uap->addr,
 		       sizeof(struct ibcs2_sco_utsname));
 }
 
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index d38c7b6..9308e9d 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -26,7 +26,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: imgact_coff.c,v 1.29 1998/02/09 06:08:20 eivind Exp $
+ *	$Id: imgact_coff.c,v 1.30 1998/02/11 01:46:47 eivind Exp $
  */
 
 #include <sys/param.h>
@@ -257,13 +257,13 @@ coff_load_file(struct proc *p, char *name)
   	}
 
   	if (error = load_coff_section(vmspace, vp, text_offset,
-				      (caddr_t)text_address,
+				      (caddr_t)(void *)(uintptr_t)text_address,
 				      text_size, text_size,
 				      VM_PROT_READ | VM_PROT_EXECUTE)) {
     		goto dealloc_and_fail;
   	}
   	if (error = load_coff_section(vmspace, vp, data_offset,
-				      (caddr_t)data_address,
+				      (caddr_t)(void *)(uintptr_t)data_address,
 				      data_size + bss_size, data_size,
 				      VM_PROT_ALL)) {
     		goto dealloc_and_fail;
@@ -417,7 +417,8 @@ exec_coff_imgact(imgp)
 		__FILE__, __LINE__, text_offset, text_address,
 		text_size, text_size, VM_PROT_READ | VM_PROT_EXECUTE));
 	if (error = load_coff_section(vmspace, imgp->vp,
-				      text_offset, (caddr_t)text_address,
+				      text_offset,
+				      (caddr_t)(void *)(uintptr_t)text_address,
 				      text_size, text_size,
 				      VM_PROT_READ | VM_PROT_EXECUTE)) {
 		DPRINTF(("%s(%d): error = %d\n", __FILE__, __LINE__, error));
@@ -433,7 +434,8 @@ exec_coff_imgact(imgp)
 		__FILE__, __LINE__, data_offset, data_address,
 		data_size + bss_size, data_size, VM_PROT_ALL));
 	if (error = load_coff_section(vmspace, imgp->vp,
-				      data_offset, (caddr_t)data_address,
+				      data_offset,
+				      (caddr_t)(void *)(uintptr_t)data_address,
 				      data_size + bss_size, data_size,
 				      VM_PROT_ALL)) {
 
@@ -446,8 +448,8 @@ exec_coff_imgact(imgp)
 
 	vmspace->vm_tsize = round_page(text_size) >> PAGE_SHIFT;
 	vmspace->vm_dsize = round_page(data_size + bss_size) >> PAGE_SHIFT;
-	vmspace->vm_taddr = (caddr_t)text_address;
-	vmspace->vm_daddr = (caddr_t)data_address;
+	vmspace->vm_taddr = (caddr_t)(void *)(uintptr_t)text_address;
+	vmspace->vm_daddr = (caddr_t)(void *)(uintptr_t)data_address;
 
 	hole = (caddr_t)trunc_page(vmspace->vm_daddr) + ctob(vmspace->vm_dsize);
 
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index c05b29c..c11fc16 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: istallion.c,v 1.18 1998/04/15 17:45:29 bde Exp $
+ * $Id: istallion.c,v 1.19 1998/06/07 17:10:42 dfr Exp $
  */
 
 /*****************************************************************************/
@@ -3391,13 +3391,14 @@ static int stli_startbrd(stlibrd_t *brdp)
 	brdp->hostoffset = hdrp->hostp - CDK_CDKADDR;
 	brdp->slaveoffset = hdrp->slavep - CDK_CDKADDR;
 	brdp->bitsize = (nrdevs + 7) / 8;
-	memp = (volatile cdkmem_t *) hdrp->memp;
-	if (((unsigned long) memp) > brdp->memsize) {
+	memp = (volatile cdkmem_t *) (void *) (uintptr_t) hdrp->memp;
+	if (((uintptr_t) (void *) memp) > brdp->memsize) {
 		printf("STALLION: corrupted shared memory region?\n");
 		rc = EIO;
 		goto stli_donestartup;
 	}
-	memp = (volatile cdkmem_t *) EBRDGETMEMPTR(brdp, (unsigned long) memp);
+	memp = (volatile cdkmem_t *) EBRDGETMEMPTR(brdp,
+						   (uintptr_t) (void *) memp);
 	if (memp->dtype != TYP_ASYNCTRL) {
 		printf("STALLION: no slave control device found\n");
 		rc = EIO;
diff --git a/sys/i386/isa/sound/dmabuf.c b/sys/i386/isa/sound/dmabuf.c
index dfd2283..613e30b 100644
--- a/sys/i386/isa/sound/dmabuf.c
+++ b/sys/i386/isa/sound/dmabuf.c
@@ -1103,13 +1103,14 @@ DMAbuf_start_dma(int dev, u_long physaddr, int count, int dma_mode)
     if (audio_devs[dev]->flags & DMA_AUTOMODE) {
 	/* Auto restart mode. Transfer the whole buffer */
 	isa_dmastart(B_RAW | ((dma_mode == 0) ? B_READ : B_WRITE),
-	     (caddr_t) dmap->raw_buf_phys, dmap->bytes_in_use, chan);
+	     (caddr_t) (void *) (uintptr_t) dmap->raw_buf_phys,
+	     dmap->bytes_in_use, chan);
 
     } else
 #endif
     {
 	isa_dmastart((dma_mode == 0) ? B_READ : B_WRITE,
-		 (caddr_t) physaddr, count, chan);
+		 (caddr_t) (void *) (uintptr_t) physaddr, count, chan);
     }
     return count;
 }
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 4661c6b..b4eca55 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -522,7 +522,7 @@ alloc_dmap(int dev, int chan, struct dma_buffparms * dmap)
      * performs the phys address computation.
      */
 
-    dmap->raw_buf_phys = (u_long) tmpbuf;
+    dmap->raw_buf_phys = (uintptr_t) tmpbuf;
     for (i = 0; i < audio_devs[dev]->buffsize; i++)   *tmpbuf++ = 0x80; 
 
 }
diff --git a/sys/i386/isa/wd7000.c b/sys/i386/isa/wd7000.c
index 0dc3829..5722aee 100644
--- a/sys/i386/isa/wd7000.c
+++ b/sys/i386/isa/wd7000.c
@@ -441,7 +441,7 @@ wdsintr(int unit)
     in = &wds[unit].imbs[c];
 
     pc = (struct wds_cmd *)scsi_3btou(in->addr);
-    vc = (struct wds_cmd *)PHYSTOKV((long)pc);
+    vc = (struct wds_cmd *)PHYSTOKV((intptr_t)(void *)pc);
     stat = in->stat;
 
     wds_done(unit, vc, stat);
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index 5f85902..b91b6ab 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -28,7 +28,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: imgact_linux.c,v 1.27 1998/02/11 01:46:49 eivind Exp $
+ *	$Id: imgact_linux.c,v 1.28 1998/07/29 16:43:00 bde Exp $
  */
 
 #include <sys/param.h>
@@ -146,8 +146,8 @@ exec_linux_imgact(imgp)
 	if (error)
 	    return error;
 
-	error = copyout((caddr_t)(buffer + file_offset), (caddr_t)vmaddr, 
-			a_out->a_text + a_out->a_data);
+	error = copyout((caddr_t)(void *)(uintptr_t)(buffer + file_offset),
+			(caddr_t)vmaddr, a_out->a_text + a_out->a_data);
 
 	vm_map_remove(kernel_map, buffer,
 		      buffer + round_page(a_out->a_text + a_out->a_data + file_offset));
@@ -219,8 +219,9 @@ exec_linux_imgact(imgp)
     /* Fill in process VM information */
     vmspace->vm_tsize = round_page(a_out->a_text) >> PAGE_SHIFT;
     vmspace->vm_dsize = round_page(a_out->a_data + bss_size) >> PAGE_SHIFT;
-    vmspace->vm_taddr = (caddr_t)virtual_offset;
-    vmspace->vm_daddr = (caddr_t)virtual_offset + a_out->a_text;
+    vmspace->vm_taddr = (caddr_t)(void *)(uintptr_t)virtual_offset;
+    vmspace->vm_daddr = (caddr_t)(void *)(uintptr_t)
+	(virtual_offset + a_out->a_text);
 
     /* Fill in image_params */
     imgp->interpreted = 0;
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index ec420fa..3647f84 100644
--- a/sys/i386/linux/linux_misc.c
+++ b/sys/i386/linux/linux_misc.c
@@ -25,7 +25,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: linux_misc.c,v 1.40 1998/07/29 16:43:00 bde Exp $
+ *  $Id: linux_misc.c,v 1.41 1998/08/05 16:44:30 bde Exp $
  */
 
 #include <sys/param.h>
@@ -327,8 +327,8 @@ printf("uselib: Non page aligned binary %lu\n", file_offset);
 	    goto cleanup;
 
 	/* copy from kernel VM space to user space */
-	error = copyout((caddr_t)(buffer + file_offset), (caddr_t)vmaddr,
-			a_out->a_text + a_out->a_data);
+	error = copyout((caddr_t)(void *)(uintptr_t)(buffer + file_offset),
+			(caddr_t)vmaddr, a_out->a_text + a_out->a_data);
 
 	/* release temporary kernel space */
 	vm_map_remove(kernel_map, buffer,
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 850263f..67ed448 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,7 +25,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: linux_sysvec.c,v 1.30 1998/06/07 17:11:27 dfr Exp $
+ *  $Id: linux_sysvec.c,v 1.31 1998/07/29 16:43:00 bde Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -126,11 +126,11 @@ linux_fixup(long **stack_base, struct image_params *imgp)
 	argv = *stack_base;
 	envp = *stack_base + (imgp->argc + 1);
 	(*stack_base)--;
-	**stack_base = (long)envp;
+	**stack_base = (intptr_t)(void *)envp;
 	(*stack_base)--;
-	**stack_base = (long)argv;
+	**stack_base = (intptr_t)(void *)argv;
 	(*stack_base)--;
-	**stack_base = (long)imgp->argc;
+	**stack_base = imgp->argc;
 	return 0;
 }