cyclingspeed: Add DBus.Properties for org.bluez.CyclingSpeed interface

diff --git a/profiles/cyclingspeed/cyclingspeed.c b/profiles/cyclingspeed/cyclingspeed.c
index a3e2d61..eace558 100644 (file)
--- a/profiles/cyclingspeed/cyclingspeed.c
+++ b/profiles/cyclingspeed/cyclingspeed.c
@@ -104,6 +104,21 @@ struct characteristic {
 
 static GSList *csc_adapters = NULL;
 
+static const char * const location_enum[] = {
+       "other", "top-of-shoe", "in-shoe", "hip", "front-wheel", "left-crank",
+       "right-crank", "left-pedal", "right-pedal", "front-hub",
+       "rear-dropout", "chainstay", "rear-wheel", "rear-hub"
+};
+
+static const gchar *location2str(uint8_t value)
+{
+       if (value < G_N_ELEMENTS(location_enum))
+               return location_enum[value];
+
+       info("Body Sensor Location [%d] is RFU", value);
+       return location_enum[0];
+}
+
 static gint cmp_adapter(gconstpointer a, gconstpointer b)
 {
        const struct csc_adapter *cadapter = a;
@@ -694,6 +709,72 @@ static void csc_adapter_remove(struct btd_profile *p,
                                        CYCLINGSPEED_MANAGER_INTERFACE);
 }
 
+static gboolean property_get_location(const GDBusPropertyTable *property,
+                                       DBusMessageIter *iter, void *data)
+{
+       struct csc *csc = data;
+       const char *loc;
+
+       if (!csc->has_location)
+               return FALSE;
+
+       loc = location2str(csc->location);
+
+       dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &loc);
+
+       return TRUE;
+}
+
+static gboolean property_exists_location(const GDBusPropertyTable *property,
+                                                               void *data)
+{
+       struct csc *csc = data;
+
+       return csc->has_location;
+}
+
+static gboolean property_exists_locations(const GDBusPropertyTable *property,
+                                                               void *data)
+{
+       struct csc *csc = data;
+
+       return !!(csc->feature & MULTI_SENSOR_LOC_SUPPORT);
+}
+
+static gboolean property_get_wheel_rev_sup(const GDBusPropertyTable *property,
+                                       DBusMessageIter *iter, void *data)
+{
+       struct csc *csc = data;
+       dbus_bool_t val;
+
+       val = !!(csc->feature & WHEEL_REV_SUPPORT);
+       dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &val);
+
+       return TRUE;
+}
+
+static gboolean property_get_multi_loc_sup(const GDBusPropertyTable *property,
+                                       DBusMessageIter *iter, void *data)
+{
+       struct csc *csc = data;
+       dbus_bool_t val;
+
+       val = !!(csc->feature & MULTI_SENSOR_LOC_SUPPORT);
+       dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &val);
+
+       return TRUE;
+}
+
+static const GDBusPropertyTable cyclingspeed_device_properties[] = {
+       { "Location", "s", property_get_location, NULL,
+                                               property_exists_location },
+       { "SupportedLocations", "as", NULL, NULL,
+                                               property_exists_locations },
+       { "WheelRevolutionDataSupported", "b", property_get_wheel_rev_sup },
+       { "MultipleLocationsSupported", "b", property_get_multi_loc_sup },
+       { }
+};
+
 static gint cmp_primary_uuid(gconstpointer a, gconstpointer b)
 {
        const struct gatt_primary *prim = a;
@@ -730,6 +811,18 @@ static int csc_device_probe(struct btd_profile *p,
        csc->dev = btd_device_ref(device);
        csc->cadapter = cadapter;
 
+       if (!g_dbus_register_interface(btd_get_dbus_connection(),
+                                               device_get_path(device),
+                                               CYCLINGSPEED_INTERFACE,
+                                               NULL, NULL,
+                                               cyclingspeed_device_properties,
+                                               csc, destroy_csc)) {
+               error("D-Bus failed to register %s interface",
+                                               CYCLINGSPEED_INTERFACE);
+               destroy_csc(csc);
+               return -EIO;
+       }
+
        csc->svc_range = g_new0(struct att_range, 1);
        csc->svc_range->start = prim->range.start;
        csc->svc_range->end = prim->range.end;
@@ -764,7 +857,8 @@ static void csc_device_remove(struct btd_profile *p,
 
        cadapter->devices = g_slist_remove(cadapter->devices, csc);
 
-       destroy_csc(csc);
+       g_dbus_unregister_interface(btd_get_dbus_connection(),
+                       device_get_path(device), CYCLINGSPEED_INTERFACE);
 }
 
 static struct btd_profile cscp_profile = {