static int audio_probe(struct btd_device *device, GSList *records)
{
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
const gchar *path = device_get_path(device);
const char *source, *destination;
bdaddr_t src, dst;
return adp;
}
-static struct audio_adapter *get_audio_adapter(struct adapter *adapter)
+static struct audio_adapter *get_audio_adapter(struct btd_adapter *adapter)
{
struct audio_adapter *adp;
const gchar *path = adapter_get_path(adapter);
return adp;
}
-static int headset_server_probe(struct adapter *adapter)
+static int headset_server_probe(struct btd_adapter *adapter)
{
struct audio_adapter *adp;
const gchar *path = adapter_get_path(adapter);
return headset_server_init(adp);
}
-static void headset_server_remove(struct adapter *adapter)
+static void headset_server_remove(struct btd_adapter *adapter)
{
struct audio_adapter *adp;
const gchar *path = adapter_get_path(adapter);
}
}
-static int gateway_server_probe(struct adapter *adapter)
+static int gateway_server_probe(struct btd_adapter *adapter)
{
struct audio_adapter *adp;
const gchar *path = adapter_get_path(adapter);
return gateway_server_init(adp);
}
-static void gateway_server_remove(struct adapter *adapter)
+static void gateway_server_remove(struct btd_adapter *adapter)
{
struct audio_adapter *adp;
const gchar *path = adapter_get_path(adapter);
}
}
-static int a2dp_server_probe(struct adapter *adapter)
+static int a2dp_server_probe(struct btd_adapter *adapter)
{
struct audio_adapter *adp;
const gchar *path = adapter_get_path(adapter);
return a2dp_init(connection, config);
}
-static int avrcp_server_probe(struct adapter *adapter)
+static int avrcp_server_probe(struct btd_adapter *adapter)
{
struct audio_adapter *adp;
const gchar *path = adapter_get_path(adapter);
static int hid_probe(struct btd_device *device, GSList *records)
{
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
const gchar *path = device_get_path(device);
const char *source, *destination;
struct hidp_connadd_req hidp;
static int headset_probe(struct btd_device *device, GSList *records)
{
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
const gchar *path = device_get_path(device);
sdp_record_t *record = records->data;
sdp_list_t *protos;
static int network_probe(struct btd_device *device, GSList *records,
uint16_t id)
{
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
const gchar *path = device_get_path(device);
const char *source, *destination;
bdaddr_t src, dst;
network_remove(device, BNEP_SVC_NAP);
}
-static int network_server_probe(struct adapter *adapter, uint16_t id)
+static int network_server_probe(struct btd_adapter *adapter, uint16_t id)
{
const gchar *path = adapter_get_path(adapter);
const char *source;
return server_register(path, &src, id);
}
-static void network_server_remove(struct adapter *adapter, uint16_t id)
+static void network_server_remove(struct btd_adapter *adapter, uint16_t id)
{
const gchar *path = adapter_get_path(adapter);
server_unregister(path, id);
}
-static int panu_server_probe(struct adapter *adapter)
+static int panu_server_probe(struct btd_adapter *adapter)
{
return network_server_probe(adapter, BNEP_SVC_PANU);
}
-static int gn_server_probe(struct adapter *adapter)
+static int gn_server_probe(struct btd_adapter *adapter)
{
return network_server_probe(adapter, BNEP_SVC_GN);
}
-static int nap_server_probe(struct adapter *adapter)
+static int nap_server_probe(struct btd_adapter *adapter)
{
return network_server_probe(adapter, BNEP_SVC_NAP);
}
-static void panu_server_remove(struct adapter *adapter)
+static void panu_server_remove(struct btd_adapter *adapter)
{
network_server_remove(adapter, BNEP_SVC_PANU);
}
-static void gn_server_remove(struct adapter *adapter)
+static void gn_server_remove(struct btd_adapter *adapter)
{
network_server_remove(adapter, BNEP_SVC_GN);
}
-static void nap_server_remove(struct adapter *adapter)
+static void nap_server_remove(struct btd_adapter *adapter)
{
network_server_remove(adapter, BNEP_SVC_NAP);
}
static GIOChannel *chan = NULL;
-static int echo_probe(struct adapter *adapter)
+static int echo_probe(struct btd_adapter *adapter)
{
const char *path = adapter_get_path(adapter);
return 0;
}
-static void echo_remove(struct adapter *adapter)
+static void echo_remove(struct btd_adapter *adapter)
{
const char *path = adapter_get_path(adapter);
static DBusMessage *add_service_record(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
DBusMessage *reply;
const char *sender, *record;
dbus_uint32_t handle;
static DBusMessage *update_service_record(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
bdaddr_t src;
str2ba(adapter_get_address(adapter), &src);
g_slist_foreach(records, (GFunc) exit_callback, NULL);
}
-static int service_probe(struct adapter *adapter)
+static int service_probe(struct btd_adapter *adapter)
{
const char *path = adapter_get_path(adapter);
return 0;
}
-static void service_remove(struct adapter *adapter)
+static void service_remove(struct btd_adapter *adapter)
{
const char *path = adapter_get_path(adapter);
static int serial_probe(struct btd_device *device, sdp_record_t *rec,
const char *name, const char *uuid)
{
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
const gchar *path = device_get_path(device);
sdp_list_t *protos;
int ch;
.remove = dialup_remove,
};
-static int proxy_probe(struct adapter *adapter)
+static int proxy_probe(struct btd_adapter *adapter)
{
const char *path = adapter_get_path(adapter);
const char *address = adapter_get_address(adapter);
return proxy_register(connection, path, &src);
}
-static void proxy_remove(struct adapter *adapter)
+static void proxy_remove(struct btd_adapter *adapter)
{
const char *path = adapter_get_path(adapter);
};
struct session_req {
- struct adapter *adapter;
- DBusConnection *conn; /* Connection reference */
- DBusMessage *msg; /* Message reference */
- guint id; /* Listener id */
- uint8_t mode; /* Requested mode */
- int refcount; /* Session refcount */
+ struct btd_adapter *adapter;
+ DBusConnection *conn; /* Connection reference */
+ DBusMessage *msg; /* Message reference */
+ guint id; /* Listener id */
+ uint8_t mode; /* Requested mode */
+ int refcount; /* Session refcount */
};
struct service_auth {
void *user_data;
};
-struct adapter {
+struct btd_adapter {
uint16_t dev_id;
int up;
char *path; /* adapter object path */
return bda ? bacmp(&pb1->bdaddr, bda) : -1;
}
-struct pending_auth_info *adapter_find_auth_request(struct adapter *adapter,
+struct pending_auth_info *adapter_find_auth_request(struct btd_adapter *adapter,
bdaddr_t *dba)
{
GSList *l;
return NULL;
}
-void adapter_remove_auth_request(struct adapter *adapter, bdaddr_t *dba)
+void adapter_remove_auth_request(struct btd_adapter *adapter, bdaddr_t *dba)
{
GSList *l;
struct pending_auth_info *auth;
g_free(auth);
}
-struct pending_auth_info *adapter_new_auth_request(struct adapter *adapter,
+struct pending_auth_info *adapter_new_auth_request(struct btd_adapter *adapter,
bdaddr_t *dba,
auth_type_t type)
{
return info;
}
-int pending_remote_name_cancel(struct adapter *adapter)
+int pending_remote_name_cancel(struct btd_adapter *adapter)
{
struct remote_dev_info *dev, match;
GSList *l;
struct btd_device *device = user_data;
struct pending_auth_info *auth;
GSList *l;
- struct adapter *adapter;
+ struct btd_adapter *adapter;
adapter = device_get_adapter(device);
device_set_agent(device, NULL);
static struct bonding_request_info *bonding_request_new(DBusConnection *conn,
DBusMessage *msg,
- struct adapter *adapter,
+ struct btd_adapter *adapter,
const char *address,
const char *agent_path,
uint8_t capability)
static DBusMessage *set_mode(DBusConnection *conn, DBusMessage *msg,
uint8_t new_mode, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
uint8_t scan_enable;
uint8_t current_scan = adapter->scan_mode;
bdaddr_t local;
static void session_free(struct session_req *req)
{
- struct adapter *adapter = req->adapter;
+ struct btd_adapter *adapter = req->adapter;
if (req->mode)
adapter->mode_sessions = g_slist_remove(adapter->mode_sessions,
session_free(req);
}
-static struct session_req *create_session(struct adapter *adapter,
+static struct session_req *create_session(struct btd_adapter *adapter,
DBusConnection *conn, DBusMessage *msg,
uint8_t mode, GDBusWatchFunction cb)
{
static DBusMessage *confirm_mode(DBusConnection *conn, DBusMessage *msg,
const char *mode, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
struct session_req *req;
int ret;
uint8_t umode;
uint32_t timeout,
void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
bdaddr_t bdaddr;
const char *path;
strerror(errno), errno);
}
-static int adapter_set_name(struct adapter *adapter, const char *name)
+static int adapter_set_name(struct btd_adapter *adapter, const char *name)
{
struct hci_dev *dev = &adapter->dev;
int dd, err;
static DBusMessage *set_name(DBusConnection *conn, DBusMessage *msg,
const char *name, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
int ecode;
const char *path;
}
}
-struct btd_device *adapter_find_device(struct adapter *adapter, const char *dest)
+struct btd_device *adapter_find_device(struct btd_adapter *adapter, const char *dest)
{
struct btd_device *device;
GSList *l;
}
struct btd_device *adapter_create_device(DBusConnection *conn,
- struct adapter *adapter, const char *address)
+ struct btd_adapter *adapter, const char *address)
{
struct btd_device *device;
static DBusMessage *remove_bonding(DBusConnection *conn, DBusMessage *msg,
const char *address, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
struct btd_device *device;
char filename[PATH_MAX + 1];
char *str;
}
-void adapter_remove_device(DBusConnection *conn, struct adapter *adapter,
+void adapter_remove_device(DBusConnection *conn, struct btd_adapter *adapter,
struct btd_device *device)
{
bdaddr_t src;
}
struct btd_device *adapter_get_device(DBusConnection *conn,
- struct adapter *adapter, const gchar *address)
+ struct btd_adapter *adapter, const gchar *address)
{
struct btd_device *device;
return adapter_create_device(conn, adapter, address);
}
-void remove_pending_device(struct adapter *adapter)
+void remove_pending_device(struct btd_adapter *adapter)
{
struct btd_device *device;
char address[18];
}
static gboolean create_bonding_conn_complete(GIOChannel *io, GIOCondition cond,
- struct adapter *adapter)
+ struct btd_adapter *adapter)
{
struct hci_request rq;
auth_requested_cp cp;
static void create_bond_req_exit(void *user_data)
{
- struct adapter *adapter = user_data;
+ struct btd_adapter *adapter = user_data;
struct pending_auth_info *auth;
debug("CreateConnection requestor exited before bonding was completed");
{
char filename[PATH_MAX + 1];
char *str;
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
struct bonding_request_info *bonding;
bdaddr_t bdaddr;
int sk;
static void discover_req_exit(void *user_data)
{
struct session_req *req = user_data;
- struct adapter *adapter = req->adapter;
+ struct btd_adapter *adapter = req->adapter;
info("Discovery session %d deactivated", g_slist_length(adapter->disc_sessions));
cancel_periodic_discovery(adapter);
}
-int start_inquiry(struct adapter *adapter)
+int start_inquiry(struct btd_adapter *adapter)
{
inquiry_cp cp;
evt_cmd_status rp;
return 0;
}
-static int start_periodic_inquiry(struct adapter *adapter)
+static int start_periodic_inquiry(struct btd_adapter *adapter)
{
periodic_inquiry_cp cp;
struct hci_request rq;
DBusMessage *msg, void *data)
{
struct session_req *req;
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
int err;
if (!adapter->up)
static DBusMessage *adapter_cancel_discovery(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
struct session_req *req;
int err = 0;
static DBusMessage *get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
const char *property;
DBusMessage *reply;
DBusMessageIter iter;
static DBusMessage *set_property(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
DBusMessageIter iter;
DBusMessageIter sub;
const char *property;
static void session_exit(void *data)
{
struct session_req *req = data;
- struct adapter *adapter = req->adapter;
+ struct btd_adapter *adapter = req->adapter;
if (!adapter->mode_sessions) {
debug("Falling back to '%s' mode", mode2str(adapter->global_mode));
DBusMessage *msg, void *data)
{
const char *mode;
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
struct session_req *req;
uint8_t new_mode;
int ret;
static DBusMessage *release_mode(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
struct session_req *req;
req = find_session(adapter->mode_sessions, msg);
static DBusMessage *list_devices(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
DBusMessage *reply;
GSList *l;
DBusMessageIter iter;
static DBusMessage *create_device(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
struct btd_device *device;
const gchar *address;
static DBusMessage *remove_device(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
struct btd_device *device;
const char *path;
GSList *l;
static DBusMessage *find_device(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
struct btd_device *device;
DBusMessage *reply;
const gchar *address;
return reply;
}
-static void agent_removed(struct agent *agent, struct adapter *adapter)
+static void agent_removed(struct agent *agent, struct btd_adapter *adapter)
{
struct pending_auth_info *auth;
GSList *l;
{
const char *path, *name, *capability;
struct agent *agent;
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
uint8_t cap;
if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
DBusMessage *msg, void *data)
{
const char *path, *name;
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID))
return 0;
}
-static int adapter_setup(struct adapter *adapter, int dd)
+static int adapter_setup(struct btd_adapter *adapter, int dd)
{
struct hci_dev *dev = &adapter->dev;
uint8_t events[8] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00 };
void *user_data)
{
char filename[PATH_MAX + 1];
- struct adapter *adapter = user_data;
+ struct btd_adapter *adapter = user_data;
GSList *uuids = bt_string2list(value);
struct btd_device *device;
const gchar *src;
static void create_stored_device_from_linkkeys(char *key, char *value,
void *user_data)
{
- struct adapter *adapter = user_data;
+ struct btd_adapter *adapter = user_data;
struct btd_device *device;
if (g_slist_find_custom(adapter->devices,
}
}
-static void load_devices(struct adapter *adapter)
+static void load_devices(struct btd_adapter *adapter)
{
char filename[PATH_MAX + 1];
textfile_foreach(filename, create_stored_device_from_linkkeys, adapter);
}
-static void load_drivers(struct adapter *adapter)
+static void load_drivers(struct btd_adapter *adapter)
{
GSList *l;
return main_opts.discovto;
}
-static void adapter_up(struct adapter *adapter, int dd)
+static void adapter_up(struct btd_adapter *adapter, int dd)
{
struct hci_conn_list_req *cl = NULL;
struct hci_conn_info *ci;
load_devices(adapter);
}
-int adapter_start(struct adapter *adapter)
+int adapter_start(struct btd_adapter *adapter)
{
struct hci_dev *dev = &adapter->dev;
struct hci_dev_info di;
return 0;
}
-static void reply_pending_requests(struct adapter *adapter)
+static void reply_pending_requests(struct btd_adapter *adapter)
{
DBusMessage *reply;
}
}
-static void unload_drivers(struct adapter *adapter)
+static void unload_drivers(struct btd_adapter *adapter)
{
GSList *l;
}
}
-int adapter_stop(struct adapter *adapter)
+int adapter_stop(struct btd_adapter *adapter)
{
const char *mode = "off";
return 0;
}
-int adapter_update(struct adapter *adapter)
+int adapter_update(struct btd_adapter *adapter)
{
struct hci_dev *dev = &adapter->dev;
int dd;
return 0;
}
-int adapter_get_class(struct adapter *adapter, uint8_t *cls)
+int adapter_get_class(struct btd_adapter *adapter, uint8_t *cls)
{
struct hci_dev *dev = &adapter->dev;
return 0;
}
-int adapter_set_class(struct adapter *adapter, uint8_t *cls)
+int adapter_set_class(struct btd_adapter *adapter, uint8_t *cls)
{
struct hci_dev *dev = &adapter->dev;
return 0;
}
-int adapter_update_ssp_mode(struct adapter *adapter, int dd, uint8_t mode)
+int adapter_update_ssp_mode(struct btd_adapter *adapter, int dd, uint8_t mode)
{
struct hci_dev *dev = &adapter->dev;
static void adapter_free(gpointer user_data)
{
- struct adapter *adapter = user_data;
+ struct btd_adapter *adapter = user_data;
agent_destroy(adapter->agent, FALSE);
adapter->agent = NULL;
return;
}
-struct adapter *adapter_create(DBusConnection *conn, int id)
+struct btd_adapter *adapter_create(DBusConnection *conn, int id)
{
char path[MAX_PATH_LENGTH];
- struct adapter *adapter;
+ struct btd_adapter *adapter;
if (!connection)
connection = conn;
snprintf(path, sizeof(path), "%s/hci%d", "/org/bluez", id);
- adapter = g_try_new0(struct adapter, 1);
+ adapter = g_try_new0(struct btd_adapter, 1);
if (!adapter) {
error("Failed to alloc memory to D-Bus path register data (%s)",
path);
return adapter;
}
-void adapter_remove(struct adapter *adapter)
+void adapter_remove(struct btd_adapter *adapter)
{
GSList *l;
char *path = g_strdup(adapter->path);
g_free(path);
}
-uint16_t adapter_get_dev_id(struct adapter *adapter)
+uint16_t adapter_get_dev_id(struct btd_adapter *adapter)
{
return adapter->dev_id;
}
-const gchar *adapter_get_path(struct adapter *adapter)
+const gchar *adapter_get_path(struct btd_adapter *adapter)
{
if (!adapter)
return NULL;
return adapter->path;
}
-const gchar *adapter_get_address(struct adapter *adapter)
+const gchar *adapter_get_address(struct btd_adapter *adapter)
{
if (!adapter)
return NULL;
static gboolean discov_timeout_handler(void *data)
{
- struct adapter *adapter = data;
+ struct btd_adapter *adapter = data;
struct hci_request rq;
int dd;
uint8_t scan_enable = adapter->scan_mode;
return retval;
}
-void adapter_set_discov_timeout(struct adapter *adapter, guint interval)
+void adapter_set_discov_timeout(struct btd_adapter *adapter, guint interval)
{
if (!adapter)
return;
adapter->discov_timeout_id = g_timeout_add(interval, discov_timeout_handler, adapter);
}
-void adapter_remove_discov_timeout(struct adapter *adapter)
+void adapter_remove_discov_timeout(struct btd_adapter *adapter)
{
if (!adapter)
return;
adapter->discov_timeout_id = 0;
}
-void adapter_set_scan_mode(struct adapter *adapter, uint8_t scan_mode)
+void adapter_set_scan_mode(struct btd_adapter *adapter, uint8_t scan_mode)
{
if (!adapter)
return;
adapter->scan_mode = scan_mode;
}
-uint8_t adapter_get_scan_mode(struct adapter *adapter)
+uint8_t adapter_get_scan_mode(struct btd_adapter *adapter)
{
return adapter->scan_mode;
}
-void adapter_set_mode(struct adapter *adapter, uint8_t mode)
+void adapter_set_mode(struct btd_adapter *adapter, uint8_t mode)
{
if (!adapter)
return;
adapter->mode = mode;
}
-uint8_t adapter_get_mode(struct adapter *adapter)
+uint8_t adapter_get_mode(struct btd_adapter *adapter)
{
return adapter->mode;
}
-void adapter_set_state(struct adapter *adapter, int state)
+void adapter_set_state(struct btd_adapter *adapter, int state)
{
gboolean discov_active = FALSE;
const char *path = adapter->path;
adapter->state = state;
}
-int adapter_get_state(struct adapter *adapter)
+int adapter_get_state(struct btd_adapter *adapter)
{
return adapter->state;
}
-struct remote_dev_info *adapter_search_found_devices(struct adapter *adapter,
+struct remote_dev_info *adapter_search_found_devices(struct btd_adapter *adapter,
struct remote_dev_info *match)
{
GSList *l;
return rssi1 - rssi2;
}
-int adapter_add_found_device(struct adapter *adapter, bdaddr_t *bdaddr,
+int adapter_add_found_device(struct btd_adapter *adapter, bdaddr_t *bdaddr,
int8_t rssi, name_status_t name_status)
{
struct remote_dev_info *dev, match;
return 0;
}
-int adapter_remove_found_device(struct adapter *adapter, bdaddr_t *bdaddr)
+int adapter_remove_found_device(struct btd_adapter *adapter, bdaddr_t *bdaddr)
{
struct remote_dev_info *dev, match;
return 0;
}
-void adapter_update_oor_devices(struct adapter *adapter)
+void adapter_update_oor_devices(struct btd_adapter *adapter)
{
GSList *l = adapter->found_devices;
struct remote_dev_info *dev;
}
}
-void adapter_remove_oor_device(struct adapter *adapter, char *peer_addr)
+void adapter_remove_oor_device(struct btd_adapter *adapter, char *peer_addr)
{
GSList *l;
}
}
-void adapter_mode_changed(struct adapter *adapter, uint8_t scan_mode)
+void adapter_mode_changed(struct btd_adapter *adapter, uint8_t scan_mode)
{
const char *mode;
const gchar *path = adapter_get_path(adapter);
DBUS_TYPE_STRING, &mode);
}
-struct agent *adapter_get_agent(struct adapter *adapter)
+struct agent *adapter_get_agent(struct btd_adapter *adapter)
{
if (!adapter || !adapter->agent)
return NULL;
return adapter->agent;
}
-void adapter_add_active_conn(struct adapter *adapter, bdaddr_t *bdaddr,
+void adapter_add_active_conn(struct btd_adapter *adapter, bdaddr_t *bdaddr,
uint16_t handle)
{
struct active_conn_info *dev;
adapter->active_conn = g_slist_append(adapter->active_conn, dev);
}
-void adapter_remove_active_conn(struct adapter *adapter,
+void adapter_remove_active_conn(struct btd_adapter *adapter,
struct active_conn_info *dev)
{
if (!adapter || !adapter->active_conn)
g_free(dev);
}
-struct active_conn_info *adapter_search_active_conn_by_bdaddr(struct adapter *adapter,
+struct active_conn_info *adapter_search_active_conn_by_bdaddr(struct btd_adapter *adapter,
bdaddr_t *bda)
{
GSList *l;
return NULL;
}
-struct active_conn_info *adapter_search_active_conn_by_handle(struct adapter *adapter,
+struct active_conn_info *adapter_search_active_conn_by_handle(struct btd_adapter *adapter,
uint16_t handle)
{
GSList *l;
return NULL;
}
-void adapter_free_bonding_request(struct adapter *adapter)
+void adapter_free_bonding_request(struct btd_adapter *adapter)
{
g_dbus_remove_watch(connection, adapter->bonding->listener_id);
adapter->bonding = NULL;
}
-struct bonding_request_info *adapter_get_bonding_info(struct adapter *adapter)
+struct bonding_request_info *adapter_get_bonding_info(struct btd_adapter *adapter)
{
if (!adapter || !adapter->bonding)
return NULL;
return adapter->bonding;
}
-gboolean adapter_has_discov_sessions(struct adapter *adapter)
+gboolean adapter_has_discov_sessions(struct btd_adapter *adapter)
{
if (!adapter || !adapter->disc_sessions)
return FALSE;
const char *uuid, service_auth_cb cb, void *user_data)
{
struct service_auth *auth;
- struct adapter *adapter;
+ struct btd_adapter *adapter;
struct btd_device *device;
struct agent *agent;
char address[18];
int btd_cancel_authorization(const bdaddr_t *src, const bdaddr_t *dst)
{
- struct adapter *adapter = manager_find_adapter(src);
+ struct btd_adapter *adapter = manager_find_adapter(src);
struct btd_device *device;
struct agent *agent;
char address[18];
struct bonding_request_info {
DBusConnection *conn;
DBusMessage *msg;
- struct adapter *adapter;
+ struct btd_adapter *adapter;
bdaddr_t bdaddr;
GIOChannel *io;
guint io_id;
uint8_t class[3];
};
-int adapter_start(struct adapter *adapter);
+int adapter_start(struct btd_adapter *adapter);
-int adapter_stop(struct adapter *adapter);
+int adapter_stop(struct btd_adapter *adapter);
-int adapter_update(struct adapter *adapter);
+int adapter_update(struct btd_adapter *adapter);
-int adapter_get_class(struct adapter *adapter, uint8_t *cls);
+int adapter_get_class(struct btd_adapter *adapter, uint8_t *cls);
-int adapter_set_class(struct adapter *adapter, uint8_t *cls);
+int adapter_set_class(struct btd_adapter *adapter, uint8_t *cls);
-int adapter_update_ssp_mode(struct adapter *adapter, int dd, uint8_t mode);
+int adapter_update_ssp_mode(struct btd_adapter *adapter, int dd, uint8_t mode);
struct btd_device *adapter_get_device(DBusConnection *conn,
- struct adapter *adapter, const gchar *address);
+ struct btd_adapter *adapter, const gchar *address);
-struct btd_device *adapter_find_device(struct adapter *adapter, const char *dest);
+struct btd_device *adapter_find_device(struct btd_adapter *adapter, const char *dest);
-void adapter_remove_device(DBusConnection *conn, struct adapter *adapter,
+void adapter_remove_device(DBusConnection *conn, struct btd_adapter *adapter,
struct btd_device *device);
struct btd_device *adapter_create_device(DBusConnection *conn,
- struct adapter *adapter, const char *address);
+ struct btd_adapter *adapter, const char *address);
-int pending_remote_name_cancel(struct adapter *adapter);
+int pending_remote_name_cancel(struct btd_adapter *adapter);
-void remove_pending_device(struct adapter *adapter);
+void remove_pending_device(struct btd_adapter *adapter);
-struct pending_auth_info *adapter_find_auth_request(struct adapter *adapter,
+struct pending_auth_info *adapter_find_auth_request(struct btd_adapter *adapter,
bdaddr_t *dba);
-void adapter_remove_auth_request(struct adapter *adapter, bdaddr_t *dba);
-struct pending_auth_info *adapter_new_auth_request(struct adapter *adapter,
+void adapter_remove_auth_request(struct btd_adapter *adapter, bdaddr_t *dba);
+struct pending_auth_info *adapter_new_auth_request(struct btd_adapter *adapter,
bdaddr_t *dba,
auth_type_t type);
-struct adapter *adapter_create(DBusConnection *conn, int id);
-void adapter_remove(struct adapter *adapter);
-uint16_t adapter_get_dev_id(struct adapter *adapter);
-const gchar *adapter_get_path(struct adapter *adapter);
-const gchar *adapter_get_address(struct adapter *adapter);
-void adapter_remove(struct adapter *adapter);
-void adapter_set_discov_timeout(struct adapter *adapter, guint interval);
-void adapter_remove_discov_timeout(struct adapter *adapter);
-void adapter_set_scan_mode(struct adapter *adapter, uint8_t scan_mode);
-uint8_t adapter_get_scan_mode(struct adapter *adapter);
-void adapter_set_mode(struct adapter *adapter, uint8_t mode);
-uint8_t adapter_get_mode(struct adapter *adapter);
-void adapter_set_state(struct adapter *adapter, int state);
-int adapter_get_state(struct adapter *adapter);
-struct remote_dev_info *adapter_search_found_devices(struct adapter *adapter,
+struct btd_adapter *adapter_create(DBusConnection *conn, int id);
+void adapter_remove(struct btd_adapter *adapter);
+uint16_t adapter_get_dev_id(struct btd_adapter *adapter);
+const gchar *adapter_get_path(struct btd_adapter *adapter);
+const gchar *adapter_get_address(struct btd_adapter *adapter);
+void adapter_remove(struct btd_adapter *adapter);
+void adapter_set_discov_timeout(struct btd_adapter *adapter, guint interval);
+void adapter_remove_discov_timeout(struct btd_adapter *adapter);
+void adapter_set_scan_mode(struct btd_adapter *adapter, uint8_t scan_mode);
+uint8_t adapter_get_scan_mode(struct btd_adapter *adapter);
+void adapter_set_mode(struct btd_adapter *adapter, uint8_t mode);
+uint8_t adapter_get_mode(struct btd_adapter *adapter);
+void adapter_set_state(struct btd_adapter *adapter, int state);
+int adapter_get_state(struct btd_adapter *adapter);
+struct remote_dev_info *adapter_search_found_devices(struct btd_adapter *adapter,
struct remote_dev_info *match);
-int adapter_add_found_device(struct adapter *adapter, bdaddr_t *bdaddr,
+int adapter_add_found_device(struct btd_adapter *adapter, bdaddr_t *bdaddr,
int8_t rssi, name_status_t name_status);
-int adapter_remove_found_device(struct adapter *adapter, bdaddr_t *bdaddr);
-void adapter_update_oor_devices(struct adapter *adapter);
-void adapter_remove_oor_device(struct adapter *adapter, char *peer_addr);
-void adapter_mode_changed(struct adapter *adapter, uint8_t scan_mode);
-struct agent *adapter_get_agent(struct adapter *adapter);
-void adapter_add_active_conn(struct adapter *adapter, bdaddr_t *bdaddr,
+int adapter_remove_found_device(struct btd_adapter *adapter, bdaddr_t *bdaddr);
+void adapter_update_oor_devices(struct btd_adapter *adapter);
+void adapter_remove_oor_device(struct btd_adapter *adapter, char *peer_addr);
+void adapter_mode_changed(struct btd_adapter *adapter, uint8_t scan_mode);
+struct agent *adapter_get_agent(struct btd_adapter *adapter);
+void adapter_add_active_conn(struct btd_adapter *adapter, bdaddr_t *bdaddr,
uint16_t handle);
-void adapter_remove_active_conn(struct adapter *adapter,
+void adapter_remove_active_conn(struct btd_adapter *adapter,
struct active_conn_info *dev);
-struct active_conn_info *adapter_search_active_conn_by_bdaddr(struct adapter *adapter,
+struct active_conn_info *adapter_search_active_conn_by_bdaddr(struct btd_adapter *adapter,
bdaddr_t *bda);
-struct active_conn_info *adapter_search_active_conn_by_handle(struct adapter *adapter,
+struct active_conn_info *adapter_search_active_conn_by_handle(struct btd_adapter *adapter,
uint16_t handle);
-void adapter_free_bonding_request(struct adapter *adapter);
-struct bonding_request_info *adapter_get_bonding_info(struct adapter *adapter);
-gboolean adapter_has_discov_sessions(struct adapter *adapter);
+void adapter_free_bonding_request(struct btd_adapter *adapter);
+struct bonding_request_info *adapter_get_bonding_info(struct btd_adapter *adapter);
+gboolean adapter_has_discov_sessions(struct btd_adapter *adapter);
struct btd_adapter_driver {
const char *name;
- int (*probe) (struct adapter *adapter);
- void (*remove) (struct adapter *adapter);
+ int (*probe) (struct btd_adapter *adapter);
+ void (*remove) (struct btd_adapter *adapter);
};
typedef void (*service_auth_cb) (DBusError *derr, void *user_data);
} agent_request_type_t;
struct agent {
- struct adapter *adapter;
+ struct btd_adapter *adapter;
char *name;
char *path;
uint8_t capability;
g_free(agent);
}
-struct agent *agent_create(struct adapter *adapter, const char *name,
+struct agent *agent_create(struct btd_adapter *adapter, const char *name,
const char *path, uint8_t capability,
agent_remove_cb cb, void *remove_cb_data)
{
{
struct agent_request *req = user_data;
struct agent *agent = req->agent;
- struct adapter *adapter = agent->adapter;
+ struct btd_adapter *adapter = agent->adapter;
agent_pincode_cb cb = req->cb;
DBusMessage *message;
DBusError err;
static int request_fallback(struct agent_request *req,
DBusPendingCallNotifyFunction function)
{
- struct adapter *adapter = req->agent->adapter;
+ struct btd_adapter *adapter = req->agent->adapter;
struct agent *adapter_agent = adapter_get_agent(adapter);
DBusMessage *msg;
typedef void (*agent_remove_cb) (struct agent *agent, void *user_data);
-struct agent *agent_create(struct adapter *adapter, const char *name,
+struct agent *agent_create(struct btd_adapter *adapter, const char *name,
const char *path, uint8_t capability,
agent_remove_cb cb, void *remove_cb_data);
for (i = 0; children[i]; i++) {
char path[MAX_PATH_LENGTH];
- struct adapter *adapter;
+ struct btd_adapter *adapter;
if (children[i][0] != 'h')
continue;
static void pincode_cb(struct agent *agent, DBusError *err, const char *pincode,
struct btd_device *device)
{
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
pin_code_reply_cp pr;
bdaddr_t sba, dba;
size_t len;
int hcid_dbus_request_pin(int dev, bdaddr_t *sba, struct hci_conn_info *ci)
{
char addr[18];
- struct adapter *adapter;
+ struct btd_adapter *adapter;
struct btd_device *device;
struct agent *agent = NULL;
int ret;
static void confirm_cb(struct agent *agent, DBusError *err, void *user_data)
{
struct btd_device *device = user_data;
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
user_confirm_reply_cp cp;
int dd;
struct pending_auth_info *auth;
void *user_data)
{
struct btd_device *device = user_data;
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
user_passkey_reply_cp cp;
bdaddr_t dba;
int dd;
int hcid_dbus_user_confirm(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
struct btd_device *device;
struct agent *agent;
char addr[18];
int hcid_dbus_user_passkey(bdaddr_t *sba, bdaddr_t *dba)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
struct btd_device *device;
struct agent *agent = NULL;
char addr[18];
int hcid_dbus_user_notify(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
struct btd_device *device;
struct agent *agent = NULL;
char addr[18];
void hcid_dbus_bonding_process_complete(bdaddr_t *local, bdaddr_t *peer,
uint8_t status)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
char peer_addr[18];
const char *paddr = peer_addr;
DBusMessage *reply;
void hcid_dbus_inquiry_start(bdaddr_t *local)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
int state;
adapter = manager_find_adapter(local);
}
}
-static int found_device_req_name(struct adapter *adapter)
+static int found_device_req_name(struct btd_adapter *adapter)
{
struct hci_request rq;
evt_cmd_status rp;
void hcid_dbus_inquiry_complete(bdaddr_t *local)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
const gchar *path;
int state;
void hcid_dbus_periodic_inquiry_start(bdaddr_t *local, uint8_t status)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
int state;
/* Don't send the signal if the cmd failed */
void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
int state;
/* Don't send the signal if the cmd failed */
int8_t rssi, uint8_t *data)
{
char filename[PATH_MAX + 1];
- struct adapter *adapter;
+ struct btd_adapter *adapter;
char local_addr[18], peer_addr[18], *name, *tmp_name;
const char *paddr = peer_addr;
struct remote_dev_info *dev, match;
char peer_addr[18];
const char *paddr = peer_addr;
uint32_t old_class = 0;
- struct adapter *adapter;
+ struct btd_adapter *adapter;
struct btd_device *device;
const gchar *dev_path;
void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, uint8_t status,
char *name)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
char peer_addr[18];
const char *paddr = peer_addr;
const gchar *dev_path;
{
char peer_addr[18];
const char *paddr = peer_addr;
- struct adapter *adapter;
+ struct btd_adapter *adapter;
const gchar *dev_path;
struct bonding_request_info *bonding;
DBusMessage *reply;
char peer_addr[18];
const char *paddr = peer_addr;
- struct adapter *adapter;
+ struct btd_adapter *adapter;
struct btd_device *device;
struct active_conn_info *dev;
gboolean connected = FALSE;
void hcid_dbus_setscan_enable_complete(bdaddr_t *local)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
read_scan_enable_rp rp;
struct hci_request rq;
int dd = -1;
void hcid_dbus_write_class_complete(bdaddr_t *local)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
int dd;
uint8_t cls[3];
uint16_t dev_id;
void hcid_dbus_write_simple_pairing_mode_complete(bdaddr_t *local)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
int dd;
uint8_t mode;
uint16_t dev_id;
int hcid_dbus_get_io_cap(bdaddr_t *local, bdaddr_t *remote,
uint8_t *cap, uint8_t *auth)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
struct btd_device *device;
struct agent *agent = NULL;
char addr[18];
int hcid_dbus_set_io_cap(bdaddr_t *local, bdaddr_t *remote,
uint8_t cap, uint8_t auth)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
struct btd_device *device;
char addr[18];
return 0;
}
-int cancel_discovery(struct adapter *adapter)
+int cancel_discovery(struct btd_adapter *adapter)
{
struct remote_dev_info *dev, match;
int dd, err = 0;
return 0;
}
-int cancel_periodic_discovery(struct adapter *adapter)
+int cancel_periodic_discovery(struct btd_adapter *adapter)
{
struct remote_dev_info *dev, match;
int dd, err = 0;
DBusMessage *new_authentication_return(DBusMessage *msg, uint8_t status);
-int cancel_discovery(struct adapter *adapter);
-int cancel_periodic_discovery(struct adapter *adapter);
+int cancel_discovery(struct btd_adapter *adapter);
+int cancel_periodic_discovery(struct btd_adapter *adapter);
int set_limited_discoverable(int dd, const uint8_t *cls, gboolean limited);
int set_service_classes(int dd, const uint8_t *cls, uint8_t value);
struct btd_device {
gchar *address;
gchar *path;
- struct adapter *adapter;
+ struct btd_adapter *adapter;
GSList *uuids;
GSList *drivers; /* List of driver_data */
gboolean temporary;
static gboolean device_is_paired(struct btd_device *device)
{
- struct adapter *adapter = device->adapter;
+ struct btd_adapter *adapter = device->adapter;
char filename[PATH_MAX + 1], *str;
gboolean ret;
const gchar *source = adapter_get_address(adapter);
DBusMessage *msg, void *user_data)
{
struct btd_device *device = user_data;
- struct adapter *adapter = device->adapter;
+ struct btd_adapter *adapter = device->adapter;
DBusMessage *reply;
DBusMessageIter iter;
DBusMessageIter dict;
const char *alias, void *data)
{
struct btd_device *device = data;
- struct adapter *adapter = device->adapter;
+ struct btd_adapter *adapter = device->adapter;
const gchar *source = adapter_get_address(adapter);
int err;
dbus_bool_t value, void *data)
{
struct btd_device *device = data;
- struct adapter *adapter = device->adapter;
+ struct btd_adapter *adapter = device->adapter;
const gchar *source = adapter_get_address(adapter);
write_trust(source, device->address, GLOBAL_TRUST, value);
static void discover_services_req_exit(void *user_data)
{
struct btd_device *device = user_data;
- struct adapter *adapter = device->adapter;
+ struct btd_adapter *adapter = device->adapter;
bdaddr_t src, dst;
const gchar *source = adapter_get_address(adapter);
DBusMessage *msg, void *user_data)
{
struct btd_device *device = user_data;
- struct adapter *adapter = device->adapter;
+ struct btd_adapter *adapter = device->adapter;
bdaddr_t src, dst;
const gchar *source = adapter_get_address(adapter);
{ }
};
-struct btd_device *device_create(DBusConnection *conn, struct adapter *adapter,
+struct btd_device *device_create(DBusConnection *conn, struct btd_adapter *adapter,
const gchar *address)
{
gchar *address_up;
void device_remove_drivers(struct btd_device *device, GSList *uuids, sdp_list_t *recs)
{
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
const gchar *src = adapter_get_address(adapter);
const gchar *dst = device_get_address(device);
GSList *list;
static void update_services(struct browse_req *req, sdp_list_t *recs)
{
struct btd_device *device = req->device;
- struct adapter *adapter = device_get_adapter(device);
+ struct btd_adapter *adapter = device_get_adapter(device);
const gchar *src = adapter_get_address(adapter);
const gchar *dst = device_get_address(device);
sdp_list_t *seq;
static void store(struct btd_device *device)
{
- struct adapter *adapter = device->adapter;
+ struct btd_adapter *adapter = device->adapter;
bdaddr_t src, dst;
char *str;
const gchar *source = adapter_get_address(adapter);
{
struct browse_req *req = user_data;
struct btd_device *device = req->device;
- struct adapter *adapter = device->adapter;
+ struct btd_adapter *adapter = device->adapter;
bdaddr_t src, dst;
uuid_t uuid;
DBusMessage *reply;
int device_browse(struct btd_device *device, DBusConnection *conn,
DBusMessage *msg, uuid_t *search)
{
- struct adapter *adapter = device->adapter;
+ struct btd_adapter *adapter = device->adapter;
struct browse_req *req;
bdaddr_t src, dst;
uuid_t uuid;
return bt_search_service(&src, &dst, &uuid, browse_cb, req, NULL);
}
-struct adapter *device_get_adapter(struct btd_device *device)
+struct btd_adapter *device_get_adapter(struct btd_device *device)
{
if (!device)
return NULL;
#define DEVICE_INTERFACE "org.bluez.Device"
-struct btd_device *device_create(DBusConnection *conn, struct adapter *adapter,
+struct btd_device *device_create(DBusConnection *conn, struct btd_adapter *adapter,
const gchar *address);
void device_remove(DBusConnection *conn, struct btd_device *device);
gint device_address_cmp(struct btd_device *device, const gchar *address);
int device_browse(struct btd_device *device, DBusConnection *conn,
DBusMessage *msg, uuid_t *search);
void device_probe_drivers(struct btd_device *device, GSList *uuids, sdp_list_t *recs);
-struct adapter *device_get_adapter(struct btd_device *device);
+struct btd_adapter *device_get_adapter(struct btd_device *device);
const gchar *device_get_address(struct btd_device *device);
const gchar *device_get_path(struct btd_device *device);
struct agent *device_get_agent(struct btd_device *device);
int manager_update_adapter(uint16_t dev_id)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
adapter = manager_find_adapter_by_id(dev_id);
if (!adapter)
int manager_get_adapter_class(uint16_t dev_id, uint8_t *cls)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
adapter = manager_find_adapter_by_id(dev_id);
if (!adapter)
int manager_set_adapter_class(uint16_t dev_id, uint8_t *cls)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
adapter = manager_find_adapter_by_id(dev_id);
if (!adapter)
DBusMessage *msg, void *data)
{
DBusMessage *reply;
- struct adapter *adapter;
+ struct btd_adapter *adapter;
const gchar *path;
adapter = manager_find_adapter_by_id(default_adapter_id);
DBusMessage *msg, void *data)
{
DBusMessage *reply;
- struct adapter *adapter;
+ struct btd_adapter *adapter;
struct hci_dev_info di;
const char *pattern;
int dev_id;
DBUS_TYPE_OBJECT_PATH_AS_STRING, &array_iter);
for (l = adapters; l; l = l->next) {
- struct adapter *adapter = l->data;
+ struct btd_adapter *adapter = l->data;
struct hci_dev_info di;
dev_id = adapter_get_dev_id(adapter);
const gchar *path = adapter_get_path(adapter);
static gint adapter_id_cmp(gconstpointer a, gconstpointer b)
{
- struct adapter *adapter = (struct adapter *) a;
+ struct btd_adapter *adapter = (struct btd_adapter *) a;
uint16_t id = GPOINTER_TO_UINT(b);
uint16_t dev_id = adapter_get_dev_id(adapter);
static gint adapter_path_cmp(gconstpointer a, gconstpointer b)
{
- struct adapter *adapter = (struct adapter *) a;
+ struct btd_adapter *adapter = (struct btd_adapter *) a;
const char *path = b;
const gchar *adapter_path = adapter_get_path(adapter);
static gint adapter_address_cmp(gconstpointer a, gconstpointer b)
{
- struct adapter *adapter = (struct adapter *) a;
+ struct btd_adapter *adapter = (struct btd_adapter *) a;
const char *address = b;
const gchar *source = adapter_get_address(adapter);
return strcmp(source, address);
}
-struct adapter *manager_find_adapter(const bdaddr_t *sba)
+struct btd_adapter *manager_find_adapter(const bdaddr_t *sba)
{
GSList *match;
char address[18];
return match->data;
}
-struct adapter *manager_find_adapter_by_path(const char *path)
+struct btd_adapter *manager_find_adapter_by_path(const char *path)
{
GSList *match;
return match->data;
}
-struct adapter *manager_find_adapter_by_id(int id)
+struct btd_adapter *manager_find_adapter_by_id(int id)
{
GSList *match;
return match->data;
}
-static void manager_add_adapter(struct adapter *adapter)
+static void manager_add_adapter(struct btd_adapter *adapter)
{
const gchar *path = adapter_get_path(adapter);
adapters = g_slist_append(adapters, adapter);
}
-static void manager_remove_adapter(struct adapter *adapter)
+static void manager_remove_adapter(struct btd_adapter *adapter)
{
uint16_t dev_id = adapter_get_dev_id(adapter);
const gchar *path = adapter_get_path(adapter);
int manager_register_adapter(int id)
{
- struct adapter *adapter = adapter_create(connection, id);
+ struct btd_adapter *adapter = adapter_create(connection, id);
if (!adapter)
return -1;
int manager_unregister_adapter(int id)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
const gchar *path;
adapter = manager_find_adapter_by_id(id);
int manager_start_adapter(int id)
{
- struct adapter* adapter;
+ struct btd_adapter* adapter;
int ret;
adapter = manager_find_adapter_by_id(id);
int manager_stop_adapter(int id)
{
- struct adapter *adapter;
+ struct btd_adapter *adapter;
adapter = manager_find_adapter_by_id(id);
if (!adapter) {
void manager_set_default_adapter(int id)
{
- struct adapter *adapter = manager_find_adapter_by_id(id);
+ struct btd_adapter *adapter = manager_find_adapter_by_id(id);
const gchar *path = adapter_get_path(adapter);
default_adapter_id = id;
dbus_bool_t manager_init(DBusConnection *conn, const char *path);
void manager_cleanup(DBusConnection *conn, const char *path);
-struct adapter *manager_find_adapter(const bdaddr_t *sba);
-struct adapter *manager_find_adapter_by_path(const char *path);
-struct adapter *manager_find_adapter_by_id(int id);
+struct btd_adapter *manager_find_adapter(const bdaddr_t *sba);
+struct btd_adapter *manager_find_adapter_by_path(const char *path);
+struct btd_adapter *manager_find_adapter_by_id(int id);
int manager_register_adapter(int id);
int manager_unregister_adapter(int id);
int manager_start_adapter(int id);