diff options
| author | bde <bde@FreeBSD.org> | 1998-08-10 17:21:49 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-08-10 17:21:49 +0000 |
| commit | d09c7eccb228027516b5db0d20d6eb3a3d6a5263 (patch) | |
| tree | bbff64fe46338c0c5ffd53ec805c064c23dfd9b9 /sys/pci | |
| parent | fd093a92abf593af9ca5e35b48ea1e8ec4468072 (diff) | |
| download | FreeBSD-src-d09c7eccb228027516b5db0d20d6eb3a3d6a5263.zip FreeBSD-src-d09c7eccb228027516b5db0d20d6eb3a3d6a5263.tar.gz | |
Use [u]intptr_t instead of [unsigned] long to convert and/or represent
pointers.
This finishes fixing conversions between pointers and integers of
possibly different sizes in GENERIC.
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/isp_pci.c | 6 | ||||
| -rw-r--r-- | sys/pci/scsiiom.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c index fd9778e..e01fce8 100644 --- a/sys/pci/isp_pci.c +++ b/sys/pci/isp_pci.c @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $Id: isp_pci.c,v 1.1 1998/04/22 18:10:34 mjacob Exp $ */ +/* $Id: isp_pci.c,v 1.2 1998/07/13 09:53:09 bde Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * FreeBSD Version. @@ -126,10 +126,10 @@ typedef int bus_space_tag_t; typedef u_long bus_space_handle_t; #define bus_space_read_2(st, sh, offset) \ (st == I386_BUS_SPACE_IO)? \ - inw((u_int16_t)sh + offset) : *((u_int16_t *) sh) + inw((u_int16_t)sh + offset) : *((u_int16_t *)(uintptr_t)sh) #define bus_space_write_2(st, sh, offset, val) \ if (st == I386_BUS_SPACE_IO) outw((u_int16_t)sh + offset, val); else \ - *((u_int16_t *) sh) = val + *((u_int16_t *)(uintptr_t)sh) = val struct isp_pcisoftc { diff --git a/sys/pci/scsiiom.c b/sys/pci/scsiiom.c index f178660b..4a7731a 100644 --- a/sys/pci/scsiiom.c +++ b/sys/pci/scsiiom.c @@ -1269,7 +1269,7 @@ NO_DEV: { pACB->DeviceCnt++; pPrevDCB = pDCB; - pACB->pDCB_free = (PDCB) ((ULONG) (pACB->pDCB_free) + sizeof( DC390_DCB )); + pACB->pDCB_free = (PDCB) ((uintptr_t) (pACB->pDCB_free) + sizeof( DC390_DCB )); pDCB->DevType = bval1; if(bval1 == SCSI_DASD || bval1 == SCSI_OPTICAL) { |
