mirror of
https://github.com/X11Libre/xf86-video-suntcx.git
synced 2026-03-24 01:25:13 +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-suntcx/-/merge_requests/8>
This commit is contained in:
committed by
Enrico Weigelt, metux IT consult
parent
6e6bcf4ab5
commit
0719bf7a48
4
.gitignore
vendored
4
.gitignore
vendored
@@ -71,8 +71,8 @@ core
|
||||
*.tar.bz2
|
||||
*.tar.gz
|
||||
#
|
||||
# Add & Override patterns for xf86-video-suntcx
|
||||
# Add & Override patterns for xf86-video-suntcx
|
||||
#
|
||||
# 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)
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ TCXLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
|
||||
TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
|
||||
int i, x, y;
|
||||
unsigned int *data = (unsigned int *)src;
|
||||
|
||||
|
||||
pTcx->CursorData = src;
|
||||
x = pTcx->CursorShiftX;
|
||||
y = pTcx->CursorShiftY;
|
||||
@@ -60,7 +60,7 @@ TCXLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
|
||||
pTcx->thc->thc_cursbits[i] = 0;
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
TCXShowCursor(ScrnInfoPtr pScrn)
|
||||
{
|
||||
TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
|
||||
@@ -83,7 +83,7 @@ TCXSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
|
||||
{
|
||||
TcxPtr pTcx = GET_TCX_FROM_SCRN(pScrn);
|
||||
int CursorShiftX = 0, CursorShiftY = 0;
|
||||
|
||||
|
||||
if (x < 0) {
|
||||
CursorShiftX = -x;
|
||||
x = 0;
|
||||
@@ -121,7 +121,7 @@ TCXSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
|
||||
}
|
||||
}
|
||||
|
||||
Bool
|
||||
Bool
|
||||
TCXHWCursorInit(ScreenPtr pScreen)
|
||||
{
|
||||
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
||||
@@ -138,7 +138,7 @@ TCXHWCursorInit(ScreenPtr pScreen)
|
||||
|
||||
infoPtr = xf86CreateCursorInfoRec();
|
||||
if(!infoPtr) return FALSE;
|
||||
|
||||
|
||||
pTcx->CursorInfoRec = infoPtr;
|
||||
|
||||
infoPtr->MaxWidth = 32;
|
||||
|
||||
@@ -66,7 +66,7 @@ void TCXSync(ScrnInfoPtr pScrn);
|
||||
#define TCX_MINOR_VERSION PACKAGE_VERSION_MINOR
|
||||
#define TCX_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
|
||||
@@ -232,7 +232,7 @@ TCXProbe(DriverPtr drv, int flags)
|
||||
numUsed = xf86MatchSbusInstances(TCX_NAME, SBUS_DEVICE_TCX,
|
||||
devSections, numDevSections,
|
||||
drv, &usedChips);
|
||||
|
||||
|
||||
free(devSections);
|
||||
if (numUsed <= 0)
|
||||
return FALSE;
|
||||
@@ -247,7 +247,7 @@ TCXProbe(DriverPtr drv, int flags)
|
||||
*/
|
||||
if(pEnt->active) {
|
||||
ScrnInfoPtr pScrn;
|
||||
|
||||
|
||||
/* Allocate a ScrnInfoRec and claim the slot */
|
||||
pScrn = xf86AllocateScreen(drv, 0);
|
||||
|
||||
@@ -290,7 +290,7 @@ TCXPreInit(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.
|
||||
*
|
||||
@@ -303,7 +303,7 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
return FALSE;
|
||||
}
|
||||
pTcx = GET_TCX_FROM_SCRN(pScrn);
|
||||
|
||||
|
||||
/* Set pScrn->monitor */
|
||||
pScrn->monitor = pScrn->confScreen->monitor;
|
||||
|
||||
@@ -338,7 +338,7 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
/*********************
|
||||
deal with depth
|
||||
*********************/
|
||||
|
||||
|
||||
if (!xf86SetDepthBpp(pScrn, 0, 0, 0,
|
||||
lowDepth ? NoDepth24Support : Support32bppFb)) {
|
||||
return FALSE;
|
||||
@@ -379,12 +379,12 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
if (pScrn->depth > 8) {
|
||||
rgb weight = {10, 11, 11};
|
||||
rgb mask = {0xff, 0xff00, 0xff0000};
|
||||
|
||||
|
||||
if (!xf86SetWeight(pScrn, weight, mask)) {
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!xf86SetDefaultVisual(pScrn, -1))
|
||||
return FALSE;
|
||||
else if (pScrn->depth > 8) {
|
||||
@@ -395,7 +395,7 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
xf86GetVisualName(pScrn->defaultVisual));
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* The new cmap code requires this to be initialised.
|
||||
@@ -410,7 +410,7 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
}
|
||||
|
||||
/* determine whether we use hardware or software cursor */
|
||||
|
||||
|
||||
from = X_PROBED;
|
||||
pTcx->HWCursor = FALSE;
|
||||
if (hwCursor) {
|
||||
@@ -423,7 +423,7 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
pTcx->HWCursor = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
|
||||
pTcx->HWCursor ? "HW" : "SW");
|
||||
|
||||
@@ -440,7 +440,7 @@ TCXPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
/*********************
|
||||
set up clock and mode stuff
|
||||
*********************/
|
||||
|
||||
|
||||
pScrn->progClock = TRUE;
|
||||
|
||||
if(pScrn->display->virtualX || pScrn->display->virtualY) {
|
||||
@@ -472,7 +472,7 @@ TCXScreenInit(SCREEN_INIT_ARGS_DECL)
|
||||
VisualPtr visual;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
/*
|
||||
* First get the ScrnInfoRec
|
||||
*/
|
||||
pScrn = xf86ScreenToScrn(pScreen);
|
||||
@@ -576,11 +576,11 @@ TCXScreenInit(SCREEN_INIT_ARGS_DECL)
|
||||
/* Initialise cursor functions */
|
||||
miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
|
||||
|
||||
/* Initialize HW cursor layer.
|
||||
/* Initialize HW cursor layer.
|
||||
Must follow software cursor initialization*/
|
||||
if (pTcx->HWCursor) {
|
||||
if (pTcx->HWCursor) {
|
||||
if(!TCXHWCursorInit(pScreen)) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
"Hardware cursor initialization failed\n");
|
||||
return(FALSE);
|
||||
}
|
||||
@@ -624,7 +624,7 @@ TCXSwitchMode(SWITCH_MODE_ARGS_DECL)
|
||||
* displayed location in the video memory.
|
||||
*/
|
||||
/* Usually mandatory */
|
||||
static void
|
||||
static void
|
||||
TCXAdjustFrame(ADJUST_FRAME_ARGS_DECL)
|
||||
{
|
||||
/* we don't support virtual desktops */
|
||||
@@ -691,7 +691,7 @@ TCXCloseScreen(CLOSE_SCREEN_ARGS_DECL)
|
||||
}
|
||||
if (pTcx->thc)
|
||||
xf86UnmapSbusMem(pTcx->psdp, pTcx->fb, 8192);
|
||||
|
||||
|
||||
if (pTcx->HWCursor)
|
||||
xf86SbusHideOsHwCursor (pTcx->psdp);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user