Implement the interface redesign

1 files changed, 5 insertions, 5 deletions

diff --git a/hcid/main.c b/hcid/main.c
index e6d43590..5ff9fcf3 100644
--- a/hcid/main.c
+++ b/hcid/main.c
@@ -401,10 +401,10 @@ 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);
+
+		if (hci_test_bit(HCI_UP, &dr->dev_opt))
+			hcid_dbus_dev_up(dr->dev_id);
 #endif
 	}
 
@@ -476,7 +476,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_manager(sd->dev_id);
+		hcid_dbus_dev_up(sd->dev_id);
 #endif
 		break;
 
@@ -485,7 +485,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_manager(sd->dev_id);
+		hcid_dbus_dev_down(sd->dev_id);
 #endif
 		break;
 	}