Hello community,
here is the log from the commit of package hal
checked in at Fri Nov 21 15:21:29 CET 2008.
--------
--- hal/hal.changes 2008-11-17 17:12:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/hal/hal.changes 2008-11-21 15:06:45.000000000 +0100
@@ -1,0 +2,27 @@
+Thu Nov 20 15:02:55 CET 2008 - dkukawka@suse.de
+
+- update HAL to latest git (93579b151700c5) of my tree and
+ hal-info to 20081120
+- this update include fixes for:
+ - fixed ipw addon to use fputs instead of fputc
+ - split 10-ipw-rfkill-switch.fdi into two seperate files for
+ ipw* and iwl* drivers
+- changed spec file to disable only iwl* killswitch handling
+
+-------------------------------------------------------------------
+Wed Nov 19 20:51:40 CET 2008 - dkukawka@suse.de
+
+- update HAL to latest git (f0ec1d3468bb1b) of my tree and
+ hal-info to 20081119
+- this update include fixes for:
+ - add a new (singleton) addon for killswitches from the rfkill
+ kernel subsystem that handle all available rfkill devices in
+ one (should also fix parts of bnc#446013)
+ - added a new killswitch.state property to reflect the state
+ - add some more modems to hal-info (incl. fix for bnc#442727)
+- due to new rfkill addon call --disable-killswitch-ipw-wlan
+ to disable special IPW killswitch handling, should work now via
+ the rfkill addon since the Intel WLAN driver uses also the rfkill
+ subsystem
+
+-------------------------------------------------------------------
hal-doc.changes: same change
calling whatdependson for head-i586
Old:
----
hal-info-20081107.tar.bz2
New:
----
hal-info-20081120.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal-doc.spec ++++++
--- /var/tmp/diff_new_pack.H28375/_old 2008-11-21 15:20:57.000000000 +0100
+++ /var/tmp/diff_new_pack.H28375/_new 2008-11-21 15:20:57.000000000 +0100
@@ -26,10 +26,10 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20081107
+%define hal_info_version 20081120
%define libsmbios_version 2.0.2
Version: 0.5.12
-Release: 7
+Release: 8
Url: http://freedesktop.org/Software/hal
License: Other uncritical OpenSource License
Group: System/Daemons
@@ -232,7 +232,7 @@
--disable-killswitch-sony-bluetooth \
--disable-killswitch-thinkpad-bluetooth \
%endif
- --enable-killswitch-ipw-wlan
+ --disable-killswitch-iwl-wlan
make
popd
@@ -364,6 +364,27 @@
%endif
%changelog
+* Thu Nov 20 2008 dkukawka@suse.de
+- update HAL to latest git (93579b151700c5) of my tree and
+ hal-info to 20081120
+- this update include fixes for:
+ - fixed ipw addon to use fputs instead of fputc
+ - split 10-ipw-rfkill-switch.fdi into two seperate files for
+ ipw* and iwl* drivers
+- changed spec file to disable only iwl* killswitch handling
+* Wed Nov 19 2008 dkukawka@suse.de
+- update HAL to latest git (f0ec1d3468bb1b) of my tree and
+ hal-info to 20081119
+- this update include fixes for:
+ - add a new (singleton) addon for killswitches from the rfkill
+ kernel subsystem that handle all available rfkill devices in
+ one (should also fix parts of bnc#446013)
+ - added a new killswitch.state property to reflect the state
+ - add some more modems to hal-info (incl. fix for bnc#442727)
+- due to new rfkill addon call --disable-killswitch-ipw-wlan
+ to disable special IPW killswitch handling, should work now via
+ the rfkill addon since the Intel WLAN driver uses also the rfkill
+ subsystem
* Sat Nov 15 2008 dkukawka@suse.de
- removed patch:
- hal-20080828-add-standby-support_v3.diff: fixed bnc#440926,
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.H28375/_old 2008-11-21 15:20:57.000000000 +0100
+++ /var/tmp/diff_new_pack.H28375/_new 2008-11-21 15:20:57.000000000 +0100
@@ -26,10 +26,10 @@
Summary: Daemon for Collecting Hardware Information
%define dbus_version 0.61
%define dbus_release 1
-%define hal_info_version 20081107
+%define hal_info_version 20081120
%define libsmbios_version 2.0.2
Version: 0.5.12
-Release: 7
+Release: 8
Url: http://freedesktop.org/Software/hal
License: GPL v2 or later; AFL
Group: System/Daemons
@@ -231,7 +231,7 @@
--disable-killswitch-sony-bluetooth \
--disable-killswitch-thinkpad-bluetooth \
%endif
- --enable-killswitch-ipw-wlan
+ --disable-killswitch-iwl-wlan
make
popd
@@ -363,6 +363,27 @@
%endif
%changelog
+* Thu Nov 20 2008 dkukawka@suse.de
+- update HAL to latest git (93579b151700c5) of my tree and
+ hal-info to 20081120
+- this update include fixes for:
+ - fixed ipw addon to use fputs instead of fputc
+ - split 10-ipw-rfkill-switch.fdi into two seperate files for
+ ipw* and iwl* drivers
+- changed spec file to disable only iwl* killswitch handling
+* Wed Nov 19 2008 dkukawka@suse.de
+- update HAL to latest git (f0ec1d3468bb1b) of my tree and
+ hal-info to 20081119
+- this update include fixes for:
+ - add a new (singleton) addon for killswitches from the rfkill
+ kernel subsystem that handle all available rfkill devices in
+ one (should also fix parts of bnc#446013)
+ - added a new killswitch.state property to reflect the state
+ - add some more modems to hal-info (incl. fix for bnc#442727)
+- due to new rfkill addon call --disable-killswitch-ipw-wlan
+ to disable special IPW killswitch handling, should work now via
+ the rfkill addon since the Intel WLAN driver uses also the rfkill
+ subsystem
* Sat Nov 15 2008 dkukawka@suse.de
- removed patch:
- hal-20080828-add-standby-support_v3.diff: fixed bnc#440926,
++++++ hal-0.5.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/ChangeLog new/hal-0.5.12/ChangeLog
--- old/hal-0.5.12/ChangeLog 2008-11-15 14:55:37.000000000 +0100
+++ new/hal-0.5.12/ChangeLog 2008-11-20 15:06:29.000000000 +0100
@@ -1,3 +1,59 @@
+commit 93579b151700c5c152153661d2800a5b3c0bd6a1
+Author: Danny Kukawka
+Date: Thu Nov 20 12:17:18 2008 +0100
+
+ fixed ipw addon
+
+ Fixed ipw addon, use fputs instead of fputc to set the status
+ to sysfs.
+
+ hald/linux/addons/addon-ipw-killswitch.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f0ec1d3468bb1be363044380a4782975d80001a3
+Author: Danny Kukawka
+Date: Wed Nov 19 20:35:01 2008 +0100
+
+ add new killswitch.state property
+
+ Added new (not mandatory) killswitch.state property to the killswitch
+ namespace reflecting the current state of the killswitch as reported
+ by e.g. the linux kernel.
+
+ There are three possible states:
+ - 0: Radio output (soft) blocked
+ - 1: Radio output allowed
+ - 2: Radio output (hard )blocked, non-overrideable via SetPower()
+
+ doc/spec/hal-spec-properties.xml | 26 ++++++++++++++++++++++++++
+ hald/linux/device.c | 16 ++++++++++++++++
+ 2 files changed, 42 insertions(+), 0 deletions(-)
+
+commit ab020cb5f396f54691352edb323cf159894144a0
+Author: Danny Kukawka
+Date: Wed Nov 19 20:10:40 2008 +0100
+
+ add a new singleton addon for the rfkill subsystem
+
+ Added a new singleton addon for the rfkill subsystem to HAL. This
+ addon (hald-addon-rfkill-killswitch) handles all killswitches
+ provided by the rfkill linux kernel subsystem.
+
+ Note: If your system provides a rfkill device for the Intel
+ WLAN device(s), you may should build hal-info with
+ --disable-killswitch-ipw-wlan to prevent trouble.
+
+ TODO: Find a way in the fdi-files to prevent trouble with the
+ ipw killswitch device spawned by via the fdi-files.
+
+ fdi/policy/10osvendor/10-rfkill-switch.fdi | 4 +
+ hald/linux/addons/.gitignore | 1 +
+ hald/linux/addons/Makefile.am | 4 +
+ hald/linux/addons/addon-rfkill-killswitch.c | 373
+ +++++++++++++++++++++++++++
+ hald/linux/device.c | 2 +
+ 5 files changed, 384 insertions(+), 0 deletions(-)
+
commit 79b92dbdf65b8c978d5a8f6fb2b421aac83c3de3
Author: Danny Kukawka
Date: Sat Nov 15 14:18:17 2008 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/doc/spec/hal-spec-properties.xml new/hal-0.5.12/doc/spec/hal-spec-properties.xml
--- old/hal-0.5.12/doc/spec/hal-spec-properties.xml 2008-11-15 14:23:04.000000000 +0100
+++ new/hal-0.5.12/doc/spec/hal-spec-properties.xml 2008-11-19 20:31:25.000000000 +0100
@@ -4778,6 +4778,32 @@
</row>
<row>
<entry>
+ <literal>killswitch.state</literal> (int)
+ </entry>
+ <entry></entry>
+ <entry>No</entry>
+ <entry>Current state of the killswitch (as reported by the kernel)</entry>
+ </row>
+ <row>
+ <entry></entry>
+ <entry>0</entry>
+ <entry></entry>
+ <entry>Radio output is blocked</entry>
+ </row>
+ <row>
+ <entry></entry>
+ <entry>1</entry>
+ <entry></entry>
+ <entry>Radio output is allowed/enabled</entry>
+ </row>
+ <row>
+ <entry></entry>
+ <entry>2</entry>
+ <entry></entry>
+ <entry>Radio output is (hard) blocked, non-overrideable via SetPower()</entry>
+ </row>
+ <row>
+ <entry>
<literal>killswitch.name</literal> (string)
</entry>
<entry></entry>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/fdi/policy/10osvendor/10-rfkill-switch.fdi new/hal-0.5.12/fdi/policy/10osvendor/10-rfkill-switch.fdi
--- old/hal-0.5.12/fdi/policy/10osvendor/10-rfkill-switch.fdi 2008-11-15 14:23:04.000000000 +0100
+++ new/hal-0.5.12/fdi/policy/10osvendor/10-rfkill-switch.fdi 2008-11-19 15:12:46.000000000 +0100
@@ -9,6 +9,10 @@
<append key="info.addons" type="strlist">hald-addon-ipw-killswitch</append>
</match>
+ <match key="killswitch.access_method" string="rfkill">
+ <append key="info.addons.singleton" type="strlist">hald-addon-rfkill-killswitch</append>
+ </match>
+
<!-- For all other KillSwitch devices -->
<match key="killswitch.access_method" contains_not="ipw">
<match key="info.subsystem" contains_not="rfkill">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/addons/addon-ipw-killswitch.c new/hal-0.5.12/hald/linux/addons/addon-ipw-killswitch.c
--- old/hal-0.5.12/hald/linux/addons/addon-ipw-killswitch.c 2008-11-15 14:23:04.000000000 +0100
+++ new/hal-0.5.12/hald/linux/addons/addon-ipw-killswitch.c 2008-11-20 12:16:43.000000000 +0100
@@ -155,9 +155,9 @@
}
if (status) {
- ret = fputc (0, f);
+ ret = fputs ("0", f);
} else {
- ret = fputc (1, f);
+ ret = fputs ("1", f);
}
if (ret == EOF) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/addons/addon-rfkill-killswitch.c new/hal-0.5.12/hald/linux/addons/addon-rfkill-killswitch.c
--- old/hal-0.5.12/hald/linux/addons/addon-rfkill-killswitch.c 1970-01-01 01:00:00.000000000 +0100
+++ new/hal-0.5.12/hald/linux/addons/addon-rfkill-killswitch.c 2008-11-19 19:59:24.000000000 +0100
@@ -0,0 +1,373 @@
+/***************************************************************************
+ * CVSID: $Id$
+ *
+ * addon-rfkill-killswitch.c:
+ * Copyright (C) 2008 Danny Kukawka
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ **************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "libhal/libhal.h"
+#include "../../logger.h"
+#include "../../util_helper.h"
+#include "../../util_helper_priv.h"
+
+static GMainLoop *gmain = NULL;
+static LibHalContext *ctx = NULL;
+static GHashTable *rfkills = NULL;
+
+/* Getting status of the killswitch */
+static int
+get_killswitch (const char *udi)
+{
+ FILE *f;
+ char buf[64];
+ char path[256];
+ char *sysfs_path;
+ int kill_status;
+ int ret = -1;
+
+ f = NULL;
+
+ if (!g_hash_table_lookup_extended (rfkills, udi, NULL, (gpointer) &sysfs_path)) {
+ return -1;
+ }
+
+ snprintf (path, sizeof (path), "%s/state", sysfs_path);
+
+ if ((f = fopen (path, "r")) == NULL) {
+ HAL_WARNING(("Could not read killswitch status from '%s' for device '%s'", path, udi));
+ return -1;
+ }
+
+ if (fgets (buf, sizeof (buf), f) == NULL) {
+ HAL_ERROR (("Cannot read from '%s' for device '%s'", path, udi));
+ goto out;
+ }
+
+ errno = 0;
+ kill_status = strtol (buf, NULL, 10);
+ if (errno == 0) {
+ HAL_DEBUG (("Got '%d' from sysfs interface for device '%s'.", kill_status, udi));
+
+ switch(kill_status) {
+ case 1: /* RFKILL_STATE_UNBLOCKED (deprecated: RFKILL_STATE_ON): Radio output allowed */
+ ret = 1;
+ break;
+ case 0: /* RFKILL_STATE_SOFT_BLOCKED (deprecated: RFKILL_STATE_OFF): Radio output blocked */
+ case 2: /* RFKILL_STATE_HARD_BLOCKED: Output blocked, non-overrideable via sysfs */
+ ret = 0;
+ break;
+ default:
+ break;
+ }
+ }
+
+out:
+ if (f != NULL)
+ fclose (f);
+
+ return ret;
+}
+
+/* Setting status of the killswitch */
+static int
+set_killswitch (const char *udi, gboolean status)
+{
+ FILE *f;
+ int ret;
+ char path[256];
+ char *sysfs_path;
+
+ if (!g_hash_table_lookup_extended (rfkills, udi, NULL, (gpointer) &sysfs_path)) {
+ return -1;
+ }
+
+ snprintf (path, sizeof (path), "%s/state", sysfs_path);
+
+ if ((f = fopen (path, "w")) == NULL) {
+ HAL_WARNING(("Could not open '%s' for device '%s'", path, udi));
+ return -1;
+ }
+
+ if (status) {
+ ret = fputs ("1", f);
+ } else {
+ ret = fputs ("0", f);
+ }
+
+ if (f != NULL)
+ fclose (f);
+
+ if (ret == EOF) {
+ HAL_WARNING(("Couldn't write status to '%s' for device '%s'", path, udi));
+ ret = -1;
+ } else {
+ int current_state = get_killswitch(udi);
+ if ((status && current_state) || (!status && !current_state)) {
+ ret = 0;
+ } else {
+ HAL_DEBUG (("Could not set the state (%d) to sysfs for device '%s', current state is %d.", status, udi, current_state));
+ ret = -1;
+ }
+ }
+
+ return ret;
+}
+
+/* DBus filter function */
+static DBusHandlerResult
+filter_function (DBusConnection *connection, DBusMessage *message, void *userdata)
+{
+ DBusError err;
+ DBusMessage *reply;
+ const char *_udi;
+ char *type;
+ char *action;
+ char *sysfs_path;
+
+ if ((_udi = dbus_message_get_path (message)) == NULL) {
+ HAL_DEBUG (("Couldn't get the udi for this call, ignore it."));
+ return DBUS_HANDLER_RESULT_HANDLED;
+ } else {
+ if(!g_hash_table_lookup_extended (rfkills, _udi, NULL, (gpointer *) &sysfs_path)) {
+ HAL_DEBUG (("This device (%s) isn't yet handled by the addon.", _udi));
+ return DBUS_HANDLER_RESULT_HANDLED;
+ }
+ }
+
+ dbus_error_init (&err);
+
+ if ((type = libhal_device_get_property_string (ctx, _udi, "killswitch.type", &err)) == NULL) {
+ HAL_DEBUG (("Couldn't get the type of the killswitch device (%s). Ignore call.", _udi));
+ return DBUS_HANDLER_RESULT_HANDLED;
+ }
+
+ action = g_strdup_printf ("org.freedesktop.hal.killswitch.%s", type);
+
+ if (!check_priv (ctx, connection, message, dbus_message_get_path (message), action)) {
+ HAL_DEBUG(("User don't have the permissions to call the interface"));
+ return DBUS_HANDLER_RESULT_HANDLED;
+ }
+
+ reply = NULL;
+
+ if (dbus_message_is_method_call (message,
+ "org.freedesktop.Hal.Device.KillSwitch",
+ "SetPower")) {
+ gboolean status;
+
+ dbus_error_init (&err);
+ if (dbus_message_get_args (message,
+ &err,
+ DBUS_TYPE_BOOLEAN, &status,
+ DBUS_TYPE_INVALID)) {
+ int return_code = 0;
+ int set;
+
+ set = set_killswitch (_udi, status);
+
+ reply = dbus_message_new_method_return (message);
+ if (reply == NULL)
+ goto error;
+
+ if (set != 0)
+ return_code = 1;
+
+ dbus_message_append_args (reply,
+ DBUS_TYPE_INT32, &return_code,
+ DBUS_TYPE_INVALID);
+
+ dbus_connection_send (connection, reply, NULL);
+ }
+ } else if (dbus_message_is_method_call (message,
+ "org.freedesktop.Hal.Device.KillSwitch",
+ "GetPower")) {
+ int status;
+
+ dbus_error_init (&err);
+ if (dbus_message_get_args (message,
+ &err,
+ DBUS_TYPE_INVALID)) {
+ status = get_killswitch(_udi);
+
+ reply = dbus_message_new_method_return (message);
+ if (reply == NULL)
+ goto error;
+
+ dbus_message_append_args (reply,
+ DBUS_TYPE_INT32, &status,
+ DBUS_TYPE_INVALID);
+ dbus_connection_send (connection, reply, NULL);
+ }
+ }
+
+error:
+ if (reply != NULL)
+ dbus_message_unref (reply);
+
+ return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static void
+add_device (LibHalContext *ctx,
+ const char *udi,
+ const LibHalPropertySet *properties)
+{
+ DBusError err;
+ DBusConnection *dbus_connection;
+ const char* sysfs_path;
+ static gboolean initialized = FALSE;
+
+ if ((sysfs_path = libhal_ps_get_string (properties, "linux.sysfs_path")) == NULL) {
+ HAL_ERROR(("%s has no property linux.sysfs_path", udi));
+ return;
+ }
+
+ /* claim the interface */
+
+ if ((dbus_connection = libhal_ctx_get_dbus_connection(ctx)) == NULL) {
+ HAL_WARNING (("Cannot get DBus connection"));
+ return;
+ }
+
+ if (!initialized) {
+ dbus_connection_add_filter (dbus_connection, filter_function, NULL, NULL);
+ initialized = TRUE;
+ }
+
+ dbus_error_init (&err);
+
+ if (!libhal_device_claim_interface (ctx,
+ udi,
+ "org.freedesktop.Hal.Device.KillSwitch",
+ " \n"
+ " \n"
+ " \n"
+ " </method>\n"
+ " \n"
+ " \n"
+ " </method>\n",
+ &err)) {
+ HAL_ERROR (("Cannot claim interface 'org.freedesktop.Hal.Device.KillSwitch'"));
+ return;
+ }
+
+ g_hash_table_insert (rfkills, g_strdup(udi), g_strdup(sysfs_path));
+}
+
+static void
+remove_device (LibHalContext *ctx,
+ const char *udi,
+ const LibHalPropertySet *properties)
+{
+ gpointer sysfs_path;
+ gboolean handling_udi;
+
+ HAL_DEBUG (("Removing channel for '%s'", udi));
+
+ handling_udi = g_hash_table_lookup_extended (rfkills, udi, NULL, &sysfs_path);
+
+ if (!handling_udi) {
+ HAL_ERROR(("DeviceRemove called for unknown device: '%s'.", udi));
+ return;
+ }
+
+ g_hash_table_remove (rfkills, udi);
+
+ if (g_hash_table_size (rfkills) == 0) {
+ HAL_INFO(("no more devices, exiting"));
+ g_main_loop_quit (gmain);
+ }
+}
+
+int
+main (int argc, char *argv[])
+{
+ DBusConnection *dbus_connection;
+ DBusError error;
+ const char *commandline;
+
+ hal_set_proc_title_init (argc, argv);
+
+ setup_logger ();
+
+ dbus_error_init (&error);
+ if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
+ HAL_WARNING (("Unable to init libhal context"));
+ goto out;
+ }
+
+ if ((dbus_connection = libhal_ctx_get_dbus_connection(ctx)) == NULL) {
+ HAL_WARNING (("Cannot get DBus connection"));
+ goto out;
+ }
+
+ if ((commandline = getenv ("SINGLETON_COMMAND_LINE")) == NULL) {
+ HAL_WARNING (("SINGLETON_COMMAND_LINE not set"));
+ goto out;
+ }
+
+ libhal_ctx_set_singleton_device_added (ctx, add_device);
+ libhal_ctx_set_singleton_device_removed (ctx, remove_device);
+
+ dbus_connection_setup_with_g_main (dbus_connection, NULL);
+ dbus_connection_set_exit_on_disconnect (dbus_connection, 0);
+
+ dbus_error_init (&error);
+
+ if (!libhal_device_singleton_addon_is_ready (ctx, commandline, &error)) {
+ goto out;
+ }
+
+ rfkills = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+ gmain = g_main_loop_new (NULL, FALSE);
+ g_main_loop_run (gmain);
+
+ return 0;
+
+out:
+ HAL_DEBUG (("An error occured, exiting cleanly"));
+ if (ctx != NULL) {
+ dbus_error_init (&error);
+ libhal_ctx_shutdown (ctx, &error);
+ libhal_ctx_free (ctx);
+ }
+
+ return 0;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/addons/Makefile.am new/hal-0.5.12/hald/linux/addons/Makefile.am
--- old/hal-0.5.12/hald/linux/addons/Makefile.am 2008-11-15 14:23:04.000000000 +0100
+++ new/hal-0.5.12/hald/linux/addons/Makefile.am 2008-11-19 14:06:03.000000000 +0100
@@ -14,6 +14,7 @@
hald-addon-hid-ups \
hald-addon-input \
hald-addon-ipw-killswitch \
+ hald-addon-rfkill-killswitch \
hald-addon-storage
if HAVE_PMU
@@ -101,3 +102,6 @@
hald_addon_ipw_killswitch_SOURCES = addon-ipw-killswitch.c ../../logger.c ../../util_helper.c ../../util_helper_priv.c
hald_addon_ipw_killswitch_LDADD = $(top_builddir)/libhal/libhal.la @GLIB_LIBS@
+hald_addon_rfkill_killswitch_SOURCES = addon-rfkill-killswitch.c ../../logger.c ../../util_helper.c ../../util_helper_priv.c
+hald_addon_rfkill_killswitch_LDADD = $(top_builddir)/libhal/libhal.la @GLIB_LIBS@
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/addons/Makefile.in new/hal-0.5.12/hald/linux/addons/Makefile.in
--- old/hal-0.5.12/hald/linux/addons/Makefile.in 2008-11-15 14:23:47.000000000 +0100
+++ new/hal-0.5.12/hald/linux/addons/Makefile.in 2008-11-20 14:59:22.000000000 +0100
@@ -36,6 +36,7 @@
@HALD_COMPILE_LINUX_TRUE@ hald-addon-hid-ups$(EXEEXT) \
@HALD_COMPILE_LINUX_TRUE@ hald-addon-input$(EXEEXT) \
@HALD_COMPILE_LINUX_TRUE@ hald-addon-ipw-killswitch$(EXEEXT) \
+@HALD_COMPILE_LINUX_TRUE@ hald-addon-rfkill-killswitch$(EXEEXT) \
@HALD_COMPILE_LINUX_TRUE@ hald-addon-storage$(EXEEXT) \
@HALD_COMPILE_LINUX_TRUE@ $(am__EXEEXT_1) $(am__EXEEXT_2) \
@HALD_COMPILE_LINUX_TRUE@ $(am__EXEEXT_3) $(am__EXEEXT_4) \
@@ -176,6 +177,13 @@
util_helper.$(OBJEXT)
hald_addon_pmu_OBJECTS = $(am_hald_addon_pmu_OBJECTS)
hald_addon_pmu_DEPENDENCIES = $(top_builddir)/libhal/libhal.la
+am_hald_addon_rfkill_killswitch_OBJECTS = \
+ addon-rfkill-killswitch.$(OBJEXT) logger.$(OBJEXT) \
+ util_helper.$(OBJEXT) util_helper_priv.$(OBJEXT)
+hald_addon_rfkill_killswitch_OBJECTS = \
+ $(am_hald_addon_rfkill_killswitch_OBJECTS)
+hald_addon_rfkill_killswitch_DEPENDENCIES = \
+ $(top_builddir)/libhal/libhal.la
am_hald_addon_storage_OBJECTS = addon-storage.$(OBJEXT) \
logger.$(OBJEXT) util_helper.$(OBJEXT)
hald_addon_storage_OBJECTS = $(am_hald_addon_storage_OBJECTS)
@@ -220,6 +228,7 @@
$(hald_addon_macbook_backlight_SOURCES) \
$(hald_addon_macbookpro_backlight_SOURCES) \
$(hald_addon_omap_backlight_SOURCES) $(hald_addon_pmu_SOURCES) \
+ $(hald_addon_rfkill_killswitch_SOURCES) \
$(hald_addon_storage_SOURCES) $(hald_addon_usb_csr_SOURCES)
DIST_SOURCES = $(hald_addon_acpi_SOURCES) \
$(am__hald_addon_acpi_buttons_toshiba_SOURCES_DIST) \
@@ -233,7 +242,9 @@
$(am__hald_addon_macbook_backlight_SOURCES_DIST) \
$(am__hald_addon_macbookpro_backlight_SOURCES_DIST) \
$(am__hald_addon_omap_backlight_SOURCES_DIST) \
- $(hald_addon_pmu_SOURCES) $(hald_addon_storage_SOURCES) \
+ $(hald_addon_pmu_SOURCES) \
+ $(hald_addon_rfkill_killswitch_SOURCES) \
+ $(hald_addon_storage_SOURCES) \
$(am__hald_addon_usb_csr_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
@@ -429,6 +440,8 @@
hald_addon_generic_backlight_LDADD = $(top_builddir)/libhal/libhal.la @GLIB_LIBS@
hald_addon_ipw_killswitch_SOURCES = addon-ipw-killswitch.c ../../logger.c ../../util_helper.c ../../util_helper_priv.c
hald_addon_ipw_killswitch_LDADD = $(top_builddir)/libhal/libhal.la @GLIB_LIBS@
+hald_addon_rfkill_killswitch_SOURCES = addon-rfkill-killswitch.c ../../logger.c ../../util_helper.c ../../util_helper_priv.c
+hald_addon_rfkill_killswitch_LDADD = $(top_builddir)/libhal/libhal.la @GLIB_LIBS@
all: all-am
.SUFFIXES:
@@ -529,6 +542,9 @@
hald-addon-pmu$(EXEEXT): $(hald_addon_pmu_OBJECTS) $(hald_addon_pmu_DEPENDENCIES)
@rm -f hald-addon-pmu$(EXEEXT)
$(LINK) $(hald_addon_pmu_OBJECTS) $(hald_addon_pmu_LDADD) $(LIBS)
+hald-addon-rfkill-killswitch$(EXEEXT): $(hald_addon_rfkill_killswitch_OBJECTS) $(hald_addon_rfkill_killswitch_DEPENDENCIES)
+ @rm -f hald-addon-rfkill-killswitch$(EXEEXT)
+ $(LINK) $(hald_addon_rfkill_killswitch_OBJECTS) $(hald_addon_rfkill_killswitch_LDADD) $(LIBS)
hald-addon-storage$(EXEEXT): $(hald_addon_storage_OBJECTS) $(hald_addon_storage_DEPENDENCIES)
@rm -f hald-addon-storage$(EXEEXT)
$(LINK) $(hald_addon_storage_OBJECTS) $(hald_addon_storage_LDADD) $(LIBS)
@@ -556,6 +572,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addon-macbookpro-backlight.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addon-omap-backlight.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addon-pmu.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addon-rfkill-killswitch.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addon-storage.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addon-usb-csr.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Po@am__quote@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/device.c new/hal-0.5.12/hald/linux/device.c
--- old/hal-0.5.12/hald/linux/device.c 2008-11-15 14:23:04.000000000 +0100
+++ new/hal-0.5.12/hald/linux/device.c 2008-11-19 20:34:19.000000000 +0100
@@ -2652,6 +2652,10 @@
hal_device_property_set_string (d, "killswitch.type", type);
}
+ hal_util_set_int_from_file (d, "killswitch.state", sysfs_path, "state", 10);
+
+ hal_device_property_set_string (d, "killswitch.access_method", "rfkill");
+
hal_util_set_string_from_file (d, "killswitch.name", sysfs_path, "name");
g_snprintf(buf, sizeof(buf), "%s %s Killswitch", hal_device_property_get_string (d, "killswitch.name"),
@@ -2662,6 +2666,19 @@
}
static gboolean
+rfkill_refresh (HalDevice *d)
+{
+ const char *sysfs_path;
+
+ if ((sysfs_path = hal_device_property_get_string (d, "linux.sysfs_path")) != NULL) {
+ /* refresh the killswitch state */
+ hal_util_set_int_from_file (d, "killswitch.state", sysfs_path, "state", 10);
+ }
+
+ return TRUE;
+}
+
+static gboolean
rfkill_compute_udi (HalDevice *d)
{
gchar udi[256];
@@ -4340,6 +4357,7 @@
.subsystem = "rfkill",
.add = rfkill_add,
.compute_udi = rfkill_compute_udi,
+ .refresh = rfkill_refresh,
.remove = dev_remove
};
++++++ hal-info-20081107.tar.bz2 -> hal-info-20081120.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081107/ChangeLog new/hal-info-20081120/ChangeLog
--- old/hal-info-20081107/ChangeLog 2008-11-07 16:08:33.000000000 +0100
+++ new/hal-info-20081120/ChangeLog 2008-11-20 15:13:27.000000000 +0100
@@ -1,3 +1,212 @@
+commit e4715394a1f45297ba5122dd1c24a07ef753f082
+Author: Danny Kukawka
+Date: Thu Nov 20 15:10:43 2008 +0100
+
+ fix typo in configure
+
+ Fixed typo in configure.
+
+ configure.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9b3517dd1bcb4f0b08d45f940ad5b2b8a46acbf2
+Author: Danny Kukawka
+Date: Thu Nov 20 15:08:21 2008 +0100
+
+ fix Makefile for IWL fdi-file
+
+ Fixed Makefile for IWL fdi-file.
+
+ fdi/information/10freedesktop/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit dd15c4b999790ba7713567fc2e520b51110897ad
+Author: Danny Kukawka
+Date: Thu Nov 20 11:04:22 2008 +0100
+
+ split up 10-ipw-rfkill-switch.fdi
+
+ Split up 10-ipw-rfkill-switch.fdi. Move iwl* kernel driver handling
+ into a new file (10-iwl-rfkill-switch.fdi) and added an new configure
+ switch for the file.
+
+ This is to prevent trouble with newer kernel versions where the iwl*
+ drivers use already the rfkill subsystem which can't get handled by
+ hald-addon-ipw-killswitch anymore since the path to the sysfs
+ attribute
+ changed.
+
+ configure.in | 7 +++++
+ .../10freedesktop/10-ipw-rfkill-switch.fdi | 2 +-
+ .../10freedesktop/10-iwl-rfkill-switch.fdi | 27
+ ++++++++++++++++++++
+ fdi/information/10freedesktop/Makefile.am | 4 +++
+ 4 files changed, 39 insertions(+), 1 deletions(-)
+
+commit 62270ffd50627bba287894696180bc1298156b78
+Author: Tambet Ingo
+Date: Tue Nov 18 17:45:48 2008 +0100
+
+ fix modem entry for 0x0af0:0x7011 to use ttyUSB2
+
+ Fixed modem entry for 0x0af0:0x7011 to use ttyUSB2.
+
+ https://bugzilla.novell.com/show_bug.cgi?id=442727
+
+ fdi/information/10freedesktop/10-modem.fdi | 10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 5b109b7bd63feff45b912625ba29bc702f623503
+Author: Danny Kukawka
+Date: Tue Nov 18 17:35:52 2008 +0100
+
+ removed some V.250 command set entries
+
+ Removed some V.250 command set entries on USB devices since they
+ get already added by a generic rule.
+
+ fdi/information/10freedesktop/10-modem.fdi | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 301462a8a62b5894c580c1b83597e3fac5e1970e
+Author: Danny Kukawka
+Date: Tue Nov 18 17:35:21 2008 +0100
+
+ cleand up modem entries, merged some entries
+
+ Cleaned up modem entries, merged some entries with the same vendor.
+
+ fdi/information/10freedesktop/10-modem.fdi | 23 ++++-------------------
+ 1 files changed, 4 insertions(+), 19 deletions(-)
+
+commit 295884f6abe8e84553c0a50172d70abce9a81d34
+Author: Danny Kukawka
+Date: Tue Nov 18 17:34:10 2008 +0100
+
+ sorted modem entries
+
+ Reorganised existing modem entries. Put the USB, PCMCIA and PCI
+ entries together in sections and sorted them after the vendor IDs.
+
+ fdi/information/10freedesktop/10-modem.fdi | 301
+ +++++++++++++++-------------
+ 1 files changed, 159 insertions(+), 142 deletions(-)
+
+commit ba6fec05ad2907e1efef9af457c69e8872c95bb7
+Author: Danny Kukawka
+Date: Tue Nov 18 17:03:40 2008 +0100
+
+ add Sony Ericsson K750i as GSM modem
+
+ Added adopted version of a patch from Michal Čihař
+
+ to add a Sony Ericsson K750i as GSM modem.
+
+ fdi/information/10freedesktop/10-modem.fdi | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+commit ea6ffa5d93703df06c6a1ac69df38b8168e55d97
+Author: Danny Kukawka
+Date: Tue Nov 18 12:22:20 2008 +0100
+
+ fixed usage of prefix_ncase: s/SONY/sony/
+
+ Fixed usage of prefix_ncase: s/SONY/sony/ .
+
+ .../10freedesktop/10-usb-music-players.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 98f64375617a50ffeb6a004a27d75eb87027dfb9
+Author: Bastien Nocera
+Date: Tue Nov 18 12:19:40 2008 +0100
+
+ correct PSP music player entry
+
+ Corrected PSP music player entry:
+ - Default folder depth is 0, as putting the files in a sub-directory,
+ actually puts them in separate playlists.
+ - Add mention of WMA and MP4 support (WMA requires to be enabled in
+ the preferences on the system, but if a user has WMAs, he's more
+ than likely going to enable the option, saving transcoding)
+
+ .../10freedesktop/10-usb-music-players.fdi | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 72f0ed662b15c53acf519dc17d0e4d0ee89721e5
+Author: Bastien Nocera
+Date: Tue Nov 18 12:17:32 2008 +0100
+
+ detect PSP 3000 as a music player
+
+ Also detect the new PSP-3000 in storage mode. Vendor name is SONY
+ (not Sony), and the product name is "PSP" MS (yes, that's with the
+ quotes in the HAL output).
+
+ .../10freedesktop/10-usb-music-players.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 322f2a0b74258f3d8ce67f5f0695ead7403ff585
+Author: Dorian Scholz
+Date: Tue Nov 18 12:13:45 2008 +0100
+
+ add keymap for Samsung X60p
+
+ Added keymap for Samsung X60p.
+
+ fdi/information/10freedesktop/30-keymap-misc.fdi | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 054fbba7dfd7013ccf53ab5b9e171821a7ccc996
+Author: Otavio Salvador
+Date: Tue Nov 18 12:07:39 2008 +0100
+
+ add ZTE CDMA Tech USB modem
+
+ Added ZTE CDMA Tech USB modem.
+
+ fdi/information/10freedesktop/10-modem.fdi | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit ad2152d07c35057b0b9074bcd81cf436f9e6a23d
+Author: Otavio Salvador
+Date: Tue Nov 18 12:07:15 2008 +0100
+
+ add Motorola G24 USB GPRS Modem (GSM)
+
+ Added Motorola G24 USB GPRS Modem (GSM).
+
+ fdi/information/10freedesktop/10-modem.fdi | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 6854dd610c2a56b8d78e2a7acc77c4e0908198d6
+Author: Otavio Salvador
+Date: Tue Nov 18 12:06:46 2008 +0100
+
+ fix modem.command_sets string for Telstra/NextG CDMA modem
+
+ Fix modem.command_sets string for Telstra/NextG CDMA modem.
+
+ fdi/information/10freedesktop/10-modem.fdi | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 5ab20ca48a33765e96fcb94aae6fa0ff4e61786c
+Author: Richard Hughes
+Date: Tue Nov 18 10:06:41 2008 +0000
+
+ add trivial suspend quirk for an IBM 2367AU4
+
+ .../10freedesktop/20-video-quirk-pm-ibm.fdi | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 64807797bd849ec7084dbd5417a7b7dd785adbae
+Author: Dan Williams
+Date: Mon Nov 17 11:01:22 2008 -0500
+
+ modem: add VZW UM175 (Pantech)
+
+ fdi/information/10freedesktop/10-modem.fdi | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
commit 133abbf14471faf33ba0358e85137be1735d4192
Author: Ugo Viti
Date: Fri Nov 7 15:12:44 2008 +0100
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081107/configure new/hal-info-20081120/configure
--- old/hal-info-20081107/configure 2008-11-07 16:08:14.000000000 +0100
+++ new/hal-info-20081120/configure 2008-11-20 15:12:54.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for hal-info 20081107.
+# Generated by GNU Autoconf 2.61 for hal-info 20081120.
#
# Report bugs to .
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='hal-info'
PACKAGE_TARNAME='hal-info'
-PACKAGE_VERSION='20081107'
-PACKAGE_STRING='hal-info 20081107'
+PACKAGE_VERSION='20081120'
+PACKAGE_STRING='hal-info 20081120'
PACKAGE_BUGREPORT='hal@lists.freedesktop.org'
ac_subst_vars='SHELL
@@ -673,6 +673,8 @@
BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE
BUILD_KILLSWITCH_IPW_WLAN_TRUE
BUILD_KILLSWITCH_IPW_WLAN_FALSE
+BUILD_KILLSWITCH_IWL_WLAN_TRUE
+BUILD_KILLSWITCH_IWL_WLAN_FALSE
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -1187,7 +1189,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures hal-info 20081107 to adapt to many kinds of systems.
+\`configure' configures hal-info 20081120 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1253,7 +1255,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hal-info 20081107:";;
+ short | recursive ) echo "Configuration of hal-info 20081120:";;
esac
cat <<\_ACEOF
@@ -1271,6 +1273,7 @@
--enable-killswitch-sony-bluetooth Include support for Sony Bluetooth killswitch
--enable-killswitch-thinkpad-bluetooth Include support for Thinkpad Bluetooth killswitch (requires hal >= 0.5.11)
--enable-killswitch-ipw-wlan Include support for IPW WLAN killswitch (requires hal >= 0.5.10)
+ --enable-killswitch-iwl-wlan Include support for IWL WLAN killswitch (requires hal >= 0.5.10)
Some influential environment variables:
CC C compiler command
@@ -1346,7 +1349,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-hal-info configure 20081107
+hal-info configure 20081120
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1363,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by hal-info $as_me 20081107, which was
+It was created by hal-info $as_me 20081120, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2050,7 +2053,7 @@
# Define the identity of the package.
PACKAGE=hal-info
- VERSION=20081107
+ VERSION=20081120
cat >>confdefs.h <<_ACEOF
@@ -3573,6 +3576,22 @@
fi
+# Check whether --enable-killswitch_iwl_wlan was given.
+if test "${enable_killswitch_iwl_wlan+set}" = set; then
+ enableval=$enable_killswitch_iwl_wlan; enable_killswitch_iwl_wlan=$enableval
+else
+ enable_killswitch_iwl_wlan=yes
+fi
+
+ if test x$enable_killswitch_iwl_wlan == xyes; then
+ BUILD_KILLSWITCH_IWL_WLAN_TRUE=
+ BUILD_KILLSWITCH_IWL_WLAN_FALSE='#'
+else
+ BUILD_KILLSWITCH_IWL_WLAN_TRUE='#'
+ BUILD_KILLSWITCH_IWL_WLAN_FALSE=
+fi
+
+
ac_config_files="$ac_config_files Makefile fdi/Makefile fdi/information/Makefile fdi/information/10freedesktop/Makefile fdi/information/20thirdparty/Makefile fdi/preprobe/Makefile fdi/preprobe/10osvendor/Makefile fdi/preprobe/20thirdparty/Makefile tools/Makefile"
cat >confcache <<\_ACEOF
@@ -3748,6 +3767,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${BUILD_KILLSWITCH_IWL_WLAN_TRUE}" && test -z "${BUILD_KILLSWITCH_IWL_WLAN_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_KILLSWITCH_IWL_WLAN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_KILLSWITCH_IWL_WLAN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -4048,7 +4074,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by hal-info $as_me 20081107, which was
+This file was extended by hal-info $as_me 20081120, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4101,7 +4127,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-hal-info config.status 20081107
+hal-info config.status 20081120
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -4383,8 +4409,8 @@
BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE!$BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE$ac_delim
BUILD_KILLSWITCH_IPW_WLAN_TRUE!$BUILD_KILLSWITCH_IPW_WLAN_TRUE$ac_delim
BUILD_KILLSWITCH_IPW_WLAN_FALSE!$BUILD_KILLSWITCH_IPW_WLAN_FALSE$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
+BUILD_KILLSWITCH_IWL_WLAN_TRUE!$BUILD_KILLSWITCH_IWL_WLAN_TRUE$ac_delim
+BUILD_KILLSWITCH_IWL_WLAN_FALSE!$BUILD_KILLSWITCH_IWL_WLAN_FALSE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -4423,6 +4449,51 @@
_ACEOF
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
+_ACEOF
+
+
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
@@ -4672,7 +4743,7 @@
s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
@@ -5008,4 +5079,5 @@
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)
+ killswitch support for IWL wlan: ${enable_killswitch_iwl_wlan} (requires hal >= 0.5.10)
"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081107/configure.in new/hal-info-20081120/configure.in
--- old/hal-info-20081107/configure.in 2008-11-07 16:07:24.000000000 +0100
+++ new/hal-info-20081120/configure.in 2008-11-20 15:10:24.000000000 +0100
@@ -70,6 +70,12 @@
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)
+dnl ---------------------------------------------------------------------------
+dnl - Should we enable WLAN killswitch support for iwl chipsets?
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(killswitch_iwl_wlan, [ --enable-killswitch-iwl-wlan Include support for IWL WLAN killswitch (requires hal >= 0.5.10)],enable_killswitch_iwl_wlan=$enableval,enable_killswitch_iwl_wlan=yes)
+AM_CONDITIONAL(BUILD_KILLSWITCH_IWL_WLAN, test x$enable_killswitch_iwl_wlan == xyes)
+
AC_OUTPUT([
Makefile
fdi/Makefile
@@ -106,4 +112,5 @@
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)
+ killswitch support for IWL wlan: ${enable_killswitch_iwl_wlan} (requires hal >= 0.5.10)
"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081107/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi new/hal-info-20081120/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
--- old/hal-info-20081107/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi 2008-11-07 16:07:24.000000000 +0100
+++ new/hal-info-20081120/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi 2008-11-20 14:59:34.000000000 +0100
@@ -6,7 +6,7 @@
<match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
<!-- Don't use generic ipw rfkill on Dells -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Dell">
- <match key="info.linux.driver" string_outof="iwl4965;iwl3945;ipw3945;ipw2200;ipw2100">
+ <match key="info.linux.driver" string_outof="ipw3945;ipw2200;ipw2100">
<spawn udi="/org/freedesktop/Hal/devices/ipw_wlan_switch"/>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081107/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi new/hal-info-20081120/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi
--- old/hal-info-20081107/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi 1970-01-01 01:00:00.000000000 +0100
+++ new/hal-info-20081120/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi 2008-11-20 14:59:34.000000000 +0100
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+ <device>
+ <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+ <!-- Don't use generic iwl rfkill on Dells -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" contains_not="Dell">
+ <match key="info.linux.driver" string_outof="iwl4965;iwl3945">
+ <spawn udi="/org/freedesktop/Hal/devices/iwl_wlan_switch"/>
+ </match>
+ </match>
+ </match>
+ </device>
+
+ <device>
+ <match key="info.udi" string="/org/freedesktop/Hal/devices/iwl_wlan_switch">
+ <append key="info.capabilities" type="strlist">killswitch</append>
+ <merge key="info.product" type="string">Intel PRO/Wireless WLAN Switch</merge>
+ <merge key="info.category" type="string">killswitch</merge>
+ <merge key="killswitch.type" type="string">wlan</merge>
+ <merge key="killswitch.access_method" type="string">ipw</merge>
+ </match>
+ </device>
+
+</deviceinfo>
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081107/fdi/information/10freedesktop/10-modem.fdi new/hal-info-20081120/fdi/information/10freedesktop/10-modem.fdi
--- old/hal-info-20081107/fdi/information/10freedesktop/10-modem.fdi 2008-11-07 16:07:24.000000000 +0100
+++ new/hal-info-20081120/fdi/information/10freedesktop/10-modem.fdi 2008-11-20 14:59:34.000000000 +0100
@@ -4,6 +4,18 @@
<device>
<match key="info.category" string="serial">
+<!-- *****************************************************
+ USB devices
+ ***************************************************** -->
+
+ <!-- Communication Device Class Abstract Control Model (CDC ACM) modems,
+ typically provided by GSM/CDMA phones -->
+ <match key="@info.parent:usb.interface.class" int="0x02">
+ <match key="@info.parent:usb.interface.subclass" int="0x02">
+ <append key="modem.command_sets" type="strlist">V.250</append>
+ </match>
+ </match>
+
<!-- Vendor: HP -->
<match key="@info.parent:usb.vendor_id" int="0x03f0">
<!-- HP HS2300 (Sierra Wireless MC8775) -->
@@ -17,6 +29,19 @@
</match>
</match>
+ <!-- Nokia -->
+ <match key="@info.parent:usb.vendor_id" int="0x421">
+ <!-- 6300/3109c/6120 Classic/E71/E70/N95-3/E90/N70/E61/N95-2/N96/N82 -->
+ <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x72">
+ <match key="@info.parent:usb.interface.class" int="0x02">
+ <match key="@info.parent:usb.interface.subclass" int="0x02">
+ <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>
+
<!-- Samsung SGH-A707 (AT&T Sync) -->
<match key="@info.parent:usb.vendor_id" int="0x04e8">
<match key="@info.parent:usb.product_id" int="0x6601">
@@ -27,18 +52,36 @@
</match>
</match>
+ <!-- NEC -->
+ <match key="@info.parent:usb.vendor_id" int="0xaae">
+ <!-- emobile -->
+ <match key="@info.parent:usb.product_id" int="0x1c">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+
<!-- 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.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;0x7021;0x7041;0x7061;0x7031;0x7051;0x7071;0x7100;0x7111">
<match key="@info.parent:usb.interface.number" int="0">
<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 key="@info.parent:usb.product_id" int_outof="0x7011">
+ <match key="@info.parent:usb.interface.number" int="2">
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
+
</match>
<!-- HTC Apache SPV C500 Smart Phone (Verizon XV6700) -->
@@ -50,6 +93,17 @@
</match>
</match>
+ <!-- Ericsson -->
+ <match key="@info.parent:usb.vendor_id" int="0x0bdb">
+ <!-- Ericsson F3507g Mobile Broadband Minicard -->
+ <match key="@info.parent:usb.product_id" int="0x1900">
+ <match key="@info.parent:usb.interface.number" int="4">
+ <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, -->
@@ -82,6 +136,35 @@
</match>
</match>
+ <!-- Sony Ericsson K750i -->
+ <match key="@info.parent:usb.vendor_id" int="0x0fce">
+ <match key="@info.parent:usb.product_id" int="0xd016">
+ <match key="@info.parent:usb.interface.number" int="1">
+ <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>
+
+ <!-- LG -->
+ <match key="@info.parent:usb.vendor_id" int="0x1004">
+ <!-- U990 -->
+ <match key="@info.parent:usb.product_id" int="0x6000">
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
+
+ <!-- Pantech -->
+ <match key="@info.parent:usb.vendor_id" int="0x106c">
+ <!-- PC5740, PC5750, UM150 EVDO rev A card, UM175 EVDO rev A -->
+ <match key="@info.parent:usb.product_id" int_outof="0x3701;0x3702;0x3711;0x3714">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <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, Compass 597 -->
@@ -127,30 +210,6 @@
</match>
</match>
- <match key="@info.parent:usb.vendor_id" int="0x19d2">
- <!-- Qualcomm: Telstra/NextG CDMA -->
- <match key="@info.parent:usb.product_id" int="0x0001">
- <match key="@info.parent:usb.interface.number" int="0">
- <append key="modem.command_sets" type="strlist">GSM-07.07</append>
- <append key="modem.command_sets" type="strlist">GSM-07.05</append>
- </match>
- </match>
- <!-- ZTE MF628 HSDPA USB dongle -->
- <match key="@info.parent:usb.product_id" int="0x0015">
- <match key="@info.parent:usb.interface.number" int="3">
- <append key="modem.command_sets" type="strlist">GSM-07.07</append>
- <append key="modem.command_sets" type="strlist">GSM-07.05</append>
- </match>
- </match>
- <!-- ONDA MF632 HSDPA USB dongle -->
- <match key="@info.parent:usb.product_id" int="0x002">
- <match key="@info.parent:usb.interface.number" int="2">
- <append key="modem.command_sets" type="strlist">GSM-07.07</append>
- <append key="modem.command_sets" type="strlist">GSM-07.05</append>
- </match>
- </match>
- </match>
-
<!-- Novatel -->
<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 -->
@@ -178,14 +237,53 @@
</match>
</match>
- <!-- Pantech -->
- <match key="@info.parent:usb.vendor_id" int="0x106c">
- <!-- PC5740, PC5750, UM150 EVDO rev A card -->
- <match key="@info.parent:usb.product_id" int_outof="0x3701;0x3702;0x3711">
+ <!-- CMOTECH -->
+ <match key="@info.parent:usb.vendor_id" int="0x16d8">
+ <!-- C-motech CNU-550, CNU-680 (USB, EV-DO) -->
+ <match key="@info.parent:usb.product_id" int_outof="0x5543;0x680a">
<match key="@info.parent:usb.interface.number" int="0">
<append key="modem.command_sets" type="strlist">IS-707-A</append>
</match>
</match>
+ <match key="@info.parent:usb.product_id" int="0x6280">
+ <match key="@info.parent:usb.interface.number" int="1">
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+
+ <!-- AXESSTEL modem -->
+ <match key="@info.parent:usb.vendor_id" int="0x1726">
+ <match key="@info.parent:usb.product_id" int="0x1000">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <match key="serial.port" int="0">
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ </match>
+ </match>
+
+ <match key="@info.parent:usb.vendor_id" int="0x19d2">
+ <!-- Qualcomm: Telstra/NextG CDMA , ZTE CDMA Tech -->
+ <match key="@info.parent:usb.product_id" int_outof="0x0001;0xfffe">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ </match>
+ </match>
+ <!-- ZTE MF628 HSDPA USB dongle -->
+ <match key="@info.parent:usb.product_id" int="0x0015">
+ <match key="@info.parent:usb.interface.number" int="3">
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
+ <!-- ONDA MF632 HSDPA USB dongle -->
+ <match key="@info.parent:usb.product_id" int="0x002">
+ <match key="@info.parent:usb.interface.number" int="2">
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
</match>
<!-- Bandrich C100 1/2 -->
@@ -199,8 +297,8 @@
</match>
<match key="@info.parent:usb.vendor_id" int="0x22b8">
- <!-- BUSlink UM-864GW USB GPRS Modem (Model SCWi275u) -->
- <match key="@info.parent:usb.product_id" int="0x3802">
+ <!-- BUSlink UM-864GW USB GPRS Modem (Model SCWi275u), Motorola G24 USB GPRS Modem -->
+ <match key="@info.parent:usb.product_id" int_outof="0x3802;0x4902">
<match key="@info.parent:usb.interface.number" int="0">
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
<append key="modem.command_sets" type="strlist">GSM-07.05</append>
@@ -210,7 +308,6 @@
<match key="@info.parent:usb.product_id" int_outof="0x6402;0x4902">
<match key="@info.parent:usb.interface.class" int="0x02">
<match key="@info.parent:usb.interface.subclass" int="0x02">
- <append key="modem.command_sets" type="strlist">V.250</append>
<append key="modem.command_sets" type="strlist">GSM-07.07</append>
<append key="modem.command_sets" type="strlist">GSM-07.05</append>
</match>
@@ -245,6 +342,21 @@
</match>
</match>
+<!-- *****************************************************
+ PCMCIA cards
+ ***************************************************** -->
+
+ <!-- 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="modem.command_sets" type="strlist">V.250</append>
+ </match>
+ </match>
+ </match>
+ </match>
+
<!-- Sierra Wireless 850/860 -->
<match key="@info.parent:pcmcia.card_id" int="1808">
<match key="@info.parent:pcmcia.manf_id" int="402">
@@ -255,6 +367,17 @@
</match>
</match>
+ <!-- Best Data 56Kbps(Cirrus) Fax Modem PC Card (56SPC) -->
+ <match key="@info.parent:pcmcia.card_id" int="0x88">
+ <match key="@info.parent:pcmcia.manf_id" int="0x14e">
+ <match key="@info.parent:pcmcia.prod_id1" string="PCMCIA V92 FAX Modem CARD">
+ <match key="@info.parent:pcmcia.prod_id2" string="FM56C-NFS">
+ <append key="modem.command_sets" type="strlist">V.250</append>
+ </match>
+ </match>
+ </match>
+ </match>
+
<!-- T-Mobile IPWireless 4G (IPWireless 3G Data Modem) -->
<match key="@info.parent:pcmcia.card_id" int="0x200">
<match key="@info.parent:pcmcia.manf_id" int="0x2f2">
@@ -269,27 +392,9 @@
</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="modem.command_sets" type="strlist">V.250</append>
- </match>
- </match>
- </match>
- </match>
-
- <!-- Best Data 56Kbps(Cirrus) Fax Modem PC Card (56SPC) -->
- <match key="@info.parent:pcmcia.card_id" int="0x88">
- <match key="@info.parent:pcmcia.manf_id" int="0x14e">
- <match key="@info.parent:pcmcia.prod_id1" string="PCMCIA V92 FAX Modem CARD">
- <match key="@info.parent:pcmcia.prod_id2" string="FM56C-NFS">
- <append key="modem.command_sets" type="strlist">V.250</append>
- </match>
- </match>
- </match>
- </match>
+<!-- *****************************************************
+ PCI devices
+ ***************************************************** -->
<!-- Option Fusion+ UMTS HSDPA card -->
<match key="info.category" string="serial">
@@ -303,83 +408,9 @@
</match>
</match>
- <!-- CMOTECH -->
- <match key="@info.parent:usb.vendor_id" int="0x16d8">
- <!-- C-motech CNU-550, CNU-680 (USB, EV-DO) -->
- <match key="@info.parent:usb.product_id" int_outof="0x5543;0x680a">
- <match key="@info.parent:usb.interface.number" int="0">
- <append key="modem.command_sets" type="strlist">IS-707-A</append>
- </match>
- </match>
- <match key="@info.parent:usb.product_id" int="0x6280">
- <match key="@info.parent:usb.interface.number" int="1">
- <append key="modem.command_sets" type="strlist">IS-707-A</append>
- </match>
- </match>
- </match>
-
- <!-- Ericsson -->
- <match key="@info.parent:usb.vendor_id" int="0x0bdb">
- <!-- Ericsson F3507g Mobile Broadband Minicard -->
- <match key="@info.parent:usb.product_id" int="0x1900">
- <match key="@info.parent:usb.interface.number" int="4">
- <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>
-
- <!-- AXESSTEL modem -->
- <match key="@info.parent:usb.vendor_id" int="0x1726">
- <match key="@info.parent:usb.product_id" int="0x1000">
- <match key="@info.parent:usb.interface.number" int="0">
- <match key="serial.port" int="0">
- <append key="modem.command_sets" type="strlist">IS-707-A</append>
- </match>
- </match>
- </match>
- </match>
-
- <!-- Communication Device Class Abstract Control Model (CDC ACM) modems,
- typically provided by GSM/CDMA phones -->
- <match key="@info.parent:usb.interface.class" int="0x02">
- <match key="@info.parent:usb.interface.subclass" int="0x02">
- <append key="modem.command_sets" type="strlist">V.250</append>
- </match>
- </match>
-
- <!-- Nokia -->
- <match key="@info.parent:usb.vendor_id" int="0x421">
- <!-- 6300/3109c/6120 Classic/E71/E70/N95-3/E90/N70/E61/N95-2/N96/N82 -->
- <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x72">
- <match key="@info.parent:usb.interface.class" int="0x02">
- <match key="@info.parent:usb.interface.subclass" int="0x02">
- <append key="modem.command_sets" type="strlist">V.250</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>
-
- <!-- LG -->
- <match key="@info.parent:usb.vendor_id" int="0x1004">
- <!-- U990 -->
- <match key="@info.parent:usb.product_id" int="0x6000">
- <append key="modem.command_sets" type="strlist">GSM-07.07</append>
- <append key="modem.command_sets" type="strlist">GSM-07.05</append>
- </match>
- </match>
-
- <!-- NEC -->
- <match key="@info.parent:usb.vendor_id" int="0xaae">
- <!-- emobile -->
- <match key="@info.parent:usb.product_id" int="0x1c">
- <match key="@info.parent:usb.interface.number" int="0">
- <append key="modem.command_sets" type="strlist">IS-707-A</append>
- </match>
- </match>
- </match>
+<!-- *****************************************************
+ generic keys
+ ***************************************************** -->
<!-- set common properties for all above matched modem devices -->
<match key="modem.command_sets" exists="true">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081107/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20081120/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20081107/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-11-07 16:07:24.000000000 +0100
+++ new/hal-info-20081120/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-11-20 14:59:34.000000000 +0100
@@ -936,15 +936,18 @@
<match key="info.category" string="storage">
<!-- Sony PSP (PlayStation Portable) -->
- <match key="storage.vendor" string="Sony">
- <match key="storage.model" string="PSP">
+ <match key="storage.vendor" prefix_ncase="sony">
+ <match key="storage.model" contains="PSP">
<append key="info.capabilities" type="strlist">portable_audio_player</append>
<!-- NOTE: for backward compatibility until key get removed finally -->
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<merge key="portable_audio_player.storage_device" type="copy_property">info.udi</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/mpeg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
<append key="portable_audio_player.output_formats" type="strlist">audio/vnd.sony.atrac3</append>
<append key="portable_audio_player.audio_folders" type="strlist">PSP/MUSIC/</append>
+ <merge key="portable_audio_player.folder_depth" type="int">0</merge>
<merge key="storage.drive_type" type="string">memory_stick</merge>
</match>
</match>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081107/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi new/hal-info-20081120/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
--- old/hal-info-20081107/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2008-11-07 16:07:24.000000000 +0100
+++ new/hal-info-20081120/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2008-11-20 14:59:34.000000000 +0100
@@ -38,7 +38,7 @@
<merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
</match>
<!-- X31, T30 , A31p-->
- <match key="system.hardware.product" prefix_outof="2366;2653">
+ <match key="system.hardware.product" prefix_outof="2366;2367;2653">
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
<!-- X22, X40, X32 -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081107/fdi/information/10freedesktop/30-keymap-misc.fdi new/hal-info-20081120/fdi/information/10freedesktop/30-keymap-misc.fdi
--- old/hal-info-20081107/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-11-07 16:07:24.000000000 +0100
+++ new/hal-info-20081120/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-11-20 14:59:34.000000000 +0100
@@ -94,7 +94,7 @@
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix_ncase="samsung">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="SP55S;SQ45S70S">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="SP55S;SQ45S70S;SX60P">
<append key="input.keymap.data" type="strlist">e002:displaytoggle</append> <!-- Fn+F4 CRT/LCD -->
<append key="input.keymap.data" type="strlist">e003:battery</append> <!-- Fn+F2 battery icon -->
<append key="input.keymap.data" type="strlist">e004:prog1</append> <!-- Fn+F5 backlight on/off -->
@@ -103,6 +103,7 @@
<append key="input.keymap.data" type="strlist">e009:brightnessdown</append> <!-- Fn-Down Brightness down -->
<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">e034:wlan</append> <!-- Fn+F9 Turn On/Off Wireless (X60P) -->
<append key="input.keymap.data" type="strlist">0074:prog1</append> <!-- User key -->
<append key="input.keymap.data" type="strlist">0075:www</append> <!-- WWW key -->
<append key="input.keymap.data" type="strlist">e077:f22</append> <!-- Fn+F10 Touchpad on -->
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081107/fdi/information/10freedesktop/Makefile.am new/hal-info-20081120/fdi/information/10freedesktop/Makefile.am
--- old/hal-info-20081107/fdi/information/10freedesktop/Makefile.am 2008-11-07 16:07:24.000000000 +0100
+++ new/hal-info-20081120/fdi/information/10freedesktop/Makefile.am 2008-11-20 15:07:22.000000000 +0100
@@ -37,6 +37,10 @@
dist_fdi_DATA += 10-ipw-rfkill-switch.fdi
endif
+if BUILD_KILLSWITCH_IWL_WLAN
+dist_fdi_DATA += 10-iwl-rfkill-switch.fdi
+endif
+
if BUILD_RECALL
dist_fdi_DATA += \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081107/fdi/information/10freedesktop/Makefile.in new/hal-info-20081120/fdi/information/10freedesktop/Makefile.in
--- old/hal-info-20081107/fdi/information/10freedesktop/Makefile.in 2008-11-07 16:08:13.000000000 +0100
+++ new/hal-info-20081120/fdi/information/10freedesktop/Makefile.in 2008-11-20 15:12:53.000000000 +0100
@@ -36,7 +36,8 @@
@BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE@am__append_4 = 10-sony-bluetooth-switch.fdi
@BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE@am__append_5 = 10-thinkpad-rfkill-switch-bluetooth.fdi
@BUILD_KILLSWITCH_IPW_WLAN_TRUE@am__append_6 = 10-ipw-rfkill-switch.fdi
-@BUILD_RECALL_TRUE@am__append_7 = \
+@BUILD_KILLSWITCH_IWL_WLAN_TRUE@am__append_7 = 10-iwl-rfkill-switch.fdi
+@BUILD_RECALL_TRUE@am__append_8 = \
@BUILD_RECALL_TRUE@ 10-recall-battery-dell.fdi \
@BUILD_RECALL_TRUE@ 10-recall-battery-ibm.fdi \
@BUILD_RECALL_TRUE@ 10-recall-battery-lenovo.fdi \
@@ -44,7 +45,7 @@
@BUILD_RECALL_TRUE@ 10-recall-battery-gateway.fdi \
@BUILD_RECALL_TRUE@ 10-recall-battery-toshiba.fdi
-@BUILD_VIDEO_TRUE@am__append_8 = \
+@BUILD_VIDEO_TRUE@am__append_9 = \
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-acer.fdi \
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-apple.fdi \
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-asus.fdi \
@@ -59,7 +60,7 @@
@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-toshiba.fdi \
@BUILD_VIDEO_TRUE@ 21-video-quirk-nvidia.fdi
-@BUILD_KEYMAPS_TRUE@am__append_9 = \
+@BUILD_KEYMAPS_TRUE@am__append_10 = \
@BUILD_KEYMAPS_TRUE@ 30-keymap-module-sony-laptop.fdi \
@BUILD_KEYMAPS_TRUE@ 30-keymap-module-thinkpad-acpi.fdi \
@BUILD_KEYMAPS_TRUE@ 30-keymap-misc.fdi \
@@ -92,17 +93,17 @@
10-dell-rfkill-switch-bluetooth.fdi \
10-dell-rfkill-switch-wwan.fdi 10-sony-bluetooth-switch.fdi \
10-thinkpad-rfkill-switch-bluetooth.fdi \
- 10-ipw-rfkill-switch.fdi 10-recall-battery-dell.fdi \
- 10-recall-battery-ibm.fdi 10-recall-battery-lenovo.fdi \
- 10-recall-battery-fujitsu.fdi 10-recall-battery-gateway.fdi \
- 10-recall-battery-toshiba.fdi 20-video-quirk-pm-acer.fdi \
- 20-video-quirk-pm-apple.fdi 20-video-quirk-pm-asus.fdi \
- 20-video-quirk-pm-dell.fdi 20-video-quirk-pm-fujitsu.fdi \
- 20-video-quirk-pm-hp.fdi 20-video-quirk-pm-ibm.fdi \
- 20-video-quirk-pm-lenovo.fdi 20-video-quirk-pm-misc.fdi \
- 20-video-quirk-pm-samsung.fdi 20-video-quirk-pm-sony.fdi \
- 20-video-quirk-pm-toshiba.fdi 21-video-quirk-nvidia.fdi \
- 30-keymap-module-sony-laptop.fdi \
+ 10-ipw-rfkill-switch.fdi 10-iwl-rfkill-switch.fdi \
+ 10-recall-battery-dell.fdi 10-recall-battery-ibm.fdi \
+ 10-recall-battery-lenovo.fdi 10-recall-battery-fujitsu.fdi \
+ 10-recall-battery-gateway.fdi 10-recall-battery-toshiba.fdi \
+ 20-video-quirk-pm-acer.fdi 20-video-quirk-pm-apple.fdi \
+ 20-video-quirk-pm-asus.fdi 20-video-quirk-pm-dell.fdi \
+ 20-video-quirk-pm-fujitsu.fdi 20-video-quirk-pm-hp.fdi \
+ 20-video-quirk-pm-ibm.fdi 20-video-quirk-pm-lenovo.fdi \
+ 20-video-quirk-pm-misc.fdi 20-video-quirk-pm-samsung.fdi \
+ 20-video-quirk-pm-sony.fdi 20-video-quirk-pm-toshiba.fdi \
+ 21-video-quirk-nvidia.fdi 30-keymap-module-sony-laptop.fdi \
30-keymap-module-thinkpad-acpi.fdi 30-keymap-misc.fdi \
30-keymap-hp.fdi 30-keymap-compaq.fdi 30-keymap-lenovo.fdi \
30-keymap-dell.fdi 30-keymap-acer.fdi \
@@ -208,7 +209,7 @@
10-usb-obex.fdi $(am__append_1) $(am__append_2) \
$(am__append_3) $(am__append_4) $(am__append_5) \
$(am__append_6) $(am__append_7) $(am__append_8) \
- $(am__append_9)
+ $(am__append_9) $(am__append_10)
all: all-am
.SUFFIXES:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org