korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-16 00:34:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

emulator: Add inquiry cancel

Browse Source 
With this patch, scheduled inquiry session in btdev can be canceled
This commit is contained in:
Lukasz Rymanowski 2014-03-20 12:25:05 +01:00 committed by Johan Hedberg
parent f1f2ad6046
commit ce83fbee7c
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
emulator/btdev.c
View File

@ -791,10 +791,14 @@ static bool inquiry_callback(void *user_data)
static void inquiry_destroy(void *user_data)
{
struct inquiry_data *data = user_data;
struct btdev *btdev = data->btdev;
if (data->btdev)
data->btdev->inquiry_id = 0;
if (!btdev)
goto finish;
btdev->inquiry_id = 0;
finish:
free(data);
}
@ -828,6 +832,24 @@ failed:
send_event(btdev, BT_HCI_EVT_INQUIRY_COMPLETE, &ic, sizeof(ic));
}
static void inquiry_cancel(struct btdev *btdev)
{
uint8_t status = BT_HCI_ERR_COMMAND_DISALLOWED;
if (!btdev->inquiry_id) {
cmd_complete(btdev, BT_HCI_CMD_INQUIRY_CANCEL, &status,
sizeof(status));
return;
}
timeout_remove(btdev->inquiry_id);
btdev->inquiry_id = 0;
status = BT_HCI_ERR_SUCCESS;
cmd_complete(btdev, BT_HCI_CMD_INQUIRY_CANCEL, &status,
sizeof(status));
}
static void conn_complete(struct btdev *btdev,
const uint8_t *bdaddr, uint8_t status)
{
@ -1760,8 +1782,7 @@ static void default_cmd(struct btdev *btdev, uint16_t opcode,
case BT_HCI_CMD_INQUIRY_CANCEL:
if (btdev->type == BTDEV_TYPE_LE)
goto unsupported;
status = BT_HCI_ERR_SUCCESS;
cmd_complete(btdev, opcode, &status, sizeof(status));
inquiry_cancel(btdev);
break;
case BT_HCI_CMD_CREATE_CONN: