# \[PATCH 1/2\] proximity: Split profile driver into Monitor and Reporter - Subsystems: THE REST - Maintainers: Linus Torvalds - List: linux-bluetooth - 3 messages, 2 authors - Page: https://ratatoskr.run/linux-bluetooth/2012/09/9626521/t ## \[PATCH 1/2\] proximity: Split profile driver into Monitor and Reporter - From: Andrzej Kaczmarek \ - Date: 2012-09-19 14:27:18 - Message: https://ratatoskr.run/linux-bluetooth/2012/09/9626521.md ```text Proximity Monitor interface is registered for each GATT device since profile driver matches by GATT_UUID which is intended only for Reporter role. This patches splits Proximity profile driver into two separate drivers for Monitor and Reporter role to register interfaces properly. --- profiles/proximity/manager.c | 29 +++++++++++++++++++++-------- profiles/proximity/reporter.c | 2 +- profiles/proximity/reporter.h | 2 +- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c index 39c2bfe..df87cb0 100644 --- a/profiles/proximity/manager.c +++ b/profiles/proximity/manager.c @@ -61,8 +61,6 @@ static int attio_device_probe(struct btd_device *device, GSList *uuids) struct gatt_primary *linkloss, *txpower, *immediate; GSList *l, *primaries; - reporter_device_probe(device); - primaries = btd_device_get_primaries(device); l = g_slist_find_custom(primaries, IMMEDIATE_ALERT_UUID, @@ -81,15 +79,21 @@ static int attio_device_probe(struct btd_device *device, GSList *uuids) static void attio_device_remove(struct btd_device *device) { monitor_unregister(device); - reporter_device_remove(device); } -static struct btd_profile pxp_profile = { - .name = "Proximity GATT Driver", - .remote_uuids = BTD_UUIDS(GATT_UUID, IMMEDIATE_ALERT_UUID, +static struct btd_profile pxp_monitor_profile = { + .name = "Proximity Monitor GATT Driver", + .remote_uuids = BTD_UUIDS(IMMEDIATE_ALERT_UUID, LINK_LOSS_UUID, TX_POWER_UUID), .device_probe = attio_device_probe, .device_remove = attio_device_remove, +}; + +static struct btd_profile pxp_reporter_profile = { + .name = "Proximity Reporter GATT Driver", + .remote_uuids = BTD_UUIDS(GATT_UUID), + .device_probe = reporter_device_probe, + .device_remove = reporter_device_remove, .adapter_probe = reporter_adapter_probe, .adapter_remove = reporter_adapter_remove, @@ -121,10 +125,19 @@ int proximity_manager_init(GKeyFile *config) { load_config_file(config); - return btd_profile_register(&pxp_profile); + if (btd_profile_register(&pxp_monitor_profile) < 0) + return -1; + + if (btd_profile_register(&pxp_reporter_profile) < 0) { + btd_profile_unregister(&pxp_monitor_profile); + return -1; + } + + return 0; } void proximity_manager_exit(void) { - btd_profile_unregister(&pxp_profile); + btd_profile_unregister(&pxp_monitor_profile); + btd_profile_unregister(&pxp_reporter_profile); } diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c index 3843018..ae6af09 100644 --- a/profiles/proximity/reporter.c +++ b/profiles/proximity/reporter.c @@ -222,7 +222,7 @@ static void register_reporter_device(struct btd_device *device, radapter->devices = g_slist_prepend(radapter->devices, device); } -int reporter_device_probe(struct btd_device *device) +int reporter_device_probe(struct btd_device *device, GSList *uuids) { struct reporter_adapter *radapter; struct btd_adapter *adapter = device_get_adapter(device); diff --git a/profiles/proximity/reporter.h b/profiles/proximity/reporter.h index d038c0e..9b4b3a5 100644 --- a/profiles/proximity/reporter.h +++ b/profiles/proximity/reporter.h @@ -37,7 +37,7 @@ enum { }; void reporter_device_remove(struct btd_device *device); -int reporter_device_probe(struct btd_device *device); +int reporter_device_probe(struct btd_device *device, GSList *uuids); int reporter_adapter_probe(struct btd_adapter *adapter); void reporter_adapter_remove(struct btd_adapter *adapter); -- 1.7.11.3 ``` ## \[PATCH 2/2\] proximity: Change Monitor drivers function prefix to monitor\_ - From: Andrzej Kaczmarek \ - Date: 2012-09-19 14:27:19 - Message: https://ratatoskr.run/linux-bluetooth/2012/09/9626522.md ```text --- profiles/proximity/manager.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c index df87cb0..f458927 100644 --- a/profiles/proximity/manager.c +++ b/profiles/proximity/manager.c @@ -56,7 +56,7 @@ static gint primary_uuid_cmp(gconstpointer a, gconstpointer b) return g_strcmp0(prim->uuid, uuid); } -static int attio_device_probe(struct btd_device *device, GSList *uuids) +static int monitor_device_probe(struct btd_device *device, GSList *uuids) { struct gatt_primary *linkloss, *txpower, *immediate; GSList *l, *primaries; @@ -76,7 +76,7 @@ static int attio_device_probe(struct btd_device *device, GSList *uuids) return monitor_register(device, linkloss, txpower, immediate, &enabled); } -static void attio_device_remove(struct btd_device *device) +static void monitor_device_remove(struct btd_device *device) { monitor_unregister(device); } @@ -85,8 +85,8 @@ static struct btd_profile pxp_monitor_profile = { .name = "Proximity Monitor GATT Driver", .remote_uuids = BTD_UUIDS(IMMEDIATE_ALERT_UUID, LINK_LOSS_UUID, TX_POWER_UUID), - .device_probe = attio_device_probe, - .device_remove = attio_device_remove, + .device_probe = monitor_device_probe, + .device_remove = monitor_device_remove, }; static struct btd_profile pxp_reporter_profile = { -- 1.7.11.3 ``` ## Re: \[PATCH 1/2\] proximity: Split profile driver into Monitor and Reporter - From: Johan Hedberg \ - Date: 2012-09-28 09:47:57 - Message: https://ratatoskr.run/linux-bluetooth/2012/09/9626139.md ```text Hi Andrzej, On Wed, Sep 19, 2012, Andrzej Kaczmarek wrote: > Proximity Monitor interface is registered for each GATT device since profile > driver matches by GATT_UUID which is intended only for Reporter role. > > This patches splits Proximity profile driver into two separate drivers for > Monitor and Reporter role to register interfaces properly. > --- > profiles/proximity/manager.c | 29 +++++++++++++++++++++-------- > profiles/proximity/reporter.c | 2 +- > profiles/proximity/reporter.h | 2 +- > 3 files changed, 23 insertions(+), 10 deletions(-) Both of these patches have been applied after some rework to match the newer profile API. Johan ```