Attachment 5507 Details for Bug 6729 – hal-spicctrl-support-dont-handle-all-vaios.patch

[patch] hal-spicctrl-support-dont-handle-all-vaios.patch

hal-spicctrl-support-dont-handle-all-vaios.patch (text/plain), 4.57 KB, created by Bastien Nocera on 2006-04-28 07:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bastien Nocera

Created: 2006-04-28 07:20:11 UTC

Size: 4.57 KB

patch

obsolete

>? addons/addon-sonypi.c
>? addons/hald-addon-sonypi
>Index: acpi.c
>===================================================================
>RCS file: /cvs/hal/hal/hald/linux2/acpi.c,v
>retrieving revision 1.47
>diff -u -p -u -p -r1.47 acpi.c
>--- acpi.c	18 Feb 2006 23:11:23 -0000	1.47
>+++ acpi.c	27 Apr 2006 21:12:03 -0000
>@@ -48,6 +48,7 @@ enum {
> 	ACPI_TYPE_PANASONIC_DISPLAY,
> 	ACPI_TYPE_SONY_DISPLAY,
> 	ACPI_TYPE_OMNIBOOK_DISPLAY,
>+	ACPI_TYPE_SONYPI_DISPLAY,
> 	ACPI_TYPE_BUTTON
> };
> 
>@@ -698,6 +699,10 @@ laptop_panel_refresh (HalDevice *d, ACPI
> 		type = "omnibook";
> 		desc = "Omnibook LCD Panel";
> 		br_levels = 8;
>+	} else if (acpi_type == ACPI_TYPE_SONYPI_DISPLAY) {
>+		type = "sonypi";
>+		desc = "Sony LCD Panel";
>+		br_levels = 256;
> 	} else {
> 		type = "unknown";
> 		desc = "Unknown LCD Panel";
>@@ -851,6 +856,49 @@ acpi_synthesize_display (char *vendor, c
> 		acpi_synthesize_item (path, method);
> }
> 
>+static int sonypi_irq_list[] = { 11, 10, 9, 6, 5 };
>+
>+/** Synthesizes a sonypi object.
>+ */
>+static void
>+acpi_synthesize_sonypi_display (void)
>+{
>+	HotplugEvent *hotplug_event;
>+	gboolean found = FALSE;
>+	guint i;
>+	gchar *path;
>+
>+	HAL_INFO (("Processing sonypi display"));
>+
>+	/* Check that we don't support brightness change through ACPI,
>+	 * for type3 VAIOs */
>+	if (g_file_test ("/proc/acpi/sony/brightness", G_FILE_TEST_EXISTS))
>+		return;
>+
>+	/* Find the sonypi device, this doesn't work
>+	 * if the sonypi device doesn't have an IRQ, sorry */
>+	for (i = 0; i < G_N_ELEMENTS (sonypi_irq_list); i++) {
>+		path =  g_strdup_printf ("/proc/irq/%d/sonypi", sonypi_irq_list[i]);
>+		if (g_file_test (path, G_FILE_TEST_IS_DIR)) {
>+			found = TRUE;
>+			break;
>+		}
>+		g_free (path);
>+	}
>+
>+	if (!found)
>+		return;
>+
>+	hotplug_event = g_new0 (HotplugEvent, 1);
>+	hotplug_event->action = HOTPLUG_ACTION_ADD;
>+	hotplug_event->type = HOTPLUG_EVENT_ACPI;
>+	g_strlcpy (hotplug_event->acpi.acpi_path, path, sizeof (hotplug_event->acpi.acpi_path));
>+	hotplug_event->acpi.acpi_type = ACPI_TYPE_SONYPI_DISPLAY;
>+	hotplug_event_enqueue (hotplug_event);
>+
>+	g_free (path);
>+}
>+
> /** Scan the data structures exported by the kernel and add hotplug
>  *  events for adding ACPI objects.
>  *
>@@ -913,8 +961,10 @@ acpi_synthesize_hotplug_events (void)
> 	acpi_synthesize_display ("acpi/pcc", "brightness", ACPI_TYPE_PANASONIC_DISPLAY);
> 	acpi_synthesize_display ("acpi/ibm", "brightness", ACPI_TYPE_IBM_DISPLAY);
> 	acpi_synthesize_display ("acpi/sony", "brightness", ACPI_TYPE_SONY_DISPLAY);
>-	/* onmibook does not live under acpi GNOME#331458 */
>+	/* omnibook does not live under acpi GNOME#331458 */
> 	acpi_synthesize_display ("omnibook", "lcd", ACPI_TYPE_OMNIBOOK_DISPLAY);
>+	/* sonypi doesn't have an acpi object fd.o#6729 */
>+	acpi_synthesize_sonypi_display ();
> 
> 	/* setup timer for things that we need to poll */
> 	g_timeout_add (ACPI_POLL_INTERVAL,
>@@ -1037,6 +1087,14 @@ static ACPIDevHandler acpidev_handler_la
> 	.remove      = acpi_generic_remove
> };
> 
>+static ACPIDevHandler acpidev_handler_laptop_panel_sonypi = {
>+	.acpi_type   = ACPI_TYPE_SONYPI_DISPLAY,
>+	.add         = acpi_generic_add,
>+	.compute_udi = acpi_generic_compute_udi,
>+	.refresh     = laptop_panel_refresh,
>+	.remove      = acpi_generic_remove
>+};
>+
> static ACPIDevHandler acpidev_handler_button = {
> 	.acpi_type   = ACPI_TYPE_BUTTON,
> 	.add         = acpi_generic_add,
>@@ -1065,6 +1123,7 @@ static ACPIDevHandler *acpi_handlers[] =
> 	&acpidev_handler_laptop_panel_asus,
> 	&acpidev_handler_laptop_panel_sony,
> 	&acpidev_handler_laptop_panel_omnibook,
>+	&acpidev_handler_laptop_panel_sonypi,
> 	NULL
> };
> 
>Index: addons/Makefile.am
>===================================================================
>RCS file: /cvs/hal/hal/hald/linux2/addons/Makefile.am,v
>retrieving revision 1.8
>diff -u -p -u -p -r1.8 Makefile.am
>--- addons/Makefile.am	8 Feb 2006 13:54:44 -0000	1.8
>+++ addons/Makefile.am	27 Apr 2006 21:12:03 -0000
>@@ -9,7 +9,7 @@ INCLUDES = \
> 	@PACKAGE_CFLAGS@
> 
> if HALD_COMPILE_LINUX2
>-libexec_PROGRAMS  = hald-addon-hid-ups hald-addon-acpi hald-addon-storage hald-addon-pmu hald-addon-keyboard
>+libexec_PROGRAMS  = hald-addon-hid-ups hald-addon-acpi hald-addon-storage hald-addon-pmu hald-addon-keyboard hald-addon-sonypi
> 
> if HAVE_LIBUSB
> libexec_PROGRAMS += hald-addon-usb-csr
>@@ -31,6 +31,9 @@ hald_addon_storage_LDADD = $(top_builddi
> hald_addon_keyboard_SOURCES = addon-keyboard.c
> hald_addon_keyboard_LDADD = $(top_builddir)/libhal/libhal.la
> 
>+hald_addon_sonypi_SOURCES = addon-sonypi.c
>+hald_addon_sonypi_LDADD = $(top_builddir)/libhal/libhal.la
>+
> if HAVE_LIBUSB
> hald_addon_usb_csr_SOURCES = addon-usb-csr.c
> hald_addon_usb_csr_LDADD = $(top_builddir)/libhal/libhal.la -lusb @PACKAGE_LIBS@

Actions: View | Splinter Review

Attachments on bug 6729: 5462 | 5487 | 5490 | 5507 | 5508

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.