Return-Path: From: alokbarsode@gmail.com To: linux-bluetooth@vger.kernel.org Cc: marcel@holtmann.org, Alok Barsode Subject: [PATCH 1/2] Adding start_discovery functionality to hciops plugin. Date: Fri, 22 May 2009 16:54:12 +0530 Message-Id: <1242991453-17427-1-git-send-email-alok.barsode@azingo.com> List-ID: From: Alok Barsode --- plugins/hciops.c | 56 ++++++++++++++++++++++++++ src/adapter.c | 115 +++-------------------------------------------------- src/adapter.h | 1 + 3 files changed, 64 insertions(+), 108 deletions(-) diff --git a/plugins/hciops.c b/plugins/hciops.c index 8f9ee06..c4c084e 100644 --- a/plugins/hciops.c +++ b/plugins/hciops.c @@ -561,6 +561,61 @@ done: return err; } +static int hciops_start_discovery(int index) +{ + struct btd_adapter *adapter; + inquiry_cp inq_cp; + periodic_inquiry_cp cp; + uint8_t lap[3] = { 0x33, 0x8b, 0x9e }; + int dd, err = 0; + + dd = hci_open_dev(index); + if (dd < 0) + return dd; + + if (main_opts.discov_interval) + goto standard; + + memset(&cp, 0, sizeof(cp)); + memcpy(&cp.lap, lap, 3); + cp.max_period = htobs(24); + cp.min_period = htobs(16); + cp.length = 0x08; + cp.num_rsp = 0x00; + + err = hci_send_cmd(dd, OGF_LINK_CTL, OCF_PERIODIC_INQUIRY, + PERIODIC_INQUIRY_CP_SIZE, &cp); + + goto done; + +standard: + + adapter = manager_find_adapter_by_id(index); + if (!adapter) { + error("Unable to find matching adapter"); + hci_close_dev(dd); + return -EINVAL; + } + + pending_remote_name_cancel(adapter); + + memset(&inq_cp, 0, sizeof(inq_cp)); + memcpy(&inq_cp.lap, lap, 3); + inq_cp.length = 0x08; + inq_cp.num_rsp = 0x00; + + err = hci_send_cmd(dd, OGF_LINK_CTL, OCF_INQUIRY, + INQUIRY_CP_SIZE, &inq_cp); + +done: + if (err < 0) + err = -errno; + + hci_close_dev(dd); + + return err; +} + static struct btd_adapter_ops hci_ops = { .setup = hciops_setup, .cleanup = hciops_cleanup, @@ -570,6 +625,7 @@ static struct btd_adapter_ops hci_ops = { .set_connectable = hciops_connectable, .set_discoverable = hciops_discoverable, .set_limited_discoverable = hciops_set_limited_discoverable, + .start_discovery = hciops_start_discovery, }; static int hciops_init(void) diff --git a/src/adapter.c b/src/adapter.c index 25ec33a..1a9dd76 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -945,108 +945,6 @@ struct btd_device *adapter_get_device(DBusConnection *conn, return adapter_create_device(conn, adapter, address); } -static int start_inquiry(struct btd_adapter *adapter) -{ - inquiry_cp cp; - evt_cmd_status rp; - struct hci_request rq; - uint8_t lap[3] = { 0x33, 0x8b, 0x9e }; - int dd, err; - - pending_remote_name_cancel(adapter); - - dd = hci_open_dev(adapter->dev_id); - if (dd < 0) - return dd; - - memset(&cp, 0, sizeof(cp)); - memcpy(&cp.lap, lap, 3); - cp.length = 0x08; - cp.num_rsp = 0x00; - - memset(&rq, 0, sizeof(rq)); - rq.ogf = OGF_LINK_CTL; - rq.ocf = OCF_INQUIRY; - rq.cparam = &cp; - rq.clen = INQUIRY_CP_SIZE; - rq.rparam = &rp; - rq.rlen = EVT_CMD_STATUS_SIZE; - rq.event = EVT_CMD_STATUS; - - if (hci_send_req(dd, &rq, HCI_REQ_TIMEOUT) < 0) { - err = -errno; - error("Unable to start inquiry: %s (%d)", - strerror(errno), errno); - hci_close_dev(dd); - return err; - } - - if (rp.status) { - error("HCI_Inquiry command failed with status 0x%02x", - rp.status); - hci_close_dev(dd); - return -bt_error(rp.status); - } - - hci_close_dev(dd); - - if (main_opts.name_resolv) - adapter->state |= RESOLVE_NAME; - - return 0; -} - -static int start_periodic_inquiry(struct btd_adapter *adapter) -{ - periodic_inquiry_cp cp; - struct hci_request rq; - uint8_t lap[3] = { 0x33, 0x8b, 0x9e }; - uint8_t status; - int dd, err; - - dd = hci_open_dev(adapter->dev_id); - if (dd < 0) - return dd; - - memset(&cp, 0, sizeof(cp)); - memcpy(&cp.lap, lap, 3); - cp.max_period = htobs(24); - cp.min_period = htobs(16); - cp.length = 0x08; - cp.num_rsp = 0x00; - - memset(&rq, 0, sizeof(rq)); - rq.ogf = OGF_LINK_CTL; - rq.ocf = OCF_PERIODIC_INQUIRY; - rq.cparam = &cp; - rq.clen = PERIODIC_INQUIRY_CP_SIZE; - rq.rparam = &status; - rq.rlen = sizeof(status); - rq.event = EVT_CMD_COMPLETE; - - if (hci_send_req(dd, &rq, HCI_REQ_TIMEOUT) < 0) { - err = -errno; - error("Unable to start periodic inquiry: %s (%d)", - strerror(errno), errno); - hci_close_dev(dd); - return err; - } - - if (status) { - error("HCI_Periodic_Inquiry_Mode failed with status 0x%02x", - status); - hci_close_dev(dd); - return -bt_error(status); - } - - hci_close_dev(dd); - - if (main_opts.name_resolv) - adapter->state |= RESOLVE_NAME; - - return 0; -} - static DBusMessage *adapter_start_discovery(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -1067,10 +965,10 @@ static DBusMessage *adapter_start_discovery(DBusConnection *conn, if (adapter->disc_sessions) goto done; - if (main_opts.discov_interval) - err = start_inquiry(adapter); - else - err = start_periodic_inquiry(adapter); + if (main_opts.name_resolv) + adapter->state |= RESOLVE_NAME; + + err = adapter_ops->start_discovery(adapter->dev_id); if (err < 0) return failed_strerror(msg, -err); @@ -2432,6 +2330,7 @@ void adapter_set_state(struct btd_adapter *adapter, int state) { gboolean discov_active = FALSE; const char *path = adapter->path; + int index = adapter->dev_id; if (adapter->state == state) return; @@ -2441,8 +2340,8 @@ void adapter_set_state(struct btd_adapter *adapter, int state) else if (adapter->disc_sessions && main_opts.discov_interval) adapter->scheduler_id = g_timeout_add_seconds( main_opts.discov_interval, - (GSourceFunc) start_inquiry, - adapter); + (GSourceFunc) adapter_ops->start_discovery, + (gpointer) index); /* Send out of range */ if (!discov_active) diff --git a/src/adapter.h b/src/adapter.h index a94edc6..516b4ac 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -157,6 +157,7 @@ struct btd_adapter_ops { int (*set_discoverable) (int index); int (*set_limited_discoverable) (int index, const uint8_t *cls, gboolean limited); + int (*start_discovery) (int index); }; int btd_register_adapter_ops(struct btd_adapter_ops *btd_adapter_ops); -- 1.5.6.3