xfree86: removal of some dead code due VGA arbiter's inclusion
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
This commit is contained in:
parent
6f3cc08ec0
commit
79182538b4
|
@ -105,7 +105,6 @@ extern _X_EXPORT int xf86GetFbInfoForScreen(int scrnIndex);
|
|||
extern _X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
|
||||
extern _X_EXPORT int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
|
||||
extern _X_EXPORT void xf86EnableAccess(ScrnInfoPtr pScrn);
|
||||
extern _X_EXPORT void xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn);
|
||||
extern _X_EXPORT Bool xf86IsPrimaryPci(struct pci_device * pPci);
|
||||
/* new RAC */
|
||||
extern _X_EXPORT Bool xf86DriverHasEntities(DriverPtr drvp);
|
||||
|
|
|
@ -455,12 +455,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
|
|||
return;
|
||||
}
|
||||
|
||||
void
|
||||
xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* xf86EnterServerState() -- set state the server is in.
|
||||
*/
|
||||
|
@ -497,9 +491,6 @@ xf86EnterServerState(xf86State state)
|
|||
else
|
||||
DebugF("Entering OPERATING state\n");
|
||||
|
||||
/* When servicing a dumb framebuffer we don't need to do anything */
|
||||
if (doFramebufferMode) return;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -528,12 +519,6 @@ xf86PostProbe(void)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
xf86PostPreInit(void)
|
||||
{
|
||||
if (doFramebufferMode) return;
|
||||
}
|
||||
|
||||
void
|
||||
xf86PostScreenInit(void)
|
||||
{
|
||||
|
@ -594,8 +579,6 @@ xf86FindPrimaryDevice(void)
|
|||
}
|
||||
}
|
||||
|
||||
/* Multihead accel sharing accessor functions and entity Private handling */
|
||||
|
||||
int
|
||||
xf86GetLastScrnFlag(int entityIndex)
|
||||
{
|
||||
|
|
|
@ -962,10 +962,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* set up the proper access funcs */
|
||||
xf86PostPreInit();
|
||||
|
||||
} else {
|
||||
/*
|
||||
* serverGeneration != 1; some OSs have to do things here, too.
|
||||
|
|
|
@ -121,7 +121,6 @@ extern _X_EXPORT void xf86FindPrimaryDevice(void);
|
|||
extern _X_EXPORT void xf86PostProbe(void);
|
||||
extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex);
|
||||
extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev);
|
||||
extern _X_EXPORT void xf86PostPreInit(void);
|
||||
extern _X_EXPORT void xf86PostScreenInit(void);
|
||||
|
||||
/* xf86Config.c */
|
||||
|
|
|
@ -644,7 +644,6 @@ bios_checksum(const CARD8 *start, int size)
|
|||
void
|
||||
LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
|
||||
{
|
||||
xf86SetCurrentAccess(FALSE, xf86Screens[pInt->scrnIndex]);
|
||||
vga->save_msr = inb(pInt->ioBase + 0x03CC);
|
||||
vga->save_vse = inb(pInt->ioBase + 0x03C3);
|
||||
#ifndef __ia64__
|
||||
|
@ -657,20 +656,17 @@ LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
|
|||
outb(pInt->ioBase + 0x46E8, ~(CARD8)0x08 & vga->save_46e8);
|
||||
#endif
|
||||
outb(pInt->ioBase + 0x0102, ~(CARD8)0x01 & vga->save_pos102);
|
||||
xf86SetCurrentAccess(TRUE, xf86Screens[pInt->scrnIndex]);
|
||||
}
|
||||
|
||||
void
|
||||
UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
|
||||
{
|
||||
xf86SetCurrentAccess(FALSE, xf86Screens[pInt->scrnIndex]);
|
||||
outb(pInt->ioBase + 0x0102, vga->save_pos102);
|
||||
#ifndef __ia64__
|
||||
outb(pInt->ioBase + 0x46E8, vga->save_46e8);
|
||||
#endif
|
||||
outb(pInt->ioBase + 0x03C3, vga->save_vse);
|
||||
outb(pInt->ioBase + 0x03C2, vga->save_msr);
|
||||
xf86SetCurrentAccess(TRUE, xf86Screens[pInt->scrnIndex]);
|
||||
}
|
||||
|
||||
#if defined (_PC)
|
||||
|
|
Loading…
Reference in New Issue
Block a user