i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

neomagic: Use uintptr_t instead of uint32_t for type casts

Browse Source 
This fixes 64-bit build with modern GCC

Signed-off-by: Jaroslaw Pelczar <[email protected]>
Change-Id: Ifaa719d8ec45f021cf01320df9639d4f8a03c957
Reviewed-on: https://review.haiku-os.org/c/haiku/+/1758
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Jaroslaw Pelczar
2019-08-30 14:02:35 +00:00
committed by waddlesplash
parent af47fc80f9
commit e7742a11bd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/neomagic/engine/nm_bes.c
+2 -2
View File
@@ -242,8 +242,8 @@ static void nm_bes_calc_move_overlay(move_overlay_info *moi)
*******************************/ *******************************/
/* calculate inputbitmap origin adress */ /* calculate inputbitmap origin adress */
moi->a1orgv = (uint32)((vuint32 *)si->overlay.ob.buffer); moi->a1orgv = (uintptr_t)((vuint32 *)si->overlay.ob.buffer);
moi->a1orgv -= (uint32)((vuint32 *)si->framebuffer); moi->a1orgv -= (uintptr_t)((vuint32 *)si->framebuffer);
LOG(4,("Overlay: topleft corner of input bitmap (cardRAM offset) $%08x\n", moi->a1orgv)); 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. */ /* Setup vertical source start: first (sub)pixel contributing to output picture. */
src/add-ons/accelerants/neomagic/engine/nm_crtc.c
+1 -1
View File
@@ -955,7 +955,7 @@ status_t nm_crtc_cursor_init()
nm_crtc_depth(BPP8); nm_crtc_depth(BPP8);
/* clear cursor: so we need full RAM access! */ /* 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++) for (i = 0; i < (1024/4); i++)
{ {
fb[i] = 0; fb[i] = 0;