Move call to xf86WrapperInit() to OsVendorInit() in xf86Init.c and remove
stubs in other DDX.
This commit is contained in:
parent
34d0b9228f
commit
2dc7b5e0d9
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2006-02-13 Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
||||||
|
|
||||||
|
* hw/kdrive/src/kdrive.c: (ddxInitGlobals):
|
||||||
|
* hw/vfb/InitOutput.c:
|
||||||
|
* hw/xfree86/common/xf86Init.c: (OsVendorInit):
|
||||||
|
* hw/xnest/Init.c:
|
||||||
|
* os/osinit.c: (OsInit):
|
||||||
|
Move call to xf86WrapperInit() to OsVendorInit() in xf86Init.c and
|
||||||
|
remove stubs in other DDX.
|
||||||
|
|
||||||
2006-02-12 Eric Anholt <anholt@FreeBSD.org>
|
2006-02-12 Eric Anholt <anholt@FreeBSD.org>
|
||||||
|
|
||||||
reviewed by: keithp (in principle)
|
reviewed by: keithp (in principle)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* $RCSId: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.29 2002/10/31 18:29:50 keithp Exp $
|
* $RCSId: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.29 2002/10/31 18:29:50 keithp Exp $
|
||||||
*
|
*
|
||||||
* Copyright © 1999 Keith Packard
|
* Copyright © 1999 Keith Packard
|
||||||
*
|
*
|
||||||
* Permission to use, copy, modify, distribute, and sell this software and its
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
||||||
* documentation for any purpose is hereby granted without fee, provided that
|
* documentation for any purpose is hereby granted without fee, provided that
|
||||||
|
@ -1514,6 +1514,4 @@ DPMSSupported (void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void ddxInitGlobals(void) { /* THANK YOU XPRINT */ }
|
void ddxInitGlobals(void) { /* THANK YOU XPRINT */ }
|
||||||
void xf86WrapperInit(void);
|
|
||||||
void xf86WrapperInit(void) { /* THANK YOU XFREE86 */ }
|
|
||||||
|
|
||||||
|
|
|
@ -1043,6 +1043,3 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
|
||||||
#ifdef AIXV3
|
#ifdef AIXV3
|
||||||
int SelectWaitTime = 10000; /* usec */
|
int SelectWaitTime = 10000; /* usec */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void xf86WrapperInit(void);
|
|
||||||
void xf86WrapperInit(void) { /* THANKS XFREE86 */ }
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */
|
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */
|
||||||
/* $XdotOrg: $ */
|
/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.29 2005/12/14 20:11:16 ajax Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Loosely based on code bearing the following copyright:
|
* Loosely based on code bearing the following copyright:
|
||||||
|
@ -1170,7 +1170,8 @@ OsVendorInit()
|
||||||
{
|
{
|
||||||
static Bool beenHere = FALSE;
|
static Bool beenHere = FALSE;
|
||||||
|
|
||||||
/* xf86WrapperInit() is called directly from OsInit() */
|
xf86WrapperInit();
|
||||||
|
|
||||||
#ifdef SIGCHLD
|
#ifdef SIGCHLD
|
||||||
signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */
|
signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -161,6 +161,3 @@ void ddxBeforeReset(void)
|
||||||
#ifdef AIXV3
|
#ifdef AIXV3
|
||||||
int SelectWaitTime = 10000; /* usec */
|
int SelectWaitTime = 10000; /* usec */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void xf86WrapperInit(void);
|
|
||||||
void xf86WrapperInit(void) { /* THANKS XFREE86 */ }
|
|
||||||
|
|
|
@ -94,10 +94,6 @@ int limitNoFile = -1;
|
||||||
|
|
||||||
Bool OsDelayInitColors = FALSE;
|
Bool OsDelayInitColors = FALSE;
|
||||||
|
|
||||||
#ifdef XFree86LOADER
|
|
||||||
extern void xf86WrapperInit(void);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void
|
void
|
||||||
OsInit(void)
|
OsInit(void)
|
||||||
{
|
{
|
||||||
|
@ -111,9 +107,6 @@ OsInit(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!been_here) {
|
if (!been_here) {
|
||||||
#ifdef XFree86LOADER
|
|
||||||
xf86WrapperInit();
|
|
||||||
#endif
|
|
||||||
#if !defined(__SCO__) && !defined(__CYGWIN__) && !defined(__UNIXWARE__)
|
#if !defined(__SCO__) && !defined(__CYGWIN__) && !defined(__UNIXWARE__)
|
||||||
fclose(stdin);
|
fclose(stdin);
|
||||||
fclose(stdout);
|
fclose(stdout);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user