mirror of
https://github.com/X11Libre/xf86-video-fbdev.git
synced 2026-03-23 17:19:32 +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-fbdev/-/merge_requests/12>
This commit is contained in:
committed by
Enrico Weigelt, metux IT consult
parent
5f2150e618
commit
1a7ca6589d
4
.gitignore
vendored
4
.gitignore
vendored
@@ -71,8 +71,8 @@ core
|
|||||||
*.tar.bz2
|
*.tar.bz2
|
||||||
*.tar.gz
|
*.tar.gz
|
||||||
#
|
#
|
||||||
# Add & Override patterns for xf86-video-fbdev
|
# Add & Override patterns for xf86-video-fbdev
|
||||||
#
|
#
|
||||||
# Edit the following section as needed
|
# Edit the following section as needed
|
||||||
# For example, !report.pc overrides *.pc. See 'man gitignore'
|
# For example, !report.pc overrides *.pc. See 'man gitignore'
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
# 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
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
# DEALINGS IN THE SOFTWARE.
|
# DEALINGS IN THE SOFTWARE.
|
||||||
#
|
#
|
||||||
|
|
||||||
drivermandir = $(DRIVER_MAN_DIR)
|
drivermandir = $(DRIVER_MAN_DIR)
|
||||||
|
|
||||||
|
|||||||
28
src/fbdev.c
28
src/fbdev.c
@@ -197,7 +197,7 @@ FBDevGetRec(ScrnInfoPtr pScrn)
|
|||||||
{
|
{
|
||||||
if (pScrn->driverPrivate != NULL)
|
if (pScrn->driverPrivate != NULL)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
pScrn->driverPrivate = XNFcallocarray(sizeof(FBDevRec), 1);
|
pScrn->driverPrivate = XNFcallocarray(sizeof(FBDevRec), 1);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
@@ -263,7 +263,7 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
|
|||||||
|
|
||||||
if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
|
if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, NULL,
|
pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, NULL,
|
||||||
NULL, NULL, NULL, NULL);
|
NULL, NULL, NULL, NULL);
|
||||||
if (pScrn) {
|
if (pScrn) {
|
||||||
@@ -286,7 +286,7 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
|
|||||||
pScrn->ValidMode = fbdevValidMode;
|
pScrn->ValidMode = fbdevValidMode;
|
||||||
|
|
||||||
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
|
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
|
||||||
"claimed PCI slot %d@%d:%d:%d\n",
|
"claimed PCI slot %d@%d:%d:%d\n",
|
||||||
dev->bus, dev->domain, dev->dev, dev->func);
|
dev->bus, dev->domain, dev->dev, dev->func);
|
||||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
||||||
"using %s\n", device ? device : "default device");
|
"using %s\n", device ? device : "default device");
|
||||||
@@ -320,12 +320,12 @@ FBDevProbe(DriverPtr drv, int flags)
|
|||||||
if (flags & PROBE_DETECT)
|
if (flags & PROBE_DETECT)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if ((numDevSections = xf86MatchDevice(FBDEV_DRIVER_NAME, &devSections)) <= 0)
|
if ((numDevSections = xf86MatchDevice(FBDEV_DRIVER_NAME, &devSections)) <= 0)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
|
if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
for (i = 0; i < numDevSections; i++) {
|
for (i = 0; i < numDevSections; i++) {
|
||||||
Bool isPci = FALSE;
|
Bool isPci = FALSE;
|
||||||
|
|
||||||
@@ -346,7 +346,7 @@ FBDevProbe(DriverPtr drv, int flags)
|
|||||||
#ifndef XSERVER_LIBPCIACCESS
|
#ifndef XSERVER_LIBPCIACCESS
|
||||||
/* XXX what about when there's no busID set? */
|
/* XXX what about when there's no busID set? */
|
||||||
int entity;
|
int entity;
|
||||||
|
|
||||||
entity = xf86ClaimPciSlot(bus,device,func,drv,
|
entity = xf86ClaimPciSlot(bus,device,func,drv,
|
||||||
0,devSections[i],
|
0,devSections[i],
|
||||||
TRUE);
|
TRUE);
|
||||||
@@ -367,11 +367,11 @@ FBDevProbe(DriverPtr drv, int flags)
|
|||||||
devSections[i], TRUE);
|
devSections[i], TRUE);
|
||||||
pScrn = xf86ConfigFbEntity(pScrn,0,entity,
|
pScrn = xf86ConfigFbEntity(pScrn,0,entity,
|
||||||
NULL,NULL,NULL,NULL);
|
NULL,NULL,NULL,NULL);
|
||||||
|
|
||||||
}
|
}
|
||||||
if (pScrn) {
|
if (pScrn) {
|
||||||
foundScreen = TRUE;
|
foundScreen = TRUE;
|
||||||
|
|
||||||
pScrn->driverVersion = FBDEV_VERSION;
|
pScrn->driverVersion = FBDEV_VERSION;
|
||||||
pScrn->driverName = FBDEV_DRIVER_NAME;
|
pScrn->driverName = FBDEV_DRIVER_NAME;
|
||||||
pScrn->name = FBDEV_NAME;
|
pScrn->name = FBDEV_NAME;
|
||||||
@@ -383,7 +383,7 @@ FBDevProbe(DriverPtr drv, int flags)
|
|||||||
pScrn->EnterVT = fbdevEnterVT;
|
pScrn->EnterVT = fbdevEnterVT;
|
||||||
pScrn->LeaveVT = fbdevLeaveVT;
|
pScrn->LeaveVT = fbdevLeaveVT;
|
||||||
pScrn->ValidMode = fbdevValidMode;
|
pScrn->ValidMode = fbdevValidMode;
|
||||||
|
|
||||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
||||||
"using %s\n", dev ? dev : "default device");
|
"using %s\n", dev ? dev : "default device");
|
||||||
}
|
}
|
||||||
@@ -571,7 +571,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
|
|||||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "checking modes against monitor...\n");
|
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "checking modes against monitor...\n");
|
||||||
{
|
{
|
||||||
DisplayModePtr mode, first = mode = pScrn->modes;
|
DisplayModePtr mode, first = mode = pScrn->modes;
|
||||||
|
|
||||||
if (mode != NULL) do {
|
if (mode != NULL) do {
|
||||||
mode->status = xf86CheckModeForMonitor(mode, pScrn->monitor);
|
mode->status = xf86CheckModeForMonitor(mode, pScrn->monitor);
|
||||||
mode = mode->next;
|
mode = mode->next;
|
||||||
@@ -710,7 +710,7 @@ FBDevShadowInit(ScreenPtr pScreen)
|
|||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
||||||
FBDevPtr fPtr = FBDEVPTR(pScrn);
|
FBDevPtr fPtr = FBDEVPTR(pScrn);
|
||||||
|
|
||||||
if (!shadowSetup(pScreen)) {
|
if (!shadowSetup(pScreen)) {
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
@@ -1006,7 +1006,7 @@ FBDevCloseScreen(ScreenPtr pScreen)
|
|||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
|
||||||
FBDevPtr fPtr = FBDEVPTR(pScrn);
|
FBDevPtr fPtr = FBDEVPTR(pScrn);
|
||||||
|
|
||||||
fbdevHWRestore(pScrn);
|
fbdevHWRestore(pScrn);
|
||||||
fbdevHWUnmapVidmem(pScrn);
|
fbdevHWUnmapVidmem(pScrn);
|
||||||
if (fPtr->shadow) {
|
if (fPtr->shadow) {
|
||||||
@@ -1238,7 +1238,7 @@ static Bool
|
|||||||
FBDevDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)
|
FBDevDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)
|
||||||
{
|
{
|
||||||
xorgHWFlags *flag;
|
xorgHWFlags *flag;
|
||||||
|
|
||||||
switch (op) {
|
switch (op) {
|
||||||
case GET_REQUIRED_HW_INTERFACES:
|
case GET_REQUIRED_HW_INTERFACES:
|
||||||
flag = (CARD32*)ptr;
|
flag = (CARD32*)ptr;
|
||||||
|
|||||||
Reference in New Issue
Block a user