summaryrefslogtreecommitdiffstats
path: root/sys/pci
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-07-15 02:32:35 +0000
committerbde <bde@FreeBSD.org>1998-07-15 02:32:35 +0000
commit863d5c8b6850a65e8b4e00a7b23bbd29bd466602 (patch)
tree503589837ac05f783d5305211b0f41aed97e2041 /sys/pci
parentb99f2f9d598baa39c296f1cf2d910a1f7e138bb1 (diff)
downloadFreeBSD-src-863d5c8b6850a65e8b4e00a7b23bbd29bd466602.zip
FreeBSD-src-863d5c8b6850a65e8b4e00a7b23bbd29bd466602.tar.gz
Cast pointers to uintptr_t/intptr_t instead of to u_long/long,
respectively. Most of the longs should probably have been u_longs, but this changes is just to prevent warnings about casts between pointers and integers of different sizes, not to fix poorly chosen types.
Diffstat (limited to 'sys/pci')
-rw-r--r--sys/pci/ide_pci.c4
-rw-r--r--sys/pci/if_de.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index d358d9a..68df969 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ide_pci.c,v 1.12 1998/06/17 14:58:03 bde Exp $
+ * $Id: ide_pci.c,v 1.13 1998/07/11 07:45:52 bde Exp $
*/
#include "pci.h"
@@ -1283,7 +1283,7 @@ ide_pci_dmasetup(void *xcp, char *vaddr, u_long vcount, int dir)
/* Generate first PRD entry, which may be non-aligned. */
- firstpage = PAGE_SIZE - ((u_long)vaddr & PAGE_MASK);
+ firstpage = PAGE_SIZE - ((uintptr_t)vaddr & PAGE_MASK);
prd_base = vtophys(vaddr);
prd_count = MIN(count, firstpage);
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index e0a128e..054fc20 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -1,5 +1,5 @@
/* $NetBSD: if_de.c,v 1.72 1998/07/05 06:49:14 jonathan Exp $ */
-/* $Id: if_de.c,v 1.83 1998/06/13 17:19:59 peter Exp $ */
+/* $Id: if_de.c,v 1.84 1998/07/08 01:24:37 peter Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -4342,7 +4342,7 @@ tulip_txput(
do {
int len = m0->m_len;
caddr_t addr = mtod(m0, caddr_t);
- unsigned clsize = CLBYTES - (((u_long) addr) & (CLBYTES-1));
+ unsigned clsize = CLBYTES - (((uintptr_t) addr) & (CLBYTES-1));
while (len > 0) {
unsigned slen = min(len, clsize);
OpenPOWER on IntegriCloud