Better error message on failure to set iopl. (Debian #021)
This commit is contained in:
parent
6d34a2ac8a
commit
c937faadd0
|
@ -29,6 +29,9 @@
|
||||||
#include <xorg-config.h>
|
#include <xorg-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
#include <X11/X.h>
|
#include <X11/X.h>
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
|
@ -566,11 +569,14 @@ xf86EnableIO(void)
|
||||||
}
|
}
|
||||||
close(fd);
|
close(fd);
|
||||||
#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
|
#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
|
||||||
if (ioperm(0, 1024, 1) || iopl(3)) {
|
if (ioperm(0, 1024, 1) || iopl(3)) {
|
||||||
xf86Msg(X_WARNING,
|
if (errno == ENODEV)
|
||||||
"xf86EnableIOPorts: Failed to set IOPL for I/O\n");
|
ErrorF("xf86EnableIOPorts: no I/O ports found\n");
|
||||||
|
else
|
||||||
|
FatalError("xf86EnableIOPorts: failed to set IOPL"
|
||||||
|
" for I/O (%s)\n", strerror(errno));
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
# if !defined(__alpha__)
|
# if !defined(__alpha__)
|
||||||
ioperm(0x40,4,0); /* trap access to the timer chip */
|
ioperm(0x40,4,0); /* trap access to the timer chip */
|
||||||
ioperm(0x60,4,0); /* trap access to the keyboard controller */
|
ioperm(0x60,4,0); /* trap access to the keyboard controller */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user