diff options
| -rw-r--r-- | src/adapter.c | 28 | ||||
| -rw-r--r-- | src/adapter.h | 28 |
2 files changed, 28 insertions, 28 deletions
diff --git a/src/adapter.c b/src/adapter.c index 30ace0bd..ebc72f63 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -93,6 +93,34 @@ struct service_auth { void *user_data; }; +struct adapter { + uint16_t dev_id; + int up; + char *path; /* adapter object path */ + char address[18]; /* adapter Bluetooth Address */ + guint discov_timeout_id; /* discoverable timeout id */ + uint32_t discov_timeout; /* discoverable time(msec) */ + 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 state; /* standard inq, periodic inq, name resloving */ + GSList *found_devices; + GSList *oor_devices; /* out of range device list */ + DBusMessage *discovery_cancel; /* discovery cancel message request */ + GSList *passkey_agents; + struct agent *agent; /* For the new API */ + GSList *active_conn; + struct bonding_request_info *bonding; + GSList *auth_reqs; /* Received and replied HCI + authentication requests */ + GSList *devices; /* Devices structure pointers */ + GSList *mode_sessions; /* Request Mode sessions */ + GSList *disc_sessions; /* Discovery sessions */ + guint scheduler_id; /* Scheduler handle */ + + struct hci_dev dev; /* hci info */ +}; + static inline DBusMessage *invalid_args(DBusMessage *msg) { return g_dbus_create_error(msg, ERROR_INTERFACE ".InvalidArguments", diff --git a/src/adapter.h b/src/adapter.h index 2fe1836b..d8293d35 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -92,34 +92,6 @@ struct hci_dev { uint8_t class[3]; }; -struct adapter { - uint16_t dev_id; - int up; - char *path; /* adapter object path */ - char address[18]; /* adapter Bluetooth Address */ - guint discov_timeout_id; /* discoverable timeout id */ - uint32_t discov_timeout; /* discoverable time(msec) */ - 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 state; /* standard inq, periodic inq, name resloving */ - GSList *found_devices; - GSList *oor_devices; /* out of range device list */ - DBusMessage *discovery_cancel; /* discovery cancel message request */ - GSList *passkey_agents; - struct agent *agent; /* For the new API */ - GSList *active_conn; - struct bonding_request_info *bonding; - GSList *auth_reqs; /* Received and replied HCI - authentication requests */ - GSList *devices; /* Devices structure pointers */ - GSList *mode_sessions; /* Request Mode sessions */ - GSList *disc_sessions; /* Discovery sessions */ - guint scheduler_id; /* Scheduler handle */ - - struct hci_dev dev; /* hci info */ -}; - int adapter_start(struct adapter *adapter); int adapter_stop(struct adapter *adapter); |