diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2006-02-11 03:51:37 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2006-02-11 03:51:37 +0000 |
| commit | 518bb944173c2036486b25a764966bd738bb5ecf (patch) | |
| tree | 4a26ff5a1363eeff675fdd1df90a9719934db0e6 /hcid/security.c | |
| parent | 2210fda2d9ff2d751fc1ba97e03f6006e4802690 (diff) | |
Complete re-design of the D-Bus interface
Diffstat (limited to 'hcid/security.c')
| -rw-r--r-- | hcid/security.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/hcid/security.c b/hcid/security.c index 89cc4cd1..36774f2b 100644 --- a/hcid/security.c +++ b/hcid/security.c @@ -389,7 +389,7 @@ static inline void cmd_status(int dev, bdaddr_t *sba, void *ptr) return; if (evt->opcode == cmd_opcode_pack(OGF_LINK_CTL, OCF_INQUIRY)) - hcid_dbus_inquiry_start(sba); + hcid_dbus_discover_start(sba); } static inline void cmd_complete(int dev, bdaddr_t *sba, void *ptr) @@ -397,7 +397,7 @@ static inline void cmd_complete(int dev, bdaddr_t *sba, void *ptr) evt_cmd_complete *evt = ptr; switch (evt->opcode) { case cmd_opcode_pack(OGF_LINK_CTL, OCF_INQUIRY_CANCEL): - hcid_dbus_inquiry_complete(sba); + hcid_dbus_discover_complete(sba); break; case cmd_opcode_pack(OGF_HOST_CTL, OCF_CHANGE_LOCAL_NAME): hcid_dbus_setname_complete(sba); @@ -442,7 +442,7 @@ static inline void remote_version_information(int dev, bdaddr_t *sba, void *ptr) static inline void inquiry_complete(int dev, bdaddr_t *sba, void *ptr) { - hcid_dbus_inquiry_complete(sba); + hcid_dbus_discover_complete(sba); } static inline void inquiry_result(int dev, bdaddr_t *sba, int plen, void *ptr) @@ -456,7 +456,7 @@ static inline void inquiry_result(int dev, bdaddr_t *sba, int plen, void *ptr) | (info->dev_class[1] << 8) | (info->dev_class[2] << 16); - hcid_dbus_inquiry_result(sba, &info->bdaddr, class, 0); + hcid_dbus_discover_result(sba, &info->bdaddr, class, 0); update_lastseen(sba, &info->bdaddr); @@ -479,7 +479,7 @@ static inline void inquiry_result_with_rssi(int dev, bdaddr_t *sba, int plen, vo | (info->dev_class[1] << 8) | (info->dev_class[2] << 16); - hcid_dbus_inquiry_result(sba, &info->bdaddr, + hcid_dbus_discover_result(sba, &info->bdaddr, class, info->rssi); update_lastseen(sba, &info->bdaddr); @@ -493,7 +493,7 @@ static inline void inquiry_result_with_rssi(int dev, bdaddr_t *sba, int plen, vo | (info->dev_class[1] << 8) | (info->dev_class[2] << 16); - hcid_dbus_inquiry_result(sba, &info->bdaddr, + hcid_dbus_discover_result(sba, &info->bdaddr, class, info->rssi); update_lastseen(sba, &info->bdaddr); @@ -514,7 +514,7 @@ static inline void extended_inquiry_result(int dev, bdaddr_t *sba, int plen, voi | (info->dev_class[1] << 8) | (info->dev_class[2] << 16); - hcid_dbus_inquiry_result(sba, &info->bdaddr, class, info->rssi); + hcid_dbus_discover_result(sba, &info->bdaddr, class, info->rssi); update_lastseen(sba, &info->bdaddr); @@ -583,7 +583,7 @@ static inline void auth_complete(int dev, bdaddr_t *sba, void *ptr) if (get_bdaddr(dev, sba, evt->handle, &dba) < 0) return; - hcid_dbus_auth_complete(sba, &dba, evt->status); + hcid_dbus_bonding_created_complete(sba, &dba, evt->status); } |