XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

kdrive: drop obsolete support for internal server reset

Browse Source 
Not used anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-11-14 16:27:48 +01:00
committed by Enrico Weigelt
parent 8c93d4e97e
commit 062a930f3c
4 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hw/kdrive/fbdev/fbinit.c
View File

@@ -56,9 +56,7 @@ ddxInputThreadInit(void)
void
InitOutput(int argc, char **argv)
{
if (serverGeneration == 1)
ephyrExtensionInit();
ephyrExtensionInit();
KdInitOutput(argc, argv);
}

12
hw/kdrive/src/kdrive.c
View File

@@ -77,7 +77,6 @@ KdDepths kdDepths[] = {
#define KD_DEFAULT_BUTTONS 5
DevPrivateKeyRec kdScreenPrivateKeyRec;
x_server_generation_t kdGeneration;
Bool kdVideoTest;
unsigned long kdVideoTestTime;
@@ -623,11 +622,9 @@ KdOsInit(const KdOsFuncs * pOsFuncs)
{
kdOsFuncs = pOsFuncs;
if (pOsFuncs) {
if (serverGeneration == 1) {
KdDoSwitchCmd("start");
if (pOsFuncs->Init)
(*pOsFuncs->Init) ();
}
KdDoSwitchCmd("start");
if (pOsFuncs->Init)
(*pOsFuncs->Init) ();
}
}
@@ -635,9 +632,6 @@ Bool KdAllocatePrivates(ScreenPtr pScreen)
{
KdPrivScreenPtr pScreenPriv;
if (kdGeneration != serverGeneration)
kdGeneration = serverGeneration;
if (!dixRegisterPrivateKey(&kdScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
return FALSE;

3
hw/kdrive/src/kdrive.h
View File

@@ -295,7 +295,7 @@ int KdAddKeyboard(KdKeyboardInfo * ki);
void KdRemoveKeyboard(KdKeyboardInfo * ki);
typedef struct _KdOsFuncs {
int (*Init) (void); /* Only called when the X server is started, when serverGeneration == 1 */
int (*Init) (void); /* only called when the X server is started */
void (*Enable) (void); /* called when screen is enabled */
void (*Disable) (void); /* called when screen is disabled */
Bool (*SpecialKey) (KeySym);
@@ -338,7 +338,6 @@ extern DevPrivateKeyRec kdScreenPrivateKeyRec;
#define kdScreenPrivateKey (&kdScreenPrivateKeyRec)
extern x_server_generation_t kdGeneration;
extern Bool kdEnabled;
extern Bool kdSwitchPending;
extern Bool kdEmulateMiddleButton;

4
hw/kdrive/src/kxv.c
View File

@@ -100,7 +100,6 @@ static DevPrivateKeyRec KdXVWindowKeyRec;
#define KdXVWindowKey (&KdXVWindowKeyRec)
static DevPrivateKey KdXvScreenKey;
static DevPrivateKeyRec KdXVScreenPrivateKey;
static x_server_generation_t KdXVGeneration = 0;
static unsigned long PortResource = 0;
#define GET_XV_SCREEN(pScreen) ((XvScreenPtr) \
@@ -119,9 +118,6 @@ KdXVScreenInit(ScreenPtr pScreen, KdVideoAdaptorPtr adaptors, int num)
/* fprintf(stderr,"KdXVScreenInit initializing %d adaptors\n",num); */
if (KdXVGeneration != serverGeneration)
KdXVGeneration = serverGeneration;
if (noXvExtension)
return FALSE;