2009-05-06 08:37:56

by alok barsode

Subject: [PATCH 1/2] Code cleanup in adapter.c.

From: Alok Barsode <[email protected]>

Not passing device descriptor to adater_up.
---
src/adapter.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index d9914e2..99dd2eb 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1999,11 +1999,12 @@ static int get_pairable_timeout(const char *src)
return main_opts.pairto;
}

-static int adapter_up(struct btd_adapter *adapter, int dd)
+static int adapter_up(struct btd_adapter *adapter)
{
char mode[14], srcaddr[18];
uint8_t scan_mode;
gboolean powered, dev_down = FALSE;
+ int dd;

ba2str(&adapter->bdaddr, srcaddr);

@@ -2046,7 +2047,7 @@ static int adapter_up(struct btd_adapter *adapter, int dd)
else
write_device_mode(&adapter->bdaddr, mode);

- return adapter_up(adapter, dd);
+ return adapter_up(adapter);
} else if (!g_str_equal(mode, "connectable") &&
adapter->discov_timeout == 0) {
/* Set discoverable only if timeout is 0 */
@@ -2056,6 +2057,11 @@ static int adapter_up(struct btd_adapter *adapter, int dd)
}

proceed:
+ dd = hci_open_dev(adapter->dev_id);
+
+ if (dd < 0)
+ return -EIO;
+
if (dev_down == FALSE)
hci_send_cmd(dd, OGF_HOST_CTL, OCF_WRITE_SCAN_ENABLE,
1, &scan_mode);
@@ -2084,6 +2090,8 @@ proceed:
ADAPTER_INTERFACE, "Powered",
DBUS_TYPE_BOOLEAN, &powered);

+ hci_close_dev(dd);
+
return 0;
}

@@ -2197,10 +2205,10 @@ setup:
adapter->state &= ~STD_INQUIRY;

adapter_setup(adapter, dd);
- err = adapter_up(adapter, dd);
-
hci_close_dev(dd);

+ err = adapter_up(adapter);
+
info("Adapter %s has been enabled", adapter->path);

return err;
--
1.5.6.3

2009-05-06 09:42:22

by Johan Hedberg

Subject: Re: [PATCH 2/2] Adding stop() functionality to hciops plugin.

Hi Alok,

On Wed, May 06, 2009, [email protected] wrote:
> From: Alok Barsode <[email protected]>
>
> ---
> plugins/hciops.c | 24 ++++++++++++++++++++++++
> src/adapter.c | 23 ++++++++++-------------
> src/adapter.h | 1 +
> 3 files changed, 35 insertions(+), 13 deletions(-)

Both patches are now pushed upstream. There was one compilation issue
which I had to fix though:
adapter.c: In function adapter_remove:
adapter.c:2477: error: label done defined but not used

Johan

2009-05-06 08:37:57

by alok barsode

Subject: [PATCH 2/2] Adding stop() functionality to hciops plugin.

From: Alok Barsode <[email protected]>

---
plugins/hciops.c | 24 ++++++++++++++++++++++++
src/adapter.c | 23 ++++++++++-------------
src/adapter.h | 1 +
3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/plugins/hciops.c b/plugins/hciops.c
index ba4b69d..2e91129 100644
--- a/plugins/hciops.c
+++ b/plugins/hciops.c
@@ -439,10 +439,34 @@ done:
return err;
}

+static int hciops_stop(int index)
+{
+ int dd;
+ int err = 0;
+
+ dd = hci_open_dev(index);
+ if (dd < 0)
+ return -EIO;
+
+ if (ioctl(dd, HCIDEVDOWN, index) == 0)
+ goto done; /* on success */
+
+ if (errno != EALREADY) {
+ err = -errno;
+ error("Can't stop device hci%d: %s (%d)",
+ index, strerror(errno), errno);
+ }
+
+done:
+ hci_close_dev(dd);
+ return err;
+}
+
static struct btd_adapter_ops hci_ops = {
.setup = hciops_setup,
.cleanup = hciops_cleanup,
.start = hciops_start,
+ .stop = hciops_stop,
};

static int hciops_init(void)
diff --git a/src/adapter.c b/src/adapter.c
index 99dd2eb..eecca34 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -424,18 +424,21 @@ static int set_mode(struct btd_adapter *adapter, uint8_t new_mode)
};

hci_send_req(dd, &rq, HCI_REQ_TIMEOUT);
+ hci_close_dev(dd);

- if (ioctl(dd, HCIDEVDOWN, adapter->dev_id) < 0) {
- err = -errno;
- hci_close_dev(dd);
+ err = adapter_ops->stop(adapter->dev_id);
+ if (err < 0)
return err;
- }

adapter->off_requested = TRUE;

goto done;
}

+ dd = hci_open_dev(adapter->dev_id);
+ if (dd < 0)
+ return -EIO;
+
if (current_scan != scan_enable) {
err = hci_send_cmd(dd, OGF_HOST_CTL, OCF_WRITE_SCAN_ENABLE,
1, &scan_enable);
@@ -2082,7 +2085,7 @@ proceed:
}

if (dev_down) {
- ioctl(dd, HCIDEVDOWN, adapter->dev_id);
+ adapter_ops->stop(adapter->dev_id);
adapter->off_requested = TRUE;
return 1;
} else
@@ -2465,14 +2468,8 @@ void adapter_remove(struct btd_adapter *adapter)
unload_drivers(adapter);

/* Return adapter to down state if it was not up on init */
- if (adapter->up && !adapter->already_up) {
- int dd = hci_open_dev(adapter->dev_id);
- if (dd < 0)
- goto done;
-
- ioctl(dd, HCIDEVDOWN, adapter->dev_id);
- hci_close_dev(dd);
- }
+ if (adapter->up && !adapter->already_up)
+ adapter_ops->stop(adapter->dev_id);

done:
g_dbus_unregister_interface(connection, path, ADAPTER_INTERFACE);
diff --git a/src/adapter.h b/src/adapter.h
index 67db648..acf680b 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -153,6 +153,7 @@ struct btd_adapter_ops {
int (*setup) (void);
void (*cleanup) (void);
int (*start) (int index);
+ int (*stop) (int index);
};

int btd_register_adapter_ops(struct btd_adapter_ops *btd_adapter_ops);
--
1.5.6.3