andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code motion: subsume xf86DoProbe.c into xf86Init.c

Browse Source
This commit is contained in:
Adam Jackson 2008-11-25 00:38:47 -05:00
parent fbabb1c5c2
commit 8b9253f638
4 changed files with 73 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/common/Makefile.am
View File

@ -27,8 +27,7 @@ BUILT_SOURCES = xf86DefModeSet.c
AM_LDFLAGS = -r
libcommon_la_SOURCES = xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \
xf86Cursor.c xf86DGA.c xf86DPMS.c \
xf86DoProbe.c xf86Events.c \
xf86Globals.c xf86AutoConfig.c \
xf86Events.c xf86Globals.c xf86AutoConfig.c \
xf86Option.c \
xf86VidMode.c xf86fbman.c xf86cmap.c \
xf86Helper.c xf86PM.c xf86RAC.c xf86Xinput.c xisb.c \

116
hw/xfree86/common/xf86DoProbe.c
View File

@ -1,116 +0,0 @@
/*
* Copyright (c) 1999-2002 by The XFree86 Project, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER 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 DEALINGS IN THE SOFTWARE.
*
* Except as contained in this notice, the name of the copyright holder(s)
* and author(s) shall not be used in advertising or otherwise to promote
* the sale, use or other dealings in this Software without prior written
* authorization from the copyright holder(s) and author(s).
*/
/*
* finish setting up the server
* Load the driver modules and call their probe functions.
*/
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <ctype.h>
#include <stdlib.h>
#include <X11/X.h>
#include <X11/Xmd.h>
#include "os.h"
#include "loaderProcs.h"
#include "xf86Config.h"
#include "xf86_OSlib.h"
#include "xf86.h"
#include "xf86Priv.h"
void
DoProbe()
{
int i;
Bool probeResult;
Bool ioEnableFailed = FALSE;
/* Find the list of video driver modules. */
char **list = xf86DriverlistFromCompile();
char **l;
if (list) {
ErrorF("List of video driver modules:\n");
for (l = list; *l; l++)
ErrorF("\t%s\n", *l);
} else {
ErrorF("No video driver modules found\n");
}
/* Load all the drivers that were found. */
xf86LoadModules(list, NULL);
/* Disable PCI devices */
xf86AccessInit();
/* Call all of the probe functions, reporting the results. */
for (i = 0; i < xf86NumDrivers; i++) {
DriverRec * const drv = xf86DriverList[i];
if (!xorgHWAccess) {
xorgHWFlags flags;
if (!drv->driverFunc
|| !drv->driverFunc( NULL, GET_REQUIRED_HW_INTERFACES, &flags )
|| NEED_IO_ENABLED(flags)) {
if (ioEnableFailed)
continue;
if (!xf86EnableIO()) {
ioEnableFailed = TRUE;
continue;
}
xorgHWAccess = TRUE;
}
}
xf86MsgVerb(X_INFO, 3, "Probing in driver %s\n", drv->driverName);
probeResult = xf86CallDriverProbe( drv, TRUE );
if (!probeResult) {
xf86ErrorF("Probe in driver `%s' returns FALSE\n",
drv->driverName);
} else {
xf86ErrorF("Probe in driver `%s' returns TRUE\n",
drv->driverName);
/* If we have a result, then call driver's Identify function */
if (drv->Identify != NULL) {
const int verbose = xf86SetVerbosity(1);
(*drv->Identify)(0);
xf86SetVerbosity(verbose);
}
}
}
OsCleanup(TRUE);
AbortDDX();
fflush(stderr);
exit(0);
}

69
hw/xfree86/common/xf86Init.c
View File

@ -643,6 +643,75 @@ xf86CallDriverProbe( DriverPtr drv, Bool detect_only )
return foundScreen;
}
static void
DoProbe(void)
{
int i;
Bool probeResult;
Bool ioEnableFailed = FALSE;
/* Find the list of video driver modules. */
char **list = xf86DriverlistFromCompile();
char **l;
if (list) {
ErrorF("List of video driver modules:\n");
for (l = list; *l; l++)
ErrorF("\t%s\n", *l);
} else {
ErrorF("No video driver modules found\n");
}
/* Load all the drivers that were found. */
xf86LoadModules(list, NULL);
/* Disable PCI devices */
xf86AccessInit();
/* Call all of the probe functions, reporting the results. */
for (i = 0; i < xf86NumDrivers; i++) {
DriverRec * const drv = xf86DriverList[i];
if (!xorgHWAccess) {
xorgHWFlags flags;
if (!drv->driverFunc
|| !drv->driverFunc( NULL, GET_REQUIRED_HW_INTERFACES, &flags )
|| NEED_IO_ENABLED(flags)) {
if (ioEnableFailed)
continue;
if (!xf86EnableIO()) {
ioEnableFailed = TRUE;
continue;
}
xorgHWAccess = TRUE;
}
}
xf86MsgVerb(X_INFO, 3, "Probing in driver %s\n", drv->driverName);
probeResult = xf86CallDriverProbe( drv, TRUE );
if (!probeResult) {
xf86ErrorF("Probe in driver `%s' returns FALSE\n",
drv->driverName);
} else {
xf86ErrorF("Probe in driver `%s' returns TRUE\n",
drv->driverName);
/* If we have a result, then call driver's Identify function */
if (drv->Identify != NULL) {
const int verbose = xf86SetVerbosity(1);
(*drv->Identify)(0);
xf86SetVerbosity(verbose);
}
}
}
OsCleanup(TRUE);
AbortDDX();
fflush(stderr);
exit(0);
}
/*
* InitOutput --

5
hw/xfree86/common/xf86Priv.h
View File

@ -150,9 +150,10 @@ Bool xf86PathIsSafe(const char *path);
extern const DisplayModeRec xf86DefaultModes[];
extern const int xf86NumDefaultModes;
/* xf86DoProbe.c */
void DoProbe(void);
/* xf86Configure.c */
void DoConfigure(void);
/* xf86ShowOpts.c */
void DoShowOptions(void);
/* xf86Events.c */