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

xfree86: linux: int10: drop dead code 

The code pieces inside `ifdef DoSubModule` aren't used anymore since very
long time. There's no evidence of this symbol ever been set in the whole
git history, so it must be an really ancient relic, that nobody used for
decades.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1400>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-13 13:27:44 +01:00 committed by Marge Bot
parent a0b69624f7
commit e37bcac1dc
1 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
hw/xfree86/os-support/linux/int10/linux.c
View File

@ -55,21 +55,6 @@ typedef struct {
char *alloc;
} linuxInt10Priv;
#if defined DoSubModules
typedef enum {
INT10_NOT_LOADED,
INT10_LOADED_VM86,
INT10_LOADED_X86EMU,
INT10_LOAD_FAILED
} Int10LinuxSubModuleState;
static Int10LinuxSubModuleState loadedSubModule = INT10_NOT_LOADED;
static Int10LinuxSubModuleState int10LinuxLoadSubModule(ScrnInfoPtr pScrn);
#endif /* DoSubModules */
static Bool
readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len)
{
@ -118,14 +103,6 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
return NULL;
}
#if defined DoSubModules
if (loadedSubModule == INT10_NOT_LOADED)
loadedSubModule = int10LinuxLoadSubModule(pScrn);
if (loadedSubModule == INT10_LOAD_FAILED)
return NULL;
#endif
if ((!vidMem) || (!sysMem)) {
if ((fd = open(DEV_MEM, O_RDWR, 0)) >= 0) {
if (!sysMem) {
@ -518,44 +495,3 @@ xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
else
return (void *) (memType) addr;
}
#if defined DoSubModules
static Bool
vm86_tst(void)
{
int __res;
#ifdef __PIC__
/* When compiling with -fPIC, we can't use asm constraint "b" because
%ebx is already taken by gcc. */
__asm__ __volatile__("pushl %%ebx\n\t"
"movl %2,%%ebx\n\t"
"movl %1,%%eax\n\t"
"int $0x80\n\t" "popl %%ebx":"=a"(__res)
:"n"((int) 113), "r"(NULL));
#else
__asm__ __volatile__("int $0x80\n\t":"=a"(__res):"a"((int) 113),
"b"((struct vm86_struct *) NULL));
#endif
if (__res < 0 && __res == -ENOSYS)
return FALSE;
return TRUE;
}
static Int10LinuxSubModuleState
int10LinuxLoadSubModule(ScrnInfoPtr pScrn)
{
if (vm86_tst()) {
if (xf86LoadSubModule(pScrn, "vm86"))
return INT10_LOADED_VM86;
}
if (xf86LoadSubModule(pScrn, "x86emu"))
return INT10_LOADED_X86EMU;
return INT10_LOAD_FAILED;
}
#endif /* DoSubModules */