XFree86: Clean up init a tiny bit (no code changes)
Reshuffle and delete.
This commit is contained in:
Daniel Stone
parent
ddcefb50dd
commit
3a54f3f48f
|
|
@ -93,12 +93,6 @@
|
|||
#include "xf86Bus.h"
|
||||
|
||||
/* forward declarations */
|
||||
|
||||
static void xf86PrintBanner(void);
|
||||
static void xf86PrintMarkers(void);
|
||||
static void xf86PrintDefaultModulePath(void);
|
||||
static void xf86PrintDefaultLibraryPath(void);
|
||||
|
||||
static Bool probe_devices_from_device_sections(DriverPtr drvp);
|
||||
static Bool add_matching_devices_to_configure_list(DriverPtr drvp);
|
||||
static Bool check_for_matching_devices(DriverPtr drvp);
|
||||
|
|
@ -127,6 +121,130 @@ static int numFormats = 6;
|
|||
#endif
|
||||
static Bool formatsDone = FALSE;
|
||||
|
||||
#ifndef OSNAME
|
||||
#define OSNAME " unknown"
|
||||
#endif
|
||||
#ifndef OSVENDOR
|
||||
#define OSVENDOR ""
|
||||
#endif
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XORG_VERSION_SNAP
|
||||
#endif
|
||||
|
||||
static void
|
||||
xf86PrintBanner()
|
||||
{
|
||||
#if PRE_RELEASE
|
||||
ErrorF("\n"
|
||||
"This is a pre-release version of the X server from " XVENDORNAME ".\n"
|
||||
"It is not supported in any way.\n"
|
||||
"Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"
|
||||
"Select the \"xorg\" product for bugs you find in this release.\n"
|
||||
"Before reporting bugs in pre-release versions please check the\n"
|
||||
"latest version in the X.Org Foundation git repository.\n"
|
||||
"See http://wiki.x.org/wiki/GitPage for git access instructions.\n");
|
||||
#endif
|
||||
ErrorF("\nX.Org X Server %d.%d.%d",
|
||||
XORG_VERSION_MAJOR,
|
||||
XORG_VERSION_MINOR,
|
||||
XORG_VERSION_PATCH);
|
||||
#if XORG_VERSION_SNAP > 0
|
||||
ErrorF(".%d", XORG_VERSION_SNAP);
|
||||
#endif
|
||||
|
||||
#if XORG_VERSION_SNAP >= 900
|
||||
/* When the minor number is 99, that signifies that the we are making
|
||||
* a release candidate for a major version. (X.0.0)
|
||||
* When the patch number is 99, that signifies that the we are making
|
||||
* a release candidate for a minor version. (X.Y.0)
|
||||
* When the patch number is < 99, then we are making a release
|
||||
* candidate for the next point release. (X.Y.Z)
|
||||
*/
|
||||
#if XORG_VERSION_MINOR >= 99
|
||||
ErrorF(" (%d.0.0 RC %d)", XORG_VERSION_MAJOR+1, XORG_VERSION_SNAP - 900);
|
||||
#elif XORG_VERSION_PATCH == 99
|
||||
ErrorF(" (%d.%d.0 RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR + 1,
|
||||
XORG_VERSION_SNAP - 900);
|
||||
#else
|
||||
ErrorF(" (%d.%d.%d RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR,
|
||||
XORG_VERSION_PATCH + 1, XORG_VERSION_SNAP - 900);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef XORG_CUSTOM_VERSION
|
||||
ErrorF(" (%s)", XORG_CUSTOM_VERSION);
|
||||
#endif
|
||||
#ifndef XORG_DATE
|
||||
#define XORG_DATE XF86_DATE
|
||||
#endif
|
||||
ErrorF("\nRelease Date: %s\n", XORG_DATE);
|
||||
ErrorF("X Protocol Version %d, Revision %d\n",
|
||||
X_PROTOCOL, X_PROTOCOL_REVISION);
|
||||
ErrorF("Build Operating System: %s %s\n", OSNAME, OSVENDOR);
|
||||
#ifdef HAS_UTSNAME
|
||||
{
|
||||
struct utsname name;
|
||||
|
||||
/* Linux & BSD state that 0 is success, SysV (including Solaris, HP-UX,
|
||||
and Irix) and Single Unix Spec 3 just say that non-negative is success.
|
||||
All agree that failure is represented by a negative number.
|
||||
*/
|
||||
if (uname(&name) >= 0) {
|
||||
ErrorF("Current Operating System: %s %s %s %s %s\n",
|
||||
name.sysname, name.nodename, name.release, name.version, name.machine);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#if defined(BUILD_DATE) && (BUILD_DATE > 19000000)
|
||||
{
|
||||
struct tm t;
|
||||
char buf[100];
|
||||
|
||||
bzero(&t, sizeof(t));
|
||||
bzero(buf, sizeof(buf));
|
||||
t.tm_mday = BUILD_DATE % 100;
|
||||
t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
|
||||
t.tm_year = BUILD_DATE / 10000 - 1900;
|
||||
#if defined(BUILD_TIME)
|
||||
t.tm_sec = BUILD_TIME % 100;
|
||||
t.tm_min = (BUILD_TIME / 100) % 100;
|
||||
t.tm_hour = (BUILD_TIME / 10000) % 100;
|
||||
if (strftime(buf, sizeof(buf), "%d %B %Y %I:%M:%S%p", &t))
|
||||
ErrorF("Build Date: %s\n", buf);
|
||||
#else
|
||||
if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
|
||||
ErrorF("Build Date: %s\n", buf);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
#if defined(CLOG_DATE) && (CLOG_DATE > 19000000)
|
||||
{
|
||||
struct tm t;
|
||||
char buf[100];
|
||||
|
||||
bzero(&t, sizeof(t));
|
||||
bzero(buf, sizeof(buf));
|
||||
t.tm_mday = CLOG_DATE % 100;
|
||||
t.tm_mon = (CLOG_DATE / 100) % 100 - 1;
|
||||
t.tm_year = CLOG_DATE / 10000 - 1900;
|
||||
if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
|
||||
ErrorF("Changelog Date: %s\n", buf);
|
||||
}
|
||||
#endif
|
||||
#if defined(BUILDERSTRING)
|
||||
ErrorF("%s \n",BUILDERSTRING);
|
||||
#endif
|
||||
ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
|
||||
"\tto make sure that you have the latest version.\n");
|
||||
ErrorF("Module Loader present\n");
|
||||
}
|
||||
|
||||
static void
|
||||
xf86PrintMarkers()
|
||||
{
|
||||
LogPrintMarkers();
|
||||
}
|
||||
|
||||
static Bool
|
||||
xf86CreateRootWindow(WindowPtr pWin)
|
||||
{
|
||||
|
|
@ -448,6 +566,7 @@ xf86CallDriverProbe( DriverPtr drv, Bool detect_only )
|
|||
return foundScreen;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* InitOutput --
|
||||
* Initialize screenInfo for all actually accessible framebuffers.
|
||||
|
|
@ -959,34 +1078,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
|
|||
xf86EnableIO();
|
||||
}
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* Install signal handler for unexpected signals
|
||||
*/
|
||||
xf86Info.caughtSignal=FALSE;
|
||||
if (!xf86Info.notrapSignals)
|
||||
{
|
||||
signal(SIGSEGV,xf86SigHandler);
|
||||
signal(SIGILL,xf86SigHandler);
|
||||
#ifdef SIGEMT
|
||||
signal(SIGEMT,xf86SigHandler);
|
||||
#endif
|
||||
signal(SIGFPE,xf86SigHandler);
|
||||
#ifdef SIGBUS
|
||||
signal(SIGBUS,xf86SigHandler);
|
||||
#endif
|
||||
#ifdef SIGSYS
|
||||
signal(SIGSYS,xf86SigHandler);
|
||||
#endif
|
||||
#ifdef SIGXCPU
|
||||
signal(SIGXCPU,xf86SigHandler);
|
||||
#endif
|
||||
#ifdef SIGXFSZ
|
||||
signal(SIGXFSZ,xf86SigHandler);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Use the previously collected parts to setup pScreenInfo
|
||||
*/
|
||||
|
|
@ -1028,7 +1119,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
|
|||
#endif /* SCO325 */
|
||||
|
||||
for (i = 0; i < xf86NumScreens; i++) {
|
||||
xf86EnableAccess(xf86Screens[i]);
|
||||
xf86EnableAccess(xf86Screens[i]);
|
||||
/*
|
||||
* Almost everything uses these defaults, and many of those that
|
||||
* don't, will wrap them.
|
||||
|
|
@ -1105,8 +1196,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
|
|||
|
||||
void
|
||||
InitInput(argc, argv)
|
||||
int argc;
|
||||
char **argv;
|
||||
int argc;
|
||||
char **argv;
|
||||
{
|
||||
IDevPtr* pDev;
|
||||
InputDriverPtr pDrv;
|
||||
|
|
@ -1156,10 +1247,6 @@ InitInput(argc, argv)
|
|||
mieqInit();
|
||||
}
|
||||
|
||||
#ifndef SET_STDERR_NONBLOCKING
|
||||
#define SET_STDERR_NONBLOCKING 1
|
||||
#endif
|
||||
|
||||
/*
|
||||
* OsVendorInit --
|
||||
* OS/Vendor-specific initialisations. Called from OsInit(), which
|
||||
|
|
@ -1178,7 +1265,6 @@ OsVendorInit()
|
|||
if (!beenHere)
|
||||
xf86LogInit();
|
||||
|
||||
#if SET_STDERR_NONBLOCKING
|
||||
/* Set stderr to non-blocking. */
|
||||
#ifndef O_NONBLOCK
|
||||
#if defined(FNDELAY)
|
||||
|
|
@ -1186,7 +1272,6 @@ OsVendorInit()
|
|||
#elif defined(O_NDELAY)
|
||||
#define O_NONBLOCK O_NDELAY
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef O_NONBLOCK
|
||||
if (!beenHere) {
|
||||
|
|
@ -1236,9 +1321,6 @@ ddxGiveUp()
|
|||
xf86Screens[i]->busAccess = NULL;
|
||||
}
|
||||
|
||||
#ifdef USE_XF86_SERVERLOCK
|
||||
xf86UnlockServer();
|
||||
#endif
|
||||
#ifdef XFreeXDGA
|
||||
DGAShutdown();
|
||||
#endif
|
||||
|
|
@ -1333,6 +1415,18 @@ xf86SetLogVerbosity(int verb)
|
|||
return save;
|
||||
}
|
||||
|
||||
static void
|
||||
xf86PrintDefaultModulePath(void)
|
||||
{
|
||||
ErrorF("%s\n", DEFAULT_MODULE_PATH);
|
||||
}
|
||||
|
||||
static void
|
||||
xf86PrintDefaultLibraryPath(void)
|
||||
{
|
||||
ErrorF("%s\n", DEFAULT_LIBRARY_PATH);
|
||||
}
|
||||
|
||||
/*
|
||||
* ddxProcessArgument --
|
||||
* Process device-dependent command line args. Returns 0 if argument is
|
||||
|
|
@ -1341,8 +1435,6 @@ xf86SetLogVerbosity(int verb)
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
|
||||
/* ARGSUSED */
|
||||
int
|
||||
ddxProcessArgument(int argc, char **argv, int i)
|
||||
|
|
@ -1747,142 +1839,6 @@ ddxUseMsg()
|
|||
}
|
||||
|
||||
|
||||
#ifndef OSNAME
|
||||
#define OSNAME " unknown"
|
||||
#endif
|
||||
#ifndef OSVENDOR
|
||||
#define OSVENDOR ""
|
||||
#endif
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XORG_VERSION_SNAP
|
||||
#endif
|
||||
|
||||
static void
|
||||
xf86PrintBanner()
|
||||
{
|
||||
#if PRE_RELEASE
|
||||
ErrorF("\n"
|
||||
"This is a pre-release version of the X server from " XVENDORNAME ".\n"
|
||||
"It is not supported in any way.\n"
|
||||
"Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"
|
||||
"Select the \"xorg\" product for bugs you find in this release.\n"
|
||||
"Before reporting bugs in pre-release versions please check the\n"
|
||||
"latest version in the X.Org Foundation git repository.\n"
|
||||
"See http://wiki.x.org/wiki/GitPage for git access instructions.\n");
|
||||
#endif
|
||||
ErrorF("\nX.Org X Server %d.%d.%d",
|
||||
XORG_VERSION_MAJOR,
|
||||
XORG_VERSION_MINOR,
|
||||
XORG_VERSION_PATCH);
|
||||
#if XORG_VERSION_SNAP > 0
|
||||
ErrorF(".%d", XORG_VERSION_SNAP);
|
||||
#endif
|
||||
|
||||
#if XORG_VERSION_SNAP >= 900
|
||||
/* When the minor number is 99, that signifies that the we are making
|
||||
* a release candidate for a major version. (X.0.0)
|
||||
* When the patch number is 99, that signifies that the we are making
|
||||
* a release candidate for a minor version. (X.Y.0)
|
||||
* When the patch number is < 99, then we are making a release
|
||||
* candidate for the next point release. (X.Y.Z)
|
||||
*/
|
||||
#if XORG_VERSION_MINOR >= 99
|
||||
ErrorF(" (%d.0.0 RC %d)", XORG_VERSION_MAJOR+1, XORG_VERSION_SNAP - 900);
|
||||
#elif XORG_VERSION_PATCH == 99
|
||||
ErrorF(" (%d.%d.0 RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR + 1,
|
||||
XORG_VERSION_SNAP - 900);
|
||||
#else
|
||||
ErrorF(" (%d.%d.%d RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR,
|
||||
XORG_VERSION_PATCH + 1, XORG_VERSION_SNAP - 900);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef XORG_CUSTOM_VERSION
|
||||
ErrorF(" (%s)", XORG_CUSTOM_VERSION);
|
||||
#endif
|
||||
#ifndef XORG_DATE
|
||||
#define XORG_DATE XF86_DATE
|
||||
#endif
|
||||
ErrorF("\nRelease Date: %s\n", XORG_DATE);
|
||||
ErrorF("X Protocol Version %d, Revision %d\n",
|
||||
X_PROTOCOL, X_PROTOCOL_REVISION);
|
||||
ErrorF("Build Operating System: %s %s\n", OSNAME, OSVENDOR);
|
||||
#ifdef HAS_UTSNAME
|
||||
{
|
||||
struct utsname name;
|
||||
|
||||
/* Linux & BSD state that 0 is success, SysV (including Solaris, HP-UX,
|
||||
and Irix) and Single Unix Spec 3 just say that non-negative is success.
|
||||
All agree that failure is represented by a negative number.
|
||||
*/
|
||||
if (uname(&name) >= 0) {
|
||||
ErrorF("Current Operating System: %s %s %s %s %s\n",
|
||||
name.sysname, name.nodename, name.release, name.version, name.machine);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#if defined(BUILD_DATE) && (BUILD_DATE > 19000000)
|
||||
{
|
||||
struct tm t;
|
||||
char buf[100];
|
||||
|
||||
bzero(&t, sizeof(t));
|
||||
bzero(buf, sizeof(buf));
|
||||
t.tm_mday = BUILD_DATE % 100;
|
||||
t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
|
||||
t.tm_year = BUILD_DATE / 10000 - 1900;
|
||||
#if defined(BUILD_TIME)
|
||||
t.tm_sec = BUILD_TIME % 100;
|
||||
t.tm_min = (BUILD_TIME / 100) % 100;
|
||||
t.tm_hour = (BUILD_TIME / 10000) % 100;
|
||||
if (strftime(buf, sizeof(buf), "%d %B %Y %I:%M:%S%p", &t))
|
||||
ErrorF("Build Date: %s\n", buf);
|
||||
#else
|
||||
if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
|
||||
ErrorF("Build Date: %s\n", buf);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
#if defined(CLOG_DATE) && (CLOG_DATE > 19000000)
|
||||
{
|
||||
struct tm t;
|
||||
char buf[100];
|
||||
|
||||
bzero(&t, sizeof(t));
|
||||
bzero(buf, sizeof(buf));
|
||||
t.tm_mday = CLOG_DATE % 100;
|
||||
t.tm_mon = (CLOG_DATE / 100) % 100 - 1;
|
||||
t.tm_year = CLOG_DATE / 10000 - 1900;
|
||||
if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
|
||||
ErrorF("Changelog Date: %s\n", buf);
|
||||
}
|
||||
#endif
|
||||
#if defined(BUILDERSTRING)
|
||||
ErrorF("%s \n",BUILDERSTRING);
|
||||
#endif
|
||||
ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
|
||||
"\tto make sure that you have the latest version.\n");
|
||||
ErrorF("Module Loader present\n");
|
||||
}
|
||||
|
||||
static void
|
||||
xf86PrintMarkers()
|
||||
{
|
||||
LogPrintMarkers();
|
||||
}
|
||||
|
||||
static void
|
||||
xf86PrintDefaultModulePath(void)
|
||||
{
|
||||
ErrorF("%s\n", DEFAULT_MODULE_PATH);
|
||||
}
|
||||
|
||||
static void
|
||||
xf86PrintDefaultLibraryPath(void)
|
||||
{
|
||||
ErrorF("%s\n", DEFAULT_LIBRARY_PATH);
|
||||
}
|
||||
|
||||
/*
|
||||
* xf86LoadModules iterates over a list that is being passed in.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -180,12 +180,6 @@ int xf86SetVerbosity(int verb);
|
|||
int xf86SetLogVerbosity(int verb);
|
||||
Bool xf86CallDriverProbe( struct _DriverRec * drv, Bool detect_only );
|
||||
|
||||
/* xf86Lock.c */
|
||||
|
||||
#ifdef USE_XF86_SERVERLOCK
|
||||
void xf86UnlockServer(void);
|
||||
#endif
|
||||
|
||||
/* xf86XKB.c */
|
||||
|
||||
void xf86InitXkb(void);
|
||||
|
|
|
|||
Loading…
Reference in New Issue