Hello community,
here is the log from the commit of package hal
checked in at Sat Mar 8 00:17:35 CET 2008.
--------
--- hal/hal.changes 2008-02-26 12:15:44.000000000 +0100
+++ hal/hal.changes 2008-03-05 16:38:29.000000000 +0100
@@ -1,0 +2,19 @@
+Wed Mar 5 14:20:17 CET 2008 - dkukawka@suse.de
+
+- updated hal and hal-info to git master from 20080305
+- removed upstream gone patches:
+ - hal-add-dockstation-support.diff
+ - hal-add-ps3_system_bus.diff
+- added new patches:
+ - hal-deprecated_keys_v2.diff: remove deprecated keys from the
+ code
+- changed configure:
+ - hal:
+ - build pmu support only on ppc/ppc64, disable ACPI on ppc*
+ - build Dell/Toshiba/Sony device support only on ix86/x86_64
+ - disable keymapping support for ia64 s390 s390 s390x since we
+ have no keymapping for them atm
+ - hal-info:
+ - build Dell/Sony/Thinkpad killswitch only on ix86/x86_64
+
+-------------------------------------------------------------------
--- hal/hal-doc.changes 2008-02-26 12:15:10.000000000 +0100
+++ hal/hal-doc.changes 2008-03-05 17:09:57.000000000 +0100
@@ -1,0 +2,24 @@
+Wed Mar 5 14:20:17 CET 2008 - dkukawka@suse.de
+
+- updated hal and hal-info to git master from 20080305
+- removed upstream gone patches:
+ - hal-add-dockstation-support.diff
+ - hal-add-ps3_system_bus.diff
+- added new patches:
+ - hal-deprecated_keys_v2.diff: remove deprecated keys from the
+ code
+- changed configure:
+ - hal:
+ - build pmu support only on ppc/ppc64, disable ACPI on ppc*
+ - build Dell/Toshiba/Sony device support only on ix86/x86_64
+ - disable keymapping support for ia64 s390 s390 s390x since we
+ have no keymapping for these archs atm
+ - hal-info:
+ - build Dell/Sony/Thinkpad killswitch only on ix86/x86_64
+
+-------------------------------------------------------------------
+Tue Feb 26 12:15:17 CET 2008 - dkukawka@suse.de
+
+- remove /usr/share/gtk-doc dirs if build base package
+
+-------------------------------------------------------------------
Old:
----
hal-0.5.10_git20080207.tar.bz2
hal-add-dockstation-support.diff
hal-add-ps3_system_bus.diff
hal-info-20080207.tar.bz2
New:
----
hal-0.5.10_git20080305.tar.bz2
hal-deprecated_keys_v2.diff
hal-info-20080305.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.GC9740/_old 2008-03-08 00:16:08.000000000 +0100
+++ /var/tmp/diff_new_pack.GC9740/_new 2008-03-08 00:16:08.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package hal-doc (Version 0.5.10_git20080207 )
+# spec file for package hal-doc (Version 0.5.10_git20080305 )
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -19,12 +19,12 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20080207
+%define hal_info_version 20080305
Url: http://freedesktop.org/Software/hal
License: Other uncritical OpenSource License
Group: System/Daemons
-Version: 0.5.10_git20080207
-Release: 15
+Version: 0.5.10_git20080305
+Release: 1
AutoReqProv: on
Requires: pm-utils
BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
@@ -75,8 +75,7 @@
Patch10: hal-add-standby-support.diff
# submitted (or planed to do in next time) upstream patches
Patch100: hal-acpi_high_rate_calculate_on_time.diff
-Patch101: hal-add-dockstation-support.diff
-Patch102: hal-add-ps3_system_bus.diff
+Patch101: hal-deprecated_keys_v2.diff
# backports from git master:
#Patch200: hal-master.diff
# revert from HEAD:
@@ -167,7 +166,6 @@
%patch10 -p0
%patch100 -p1
%patch101 -p1
-%patch102 -p1
#%patch200 -p1
#%patch300 -p1
#%patch1000 -p1
@@ -190,14 +188,27 @@
--with-hal-group=haldaemon \
--docdir=%{_datadir}/doc/packages/hal \
--with-eject=/bin/eject \
+%ifarch ppc ppc64
+ --disable-acpi \
+ --disable-acpi-acpid \
+%else
--enable-acpi-acpid \
+%endif
--disable-acpi-proc \
--disable-acpi-ibm \
- --enable-acpi-toshiba \
--enable-parted \
--enable-console-kit \
+%ifarch ia64 s390 s390 s390x
+ --with-keymaps=no \
+ --disable-pmu \
+%endif
%ifarch %ix86 x86_64
+ --disable-pmu \
+ --enable-acpi-toshiba \
+ --enable-sonypic \
--with-dell-backlight=yes \
+%else
+ --disable-sonypic \
%endif
%if %build_doc
--enable-gtk-doc \
@@ -205,10 +216,19 @@
%endif
--enable-policy-kit
make %{?jobs:-j%jobs}
+# hal-info
pushd hal-info-%{hal_info_version}
%configure \
--disable-recall \
+%ifarch ppc ppc64 ia64 s390 s390 s390x
+ --disable-killswitch-dell-bluetooth \
+ --disable-killswitch-dell-wlan \
+ --disable-killswitch-dell-wwan \
+ --disable-killswitch-sony-bluetooth \
+ --disable-killswitch-thinkpad-bluetooth \
+%endif
--enable-killswitch-ipw-wlan
+make
popd
%install
@@ -339,6 +359,24 @@
%endif
%changelog
+* Wed Mar 05 2008 dkukawka@suse.de
+- updated hal and hal-info to git master from 20080305
+- removed upstream gone patches:
+ - hal-add-dockstation-support.diff
+ - hal-add-ps3_system_bus.diff
+- added new patches:
+ - hal-deprecated_keys_v2.diff: remove deprecated keys from the
+ code
+- changed configure:
+ - hal:
+ - build pmu support only on ppc/ppc64, disable ACPI on ppc*
+ - build Dell/Toshiba/Sony device support only on ix86/x86_64
+ - disable keymapping support for ia64 s390 s390 s390x since we
+ have no keymapping for these archs atm
+ - hal-info:
+ - build Dell/Sony/Thinkpad killswitch only on ix86/x86_64
+* Tue Feb 26 2008 dkukawka@suse.de
+- remove /usr/share/gtk-doc dirs if build base package
* Fri Feb 22 2008 dkukawka@suse.de
- fixed b.n.c #363765: move API doc to /usr/share/gtk-doc to get
it into devhelp
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.GC9740/_old 2008-03-08 00:16:08.000000000 +0100
+++ /var/tmp/diff_new_pack.GC9740/_new 2008-03-08 00:16:08.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package hal (Version 0.5.10_git20080207 )
+# spec file for package hal (Version 0.5.10_git20080305 )
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -19,12 +19,12 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20080207
+%define hal_info_version 20080305
Url: http://freedesktop.org/Software/hal
License: GPL v2 or later; AFL
Group: System/Daemons
-Version: 0.5.10_git20080207
-Release: 14
+Version: 0.5.10_git20080305
+Release: 1
AutoReqProv: on
Requires: pm-utils
BuildRequires: ConsoleKit-devel PolicyKit-devel dbus-1-glib-devel glib2-devel gperf intltool libexpat-devel libusb-devel libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
@@ -75,8 +75,7 @@
Patch10: hal-add-standby-support.diff
# submitted (or planed to do in next time) upstream patches
Patch100: hal-acpi_high_rate_calculate_on_time.diff
-Patch101: hal-add-dockstation-support.diff
-Patch102: hal-add-ps3_system_bus.diff
+Patch101: hal-deprecated_keys_v2.diff
# backports from git master:
#Patch200: hal-master.diff
# revert from HEAD:
@@ -167,7 +166,6 @@
%patch10 -p0
%patch100 -p1
%patch101 -p1
-%patch102 -p1
#%patch200 -p1
#%patch300 -p1
#%patch1000 -p1
@@ -190,14 +188,27 @@
--with-hal-group=haldaemon \
--docdir=%{_datadir}/doc/packages/hal \
--with-eject=/bin/eject \
+%ifarch ppc ppc64
+ --disable-acpi \
+ --disable-acpi-acpid \
+%else
--enable-acpi-acpid \
+%endif
--disable-acpi-proc \
--disable-acpi-ibm \
- --enable-acpi-toshiba \
--enable-parted \
--enable-console-kit \
+%ifarch ia64 s390 s390 s390x
+ --with-keymaps=no \
+ --disable-pmu \
+%endif
%ifarch %ix86 x86_64
+ --disable-pmu \
+ --enable-acpi-toshiba \
+ --enable-sonypic \
--with-dell-backlight=yes \
+%else
+ --disable-sonypic \
%endif
%if %build_doc
--enable-gtk-doc \
@@ -205,10 +216,19 @@
%endif
--enable-policy-kit
make %{?jobs:-j%jobs}
+# hal-info
pushd hal-info-%{hal_info_version}
%configure \
--disable-recall \
+%ifarch ppc ppc64 ia64 s390 s390 s390x
+ --disable-killswitch-dell-bluetooth \
+ --disable-killswitch-dell-wlan \
+ --disable-killswitch-dell-wwan \
+ --disable-killswitch-sony-bluetooth \
+ --disable-killswitch-thinkpad-bluetooth \
+%endif
--enable-killswitch-ipw-wlan
+make
popd
%install
@@ -339,6 +359,22 @@
%endif
%changelog
+* Wed Mar 05 2008 dkukawka@suse.de
+- updated hal and hal-info to git master from 20080305
+- removed upstream gone patches:
+ - hal-add-dockstation-support.diff
+ - hal-add-ps3_system_bus.diff
+- added new patches:
+ - hal-deprecated_keys_v2.diff: remove deprecated keys from the
+ code
+- changed configure:
+ - hal:
+ - build pmu support only on ppc/ppc64, disable ACPI on ppc*
+ - build Dell/Toshiba/Sony device support only on ix86/x86_64
+ - disable keymapping support for ia64 s390 s390 s390x since we
+ have no keymapping for them atm
+ - hal-info:
+ - build Dell/Sony/Thinkpad killswitch only on ix86/x86_64
* Tue Feb 26 2008 dkukawka@suse.de
- remove /usr/share/gtk-doc dirs if build base package
* Fri Feb 22 2008 dkukawka@suse.de
++++++ hal-0.5.10_git20080207.tar.bz2 -> hal-0.5.10_git20080305.tar.bz2 ++++++
++++ 8651 lines of diff (skipped)
++++++ hal-add-standby-support.diff ++++++
--- /var/tmp/diff_new_pack.GC9740/_old 2008-03-08 00:16:11.000000000 +0100
+++ /var/tmp/diff_new_pack.GC9740/_new 2008-03-08 00:16:11.000000000 +0100
@@ -191,8 +191,8 @@
+done
+
+exit $RET
---- policy/hal-power.policy 2007-10-17 15:44:00.000000000 +0200
-+++ policy/hal-power.policy 2007-10-17 15:44:40.000000000 +0200
+--- policy/org.freedesktop.hal.power-management.policy 2007-10-17 15:44:00.000000000 +0200
++++ policy/org.freedesktop.hal.power-management.policy 2007-10-17 15:44:40.000000000 +0200
@@ -79,6 +79,15 @@
</defaults>
</action>
++++++ hal-deprecated_keys_v2.diff ++++++
diff --git a/configure.in b/configure.in
index 6350601..88f69f4 100644
--- a/configure.in
+++ b/configure.in
@@ -612,6 +612,15 @@ if test "x$enable_pci" != "xno"; then
AC_DEFINE(HAVE_PCI, [], [Set if we have PCI support])
fi
+AC_ARG_WITH([deprecated-keys], AS_HELP_STRING([--with-deprecated-keys], [Add fdi-file to support deprecated/removed keys]))
+BUILD_DEPRECATED_KEYS=no
+if test "x$with_deprecated_keys" = "xyes"; then
+ BUILD_DEPRECATED_KEYS=yes
+else
+ BUILD_DEPRECATED_KEYS=no
+fi
+AM_CONDITIONAL(BUILD_DEPRECATED_KEYS, [test x$BUILD_DEPRECATED_KEYS = xyes])
+
# D-Bus libs
PKG_CHECK_MODULES(DBUS, [$dbus_module])
AC_SUBST(DBUS_CFLAGS)
@@ -1011,63 +1020,65 @@ echo "
HAL $VERSION
==============
- prefix: ${prefix}
- libdir: ${libdir}
- libexecdir: ${libexecdir}
- bindir: ${bindir}
- sbindir: ${sbindir}
- datadir: ${datadir}
- sysconfdir: ${sysconfdir}
- localstatedir: ${localstatedir}
- docdir: ${docdir}
- dbus-1 system.d dir: ${DBUS_SYS_DIR}
- pci.ids dir: ${PCI_IDS_DIR}
- usb.ids dir: ${USB_IDS_DIR}
-
- compiler: ${CC}
- cflags: ${CFLAGS}
- ldflags: ${LDFLAGS}
- cppflags: ${CPPFLAGS}
- xmlto: ${XMLTO}
- xmllint: ${XMLLINT}
- User for HAL: ${HAL_USER}
- Group for HAL: ${HAL_GROUP}
- hald pidfile: ${HALD_PID_FILE}
- hald socket dir: ${HALD_SOCKET_DIR}
- eject program: ${EJECT_PROGRAM}
-
- OS backend: ${HALD_BACKEND}
-
- use acpi kernel interface: ${acpi_proc}
- use acpid interface: ${acpi_acpid}
- use libusb: ${USE_LIBUSB}
- use libpci: ${USE_LIBPCI}
- use libparted: ${USE_PARTED}
- use gperf: ${have_gperf}
- use PolicyKit: ${msg_polkit}
- use ConsoleKit: ${msg_conkit}
- use ACL management: ${msg_aclmgmt}
- use umount.hal helper: ${msg_umount_hal}
- use ACPI: ${msg_acpi}
- use PMU: ${msg_pmu}
- use APM: ${msg_apm}
- use Sony PIC: ${msg_sonypic}
-
- Macbook backlight support: ${BUILD_MACBOOK} (Linux only, x86 only, requires libpci)
- Macbook Pro utils: ${BUILD_MACBOOKPRO} (Linux only, x86 only, requires libpci)
- OMAP utils: ${BUILD_OMAP} (Linux only, arm only)
- CPU frequency scaling: ${BUILD_CPUFREQ} (Linux only)
- Re-map multimedia keys: ${BUILD_KEYMAPS} (Linux only, requires gperf)
- Forward IBM ACPI events: ${BUILD_ACPI_IBM} (Linux only)
- Forward Toshiba ACPI events: ${BUILD_ACPI_TOSHIBA} (Linux only)
- USB wireless mouse power: ${BUILD_USBCSR} (Linux only, requires libusb)
- Dell Backlight: ${BUILD_DELL} (Linux only, requires libsmbios >= 0.13.4)
-
- Maintainer mode: ${USE_MAINTAINER_MODE}
- Building verbose mode: ${enable_verbose_mode}
- Building api docs: ${enable_gtk_doc}
- Building docs: ${enable_docbook_docs}
- Building man pages: ${enable_man_pages}
+ prefix: ${prefix}
+ libdir: ${libdir}
+ libexecdir: ${libexecdir}
+ bindir: ${bindir}
+ sbindir: ${sbindir}
+ datadir: ${datadir}
+ sysconfdir: ${sysconfdir}
+ localstatedir: ${localstatedir}
+ docdir: ${docdir}
+ dbus-1 system.d dir: ${DBUS_SYS_DIR}
+ pci.ids dir: ${PCI_IDS_DIR}
+ usb.ids dir: ${USB_IDS_DIR}
+
+ compiler: ${CC}
+ cflags: ${CFLAGS}
+ ldflags: ${LDFLAGS}
+ cppflags: ${CPPFLAGS}
+ xmlto: ${XMLTO}
+ xmllint: ${XMLLINT}
+ User for HAL: ${HAL_USER}
+ Group for HAL: ${HAL_GROUP}
+ hald pidfile: ${HALD_PID_FILE}
+ hald socket dir: ${HALD_SOCKET_DIR}
+ eject program: ${EJECT_PROGRAM}
+
+ OS backend: ${HALD_BACKEND}
+
+ use acpi kernel interface: ${acpi_proc}
+ use acpid interface: ${acpi_acpid}
+ use libusb: ${USE_LIBUSB}
+ use libpci: ${USE_LIBPCI}
+ use libparted: ${USE_PARTED}
+ use gperf: ${have_gperf}
+ use PolicyKit: ${msg_polkit}
+ use ConsoleKit: ${msg_conkit}
+ use ACL management: ${msg_aclmgmt}
+ use umount.hal helper: ${msg_umount_hal}
+ use ACPI: ${msg_acpi}
+ use PMU: ${msg_pmu}
+ use APM: ${msg_apm}
+ use Sony PIC: ${msg_sonypic}
+
+ Macbook backlight support: ${BUILD_MACBOOK} (Linux only, x86 only, requires libpci)
+ Macbook Pro utils: ${BUILD_MACBOOKPRO} (Linux only, x86 only, requires libpci)
+ OMAP utils: ${BUILD_OMAP} (Linux only, arm only)
+ CPU frequency scaling: ${BUILD_CPUFREQ} (Linux only)
+ Re-map multimedia keys: ${BUILD_KEYMAPS} (Linux only, requires gperf)
+ Forward IBM ACPI events: ${BUILD_ACPI_IBM} (Linux only)
+ Forward Toshiba ACPI events: ${BUILD_ACPI_TOSHIBA} (Linux only)
+ USB wireless mouse power: ${BUILD_USBCSR} (Linux only, requires libusb)
+ Dell Backlight: ${BUILD_DELL} (Linux only, requires libsmbios >= 0.13.4)
+
+ Support deprecated(removed) keys: ${BUILD_DEPRECATED_KEYS} (via a FDI-file)
+
+ Maintainer mode: ${USE_MAINTAINER_MODE}
+ Building verbose mode: ${enable_verbose_mode}
+ Building api docs: ${enable_gtk_doc}
+ Building docs: ${enable_docbook_docs}
+ Building man pages: ${enable_man_pages}
"
if test x$BUILD_ACPI_IBM = xyes; then
diff --git a/fdi/information/10freedesktop/01-deprecated-keys.fdi b/fdi/information/10freedesktop/01-deprecated-keys.fdi
new file mode 100644
index 0000000..79337ae
--- /dev/null
+++ b/fdi/information/10freedesktop/01-deprecated-keys.fdi
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+ <device>
+
+ <!--
+ Note: This fdi-file contains several deprecated keys, which get removed 12 months
+ after they get marked as deprecated in the HAL spec.
+ For backward compability of some unported tools this file can contain for a
+ short time some already finally removed keys.
+ -->
+
+ <!-- temporary readded keys -->
+ <!-- *.physical_device - finally removed: 2008-03-03 -->
+ <!-- readd net.physical_device to prevent problems with NM -->
+ <match key="net.originating_device" exists="true">
+ <merge key="net.physical_device" type="copy_property">net.originating_device</merge>
+ </match>
+
+ <!-- info.bus - finally removed: 2008-03-03 -->
+ <!-- readd info.bus for usb/usb_device to prevent problems with (lib)gphoto2 and libmtp -->
+ <match key="info.subsystem" contains="usb">
+ <merge key="info.bus" type="copy_property">info.subsystem</merge>
+ </match>
+
+ <!-- keys which are deprecated, but not removed finally -->
+ <!-- power_management.can_suspend_to_ram - planed remove: 2007-05-01 -->
+ <match key="power_management.can_suspend" exists="true">
+ <merge key="power_management.can_suspend_to_ram" type="copy_property">power_management.can_suspend</merge>
+ </match>
+ <!-- power_management.can_suspend_to_disk - planed remove: 2007-05-01 -->
+ <match key="power_management.can_hibernate" exists="true">
+ <merge key="power_management.can_suspend_to_disk" type="copy_property">power_management.can_hibernate</merge>
+ </match>
+
+ </device>
+</deviceinfo>
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 08f8971..932f9b7 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -1,7 +1,11 @@
fdidir = $(datadir)/hal/fdi/information/10freedesktop
-dist_fdi_DATA =
+dist_fdi_DATA =
+
+if BUILD_DEPRECATED_KEYS
+dist_fdi_DATA += 01-deprecated-keys.fdi
+endif
check:
for f in $(dist_fdi_DATA); do \
diff --git a/hald/freebsd/hf-computer.c b/hald/freebsd/hf-computer.c
index 3f3205f..9e7aac4 100644
--- a/hald/freebsd/hf-computer.c
+++ b/hald/freebsd/hf-computer.c
@@ -165,10 +165,6 @@ hf_computer_device_add (void)
hal_device_property_set_bool(device, "power_management.can_suspend", can_suspend_to_ram);
hal_device_property_set_bool(device, "power_management.can_hibernate", can_suspend_to_disk);
- /* XXX: These following two keys are deprecated. */
- hal_device_property_set_bool(device, "power_management.can_suspend_to_ram", can_suspend_to_ram);
- hal_device_property_set_bool(device, "power_management.can_suspend_to_disk", can_suspend_to_disk);
-
if (hf_device_preprobe(device))
{
if (should_decode_dmi)
diff --git a/hald/linux/device.c b/hald/linux/device.c
index 1026b2a..b0c739c 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -511,7 +511,6 @@ net_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
hal_device_add_capability (d, "net");
hal_device_property_set_string (d, "net.originating_device", hal_device_get_udi (parent_dev));
- hal_device_property_set_string (d, "net.physical_device", hal_device_get_udi (parent_dev));
ifname = hal_util_get_last_element (sysfs_path);
hal_device_property_set_string (d, "net.interface", ifname);
@@ -1709,7 +1708,6 @@ usb_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
gint bmAttributes;
hal_device_property_set_string (d, "info.subsystem", "usb_device");
- hal_device_property_set_string (d, "info.bus", "usb_device");
hal_util_set_driver (d, "info.linux.driver", sysfs_path);
@@ -1796,7 +1794,6 @@ usb_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
} else {
hal_device_property_set_string (d, "info.subsystem", "usb");
- hal_device_property_set_string (d, "info.bus", "usb");
/* take all usb_device.* properties from parent and make them usb.* on this object */
if (parent_dev != NULL)
@@ -3574,7 +3571,6 @@ virtio_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent
d = hal_device_new ();
hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
hal_device_property_set_string (d, "info.subsystem", "virtio");
- hal_device_property_set_string (d, "info.bus", "virtio");
if (parent_dev != NULL) {
hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
} else {
diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c
index 266453b..fb7f436 100644
--- a/hald/linux/osspec.c
+++ b/hald/linux/osspec.c
@@ -661,12 +661,6 @@
hal_device_property_set_bool (d, "power_management.can_suspend_hybrid", FALSE);
hal_device_property_set_bool (d, "power_management.can_hibernate", can_hibernate);
hal_device_property_set_bool (d, "power_management.can_standby", can_standby);
-
- /* WARNING: These keys are depreciated and power_management.can_suspend
- * and power_management.can_hibernate should be used instead.
- * These properties will be removed, but not before May 1st 2007. */
- hal_device_property_set_bool (d, "power_management.can_suspend_to_ram", can_suspend);
- hal_device_property_set_bool (d, "power_management.can_suspend_to_disk", can_hibernate);
}
static void
++++++ hal-fix-storage-policy-fixed-drives.diff ++++++
--- /var/tmp/diff_new_pack.GC9740/_old 2008-03-08 00:16:11.000000000 +0100
+++ /var/tmp/diff_new_pack.GC9740/_new 2008-03-08 00:16:11.000000000 +0100
@@ -14,12 +14,19 @@
+</deviceinfo>
--- fdi/policy/10osvendor/Makefile.am 2007-11-13 16:19:08.000000000 +0100
+++ fdi/policy/10osvendor/Makefile.am 2007-11-13 16:19:27.000000000 +0100
-@@ -10,7 +10,8 @@
- 10-tabletPCs.fdi \
+@@ -2,6 +2,7 @@
+ fdidir = $(datadir)/hal/fdi/policy/10osvendor
+
+ dist_fdi_DATA = \
++ 10-dockstation.fdi \
+ 10-input-policy.fdi \
+ 10-x11-input.fdi \
+ 10-power-mgmt-policy.fdi \
+@@ -11,7 +12,7 @@
15-storage-luks.fdi \
20-storage-methods.fdi \
-- 30-wol.fdi
-+ 30-wol.fdi \
+ 30-wol.fdi \
+- 10-dockstation.fdi
+ 99-storage-policy-fixed-drives.fdi
if BUILD_KEYMAPS
++++++ hal-info-20080207.tar.bz2 -> hal-info-20080305.tar.bz2 ++++++
++++ 1869 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/ChangeLog new/hal-info-20080305/ChangeLog
--- old/hal-info-20080207/ChangeLog 2008-02-07 15:57:04.000000000 +0100
+++ new/hal-info-20080305/ChangeLog 2008-03-05 14:20:25.000000000 +0100
@@ -1,3 +1,552 @@
+commit 58becc3d5d195a33c6ef6c048b217b93d62bc5c4
+Author: Danny Kukawka
+Date: Tue Mar 4 22:28:32 2008 +0100
+
+ added suspend quirk for Lenovo ThinkPad R61
+
+ Added suspend quirk for Lenovo ThinkPad R61 as reported via HAL ML
+ from Brouard Nicolas .
+
+ .../10freedesktop/20-video-quirk-pm-lenovo.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b38d6526206df73f10ad5db89fa60fa156a9b743
+Author: Danny Kukawka
+Date: Tue Mar 4 19:35:44 2008 +0100
+
+ fixed killswitch related configure information
+
+ Fixed killswitch related configure information: ThinkPad bluetooth
+ switch need HAL >= 0.5.11, added more info to the AC_ARG_ENABLE()
+ for the different (kill-)switch related parts of configure.
+
+ configure.in | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 2312b14641537148e2a1216d2fc5085695e919de
+Author: Ben Liblit
+Date: Tue Mar 4 19:13:32 2008 +0100
+
+ added support for software bluetooth killswitch for ThinkPads
+
+ Added support for software bluetooth killswitch for ThinkPads to
+ hal-info. Needs an actual hal (>= 0.5.11) package to work.
+
+ configure.in | 29
+ ++++++++++++-------
+ .../10-thinkpad-rfkill-switch-bluetooth.fdi | 24
+ ++++++++++++++++
+ fdi/information/10freedesktop/Makefile.am | 4 +++
+ 3 files changed, 46 insertions(+), 11 deletions(-)
+
+commit 4fd982c18ad1b73fc8745524c335da68d8adc980
+Author: Adam Williamson
+Date: Tue Mar 4 16:38:51 2008 +0100
+
+ support Nokia 6300 as a music device
+
+ Added a Nokia 6300 to list of USB mp3 music players.
+
+ .../10freedesktop/10-usb-music-players.fdi | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 1a2b66320a78344f7ebb089e91d1278ede99c830
+Author: Benjamin Delagoutte
+Date: Tue Mar 4 16:32:23 2008 +0100
+
+ added Sony Ericsson W880i to USB mp3 musicplayers
+
+ Added Sony Ericsson W880i to USB mp3 musicplayers. Contributed via
+ https://bugs.launchpad.net/ubuntu/+source/hal/+bug/117809 and fd.o
+ bug #12969.
+
+ .../10freedesktop/10-usb-music-players.fdi | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 99f0e49b7924f53913e87eab0910802f4beb087e
+Author: Danny Kukawka
+Date: Tue Mar 4 15:03:30 2008 +0100
+
+ added suspend quirks for a HP Omnibook 6100
+
+ Added slightly adopted version of a patch to add suspend quirks for
+ a HP Omnibook 6100, contributed by Denis D.
+ via HAL ML.
+
+ .../10freedesktop/20-video-quirk-pm-hp.fdi | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit d49da537eebb55e07678382259c825a04dc930ce
+Author: Danny Kukawka
+Date: Mon Mar 3 16:30:30 2008 +0100
+
+ s/AMR/amr/ and s/AMR-WB/amr-wb/
+
+ s/AMR/amr/ and s/AMR-WB/amr-wb/
+
+ .../10freedesktop/10-usb-music-players.fdi | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit b45424bb9de99df8ad9401a00675adb662351820
+Author: Thorsten Kocher
+Date: Mon Mar 3 15:53:21 2008 +0100
+
+ suspend quirk for IBM ThinkPad R50p
+
+ Added suspend quirk for IBM ThinkPad R50p, which need s3_bios/s3_mode.
+
+ .../10freedesktop/20-video-quirk-pm-ibm.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 8d93383c57c75885e584f38e228a5352ddef0f40
+Author: Bastien Nocera
+Date: Mon Mar 3 15:45:34 2008 +0100
+
+ added Sony Ericsson K850i to USB mp3 players
+
+ Added Sony Ericsson K850i to USB mp3 players. The supported formats
+ list was taken from the "default-capability.xml" file on the phone's
+ internal memory card.
+
+ .../10freedesktop/10-usb-music-players.fdi | 20
+ +++++++++++++++++++-
+ 1 files changed, 19 insertions(+), 1 deletions(-)
+
+commit dd607c8063ffead662e6a4dc3798d89bdeada157
+Author: Oliver Gerlich
+Date: Mon Mar 3 15:39:08 2008 +0100
+
+ added Mobile Media Tech no-name music player
+
+ Added Mobile Media Tech no-name music player (no-name USB music player
+ sold as 'Lavod', according to the USB database, the vendor ID is
+ 'Mobile Media Tech.'). Contributed via:
+ https://bugs.launchpad.net/bugs/114443
+
+ .../10freedesktop/10-usb-music-players.fdi | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit f3912125dd6c91f542a0d7e7d15fae9255e04dbe
+Author: Fernando Muñoz
+Date: Mon Mar 3 15:19:41 2008 +0100
+
+ added Lyra TH1501 music player
+
+ Added Lyra TH1501 music player. Contributed via
+ https://bugs.launchpad.net/bugs/157904.
+
+ .../10freedesktop/10-usb-music-players.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit aa6ce4cda407b9038dcf4c711274d517b8e92045
+Author: Alexey Fisher
+Date: Mon Mar 3 15:16:01 2008 +0100
+
+ added suspend quirks for Asus P5LD2
+
+ In https://launchpad.net/bugs/191737, a user reported that the Asus
+ P5LD2 needs the s3_bios and s3_mode quirks to resume properly.
+
+ .../10freedesktop/20-video-quirk-pm-asus.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 760853ff04f3391192f3ab5cb25c0f80a211c3b1
+Author: Martin Pitt
+Date: Mon Mar 3 15:08:23 2008 +0100
+
+ fixed suspend quirks for Asus V6V
+
+ In https://launchpad.net/bugs/191737, a user reported that the Asus
+ V6V additionally needs the s3_bios quirk to resume properly.
+
+ .../10freedesktop/20-video-quirk-pm-asus.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 03fc5c76634651f35ff9e93ff778efa04678fffc
+Author: Martin Pitt
+Date: Mon Mar 3 15:01:51 2008 +0100
+
+ added Samsung Yepp YP-K3 music player
+
+ Added Samsung Yepp YP-K3 music player. Contributed via
+ https://bugs.launchpad.net/bugs/120413.
+
+ .../10freedesktop/10-usb-music-players.fdi | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+commit f590a9e262dbfc1dab207e1acbbfe5ad06eb9b5f
+Author: Alexander Jones
+Date: Mon Mar 3 14:56:45 2008 +0100
+
+ added Nokia 5300 to USB mp3 musicplayer
+
+ Added Nokia 5300 to USB mp3 musicplayer list. Patch contributed via
+ https://bugs.launchpad.net/bugs/103831
+
+ .../10freedesktop/10-usb-music-players.fdi | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 0ea0f0cf520d6024ee5fd629de60f03f4c65d956
+Author: Mark Edgington
+Date: Mon Mar 3 14:48:55 2008 +0100
+
+ added Olympus DS-2 voice recorder to USB mp3 player
+
+ Added Olympus DS-2 voice recorderto USB mp3 players. Patch
+ contributed in
+ https://bugs.launchpad.net/bugs/94924.
+
+ .../10freedesktop/10-usb-music-players.fdi | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 12bdf69a181a84fb9ffacbb4bc7a57e26b828680
+Author: Daniel Tschinder
+Date: Mon Mar 3 14:40:22 2008 +0100
+
+ added keymap for Acer Aspire 5600
+
+ Added keymap for Acer Aspire 5600.
+
+ fdi/information/10freedesktop/30-keymap-acer.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3867526003664a62f9a23181ed449d9d7c8e2df1
+Author: Ulf Gattner
+Date: Mon Mar 3 14:27:16 2008 +0100
+
+ added keymap for Samsung P55-Pro
+
+ Added keymap for a Samsung P55-Pro.
+
+ fdi/information/10freedesktop/30-keymap-misc.fdi | 18
+ ++++++++++++++++++
+ 1 files changed, 18 insertions(+), 0 deletions(-)
+
+commit a455a551fdee78d7890fabde898623f4442ad757
+Author: Thomas Renninger
+Date: Mon Mar 3 14:22:16 2008 +0100
+
+ added keymap for HP 6715
+
+ Added keymap for HP 6715 laptop.
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bd634aefdaaa090eefadb4c61bc127fba86a5820
+Author: Danny Kukawka
+Date: Mon Mar 3 13:56:47 2008 +0100
+
+ removed deprecated and outdated smbios.* keys
+
+ Removed deprecated smbios.* properties from hal. The key reached
+ end of
+ lifetime with 2008-02-28 and was replaced by some other:
+
+ smbios.system.manufacturer --> system.hardware.vendor
+ smbios.system.product --> system.hardware.product
+ smbios.system.version --> system.hardware.version
+ smbios.system.serial --> system.hardware.serial
+ smbios.system.uuid --> system.hardware.uuid
+ smbios.bios.vendor --> system.firmware.vendor
+ smbios.bios.version --> system.firmware.version
+ smbios.bios.release_date --> system.firmware.release_date
+ smbios.chassis.manufacturer --> system.chassis.manufacturer
+ smbios.chassis.type --> system.chassis.type
+ system.vendor --> system.hardware.vendor
+
+ .../10freedesktop/20-video-quirk-pm-asus.fdi | 6 +++---
+ fdi/information/10freedesktop/30-keymap-misc.fdi | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit bce7df829de82ffa0f8aa4dff55c5f983243a4d6
+Author: Danny Kukawka
+Date: Mon Mar 3 13:51:32 2008 +0100
+
+ removed deprecated and outdated info.bus
+
+ Removed deprecated info.bus property from hal. The key reached end of
+ lifetime with 2008-03-01 and was replaced by info.subsystem.
+
+ .../10-dell-rfkill-switch-bluetooth.fdi | 2 +-
+ .../10freedesktop/10-dell-rfkill-switch-wlan.fdi | 2 +-
+ .../10freedesktop/10-dell-rfkill-switch-wwan.fdi | 2 +-
+ fdi/information/10freedesktop/10-usb-pda.fdi | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 84b217957491c821d05ec5a5b64af80ee2e6586b
+Author: Dan Williams
+Date: Sun Mar 2 10:57:31 2008 -0500
+
+ BUSlink UM-864GW is GPRS, not CDMA
+
+ fdi/information/10freedesktop/10-modem.fdi | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 5d8b2c479871d27f5a17023e20848b611c13e615
+Author: Danny Kukawka
+Date: Tue Feb 26 14:40:47 2008 +0100
+
+ cleaned up 10-usb-pda.fdi
+
+ Cleaned up and compressed 10-usb-pda.fdi by put entries for different
+ products of the same vendor together. Reduce file size from 18874 to
+ 8661 byte.
+
+ fdi/information/10freedesktop/10-usb-pda.fdi | 215
+ ++------------------------
+ 1 files changed, 14 insertions(+), 201 deletions(-)
+
+commit a196ae310a30b70f6b9de86b02cefc6ff4d06d9f
+Author: Kevin Page
+Date: Tue Feb 26 14:25:31 2008 +0100
+
+ update for PalmOS USB handhelds
+
+ The attached fdi patch identifies PalmOS USB handhelds; the USB
+ VID/PIDs
+ match those used by the pilot-link libusb code.
+
+ fdi/information/10freedesktop/10-usb-pda.fdi | 280
+ +++++++++++++++++++++++++-
+ 1 files changed, 279 insertions(+), 1 deletions(-)
+
+commit 79cf7ab4aa87605e7b92b98691c447c9d83efd55
+Author: Danny Kukawka
+Date: Tue Feb 26 14:21:57 2008 +0100
+
+ fixed entry for Sansa Clip
+
+ Fixed entry for Sansa Clip: please sort the added devices next time
+ after the produc id, don't add *.output_formats=audio/mpeg - all mp3
+ player get this format automatically.
+
+ .../10freedesktop/10-usb-music-players.fdi | 21
+ +++++++++----------
+ 1 files changed, 10 insertions(+), 11 deletions(-)
+
+commit ac165fac88cff6bdd96a18d3af1b6b4a40ef6ec7
+Author: Dan Williams
+Date: Mon Feb 25 13:49:45 2008 -0500
+
+ Add Dell 5720/Novatel Expedite E725
+
+ fdi/information/10freedesktop/10-modem.fdi | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 889df6e1e1ba33280685158a80872962d6337e0d
+Author: David Zeuthen
+Date: Sun Feb 24 23:14:53 2008 -0500
+
+ avoid showing fake cdrom drive on SanDisk Cruzer
+
+ This is for my 8GB Sandisk Cruzer Micro.
+
+ fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 65bc08e7c7e1761c287591eb8e23573a0daccbe4
+Author: Danny Kukawka
+Date: Thu Feb 21 21:41:47 2008 +0100
+
+ added suspend quirk for IBM Z60m
+
+ Added suspend quirk for IBM Z60m as reported via fd.o bug #14187.
+
+ .../10freedesktop/20-video-quirk-pm-ibm.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5ba78bcca276c5df1fb2fcf46823c6e310157dcd
+Author: Danny Kukawka
+Date: Thu Feb 21 15:31:30 2008 +0100
+
+ cleaned up modem list
+
+ Cleaned up FDI file for modems. Put similar modems from the same
+ vendor
+ together. This reduced the filesize from 46386 to 10731 bytes
+
+ fdi/information/10freedesktop/10-modem.fdi | 915
+ ++--------------------------
+ 1 files changed, 56 insertions(+), 859 deletions(-)
+
+commit d935b7ffd2f64c72dec135a4d0a6e663918ee9cc
+Author: Jason Merrill
+Date: Wed Feb 20 20:41:49 2008 +0000
+
+ for Thinkpad T43 we check the video manufacturer rather than the
+ Thinkpad model number
+
+ .../10freedesktop/20-video-quirk-pm-ibm.fdi | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 4144b7098bd9d1918e3ca3757d7d8f8d3b74668a
+Author: Danny Kukawka
+Date: Tue Feb 19 23:01:00 2008 +0100
+
+ Revert "identify modems and mobile broadband cards"
+
+ This reverts commit 5f906756030f6dcce6f55f11e29631dba023e984.
+ Because it duplicated the existing entries.
+
+ fdi/information/10freedesktop/10-modem.fdi | 1016
+ ----------------------------
+ 1 files changed, 0 insertions(+), 1016 deletions(-)
+
+commit d41f5423d3c0557310d151b17f8132ec1ca98d61
+Author: Daniele C
+Date: Tue Feb 19 15:38:38 2008 +0000
+
+ hal-info patch for Maxdata Pro 7000DX
+
+ I have created a patch for the multimedia keys of Maxdata Pro
+ 7000X/7000DX notebooks
+ (http://gentoo-wiki.com/HARDWARE_Maxdata_Pro_7000DX).
+
+ Please note that system.hardware.product is 'Pro 7000X', although I
+ have always thought to own a 7000DX! I am sure that 7000X/7000DX have
+ the same multimedia keys.
+
+ fdi/information/10freedesktop/30-keymap-misc.fdi | 15 +++++++++++++++
+ 1 files changed, 15 insertions(+), 0 deletions(-)
+
+commit 5f906756030f6dcce6f55f11e29631dba023e984
+Author: Dan Williams
+Date: Tue Feb 19 15:32:34 2008 +0000
+
+ identify modems and mobile broadband cards
+
+ As discussed in previous threads. fdi patch to hal-info attached as
+ it's too big for most mailing lists. If we find things in the
+ ETSI/UMTS/3GPP stuff that is _new_ to UMTS cards, we'll add another
+ command set specification. There are plenty of EDGE/GPRS cards and
+ actual phones that don't support UMTS and therefore wouldn't have any
+ new stuff like that.
+
+ fdi/information/10freedesktop/10-modem.fdi | 1016
+ ++++++++++++++++++++++++++++
+ 1 files changed, 1016 insertions(+), 0 deletions(-)
+
+commit 48856bce1e3a0f5c3d7be3e25306681f40c7edad
+Author: rehan khan
+Date: Tue Feb 19 14:26:27 2008 +0000
+
+ hp tx1000 hal-info keymap patch
+
+ Attached is a patch file for the HP tx1000 series. I have a tx1340ea
+ but I think the keymap will work on most tx1000 laptops.
+
+ One problem I had with the keymap was the DVD and PC/PVR mappings. I
+ took these from the sorted list and referred to the input.h on my
+ machine (kernel 2.6.23). One button starts a DVD player and the Other
+ button starts a media player in media mode. Not sure what I did wrong
+ but they are still showing up in /var/log/messages as being unmapped.
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 23bf51a67020ce3e7912cf527dd17db0865081b2
+Author: Nicholas Brekhus
+Date: Tue Feb 19 14:08:41 2008 +0000
+
+ Adds suspend support for IBM x40 systems
+
+ .../10freedesktop/20-video-quirk-pm-ibm.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f1368a36a65d302801f7e09d3ff9c8fc6eb01860
+Author: Thomas Reifenberger
+Date: Tue Feb 19 14:07:32 2008 +0000
+
+ add suspend quirk for Acer Aspire 5500
+
+ I got suspend working on an Acer Aspire 5500 with a Radeon-Mobility
+ x700
+ (open-source drivers) by using the vbe-post quirk.
+ When using suspend from the gnome-dislplay-manager, the display shows
+ black and white blocks for some seconds after resuming, but then the
+ lock-screen unlock dialog appears and it works.
+
+ .../10freedesktop/20-video-quirk-pm-acer.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit be12f449f01f2ad9a874233308fb3c9f7e3e3734
+Author: Carlos Corbacho
+Date: Tue Feb 19 14:06:02 2008 +0000
+
+ Acer Aspire 1350 Keymap
+
+ fdi/information/10freedesktop/30-keymap-acer.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6b5398118c97a123cb157e013d4977f3a39d18a1
+Author: MrLoba
+Date: Tue Feb 19 14:04:06 2008 +0000
+
+ add support for Fn+F1 and Fn+F6 on HP Pavilion DV5000
+
+ fdi/information/10freedesktop/30-keymap-hp.fdi | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 9340393a7975898b85be79460881008f1c1020bf
+Author: John A. Hull
+Date: Tue Feb 19 14:02:11 2008 +0000
+
+ add Sansa clip info for USB music players
+
+ Attached is a patch to add Sansa clip info for USB music players. I
+ have tested
+ it on my new Sansa Clip and it seems to work well with Rhythmbox
+ and Banshee.
+
+ .../10freedesktop/10-usb-music-players.fdi | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+commit 7b2429ecbcab6f6867cdf049dae3e30c97c0cef0
+Author: Richard Hughes
+Date: Tue Feb 19 13:55:58 2008 +0000
+
+ fix an obvious bug for dell laptops when pressing the brightness
+ down button.
+
+ Found by Bastien.
+
+ fdi/information/10freedesktop/30-keymap-dell.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 87e1aabe6bbe5b7d1c9b76b118ff6828e3df8694
+Author: Dan Williams
+Date: Fri Feb 15 17:42:39 2008 -0500
+
+ Released hal-info 20080215
+
+ VERSION | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a7177cd6ce0476c04fd52ba22c4a816ce24d1e4e
+Author: Dan Williams
+Date: Fri Feb 15 17:40:09 2008 -0500
+
+ update makefile for 10-modem.fdi
+
+ fdi/information/10freedesktop/Makefile.am | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit ec90d340793b01b3bcc6a91bbcf1fc1ca4dc301f
+Author: Dan Williams
+Date: Fri Feb 15 17:34:44 2008 -0500
+
+ tag many known modems with the modem property and supported command
+ sets
+
+ Big list of known modems, mainly CDMA and GSM-based mobile broadband
+ cards known to the Linux option, sierra, and airprime drivers, plus a
+ few others.
+
+ fdi/information/10freedesktop/10-modem.fdi | 1016
+ ++++++++++++++++++++++++++++
+ 1 files changed, 1016 insertions(+), 0 deletions(-)
+
commit 932f165f3ed6a73793d626197be5d24d31f52b4e
Author: Pavel Šefránek
Date: Thu Feb 7 14:25:01 2008 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/configure.in new/hal-info-20080305/configure.in
--- old/hal-info-20080207/configure.in 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/configure.in 2008-03-04 22:17:24.000000000 +0100
@@ -37,31 +37,37 @@
dnl ---------------------------------------------------------------------------
dnl - Should we enable WLAN killswitch support for Dell laptops?
dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(killswitch_dell_wlan, [ --enable-killswitch-dell-wlan Include support for WLAN killswitch],enable_killswitch_dell_wlan=$enableval,enable_killswitch_dell_wlan=yes)
+AC_ARG_ENABLE(killswitch_dell_wlan, [ --enable-killswitch-dell-wlan Include support for Dell WLAN killswitch],enable_killswitch_dell_wlan=$enableval,enable_killswitch_dell_wlan=yes)
AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_WLAN, test x$enable_killswitch_dell_wlan == xyes)
dnl ---------------------------------------------------------------------------
dnl - Should we enable Bluetooth killswitch support for Dell laptops?
dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(killswitch_dell_bluetooth, [ --enable-killswitch-dell-bluetooth Include support for Bluetooth killswitch],enable_killswitch_dell_bluetooth=$enableval,enable_killswitch_dell_bluetooth=yes)
+AC_ARG_ENABLE(killswitch_dell_bluetooth, [ --enable-killswitch-dell-bluetooth Include support for Dell Bluetooth killswitch],enable_killswitch_dell_bluetooth=$enableval,enable_killswitch_dell_bluetooth=yes)
AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_BLUETOOTH, test x$enable_killswitch_dell_bluetooth == xyes)
dnl ---------------------------------------------------------------------------
dnl - Should we enable WWAN killswitch support for Dell laptops?
dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(killswitch_dell_wwan, [ --enable-killswitch-dell-wwan Include support for WWAN killswitch (requires hal >= 0.5.11)],enable_killswitch_dell_wwan=$enableval,enable_killswitch_dell_wwan=yes)
+AC_ARG_ENABLE(killswitch_dell_wwan, [ --enable-killswitch-dell-wwan Include support for Dell WWAN killswitch (requires hal >= 0.5.11)],enable_killswitch_dell_wwan=$enableval,enable_killswitch_dell_wwan=yes)
AM_CONDITIONAL(BUILD_KILLSWITCH_DELL_WWAN, test x$enable_killswitch_dell_wwan == xyes)
dnl ---------------------------------------------------------------------------
dnl - Should we enable Bluetooth killswitch support for Sony laptops?
dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(killswitch_sony_bluetooth, [ --enable-killswitch-sony-bluetooth Include support for Bluetooth killswitch],enable_killswitch_sony_bluetooth=$enableval,enable_killswitch_sony_bluetooth=yes)
+AC_ARG_ENABLE(killswitch_sony_bluetooth, [ --enable-killswitch-sony-bluetooth Include support for Sony Bluetooth killswitch],enable_killswitch_sony_bluetooth=$enableval,enable_killswitch_sony_bluetooth=yes)
AM_CONDITIONAL(BUILD_KILLSWITCH_SONY_BLUETOOTH, test x$enable_killswitch_sony_bluetooth == xyes)
dnl ---------------------------------------------------------------------------
+dnl - Should we enable Bluetooth killswitch support for ThinkPad laptops?
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(killswitch_thinkpad_bluetooth, [ --enable-killswitch-thinkpad-bluetooth Include support for Thinkpad Bluetooth killswitch (requires hal >= 0.5.11)],enable_killswitch_thinkpad_bluetooth=$enableval,enable_killswitch_thinkpad_bluetooth=yes)
+AM_CONDITIONAL(BUILD_KILLSWITCH_THINKPAD_BLUETOOTH, test x$enable_killswitch_thinkpad_bluetooth == xyes)
+
+dnl ---------------------------------------------------------------------------
dnl - Should we enable WLAN killswitch support for ipw chipsets?
dnl ---------------------------------------------------------------------------
-AC_ARG_ENABLE(killswitch_ipw_wlan, [ --enable-killswitch-ipw-wlan Include support for WLAN killswitch (requires hal >= 0.5.10)],enable_killswitch_ipw_wlan=$enableval,enable_killswitch_ipw_wlan=yes)
+AC_ARG_ENABLE(killswitch_ipw_wlan, [ --enable-killswitch-ipw-wlan Include support for IPW WLAN killswitch (requires hal >= 0.5.10)],enable_killswitch_ipw_wlan=$enableval,enable_killswitch_ipw_wlan=yes)
AM_CONDITIONAL(BUILD_KILLSWITCH_IPW_WLAN, test x$enable_killswitch_ipw_wlan == xyes)
AC_OUTPUT([
@@ -88,15 +94,16 @@
========================================================="
fi
echo "
- prefix: ${prefix}
- datarootdir: ${datarootdir:-unused}
- datadir: ${datadir}
- sysconfdir: ${sysconfdir}
- hardware recall data: ${enable_recall}
- video suspend data: ${enable_video}
- killswitch support for Dell wlan: ${enable_killswitch_dell_wlan}
- killswitch support for Dell Bluetooth: ${enable_killswitch_dell_bluetooth}
- killswitch support for Dell wwan: ${enable_killswitch_dell_wwan} (requires hal >= 0.5.11)
- killswitch support for Sony Bluetooth: ${enable_killswitch_sony_bluetooth}
- killswitch support for IPW wlan: ${enable_killswitch_ipw_wlan} (requires hal >= 0.5.10)
+ prefix: ${prefix}
+ datarootdir: ${datarootdir:-unused}
+ datadir: ${datadir}
+ sysconfdir: ${sysconfdir}
+ hardware recall data: ${enable_recall}
+ video suspend data: ${enable_video}
+ killswitch support for Dell wlan: ${enable_killswitch_dell_wlan}
+ killswitch support for Dell Bluetooth: ${enable_killswitch_dell_bluetooth}
+ killswitch support for Dell wwan: ${enable_killswitch_dell_wwan} (requires hal >= 0.5.11)
+ killswitch support for Sony Bluetooth: ${enable_killswitch_sony_bluetooth}
+ killswitch support for ThinkPad Bluetooth: ${enable_killswitch_thinkpad_bluetooth} (requires hal >= 0.5.11)
+ killswitch support for IPW wlan: ${enable_killswitch_ipw_wlan} (requires hal >= 0.5.10)
"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi new/hal-info-20080305/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -3,7 +3,7 @@
<deviceinfo version="0.2">
<device>
- <match key="info.bus" string="platform">
+ <match key="info.subsystem" string="platform">
<match key="platform.id" string="dcdbas">
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi new/hal-info-20080305/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -3,7 +3,7 @@
<deviceinfo version="0.2">
<device>
- <match key="info.bus" string="platform">
+ <match key="info.subsystem" string="platform">
<match key="platform.id" string="dcdbas">
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi new/hal-info-20080305/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -3,7 +3,7 @@
<deviceinfo version="0.2">
<device>
- <match key="info.bus" string="platform">
+ <match key="info.subsystem" string="platform">
<match key="platform.id" string="dcdbas">
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/10-modem.fdi new/hal-info-20080305/fdi/information/10freedesktop/10-modem.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/10-modem.fdi 1970-01-01 01:00:00.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/10-modem.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- xml -*- -->
+
+<deviceinfo version="0.2">
+ <device>
+ <match key="info.category" string="serial">
+
+ <!-- Option -->
+ <match key="@info.parent:usb.vendor_id" int="0x0af0">
+ <!-- Colt,Ricola,Ricola Light,Ricola Quad,Ricola Quad Light,Ricola Ndis,Ricola Ndis Light;Ricola Ndis Quad,Ricola Ndis Quad Light,
+ Cobra,Cobra Bus,Viper,Viper Bus,Gt Max Ready,Gt Max,Fuji Modem Light,Fuji Modem Gt,Fuji Modem Ex,Fuji Network Light,Fuji Network Gt,
+ Fuji Network Ex,Koi Modem,Koi Network,Scorpion Modem,Scorpion Network,Etna Modem,Etna Network,Etna Modem Lite;Etna Modem Gt,
+ Etna Modem Ex,Etna Network Lite,Etna Network Gt,Etna Network Ex,Etna Koi Modem,Etna Koi Network -->
+ <match key="@info.parent:usb.product_id" int_outof="0x5000;0x6000;0x6100;0x6200;0x6300;0x6050;0x6150;0x6250;0x6350;0x6500;0x6501;0x6600;0x6601;0x6701;0x6711;0x6721;0x6741;0x6761;0x6731;0x6751;0x6771;0x6800;0x6811;0x6901;0x6911;0x7001;0x7011;0x7021;0x7041;0x7061;0x7031;0x7051;0x7071;0x7100;0x7111">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <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>
+
+ <!-- Kyocera -->
+ <match key="@info.parent:usb.vendor_id" int="0x0c88">
+ <!-- KPC680,KPC650/Passport, -->
+ <match key="@info.parent:usb.product_id" int_outof="0x180a;0x17da">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+
+ <!-- Sierra Wireless MC5720 -->
+ <match key="@info.parent:usb.vendor_id" int="0x0f30">
+ <match key="@info.parent:usb.product_id" int="0x1b1d">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+
+ <!-- Airprime/Sierra PC 5220 -->
+ <match key="@info.parent:usb.vendor_id" int="0x0f3d">
+ <match key="@info.parent:usb.product_id" int="0x0112">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+
+ <!-- Sierra Wireless -->
+ <match key="@info.parent:usb.vendor_id" int="0x1199">
+ <!-- EM5625,2x MC5720,2x MC5725,AirCard 595,AirCard 597E,USB Dongle 595U,AirCard 580 -->
+ <match key="@info.parent:usb.product_id" int_outof="0x0017;0x0018;0x0218;0x0020;0x0220;0x0019;0x0021;0x0120;0x0112">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ <!-- 2x MC8755,MC8765,MC8775 & AC 875U,MC8775,AirCard 875,MC8780,MC8781,AirCard 880,AirCard 881,AirCard 880 E,AirCard 881 E, -->
+ <!-- -->
+ <match key="@info.parent:usb.product_id" int_outof="0x6802;0x6804;0x6803;0x6812;0x6813;0x6820;0x6832;0x6833;0x6850;0x6851;0x6852;0x6853">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <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>
+
+ <!-- Huawei -->
+ <match key="@info.parent:usb.vendor_id" int="0x12d1">
+ <!-- E600 -->
+ <match key="@info.parent:usb.product_id" int="0x1001">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
+ <!-- E220,E220bis -->
+ <match key="@info.parent:usb.product_id" int_outof="0x1003;0x1004">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <match key="@info.parent:usb.interface.class" int="0xff">
+ <match key="@info.parent:usb.interface.subclass" int="0xff">
+ <match key="@info.parent:usb.interface.protocol" int="0xff">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <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>
+ </match>
+ </match>
+ </match>
+
+ <!-- Novatel -->
+ <match key="@info.parent:usb.vendor_id" int="0x1410">
+ <!-- Merlin XS620/S640,S620,EX720,S720,EV620 CDMA/EV-DO,ES620/Merlin ES720/Ovation U720,ES620 SM Bus,U727 -->
+ <match key="@info.parent:usb.product_id" int_outof="0x1100;0x1410;0x1120;0x1130;0x2100;0x2110;0x2130;0x4100">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ <!-- U730,U740,EU870,XU870 HSDPA/3G,EU740,MC950 -->
+ <match key="@info.parent:usb.product_id" int_outof="0x1400;0x1410;0x1420;0x1430;0x2410;0x4400">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <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>
+
+ <!-- Anydata -->
+ <match key="@info.parent:usb.vendor_id" int="0x16d5">
+ <!-- Adu E100a,500a -->
+ <match key="@info.parent:usb.product_id" int_outof="0x6501;0x6502">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+
+ <!-- Pantech -->
+ <match key="@info.parent:usb.vendor_id" int="0x106c">
+ <!-- PC5740;PC5750 EVDO rev A card -->
+ <match key="@info.parent:usb.product_id" int_outof="0x3701;0x3702">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+
+ <!-- Bandrich C100 1/2 -->
+ <match key="@info.parent:usb.vendor_id" int="0x1a8d">
+ <match key="@info.parent:usb.product_id" int_outof="0x1002;0x1003">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <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>
+
+ <!-- BUSlink UM-864GW USB GPRS Modem (Model SCWi275u) -->
+ <match key="@info.parent:usb.vendor_id" int="0x22b8">
+ <match key="@info.parent:usb.product_id" int="0x3802">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <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>
+
+ <!-- Dell Wireless -->
+ <match key="@info.parent:usb.vendor_id" int="0x413c">
+ <!-- 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO,
+ 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO,
+ 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO,
+ 5720 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E725 CDMA/EV-DO,
+ -->
+ <match key="@info.parent:usb.product_id" int_outof="0x8114;0x8117;0x8128;0x8133">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ <!-- 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G,
+ 505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G,
+ 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G,
+ HSDPA 5520,
+ -->
+ <match key="@info.parent:usb.product_id" int_outof="0x8115;0x8116;0x8118;0x8137">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <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>
+
+ <!-- PCMCIA CARDS -->
+
+ <!-- Sierra Wireless 850/860 -->
+ <match key="@info.parent:pcmcia.card_id" int="1808">
+ <match key="@info.parent:pcmcia.manf_id" int="402">
+ <match key="@info.parent:pcmcia.prod_id2" string="AC850">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <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>
+ <!-- Hayes Accura V.92 Modem PC Card -->
+ <match key="@info.parent:pcmcia.card_id" int="0">
+ <match key="@info.parent:pcmcia.manf_id" int="19">
+ <match key="@info.parent:pcmcia.prod_id1" string="Hayes">
+ <match key="@info.parent:pcmcia.prod_id2" string="V92 PC Card">
+ <append key="info.capabilities" type="strlist">modem</append>
+ <append key="modem.command_sets" type="strlist">V.250</append>
+ </match>
+ </match>
+ </match>
+ </match>
+
+ </match>
+ </device>
+</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi new/hal-info-20080305/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi 1970-01-01 01:00:00.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+ <device>
+ <match key="platform.id" string="thinkpad_acpi">
+ <match key="/org/freedesktop/Hal/devices/platform_bluetooth:platform.id" string="bluetooth">
+ <spawn udi="/org/freedesktop/Hal/devices/thinkpad_bluetooth_switch"/>
+ </match>
+ </match>
+ </device>
+
+ <device>
+ <match key="info.udi" string="/org/freedesktop/Hal/devices/thinkpad_bluetooth_switch">
+ <append key="info.capabilities" type="strlist">killswitch</append>
+ <merge key="info.category" type="string">killswitch</merge>
+ <merge key="info.product" type="string">ThinkPad Bluetooth Switch</merge>
+ <merge key="killswitch.type" type="string">bluetooth</merge>
+ <merge key="killswitch.access_method" type="string">thinkpad</merge>
+ <merge key="linux.sysfs_path" type="string">/sys/devices/platform/thinkpad_acpi/bluetooth_enable</merge>
+ </match>
+ </device>
+
+</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20080305/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -85,6 +85,22 @@
<match key="@storage.originating_device:usb.product_id" int_outof="0x0433;0x0434">
<merge key="storage.requires_eject" type="bool">true</merge>
</match>
+ <!-- Nokia 5300 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x4b9">
+ <merge key="storage.model" type="string">5300</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ </match>
+ <!-- Nokia 6300 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x4fa">
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">music/</append>
+ </match>
</match>
<!-- MPIO HD300 Player -->
@@ -240,6 +256,14 @@
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
+ <!-- Samsung Yepp YP-K3 (Firmware_4.06KR)-->
+ <match key="@storage.originating_device:usb.product_id" int="0x5080">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ </match>
<!-- Meizu M6 MiniPlayer -->
<match key="@storage.originating_device:usb.product_id" int="0x5a0f">
<merge key="portable_audio_player.type" type="string">generic</merge>
@@ -335,8 +359,8 @@
<!-- RCA -->
<match key="@storage.originating_device:usb.vendor_id" int="0x69b">
- <!-- Lyra RD1072, RD2212, MC2021C -->
- <match key="@storage.originating_device:usb.product_id" int_outof="0x713;0x718;0x767">
+ <!-- Lyra RD1072, RD2212, MC2021C, TH1501 -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x713;0x718;0x756;0x767">
<merge key="portable_audio_player.type" type="string">generic</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
@@ -373,6 +397,16 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
</match>
+ <!-- Sansa Clip -->
+ <match key="@storage.originating_device:usb.product_id" int="0x7432">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/audible</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+ <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
<!-- Sansa c250 -->
<match key="@storage.originating_device:usb.product_id" int="0x7451">
<merge key="portable_audio_player.type" type="string">generic</merge>
@@ -526,9 +560,9 @@
<append key="portable_audio_player.audio_folders" type="strlist">music/</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
- <append key="portable_audio_player.output_formats" type="strlist">audio/AMR</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/AMR</append>
- </match>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/amr</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/amr</append>
+ </match>
<!-- W810i, K610i, W300i -->
<match key="@storage.originating_device:usb.product_id" int_outof="0xe042;0xe046;0xe053">
@@ -579,6 +613,34 @@
<append key="portable_audio_player.playlist_path" type="strlist">Music/playlists</append>
</match>
+ <!-- W880i Walkman Phone -->
+ <match key="@storage.originating_device:usb.product_id" int="0xe068">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_path" type="strlist">Music/playlists</append>
+ </match>
+
+ <!-- Sony Ericsson K850i -->
+ <match key="@storage.originating_device:usb.product_id" int="0xe075">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/amr</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/amr-wb</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.m-realaudio</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-m4b</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/midi</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/amr</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ </match>
+
</match>
<!-- LG Fusic Phone -->
@@ -595,6 +657,16 @@
</match>
</match>
+ <!-- Olympus -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x07b4">
+ <!-- DS-2 voice recorder -->
+ <match key="@storage.originating_device:usb.product_id" int="0x020e">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ </match>
+ </match>
+
<match key="@storage.originating_device:usb.vendor_id" int="0x1006">
<!-- iGP 100 -->
<match key="@storage.originating_device:usb.product_id" int="0x2001">
@@ -612,6 +684,16 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
</match>
+
+ <!-- Mobile Media Tech. -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x1011">
+ <!-- No-name device, sold as "Lavod" -->
+ <match key="@storage.originating_device:usb.product_id" int="0x0001">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
+ </match>
<!-- TouchStone/WaveX -->
<match key="@storage.originating_device:usb.vendor_id" int="0x10c7">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/10-usb-pda.fdi new/hal-info-20080305/fdi/information/10freedesktop/10-usb-pda.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/10-usb-pda.fdi 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/10-usb-pda.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -12,7 +12,7 @@
<merge key="pda.pocketpc.hotsync_interface" type="copy_property">serial.device</merge>
</match>
- <!-- PDAs via Linux 'visor' kernel driver -->
+ <!-- PalmOS PDAs via Linux 'visor' kernel driver -->
<match key="@serial.originating_device:info.linux.driver" string="visor">
<!--
@@ -26,16 +26,8 @@
from the driver directly?)
-->
<match key="@serial.originating_device:usb.vendor_id" int="0x054c">
- <!-- Sony Clie 3.5 -->
- <match key="@serial.originating_device:usb.product_id" int="0x0038">
- <match key="serial.port" int="0">
- <append key="info.capabilities" type="strlist">pda</append>
- <merge key="pda.platform" type="string">palm</merge>
- <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
- </match>
- </match>
- <!-- Sony Clie SJ-22 -->
- <match key="@serial.originating_device:usb.product_id" int="0x0066">
+ <!-- Sony Clie: 3.5, SJ-22 -->
+ <match key="@serial.originating_device:usb.product_id" int_outof="0x0038;0x0066">
<match key="serial.port" int="0">
<append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">palm</merge>
@@ -92,7 +84,106 @@
</match>
</match>
+
+ <!-- PalmOS PDAs via libusb -->
+ <match key="info.subsystem" string="usb_device">
+
+ <!-- Sony -->
+ <match key="usb_device.vendor_id" int="0x054c">
+ <!-- Sony NR and other Palm OS 4.1, Sony S S320 and other Palm OS 3.5, Sony T, SJ series, and other Palm OS 4.0,
+ Sony S360, Sony NR70V/U, Sony NX, Sony NZ, Sony UX, Sony TJ
+ -->
+ <match key="usb_device.product_id" int_outof="0x000a;0x0038;0x0066;0x0095;0x009a;0x00da;0x00e9;0x0144;0x0169">
+ <append key="info.capabilities" type="strlist">pda</append>
+ <merge key="pda.platform" type="string">palm</merge>
+ <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+ </match>
+ </match>
+
+ <!-- Handspring -->
+ <match key="usb_device.vendor_id" int="0x082d">
+ <!-- Visor/Treo 300, Treo, Treo 600 -->
+ <match key="usb_device.product_id" int_outof="0x0100;0x0200;0x0300">
+ <append key="info.capabilities" type="strlist">pda</append>
+ <merge key="pda.platform" type="string">palm</merge>
+ <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+ </match>
+ </match>
+
+ <!-- Palm, Inc. and palmOne -->
+ <match key="usb_device.vendor_id" int="0x0830">
+ <!-- m500,m505,m515,2xunknown,i705,Tungsten Z,Tungsten W,m125,m130,3x unknown,
+ (Tungsten series, Zire 71), 3x(Zire 21, 31, 72, Z22, Tungsten E2, T3, TX, Treo 650, 680, LifeDrive),
+ 2x Zire, m100, 2y unknown -->
+ <match key="usb_device.product_id" int_outof="0x0001;0x0002;0x0003;0x0010;0x0011;0x0020;0x0030;0x0031;0x0040;0x0050;0x0051;0x0052;0x0053;0x0060;0x0061;0x0062;0x0063;0x0070;0x0071;0x0080;0x0099;0x0100">
+ <append key="info.capabilities" type="strlist">pda</append>
+ <merge key="pda.platform" type="string">palm</merge>
+ <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+ </match>
+ </match>
+
+ <!-- Samsung -->
+ <match key="usb_device.vendor_id" int="0x04e8">
+ <!-- i330 -->
+ <match key="usb_device.product_id" int="0x8001">
+ <append key="info.capabilities" type="strlist">pda</append>
+ <merge key="pda.platform" type="string">palm</merge>
+ <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+ </match>
+ </match>
+
+ <!-- Garmin -->
+ <match key="usb_device.vendor_id" int="0x091e">
+ <!-- IQUE 3600 -->
+ <match key="usb_device.product_id" int="0x0004">
+ <append key="info.capabilities" type="strlist">pda</append>
+ <merge key="pda.platform" type="string">palm</merge>
+ <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+ </match>
+ </match>
+
+ <!-- Kyocera -->
+ <match key="usb_device.vendor_id" int="0x0c88">
+ <!-- 7135 Smartphone, 6035 Smartphone -->
+ <match key="usb_device.product_id" int_outof="0x0021;0xa226">
+ <append key="info.capabilities" type="strlist">pda</append>
+ <merge key="pda.platform" type="string">palm</merge>
+ <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+ </match>
+ </match>
+
+ <!-- Tapwave -->
+ <match key="usb_device.vendor_id" int="0x12ef">
+ <!-- Zodiac, Zodiac2 -->
+ <match key="usb_device.product_id" int="0x0100">
+ <append key="info.capabilities" type="strlist">pda</append>
+ <merge key="pda.platform" type="string">palm</merge>
+ <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+ </match>
+ </match>
+
+ <!-- Aceeca -->
+ <match key="usb_device.vendor_id" int="0x4766">
+ <!-- MEZ1000 -->
+ <match key="usb_device.product_id" int="0x0001">
+ <append key="info.capabilities" type="strlist">pda</append>
+ <merge key="pda.platform" type="string">palm</merge>
+ <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+ </match>
+ </match>
+
+ <!-- Alphasmart -->
+ <match key="usb_device.vendor_id" int="0x081e">
+ <!-- Alphasmart Dana -->
+ <match key="usb_device.product_id" int="0xdf00">
+ <append key="info.capabilities" type="strlist">pda</append>
+ <merge key="pda.platform" type="string">palm</merge>
+ <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+ </match>
+ </match>
+
+ </match>
+
</device>
</deviceinfo>
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi new/hal-info-20080305/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -65,7 +65,7 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="5610;5020">
+ <match key="system.hardware.product" contains_outof="5610;5020;5500">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains_outof="1520;3000;5110;5570;5920">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi new/hal-info-20080305/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -5,10 +5,10 @@
<match key="system.hardware.product" prefix="U5F ">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne;V6V">
+ <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ">
+ <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ;V6V;P5LD2">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -37,17 +37,17 @@
</match>
<!-- ASUS a7v600 motherboard, has no usable sys_* entries besides bios_version -->
- <match key="smbios.bios.version" prefix="ASUS A7V600">
+ <match key="system.firmware.version" prefix="ASUS A7V600">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!-- another ASUS Mainboard -->
- <match key="smbios.bios.version" prefix_outof="ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101">
+ <match key="system.firmware.version" prefix_outof="ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
<!-- another ASUS Mainboard, this need no quirk -->
- <match key="smbios.bios.version" prefix="ASUS M2N-E ACPI BIOS Revision">
+ <match key="system.firmware.version" prefix="ASUS M2N-E ACPI BIOS Revision">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi new/hal-info-20080305/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2008-02-07 13:59:27.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -71,6 +71,11 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
+ <!-- yes, system.hardware.version is correct for this machine -->
+ <match key="system.hardware.version" string="HP OmniBook 6100 EB">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
<match key="system.hardware.product" contains_outof="nc2400;nc6120;nc6320;nx7300;nw8440;6710b">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi new/hal-info-20080305/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -43,8 +43,8 @@
-->
</match>
</match>
- <!-- R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m -->
- <match key="system.hardware.product" prefix_outof="1860;1869;2371;2373;2374;2376;2386;2513;2525;2529">
+ <!-- R50p, R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m -->
+ <match key="system.hardware.product" prefix_outof="1832;1860;1869;2371;2373;2374;2376;2382;2386;2513;2525;2529;2530">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -65,13 +65,13 @@
</match>
<!-- T43 -->
<match key="system.hardware.version" string="ThinkPad T43">
- <!-- Models 2668, 2669, 2678, 2679, 2686, 2687 use ATI graphics -->
- <match key="system.hardware.product" prefix="26">
+ <!-- ATI graphics -->
+ <match key="system.hardware.primary_video.vendor" int="0x1002">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
- <!-- Models 1871, 1872, 1873, 1874, 1875, 1876 use Intel graphics -->
- <match key="system.hardware.product" prefix="18">
+ <!-- Intel graphics -->
+ <match key="system.hardware.primary_video.vendor" int="0x8086">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi new/hal-info-20080305/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi 2008-02-07 14:17:53.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi 2008-03-04 22:21:42.000000000 +0100
@@ -5,7 +5,7 @@
<!-- ThinkPads -->
<!-- X60 / X60s / T61 / R61 / X61 Tablet -->
- <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;7658;8919;7767;7768;7661W1P">
+ <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;7658;8919;7767;7768;7661;7733">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/30-keymap-acer.fdi new/hal-info-20080305/fdi/information/10freedesktop/30-keymap-acer.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/30-keymap-acer.fdi 2008-02-07 13:55:38.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/30-keymap-acer.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -18,7 +18,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<!-- Laptops without extra Euro and Dollar keys -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1360;1520">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1350;1360;1520">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
<append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
<append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
@@ -52,7 +52,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1410;1640;1680;1690;3050;3680;5050;5570;5580">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1410;1640;1680;1690;3050;3680;5050;5570;5580;5600">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
<append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
<append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/30-keymap-dell.fdi new/hal-info-20080305/fdi/information/10freedesktop/30-keymap-dell.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/30-keymap-dell.fdi 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/30-keymap-dell.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -10,12 +10,12 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Latitude">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D420">
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e005:f23</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
<append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
<append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
<append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+ <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D610">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/30-keymap-hp.fdi new/hal-info-20080305/fdi/information/10freedesktop/30-keymap-hp.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/30-keymap-hp.fdi 2008-02-07 14:22:24.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/30-keymap-hp.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -14,6 +14,11 @@
<append key="input.keymap.data" type="strlist">e058:f22</append> <!-- touchpad off -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="dv5000">
+ <append key="input.keymap.data" type="strlist">e031:help</append> <!-- FnF1 (help) -->
+ <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="dv6500">
<append key="input.keymap.data" type="strlist">e008:f20</append> <!-- FIXME: quick play -->
<append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
@@ -57,7 +62,7 @@
<append key="input.keymap.data" type="strlist">e059:info</append> <!-- I key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6230;nw8440;nx6325;6710b">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6230;nw8440;nx6325;6710b;6715">
<append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
<append key="input.keymap.data" type="strlist">e008:presentation</append> <!-- presentation -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
@@ -86,6 +91,16 @@
<append key="input.keymap.data" type="strlist">e031:help</append> <!-- Fn+F1 (help) -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="tx1000">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
+ <append key="input.keymap.data" type="strlist">e031:help</append> <!-- FnF1 (help) -->
+ <append key="input.keymap.data" type="strlist">e00e:dvd</append> <!-- Media Player: DVD mode -->
+ <append key="input.keymap.data" type="strlist">e008:pc</append> <!-- Media Player: Media Mode (PVR or PC?) -->
+ <append key="input.keymap.data" type="strlist">e059:f22</append> <!-- touchpad on -->
+ <append key="input.keymap.data" type="strlist">e058:f22</append> <!-- touchpad off -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
</match>
</device>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/30-keymap-misc.fdi new/hal-info-20080305/fdi/information/10freedesktop/30-keymap-misc.fdi
--- old/hal-info-20080207/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -60,8 +60,8 @@
</match>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.vendor" string="MEDIONNB">
- <match key="/org/freedesktop/Hal/devices/computer:system.product" prefix="A555">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="MEDIONNB">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="A555">
<append key="input.keymap.data" type="strlist">63:www</append> <!-- N button -->
<append key="input.keymap.data" type="strlist">66:prog1</append> <!-- link 1 button -->
<append key="input.keymap.data" type="strlist">67:email</append> <!-- envelope button -->
@@ -77,6 +77,39 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
+
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="MAXDATA">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Pro 7000">
+ <append key="input.keymap.data" type="strlist">97:prog2</append> <!-- "P2" programmable button -->
+ <append key="input.keymap.data" type="strlist">9f:prog1</append> <!-- "P1" programmable button -->
+ <append key="input.keymap.data" type="strlist">a0:mute</append> <!-- Fn-F5 Sound On/Off -->
+ <append key="input.keymap.data" type="strlist">82:www</append> <!-- www button -->
+ <append key="input.keymap.data" type="strlist">ec:email</append> <!-- envelope button -->
+ <append key="input.keymap.data" type="strlist">ae:volumedown</append> <!-- Fn-Down Volume down -->
+ <append key="input.keymap.data" type="strlist">b0:volumeup</append> <!-- Fn-Up Volume up -->
+ <append key="input.keymap.data" type="strlist">df:suspend</append> <!-- Fn+F2 hibernate -->
+ <append key="input.keymap.data" type="strlist">f5:help</append> <!-- Help button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="SAMSUNG">
+ <!-- Samsung P55-Pro -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="SP55S">
+ <append key="input.keymap.data" type="strlist">e003:battery</append> <!-- Fn+F2 battery icon -->
+ <!-- Fn+F3 euro (generates a sequence of different keypressed events in syslog) -->
+ <append key="input.keymap.data" type="strlist">e002:displaytoggle</append> <!-- Fn+F4 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e004:prog1</append> <!-- Fn+F5 backlight on/off -->
+ <append key="input.keymap.data" type="strlist">e031:prog2</append> <!-- Fn+F7 run Samsung Magic Doctor (keypressed event is generated twice) -->
+ <append key="input.keymap.data" type="strlist">e033:prog3</append> <!-- Fn+F8 switch power mode (battery/dynamic/performance) -->
+ <append key="input.keymap.data" type="strlist">e006:wlan</append> <!-- Fn+F9 Turn On/Off Wireless -->
+ <append key="input.keymap.data" type="strlist">e077:f22</append> <!-- Fn+F10 Touchpad on -->
+ <append key="input.keymap.data" type="strlist">e079:f22</append> <!-- Fn+F10 Touchpad off -->
+ <append key="input.keymap.data" type="strlist">e008:brightnessup</append> <!-- Fn-Up Brightness up -->
+ <append key="input.keymap.data" type="strlist">e009:brightnessdown</append> <!-- Fn-Down Brightness down -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/information/10freedesktop/Makefile.am new/hal-info-20080305/fdi/information/10freedesktop/Makefile.am
--- old/hal-info-20080207/fdi/information/10freedesktop/Makefile.am 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/information/10freedesktop/Makefile.am 2008-03-04 22:17:24.000000000 +0100
@@ -8,7 +8,8 @@
10-usb-pda.fdi \
10-usbcsr-mice.fdi \
10-laptop-panel-hardware.fdi \
- 10-cd-dvd-burner.fdi
+ 10-cd-dvd-burner.fdi \
+ 10-modem.fdi
if BUILD_KILLSWITCH_DELL_WLAN
dist_fdi_DATA += 10-dell-rfkill-switch-wlan.fdi
@@ -26,6 +27,10 @@
dist_fdi_DATA += 10-sony-bluetooth-switch.fdi
endif
+if BUILD_KILLSWITCH_THINKPAD_BLUETOOTH
+dist_fdi_DATA += 10-thinkpad-rfkill-switch-bluetooth.fdi
+endif
+
if BUILD_KILLSWITCH_IPW_WLAN
dist_fdi_DATA += 10-ipw-rfkill-switch.fdi
endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hal-info-20080207/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi new/hal-info-20080305/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
--- old/hal-info-20080207/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi 2008-02-07 13:54:13.000000000 +0100
+++ new/hal-info-20080305/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi 2008-03-04 22:17:24.000000000 +0100
@@ -9,6 +9,9 @@
<match key="storage.drive_type" string="cdrom">
<match key="storage.lun" int="1">
<match key="storage.vendor" string="SanDisk">
+ <match key="storage.model" string="Cruzer">
+ <merge key="info.ignore" type="bool">true</merge>
+ </match>
<match key="storage.model" string="U3 Cruzer Micro">
<merge key="info.ignore" 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