diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2007-08-01 01:10:50 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2007-08-01 01:53:31 +0300 |
| commit | 8658f5d923a69fb55b4cd9e1e84c2d271679f6e2 (patch) | |
| tree | ff73a6152627f125621afc97cddb73fdfdf28079 /config/config.c | |
| parent | aa75b3481724834da2f855d8dd2ff36074bd5706 (diff) | |
Hotplug: Add HAL support
Add support for HAL-based hotplugging, in which we just get the list of
input devices and properties from HAL. Requires an FDI which is not yet
in mainline HAL.
Diffstat (limited to 'config/config.c')
| -rw-r--r-- | config/config.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/config/config.c b/config/config.c index a6d36c0ee..837dd00db 100644 --- a/config/config.c +++ b/config/config.c @@ -31,10 +31,16 @@ void config_init() { -#if defined(CONFIG_DBUS_API) +#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) if (config_dbus_core_init()) { +# ifdef CONFIG_DBUS_API if (!config_dbus_init()) ErrorF("[config] failed to initialise D-Bus API\n"); +# endif +# ifdef CONFIG_HAL + if (!config_hal_init()) + ErrorF("[config] failed to initialise HAL\n"); +# endif } else { ErrorF("[config] failed to initialise D-Bus core\n"); @@ -45,8 +51,13 @@ config_init() void config_fini() { -#if defined(CONFIG_DBUS_API) +#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) +# ifdef CONFIG_HAL + config_hal_fini(); +# endif +# ifdef CONFIG_DBUS_API config_dbus_fini(); +# endif config_dbus_core_fini(); #endif } |