diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2006-08-01 13:45:43 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2006-08-01 13:45:43 -0700 |
| commit | ee02e647882a4be29e1130bd79904ee79ed6b802 (patch) | |
| tree | f4a2d76b462019f4ea16a7c2004d257db6684ab6 /fb/fbpixmap.c | |
| parent | a69335dc299be6de8b82ed34de1cb30f1255feb4 (diff) | |
Wrap libwfb memory access.
Use the READ and WRITE macros to wrap memory accesses that could be in video
memory. Add MEMCPY_WRAPPED and MEMSET_WRAPPED macros to wrap memcpy and
memset, respectively.
Diffstat (limited to 'fb/fbpixmap.c')
| -rw-r--r-- | fb/fbpixmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index 3fe38ef9f..aca37d420 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -176,7 +176,7 @@ fbPixmapToRegion(PixmapPtr pPix) irectLineStart = rects - FirstRect; /* If the Screen left most bit of the word is set, we're starting in * a box */ - if(*pw & mask0) + if(READ(pw) & mask0) { fInBox = TRUE; rx1 = 0; @@ -187,7 +187,7 @@ fbPixmapToRegion(PixmapPtr pPix) pwLineEnd = pw + (width >> FB_SHIFT); for (base = 0; pw < pwLineEnd; base += FB_UNIT) { - w = *pw++; + w = READ(pw++); if (fInBox) { if (!~w) @@ -228,7 +228,7 @@ fbPixmapToRegion(PixmapPtr pPix) if(width & FB_MASK) { /* Process final partial word on line */ - w = *pw++; + w = READ(pw++); for(ib = 0; ib < (width & FB_MASK); ib++) { /* If the Screen left most bit of the word is set, we're |