Attachment 4829 Details for Bug 5877 – xorg-x11-6.8.99.901-alt-acpi.patch

[patch] xorg-x11-6.8.99.901-alt-acpi.patch

xorg-x11-6.8.99.901-alt-acpi.patch (text/plain), 1.52 KB, created by Valery Inozemtsev on 2006-03-06 00:36:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Valery Inozemtsev

Created: 2006-03-06 00:36:42 UTC

Size: 1.52 KB

patch

obsolete

>--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c~	2005-10-31 11:46:36 +0300
>+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c	2005-11-02 14:55:59 +0300
>@@ -13,7 +13,6 @@
> #include <errno.h>
>  
> #define ACPI_SOCKET  "/var/run/acpid.socket"
>-#define ACPI_EVENTS  "/proc/acpi/event"
> 
> #define ACPI_VIDEO_NOTIFY_SWITCH	0x80
> #define ACPI_VIDEO_NOTIFY_PROBE		0x81
>@@ -46,6 +45,13 @@
> 
>     n = read( fd, ev, LINE_LENGTH );
> 
>+    if (n <= 0) {
>+      lnxCloseACPI();
>+      sleep (3);
>+      lnxACPIOpen();
>+      return 0;
>+    }
>+    
>     /* Check that we have a video event */
>     if (strstr(ev, "video") == ev) {
> 	char *video = NULL;
>@@ -131,14 +137,7 @@
> 	if ((r = connect(fd, (struct sockaddr*)&addr, sizeof(addr))) == -1) {
> 	    shutdown(fd, 2);
> 	    close(fd);
>-	    fd = -1;
>-	}
>-    }
>-
>-    /* acpid's socket isn't available, so try going direct */
>-    if (fd == -1) {
>-        if ((fd = open(ACPI_EVENTS, O_RDONLY)) < 0) {
>-	    xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n", ACPI_EVENTS,
>+	    xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n", ACPI_SOCKET,
> 	    	strerror(errno));
> 	    return NULL;
>     	}
>@@ -147,7 +146,7 @@
>     xf86PMGetEventFromOs = lnxACPIGetEventFromOs;
>     xf86PMConfirmEventToOs = lnxACPIConfirmEventToOs;
>     ACPIihPtr = xf86AddInputHandler(fd,xf86HandlePMEvents,NULL);
>-    xf86MsgVerb(X_INFO,3,"Open ACPI successful (%s)\n", (r != -1) ? ACPI_SOCKET : ACPI_EVENTS);
>+    xf86MsgVerb(X_INFO,3,"Open ACPI successful (%s)\n", ACPI_SOCKET);
> 
>     return lnxCloseACPI;
> }

Actions: View | Splinter Review

Attachments on bug 5877: 4829

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.