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

xfree86: bus: remove SetSIGIOForState and simplify the code

Browse Source 
Also removed some dumb debug messages.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Tiago Vignatti 2010-05-02 21:24:46 +03:00
parent 211ca67e4d
commit f28515b5f7
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,12 +399,17 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
typedef enum { TRI_UNSET, TRI_TRUE, TRI_FALSE } TriState;
static void
SetSIGIOForState(xf86State state)
void
xf86EnterServerState(xf86State state)
{
static int sigio_state;
static TriState sigio_blocked = TRI_UNSET;
/*
* This is a good place to block SIGIO during SETUP state. SIGIO should be
* blocked in SETUP state otherwise (u)sleep() might get interrupted
* early. We take care not to call xf86BlockSIGIO() twice.
*/
if ((state == SETUP) && (sigio_blocked != TRI_TRUE)) {
sigio_state = xf86BlockSIGIO();
sigio_blocked = TRI_TRUE;
@ -414,24 +419,6 @@ SetSIGIOForState(xf86State state)
}
}
void
xf86EnterServerState(xf86State state)
{
/*
* This is a good place to block SIGIO during SETUP state.
* SIGIO should be blocked in SETUP state otherwise (u)sleep()
* might get interrupted early.
* We take care not to call xf86BlockSIGIO() twice.
*/
SetSIGIOForState(state);
if (state == SETUP)
DebugF("Entering SETUP state\n");
else
DebugF("Entering OPERATING state\n");
return;
}
/*
* xf86PostProbe() -- Allocate all non conflicting resources
* This function gets called by xf86Init().
@ -458,13 +445,6 @@ void
xf86PostScreenInit(void)
{
xf86VGAarbiterWrapFunctions();
if (fbSlotClaimed) {
SetSIGIOForState(OPERATING);
return;
}
DebugF("PostScreenInit generation: %i\n",serverGeneration);
xf86EnterServerState(OPERATING);
}