frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: bus: delete useless xf86FindPrimaryDevice 

This function had a wrong name and was just logging the primary device. No one
cares about it honestly.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
This commit is contained in:
Tiago Vignatti 2010-05-18 20:48:35 +03:00
parent f686590948
commit 95889a569f
3 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/xfree86/common/xf86Bus.c
View File

@ -111,10 +111,6 @@ xf86BusConfig(void)
if (xorgHWAccess) if (xorgHWAccess)
xorgHWAccess = xf86EnableIO(); xorgHWAccess = xf86EnableIO();
/* Locate bus slot that had register IO enabled at server startup */
if (xorgHWAccess)
xf86FindPrimaryDevice();
/* /*
* Now call each of the Probe functions. Each successful probe will * Now call each of the Probe functions. Each successful probe will
* result in an extra entry added to the xf86Screens[] list for each * result in an extra entry added to the xf86Screens[] list for each
@ -557,39 +553,6 @@ xf86PostScreenInit(void)
xf86EnterServerState(OPERATING); xf86EnterServerState(OPERATING);
} }
/*
* xf86FindPrimaryDevice() - Find the display device which
* was active when the server was started.
*/
void
xf86FindPrimaryDevice(void)
{
if (primaryBus.type != BUS_NONE) {
char *bus;
char loc[16];
switch (primaryBus.type) {
case BUS_PCI:
bus = "PCI";
snprintf(loc, sizeof(loc), " %2.2x@%2.2x:%2.2x:%1.1x",
primaryBus.id.pci->bus,
primaryBus.id.pci->domain,
primaryBus.id.pci->dev,
primaryBus.id.pci->func);
break;
case BUS_SBUS:
bus = "SBUS";
snprintf(loc, sizeof(loc), " %2.2x", primaryBus.id.sbus.fbNum);
break;
default:
bus = "";
loc[0] = '\0';
}
xf86MsgVerb(X_INFO, 2, "Primary Device is: %s%s\n",bus,loc);
}
}
int int
xf86GetLastScrnFlag(int entityIndex) xf86GetLastScrnFlag(int entityIndex)
{ {

2
hw/xfree86/common/xf86Configure.c
View File

@ -681,8 +681,6 @@ DoConfigure(void)
xorgHWAccess = FALSE; xorgHWAccess = FALSE;
} }
xf86FindPrimaryDevice();
/* Create XF86Config file structure */ /* Create XF86Config file structure */
xf86config = calloc(1, sizeof(XF86ConfigRec)); xf86config = calloc(1, sizeof(XF86ConfigRec));

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

@ -110,14 +110,10 @@ extern _X_EXPORT RootWinPropPtr *xf86RegisteredPropertiesTable;
#ifndef _NO_XF86_PROTOTYPES #ifndef _NO_XF86_PROTOTYPES
/* xf86Bus.c */ /* xf86Bus.c */
extern _X_EXPORT Bool xf86BusConfig(void); extern _X_EXPORT Bool xf86BusConfig(void);
extern _X_EXPORT void xf86BusProbe(void); extern _X_EXPORT void xf86BusProbe(void);
extern _X_EXPORT void xf86AccessEnter(void); extern _X_EXPORT void xf86AccessEnter(void);
extern _X_EXPORT void xf86AccessLeave(void); extern _X_EXPORT void xf86AccessLeave(void);
extern _X_EXPORT void xf86FindPrimaryDevice(void);
/* new RAC */
extern _X_EXPORT void xf86PostProbe(void); extern _X_EXPORT void xf86PostProbe(void);
extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex); extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex);
extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev); extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev);