From 12676c3a1de6b56f03962001be5bb3c5e9e77cf2 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Fri, 27 Jan 2006 21:06:26 +0000 Subject: [PATCH] volatile pointers where possibly needed. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16113 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/matrox/engine/mga_crtc.c | 8 ++++---- src/add-ons/accelerants/matrox/engine/mga_general.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/add-ons/accelerants/matrox/engine/mga_crtc.c b/src/add-ons/accelerants/matrox/engine/mga_crtc.c index ba4f1e2094..e68d37ec1c 100644 --- a/src/add-ons/accelerants/matrox/engine/mga_crtc.c +++ b/src/add-ons/accelerants/matrox/engine/mga_crtc.c @@ -512,7 +512,7 @@ status_t gx00_crtc_cursor_init() if (si->ps.card_type >= G100) { - uint32 * fb; + vuint32 * fb; /* cursor bitmap will be stored at the start of the framebuffer on >= G100 */ const uint32 curadd = 0; @@ -535,7 +535,7 @@ status_t gx00_crtc_cursor_init() DXIW(CURCOL2BLUE,0); /*clear cursor*/ - fb = (uint32 *) si->framebuffer + curadd; + fb = (vuint32 *) si->framebuffer + curadd; for (i=0;i<(1024/4);i++) { fb[i]=0; @@ -610,10 +610,10 @@ status_t gx00_crtc_cursor_define(uint8* andMask,uint8* xorMask) if(si->ps.card_type >= G100) { - uint8 * cursor; + vuint8 * cursor; /*get a pointer to the cursor*/ - cursor = (uint8*) si->framebuffer; + cursor = (vuint8*) si->framebuffer; /*draw the cursor*/ for(y=0;y<16;y++) diff --git a/src/add-ons/accelerants/matrox/engine/mga_general.c b/src/add-ons/accelerants/matrox/engine/mga_general.c index 96c84b2fc4..a65c6c4824 100644 --- a/src/add-ons/accelerants/matrox/engine/mga_general.c +++ b/src/add-ons/accelerants/matrox/engine/mga_general.c @@ -152,7 +152,7 @@ static status_t test_ram() for (offset = 0, value = 0x55aa55aa; offset < 256; offset++) { /* write testpattern to cardRAM */ - ((uint32 *)si->fbc.frame_buffer)[offset] = value; + ((vuint32 *)si->fbc.frame_buffer)[offset] = value; /* toggle testpattern */ value = 0xffffffff - value; } @@ -160,7 +160,7 @@ static status_t test_ram() for (offset = 0, value = 0x55aa55aa; offset < 256; offset++) { /* readback and verify testpattern from cardRAM */ - if (((uint32 *)si->fbc.frame_buffer)[offset] != value) result = B_ERROR; + if (((vuint32 *)si->fbc.frame_buffer)[offset] != value) result = B_ERROR; /* toggle testpattern */ value = 0xffffffff - value; }