From e7742a11bd3a8f635856364de849a5e4caf1058b Mon Sep 17 00:00:00 2001 From: Jaroslaw Pelczar Date: Wed, 28 Aug 2019 09:43:29 +0200 Subject: [PATCH] neomagic: Use uintptr_t instead of uint32_t for type casts This fixes 64-bit build with modern GCC Signed-off-by: Jaroslaw Pelczar Change-Id: Ifaa719d8ec45f021cf01320df9639d4f8a03c957 Reviewed-on: https://review.haiku-os.org/c/haiku/+/1758 Reviewed-by: waddlesplash --- src/add-ons/accelerants/neomagic/engine/nm_bes.c | 4 ++-- src/add-ons/accelerants/neomagic/engine/nm_crtc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/accelerants/neomagic/engine/nm_bes.c b/src/add-ons/accelerants/neomagic/engine/nm_bes.c index 0f2f7080d2..2141a9d60d 100644 --- a/src/add-ons/accelerants/neomagic/engine/nm_bes.c +++ b/src/add-ons/accelerants/neomagic/engine/nm_bes.c @@ -242,8 +242,8 @@ static void nm_bes_calc_move_overlay(move_overlay_info *moi) *******************************/ /* calculate inputbitmap origin adress */ - moi->a1orgv = (uint32)((vuint32 *)si->overlay.ob.buffer); - moi->a1orgv -= (uint32)((vuint32 *)si->framebuffer); + moi->a1orgv = (uintptr_t)((vuint32 *)si->overlay.ob.buffer); + moi->a1orgv -= (uintptr_t)((vuint32 *)si->framebuffer); LOG(4,("Overlay: topleft corner of input bitmap (cardRAM offset) $%08x\n", moi->a1orgv)); /* Setup vertical source start: first (sub)pixel contributing to output picture. */ diff --git a/src/add-ons/accelerants/neomagic/engine/nm_crtc.c b/src/add-ons/accelerants/neomagic/engine/nm_crtc.c index 42d65b33b7..b8437676d8 100644 --- a/src/add-ons/accelerants/neomagic/engine/nm_crtc.c +++ b/src/add-ons/accelerants/neomagic/engine/nm_crtc.c @@ -955,7 +955,7 @@ status_t nm_crtc_cursor_init() nm_crtc_depth(BPP8); /* clear cursor: so we need full RAM access! */ - fb = ((vuint32 *)(((uint32)si->framebuffer) + curadd)); + fb = ((vuint32 *)(((uintptr_t)si->framebuffer) + curadd)); for (i = 0; i < (1024/4); i++) { fb[i] = 0;