Attachment 9921 Details for Bug 10911 – Fix Hurd I/O enable/disable

[patch] Fix Hurd I/O enable/disable

xorg-hurd-patch (text/plain), 1.87 KB, created by Samuel Thibault on 2007-05-10 17:30:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samuel Thibault

Created: 2007-05-10 17:30:55 UTC

Size: 1.87 KB

patch

obsolete

>--- hw/xfree86/os-support/hurd/hurd_video.c.orig	2007-05-08 18:28:21.000842117 +0000
>+++ hw/xfree86/os-support/hurd/hurd_video.c	2007-05-08 18:27:37.000381314 +0000
>@@ -117,49 +117,29 @@
> /**************************************************************************
>  * I/O Permissions section                                                 
>  ***************************************************************************/
>-mach_port_t io_port;
>+
>+/*
>+ * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
>+ * this.
>+ */
>+extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on);
> 
> Bool
> xf86EnableIO()
> {
>-    mach_port_t device;
>-    kern_return_t err;
>-
>-    err = get_privileged_ports(NULL, &device);
>-    if( err )
>-    {
>-	errno = err;
>-	FatalError("xf86EnableIO() can't get_privileged_ports. (%s)\n",strerror(errno));
>-    }
>-    err = device_open(device,D_READ|D_WRITE,"io",&io_port);
>-    mach_port_deallocate(mach_task_self(), device);
>-    if( err )
>-    {
>-	errno = err;
>-	FatalError("xf86EnableIO() can't device_open. (%s)\n",strerror(errno));
>-    }
>-
>-    err = i386_io_port_add(mach_thread_self (), io_port);
>-    if( err )
>-    {
>-	errno = err;
>-	FatalError("xf86EnableIO() can't i386_io_port_add.(io_port) (%s)\n",strerror(errno));
>+    if (ioperm(0, 0xffff, 1)) {
>+	FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
>+	return FALSE;
>     }
>+    ioperm(0x40,4,0); /* trap access to the timer chip */
>+    ioperm(0x60,4,0); /* trap access to the keyboard controller */
>     return TRUE;
> }
> 	
> void
> xf86DisableIO()
> {
>-    kern_return_t err;
>-
>-    err = i386_io_port_remove(mach_thread_self (), io_port);
>-    if( err )
>-    {
>-	errno = err;
>-	FatalError("xf86DisableIO() can't i386_io_port_remove.(io_port) (%s)\n",strerror(errno));
>-    }
>-    mach_port_deallocate(mach_task_self(), io_port);
>+    ioperm(0,0xffff,0);
>     return;
> }
>

Actions: View | Splinter Review

Attachments on bug 10911: 9921

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.