Hello community,
here is the log from the commit of package hal
checked in at Sat Nov 8 01:06:03 CET 2008.
--------
--- hal/hal.changes 2008-11-05 15:56:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/hal/hal.changes 2008-11-07 16:54:16.000000000 +0100
@@ -1,0 +2,13 @@
+Fri Nov 7 16:15:34 CET 2008 - dkukawka@suse.de
+
+- update HAL to latest git (07196f11b42c240) of my tree and
+ hal-info to 20081107
+- this update includes fixes for:
+ - improve performance: don't ask libvolume_id for filesystem
+ related information, which we get already from udev, use the
+ udev data
+ - add support for memstick/memstick_host subsystems and add
+ memstick as bus for block devices
+ - some more USB music player and suspend quirks
+
+-------------------------------------------------------------------
@@ -4 +17,3 @@
-- fix segfault when lever on bay device is pulled (bnc#441851)
+- updated patch:
+ - hal-20081105-fix-docking-support.diff: fix segfault when lever
+ on bay device is pulled (bnc#441851)
--- hal/hal-doc.changes 2008-10-31 17:33:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/hal/hal-doc.changes 2008-11-07 16:54:23.000000000 +0100
@@ -1,0 +2,20 @@
+Fri Nov 7 16:15:34 CET 2008 - dkukawka@suse.de
+
+- update HAL to latest git (07196f11b42c240) of my tree and
+ hal-info to 20081107
+- this update includes fixes for:
+ - improve performance: don't ask libvolume_id for filesystem
+ related information, which we get already from udev, use the
+ udev data
+ - add support for memstick/memstick_host subsystems and add
+ memstick as bus for block devices
+ - some more USB music player and suspend quirks
+
+-------------------------------------------------------------------
+Wed Nov 5 15:54:26 CET 2008 - hmacht@suse.de
+
+- updated patch:
+ - hal-20081105-fix-docking-support.diff: fix segfault when lever
+ on bay device is pulled (bnc#441851)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
hal-20081021-fix-docking-support.diff
hal-info-20081027.tar.bz2
New:
----
hal-20081105-fix-docking-support.diff
hal-info-20081107.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.IT9063/_old 2008-11-08 01:00:54.000000000 +0100
+++ /var/tmp/diff_new_pack.IT9063/_new 2008-11-08 01:00:54.000000000 +0100
@@ -26,10 +26,10 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20081027
+%define hal_info_version 20081107
%define libsmbios_version 2.0.2
Version: 0.5.12
-Release: 4
+Release: 5
Url: http://freedesktop.org/Software/hal
License: Other uncritical OpenSource License
Group: System/Daemons
@@ -81,7 +81,7 @@
# SUSE specific temporary patches
Patch10: hal-20080828-add-standby-support_v3.diff
# submitted (or planed to do in next time) upstream patches
-Patch100: hal-20081021-fix-docking-support.diff
+Patch100: hal-20081105-fix-docking-support.diff
# backports from git master:
#Patch200: hal-update-to_.diff
# revert from HEAD:
@@ -364,6 +364,20 @@
%endif
%changelog
+* Fri Nov 07 2008 dkukawka@suse.de
+- update HAL to latest git (07196f11b42c240) of my tree and
+ hal-info to 20081107
+- this update includes fixes for:
+ - improve performance: don't ask libvolume_id for filesystem
+ related information, which we get already from udev, use the
+ udev data
+ - add support for memstick/memstick_host subsystems and add
+ memstick as bus for block devices
+ - some more USB music player and suspend quirks
+* Wed Nov 05 2008 hmacht@suse.de
+- updated patch:
+ - hal-20081105-fix-docking-support.diff: fix segfault when lever
+ on bay device is pulled (bnc#441851)
* Fri Oct 31 2008 dkukawka@suse.de
- update HAL to latest git (689d0503c45161) of my tree
- this update includes fixes for:
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.IT9063/_old 2008-11-08 01:00:54.000000000 +0100
+++ /var/tmp/diff_new_pack.IT9063/_new 2008-11-08 01:00:54.000000000 +0100
@@ -26,10 +26,10 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20081027
+%define hal_info_version 20081107
%define libsmbios_version 2.0.2
Version: 0.5.12
-Release: 4
+Release: 5
Url: http://freedesktop.org/Software/hal
License: GPL v2 or later; AFL
Group: System/Daemons
@@ -81,7 +81,7 @@
# SUSE specific temporary patches
Patch10: hal-20080828-add-standby-support_v3.diff
# submitted (or planed to do in next time) upstream patches
-Patch100: hal-20081021-fix-docking-support.diff
+Patch100: hal-20081105-fix-docking-support.diff
# backports from git master:
#Patch200: hal-update-to_.diff
# revert from HEAD:
@@ -363,8 +363,20 @@
%endif
%changelog
+* Fri Nov 07 2008 dkukawka@suse.de
+- update HAL to latest git (07196f11b42c240) of my tree and
+ hal-info to 20081107
+- this update includes fixes for:
+ - improve performance: don't ask libvolume_id for filesystem
+ related information, which we get already from udev, use the
+ udev data
+ - add support for memstick/memstick_host subsystems and add
+ memstick as bus for block devices
+ - some more USB music player and suspend quirks
* Wed Nov 05 2008 hmacht@suse.de
-- fix segfault when lever on bay device is pulled (bnc#441851)
+- updated patch:
+ - hal-20081105-fix-docking-support.diff: fix segfault when lever
+ on bay device is pulled (bnc#441851)
* Fri Oct 31 2008 dkukawka@suse.de
- update HAL to latest git (689d0503c45161) of my tree
- this update includes fixes for:
++++++ hal-0.5.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/ChangeLog new/hal-0.5.12/ChangeLog
--- old/hal-0.5.12/ChangeLog 2008-10-31 16:58:55.000000000 +0100
+++ new/hal-0.5.12/ChangeLog 2008-11-07 16:50:20.000000000 +0100
@@ -1,3 +1,161 @@
+commit 2f9ad11a8835ae10e235a7d9d0374b40385d3533
+Author: Danny Kukawka
+Date: Fri Nov 7 16:31:09 2008 +0100
+
+ add memstick to storage.bus in spec
+
+ Documented memstick as possible value of storage.bus in the spec.
+
+ doc/spec/hal-spec-properties.xml | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit a6080ac92f86bed66be3944cc3e8f9075edab785
+Author: Danny Kukawka
+Date: Fri Nov 7 16:26:53 2008 +0100
+
+ add memstick and memstick_host namespace to spec
+
+ Documented memstick and memstick_host namespace in spec.
+
+ doc/spec/hal-spec-properties.xml | 44
+ ++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 44 insertions(+), 0 deletions(-)
+
+commit 07196f11b42c2405d2bfadb66f82f28ee5a5fca5
+Author: Danny Kukawka
+Date: Fri Nov 7 14:54:33 2008 +0100
+
+ another fix for commit d29ea6b31b67bf540b23dfedfa1b7add4c22bce2
+
+ Another fix for commit d29ea6b31b67bf540b23dfedfa1b7add4c22bce2:
+ - info.bus is deprecated, don't add this key
+ - info.subsystem should get only set in the subsystem specific
+ code if it differs from the subsystem or in other rare cases
+
+ hald/linux/device.c | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 01ef81e6e0bb277eec8a2b9fc2930c902b40c7b9
+Author: Danny Kukawka
+Date: Fri Nov 7 14:51:49 2008 +0100
+
+ fix commit d29ea6b31b67bf540b23dfedfa1b7add4c22bce2
+
+ Fixed commit d29ea6b31b67bf540b23dfedfa1b7add4c22bce2: keep
+ subsystem handler and related code in alphabetical order.
+
+ hald/linux/device.c | 209
+ ++++++++++++++++++++++++++-------------------------
+ 1 files changed, 106 insertions(+), 103 deletions(-)
+
+commit d29ea6b31b67bf540b23dfedfa1b7add4c22bce2
+Author: Matthew Garrett
+Date: Fri Nov 7 14:42:25 2008 +0100
+
+ add memstick/memstick_host support
+
+ This adds basic memory stick support to hal. It's enough to get
+ automounting up, but it doesn't expose any of the memory stick
+ specific
+ attributes yet since I'm not sure which of them are especially useful.
+
+ hald/linux/blockdev.c | 8 ++++
+ hald/linux/device.c | 105
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 113 insertions(+), 0 deletions(-)
+
+commit 7aca1f3fefefd3c760636aabcff1e25946ab6391
+Author: Danny Kukawka
+Date: Wed Nov 5 14:31:02 2008 +0100
+
+ cleanup handling volume filesystem information
+
+ Cleaned up handling of volume filesystem information. Don't call
+ libvolume_id functions in the volume prober to get the following
+ information:
+ - volume.fsusage
+ - volume.fstype
+ - volume.fsversion
+ - volume.uuid
+ - volume.label
+
+ HAL now simply use the already in the HotplugEvent stored information
+ from udev, since udev already called libvolume_id to get these info.
+
+ hald/linux/blockdev.c | 56 +++++++++++-
+ hald/linux/probing/Makefile.am | 2 +-
+ hald/linux/probing/probe-volume.c | 181
+ +------------------------------------
+ 3 files changed, 57 insertions(+), 182 deletions(-)
+
+commit 98b0b8434bf3506c69c33de4f126d885448dcbbb
+Merge: 689d050... 315ca27...
+Author: Danny Kukawka
+Date: Mon Nov 3 18:06:30 2008 +0100
+
+ Merged changes from git.freedesktop.org/git/hal.git (315ca276ffdde9a)
+
+ Merge commit '315ca276ffdde9a0cba809f67cddf58f258ee1d3'
+
+commit 315ca276ffdde9a0cba809f67cddf58f258ee1d3
+Author: Danny Kukawka
+Date: Mon Nov 3 11:13:30 2008 +0100
+
+ fix commit 151957477daaf985acdb2d7bda5b4a418c612cf3
+
+ Fixed commit 151957477daaf985acdb2d7bda5b4a418c612cf3: don't
+ call computer_probing_helper_done() twice.
+
+ hald/linux/osspec.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 151957477daaf985acdb2d7bda5b4a418c612cf3
+Author: Richard Hughes
+Date: Mon Nov 3 09:13:03 2008 +0000
+
+ prefer openfirmware interface for DMI even when dmidecode is found
+ in the path
+
+ This allows us to add OLPC specific code in the future. Patch
+ coming up.
+
+ hald/linux/osspec.c | 58
+ ++++++++++++++++++++++++++------------------------
+ 1 files changed, 30 insertions(+), 28 deletions(-)
+
+commit 96aafd9be0bdd8f5e41cf3ec1e6f744ccdbd67eb
+Author: Richard Hughes
+Date: Mon Nov 3 09:07:09 2008 +0000
+
+ remove the forced removal of the trailing newline to fix OLPC probing
+
+ While doing some patches for OLPC, all the OFW firmware strings
+ are not
+ terminated with \n\0 just with \0.
+
+ This means that we get results like OLP when we should be getting
+ OLPC.
+
+ data = OLPC0
+ index = 01234
+
+ len = 4
+ data[len-1] = C
+
+ data = IBMn0
+ index = 01234
+
+ len = 4
+ data[len-1] = \n
+
+ Now, the isspace check checks for \n, so we can remove the explicit \0
+ termination, and rely on the code three lines down. Removing the
+ explicit code allows non-newline terminated strings to be got with
+ hal_util_get_string_from_file().
+
+ hald/util.c | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
commit 689d0503c451610d57645a4f8d316249c84a5746
Author: Danny Kukawka
Date: Fri Oct 31 15:58:49 2008 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/doc/spec/hal-spec-properties.xml new/hal-0.5.12/doc/spec/hal-spec-properties.xml
--- old/hal-0.5.12/doc/spec/hal-spec-properties.xml 2008-10-30 18:54:36.000000000 +0100
+++ new/hal-0.5.12/doc/spec/hal-spec-properties.xml 2008-11-07 16:31:01.000000000 +0100
@@ -2070,6 +2070,50 @@
</informaltable>
</sect2>
+ <sect2 id="device-properties-memstick">
+ <title>
+ memstick namespace
+ </title>
+ <para>
+ Device objects with the capability <literal>memstick</literal> represent
+ a Sony MemoryStick device. No namespace specific properties.
+ </para>
+ </sect2>
+
+ <sect2 id="device-properties-memstick_host">
+ <title>
+ memstick_host namespace
+ </title>
+ <para>
+ Device objects with <literal>info.subsystem</literal> set to
+ <literal>memstick_host</literal> represent Sony MemoryStick
+ host adaptors. The following properties are available for such
+ device objects.
+ </para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Key (type)</entry>
+ <entry>Values</entry>
+ <entry>Mandatory</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ <literal>memstick_host.host</literal> (int)
+ </entry>
+ <entry></entry>
+ <entry>Yes</entry>
+ <entry>A unique number identifying the Sony MemoryStick host adaptor</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </sect2>
+
<sect2 id="device-properties-mmc">
<title>
mmc namespace
@@ -6195,6 +6239,12 @@
</row>
<row>
<entry></entry>
+ <entry>memstick</entry>
+ <entry></entry>
+ <entry>Sony MemoryStick device/interface</entry>
+ </row>
+ <row>
+ <entry></entry>
<entry>mmc</entry>
<entry></entry>
<entry>MultiMediaCard (MMC) interface</entry>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/blockdev.c new/hal-0.5.12/hald/linux/blockdev.c
--- old/hal-0.5.12/hald/linux/blockdev.c 2008-10-30 15:43:21.000000000 +0100
+++ new/hal-0.5.12/hald/linux/blockdev.c 2008-11-07 15:20:43.000000000 +0100
@@ -57,6 +57,34 @@
#include "blockdev.h"
+static gchar *
+strdup_valid_utf8 (const char *str)
+{
+ char *endchar;
+ char *newstr;
+ unsigned int fixes;
+
+ if (str == NULL)
+ return NULL;
+
+ newstr = g_strdup (str);
+
+ fixes = 0;
+ while (!g_utf8_validate (newstr, -1, (const char **) &endchar)) {
+ *endchar = '_';
+ ++fixes;
+ }
+
+ /* If we had to fix more than 20% of the characters, give up */
+ if (fixes > 0 && g_utf8_strlen (newstr, -1) / fixes < 5) {
+ g_free (newstr);
+ newstr = g_strdup("");
+ }
+
+ return newstr;
+}
+
+
/*--------------------------------------------------------------------------------------------------------------*/
static gboolean
@@ -1202,6 +1230,12 @@
is_hotpluggable = TRUE;
hal_device_property_set_string (d, "storage.bus", "mmc");
break;
+ } else if (strcmp (bus, "memstick") == 0) {
+ physdev = d_it;
+ physdev_udi = udi_it;
+ is_hotpluggable = TRUE;
+ hal_device_property_set_string (d, "storage.bus", "memstick");
+ break;
} else if (strcmp (bus, "ccw") == 0) {
physdev = d_it;
physdev_udi = udi_it;
@@ -1349,6 +1383,8 @@
} else if (strcmp (parent_bus, "mmc") == 0) {
hal_device_property_set_string (d, "storage.drive_type", "sd_mmc");
+ } else if (strcmp (parent_bus, "memstick") == 0) {
+ hal_device_property_set_string (d, "storage.drive_type", "memstick");
} else if (strcmp (parent_bus, "vio") == 0) {
char buf[256];
const gchar *prop;
@@ -1420,6 +1456,8 @@
} else {
guint sysfs_path_len;
gboolean is_physical_partition;
+ char *volume_label;
+ char buf[64];
/*************************
*
@@ -1435,12 +1473,32 @@
hal_device_property_set_string (d, "volume.uuid", "");
hal_device_property_set_string (d, "volume.label", "");
hal_device_property_set_string (d, "volume.mount_point", "");
+
+ /* persistent properties from udev (may be empty) */
+ hal_device_property_set_string (d, "volume.fsusage", hotplug_event->sysfs.fsusage);
+ hal_device_property_set_string (d, "volume.fsversion", hotplug_event->sysfs.fsversion);
+ hal_device_property_set_string (d, "volume.uuid", hotplug_event->sysfs.fsuuid);
+ hal_device_property_set_string (d, "volume.fstype", hotplug_event->sysfs.fstype);
+ if (hotplug_event->sysfs.fstype[0] != '\0') {
+ snprintf (buf, sizeof (buf), "Volume (%s)", hotplug_event->sysfs.fstype);
+ } else {
+ snprintf (buf, sizeof (buf), "Volume");
+ }
+ hal_device_property_set_string (d, "info.product", buf);
+
+ volume_label = strdup_valid_utf8 (hotplug_event->sysfs.fslabel);
+ if (volume_label) {
+ hal_device_property_set_string (d, "volume.label", volume_label);
+ if (volume_label[0] != '\0') {
+ hal_device_property_set_string (d, "info.product", volume_label);
+ }
+ g_free(volume_label);
+ }
+
hal_device_property_set_bool (d, "volume.is_mounted", FALSE);
hal_device_property_set_bool (d, "volume.is_mounted_read_only", FALSE);
hal_device_property_set_bool (d, "volume.linux.is_device_mapper", is_device_mapper);
- hal_device_property_set_bool (
- d, "volume.is_disc",
- strcmp (hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0);
+ hal_device_property_set_bool (d, "volume.is_disc", strcmp (hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0);
is_physical_partition = TRUE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/device.c new/hal-0.5.12/hald/linux/device.c
--- old/hal-0.5.12/hald/linux/device.c 2008-10-30 15:43:49.000000000 +0100
+++ new/hal-0.5.12/hald/linux/device.c 2008-11-07 15:20:43.000000000 +0100
@@ -1263,6 +1263,93 @@
/*--------------------------------------------------------------------------------------------------------------*/
static HalDevice *
+memstick_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path)
+{
+ HalDevice *d;
+ const gchar *bus_id;
+
+ if (parent_dev == NULL) {
+ d = NULL;
+ goto out;
+ }
+
+ d = hal_device_new ();
+ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
+ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
+
+ hal_util_set_driver (d, "info.linux.driver", sysfs_path);
+
+ bus_id = hal_util_get_last_element (sysfs_path);
+
+ hal_util_set_string_from_file (d, "info.product", sysfs_path, "attr_modelname");
+
+out:
+ return d;
+}
+
+static gboolean
+memstick_compute_udi (HalDevice *d)
+{
+ gchar udi[256];
+
+ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
+ "%s_memstick_card",
+ hal_device_property_get_string (d, "info.parent"));
+ hal_device_set_udi (d, udi);
+ hal_device_property_set_string (d, "info.udi", udi);
+ return TRUE;
+
+}
+
+/*--------------------------------------------------------------------------------------------------------------*/
+
+static HalDevice *
+memstick_host_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path)
+{
+ HalDevice *d;
+ gint host_num;
+ const gchar *last_elem;
+
+ d = NULL;
+
+ if (parent_dev == NULL || parent_path == NULL) {
+ goto out;
+ }
+
+ d = hal_device_new ();
+ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
+
+ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
+
+ hal_device_property_set_string (d, "info.category", "memstick_host");
+ hal_device_add_capability (d, "memstick_host");
+
+ hal_device_property_set_string (d, "info.product", "Memory Stick Host Adapter");
+
+ last_elem = hal_util_get_last_element (sysfs_path);
+ sscanf (last_elem, "memstick%d", &host_num);
+ hal_device_property_set_int (d, "memstick_host.host", host_num);
+
+out:
+ return d;
+}
+
+static gboolean
+memstick_host_compute_udi (HalDevice *d)
+{
+ gchar udi[256];
+
+ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
+ "%s_memstick_host",
+ hal_device_property_get_string (d, "info.parent"));
+ hal_device_set_udi (d, udi);
+ hal_device_property_set_string (d, "info.udi", udi);
+ return TRUE;
+}
+
+/*--------------------------------------------------------------------------------------------------------------*/
+
+static HalDevice *
mmc_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path)
{
HalDevice *d;
@@ -4134,6 +4221,23 @@
.remove = dev_remove
};
+static DevHandler dev_handler_memstick = {
+ .subsystem = "memstick",
+ .add = memstick_add,
+ .compute_udi = memstick_compute_udi,
+ .remove = dev_remove
+};
+
+static DevHandler dev_handler_memstick_host =
+{
+ .subsystem = "memstick_host",
+ .add = memstick_host_add,
+ .get_prober = NULL,
+ .post_probing = NULL,
+ .compute_udi = memstick_host_compute_udi,
+ .remove = dev_remove
+};
+
static DevHandler dev_handler_mmc = {
.subsystem = "mmc",
.add = mmc_add,
@@ -4405,6 +4509,8 @@
&dev_handler_input,
&dev_handler_iucv,
&dev_handler_mmc,
+ &dev_handler_memstick,
+ &dev_handler_memstick_host,
&dev_handler_mmc_host,
&dev_handler_net,
&dev_handler_of_platform,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/osspec.c new/hal-0.5.12/hald/linux/osspec.c
--- old/hal-0.5.12/hald/linux/osspec.c 2008-10-31 15:54:49.000000000 +0100
+++ new/hal-0.5.12/hald/linux/osspec.c 2008-11-07 15:20:43.000000000 +0100
@@ -723,61 +723,62 @@
}
}
-static void
-probe_openfirmware(HalDevice *root)
+static gboolean
+decode_dmi_from_openfirmware (HalDevice *root)
{
#define DEVICE_TREE "/proc/device-tree/"
- if (!g_file_test(DEVICE_TREE, G_FILE_TEST_IS_DIR)) {
- return;
- }
+ if (!g_file_test(DEVICE_TREE, G_FILE_TEST_IS_DIR))
+ return FALSE;
+
get_openfirmware_entry(root, "openfirmware.model",
DEVICE_TREE "model", FALSE);
get_openfirmware_entry(root, "openfirmware.compatible",
DEVICE_TREE "compatible", TRUE);
detect_openfirmware_formfactor(root);
+ return TRUE;
}
static gboolean
decode_dmi_from_sysfs (HalDevice *d)
{
- if (g_file_test (DMI_SYSFS_PATH, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
-
- osspec_privileged_init_preparse_set_dmi(TRUE, d);
- hal_util_set_string_from_file(d, "system.firmware.vendor", DMI_SYSFS_PATH, "bios_vendor");
- hal_util_set_string_from_file(d, "system.firmware.version", DMI_SYSFS_PATH, "bios_version");
- hal_util_set_string_from_file(d, "system.firmware.release_date", DMI_SYSFS_PATH, "bios_date");
- hal_util_set_string_from_file(d, "system.hardware.vendor", DMI_SYSFS_PATH, "sys_vendor");
- hal_util_set_string_from_file(d, "system.hardware.product", DMI_SYSFS_PATH, "product_name");
- hal_util_set_string_from_file(d, "system.hardware.version", DMI_SYSFS_PATH, "product_version");
- hal_util_set_string_from_file(d, "system.chassis.manufacturer", DMI_SYSFS_PATH, "chassis_vendor");
- hal_util_set_string_from_file(d, "system.board.product", DMI_SYSFS_PATH, "board_name");
- hal_util_set_string_from_file(d, "system.board.version", DMI_SYSFS_PATH, "board_version");
- hal_util_set_string_from_file(d, "system.board.vendor", DMI_SYSFS_PATH, "board_vendor");
- computer_dmi_map (d, FALSE);
-
- computer_probing_helper_done (d);
- return TRUE;
-
- } else {
+ if (!g_file_test (DMI_SYSFS_PATH, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
return FALSE;
- }
+ osspec_privileged_init_preparse_set_dmi(TRUE, d);
+ hal_util_set_string_from_file(d, "system.firmware.vendor", DMI_SYSFS_PATH, "bios_vendor");
+ hal_util_set_string_from_file(d, "system.firmware.version", DMI_SYSFS_PATH, "bios_version");
+ hal_util_set_string_from_file(d, "system.firmware.release_date", DMI_SYSFS_PATH, "bios_date");
+ hal_util_set_string_from_file(d, "system.hardware.vendor", DMI_SYSFS_PATH, "sys_vendor");
+ hal_util_set_string_from_file(d, "system.hardware.product", DMI_SYSFS_PATH, "product_name");
+ hal_util_set_string_from_file(d, "system.hardware.version", DMI_SYSFS_PATH, "product_version");
+ hal_util_set_string_from_file(d, "system.chassis.manufacturer", DMI_SYSFS_PATH, "chassis_vendor");
+ hal_util_set_string_from_file(d, "system.board.product", DMI_SYSFS_PATH, "board_name");
+ hal_util_set_string_from_file(d, "system.board.version", DMI_SYSFS_PATH, "board_version");
+ hal_util_set_string_from_file(d, "system.board.vendor", DMI_SYSFS_PATH, "board_vendor");
+ computer_dmi_map (d, FALSE);
+
+ return TRUE;
}
static void
decode_dmi (HalDevice *d)
{
/* try to get the dmi infos from sysfs instead of call dmidecode*/
- if(!decode_dmi_from_sysfs(d)) {
+ if (decode_dmi_from_sysfs(d) ||
+ decode_dmi_from_openfirmware (d)) {
+ HAL_INFO (("got DMI from files"));
+ computer_probing_helper_done (d);
+ } else {
if (g_file_test ("/usr/sbin/dmidecode", G_FILE_TEST_IS_EXECUTABLE) ||
g_file_test ("/bin/dmidecode", G_FILE_TEST_IS_EXECUTABLE) ||
g_file_test ("/sbin/dmidecode", G_FILE_TEST_IS_EXECUTABLE) ||
g_file_test ("/usr/local/sbin/dmidecode", G_FILE_TEST_IS_EXECUTABLE)) {
+ HAL_INFO (("getting DMI from prober"));
hald_runner_run (d, "hald-probe-smbios", NULL, HAL_HELPER_TIMEOUT,
computer_probing_pcbios_helper_done, NULL, NULL);
} else {
- /* no probing */
- probe_openfirmware (d);
+ /* no probing possible */
+ HAL_INFO (("failed to probe DMI"));
computer_probing_helper_done (d);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/probing/Makefile.am new/hal-0.5.12/hald/linux/probing/Makefile.am
--- old/hal-0.5.12/hald/linux/probing/Makefile.am 2008-10-30 15:43:21.000000000 +0100
+++ new/hal-0.5.12/hald/linux/probing/Makefile.am 2008-11-07 15:20:43.000000000 +0100
@@ -45,7 +45,7 @@
hald_probe_pc_floppy_SOURCES = probe-pc-floppy.c ../../logger.c
hald_probe_volume_SOURCES = probe-volume.c linux_dvd_rw_utils.c ../../logger.c
-hald_probe_volume_LDADD = $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la @GLIB_LIBS@ @VOLUME_ID_LIBS@
+hald_probe_volume_LDADD = $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la @GLIB_LIBS@
hald_probe_ieee1394_unit_SOURCES = probe-ieee1394-unit.c ../../logger.c
hald_probe_ieee1394_unit_LDADD = $(top_builddir)/libhal/libhal.la
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/probing/Makefile.in new/hal-0.5.12/hald/linux/probing/Makefile.in
--- old/hal-0.5.12/hald/linux/probing/Makefile.in 2008-10-31 16:07:17.000000000 +0100
+++ new/hal-0.5.12/hald/linux/probing/Makefile.in 2008-11-07 16:32:48.000000000 +0100
@@ -309,7 +309,7 @@
hald_probe_storage_LDADD = @GLIB_LIBS@ @VOLUME_ID_LIBS@ $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la
hald_probe_pc_floppy_SOURCES = probe-pc-floppy.c ../../logger.c
hald_probe_volume_SOURCES = probe-volume.c linux_dvd_rw_utils.c ../../logger.c
-hald_probe_volume_LDADD = $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la @GLIB_LIBS@ @VOLUME_ID_LIBS@
+hald_probe_volume_LDADD = $(top_builddir)/libhal/libhal.la $(top_builddir)/partutil/libpartutil.la @GLIB_LIBS@
hald_probe_ieee1394_unit_SOURCES = probe-ieee1394-unit.c ../../logger.c
hald_probe_ieee1394_unit_LDADD = $(top_builddir)/libhal/libhal.la
hald_probe_net_bluetooth_SOURCES = probe-net-bluetooth.c ../../logger.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/probing/probe-volume.c new/hal-0.5.12/hald/linux/probing/probe-volume.c
--- old/hal-0.5.12/hald/linux/probing/probe-volume.c 2008-10-30 15:43:21.000000000 +0100
+++ new/hal-0.5.12/hald/linux/probing/probe-volume.c 2008-11-07 15:20:43.000000000 +0100
@@ -42,116 +42,12 @@
#include
#include
-#include
#include "libhal/libhal.h"
#include "partutil/partutil.h"
#include "linux_dvd_rw_utils.h"
#include "../../logger.h"
-static void vid_log(int priority, const char *file, int line, const char *format, ...)
-{
- char log_str[1024];
- va_list args;
-
- va_start(args, format);
- vsnprintf(log_str, sizeof(log_str), format, args);
- logger_forward_debug("%s:%i %s\n", file, line, log_str);
- va_end(args);
-}
-
-static gchar *
-strdup_valid_utf8 (const char *str)
-{
- char *endchar;
- char *newstr;
- unsigned int fixes;
-
- if (str == NULL)
- return NULL;
-
- newstr = g_strdup (str);
-
- fixes = 0;
- while (!g_utf8_validate (newstr, -1, (const char **) &endchar)) {
- *endchar = '_';
- ++fixes;
- }
-
- /* If we had to fix more than 20% of the characters, give up */
- if (fixes > 0 && g_utf8_strlen (newstr, -1) / fixes < 5) {
- g_free (newstr);
- newstr = g_strdup("");
- }
-
- return newstr;
-}
-
-
-static void
-set_volume_id_values (LibHalChangeSet *cs, struct volume_id *vid)
-{
- char buf[256];
- const char *usage;
- const char *type;
- const char *type_version;
- const char *label;
- const char *uuid;
- DBusError error;
-
- dbus_error_init (&error);
-
- if (!volume_id_get_usage(vid, &usage))
- usage = "";
- libhal_changeset_set_property_string (cs, "volume.fsusage", usage);
- HAL_DEBUG (("volume.fsusage = '%s'", usage));
-
- if (!volume_id_get_type(vid, &type))
- type = "";
- if (!libhal_changeset_set_property_string (cs, "volume.fstype", type))
- libhal_changeset_set_property_string (cs, "volume.fstype", "");
- HAL_DEBUG(("volume.fstype = '%s'", type));
-
- if (!volume_id_get_type_version(vid, &type_version))
- type_version = "";
- libhal_changeset_set_property_string (cs, "volume.fsversion", type_version);
- HAL_DEBUG(("volume.fsversion = '%s'", type_version));
-
- if (!volume_id_get_uuid(vid, &uuid))
- uuid = "";
- libhal_changeset_set_property_string (cs, "volume.uuid", uuid);
- HAL_DEBUG(("volume.uuid = '%s'", uuid));
-
- if (!volume_id_get_label(vid, &label))
- label = "";
-
- if (label[0] != '\0') {
- char *volume_label;
-
- /* we need to be sure for a utf8 valid label, because dbus accept only utf8 valid strings */
- volume_label = strdup_valid_utf8 (label);
- if( volume_label != NULL ) {
- libhal_changeset_set_property_string (cs, "volume.label", volume_label);
- HAL_DEBUG(("volume.label = '%s'", volume_label));
-
- if (volume_label[0] != '\0') {
- libhal_changeset_set_property_string (cs, "info.product", volume_label);
- g_free(volume_label);
- return;
- }
-
- g_free(volume_label);
- }
- }
-
- if (type[0] != '\0') {
- snprintf (buf, sizeof (buf), "Volume (%s)", type);
- } else {
- snprintf (buf, sizeof (buf), "Volume (unknown)");
- }
- libhal_changeset_set_property_string (cs, "info.product", buf);
-}
-
static void
advanced_disc_detect (LibHalChangeSet *cs, int fd, const char *device_file)
{
@@ -311,7 +207,6 @@
LibHalContext *ctx = NULL;
DBusError error;
char *parent_udi;
- struct volume_id *vid;
char *stordev_dev_file;
char *partition_number_str;
char *partition_start_str;
@@ -330,9 +225,6 @@
cs = NULL;
disc_may_have_data = FALSE;
- /* hook in our debug into libvolume_id */
- volume_id_log_fn = vid_log;
-
setup_logger ();
/* assume failure */
@@ -618,76 +510,9 @@
vol_size = 0;
}
- /* probe for file system */
- vid = volume_id_open_fd (fd);
- if (vid != NULL) {
- int vid_ret;
- HAL_INFO (("invoking volume_id_probe_all, offset=%d, size=%d", vol_probe_offset, vol_size));
- vid_ret = volume_id_probe_all (vid, vol_probe_offset, vol_size);
- HAL_INFO (("volume_id_probe_all returned %d", vid_ret));
-
- if (vid_ret != 0 && is_disc && vol_probe_offset != 0) {
- /* Some cd-rom drives report the offset of the session in the cd's TOC
- * wrong. Fallback to probing at offset 0, just to be sure */
- HAL_INFO (("invoking volume_id_probe_all, offset=0, size=%d", vol_size));
- vid_ret = volume_id_probe_all (vid, 0 , vol_size);
- HAL_INFO (("volume_id_probe_all returned %d", vid_ret));
- }
-
- if (vid_ret == 0) {
- set_volume_id_values(cs, vid);
- if (disc_may_have_data) {
- libhal_changeset_set_property_bool (cs, "volume.disc.is_blank", FALSE);
- libhal_changeset_set_property_bool (cs, "volume.disc.has_data", TRUE);
- }
- } else {
- libhal_changeset_set_property_string (cs, "info.product", "Volume");
- }
-
- /* If we didn't detect anything, look whether it's a partition table (some Apple discs
- * uses Apple Partition Map) and look at partitions
- *
- * (kind of a hack - ugh - we ought to export all these as fakevolumes... but
- * this is good enough for now... the only discs I know of that does this
- * is in fact Apple's install disc.)
- */
- if (vid_ret != 0 && is_disc) {
- PartitionTable *p;
- p = part_table_load_from_disk (stordev_dev_file);
- if (p != NULL) {
- int i;
-
- HAL_INFO (("Partition table with scheme '%s' on optical disc",
- part_get_scheme_name (part_table_get_scheme (p))));
-
- for (i = 0; i < part_table_get_num_entries (p); i++) {
- char *part_type;
-
- part_type = part_table_entry_get_type (p, i);
- HAL_INFO ((" partition %d has type '%s'", i, part_type));
- if (strcmp (part_type, "Apple_HFS") == 0) {
- guint64 part_offset;
-
- part_offset = part_table_entry_get_offset (p, i);
- if (volume_id_probe_all (
- vid, vol_probe_offset + part_offset, 0) == 0) {
-
- set_volume_id_values(cs, vid);
- }
-
- /* and we're done */
- break;
- }
- g_free (part_type);
- }
-
-
- HAL_INFO (("Done looking at part table"));
- part_table_free (p);
- }
- }
-
- volume_id_close(vid);
+ if (disc_may_have_data) {
+ libhal_changeset_set_property_bool (cs, "volume.disc.is_blank", FALSE);
+ libhal_changeset_set_property_bool (cs, "volume.disc.has_data", TRUE);
}
/* get partition type number, if we find a msdos partition table */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/util.c new/hal-0.5.12/hald/util.c
--- old/hal-0.5.12/hald/util.c 2008-10-30 15:43:21.000000000 +0100
+++ new/hal-0.5.12/hald/util.c 2008-11-07 15:20:43.000000000 +0100
@@ -305,13 +305,14 @@
//HAL_ERROR (("Cannot read from '%s'", path));
goto out;
}
-
+
+ /* blank file, no data */
len = strlen (buf);
- if (len>0)
- buf[len-1] = '\0';
+ if (len == 0)
+ goto out;
- /* Clear remaining whitespace */
- for (i = len - 2; i >= 0; --i) {
+ /* clear remaining whitespace */
+ for (i = len - 1; i >= 0; --i) {
if (!g_ascii_isspace (buf[i]))
break;
buf[i] = '\0';
++++++ hal-20081021-fix-docking-support.diff -> hal-20081105-fix-docking-support.diff ++++++
++++++ hal-info-20081027.tar.bz2 -> hal-info-20081107.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081027/ChangeLog new/hal-info-20081107/ChangeLog
--- old/hal-info-20081027/ChangeLog 2008-10-28 23:25:11.000000000 +0100
+++ new/hal-info-20081107/ChangeLog 2008-11-07 16:08:33.000000000 +0100
@@ -1,3 +1,50 @@
+commit 133abbf14471faf33ba0358e85137be1735d4192
+Author: Ugo Viti
+Date: Fri Nov 7 15:12:44 2008 +0100
+
+ added suspend quirk for a Sony Vaio VGN-SR11M
+
+ Added suspend quirk for a Sony Vaio VGN-SR11M.
+
+ .../10freedesktop/20-video-quirk-pm-sony.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 773d7144628aac51453de0d16daa29b5140e2c48
+Author: Stepan Zastupov
+Date: Mon Nov 3 11:54:47 2008 +0100
+
+ add suspend video quirk for Asus A8N
+
+ Add suspend video quirk for Asus A8N, as reported by Stepan Zastupov
+ on the upstream ML.
+
+ .../10freedesktop/20-video-quirk-pm-asus.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit daeb673f13fc9ca0c42b474fca0603c73bea8629
+Author: Martin Pitt
+Date: Mon Nov 3 11:27:47 2008 +0100
+
+ add ONDA MF632 HSDPA USB dongle modem
+
+ Add ONDA MF632 HSDPA USB dongle modem, as reported in
+ https://launchpad.net/bugs/291333.
+
+ fdi/information/10freedesktop/10-modem.fdi | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 858895cf8ec763f68ae1171cbba75f258566acd0
+Author: Danny Kukawka
+Date: Wed Oct 29 18:50:49 2008 +0100
+
+ set ogg support only for Android (HTC G1)
+
+ Set ogg support only for Android (HTC G1), other Windows-Mobile based
+ HTC devices need special software to play ogg.
+
+ .../10freedesktop/10-usb-music-players.fdi | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
commit 1d0ca1d8461a1bcfa4a4fa08d52871d5d149acf0
Author: Danny Kukawka
Date: Tue Oct 28 11:01:41 2008 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081027/configure new/hal-info-20081107/configure
--- old/hal-info-20081027/configure 2008-10-28 23:24:33.000000000 +0100
+++ new/hal-info-20081107/configure 2008-11-07 16:08:14.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for hal-info 20081027.
+# Generated by GNU Autoconf 2.61 for hal-info 20081107.
#
# Report bugs to .
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='hal-info'
PACKAGE_TARNAME='hal-info'
-PACKAGE_VERSION='20081027'
-PACKAGE_STRING='hal-info 20081027'
+PACKAGE_VERSION='20081107'
+PACKAGE_STRING='hal-info 20081107'
PACKAGE_BUGREPORT='hal@lists.freedesktop.org'
ac_subst_vars='SHELL
@@ -1187,7 +1187,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures hal-info 20081027 to adapt to many kinds of systems.
+\`configure' configures hal-info 20081107 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1253,7 +1253,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hal-info 20081027:";;
+ short | recursive ) echo "Configuration of hal-info 20081107:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-hal-info configure 20081027
+hal-info configure 20081107
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by hal-info $as_me 20081027, which was
+It was created by hal-info $as_me 20081107, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2050,7 +2050,7 @@
# Define the identity of the package.
PACKAGE=hal-info
- VERSION=20081027
+ VERSION=20081107
cat >>confdefs.h <<_ACEOF
@@ -4048,7 +4048,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by hal-info $as_me 20081027, which was
+This file was extended by hal-info $as_me 20081107, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4101,7 +4101,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-hal-info config.status 20081027
+hal-info config.status 20081107
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081027/fdi/information/10freedesktop/10-modem.fdi new/hal-info-20081107/fdi/information/10freedesktop/10-modem.fdi
--- old/hal-info-20081027/fdi/information/10freedesktop/10-modem.fdi 2008-10-28 23:24:11.000000000 +0100
+++ new/hal-info-20081107/fdi/information/10freedesktop/10-modem.fdi 2008-11-07 16:07:24.000000000 +0100
@@ -142,6 +142,13 @@
<append key="modem.command_sets" type="strlist">GSM-07.05</append>
</match>
</match>
+ <!-- ONDA MF632 HSDPA USB dongle -->
+ <match key="@info.parent:usb.product_id" int="0x002">
+ <match key="@info.parent:usb.interface.number" int="2">
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
</match>
<!-- Novatel -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081027/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20081107/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20081027/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-10-28 23:24:11.000000000 +0100
+++ new/hal-info-20081107/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-11-07 16:07:24.000000000 +0100
@@ -904,7 +904,9 @@
<!-- Android Phone, HTC Diamond -->
<match key="@storage.originating_device:usb.product_id" int_outof="0xc01;0xc13">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
- <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <match key="@storage.originating_device:usb.product_id" int="0xc01">
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ </match>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081027/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi new/hal-info-20081107/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
--- old/hal-info-20081027/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2008-10-28 23:24:11.000000000 +0100
+++ new/hal-info-20081107/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2008-11-07 16:07:24.000000000 +0100
@@ -5,7 +5,7 @@
<match key="system.hardware.product" prefix_outof="U5F ;M2000E;F2J ">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne;M51Sr ;U6S">
+ <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne;M51Sr ;U6S;A8N">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!--NOTE: s2ram list the F3F with power_management.quirk.none=true -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081027/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi new/hal-info-20081107/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
--- old/hal-info-20081027/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi 2008-10-28 23:24:11.000000000 +0100
+++ new/hal-info-20081107/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi 2008-11-07 16:07:24.000000000 +0100
@@ -8,7 +8,7 @@
<match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B;VGN-SZ61XN_C;VGN-TZ37;VGN-TZ170N;VGN-FS920;VGN-C240E;PCG-FX601">
+ <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B;VGN-SZ61XN_C;VGN-TZ37;VGN-TZ170N;VGN-FS920;VGN-C240E;PCG-FX601;VGN-SR11M">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org