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

Move storage dependencies from hciops to core daemon

Browse Source
This commit is contained in:
Johan Hedberg 2010-12-19 14:40:54 +02:00
parent cdb793f181
commit 49a520fbda
2 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/hciops.c
View File

@ -613,28 +613,6 @@ static inline int get_bdaddr(int index, uint16_t handle, bdaddr_t *dba)
return -ENOENT;
}
static inline void update_lastseen(bdaddr_t *sba, bdaddr_t *dba)
{
time_t t;
struct tm *tm;
t = time(NULL);
tm = gmtime(&t);
write_lastseen_info(sba, dba, tm);
}
static inline void update_lastused(bdaddr_t *sba, bdaddr_t *dba)
{
time_t t;
struct tm *tm;
t = time(NULL);
tm = gmtime(&t);
write_lastused_info(sba, dba, tm);
}
/* Link Key handling */
static void link_key_request(int index, bdaddr_t *dba)
@ -1643,9 +1621,6 @@ static inline void inquiry_result(int index, int plen, void *ptr)
btd_event_inquiry_result(&dev->bdaddr, &info->bdaddr, class,
0, NULL);
update_lastseen(&dev->bdaddr, &info->bdaddr);
ptr += INQUIRY_INFO_SIZE;
}
}
@ -1668,9 +1643,6 @@ static inline void inquiry_result_with_rssi(int index, int plen, void *ptr)
btd_event_inquiry_result(&dev->bdaddr, &info->bdaddr,
class, info->rssi, NULL);
update_lastseen(&dev->bdaddr, &info->bdaddr);
ptr += INQUIRY_INFO_WITH_RSSI_AND_PSCAN_MODE_SIZE;
}
} else {
@ -1682,9 +1654,6 @@ static inline void inquiry_result_with_rssi(int index, int plen, void *ptr)
btd_event_inquiry_result(&dev->bdaddr, &info->bdaddr,
class, info->rssi, NULL);
update_lastseen(&dev->bdaddr, &info->bdaddr);
ptr += INQUIRY_INFO_WITH_RSSI_SIZE;
}
}
@ -1704,9 +1673,6 @@ static inline void extended_inquiry_result(int index, int plen, void *ptr)
btd_event_inquiry_result(&dev->bdaddr, &info->bdaddr, class,
info->rssi, info->data);
update_lastseen(&dev->bdaddr, &info->bdaddr);
ptr += EXTENDED_INQUIRY_INFO_SIZE;
}
}
@ -1751,8 +1717,6 @@ static inline void conn_complete(int index, void *ptr)
if (evt->status)
return;
update_lastused(&dev->bdaddr, &evt->bdaddr);
/* check if the remote version needs be requested */
ba2str(&dev->bdaddr, local_addr);
ba2str(&evt->bdaddr, peer_addr);
@ -1788,8 +1752,6 @@ static inline void le_conn_complete(int index, void *ptr)
if (evt->status)
return;
update_lastused(&dev->bdaddr, &evt->peer_bdaddr);
/* check if the remote version needs be requested */
ba2str(&dev->bdaddr, local_addr);
ba2str(&evt->peer_bdaddr, peer_addr);

27
src/event.c
View File

@ -445,6 +445,28 @@ void btd_event_advertising_report(bdaddr_t *local, le_advertising_info *info)
eir_data.services, eir_data.flags);
}
static void update_lastseen(bdaddr_t *sba, bdaddr_t *dba)
{
time_t t;
struct tm *tm;
t = time(NULL);
tm = gmtime(&t);
write_lastseen_info(sba, dba, tm);
}
static void update_lastused(bdaddr_t *sba, bdaddr_t *dba)
{
time_t t;
struct tm *tm;
t = time(NULL);
tm = gmtime(&t);
write_lastused_info(sba, dba, tm);
}
void btd_event_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class,
int8_t rssi, uint8_t *data)
{
@ -467,6 +489,7 @@ void btd_event_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class,
return;
}
update_lastseen(local, peer);
write_remote_class(local, peer, class);
if (data)
@ -776,7 +799,9 @@ void btd_event_conn_complete(bdaddr_t *local, uint8_t status, uint16_t handle,
if (device_is_temporary(device))
adapter_remove_device(conn, adapter, device, secmode3);
return;
}
} else
update_lastused(local, peer);
/* add in the device connetions list */
adapter_add_connection(adapter, device, handle);