Fixed ioperm calls in hwEnableIO
This commit is contained in:
parent
bb46e78540
commit
a0f738a673
|
@ -116,16 +116,36 @@ hwDisableIO(void)
|
|||
static Bool
|
||||
hwEnableIO(void)
|
||||
{
|
||||
if (ioperm(0, 1024, 1) || iopl(3)) {
|
||||
ErrorF("xf86EnableIOPorts: failed to set IOPL for I/O (%s)\n",
|
||||
short i;
|
||||
size_t n=0;
|
||||
int begin, end;
|
||||
char *buf=NULL, target[4];
|
||||
FILE *fp;
|
||||
|
||||
if (ioperm(0, 1024, 1)) {
|
||||
ErrorF("xf86EnableIO: failed to enable I/O ports 0000-03ff (%s)\n",
|
||||
strerror(errno));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#if !defined(__alpha__)
|
||||
/* XXX: this is actually not trapping anything because of iopl(3)
|
||||
* above */
|
||||
ioperm(0x40, 4, 0); /* trap access to the timer chip */
|
||||
ioperm(0x60, 4, 0); /* trap access to the keyboard controller */
|
||||
/* trap access to the keyboard controller(s) and timer chip(s) */
|
||||
fp = fopen("/proc/ioports", "r");
|
||||
while (getline(&buf, &n, fp) != -1) {
|
||||
if ((strstr(buf, "keyboard") != NULL) || (strstr(buf, "timer") != NULL)) {
|
||||
for (i=0; i<4; i++)
|
||||
target[i] = buf[i+2];
|
||||
begin = atoi(target);
|
||||
|
||||
for (i=0; i<4; i++)
|
||||
target[i] = buf[i+7];
|
||||
end = atoi(target);
|
||||
|
||||
ioperm(begin, end-begin+1, 0);
|
||||
}
|
||||
}
|
||||
free(buf);
|
||||
fclose(fp);
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
|
|
Loading…
Reference in New Issue
Block a user