diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-08-27 11:45:28 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-08-27 11:45:28 +0200 |
| commit | 85586b684b630334778a41c942fe8290ca07ca93 (patch) | |
| tree | 9666f7afc6adbb58192e31f8c03b4f58f4c5db57 /src/dbus-hci.c | |
| parent | e94d033441ea79a820c018bc04f49b3ab08ac2f3 (diff) | |
| parent | fda18fb2d24cedaaf823cdafecbe8ba69495947c (diff) | |
Merge branch 'for-upstream' of git://gitorious.org/bluez/cktakahasis-clone
Diffstat (limited to 'src/dbus-hci.c')
| -rw-r--r-- | src/dbus-hci.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/dbus-hci.c b/src/dbus-hci.c index 9090c4c3..bc1528f8 100644 --- a/src/dbus-hci.c +++ b/src/dbus-hci.c @@ -45,8 +45,10 @@ #include <dbus/dbus.h> #include <gdbus.h> -#include "hcid.h" +#include "logging.h" #include "textfile.h" + +#include "hcid.h" #include "manager.h" #include "adapter.h" #include "device.h" @@ -118,7 +120,7 @@ int dev_rssi_cmp(struct remote_dev_info *d1, struct remote_dev_info *d2) return rssi1 - rssi2; } -int found_device_add(GSList **list, bdaddr_t *bdaddr, int8_t rssi, +static int found_device_add(GSList **list, bdaddr_t *bdaddr, int8_t rssi, name_status_t name_status) { struct remote_dev_info *dev, match; @@ -837,7 +839,7 @@ void hcid_dbus_inquiry_start(bdaddr_t *local) DBUS_TYPE_INVALID); } -int found_device_req_name(struct adapter *adapter) +static int found_device_req_name(struct adapter *adapter) { struct hci_request rq; evt_cmd_status rp; |