diff options
| author | Alok Barsode <alok.barsode@azingo.com> | 2008-09-08 13:39:38 +0530 |
|---|---|---|
| committer | Alok Barsode <alok.barsode@azingo.com> | 2008-09-08 14:31:43 +0530 |
| commit | 2a8fb41c4c57b24a22f3adaab472b416faae122e (patch) | |
| tree | 930c56d79ffd39c5143ccb07b817b38c558fc1bb /input | |
| parent | 9de95d439b89c8003d953d0f82b94edc27c50bbc (diff) | |
Redefining adapter_get_address to take bdaddr_t as parameter.
Diffstat (limited to 'input')
| -rw-r--r-- | input/manager.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/input/manager.c b/input/manager.c index 8de717ba..57871a34 100644 --- a/input/manager.c +++ b/input/manager.c @@ -170,7 +170,7 @@ static int hid_device_probe(struct btd_device *device, GSList *records) { struct btd_adapter *adapter = device_get_adapter(device); const gchar *path = device_get_path(device); - const char *source, *destination; + const char *destination; struct hidp_connadd_req hidp; bdaddr_t src, dst; @@ -178,10 +178,9 @@ static int hid_device_probe(struct btd_device *device, GSList *records) memset(&hidp, 0, sizeof(hidp)); - source = adapter_get_address(adapter); + adapter_get_address(adapter, &src); destination = device_get_address(device); - str2ba(source, &src); str2ba(destination, &dst); if (load_stored(&src, &dst, &hidp) == 0) @@ -213,7 +212,7 @@ static int headset_probe(struct btd_device *device, GSList *records) sdp_record_t *record = records->data; sdp_list_t *protos; uint8_t ch; - const char *source, *destination; + const char *destination; bdaddr_t src, dst; DBG("path %s", path); @@ -232,10 +231,9 @@ static int headset_probe(struct btd_device *device, GSList *records) return -EINVAL; } - source = adapter_get_address(adapter); + adapter_get_address(adapter, &src); destination = device_get_address(device); - str2ba(source, &src); str2ba(destination, &dst); return fake_input_register(connection, path, &src, &dst, @@ -249,22 +247,18 @@ static void headset_remove(struct btd_device *device) static int hid_server_probe(struct btd_adapter *adapter) { - const char *addr; bdaddr_t src; - addr = adapter_get_address(adapter); - str2ba(addr, &src); + adapter_get_address(adapter, &src); return server_start(&src); } static void hid_server_remove(struct btd_adapter *adapter) { - const char *addr; bdaddr_t src; - addr = adapter_get_address(adapter); - str2ba(addr, &src); + adapter_get_address(adapter, &src); server_stop(&src); } |