[src/trunk]: src/sys/dev/isa Appease _LP64 build with GCC 4.5.

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ee9c085a2e73
branches:  trunk
changeset: 768080:ee9c085a2e73
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sun Aug 07 19:46:22 2011 +0000

description:
Appease _LP64 build with GCC 4.5.

diffstat:

 sys/dev/isa/dpt_isa.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 397fcd5a0c0c -r ee9c085a2e73 sys/dev/isa/dpt_isa.c
--- a/sys/dev/isa/dpt_isa.c     Sun Aug 07 18:58:52 2011 +0000
+++ b/sys/dev/isa/dpt_isa.c     Sun Aug 07 19:46:22 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dpt_isa.c,v 1.20 2009/05/12 09:10:15 cegger Exp $      */
+/*     $NetBSD: dpt_isa.c,v 1.21 2011/08/07 19:46:22 jakllsch Exp $    */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Andrew Doran <ad%NetBSD.org@localhost>
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.20 2009/05/12 09:10:15 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.21 2011/08/07 19:46:22 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -171,7 +171,7 @@
         */
        bus_space_write_1(iot, ioh, HA_COMMAND, CP_PIO_GETCFG);
        memset(&ec, 0, sizeof(ec));
-       i = ((int)&((struct eata_cfg *)0)->ec_cfglen +
+       i = ((uintptr_t)&((struct eata_cfg *)0)->ec_cfglen +
            sizeof(ec.ec_cfglen)) >> 1;
        p = (u_int16_t *)&ec;
 
@@ -183,13 +183,13 @@
                *p++ = bus_space_read_stream_2(iot, ioh, HA_DATA);
 
        if ((i = ec.ec_cfglen) > (sizeof(struct eata_cfg)
-           - (int)(&(((struct eata_cfg *)0L)->ec_cfglen))
+           - (uintptr_t)(&(((struct eata_cfg *)0L)->ec_cfglen))
            - sizeof(ec.ec_cfglen)))
                i = sizeof(struct eata_cfg)
-                 - (int)(&(((struct eata_cfg *)0L)->ec_cfglen))
+                 - (uintptr_t)(&(((struct eata_cfg *)0L)->ec_cfglen))
                  - sizeof(ec.ec_cfglen);
 
-       j = i + (int)(&(((struct eata_cfg *)0L)->ec_cfglen)) +
+       j = i + (uintptr_t)(&(((struct eata_cfg *)0L)->ec_cfglen)) +
            sizeof(ec.ec_cfglen);
        i >>= 1;