mirror of
https://github.com/X11Libre/xf86-video-suncg14.git
synced 2026-03-24 01:25:04 +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-suncg14/-/merge_requests/11>
This commit is contained in:
committed by
Enrico Weigelt, metux IT consult
parent
4ba6ae1e86
commit
c303ce2af9
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-suncg14
|
# Add & Override patterns for xf86-video-suncg14
|
||||||
#
|
#
|
||||||
# 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'
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -19,7 +19,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)
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ void CG14Sync(ScrnInfoPtr pScrn);
|
|||||||
#define CG14_MINOR_VERSION PACKAGE_VERSION_MINOR
|
#define CG14_MINOR_VERSION PACKAGE_VERSION_MINOR
|
||||||
#define CG14_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
|
#define CG14_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This contains the functions needed by the server after loading the driver
|
* This contains the functions needed by the server after loading the driver
|
||||||
* module. It must be supplied, and gets passed back by the SetupProc
|
* 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
|
* function in the dynamic case. In the static case, a reference to this
|
||||||
@@ -234,7 +234,7 @@ CG14Probe(DriverPtr drv, int flags)
|
|||||||
numUsed = xf86MatchSbusInstances(CG14_NAME, SBUS_DEVICE_CG14,
|
numUsed = xf86MatchSbusInstances(CG14_NAME, SBUS_DEVICE_CG14,
|
||||||
devSections, numDevSections,
|
devSections, numDevSections,
|
||||||
drv, &usedChips);
|
drv, &usedChips);
|
||||||
|
|
||||||
free(devSections);
|
free(devSections);
|
||||||
if (numUsed <= 0)
|
if (numUsed <= 0)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
@@ -249,7 +249,7 @@ CG14Probe(DriverPtr drv, int flags)
|
|||||||
*/
|
*/
|
||||||
if(pEnt->active) {
|
if(pEnt->active) {
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
/* Allocate a ScrnInfoRec and claim the slot */
|
/* Allocate a ScrnInfoRec and claim the slot */
|
||||||
pScrn = xf86AllocateScreen(drv, 0);
|
pScrn = xf86AllocateScreen(drv, 0);
|
||||||
|
|
||||||
@@ -290,7 +290,7 @@ CG14PreInit(ScrnInfoPtr pScrn, int flags)
|
|||||||
* not at the start of each server generation. This means that
|
* not at the start of each server generation. This means that
|
||||||
* only things that are persistent across server generations can
|
* only things that are persistent across server generations can
|
||||||
* be initialised here. xf86Screens[] is (pScrn is a pointer to one
|
* 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
|
* are too, and should be used for data that must persist across
|
||||||
* server generations.
|
* server generations.
|
||||||
*
|
*
|
||||||
@@ -303,7 +303,7 @@ CG14PreInit(ScrnInfoPtr pScrn, int flags)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
pCg14 = GET_CG14_FROM_SCRN(pScrn);
|
pCg14 = GET_CG14_FROM_SCRN(pScrn);
|
||||||
|
|
||||||
/* Set pScrn->monitor */
|
/* Set pScrn->monitor */
|
||||||
pScrn->monitor = pScrn->confScreen->monitor;
|
pScrn->monitor = pScrn->confScreen->monitor;
|
||||||
|
|
||||||
@@ -327,7 +327,7 @@ CG14PreInit(ScrnInfoPtr pScrn, int flags)
|
|||||||
/*********************
|
/*********************
|
||||||
deal with depth
|
deal with depth
|
||||||
*********************/
|
*********************/
|
||||||
|
|
||||||
if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb|Support32bppFb))
|
if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb|Support32bppFb))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
/* Check that the returned depth is one we support */
|
/* Check that the returned depth is one we support */
|
||||||
@@ -359,12 +359,12 @@ CG14PreInit(ScrnInfoPtr pScrn, int flags)
|
|||||||
if (pScrn->depth > 8) {
|
if (pScrn->depth > 8) {
|
||||||
rgb weight = {0, 0, 0};
|
rgb weight = {0, 0, 0};
|
||||||
rgb mask = {0xff, 0xff00, 0xff0000};
|
rgb mask = {0xff, 0xff00, 0xff0000};
|
||||||
|
|
||||||
if (!xf86SetWeight(pScrn, weight, mask)) {
|
if (!xf86SetWeight(pScrn, weight, mask)) {
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!xf86SetDefaultVisual(pScrn, -1))
|
if (!xf86SetDefaultVisual(pScrn, -1))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
else if (pScrn->depth > 8) {
|
else if (pScrn->depth > 8) {
|
||||||
@@ -375,7 +375,7 @@ CG14PreInit(ScrnInfoPtr pScrn, int flags)
|
|||||||
xf86GetVisualName(pScrn->defaultVisual));
|
xf86GetVisualName(pScrn->defaultVisual));
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The new cmap code requires this to be initialised.
|
* The new cmap code requires this to be initialised.
|
||||||
@@ -397,7 +397,7 @@ CG14PreInit(ScrnInfoPtr pScrn, int flags)
|
|||||||
/*********************
|
/*********************
|
||||||
set up clock and mode stuff
|
set up clock and mode stuff
|
||||||
*********************/
|
*********************/
|
||||||
|
|
||||||
pScrn->progClock = TRUE;
|
pScrn->progClock = TRUE;
|
||||||
|
|
||||||
if(pScrn->display->virtualX || pScrn->display->virtualY) {
|
if(pScrn->display->virtualX || pScrn->display->virtualY) {
|
||||||
@@ -429,7 +429,7 @@ CG14ScreenInit(SCREEN_INIT_ARGS_DECL)
|
|||||||
VisualPtr visual;
|
VisualPtr visual;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* First get the ScrnInfoRec
|
* First get the ScrnInfoRec
|
||||||
*/
|
*/
|
||||||
pScrn = xf86ScreenToScrn(pScreen);
|
pScrn = xf86ScreenToScrn(pScreen);
|
||||||
@@ -551,7 +551,7 @@ CG14SwitchMode(SWITCH_MODE_ARGS_DECL)
|
|||||||
* displayed location in the video memory.
|
* displayed location in the video memory.
|
||||||
*/
|
*/
|
||||||
/* Usually mandatory */
|
/* Usually mandatory */
|
||||||
static void
|
static void
|
||||||
CG14AdjustFrame(ADJUST_FRAME_ARGS_DECL)
|
CG14AdjustFrame(ADJUST_FRAME_ARGS_DECL)
|
||||||
{
|
{
|
||||||
/* we don't support virtual desktops */
|
/* we don't support virtual desktops */
|
||||||
@@ -613,7 +613,7 @@ CG14CloseScreen(CLOSE_SCREEN_ARGS_DECL)
|
|||||||
xf86UnmapSbusMem(pCg14->psdp, pCg14->x32,
|
xf86UnmapSbusMem(pCg14->psdp, pCg14->x32,
|
||||||
(pCg14->psdp->width * pCg14->psdp->height));
|
(pCg14->psdp->width * pCg14->psdp->height));
|
||||||
xf86UnmapSbusMem(pCg14->psdp, pCg14->xlut, 4096);
|
xf86UnmapSbusMem(pCg14->psdp, pCg14->xlut, 4096);
|
||||||
|
|
||||||
pScreen->CloseScreen = pCg14->CloseScreen;
|
pScreen->CloseScreen = pCg14->CloseScreen;
|
||||||
return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
|
return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
|
||||||
}
|
}
|
||||||
@@ -687,7 +687,7 @@ CG14InitCplane24(ScrnInfoPtr pScrn)
|
|||||||
{
|
{
|
||||||
Cg14Ptr pCg14 = GET_CG14_FROM_SCRN(pScrn);
|
Cg14Ptr pCg14 = GET_CG14_FROM_SCRN(pScrn);
|
||||||
int size, bpp;
|
int size, bpp;
|
||||||
|
|
||||||
size = pScrn->virtualX * pScrn->virtualY;
|
size = pScrn->virtualX * pScrn->virtualY;
|
||||||
if (pScrn->bitsPerPixel > 8) {
|
if (pScrn->bitsPerPixel > 8) {
|
||||||
bpp = 32;
|
bpp = 32;
|
||||||
@@ -697,7 +697,7 @@ CG14InitCplane24(ScrnInfoPtr pScrn)
|
|||||||
memset (pCg14->fb, 0, size * (bpp >> 3));
|
memset (pCg14->fb, 0, size * (bpp >> 3));
|
||||||
memset (pCg14->x32, 0, size);
|
memset (pCg14->x32, 0, size);
|
||||||
memset (pCg14->xlut, 0, 0x200);
|
memset (pCg14->xlut, 0, 0x200);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This initializes the card for 8 bit mode.
|
* This initializes the card for 8 bit mode.
|
||||||
@@ -707,6 +707,6 @@ CG14ExitCplane24(ScrnInfoPtr pScrn)
|
|||||||
{
|
{
|
||||||
Cg14Ptr pCg14 = GET_CG14_FROM_SCRN(pScrn);
|
Cg14Ptr pCg14 = GET_CG14_FROM_SCRN(pScrn);
|
||||||
int bpp = 8;
|
int bpp = 8;
|
||||||
|
|
||||||
ioctl (pCg14->psdp->fd, CG14_SET_PIXELMODE, &bpp);
|
ioctl (pCg14->psdp->fd, CG14_SET_PIXELMODE, &bpp);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user