mirror of
https://github.com/X11Libre/xf86-video-sunleo.git
synced 2026-03-24 01:25:11 +00:00
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 <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunleo/-/merge_requests/9>
This commit is contained in:
committed by
Enrico Weigelt, metux IT consult
parent
652b23746e
commit
e50ab0e4a5
4
.gitignore
vendored
4
.gitignore
vendored
@@ -71,8 +71,8 @@ core
|
||||
*.tar.bz2
|
||||
*.tar.gz
|
||||
#
|
||||
# Add & Override patterns for xf86-video-sunleo
|
||||
# Add & Override patterns for xf86-video-sunleo
|
||||
#
|
||||
# Edit the following section as needed
|
||||
# For example, !report.pc overrides *.pc. See 'man gitignore'
|
||||
#
|
||||
#
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ int leoRopTable[16] = {
|
||||
void LeoVtChange (ScreenPtr pScreen, int enter)
|
||||
{
|
||||
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
||||
LeoPtr pLeo = GET_LEO_FROM_SCRN (pScrn);
|
||||
LeoPtr pLeo = GET_LEO_FROM_SCRN (pScrn);
|
||||
LeoCommand0 *lc0 = pLeo->lc0;
|
||||
LeoDraw *ld0 = pLeo->ld0;
|
||||
|
||||
@@ -74,14 +74,14 @@ void LeoVtChange (ScreenPtr pScreen, int enter)
|
||||
ld0->fg = 0;
|
||||
ld0->vclipmin = 0;
|
||||
ld0->vclipmax = (pLeo->psdp->width - 1) | ((pLeo->psdp->height - 1) << 16);
|
||||
|
||||
|
||||
while (lc0->csr & LEO_CSR_BLT_BUSY);
|
||||
|
||||
|
||||
lc0->extent = (pLeo->psdp->width - 1) | ((pLeo->psdp->height - 1) << 11);
|
||||
lc0->fill = 0;
|
||||
|
||||
|
||||
while (lc0->csr & LEO_CSR_BLT_BUSY);
|
||||
|
||||
|
||||
lc0->addrspace = LEO_ADDRSPC_OBGR;
|
||||
ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
|
||||
}
|
||||
@@ -115,14 +115,14 @@ Bool LeoAccelInit (ScreenPtr pScreen, LeoPtr pLeo)
|
||||
pLeo->vclipmax = (pLeo->psdp->width - 1) | ((pLeo->psdp->height - 1) << 16);
|
||||
pLeo->width = pLeo->psdp->width;
|
||||
pLeo->height = pLeo->psdp->height;
|
||||
|
||||
|
||||
while (lc0->csr & LEO_CSR_BLT_BUSY);
|
||||
|
||||
|
||||
lc0->extent = (pLeo->psdp->width - 1) | ((pLeo->psdp->height - 1) << 11);
|
||||
lc0->fill = 0;
|
||||
|
||||
|
||||
while (lc0->csr & LEO_CSR_BLT_BUSY);
|
||||
|
||||
|
||||
lc0->addrspace = LEO_ADDRSPC_OBGR;
|
||||
ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ LeoLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
LeoShowCursor(ScrnInfoPtr pScrn)
|
||||
{
|
||||
LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
|
||||
@@ -105,7 +105,7 @@ LeoSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
|
||||
pLeo->CursorShiftY = CursorShiftY;
|
||||
LeoLoadCursorImage(pScrn, pLeo->CursorData);
|
||||
}
|
||||
|
||||
|
||||
pLeo->dac->cur_cursxy = ((y & 0x7ff) << 11) | (x & 0x7ff);
|
||||
pLeo->dac->cur_misc |= 0x30;
|
||||
pLeo->dac->cur_misc |= 0x80;
|
||||
@@ -122,7 +122,7 @@ LeoSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
|
||||
pLeo->dac->cur_misc |= 0x03;
|
||||
}
|
||||
|
||||
Bool
|
||||
Bool
|
||||
LeoHWCursorInit(ScreenPtr pScreen)
|
||||
{
|
||||
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
||||
@@ -136,7 +136,7 @@ LeoHWCursorInit(ScreenPtr pScreen)
|
||||
|
||||
infoPtr = xf86CreateCursorInfoRec();
|
||||
if(!infoPtr) return FALSE;
|
||||
|
||||
|
||||
pLeo->CursorInfoRec = infoPtr;
|
||||
pLeo->dac = (LeoCursor *)((char *)pLeo->fb + LEO_LX0_CURSOR_VOFF);
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ void LeoSync(ScrnInfoPtr pScrn);
|
||||
#define LEO_MINOR_VERSION PACKAGE_VERSION_MINOR
|
||||
#define LEO_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
|
||||
@@ -234,7 +234,7 @@ LeoProbe(DriverPtr drv, int flags)
|
||||
numUsed = xf86MatchSbusInstances(LEO_NAME, SBUS_DEVICE_LEO,
|
||||
devSections, numDevSections,
|
||||
drv, &usedChips);
|
||||
|
||||
|
||||
free(devSections);
|
||||
if (numUsed <= 0)
|
||||
return FALSE;
|
||||
@@ -249,7 +249,7 @@ LeoProbe(DriverPtr drv, int flags)
|
||||
*/
|
||||
if(pEnt->active) {
|
||||
ScrnInfoPtr pScrn;
|
||||
|
||||
|
||||
/* Allocate a ScrnInfoRec and claim the slot */
|
||||
pScrn = xf86AllocateScreen(drv, 0);
|
||||
|
||||
@@ -291,7 +291,7 @@ LeoPreInit(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.
|
||||
*
|
||||
@@ -304,7 +304,7 @@ LeoPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
return FALSE;
|
||||
}
|
||||
pLeo = GET_LEO_FROM_SCRN(pScrn);
|
||||
|
||||
|
||||
/* Set pScrn->monitor */
|
||||
pScrn->monitor = pScrn->confScreen->monitor;
|
||||
|
||||
@@ -326,7 +326,7 @@ LeoPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
/*********************
|
||||
deal with depth
|
||||
*********************/
|
||||
|
||||
|
||||
if (!xf86SetDepthBpp(pScrn, 32, 0, 32, Support32bppFb)) {
|
||||
return FALSE;
|
||||
} else {
|
||||
@@ -350,7 +350,7 @@ LeoPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
return FALSE;
|
||||
memcpy(pLeo->Options, LeoOptions, sizeof(LeoOptions));
|
||||
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pLeo->Options);
|
||||
|
||||
|
||||
/*
|
||||
* This must happen after pScrn->display has been set because
|
||||
* xf86SetWeight references it.
|
||||
@@ -392,7 +392,7 @@ LeoPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
from = X_DEFAULT;
|
||||
|
||||
/* determine whether we use hardware or software cursor */
|
||||
|
||||
|
||||
pLeo->HWCursor = TRUE;
|
||||
if (xf86GetOptValBool(pLeo->Options, OPTION_HW_CURSOR, &pLeo->HWCursor))
|
||||
from = X_CONFIG;
|
||||
@@ -400,7 +400,7 @@ LeoPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
from = X_CONFIG;
|
||||
pLeo->HWCursor = FALSE;
|
||||
}
|
||||
|
||||
|
||||
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
|
||||
pLeo->HWCursor ? "HW" : "SW");
|
||||
|
||||
@@ -408,7 +408,7 @@ LeoPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
pLeo->NoAccel = TRUE;
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
|
||||
}
|
||||
|
||||
|
||||
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
|
||||
LeoFreeRec(pScrn);
|
||||
return FALSE;
|
||||
@@ -422,7 +422,7 @@ LeoPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
/*********************
|
||||
set up clock and mode stuff
|
||||
*********************/
|
||||
|
||||
|
||||
pScrn->progClock = TRUE;
|
||||
|
||||
if(pScrn->display->virtualX || pScrn->display->virtualY) {
|
||||
@@ -454,7 +454,7 @@ LeoScreenInit(SCREEN_INIT_ARGS_DECL)
|
||||
int ret;
|
||||
VisualPtr visual;
|
||||
|
||||
/*
|
||||
/*
|
||||
* First get the ScrnInfoRec
|
||||
*/
|
||||
pScrn = xf86ScreenToScrn(pScreen);
|
||||
@@ -531,12 +531,12 @@ LeoScreenInit(SCREEN_INIT_ARGS_DECL)
|
||||
/* Initialise cursor functions */
|
||||
miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
|
||||
|
||||
/* Initialize HW cursor layer.
|
||||
/* Initialize HW cursor layer.
|
||||
Must follow software cursor initialization*/
|
||||
if (pLeo->HWCursor) {
|
||||
if (pLeo->HWCursor) {
|
||||
|
||||
if(!LeoHWCursorInit(pScreen)) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
"Hardware cursor initialization failed\n");
|
||||
return(FALSE);
|
||||
}
|
||||
@@ -577,7 +577,7 @@ LeoSwitchMode(SWITCH_MODE_ARGS_DECL)
|
||||
* displayed location in the video memory.
|
||||
*/
|
||||
/* Usually mandatory */
|
||||
static void
|
||||
static void
|
||||
LeoAdjustFrame(ADJUST_FRAME_ARGS_DECL)
|
||||
{
|
||||
/* we don't support virtual desktops */
|
||||
|
||||
Reference in New Issue
Block a user