Remove pointless empty functions

These functions might be useful in a real driver, but with no
hardware, they're pointless.  Get rid of them.

v2: Rebase, get rid of pointless calls to DUMMYAdjustFrame, return TRUE from
DUMMYSwitchMode.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
Tested-by: Antoine Martin <antoine@nagafix.co.uk>
This commit is contained in:
Aaron Plattner 2016-09-22 09:14:26 -07:00
parent 367c778240
commit e434975017

View File

@ -65,9 +65,6 @@ static ModeStatus DUMMYValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode); static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode);
/* Internally used functions */ /* Internally used functions */
static Bool dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
static void dummySave(ScrnInfoPtr pScrn);
static void dummyRestore(ScrnInfoPtr pScrn, Bool restoreText);
static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
pointer ptr); pointer ptr);
@ -461,14 +458,6 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flags)
static Bool static Bool
DUMMYEnterVT(VT_FUNC_ARGS_DECL) DUMMYEnterVT(VT_FUNC_ARGS_DECL)
{ {
SCRN_INFO_PTR(arg);
/* Should we re-save the text mode on each VT enter? */
if(!dummyModeInit(pScrn, pScrn->currentMode))
return FALSE;
DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
return TRUE; return TRUE;
} }
@ -476,8 +465,6 @@ DUMMYEnterVT(VT_FUNC_ARGS_DECL)
static void static void
DUMMYLeaveVT(VT_FUNC_ARGS_DECL) DUMMYLeaveVT(VT_FUNC_ARGS_DECL)
{ {
SCRN_INFO_PTR(arg);
dummyRestore(pScrn, TRUE);
} }
static void static void
@ -535,15 +522,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
if (!(dPtr->FBBase = malloc(pScrn->videoRam * 1024))) if (!(dPtr->FBBase = malloc(pScrn->videoRam * 1024)))
return FALSE; return FALSE;
/*
* next we save the current state and setup the first mode
*/
dummySave(pScrn);
if (!dummyModeInit(pScrn,pScrn->currentMode))
return FALSE;
DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
/* /*
* Reset visual list. * Reset visual list.
@ -665,8 +643,7 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
Bool Bool
DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL) DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
{ {
SCRN_INFO_PTR(arg); return TRUE;
return dummyModeInit(pScrn, mode);
} }
/* Mandatory */ /* Mandatory */
@ -683,7 +660,6 @@ DUMMYCloseScreen(CLOSE_SCREEN_ARGS_DECL)
DUMMYPtr dPtr = DUMMYPTR(pScrn); DUMMYPtr dPtr = DUMMYPTR(pScrn);
if(pScrn->vtSema){ if(pScrn->vtSema){
dummyRestore(pScrn, TRUE);
free(dPtr->FBBase); free(dPtr->FBBase);
} }
@ -725,24 +701,6 @@ DUMMYValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
return(MODE_OK); return(MODE_OK);
} }
static void
dummySave(ScrnInfoPtr pScrn)
{
}
static void
dummyRestore(ScrnInfoPtr pScrn, Bool restoreText)
{
}
static Bool
dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
dummyRestore(pScrn, FALSE);
return(TRUE);
}
Atom VFB_PROP = 0; Atom VFB_PROP = 0;
#define VFB_PROP_NAME "VFB_IDENT" #define VFB_PROP_NAME "VFB_IDENT"