[src/trunk]: src/sys/arch/x86/x86 insert some (uintptr_t) between some casts ...

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

details:   https://anonhg.NetBSD.org/src/rev/02f3332cb38d
branches:  trunk
changeset: 766796:02f3332cb38d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jul 02 13:09:31 2011 +0000

description:
insert some (uintptr_t) between some casts involving pointer to int.
(they already had casts for the pointer.)

diffstat:

 sys/arch/x86/x86/x86_autoconf.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 337f0f38c28b -r 02f3332cb38d sys/arch/x86/x86/x86_autoconf.c
--- a/sys/arch/x86/x86/x86_autoconf.c   Sat Jul 02 13:08:25 2011 +0000
+++ b/sys/arch/x86/x86/x86_autoconf.c   Sat Jul 02 13:09:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_autoconf.c,v 1.59 2011/03/08 02:57:00 macallan Exp $       */
+/*     $NetBSD: x86_autoconf.c,v 1.60 2011/07/02 13:09:31 mrg Exp $    */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.59 2011/03/08 02:57:00 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.60 2011/07/02 13:09:31 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -718,13 +718,14 @@
                                        gfb_cb.gcc_set_mapreg = 
                                            x86_genfb_set_mapreg;
                                        prop_dictionary_set_uint64(dict,
-                                           "cmap_callback", (uint64_t)&gfb_cb);
+                                           "cmap_callback",
+                                           (uint64_t)(uintptr_t)&gfb_cb);
                                }
                                if (fbinfo->physaddr != 0) {
                                        mode_cb.gmc_setmode = x86_genfb_setmode;
                                        prop_dictionary_set_uint64(dict,
                                            "mode_callback",
-                                           (uint64_t)&mode_cb);
+                                           (uint64_t)(uintptr_t)&mode_cb);
                                }
 
 #if NWSDISPLAY > 0 && NGENFB > 0
@@ -750,7 +751,7 @@
                        pmf_cb.gpc_suspend = x86_genfb_suspend;
                        pmf_cb.gpc_resume = x86_genfb_resume;
                        prop_dictionary_set_uint64(dict,
-                           "pmf_callback", (uint64_t)&pmf_cb);
+                           "pmf_callback", (uint64_t)(uintptr_t)&pmf_cb);
 #ifdef VGA_POST
                        vga_posth = vga_post_init(pa->pa_bus, pa->pa_device,
                            pa->pa_function);