#include "bt-hal-agent.h"
#include "bt-hal-adapter-le.h"
#include "bt-hal-gatt-server.h"
+#include "bt-hal-gatt-client.h"
#define BASELEN_PROP_CHANGED (sizeof(struct hal_ev_adapter_props_changed) \
+ sizeof(struct hal_property))
static void __bt_hal_dbus_device_found_properties(const char *device_path);
static void __bt_hal_device_properties_lookup(GVariant *result, char *address);
static void __bt_hal_handle_device_specific_events(GVariant *msg, const char *member, const char *path);
-static void __bt_hal_send_device_acl_connection_state_event(gboolean connected, const char *address);
+static void __bt_hal_send_device_acl_connection_state_event(int status, gboolean connected, const char *address);
static void __bt_hal_handle_input_event(GVariant *msg, const char *path);
static void __bt_hal_send_av_connection_state_event(gboolean connected, const char *address);
static void __bt_hal_send_a2dp_sink_connection_state_event(gboolean connected, const char *address);
unsigned int scan_mode = BT_SCAN_MODE_NONE;
unsigned int disc_timeout;
const gchar *version;
- const gboolean ipsp_initialized;
+ gboolean ipsp_initialized;
gboolean powered;
gboolean pairable;
unsigned int pairable_timeout;
char *val = NULL;
GVariantIter *iter = NULL;
g_variant_get(value, "as", &iter);
+ bt_local_le_features_t le_features;
+ gboolean le_features_present = FALSE;
if (iter == NULL)
continue;
+ memset(&le_features, 0x00, sizeof(le_features));
+
while (g_variant_iter_next(iter, "&s", &name) &&
- g_variant_iter_next(iter, "&s", &val)) {
+ g_variant_iter_next(iter, "&s", &val)) {
DBG("name = %s, Value = %s", name, val);
- if (FALSE == _bt_hal_update_le_feature_support(name, val))
+ if (FALSE == _bt_hal_update_le_feature_support(name, val, &le_features))
ERR("Failed to update LE feature (name = %s, value = %s)", name, val);
+ else
+ le_features_present = TRUE;
}
g_variant_iter_free(iter);
+ if (le_features_present) {
+ size += __bt_insert_hal_properties(buf + size,
+ HAL_PROP_ADAPTER_LOCAL_LE_FEAT, sizeof(le_features), &le_features);
+ ev->num_props++;
+ } else {
+ DBG("le supported features values are NOT provided by Stack");
+ }
} else if (!g_strcmp0(key, "IpspInitStateChanged")) {
g_variant_get(value, "b" , &ipsp_initialized);
DBG("##IPSP Initialized = %d", ipsp_initialized);
if (size > 2) {
- DBG("Send Adapter properties changed event to HAL user, Num Prop [%d] total size [%d]", ev->num_props, size);
+ DBG("Send Adapter properties changed event to HAL user, Num Prop [%d] total size [%zd]", ev->num_props, size);
event_cb(HAL_EV_ADAPTER_PROPS_CHANGED, buf, size);
}
- g_variant_unref(value);
+
DBG("-");
}
g_variant_get(msg, "(siii)", &address, &link_type, &alert_type, &rssi_dbm);
DBG("RSSI Alert: [Address %s LinkType %d] [Type %d DBM %d]",
- address, alert_type, rssi_dbm);
+ address, alert_type, rssi_dbm, link_type);
_bt_hal_convert_addr_string_to_type(ev.bdaddr, address);
ev.link_type = link_type;
ev->num_props++;
DBG("Device address [%s] property Num [%d]", address, ev->num_props);
-
+ g_free(address);
} else if (strcasecmp(key, "Class") == 0) {
unsigned int class = g_variant_get_uint32(val);
size += __bt_insert_hal_properties(buf + size, HAL_PROP_DEVICE_CLASS,
ev->num_props++;
DBG("Device Name [%s] Property num [%d]", name, ev->num_props);
}
+ g_free(name);
} else if (strcasecmp(key, "Connected") == 0) {
- unsigned int connected = g_variant_get_uint32(val);
+ unsigned int connected = g_variant_get_byte(val);
size += __bt_insert_hal_properties(buf + size, HAL_PROP_DEVICE_CONNECTED,
sizeof(unsigned int), &connected);
gsize size1 = 0;
int i = 0;
size1 = g_variant_get_size(val);
- DBG("UUID count from size [%d]\n", size1);
+ DBG("UUID count from size [%zu]\n", size1);
int num_props_tmp = ev->num_props;
if (size1 > 0) {
g_free(uuid_value);
}
- } else if (strcasecmp(key, "ManufacturerDataLen") == 0) {
+ } else if (strcasecmp(key, "LegacyManufacturerDataLen") == 0) {
/* TODO: To be handled later*/
- } else if (strcasecmp(key, "ManufacturerData") == 0) {
+ } else if (strcasecmp(key, "LegacyManufacturerData") == 0) {
/* TODO: To be handled later*/
} else {
ERR("Unhandled Property:[%s]", key);
DBG("-");
if (size > 1) {
- DBG("Send Device found event to HAL user, Num Prop [%d] total size [%d]", ev->num_props, size);
+ DBG("Send Device found event to HAL user, Num Prop [%d] total size [%zd]", ev->num_props, size);
event_cb(HAL_EV_DEVICE_FOUND, (void*) buf, size);
}
g_variant_get(msg, "(&s@a{sv}@as)", &interface_name, &val, NULL);
+ if (!interface_name) {
+ DBG("Failed to get interface name");
+
+ if (val)
+ g_variant_unref(val);
+ return;
+ }
+
if (strcasecmp(interface_name, BT_HAL_ADAPTER_INTERFACE) == 0) {
DBG("Event: Property Changed: Interface: BT_HAL_ADAPTER_INTERFACE");
__bt_hal_adapter_property_changed_event(val);
return FALSE;
}
+void __bt_hal_handle_gatt_char_event(GVariant *parameters, const char *signal_name)
+{
+ DBG("+");
+
+ if (signal_name == NULL)
+ return;
+
+ if (strcasecmp(signal_name, "GattValueChanged") == 0) {
+ DBG("GattValueChanged event received");
+
+ int result = 0;
+ const char *char_handle = NULL;
+ GVariant *char_value_var = NULL;
+ int len = 0;
+ char *char_value = NULL;
+
+ g_variant_get(parameters, "(i&s@ay)", &result, &char_handle, &char_value_var);
+ DBG("char handle: %s", char_handle);
+
+ len = g_variant_get_size(char_value_var);
+ if (len > 0)
+ char_value = (char *)g_variant_get_data(char_value_var);
+
+ _bt_hal_handle_gattc_value_changed_event(result, char_handle, char_value, len);
+
+ g_variant_unref(char_value_var);
+ }
+}
+
+
static gboolean __bt_hal_event_manager(gpointer data)
{
bt_hal_event_type_t bt_event = 0x00;
} else if (g_strcmp0(param->interface_name, BT_HAL_MEDIATRANSPORT_INTERFACE) == 0) {
DBG("Manager Event: Interface Name: BT_HAL_MEDIATRANSPORT_INTERFACE");
__bt_hal_handle_avrcp_transport_events(param->parameters, param->signal_name, param->object_path);
+ } else if (g_strcmp0(param->interface_name, BT_HAL_GATT_CHAR_INTERFACE) == 0) {
+ DBG("Manager Event: Interface Name: BT_HAL_GATT_CHAR_INTERFACE");
+ __bt_hal_handle_gatt_char_event(param->parameters, param->signal_name);
}
return 0;
}
+static int __bt_hal_register_gatt_subscribe_signal(GDBusConnection *conn,
+ int subscribe)
+{
+ static int subs_gatt_id = -1;
+
+ DBG("+");
+
+ if (subscribe) {
+ if (subs_gatt_id == -1) {
+ subs_gatt_id = g_dbus_connection_signal_subscribe(conn,
+ NULL, BT_HAL_GATT_CHAR_INTERFACE,
+ NULL, NULL, NULL, 0,
+ __bt_hal_manager_event_filter,
+ NULL, NULL);
+ }
+ } else {
+ if (subs_gatt_id == -1) {
+ g_dbus_connection_signal_unsubscribe(conn,
+ subs_gatt_id);
+ subs_gatt_id = -1;
+ }
+ }
+
+ return BT_HAL_ERROR_NONE;
+}
+
+
+
static int __bt_hal_register_service_event(GDBusConnection *g_conn, int event_type)
{
DBG("+");
case BT_HAL_HEADSET_EVENT:
__bt_hal_register_audio_subscribe_signal(g_conn, TRUE);
break;
+ case BT_HAL_GATT_EVENT:
+ __bt_hal_register_gatt_subscribe_signal(g_conn, TRUE);
+ break;
default:
INFO_C("Register Event: event_type [%d]", event_type);
return BT_HAL_ERROR_NOT_SUPPORT;
if (__bt_hal_register_service_event(manager_conn,
BT_HAL_HEADSET_EVENT) != BT_HAL_ERROR_NONE)
goto fail;
+ if (__bt_hal_register_service_event(manager_conn,
+ BT_HAL_GATT_EVENT) != BT_HAL_ERROR_NONE)
+ goto fail;
return BT_HAL_ERROR_NONE;
fail:
if (manager_conn) {
DBG("@@gatt_connected: %d", gatt_connected);
DBG("@@address: %s", address);
_bt_hal_gatt_connected_state_event(gatt_connected, address);
+ _bt_hal_handle_gattc_connected_event(address, gatt_connected);
g_free(address);
} else if (!g_strcmp0(key, "Paired")) {
gboolean paired = FALSE;
size += __bt_insert_hal_properties(buf + size, HAL_PROP_DEVICE_CLASS,
sizeof(unsigned int), &class);
ev->num_props++;
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* Connected */
sizeof(unsigned int), &connected);
ev->num_props++;
DBG("Device connected [%u] Property num [%d]", connected, ev->num_props);
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* Trust */
tmp_value = g_variant_lookup_value(value, "Trusted", G_VARIANT_TYPE_BOOLEAN);
sizeof(uint8_t), &trust);
ev->num_props++;
DBG("Device trusted [%d] Property num [%d]", trust, ev->num_props);
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* Paired */
tmp_value = g_variant_lookup_value(value, "Paired", G_VARIANT_TYPE_BOOLEAN);
sizeof(uint8_t), &paired);
ev->num_props++;
DBG("Device Paired [%d] Property num [%d]", paired, ev->num_props);
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* RSSI*/
tmp_value = g_variant_lookup_value(value, "RSSI", G_VARIANT_TYPE_INT32);
sizeof(int), &rssi);
ev->num_props++;
DBG("Device RSSI [%d] Property num [%d]", rssi, ev->num_props);
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* Last Addr Type */
tmp_value = g_variant_lookup_value(value, "LastAddrType", G_VARIANT_TYPE_UINT32);
unsigned int addr_type = tmp_value ? g_variant_get_uint32(tmp_value) : 0;
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
DBG("Device Last Address Type [0x%x]", addr_type);
/* Is Alias Set */
sizeof(uint8_t), &is_alias_set);
ev->num_props++;
DBG("IsAliasSet: [%s], Property num [%d]", (is_alias_set ? "TRUE" : "FALSE"), ev->num_props);
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* UUID's */
tmp_value = g_variant_lookup_value(value, "UUIDs", G_VARIANT_TYPE_STRING_ARRAY);
}
g_variant_unref(tmp_value);
- /* ManufacturerDataLen */
- tmp_value = g_variant_lookup_value(value, "ManufacturerDataLen", G_VARIANT_TYPE_UINT32);
+ /* LegacyManufacturerDataLen */
+ tmp_value = g_variant_lookup_value(value, "LegacyManufacturerDataLen", G_VARIANT_TYPE_UINT32);
unsigned int manufacturer_data_len = tmp_value ? g_variant_get_uint32(tmp_value) : 0;
if (manufacturer_data_len > BT_HAL_MANUFACTURER_DATA_LENGTH_MAX) {
ERR("manufacturer_data_len is too long(len = %d)", manufacturer_data_len);
manufacturer_data_len = BT_HAL_MANUFACTURER_DATA_LENGTH_MAX;
}
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/*size += __bt_insert_hal_properties(buf + size, HAL_PROP_DEVICE_MANUFACTURER_DATA_LEN,
sizeof(unsigned int), &manufacturer_data_len);
ev->num_props++;*/
- DBG("Device Manufacturer data length [%u]", manufacturer_data_len);
+ DBG("Device Legacy Manufacturer data length [%u]", manufacturer_data_len);
/* ManufacturerData */
- tmp_value = g_variant_lookup_value(value, "ManufacturerData", G_VARIANT_TYPE_BYTESTRING);
+ tmp_value = g_variant_lookup_value(value, "LegacyManufacturerData", G_VARIANT_TYPE_BYTESTRING);
manufacturer_data = value ? (gchar *)g_variant_get_bytestring(tmp_value) : NULL;
if (manufacturer_data) {
if (manufacturer_data_len > 0) {
ev->num_props++;
}
}
- g_variant_unref(tmp_value);
+ if (tmp_value)
+ g_variant_unref(tmp_value);
/* Address */
uint8_t bdaddr[6];
ERR("result is NULL\n");
}
if (size > 1) {
- DBG("Send Device found event to HAL user, Num Prop [%d] total size [%d]", ev->num_props, size);
+ DBG("Send Device found event to HAL user, Num Prop [%d] total size [%zd]", ev->num_props, size);
event_cb(HAL_EV_DEVICE_FOUND, (void*) buf, size);
}
DBG("-");
}
-static void __bt_hal_send_device_acl_connection_state_event(gboolean connected, const char *address)
+static void __bt_hal_send_device_acl_connection_state_event(int status, gboolean connected, const char *address)
{
DBG("+");
struct hal_ev_acl_state_changed ev;
- ev.status = BT_STATUS_SUCCESS;
+ ev.status = status;
ev.state = (connected == TRUE) ?
HAL_ACL_STATE_CONNECTED :
HAL_ACL_STATE_DISCONNECTED;
DBG("-");
}
-static void __bt_hal_send_device_le_connection_state_event(gboolean connected, const char *address)
+static void __bt_hal_send_device_le_connection_state_event(int status, gboolean connected, const char *address)
{
DBG("+");
struct hal_ev_le_conn_state_changed ev;
- ev.status = BT_STATUS_SUCCESS;
+ ev.status = status;
ev.state = (connected == TRUE) ?
HAL_LE_STATE_CONNECTED :
HAL_LE_STATE_DISCONNECTED;
DBG("Member: [%s]", member);
ERR_C("Connected [%s] [%s]", !addr_type ? "BREDR" : "LE", address);
if (!addr_type)
- __bt_hal_send_device_acl_connection_state_event(TRUE, address);
+ __bt_hal_send_device_acl_connection_state_event(BT_STATUS_SUCCESS, TRUE, address);
else
- __bt_hal_send_device_le_connection_state_event(TRUE, address);
+ __bt_hal_send_device_le_connection_state_event(BT_STATUS_SUCCESS, TRUE, address);
g_free(address);
} else if (strcasecmp(member, "Disconnected") == 0) {
unsigned char disc_reason = 0;
_bt_hal_convert_device_path_to_address(path, address);
DBG("Member: [%s]", member);
+
ERR_C("DisConnected [%s] [%s]", !addr_type ? "BREDR" : "LE", address);
- DBG("Disconnect Reason: %d", disc_reason);
+ DBG("Disconnected Reason [%d : %s]", disc_reason, _bt_hal_convert_disc_reason_to_string(disc_reason));
DBG("Name: %s", name);
if (!addr_type)
- __bt_hal_send_device_acl_connection_state_event(FALSE, address);
+ __bt_hal_send_device_acl_connection_state_event(_bt_hal_convert_disc_reason_to_status(disc_reason), FALSE, address);
else
- __bt_hal_send_device_le_connection_state_event(FALSE, address);
+ __bt_hal_send_device_le_connection_state_event(_bt_hal_convert_disc_reason_to_status(disc_reason), FALSE, address);
g_free(address);
} else if (strcasecmp(member, "ProfileStateChanged") == 0) {
int state = 0;
memcpy(ev->adv_data, buffer, data_len);
size += data_len;
- DBG("Send le scan result event to HAL, size: [%d]", size);
+ DBG("Send le scan result event to HAL, size: [%zd]", size);
gatt_event_cb(HAL_EV_GATT_CLIENT_SCAN_RESULT, buf, size);
g_variant_unref(value);
}
long int val;
val = g_variant_get_uint32(value);
- DBG("Value : %d", val);
+ DBG("Value : %li", val);
ev->attr[i].attr_id = HAL_MEDIA_ATTR_ID_PLAYING_TIME;
snprintf((char*)ev->attr[i].text, HAL_MAX_ATTR_STR_LEN, "%ld", val);
i++;
long int val;
val = g_variant_get_uint32(value);
- DBG("Value : %d", val);
+ DBG("Value : %li", val);
ev->attr[i].attr_id = HAL_MEDIA_ATTR_ID_NUM_TRACKS;
snprintf((char*)ev->attr[i].text, HAL_MAX_ATTR_STR_LEN, "%ld", val);
i++;
long int val;
val = g_variant_get_uint32(value);
- DBG("Value : %d", val);
+ DBG("Value : %li", val);
ev->attr[i].attr_id = HAL_MEDIA_ATTR_ID_TRACK_NUM;
snprintf((char*)ev->attr[i].text, HAL_MAX_ATTR_STR_LEN, "%ld", val);
i++;
projects / platform / core / connectivity / bluetooth-frwk.git / blobdiff