diff options
| author | Luiz Augusto von Dentz <luiz.dentz@indt.org.br> | 2008-07-10 16:05:26 -0300 | 
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.dentz@indt.org.br> | 2008-07-28 10:37:24 -0300 | 
| commit | 31add9474ec23e17b445811ac7491d3571bfc716 (patch) | |
| tree | caf842053b8eea073ed9e928bac8acdc904406ac /hcid/adapter.h | |
| parent | 51e6fcc051fe21c8359dd7d1981a5b38c59a4b9d (diff) | |
Integrate struct hci_dev into struct adapter.
Diffstat (limited to 'hcid/adapter.h')
| -rw-r--r-- | hcid/adapter.h | 18 | 
1 files changed, 17 insertions, 1 deletions
| diff --git a/hcid/adapter.h b/hcid/adapter.h index 772f3599..1b9901bd 100644 --- a/hcid/adapter.h +++ b/hcid/adapter.h @@ -84,6 +84,21 @@ struct active_conn_info {  	uint16_t handle;  }; +struct hci_dev { +	int ignore; + +	bdaddr_t bdaddr; +	uint8_t  features[8]; +	uint8_t  lmp_ver; +	uint16_t lmp_subver; +	uint16_t hci_rev; +	uint16_t manufacturer; + +	uint8_t  ssp_mode; +	uint8_t  name[248]; +	uint8_t  class[3]; +}; +  struct adapter {  	uint16_t dev_id;  	int up; @@ -94,7 +109,6 @@ struct adapter {  	uint8_t scan_enable;		/* scan mode: SCAN_DISABLED, SCAN_PAGE, SCAN_INQUIRY */  	uint8_t mode;			/* off, connectable, discoverable, limited */  	uint8_t global_mode;		/* last valid global mode */ -	uint8_t class[3];		/* device class */  	int discov_active;		/* standard discovery active: includes name resolution step */  	int pdiscov_active;		/* periodic discovery active */  	int pinq_idle;			/* tracks the idle time for periodic inquiry */ @@ -115,6 +129,8 @@ struct adapter {  					   authentication requests */  	GSList *devices;		/* Devices structure pointers */  	GSList *sessions;		/* Request Mode sessions */ + +	struct hci_dev dev;		/* hci info */  };  dbus_bool_t adapter_init(DBusConnection *conn, | 
