From 18614bd2b008cb9f3879990883c569c37b72f195 Mon Sep 17 00:00:00 2001 From: Alok Barsode Date: Thu, 4 Sep 2008 16:03:43 +0530 Subject: Renaming struct adapter to struct btd_adapter. --- audio/manager.c | 16 ++--- input/manager.c | 4 +- network/manager.c | 18 +++--- plugins/echo.c | 4 +- plugins/service.c | 8 +-- serial/manager.c | 6 +- src/adapter.c | 186 +++++++++++++++++++++++++++--------------------------- src/adapter.h | 92 +++++++++++++-------------- src/agent.c | 8 +-- src/agent.h | 2 +- src/dbus-common.c | 2 +- src/dbus-hci.c | 50 +++++++-------- src/dbus-hci.h | 4 +- src/device.c | 28 ++++---- src/device.h | 4 +- src/manager.c | 38 +++++------ src/manager.h | 6 +- 17 files changed, 238 insertions(+), 238 deletions(-) diff --git a/audio/manager.c b/audio/manager.c index f4905ea9..4f31bb46 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -673,7 +673,7 @@ static int gateway_server_init(struct audio_adapter *adapter) 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; @@ -726,7 +726,7 @@ static struct audio_adapter *create_audio_adapter(const char *path, bdaddr_t *sr 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); @@ -747,7 +747,7 @@ static struct audio_adapter *get_audio_adapter(struct adapter *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); @@ -761,7 +761,7 @@ static int headset_server_probe(struct adapter *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); @@ -793,7 +793,7 @@ static void headset_server_remove(struct adapter *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); @@ -807,7 +807,7 @@ static int gateway_server_probe(struct adapter *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); @@ -829,7 +829,7 @@ static void gateway_server_remove(struct adapter *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); @@ -843,7 +843,7 @@ static int a2dp_server_probe(struct adapter *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); diff --git a/input/manager.c b/input/manager.c index 68b4c1c1..dfd2da3a 100644 --- a/input/manager.c +++ b/input/manager.c @@ -173,7 +173,7 @@ static void input_remove(struct btd_device *device, const char *uuid) 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; @@ -213,7 +213,7 @@ static void hid_remove(struct btd_device *device) 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; diff --git a/network/manager.c b/network/manager.c index 8067b821..d85ac48f 100644 --- a/network/manager.c +++ b/network/manager.c @@ -55,7 +55,7 @@ static DBusConnection *connection = NULL; 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; @@ -110,7 +110,7 @@ static void nap_remove(struct btd_device *device) 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; @@ -127,7 +127,7 @@ static int network_server_probe(struct adapter *adapter, uint16_t id) 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); @@ -136,32 +136,32 @@ static void network_server_remove(struct adapter *adapter, uint16_t id) 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); } diff --git a/plugins/echo.c b/plugins/echo.c index ead488e4..dcb57949 100644 --- a/plugins/echo.c +++ b/plugins/echo.c @@ -123,7 +123,7 @@ static GIOChannel *setup_rfcomm(uint8_t channel) 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); @@ -134,7 +134,7 @@ static int echo_probe(struct adapter *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); diff --git a/plugins/service.c b/plugins/service.c index 03820198..4ec8cca0 100644 --- a/plugins/service.c +++ b/plugins/service.c @@ -430,7 +430,7 @@ static int remove_record(DBusConnection *conn, const char *sender, 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; @@ -460,7 +460,7 @@ static DBusMessage *add_service_record(DBusConnection *conn, 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); @@ -517,7 +517,7 @@ static void path_unregister(void *data) 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); @@ -537,7 +537,7 @@ static int service_probe(struct adapter *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); diff --git a/serial/manager.c b/serial/manager.c index eb575d58..f4687ccd 100644 --- a/serial/manager.c +++ b/serial/manager.c @@ -77,7 +77,7 @@ static DBusConnection *connection = NULL; 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; @@ -150,7 +150,7 @@ static struct btd_device_driver serial_dialup_driver = { .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); @@ -162,7 +162,7 @@ static int proxy_probe(struct adapter *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); diff --git a/src/adapter.c b/src/adapter.c index ebc72f63..36cac369 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -80,12 +80,12 @@ struct record_list { }; 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 { @@ -93,7 +93,7 @@ struct service_auth { void *user_data; }; -struct adapter { +struct btd_adapter { uint16_t dev_id; int up; char *path; /* adapter object path */ @@ -288,7 +288,7 @@ static int auth_req_cmp(const void *p1, const void *p2) 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; @@ -300,7 +300,7 @@ struct pending_auth_info *adapter_find_auth_request(struct adapter *adapter, 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; @@ -316,7 +316,7 @@ void adapter_remove_auth_request(struct adapter *adapter, bdaddr_t *dba) 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) { @@ -336,7 +336,7 @@ struct pending_auth_info *adapter_new_auth_request(struct adapter *adapter, 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; @@ -388,7 +388,7 @@ static void device_agent_removed(struct agent *agent, void *user_data) 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); @@ -404,7 +404,7 @@ static void device_agent_removed(struct agent *agent, void *user_data) 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) @@ -483,7 +483,7 @@ static uint8_t str2mode(const char *addr, const char *mode) 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; @@ -617,7 +617,7 @@ static struct session_req *find_session(GSList *list, DBusMessage *msg) 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, @@ -644,7 +644,7 @@ static void session_unref(struct session_req *req) 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) { @@ -693,7 +693,7 @@ cleanup: 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; @@ -720,7 +720,7 @@ static DBusMessage *set_discoverable_timeout(DBusConnection *conn, uint32_t timeout, void *data) { - struct adapter *adapter = data; + struct btd_adapter *adapter = data; bdaddr_t bdaddr; const char *path; @@ -764,7 +764,7 @@ static void update_ext_inquiry_response(int dd, struct hci_dev *dev) 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; @@ -805,7 +805,7 @@ static int adapter_set_name(struct adapter *adapter, const char *name) 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; @@ -843,7 +843,7 @@ static void reply_authentication_failure(struct bonding_request_info *bonding) } } -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; @@ -862,7 +862,7 @@ struct btd_device *adapter_find_device(struct adapter *adapter, const char *dest } 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; @@ -882,7 +882,7 @@ struct btd_device *adapter_create_device(DBusConnection *conn, 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; @@ -966,7 +966,7 @@ done: } -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; @@ -1000,7 +1000,7 @@ void adapter_remove_device(DBusConnection *conn, struct adapter *adapter, } 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; @@ -1016,7 +1016,7 @@ struct btd_device *adapter_get_device(DBusConnection *conn, 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]; @@ -1031,7 +1031,7 @@ void remove_pending_device(struct adapter *adapter) } 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; @@ -1199,7 +1199,7 @@ static void cancel_auth_request(struct pending_auth_info *auth, int dev_id) 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"); @@ -1227,7 +1227,7 @@ static DBusMessage *create_bonding(DBusConnection *conn, DBusMessage *msg, { 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; @@ -1290,7 +1290,7 @@ static DBusMessage *create_bonding(DBusConnection *conn, DBusMessage *msg, 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)); @@ -1311,7 +1311,7 @@ static void discover_req_exit(void *user_data) cancel_periodic_discovery(adapter); } -int start_inquiry(struct adapter *adapter) +int start_inquiry(struct btd_adapter *adapter) { inquiry_cp cp; evt_cmd_status rp; @@ -1362,7 +1362,7 @@ int start_inquiry(struct adapter *adapter) 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; @@ -1417,7 +1417,7 @@ static DBusMessage *adapter_discover_devices(DBusConnection *conn, DBusMessage *msg, void *data) { struct session_req *req; - struct adapter *adapter = data; + struct btd_adapter *adapter = data; int err; if (!adapter->up) @@ -1453,7 +1453,7 @@ done: 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; @@ -1503,7 +1503,7 @@ struct remote_device_list_t { 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; @@ -1567,7 +1567,7 @@ static DBusMessage *get_properties(DBusConnection *conn, 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; @@ -1627,7 +1627,7 @@ static DBusMessage *set_property(DBusConnection *conn, 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)); @@ -1643,7 +1643,7 @@ static DBusMessage *request_mode(DBusConnection *conn, 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; @@ -1688,7 +1688,7 @@ static DBusMessage *request_mode(DBusConnection *conn, 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); @@ -1704,7 +1704,7 @@ static DBusMessage *release_mode(DBusConnection *conn, 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; @@ -1742,7 +1742,7 @@ static DBusMessage *list_devices(DBusConnection *conn, 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; @@ -1820,7 +1820,7 @@ static gint device_path_cmp(struct btd_device *device, const gchar *path) 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; @@ -1850,7 +1850,7 @@ static DBusMessage *remove_device(DBusConnection *conn, 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; @@ -1888,7 +1888,7 @@ static DBusMessage *find_device(DBusConnection *conn, 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; @@ -1909,7 +1909,7 @@ static DBusMessage *register_agent(DBusConnection *conn, { 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, @@ -1946,7 +1946,7 @@ static DBusMessage *unregister_agent(DBusConnection *conn, 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)) @@ -2052,7 +2052,7 @@ static int device_read_bdaddr(uint16_t dev_id, const char *address) 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 }; @@ -2161,7 +2161,7 @@ static void create_stored_device_from_profiles(char *key, char *value, 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; @@ -2196,7 +2196,7 @@ static void create_stored_device_from_profiles(char *key, char *value, 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, @@ -2210,7 +2210,7 @@ static void create_stored_device_from_linkkeys(char *key, char *value, } } -static void load_devices(struct adapter *adapter) +static void load_devices(struct btd_adapter *adapter) { char filename[PATH_MAX + 1]; @@ -2221,7 +2221,7 @@ static void load_devices(struct adapter *adapter) 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; @@ -2243,7 +2243,7 @@ static int get_discoverable_timeout(const char *src) 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; @@ -2319,7 +2319,7 @@ static void adapter_up(struct adapter *adapter, int dd) 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; @@ -2424,7 +2424,7 @@ setup: return 0; } -static void reply_pending_requests(struct adapter *adapter) +static void reply_pending_requests(struct btd_adapter *adapter) { DBusMessage *reply; @@ -2461,7 +2461,7 @@ static void reply_pending_requests(struct adapter *adapter) } } -static void unload_drivers(struct adapter *adapter) +static void unload_drivers(struct btd_adapter *adapter) { GSList *l; @@ -2473,7 +2473,7 @@ static void unload_drivers(struct adapter *adapter) } } -int adapter_stop(struct adapter *adapter) +int adapter_stop(struct btd_adapter *adapter) { const char *mode = "off"; @@ -2533,7 +2533,7 @@ int adapter_stop(struct adapter *adapter) return 0; } -int adapter_update(struct adapter *adapter) +int adapter_update(struct btd_adapter *adapter) { struct hci_dev *dev = &adapter->dev; int dd; @@ -2556,7 +2556,7 @@ int adapter_update(struct adapter *adapter) 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; @@ -2565,7 +2565,7 @@ int adapter_get_class(struct adapter *adapter, uint8_t *cls) 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; @@ -2574,7 +2574,7 @@ int adapter_set_class(struct adapter *adapter, uint8_t *cls) 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; @@ -2589,7 +2589,7 @@ int adapter_update_ssp_mode(struct adapter *adapter, int dd, uint8_t mode) 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; @@ -2600,17 +2600,17 @@ static void adapter_free(gpointer user_data) 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); @@ -2632,7 +2632,7 @@ struct adapter *adapter_create(DBusConnection *conn, int id) return adapter; } -void adapter_remove(struct adapter *adapter) +void adapter_remove(struct btd_adapter *adapter) { GSList *l; char *path = g_strdup(adapter->path); @@ -2648,12 +2648,12 @@ void adapter_remove(struct adapter *adapter) 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; @@ -2661,7 +2661,7 @@ const gchar *adapter_get_path(struct adapter *adapter) return adapter->path; } -const gchar *adapter_get_address(struct adapter *adapter) +const gchar *adapter_get_address(struct btd_adapter *adapter) { if (!adapter) return NULL; @@ -2671,7 +2671,7 @@ const gchar *adapter_get_address(struct adapter *adapter) 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; @@ -2718,7 +2718,7 @@ failed: 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; @@ -2731,7 +2731,7 @@ void adapter_set_discov_timeout(struct adapter *adapter, guint interval) 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; @@ -2743,7 +2743,7 @@ void adapter_remove_discov_timeout(struct adapter *adapter) 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; @@ -2751,12 +2751,12 @@ void adapter_set_scan_mode(struct adapter *adapter, uint8_t scan_mode) 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; @@ -2764,12 +2764,12 @@ void adapter_set_mode(struct adapter *adapter, uint8_t mode) 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; @@ -2807,12 +2807,12 @@ done: 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; @@ -2835,7 +2835,7 @@ int dev_rssi_cmp(struct remote_dev_info *d1, struct remote_dev_info *d2) 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; @@ -2876,7 +2876,7 @@ int adapter_add_found_device(struct adapter *adapter, bdaddr_t *bdaddr, 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; @@ -2893,7 +2893,7 @@ int adapter_remove_found_device(struct adapter *adapter, bdaddr_t *bdaddr) 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; @@ -2914,7 +2914,7 @@ void adapter_update_oor_devices(struct adapter *adapter) } } -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; @@ -2928,7 +2928,7 @@ void adapter_remove_oor_device(struct adapter *adapter, char *peer_addr) } } -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); @@ -2972,7 +2972,7 @@ void adapter_mode_changed(struct adapter *adapter, uint8_t scan_mode) 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; @@ -2980,7 +2980,7 @@ struct agent *adapter_get_agent(struct adapter *adapter) 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; @@ -2996,7 +2996,7 @@ void adapter_add_active_conn(struct adapter *adapter, bdaddr_t *bdaddr, 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) @@ -3006,7 +3006,7 @@ void adapter_remove_active_conn(struct adapter *adapter, 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; @@ -3022,7 +3022,7 @@ struct active_conn_info *adapter_search_active_conn_by_bdaddr(struct adapter *ad 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; @@ -3038,7 +3038,7 @@ struct active_conn_info *adapter_search_active_conn_by_handle(struct adapter *ad 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); @@ -3052,7 +3052,7 @@ void adapter_free_bonding_request(struct adapter *adapter) 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; @@ -3060,7 +3060,7 @@ struct bonding_request_info *adapter_get_bonding_info(struct adapter *adapter) 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; @@ -3093,7 +3093,7 @@ int btd_request_authorization(const bdaddr_t *src, const bdaddr_t *dst, 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]; @@ -3146,7 +3146,7 @@ int btd_request_authorization(const bdaddr_t *src, const bdaddr_t *dst, 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]; diff --git a/src/adapter.h b/src/adapter.h index d8293d35..1071c69c 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -56,7 +56,7 @@ struct remote_dev_info { struct bonding_request_info { DBusConnection *conn; DBusMessage *msg; - struct adapter *adapter; + struct btd_adapter *adapter; bdaddr_t bdaddr; GIOChannel *io; guint io_id; @@ -92,77 +92,77 @@ struct hci_dev { 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); diff --git a/src/agent.c b/src/agent.c index ae530f98..44ce3b11 100644 --- a/src/agent.c +++ b/src/agent.c @@ -60,7 +60,7 @@ typedef enum { } agent_request_type_t; struct agent { - struct adapter *adapter; + struct btd_adapter *adapter; char *name; char *path; uint8_t capability; @@ -190,7 +190,7 @@ static void agent_free(struct agent *agent) 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) { @@ -364,7 +364,7 @@ static void pincode_reply(DBusPendingCall *call, void *user_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; @@ -700,7 +700,7 @@ failed: 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; diff --git a/src/agent.h b/src/agent.h index 291e7a15..3846d14e 100644 --- a/src/agent.h +++ b/src/agent.h @@ -35,7 +35,7 @@ typedef void (*agent_passkey_cb) (struct agent *agent, DBusError *err, 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); diff --git a/src/dbus-common.c b/src/dbus-common.c index c7853d29..e9295998 100644 --- a/src/dbus-common.c +++ b/src/dbus-common.c @@ -181,7 +181,7 @@ void hcid_dbus_unregister(void) for (i = 0; children[i]; i++) { char path[MAX_PATH_LENGTH]; - struct adapter *adapter; + struct btd_adapter *adapter; if (children[i][0] != 'h') continue; diff --git a/src/dbus-hci.c b/src/dbus-hci.c index 9c667e7f..3776456c 100644 --- a/src/dbus-hci.c +++ b/src/dbus-hci.c @@ -118,7 +118,7 @@ DBusMessage *new_authentication_return(DBusMessage *msg, uint8_t status) 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; @@ -172,7 +172,7 @@ done: 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; @@ -218,7 +218,7 @@ int hcid_dbus_request_pin(int dev, bdaddr_t *sba, struct hci_conn_info *ci) 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; @@ -260,7 +260,7 @@ static void passkey_cb(struct agent *agent, DBusError *err, uint32_t passkey, 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; @@ -340,7 +340,7 @@ static int get_auth_requirements(bdaddr_t *local, bdaddr_t *remote, 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]; @@ -423,7 +423,7 @@ int hcid_dbus_user_confirm(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) 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]; @@ -463,7 +463,7 @@ int hcid_dbus_user_passkey(bdaddr_t *sba, bdaddr_t *dba) 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]; @@ -503,7 +503,7 @@ int hcid_dbus_user_notify(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey) 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; @@ -600,7 +600,7 @@ cleanup: void hcid_dbus_inquiry_start(bdaddr_t *local) { - struct adapter *adapter; + struct btd_adapter *adapter; int state; adapter = manager_find_adapter(local); @@ -627,7 +627,7 @@ void hcid_dbus_inquiry_start(bdaddr_t *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; @@ -697,7 +697,7 @@ static int found_device_req_name(struct adapter *adapter) void hcid_dbus_inquiry_complete(bdaddr_t *local) { - struct adapter *adapter; + struct btd_adapter *adapter; const gchar *path; int state; @@ -736,7 +736,7 @@ void hcid_dbus_inquiry_complete(bdaddr_t *local) 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 */ @@ -756,7 +756,7 @@ void hcid_dbus_periodic_inquiry_start(bdaddr_t *local, uint8_t status) 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 */ @@ -850,7 +850,7 @@ void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, 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; @@ -954,7 +954,7 @@ void hcid_dbus_remote_class(bdaddr_t *local, bdaddr_t *peer, uint32_t class) 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; @@ -985,7 +985,7 @@ void hcid_dbus_remote_class(bdaddr_t *local, bdaddr_t *peer, uint32_t class) 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; @@ -1024,7 +1024,7 @@ void hcid_dbus_conn_complete(bdaddr_t *local, uint8_t status, uint16_t handle, { 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; @@ -1073,7 +1073,7 @@ void hcid_dbus_disconn_complete(bdaddr_t *local, uint8_t status, 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; @@ -1253,7 +1253,7 @@ void hcid_dbus_setname_complete(bdaddr_t *local) 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; @@ -1304,7 +1304,7 @@ failed: 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; @@ -1338,7 +1338,7 @@ void hcid_dbus_write_class_complete(bdaddr_t *local) 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; @@ -1374,7 +1374,7 @@ void hcid_dbus_write_simple_pairing_mode_complete(bdaddr_t *local) 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]; @@ -1434,7 +1434,7 @@ int hcid_dbus_get_io_cap(bdaddr_t *local, bdaddr_t *remote, 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]; @@ -1508,7 +1508,7 @@ static int remote_name_cancel(int dd, bdaddr_t *dba, int to) 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; @@ -1569,7 +1569,7 @@ static int periodic_inquiry_exit(int dd, int to) 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; diff --git a/src/dbus-hci.h b/src/dbus-hci.h index 2d78edc3..fb9dac96 100644 --- a/src/dbus-hci.h +++ b/src/dbus-hci.h @@ -50,8 +50,8 @@ int unregister_adapter_path(const char *path); 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); diff --git a/src/device.c b/src/device.c index 5ebbdbc6..6ea9c5cc 100644 --- a/src/device.c +++ b/src/device.c @@ -66,7 +66,7 @@ struct btd_driver_data { struct btd_device { gchar *address; gchar *path; - struct adapter *adapter; + struct btd_adapter *adapter; GSList *uuids; GSList *drivers; /* List of driver_data */ gboolean temporary; @@ -122,7 +122,7 @@ static void device_free(gpointer user_data) 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); @@ -140,7 +140,7 @@ static DBusMessage *get_properties(DBusConnection *conn, 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; @@ -239,7 +239,7 @@ static DBusMessage *set_alias(DBusConnection *conn, DBusMessage *msg, 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; @@ -262,7 +262,7 @@ static DBusMessage *set_trust(DBusConnection *conn, DBusMessage *msg, 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); @@ -325,7 +325,7 @@ static DBusMessage *set_property(DBusConnection *conn, 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); @@ -378,7 +378,7 @@ static DBusMessage *cancel_discover(DBusConnection *conn, 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); @@ -482,7 +482,7 @@ static GDBusSignalTable device_signals[] = { { } }; -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; @@ -619,7 +619,7 @@ void device_probe_drivers(struct btd_device *device, GSList *uuids, sdp_list_t * 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; @@ -769,7 +769,7 @@ static void services_changed(struct browse_req *req) 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; @@ -809,7 +809,7 @@ static void update_services(struct browse_req *req, sdp_list_t *recs) 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); @@ -831,7 +831,7 @@ static void browse_cb(sdp_list_t *recs, int err, gpointer user_data) { 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; @@ -919,7 +919,7 @@ cleanup: 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; @@ -957,7 +957,7 @@ int device_browse(struct btd_device *device, DBusConnection *conn, 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; diff --git a/src/device.h b/src/device.h index bbb0846f..95b5e596 100644 --- a/src/device.h +++ b/src/device.h @@ -24,14 +24,14 @@ #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); diff --git a/src/manager.c b/src/manager.c index e0ad5e17..793cb497 100644 --- a/src/manager.c +++ b/src/manager.c @@ -54,7 +54,7 @@ static GSList *adapters = NULL; 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) @@ -65,7 +65,7 @@ int manager_update_adapter(uint16_t dev_id) 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) @@ -76,7 +76,7 @@ int manager_get_adapter_class(uint16_t dev_id, uint8_t *cls) 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) @@ -147,7 +147,7 @@ static DBusMessage *default_adapter(DBusConnection *conn, 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); @@ -170,7 +170,7 @@ static DBusMessage *find_adapter(DBusConnection *conn, DBusMessage *msg, void *data) { DBusMessage *reply; - struct adapter *adapter; + struct btd_adapter *adapter; struct hci_dev_info di; const char *pattern; int dev_id; @@ -231,7 +231,7 @@ static DBusMessage *list_adapters(DBusConnection *conn, 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); @@ -281,7 +281,7 @@ void manager_cleanup(DBusConnection *conn, const char *path) 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); @@ -290,7 +290,7 @@ static gint adapter_id_cmp(gconstpointer a, gconstpointer b) 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); @@ -299,14 +299,14 @@ static gint adapter_path_cmp(gconstpointer a, gconstpointer b) 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]; @@ -320,7 +320,7 @@ struct adapter *manager_find_adapter(const bdaddr_t *sba) 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; @@ -331,7 +331,7 @@ struct adapter *manager_find_adapter_by_path(const char *path) return match->data; } -struct adapter *manager_find_adapter_by_id(int id) +struct btd_adapter *manager_find_adapter_by_id(int id) { GSList *match; @@ -342,7 +342,7 @@ struct adapter *manager_find_adapter_by_id(int id) 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); @@ -354,7 +354,7 @@ static void manager_add_adapter(struct adapter *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); @@ -376,7 +376,7 @@ static void manager_remove_adapter(struct adapter *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; @@ -388,7 +388,7 @@ int manager_register_adapter(int id) int manager_unregister_adapter(int id) { - struct adapter *adapter; + struct btd_adapter *adapter; const gchar *path; adapter = manager_find_adapter_by_id(id); @@ -408,7 +408,7 @@ int manager_unregister_adapter(int id) int manager_start_adapter(int id) { - struct adapter* adapter; + struct btd_adapter* adapter; int ret; adapter = manager_find_adapter_by_id(id); @@ -429,7 +429,7 @@ int manager_start_adapter(int id) int manager_stop_adapter(int id) { - struct adapter *adapter; + struct btd_adapter *adapter; adapter = manager_find_adapter_by_id(id); if (!adapter) { @@ -447,7 +447,7 @@ int manager_get_default_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; diff --git a/src/manager.h b/src/manager.h index 99bc26c3..a4c26313 100644 --- a/src/manager.h +++ b/src/manager.h @@ -27,9 +27,9 @@ 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); -- cgit