Whitespace and formatting changes

1 files changed, 154 insertions, 173 deletions

diff --git a/src/smi_dga.c b/src/smi_dga.c
index 3fd0864..71d0922 100644
--- a/src/smi_dga.c
+++ b/src/smi_dga.c
@@ -55,145 +55,132 @@ static void SMI_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int,
 static
 DGAFunctionRec SMI_DGAFuncs =
 {
-   SMI_OpenFramebuffer,
-   NULL,
-   SMI_SetMode,
-   SMI_SetViewport,
-   SMI_GetViewport,
-   SMI_AccelSync,
-   SMI_FillRect,
-   SMI_BlitRect,
-   SMI_BlitTransRect
+    SMI_OpenFramebuffer,
+    NULL,
+    SMI_SetMode,
+    SMI_SetViewport,
+    SMI_GetViewport,
+    SMI_AccelSync,
+    SMI_FillRect,
+    SMI_BlitRect,
+    SMI_BlitTransRect
 };
 
 Bool
 SMI_DGAInit(ScreenPtr pScreen)
 {
-	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-	SMIPtr pSmi = SMIPTR(pScrn);
-	DGAModePtr modes = NULL, newmodes = NULL, currentMode;
-	DisplayModePtr pMode, firstMode;
-	int Bpp = pScrn->bitsPerPixel >> 3;
-	int num = 0;
-	Bool ret;
-
-	ENTER_PROC("SMI_DGAInit");
-
-	pMode = firstMode = pScrn->modes;
-
-	while (pMode)
-	{
-		newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
-		if (newmodes == NULL)
-		{
-			xfree(modes);
-			LEAVE_PROC("SMI_DGAInit");
-			return(FALSE);
-		}
-
-		modes = newmodes;
-
-		currentMode = modes + num;
-		num++;
-
-		currentMode->mode  = pMode;
-		currentMode->flags = DGA_PIXMAP_AVAILABLE;
-		if (!pSmi->NoAccel)
-		{
-			currentMode->flags |= DGA_FILL_RECT
-							   |  DGA_BLIT_RECT
-							   |  DGA_BLIT_RECT_TRANS;
-		}
-		if (pMode->Flags & V_DBLSCAN)
-		{
-			currentMode->flags |= DGA_DOUBLESCAN;
-		}
-		if (pMode->Flags & V_INTERLACE)
-		{
-			currentMode->flags |= DGA_INTERLACED;
-		}
-
-		currentMode->byteOrder      = pScrn->imageByteOrder;
-		currentMode->depth          = pScrn->depth;
-		currentMode->bitsPerPixel   = pScrn->bitsPerPixel;
-		currentMode->red_mask       = pScrn->mask.red;
-		currentMode->green_mask     = pScrn->mask.green;
-		currentMode->blue_mask      = pScrn->mask.blue;
-		currentMode->visualClass    = (Bpp == 1) ? PseudoColor : TrueColor;
-		currentMode->viewportWidth  = pMode->HDisplay;
-		currentMode->viewportHeight = pMode->VDisplay;
-		currentMode->xViewportStep  = (Bpp == 3) ? 8 : (8 / Bpp);
-		currentMode->yViewportStep  = 1;
-		currentMode->viewportFlags  = DGA_FLIP_RETRACE;
-		currentMode->offset         = 0;
-		currentMode->address        = pSmi->FBBase;
-
-		xf86ErrorFVerb(VERBLEV, "\tSMI_DGAInit %dx%d @ %d bpp\n",
-				currentMode->viewportWidth, currentMode->viewportHeight,
-				currentMode->bitsPerPixel);
-
-		currentMode->bytesPerScanline = ((pScrn->displayWidth * Bpp) + 15)
-									  & ~15L;
-		currentMode->imageWidth       = pScrn->displayWidth;
-		currentMode->imageHeight      = pSmi->FBReserved
-									  / currentMode->bytesPerScanline;
-	    currentMode->pixmapWidth      = currentMode->imageWidth;
-	    currentMode->pixmapHeight     = currentMode->imageHeight;
-	    currentMode->maxViewportX     = currentMode->imageWidth
-	    							  - currentMode->viewportWidth;
-	    currentMode->maxViewportY     = currentMode->imageHeight
-	    							  - currentMode->viewportHeight;
-
-		pMode = pMode->next;
-		if (pMode == firstMode)
-		{
-			break;
-		}
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    SMIPtr pSmi = SMIPTR(pScrn);
+    DGAModePtr modes = NULL, newmodes = NULL, currentMode;
+    DisplayModePtr pMode, firstMode;
+    int Bpp = pScrn->bitsPerPixel >> 3;
+    int num = 0;
+    Bool ret;
+
+    ENTER_PROC("SMI_DGAInit");
+
+    pMode = firstMode = pScrn->modes;
+
+    while (pMode) {
+	newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+	if (newmodes == NULL) {
+	    xfree(modes);
+	    LEAVE_PROC("SMI_DGAInit");
+	    return FALSE;
 	}
 
-	pSmi->numDGAModes = num;
-	pSmi->DGAModes    = modes;
+	modes = newmodes;
+
+	currentMode = modes + num;
+	num++;
+
+	currentMode->mode  = pMode;
+	currentMode->flags = DGA_PIXMAP_AVAILABLE;
+	if (!pSmi->NoAccel) {
+	    currentMode->flags |= DGA_FILL_RECT
+			       |  DGA_BLIT_RECT
+			       |  DGA_BLIT_RECT_TRANS;
+	}
+	if (pMode->Flags & V_DBLSCAN) {
+	    currentMode->flags |= DGA_DOUBLESCAN;
+	}
+	if (pMode->Flags & V_INTERLACE) {
+	    currentMode->flags |= DGA_INTERLACED;
+	}
 
-	ret = DGAInit(pScreen, &SMI_DGAFuncs, modes, num);
-	LEAVE_PROC("SMI_DGAInit");
-	return(ret);
+	currentMode->byteOrder      = pScrn->imageByteOrder;
+	currentMode->depth          = pScrn->depth;
+	currentMode->bitsPerPixel   = pScrn->bitsPerPixel;
+	currentMode->red_mask       = pScrn->mask.red;
+	currentMode->green_mask     = pScrn->mask.green;
+	currentMode->blue_mask      = pScrn->mask.blue;
+	currentMode->visualClass    = (Bpp == 1) ? PseudoColor : TrueColor;
+	currentMode->viewportWidth  = pMode->HDisplay;
+	currentMode->viewportHeight = pMode->VDisplay;
+	currentMode->xViewportStep  = (Bpp == 3) ? 8 : (8 / Bpp);
+	currentMode->yViewportStep  = 1;
+	currentMode->viewportFlags  = DGA_FLIP_RETRACE;
+	currentMode->offset         = 0;
+	currentMode->address        = pSmi->FBBase;
+
+	xf86ErrorFVerb(VERBLEV, "\tSMI_DGAInit %dx%d @ %d bpp\n",
+			currentMode->viewportWidth, currentMode->viewportHeight,
+			currentMode->bitsPerPixel);
+
+	currentMode->bytesPerScanline = ((pScrn->displayWidth * Bpp) + 15) & ~15L;
+	currentMode->imageWidth       = pScrn->displayWidth;
+	currentMode->imageHeight      = pSmi->FBReserved / currentMode->bytesPerScanline;
+	currentMode->pixmapWidth      = currentMode->imageWidth;
+	currentMode->pixmapHeight     = currentMode->imageHeight;
+	currentMode->maxViewportX     = currentMode->imageWidth - currentMode->viewportWidth;
+	currentMode->maxViewportY     = currentMode->imageHeight - currentMode->viewportHeight;
+
+	pMode = pMode->next;
+	if (pMode == firstMode) {
+	    break;
+	}
+    }
+
+    pSmi->numDGAModes = num;
+    pSmi->DGAModes    = modes;
+
+    ret = DGAInit(pScreen, &SMI_DGAFuncs, modes, num);
+    LEAVE_PROC("SMI_DGAInit");
+    return ret;
 }
 
 static Bool
 SMI_SetMode(ScrnInfoPtr pScrn, DGAModePtr pMode)
 {
-	static int OldDisplayWidth[MAXSCREENS];
-	int index = pScrn->pScreen->myNum;
-	SMIPtr pSmi = SMIPTR(pScrn);
+    static int OldDisplayWidth[MAXSCREENS];
+    int index = pScrn->pScreen->myNum;
+    SMIPtr pSmi = SMIPTR(pScrn);
 
-	ENTER_PROC("SMI_SetMode");
+    ENTER_PROC("SMI_SetMode");
 
-	if (pMode == NULL)
-	{	/* restore the original mode */
+    if (pMode == NULL) {
+	/* restore the original mode */
 
-		/* put the ScreenParameters back */
-		pScrn->displayWidth = OldDisplayWidth[index];
+	/* put the ScreenParameters back */
+	pScrn->displayWidth = OldDisplayWidth[index];
 
-		SMI_SwitchMode(index, pScrn->currentMode, 0);
-		pSmi->DGAactive = FALSE;
-	}
-	else
-	{
-		if (!pSmi->DGAactive)
-		{	/* save the old parameters */
-			OldDisplayWidth[index] = pScrn->displayWidth;
+	SMI_SwitchMode(index, pScrn->currentMode, 0);
+	pSmi->DGAactive = FALSE;
+    } else {
+	if (!pSmi->DGAactive) {
+	    /* save the old parameters */
+	    OldDisplayWidth[index] = pScrn->displayWidth;
 
-			pSmi->DGAactive = TRUE;
-		}
+	    pSmi->DGAactive = TRUE;
+	}
 
-		pScrn->displayWidth = pMode->bytesPerScanline
-							/ (pMode->bitsPerPixel >> 3);
+	pScrn->displayWidth = pMode->bytesPerScanline / (pMode->bitsPerPixel >> 3);
 
-		SMI_SwitchMode(index, pMode->mode, 0);
-	}
+	SMI_SwitchMode(index, pMode->mode, 0);
+    }
 
-	LEAVE_PROC("SMI_SetMode");
-	return(TRUE);
+    LEAVE_PROC("SMI_SetMode");
+    return TRUE;
 }
 
 
@@ -202,103 +189,97 @@ SMI_GetViewport(ScrnInfoPtr pScrn)
 {
     SMIPtr pSmi = SMIPTR(pScrn);
 
-	ENTER_PROC("SMI_GetViewport");
+    ENTER_PROC("SMI_GetViewport");
 
-	LEAVE_PROC("SMI_GetViewport");
+    LEAVE_PROC("SMI_GetViewport");
 
-    return(pSmi->DGAViewportStatus);
+    return pSmi->DGAViewportStatus;
 }
 
 static void
 SMI_SetViewport(ScrnInfoPtr pScrn, int x, int y, int flags)
 {
-	SMIPtr pSmi = SMIPTR(pScrn);
+    SMIPtr pSmi = SMIPTR(pScrn);
 
-	ENTER_PROC("SMI_SetViewport");
+    ENTER_PROC("SMI_SetViewport");
 
-	SMI_AdjustFrame(pScrn->pScreen->myNum, x, y, flags);
-	pSmi->DGAViewportStatus = 0;
+    SMI_AdjustFrame(pScrn->pScreen->myNum, x, y, flags);
+    pSmi->DGAViewportStatus = 0;
 
-	LEAVE_PROC("SMI_SetViewport");
+    LEAVE_PROC("SMI_SetViewport");
 }
 
 static void
 SMI_FillRect(ScrnInfoPtr pScrn, int x, int y, int w, int h, unsigned long color)
 {
-	SMIPtr pSmi = SMIPTR(pScrn);
+    SMIPtr pSmi = SMIPTR(pScrn);
 
-	ENTER_PROC("SMI_FillRect");
+    ENTER_PROC("SMI_FillRect");
 
-	if (pSmi->AccelInfoRec)
-	{
-		(*pSmi->AccelInfoRec->SetupForSolidFill)(pScrn, color, GXcopy, ~0);
-		(*pSmi->AccelInfoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
-		SET_SYNC_FLAG(pSmi->AccelInfoRec);
-	}
+    if (pSmi->AccelInfoRec) {
+	(*pSmi->AccelInfoRec->SetupForSolidFill)(pScrn, color, GXcopy, ~0);
+	(*pSmi->AccelInfoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
+	SET_SYNC_FLAG(pSmi->AccelInfoRec);
+    }
 
-	LEAVE_PROC("SMI_FillRect");
+    LEAVE_PROC("SMI_FillRect");
 }
 
 static void
 SMI_BlitRect(ScrnInfoPtr pScrn, int srcx, int srcy, int w, int h, int dstx,
-			 int dsty)
+	     int dsty)
 {
-	SMIPtr pSmi = SMIPTR(pScrn);
+    SMIPtr pSmi = SMIPTR(pScrn);
 
-	ENTER_PROC("SMI_BlitRect");
+    ENTER_PROC("SMI_BlitRect");
 
-    if (pSmi->AccelInfoRec)
-    {
-		int xdir = ((srcx < dstx) && (srcy == dsty)) ? -1 : 1;
-		int ydir = (srcy < dsty) ? -1 : 1;
+    if (pSmi->AccelInfoRec) {
+	int xdir = ((srcx < dstx) && (srcy == dsty)) ? -1 : 1;
+	int ydir = (srcy < dsty) ? -1 : 1;
 
-		(*pSmi->AccelInfoRec->SetupForScreenToScreenCopy)(pScrn, xdir, ydir,
-														  GXcopy, ~0, -1);
-		(*pSmi->AccelInfoRec->SubsequentScreenToScreenCopy)(pScrn, srcx, srcy,
-															dstx, dsty, w, h);
-		SET_SYNC_FLAG(pSmi->AccelInfoRec);
-	}
+	(*pSmi->AccelInfoRec->SetupForScreenToScreenCopy)(pScrn, xdir, ydir, GXcopy, ~0, -1);
+	(*pSmi->AccelInfoRec->SubsequentScreenToScreenCopy)(pScrn, srcx, srcy, dstx, dsty, w, h);
+	SET_SYNC_FLAG(pSmi->AccelInfoRec);
+    }
 
-	LEAVE_PROC("SMI_BlitRect");
+    LEAVE_PROC("SMI_BlitRect");
 }
 
 static void
 SMI_BlitTransRect(ScrnInfoPtr pScrn, int srcx, int srcy, int w, int h, int dstx,
-				  int dsty, unsigned long color)
+		  int dsty, unsigned long color)
 {
-	SMIPtr pSmi = SMIPTR(pScrn);
+    SMIPtr pSmi = SMIPTR(pScrn);
 
-	ENTER_PROC("SMI_BlitTraneRect");
+    ENTER_PROC("SMI_BlitTraneRect");
 
-	if (pSmi->AccelInfoRec)
-	{
-		int xdir = ((srcx < dstx) && (srcy == dsty)) ? -1 : 1;
-		int ydir = (srcy < dsty) ? -1 : 1;
+    if (pSmi->AccelInfoRec) {
+	int xdir = ((srcx < dstx) && (srcy == dsty)) ? -1 : 1;
+	int ydir = (srcy < dsty) ? -1 : 1;
 
-		(*pSmi->AccelInfoRec->SetupForScreenToScreenCopy)(pScrn, xdir, ydir,
-														  GXcopy, ~0, color);
-		(*pSmi->AccelInfoRec->SubsequentScreenToScreenCopy)(pScrn, srcx, srcy,
-															dstx, dsty, w, h);
-		SET_SYNC_FLAG(pSmi->AccelInfoRec);
-	}
+	(*pSmi->AccelInfoRec->SetupForScreenToScreenCopy)(pScrn, xdir, ydir, GXcopy, ~0, color);
+	(*pSmi->AccelInfoRec->SubsequentScreenToScreenCopy)(pScrn, srcx, srcy, dstx, dsty, w, h);
+	SET_SYNC_FLAG(pSmi->AccelInfoRec);
+    }
 
-	LEAVE_PROC("SMI_BlitTraneRect");
+    LEAVE_PROC("SMI_BlitTraneRect");
 }
 
 static Bool
 SMI_OpenFramebuffer(ScrnInfoPtr pScrn, char **name, unsigned char **mem,
-					int *size, int *offset, int *flags)
+		    int *size, int *offset, int *flags)
 {
-	SMIPtr pSmi = SMIPTR(pScrn);
+    SMIPtr pSmi = SMIPTR(pScrn);
 
-	ENTER_PROC("SMI_OpenFrameBuffer");
+    ENTER_PROC("SMI_OpenFrameBuffer");
 
-	*name   = NULL;	/* no special device */
-	*mem    = (unsigned char*)pSmi->FBBase;
-	*size   = pSmi->videoRAMBytes;
-	*offset = 0;
-	*flags  = DGA_NEED_ROOT;
+    *name   = NULL;	/* no special device */
+    *mem    = (unsigned char*)pSmi->FBBase;
+    *size   = pSmi->videoRAMBytes;
+    *offset = 0;
+    *flags  = DGA_NEED_ROOT;
 
-	LEAVE_PROC("SMI_OpenFrameBuffer");
-	return(TRUE);
+    LEAVE_PROC("SMI_OpenFrameBuffer");
+    return TRUE;
 }
+