return NULL;
}
+#if 0
static const char *__bt_transport_type_to_str(int type)
{
switch (type) {
return NULL;
}
+#endif
bt_status_t _bt_hal_dbus_handler_avrcp_ctrl_set_property(bt_bdaddr_t *bd_addr, uint8_t type, uint8_t value)
{
GDBusProxy *_bt_hal_get_profile_proxy(void);
GDBusProxy *_bt_hal_get_avrcp_ctrl_proxy(bt_bdaddr_t *bd_addr);
GDBusProxy *_bt_hal_get_avrcp_ctrl_properties_proxy(bt_bdaddr_t *bd_addr);
+ GDBusProxy *_bt_hal_get_avrcp_transport_properties_proxy(bt_bdaddr_t *bd_addr);
char *_bt_hal_get_adapter_path(void);
gboolean _bt_hal_is_adapter_powered(gboolean *powered);
break;
case BT_PROPERTY_SERVICE_RECORD:
rec = property->val;
- ret = snprintf(p, "{%s, %d, %s}", btuuid2str(rec->uuid.uu),
+ ret = snprintf(p, buf_len, "{%s, %d, %s}", btuuid2str(rec->uuid.uu),
rec->channel, rec->name);
if (0 > ret) {
ERR("snprintf failed with %d", ret);
return ret;
}
-void convert_str_2_hex(char out[], char in[])
+void convert_str_2_hex(unsigned char out[], char in[])
{
int i = 0;
for (i = 0; i < 62; i++) {
}
}
-void convert_hex_2_str(char * hex, int len, char * str_out)
+void convert_hex_2_str(unsigned char * hex, int len, char * str_out)
{
int i = 0;
int oal_is_address_zero(unsigned char *addr1);
void print_bt_properties(int num_properties, bt_property_t *properties);
-void convert_str_2_hex(char out[], char in[]);
-void convert_hex_2_str(char * hex, int len, char * str_out);
+void convert_str_2_hex(unsigned char out[], char in[]);
+void convert_hex_2_str(unsigned char *hex, int len, char *str_out);
char* convert_bt_property_2_str(const bt_property_t *property);
char* convert_property_type_2_str(bt_property_type_t prop_type);
char* convert_scan_mode_2_str(bt_scan_mode_t scan_mode);
/** send command to set delay, volume to target */
bt_status_t (*set_transport_setting_cmd) (bt_bdaddr_t *bd_addr, uint8_t num_attrib,
- uint8_t* attrib_ids, uint8_t* attrib_vals);
+ int* attrib_ids, uint32_t* attrib_vals);
/** send command to play a particular item */
bt_status_t (*play_item_cmd) (
static gboolean cur_adv_state[NUM_SERVER_INST];
static gatt_server_t gatt_servers[NUM_SERVER_INST];
-static int default_client_id = -1;
-static int pending_gattc_req = OAL_REQ_NONE;
-
/* Forward declarations of GATT Server callbacks */
static void cb_gatts_register_app(int status, int server_if, bt_uuid_t *uuid);
static void cb_gatts_multi_adv_enable(int server_if, int status);
adv_setup.server_if = gatt_servers[instance_id - 1].server_id;
if (adv_setup.manufacturer_data_len > 0 && adv_setup.manufacturer_data != NULL) {
BT_INFO("Manufacture data.....\n");
- PRINT_ADV_DATA(adv_setup.manufacturer_data_len, adv_setup.manufacturer_data, adv_setup.set_scan_rsp);
+ PRINT_ADV_DATA(adv_setup.manufacturer_data_len, (unsigned char *)adv_setup.manufacturer_data, adv_setup.set_scan_rsp);
}
if (adv_setup.service_uuid_len > 0 && adv_setup.service_uuid != NULL) {
BT_INFO("Service uuid.....\n");
- PRINT_ADV_DATA(adv_setup.service_uuid_len, adv_setup.service_uuid, FALSE);
+ PRINT_ADV_DATA(adv_setup.service_uuid_len, (unsigned char*)adv_setup.service_uuid, FALSE);
}
send_event(OAL_EVENT_GATTC_READ_DESCR, event, sizeof(*event));
}
-
-/* Register default gatt client to be used in LE scan etc. */
-static oal_status_t __register_default_gatt_client(void)
-{
- bt_uuid_t uuid;
- int ret;
-
- API_TRACE("GATT client register");
- CHECK_OAL_GATT_ENABLED();
-
- if (default_client_id >= 0) {
- BT_ERR("Client Already registered");
- return OAL_STATUS_ALREADY_DONE;
- }
-
- string_to_uuid(DEFAULT_GATT_CLIENT_UUID, (service_uuid_t *)&uuid);
- ret = gatt_api->client->register_client(&uuid);
- if (ret != BT_STATUS_SUCCESS) {
- BT_ERR("GATT client register failed: %s", status2string(ret));
- return convert_to_oal_status(ret);
- }
-
- return OAL_STATUS_SUCCESS;
-}
-
oal_status_t gattc_start_le_discovery(int client_id)
{
if (discoverable_mode == BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE) {
ret = _bt_stop_visibility_timer();
+ if (BLUETOOTH_ERROR_NONE != ret)
+ BT_ERR("_bt_stop_visibility_timer failed");
if (!TIZEN_PROFILE_WEARABLE) {
if (vconf_set_int(BT_FILE_VISIBLE_TIME, -1) != 0)
BT_ERR("Set vconf failed");
}
} else if (discoverable_mode == BLUETOOTH_DISCOVERABLE_MODE_TIME_LIMITED_DISCOVERABLE) {
ret = _bt_start_visibility_timer(timeout);
+ if (BLUETOOTH_ERROR_NONE != ret)
+ BT_ERR("_bt_start_visibility_timer failed");
} else {
ret = _bt_stop_visibility_timer();
+ if (BLUETOOTH_ERROR_NONE != ret)
+ BT_ERR("_bt_stop_visibility_timer failed");
}
BT_DBG("-");
if (vconf_set_int(VCONFKEY_BT_DEVICE, VCONFKEY_BT_DEVICE_NONE) != 0)
BT_ERR("Set vconf failed\n");
- _bt_cancel_queued_transfers();
_bt_adapter_set_status(BT_DEACTIVATED);
__bt_adapter_update_discovery_status(ADAPTER_DISCOVERY_STOPPED);
/* Disconnect if connected blacklist uuid is existing */
addr_list = g_array_new(FALSE, FALSE, sizeof(gchar));
- _bt_get_profile_connected_devices(uuid, &addr_list);
+ _bt_get_profile_connected_devices((char *)uuid, &addr_list);
for (i = 0; i < (addr_list->len / sizeof(bluetooth_device_address_t)); i++) {
char address[BT_ADDRESS_STRING_SIZE];
case DPM_POLICY_BLUETOOTH_SPP_PROFILE_STATE:
uuid = BT_SPP_UUID;
break;
+ default:
+ BT_ERR("Unknown profile %d", profile);
+ return BLUETOOTH_ERROR_INTERNAL;
}
addr_list = g_array_new(FALSE, FALSE, sizeof(gchar));
}
#ifdef TIZEN_GATT_CLIENT
-static void __bt_convert_byte_ordering(char *data, int data_len,
- char *converted_data)
-{
- int i, j;
- char temp[BLUETOOTH_UUID_HEX_MAX_LEN];
-
- memcpy(&temp, data, data_len);
- for (i = 0, j = data_len - 1; i < data_len; i++, j--)
- converted_data[i] = temp[j];
-}
-
/* GATT Client utility static functions */
static bt_gatt_service_info_list_t * __bt_get_service_info_list(int conn_id)
{
goto fail;
if (info->name == NULL) {
- info->name = sender;
+ info->name = (char *)sender;
} else {
if (g_strcmp0(sender, info->name) != 0)
goto fail;