whitespace cleanup using ../modular/x-indent-all.shHEADmaster

5 files changed, 21 insertions, 34 deletions

diff --git a/src/gfx/durango.c b/src/gfx/durango.c
index 83c5cf2..0a5cf44 100644
--- a/src/gfx/durango.c
+++ b/src/gfx/durango.c
@@ -345,8 +345,7 @@ gfx_inb(unsigned short port)
     unsigned char data;
 
     _asm {
-    pushf mov dx, port in al, dx mov data, al popf}
-    return (data);
+    pushf mov dx, port in al, dx mov data, al popf} return (data);
 }
 
 unsigned short
@@ -355,8 +354,7 @@ gfx_inw(unsigned short port)
     unsigned short data;
 
     _asm {
-    pushf mov dx, port in ax, dx mov data, ax popf}
-    return (data);
+    pushf mov dx, port in ax, dx mov data, ax popf} return (data);
 }
 
 unsigned long
@@ -365,31 +363,22 @@ gfx_ind(unsigned short port)
     unsigned long data;
 
     _asm {
-    pushf mov dx, port in eax, dx mov data, eax popf}
-    return (data);
+    pushf mov dx, port in eax, dx mov data, eax popf} return (data);
 }
 
 void
 gfx_outb(unsigned short port, unsigned char data)
 {
     _asm {
-    pushf mov al, data mov dx, port out dx, al popf}
-}
-
-void
+pushf mov al, data mov dx, port out dx, al popf}} void
 gfx_outw(unsigned short port, unsigned short data)
 {
     _asm {
-    pushf mov ax, data mov dx, port out dx, ax popf}
-}
-
-void
+pushf mov ax, data mov dx, port out dx, ax popf}} void
 gfx_outd(unsigned short port, unsigned long data)
 {
     _asm {
-    pushf mov eax, data mov dx, port out dx, eax popf}
-}
-
+pushf mov eax, data mov dx, port out dx, eax popf}}
 #elif defined(OS_VXWORKS) || defined (OS_LINUX) /* VxWorks and Linux */
 
 #if defined(OS_LINUX)
diff --git a/src/gfx/history.h b/src/gfx/history.h
index eec942f..4a5d6ce 100644
--- a/src/gfx/history.h
+++ b/src/gfx/history.h
@@ -136,7 +136,7 @@
 
 #if 0
 
-This file contains specific revision info SINCE THE LAST RELEASE.
-    It is not meant to be a comprehensive record of all additions.
+This file contains specific revision info SINCE THE LAST RELEASE.It is not meant
+    to be a comprehensive record of all additions.
 #endif
 /* END OF FILE */
diff --git a/src/nsc_gx1_driver.c b/src/nsc_gx1_driver.c
index e2488d2..9c1fe84 100644
--- a/src/nsc_gx1_driver.c
+++ b/src/nsc_gx1_driver.c
@@ -484,8 +484,8 @@ GX1PreInit(ScrnInfoPtr pScreenInfo, int flags)
 #endif
         pGeode->Chipset = pGeode->pEnt->chipset;
         pScreenInfo->chipset = (char *) xf86TokenToString(GeodeChipsets,
-                                                          pGeode->pEnt->
-                                                          chipset);
+                                                          pGeode->
+                                                          pEnt->chipset);
     }
 
     if (flags & PROBE_DETECT) {
@@ -2113,8 +2113,8 @@ GX1ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
                                                     (pGeode->Pitch *
                                                      pGeode->TVOy) +
                                                     (pGeode->TVOx <<
-                                                     ((pScreenInfo->
-                                                       depth >> 3) - 1)));
+                                                     ((pScreenInfo->depth >> 3)
+                                                      - 1)));
         GeodeDebug(("->memPhysBase (%X)!\n", pScreenInfo->memPhysBase));
     }
     else {
@@ -2300,8 +2300,8 @@ GX1ValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags)
 #else
             ret = gfx_is_tv_display_mode_supported(pMode->CrtcHDisplay,
                                                    pMode->CrtcVDisplay,
-                                                   (TVStandardType) pGeode->
-                                                   TvParam.wStandard);
+                                                   (TVStandardType)
+                                                   pGeode->TvParam.wStandard);
 #endif
         }
     }
diff --git a/src/nsc_gx1_video.c b/src/nsc_gx1_video.c
index 93ab2eb..7a9d8a8 100644
--- a/src/nsc_gx1_video.c
+++ b/src/nsc_gx1_video.c
@@ -378,17 +378,15 @@ GX1SetColorkey(ScrnInfoPtr pScrn, GeodePortPrivPtr pPriv)
         break;
     default:
         red = (pPriv->colorKey & pScrn->mask.red) >> pScrn->offset.red << (8 -
-                                                                           pScrn->weight.red);
+                                                                           pScrn->
+                                                                           weight.
+                                                                           red);
         green =
             (pPriv->colorKey & pScrn->mask.green) >> pScrn->offset.green << (8 -
-                                                                             pScrn->
-                                                                             weight.
-                                                                             green);
+                                                                             pScrn->weight.green);
         blue =
             (pPriv->colorKey & pScrn->mask.blue) >> pScrn->offset.blue << (8 -
-                                                                           pScrn->
-                                                                           weight.
-                                                                           blue);
+                                                                           pScrn->weight.blue);
         break;
     }
     GFX(set_video_color_key((blue | (green << 8) | (red << 16)), 0xFCFCFC,
diff --git a/src/nsc_gx2_driver.c b/src/nsc_gx2_driver.c
index a5673e8..c4de4c0 100644
--- a/src/nsc_gx2_driver.c
+++ b/src/nsc_gx2_driver.c
@@ -493,8 +493,8 @@ GX2PreInit(ScrnInfoPtr pScreenInfo, int flags)
 #endif
         pGeode->Chipset = pGeode->pEnt->chipset;
         pScreenInfo->chipset = (char *) xf86TokenToString(GeodeChipsets,
-                                                          pGeode->pEnt->
-                                                          chipset);
+                                                          pGeode->
+                                                          pEnt->chipset);
     }
 
     if (flags & PROBE_DETECT) {