diff options
| author | Mikel Astiz <mikel.astiz@bmw-carit.de> | 2013-05-27 14:04:08 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-06-24 11:16:51 +0300 |
| commit | 0173540c1ca5ae7021282408879ee5f69a8fe75e (patch) | |
| tree | 0da9b1910fe5bb8e4d65b3ef0691e6448d81c28d /profiles/scanparam | |
| parent | 13093c8a70cc7f64daace43ad24173b1e903c582 (diff) | |
| download | bluez-0173540c1ca5ae7021282408879ee5f69a8fe75e.tar.gz | |
scanparam: Use btd_service userdata pointer
Avoid maintaining an internal list of probed struct scan instances by
making use of btd_service's userdata pointer.
Diffstat (limited to 'profiles/scanparam')
| -rw-r--r-- | profiles/scanparam/scan.c | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/profiles/scanparam/scan.c b/profiles/scanparam/scan.c index a9baec89c..fc4779f86 100644 --- a/profiles/scanparam/scan.c +++ b/profiles/scanparam/scan.c @@ -64,16 +64,6 @@ struct scan { uint16_t refresh_cb_id; }; -static GSList *servers = NULL; - -static int scan_device_cmp(gconstpointer a, gconstpointer b) -{ - const struct scan *scan = a; - const struct btd_device *device = b; - - return (device == scan->device ? 0 : -1); -} - static void write_scan_params(GAttrib *attrib, uint16_t handle) { uint8_t value[4]; @@ -227,8 +217,9 @@ static void attio_disconnected_cb(gpointer user_data) scan->attrib = NULL; } -static int scan_register(struct btd_device *device, struct gatt_primary *prim) +static int scan_register(struct btd_service *service, struct gatt_primary *prim) { + struct btd_device *device = btd_service_get_device(service); struct scan *scan; scan = g_new0(struct scan, 1); @@ -239,22 +230,14 @@ static int scan_register(struct btd_device *device, struct gatt_primary *prim) attio_disconnected_cb, scan); - servers = g_slist_prepend(servers, scan); + btd_service_set_user_data(service, scan); return 0; } -static void scan_unregister(struct btd_device *device) +static void scan_param_remove(struct btd_service *service) { - struct scan *scan; - GSList *l; - - l = g_slist_find_custom(servers, device, scan_device_cmp); - if (l == NULL) - return; - - scan = l->data; - servers = g_slist_remove(servers, scan); + struct scan *scan = btd_service_get_user_data(service); if (scan->refresh_cb_id) { g_attrib_unregister(scan->attrib, scan->refresh_cb_id); @@ -278,14 +261,7 @@ static int scan_param_probe(struct btd_service *service) if (!prim) return -EINVAL; - return scan_register(device, prim); -} - -static void scan_param_remove(struct btd_service *service) -{ - struct btd_device *device = btd_service_get_device(service); - - scan_unregister(device); + return scan_register(service, prim); } static struct btd_profile scan_profile = { |