Commit 809bea08 authored by Martin-Éric Racine's avatar Martin-Éric Racine
Browse files

Whitespace cleanup using ../modular/x-indent.sh

parent 4cf15cbf
2006-04-06 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
* src/cyrix.h:
* src/cyrix_accel.c:
* src/cyrix_bank.c:
* src/cyrix_driver.c:
* src/cyrix_helper.c:
* src/cyrix_shadow.c:
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
* src/cyrix_driver.c:
VERSION -> CYRIX_VERSION
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
Update package version for X11R7 release.
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
Update package version number for final X11R7 release candidate.
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
* man/Makefile.am:
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
Update package version number for X11R7 RC3 release.
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
Remove extraneous AC_MSG_RESULT.
2005-11-29 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
Only build dlloader modules by default.
2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
Add check for DGA extension to fix issues when building with
separate build roots.
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
Update package version number for X11R7 RC2 release.
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
Update pkgcheck dependencies to work with separate build roots.
This diff is collapsed.
This diff is collapsed.
...@@ -52,12 +52,11 @@ ...@@ -52,12 +52,11 @@
int int
CYRIXSetRead(ScreenPtr pScreen, int bank) CYRIXSetRead(ScreenPtr pScreen, int bank)
{ {
outw(0x3D6, ((((bank << 3) & 0xFF) << 8) | 0x10)); outw(0x3D6, ((((bank << 3) & 0xFF) << 8) | 0x10));
return 0; return 0;
} }
int int
CYRIXSetWrite(ScreenPtr pScreen, int bank) CYRIXSetWrite(ScreenPtr pScreen, int bank)
{ {
...@@ -65,7 +64,6 @@ CYRIXSetWrite(ScreenPtr pScreen, int bank) ...@@ -65,7 +64,6 @@ CYRIXSetWrite(ScreenPtr pScreen, int bank)
return 0; return 0;
} }
int int
CYRIXSetReadWrite(ScreenPtr pScreen, int bank) CYRIXSetReadWrite(ScreenPtr pScreen, int bank)
{ {
......
This diff is collapsed.
This diff is collapsed.
...@@ -20,34 +20,32 @@ ...@@ -20,34 +20,32 @@
#include "shadowfb.h" #include "shadowfb.h"
#include "servermd.h" #include "servermd.h"
void void
CYRIXRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox) CYRIXRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
{ {
CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn); CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn);
int width, height, Bpp, FBPitch; int width, height, Bpp, FBPitch;
unsigned char *src, *dst; unsigned char *src, *dst;
Bpp = pScrn->bitsPerPixel >> 3; Bpp = pScrn->bitsPerPixel >> 3;
FBPitch = BitmapBytePad(pScrn->displayWidth * pScrn->bitsPerPixel); FBPitch = BitmapBytePad(pScrn->displayWidth * pScrn->bitsPerPixel);
while(num--) { while (num--) {
width = (pbox->x2 - pbox->x1) * Bpp; width = (pbox->x2 - pbox->x1) * Bpp;
height = pbox->y2 - pbox->y1; height = pbox->y2 - pbox->y1;
src = pCyrix->ShadowPtr + (pbox->y1 * pCyrix->ShadowPitch) + src = pCyrix->ShadowPtr + (pbox->y1 * pCyrix->ShadowPitch) +
(pbox->x1 * Bpp); (pbox->x1 * Bpp);
dst = pCyrix->FbBase + (pbox->y1 * FBPitch) + (pbox->x1 * Bpp); dst = pCyrix->FbBase + (pbox->y1 * FBPitch) + (pbox->x1 * Bpp);
while(height--) { while (height--) {
memcpy(dst, src, width); memcpy(dst, src, width);
dst += FBPitch; dst += FBPitch;
src += pCyrix->ShadowPitch; src += pCyrix->ShadowPitch;
} }
pbox++; pbox++;
} }
} }
void void
CYRIXPointerMoved(int index, int x, int y) CYRIXPointerMoved(int index, int x, int y)
...@@ -56,15 +54,16 @@ CYRIXPointerMoved(int index, int x, int y) ...@@ -56,15 +54,16 @@ CYRIXPointerMoved(int index, int x, int y)
CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn); CYRIXPrvPtr pCyrix = CYRIXPTR(pScrn);
int newX, newY; int newX, newY;
if(pCyrix->Rotate == 1) { if (pCyrix->Rotate == 1) {
newX = pScrn->pScreen->height - y - 1; newX = pScrn->pScreen->height - y - 1;
newY = x; newY = x;
} else { }
newX = y; else {
newY = pScrn->pScreen->width - x - 1; newX = y;
newY = pScrn->pScreen->width - x - 1;
} }
(*pCyrix->PointerMoved)(index, newX, newY); (*pCyrix->PointerMoved) (index, newX, newY);
} }
void void
...@@ -78,40 +77,39 @@ CYRIXRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox) ...@@ -78,40 +77,39 @@ CYRIXRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
dstPitch = pScrn->displayWidth; dstPitch = pScrn->displayWidth;
srcPitch = -pCyrix->Rotate * pCyrix->ShadowPitch; srcPitch = -pCyrix->Rotate * pCyrix->ShadowPitch;
while(num--) { while (num--) {
width = pbox->x2 - pbox->x1; width = pbox->x2 - pbox->x1;
y1 = pbox->y1 & ~3; y1 = pbox->y1 & ~3;
y2 = (pbox->y2 + 3) & ~3; y2 = (pbox->y2 + 3) & ~3;
height = (y2 - y1) >> 2; /* in dwords */ height = (y2 - y1) >> 2; /* in dwords */
if(pCyrix->Rotate == 1) { if (pCyrix->Rotate == 1) {
dstPtr = pCyrix->FbBase + dstPtr = pCyrix->FbBase +
(pbox->x1 * dstPitch) + pScrn->virtualX - y2; (pbox->x1 * dstPitch) + pScrn->virtualX - y2;
srcPtr = pCyrix->ShadowPtr + ((1 - y2) * srcPitch) + pbox->x1; srcPtr = pCyrix->ShadowPtr + ((1 - y2) * srcPitch) + pbox->x1;
} else { }
dstPtr = pCyrix->FbBase + else {
((pScrn->virtualY - pbox->x2) * dstPitch) + y1; dstPtr = pCyrix->FbBase +
srcPtr = pCyrix->ShadowPtr + (y1 * srcPitch) + pbox->x2 - 1; ((pScrn->virtualY - pbox->x2) * dstPitch) + y1;
} srcPtr = pCyrix->ShadowPtr + (y1 * srcPitch) + pbox->x2 - 1;
}
while(width--) {
src = srcPtr; while (width--) {
dst = (CARD32*)dstPtr; src = srcPtr;
count = height; dst = (CARD32 *) dstPtr;
while(count--) { count = height;
*(dst++) = src[0] | (src[srcPitch] << 8) | while (count--) {
(src[srcPitch * 2] << 16) | *(dst++) = src[0] | (src[srcPitch] << 8) |
(src[srcPitch * 3] << 24); (src[srcPitch * 2] << 16) | (src[srcPitch * 3] << 24);
src += srcPitch * 4; src += srcPitch * 4;
} }
srcPtr += pCyrix->Rotate; srcPtr += pCyrix->Rotate;
dstPtr += dstPitch; dstPtr += dstPitch;
} }
pbox++; pbox++;
} }
} }
void void
CYRIXRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox) CYRIXRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
...@@ -124,37 +122,37 @@ CYRIXRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox) ...@@ -124,37 +122,37 @@ CYRIXRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
dstPitch = pScrn->displayWidth; dstPitch = pScrn->displayWidth;
srcPitch = -pCyrix->Rotate * pCyrix->ShadowPitch >> 1; srcPitch = -pCyrix->Rotate * pCyrix->ShadowPitch >> 1;
while(num--) { while (num--) {
width = pbox->x2 - pbox->x1; width = pbox->x2 - pbox->x1;
y1 = pbox->y1 & ~1; y1 = pbox->y1 & ~1;
y2 = (pbox->y2 + 1) & ~1; y2 = (pbox->y2 + 1) & ~1;
height = (y2 - y1) >> 1; /* in dwords */ height = (y2 - y1) >> 1; /* in dwords */
if(pCyrix->Rotate == 1) { if (pCyrix->Rotate == 1) {
dstPtr = (CARD16*)pCyrix->FbBase + dstPtr = (CARD16 *) pCyrix->FbBase +
(pbox->x1 * dstPitch) + pScrn->virtualX - y2; (pbox->x1 * dstPitch) + pScrn->virtualX - y2;
srcPtr = (CARD16*)pCyrix->ShadowPtr + srcPtr = (CARD16 *) pCyrix->ShadowPtr +
((1 - y2) * srcPitch) + pbox->x1; ((1 - y2) * srcPitch) + pbox->x1;
} else { }
dstPtr = (CARD16*)pCyrix->FbBase + else {
((pScrn->virtualY - pbox->x2) * dstPitch) + y1; dstPtr = (CARD16 *) pCyrix->FbBase +
srcPtr = (CARD16*)pCyrix->ShadowPtr + ((pScrn->virtualY - pbox->x2) * dstPitch) + y1;
(y1 * srcPitch) + pbox->x2 - 1; srcPtr = (CARD16 *) pCyrix->ShadowPtr +
} (y1 * srcPitch) + pbox->x2 - 1;
}
while(width--) {
src = srcPtr; while (width--) {
dst = (CARD32*)dstPtr; src = srcPtr;
count = height; dst = (CARD32 *) dstPtr;
while(count--) { count = height;
*(dst++) = src[0] | (src[srcPitch] << 16); while (count--) {
src += srcPitch * 2; *(dst++) = src[0] | (src[srcPitch] << 16);
} src += srcPitch * 2;
srcPtr += pCyrix->Rotate; }
dstPtr += dstPitch; srcPtr += pCyrix->Rotate;
} dstPtr += dstPitch;
}
pbox++;
pbox++;
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment