XLibre/xf86-video-sunffb
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-sunffb.git synced 2026-03-24 01:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Strip trailing whitespace from source files

Browse Source 
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 <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb/-/merge_requests/10>
This commit is contained in:
Alan Coopersmith
2025-08-20 17:48:50 -07:00
committed by Enrico Weigelt, metux IT consult
parent 166adfdcf3
commit 971c41ec00
11 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -71,8 +71,8 @@ core
*.tar.bz2
*.tar.gz
#
# Add & Override patterns for xf86-video-sunffb
# Add & Override patterns for xf86-video-sunffb
#
# Edit the following section as needed
# For example, !report.pc overrides *.pc. See 'man gitignore'
#
#

2
man/Makefile.am
View File

@@ -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)

2
src/VISmoveImage.s
View File

@@ -30,7 +30,7 @@
* hardware bug. -DaveM
*/
/*
/*
void
VISmoveImageLR(unsigned char *src, unsigned char *dst, long w, long h, long skind, long dkind)
{

2
src/ffb.h
View File

@@ -78,7 +78,7 @@
#define FFB_DAC_VOFF 0x0bc06000
#define FFB_PROM_VOFF 0x0bc08000
#define FFB_EXP_VOFF 0x0bc18000
#if defined(__GNUC__) && defined(USE_VIS)
#define FFB_ALIGN64 __attribute__((aligned(8)))
#else

4
src/ffb_asm.s
View File

@@ -291,7 +291,7 @@ FFB_LINE_LOOP1:
add %o2, 4, %o2
or %g7, %g3, %g7
subcc %g1, 3, %g1
bl,pn %icc, FFB_LINE1_WAIT
add %g7, %o4, %g7
9: cmp %o2, %o3
@@ -332,7 +332,7 @@ FFB_LINE_LOOP2:
sllx %g4, 32, %g7
srl %g4, 16, %g3
add %o2, 4, %o2
or %g7, %g3, %g7
subcc %g1, 3, %g1
bl,pn %icc, FFB_LINE2_WAIT

6
src/ffb_attr.c
View File

@@ -17,9 +17,9 @@
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* 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
* JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* 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.
*/

8
src/ffb_cursor.c
View File

@@ -55,7 +55,7 @@ FFBLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
FFBDacCursorLoadBitmap(pFfb, x, y, data);
}
static void
static void
FFBShowCursor(ScrnInfoPtr pScrn)
{
FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn);
@@ -97,7 +97,7 @@ FFBSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
pFfb->CursorShiftY = CursorShiftY;
FFBLoadCursorImage(pScrn, pFfb->CursorData);
}
FFBDacLoadCursorPos(pFfb, x, y);
}
@@ -109,7 +109,7 @@ FFBSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
FFBDacLoadCursorColor(pFfb, fg, bg);
}
Bool
Bool
FFBHWCursorInit(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
@@ -123,7 +123,7 @@ FFBHWCursorInit(ScreenPtr pScreen)
infoPtr = xf86CreateCursorInfoRec();
if(!infoPtr) return FALSE;
pFfb->CursorInfoRec = infoPtr;
infoPtr->MaxWidth = 64;

6
src/ffb_dac.c
View File

@@ -197,7 +197,7 @@ dac_stop(FFBPtr pFfb)
if (vctr == 0)
break;
}
}
DACCFG_WRITE(dac, FFBDAC_CFG_TGEN, 0);
}
@@ -555,7 +555,7 @@ FFBDacSaveScreen(FFBPtr pFfb, int mode) {
/* DPMS Control, also hinted at by David Miller.
The rule seems to be:
StandBy = -HSYNC +VSYNC -VIDEO
Suspend = +HSYNC -VSYNC -VIDEO
Off = -HSYNC -VSYNC -VIDEO
@@ -605,7 +605,7 @@ FFBDacDPMSMode(FFBPtr pFfb, int DPMSMode, int flags) {
tmp |= (FFBDAC_CFG_TGEN_VSD | FFBDAC_CFG_TGEN_HSD); /* Kill HSYNC, VSYNC both */
tmp &= ~FFBDAC_CFG_TGEN_VIDE; /* Kill the video */
break;
default:
return; /* If we get here, we really should log an error */
}

32
src/ffb_driver.c
View File

@@ -68,7 +68,7 @@ void FFBSync(ScrnInfoPtr pScrn);
#define FFB_MINOR_VERSION PACKAGE_VERSION_MINOR
#define FFB_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
@@ -236,7 +236,7 @@ FFBProbe(DriverPtr drv, int flags)
numUsed = xf86MatchSbusInstances(FFB_NAME, SBUS_DEVICE_FFB,
devSections, numDevSections,
drv, &usedChips);
free(devSections);
if (numUsed <= 0)
return FALSE;
@@ -251,7 +251,7 @@ FFBProbe(DriverPtr drv, int flags)
*/
if(pEnt->active) {
ScrnInfoPtr pScrn;
/* Allocate a ScrnInfoRec and claim the slot */
pScrn = xf86AllocateScreen(drv, 0);
@@ -293,7 +293,7 @@ FFBPreInit(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.
*
@@ -306,7 +306,7 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
pFfb = GET_FFB_FROM_SCRN(pScrn);
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -328,7 +328,7 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
/*********************
deal with depth
*********************/
if (!xf86SetDepthBpp(pScrn, 24, 0, 32, Support32bppFb)) {
return FALSE;
} else {
@@ -352,7 +352,7 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
memcpy(pFfb->Options, FFBOptions, sizeof(FFBOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pFfb->Options);
/*
* This must happen after pScrn->display has been set because
* xf86SetWeight references it.
@@ -385,7 +385,7 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
from = X_DEFAULT;
/* determine whether we use hardware or software cursor */
pFfb->HWCursor = TRUE;
if (xf86GetOptValBool(pFfb->Options, OPTION_HW_CURSOR, &pFfb->HWCursor))
from = X_CONFIG;
@@ -393,7 +393,7 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
from = X_CONFIG;
pFfb->HWCursor = FALSE;
}
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
pFfb->HWCursor ? "HW" : "SW");
@@ -401,7 +401,7 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
pFfb->NoAccel = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
}
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
FFBFreeRec(pScrn);
return FALSE;
@@ -427,7 +427,7 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
/*********************
set up clock and mode stuff
*********************/
pScrn->progClock = TRUE;
if(pScrn->display->virtualX || pScrn->display->virtualY) {
@@ -574,7 +574,7 @@ FFBScreenInit(SCREEN_INIT_ARGS_DECL)
unsigned int afb_fem;
VisualPtr visual;
/*
/*
* First get the ScrnInfoRec
*/
pScrn = xf86ScreenToScrn(pScreen);
@@ -761,12 +761,12 @@ FFBScreenInit(SCREEN_INIT_ARGS_DECL)
/* Initialise cursor functions */
miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
/* Initialize HW cursor layer.
/* Initialize HW cursor layer.
* Must follow software cursor initialization.
*/
if (pFfb->HWCursor) {
if (pFfb->HWCursor) {
if(!FFBHWCursorInit(pScreen)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Hardware cursor initialization failed\n");
return(FALSE);
}
@@ -824,7 +824,7 @@ FFBSwitchMode(SWITCH_MODE_ARGS_DECL)
* displayed location in the video memory.
*/
/* Usually mandatory */
static void
static void
FFBAdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
/* we don't support virtual desktops */

10
src/ffb_regs.h
View File

@@ -102,11 +102,11 @@ typedef struct _ffb_fbc {
/* fastfill(NX) */
/*0x78*/unsigned int pad6[2]; /* Reserved */
/*0x80*/unsigned int pad7[32]; /* Reserved */
/* Setup Unit's vertex state register */
/*100*/ volatile unsigned int suvtx;
/*104*/ unsigned int pad8[63]; /* Reserved */
/* Frame Buffer Control Registers */
/*200*/ volatile unsigned int ppc; /* Pixel Processor Control */
/*204*/ volatile unsigned int wid; /* Current WID */
@@ -149,7 +149,7 @@ typedef struct _ffb_fbc {
/*298*/ volatile unsigned int ypmask; /* Y PlaneMask */
/*29c*/ volatile unsigned int zpmask; /* Z PlaneMask */
/*2a0*/ ffb_auxclip auxclip[4]; /* Auxiliary Viewport Clip */
/* New 3dRAM III support regs */
/*2c0*/ volatile unsigned int rawblend2;
/*2c4*/ volatile unsigned int rawpreblend;
@@ -167,7 +167,7 @@ typedef struct _ffb_fbc {
/*2f4*/ volatile unsigned int rawcmp;
/*2f8*/ volatile unsigned int rawwac;
/*2fc*/ volatile unsigned int fbramid;
/*300*/ volatile unsigned int drawop; /* Draw OPeration */
/*304*/ unsigned int pad10[2]; /* Reserved */
/*30c*/ volatile unsigned int lpat; /* Line Pattern control */
@@ -488,7 +488,7 @@ do { __asm__ __volatile__ ("ldx\t%0, %%g2;" \
"stx\t%%g2, %1" \
: : "m" (*(__srcp)), "m" (*(__regp)) \
: "g2"); \
} while(0)
} while(0)
#define FFB_WRITE64(__regp, __lo32, __hi32) \
FFB_WRITE64_COMMON(__regp, __lo32, __hi32, g2, g3)

2
src/ffb_wid.c
View File

@@ -217,7 +217,7 @@ update_wids(FFBPtr pFfb, int index)
DACCFG_WRITE(dac, base, p->wid_table.wid_pool[index].wlut_regval);
/* Schedule the window transfer. */
DACCFG_WRITE(dac, FFBDAC_CFG_WTCTRL,
DACCFG_WRITE(dac, FFBDAC_CFG_WTCTRL,
(FFBDAC_CFG_WTCTRL_TCMD | FFBDAC_CFG_WTCTRL_TE));
limit = 1000000;