summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlok Barsode <alok.barsode@azingo.com>2008-08-26 16:41:43 +0530
committerAlok Barsode <alok.barsode@azingo.com>2008-08-29 13:53:11 +0530
commit344789216712689037f57cb7bc2dc7a333a95333 (patch)
tree3235c06667879cbb3e4e51e034e04410217c1986
parent6c0f7565f134e526fd549538569ad70cd09fefc1 (diff)
Removing pinq_idle from struct adapter.
-rw-r--r--src/adapter.c1
-rw-r--r--src/adapter.h1
-rw-r--r--src/dbus-hci.c5
3 files changed, 0 insertions, 7 deletions
diff --git a/src/adapter.c b/src/adapter.c
index 16d03958..bc49090c 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2492,7 +2492,6 @@ int adapter_stop(struct adapter *adapter)
adapter->up = 0;
adapter->scan_mode = SCAN_DISABLED;
adapter->mode = MODE_OFF;
- adapter->pinq_idle = 0;
adapter->state = DISCOVER_TYPE_NONE;
unload_drivers(adapter);
diff --git a/src/adapter.h b/src/adapter.h
index 7d6ca9cb..d643f40d 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -102,7 +102,6 @@ struct adapter {
uint8_t scan_mode; /* scan mode: SCAN_DISABLED, SCAN_PAGE, SCAN_INQUIRY */
uint8_t mode; /* off, connectable, discoverable, limited */
uint8_t global_mode; /* last valid global mode */
- int pinq_idle; /* tracks the idle time for periodic inquiry */
int state; /* standard inq, periodic inq, name resloving */
GSList *found_devices;
GSList *oor_devices; /* out of range device list */
diff --git a/src/dbus-hci.c b/src/dbus-hci.c
index b713b16f..5e6285ac 100644
--- a/src/dbus-hci.c
+++ b/src/dbus-hci.c
@@ -969,8 +969,6 @@ void hcid_dbus_inquiry_complete(bdaddr_t *local)
}
}
- adapter->pinq_idle = 1;
-
/*
* Enable resolution again: standard inquiry can be
* received in the periodic inquiry idle state.
@@ -1242,10 +1240,7 @@ void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class,
adapter_set_state(adapter, state);
}
- /* reset the idle flag when the inquiry complete event arrives */
if (adapter_get_state(adapter) & PERIODIC_INQUIRY) {
- adapter->pinq_idle = 0;
-
/* Out of range list update */
l = g_slist_find_custom(adapter->oor_devices, peer_addr,
(GCompareFunc) strcmp);