diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2005-10-27 00:28:36 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2005-10-27 00:28:36 +0000 |
| commit | 7a58f1b38a86d30477048e84d979d627ebfec10b (patch) | |
| tree | 539e64a957038d5bcce9aad8fd01c95108bd36ee /hcid/main.c | |
| parent | 5b06ecd76bbb760cdee2e7b9e36cc3202db2e5db (diff) | |
Add initial D-Bus device configuration support
Diffstat (limited to 'hcid/main.c')
| -rw-r--r-- | hcid/main.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/hcid/main.c b/hcid/main.c index b6891ee4..d3d285da 100644 --- a/hcid/main.c +++ b/hcid/main.c @@ -377,6 +377,9 @@ static void init_all_devices(int ctl) start_security_manager(dr->dev_id); #ifdef ENABLE_DBUS + if (hci_test_bit(HCI_UP, &dr->dev_opt)) + hcid_dbus_register_manager(dr->dev_id); + hcid_dbus_register_device(dr->dev_id); #endif } @@ -430,10 +433,16 @@ static inline void device_event(GIOChannel *chan, evt_stack_internal *si) syslog(LOG_INFO, "HCI dev %d registered", sd->dev_id); if (hcid.auto_init) init_device(sd->dev_id); +#ifdef ENABLE_DBUS + hcid_dbus_register_device(sd->dev_id); +#endif break; case HCI_DEV_UNREG: syslog(LOG_INFO, "HCI dev %d unregistered", sd->dev_id); +#ifdef ENABLE_DBUS + hcid_dbus_unregister_device(sd->dev_id); +#endif break; case HCI_DEV_UP: @@ -443,7 +452,7 @@ static inline void device_event(GIOChannel *chan, evt_stack_internal *si) if (hcid.security) start_security_manager(sd->dev_id); #ifdef ENABLE_DBUS - hcid_dbus_register_device(sd->dev_id); + hcid_dbus_register_manager(sd->dev_id); #endif break; @@ -452,7 +461,7 @@ static inline void device_event(GIOChannel *chan, evt_stack_internal *si) if (hcid.security) stop_security_manager(sd->dev_id); #ifdef ENABLE_DBUS - hcid_dbus_unregister_device(sd->dev_id); + hcid_dbus_unregister_manager(sd->dev_id); #endif break; } |