summaryrefslogtreecommitdiffstats
path: root/hcid/main.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2006-04-28 14:53:01 +0000
committerMarcel Holtmann <marcel@holtmann.org>2006-04-28 14:53:01 +0000
commit7a2ad6681fd5892577fe7d9c80d13eca96e99541 (patch)
tree8c9336afb948bdf0807fe45746ead93db9964a6e /hcid/main.c
parent403066f6cd6f4df68f68178acc2db0926370e95c (diff)
Make D-Bus a mandatory requirement
Diffstat (limited to 'hcid/main.c')
-rw-r--r--hcid/main.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/hcid/main.c b/hcid/main.c
index ec8c047c..86a4a773 100644
--- a/hcid/main.c
+++ b/hcid/main.c
@@ -536,9 +536,7 @@ static void init_all_devices(int ctl)
start_device(dr->dev_id);
-#ifdef ENABLE_DBUS
hcid_dbus_register_device(dr->dev_id);
-#endif
}
free(dl);
@@ -581,16 +579,12 @@ static inline void device_event(GIOChannel *chan, evt_stack_internal *si)
if (hcid.auto_init)
init_device(sd->dev_id);
add_device(sd->dev_id);
-#ifdef ENABLE_DBUS
hcid_dbus_register_device(sd->dev_id);
-#endif
break;
case HCI_DEV_UNREG:
info("HCI dev %d unregistered", sd->dev_id);
-#ifdef ENABLE_DBUS
hcid_dbus_unregister_device(sd->dev_id);
-#endif
remove_device(sd->dev_id);
break;
@@ -750,12 +744,10 @@ int main(int argc, char *argv[])
init_devices();
-#ifdef ENABLE_DBUS
if (hcid_dbus_init() == FALSE) {
error("Unable to get on D-Bus");
exit(1);
}
-#endif
init_security_data();
@@ -782,9 +774,7 @@ int main(int argc, char *argv[])
free_device_opts();
-#ifdef ENABLE_DBUS
hcid_dbus_exit();
-#endif
info("Exit");