korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2025-01-27 14:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove inquiry and scanning callbacks from btd_adapter_ops

Browse Source 
The discovery procedure is implemented in discovery callbacks
(start_discovery and stop_discovery). We don't need inquiry and
scanning specifics callbacks in btd_adapter_ops anymore.
This commit is contained in:
Andre Guedes 2011-04-29 21:27:31 -03:00 committed by Johan Hedberg
parent 6613e8695b
commit ef7435b9c1
3 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/hciops.c
View File

@ -3812,10 +3812,6 @@ static struct btd_adapter_ops hci_ops = {
.set_limited_discoverable = hciops_set_limited_discoverable,
.start_discovery = hciops_start_discovery,
.stop_discovery = hciops_stop_discovery,
.start_inquiry = hciops_start_inquiry,
.stop_inquiry = hciops_stop_inquiry,
.start_scanning = hciops_start_scanning,
.stop_scanning = hciops_stop_scanning,
.resolve_name = hciops_resolve_name,
.cancel_resolve_name = hciops_cancel_resolve_name,
.set_name = hciops_set_name,

48
plugins/mgmtops.c
View File

@ -1617,50 +1617,6 @@ static int mgmt_stop_discovery(int index)
return 0;
}
static int mgmt_start_inquiry(int index, uint8_t length, gboolean periodic)
{
struct mgmt_hdr hdr;
DBG("index %d length %u periodic %d", index, length, periodic);
memset(&hdr, 0, sizeof(hdr));
hdr.opcode = htobs(MGMT_OP_START_DISCOVERY);
hdr.index = htobs(index);
if (write(mgmt_sock, &hdr, sizeof(hdr)) < 0)
return -errno;
return 0;
}
static int mgmt_stop_inquiry(int index)
{
struct mgmt_hdr hdr;
DBG("index %d", index);
memset(&hdr, 0, sizeof(hdr));
hdr.opcode = htobs(MGMT_OP_STOP_DISCOVERY);
hdr.index = htobs(index);
if (write(mgmt_sock, &hdr, sizeof(hdr)) < 0)
return -errno;
return 0;
}
static int mgmt_start_scanning(int index, int timeout)
{
DBG("index %d", index);
return -ENOSYS;
}
static int mgmt_stop_scanning(int index)
{
DBG("index %d", index);
return -ENOSYS;
}
static int mgmt_resolve_name(int index, bdaddr_t *bdaddr)
{
char addr[18];
@ -2057,10 +2013,6 @@ static struct btd_adapter_ops mgmt_ops = {
.set_limited_discoverable = mgmt_set_limited_discoverable,
.start_discovery = mgmt_start_discovery,
.stop_discovery = mgmt_stop_discovery,
.start_inquiry = mgmt_start_inquiry,
.stop_inquiry = mgmt_stop_inquiry,
.start_scanning = mgmt_start_scanning,
.stop_scanning = mgmt_stop_scanning,
.resolve_name = mgmt_resolve_name,
.cancel_resolve_name = mgmt_cancel_resolve_name,
.set_name = mgmt_set_name,

4
src/adapter.h
View File

@ -187,10 +187,6 @@ struct btd_adapter_ops {
int (*set_limited_discoverable) (int index, gboolean limited);
int (*start_discovery) (int index);
int (*stop_discovery) (int index);
int (*start_inquiry) (int index, uint8_t length, gboolean periodic);
int (*stop_inquiry) (int index);
int (*start_scanning) (int index, int timeout);
int (*stop_scanning) (int index);
int (*resolve_name) (int index, bdaddr_t *bdaddr);
int (*cancel_resolve_name) (int index, bdaddr_t *bdaddr);