Module Name: src
Committed By: mrg
Date: Sat Jul 2 13:09:32 UTC 2011
Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c
Log Message:
insert some (uintptr_t) between some casts involving pointer to int.
(they already had casts for the pointer.)
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/x86/x86/x86_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.59 src/sys/arch/x86/x86/x86_autoconf.c:1.60
--- src/sys/arch/x86/x86/x86_autoconf.c:1.59 Tue Mar 8 02:57:00 2011
+++ src/sys/arch/x86/x86/x86_autoconf.c Sat Jul 2 13:09:31 2011
@@ -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);
