From 771dd91e375676fa78c6658d5e7063a31875b821 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 20 Aug 2025 17:46:24 -0700 Subject: [PATCH] Strip trailing whitespace from source files Performed with: `git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'` `git diff -w` & `git diff -b` show no diffs from this change Signed-off-by: Alan Coopersmith Part-of: --- .gitignore | 4 ++-- man/Makefile.am | 2 +- src/cg6.h | 2 +- src/cg6_cursor.c | 6 +++--- src/cg6_driver.c | 34 +++++++++++++++++----------------- src/cg6_regs.h | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 1559e87..e8e0f88 100644 --- a/.gitignore +++ b/.gitignore @@ -71,8 +71,8 @@ core *.tar.bz2 *.tar.gz # -# Add & Override patterns for xf86-video-suncg6 +# Add & Override patterns for xf86-video-suncg6 # # Edit the following section as needed # For example, !report.pc overrides *.pc. See 'man gitignore' -# +# diff --git a/man/Makefile.am b/man/Makefile.am index b3688ce..907544f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -19,7 +19,7 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -# +# drivermandir = $(DRIVER_MAN_DIR) diff --git a/src/cg6.h b/src/cg6.h index bd148fe..cf86c4f 100644 --- a/src/cg6.h +++ b/src/cg6.h @@ -87,7 +87,7 @@ extern int Cg6WindowPrivateIndex; #define Cg6GetWindowPrivate(w) \ ((Cg6StipplePtr) (w)->devPrivates[Cg6WindowPrivateIndex].ptr) - + #define Cg6SetWindowPrivate(w,p) \ ((w)->devPrivates[Cg6WindowPrivateIndex].ptr = (pointer) p) diff --git a/src/cg6_cursor.c b/src/cg6_cursor.c index ad90c52..4000e36 100644 --- a/src/cg6_cursor.c +++ b/src/cg6_cursor.c @@ -49,7 +49,7 @@ CG6LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src) pCg6->thc->thc_cursbits[i] = *data++; } -static void +static void CG6ShowCursor(ScrnInfoPtr pScrn) { Cg6Ptr pCg6 = GET_CG6_FROM_SCRN(pScrn); @@ -89,7 +89,7 @@ CG6SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) } } -Bool +Bool CG6HWCursorInit(ScreenPtr pScreen) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; @@ -103,7 +103,7 @@ CG6HWCursorInit(ScreenPtr pScreen) infoPtr = xf86CreateCursorInfoRec(); if(!infoPtr) return FALSE; - + pCg6->CursorInfoRec = infoPtr; infoPtr->MaxWidth = 32; diff --git a/src/cg6_driver.c b/src/cg6_driver.c index 331769c..1278839 100644 --- a/src/cg6_driver.c +++ b/src/cg6_driver.c @@ -67,7 +67,7 @@ void CG6Sync(ScrnInfoPtr pScrn); #define CG6_MINOR_VERSION PACKAGE_VERSION_MINOR #define CG6_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL -/* +/* * This contains the functions needed by the server after loading the driver * module. It must be supplied, and gets passed back by the SetupProc * function in the dynamic case. In the static case, a reference to this @@ -235,7 +235,7 @@ CG6Probe(DriverPtr drv, int flags) numUsed = xf86MatchSbusInstances(CG6_NAME, SBUS_DEVICE_CG6, devSections, numDevSections, drv, &usedChips); - + free(devSections); if (numUsed <= 0) return FALSE; @@ -250,7 +250,7 @@ CG6Probe(DriverPtr drv, int flags) */ if(pEnt->active) { ScrnInfoPtr pScrn; - + /* Allocate a ScrnInfoRec and claim the slot */ pScrn = xf86AllocateScreen(drv, 0); @@ -292,7 +292,7 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags) * not at the start of each server generation. This means that * only things that are persistent across server generations can * be initialised here. xf86Screens[] is (pScrn is a pointer to one - * of these). Privates allocated using xf86AllocateScrnInfoPrivateIndex() + * of these). Privates allocated using xf86AllocateScrnInfoPrivateIndex() * are too, and should be used for data that must persist across * server generations. * @@ -305,7 +305,7 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } pCg6 = GET_CG6_FROM_SCRN(pScrn); - + /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -327,7 +327,7 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags) /********************* deal with depth *********************/ - + if (!xf86SetDepthBpp(pScrn, 8, 0, 0, NoDepth24Support)) { return FALSE; } else { @@ -351,7 +351,7 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags) return FALSE; memcpy(pCg6->Options, CG6Options, sizeof(CG6Options)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pCg6->Options); - + if (!xf86SetDefaultVisual(pScrn, -1)) return FALSE; @@ -371,7 +371,7 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags) from = X_DEFAULT; /* determine whether we use hardware or software cursor */ - + pCg6->HWCursor = TRUE; if (xf86GetOptValBool(pCg6->Options, OPTION_HW_CURSOR, &pCg6->HWCursor)) from = X_CONFIG; @@ -379,7 +379,7 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags) from = X_CONFIG; pCg6->HWCursor = FALSE; } - + xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n", pCg6->HWCursor ? "HW" : "SW"); @@ -387,7 +387,7 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags) pCg6->NoAccel = TRUE; xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n"); } - + if (xf86LoadSubModule(pScrn, "fb") == NULL) { CG6FreeRec(pScrn); return FALSE; @@ -401,7 +401,7 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags) /********************* set up clock and mode stuff *********************/ - + pScrn->progClock = TRUE; if(pScrn->display->virtualX || pScrn->display->virtualY) { @@ -473,7 +473,7 @@ CG6ScreenInit(SCREEN_INIT_ARGS_DECL) return FALSE; miSetPixmapDepths (); - + /* * Call the framebuffer layer's ScreenInit function, and fill in other * pScreen fields. @@ -507,11 +507,11 @@ CG6ScreenInit(SCREEN_INIT_ARGS_DECL) /* Initialise cursor functions */ miDCInitialize (pScreen, xf86GetPointerScreenFuncs()); - /* Initialize HW cursor layer. + /* Initialize HW cursor layer. Must follow software cursor initialization*/ - if (pCg6->HWCursor) { + if (pCg6->HWCursor) { if(!CG6HWCursorInit(pScreen)) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Hardware cursor initialization failed\n"); return(FALSE); } @@ -555,7 +555,7 @@ CG6SwitchMode(SWITCH_MODE_ARGS_DECL) * displayed location in the video memory. */ /* Usually mandatory */ -static void +static void CG6AdjustFrame(ADJUST_FRAME_ARGS_DECL) { /* we don't support virtual desktops */ @@ -612,7 +612,7 @@ CG6CloseScreen(CLOSE_SCREEN_ARGS_DECL) xf86UnmapSbusMem(pCg6->psdp, pCg6->fbc, CG6_RAM_VOFF - CG6_FBC_VOFF + (pCg6->psdp->width * pCg6->psdp->height)); - + if (pCg6->HWCursor) xf86SbusHideOsHwCursor(pCg6->psdp); diff --git a/src/cg6_regs.h b/src/cg6_regs.h index 7748007..97e1a64 100644 --- a/src/cg6_regs.h +++ b/src/cg6_regs.h @@ -136,7 +136,7 @@ typedef struct cg6_fbc { unsigned int xxx0[1]; volatile unsigned int mode; volatile unsigned int clip; - unsigned int xxx1[1]; + unsigned int xxx1[1]; volatile unsigned int s; volatile unsigned int draw; volatile unsigned int blit;