mirror of git://git.sysmocom.de/ofono
bluez5: Rename BlueZ Profile registration functions
This patch renames external profile registration functions replacing the prefix from 'bluetooth_' to 'bt_' in order to follow the name convention adopted for bluez5 functions.
This commit is contained in:
parent
f93a6a2d06
commit
86224f5724
|
@ -101,7 +101,7 @@ done:
|
|||
dbus_message_unref(reply);
|
||||
}
|
||||
|
||||
int bluetooth_register_profile(DBusConnection *conn, const char *uuid,
|
||||
int bt_register_profile(DBusConnection *conn, const char *uuid,
|
||||
const char *name, const char *object)
|
||||
{
|
||||
DBusMessageIter iter, dict;
|
||||
|
@ -136,7 +136,7 @@ int bluetooth_register_profile(DBusConnection *conn, const char *uuid,
|
|||
return 0;
|
||||
}
|
||||
|
||||
void bluetooth_unregister_profile(DBusConnection *conn, const char *object)
|
||||
void bt_unregister_profile(DBusConnection *conn, const char *object)
|
||||
{
|
||||
DBusMessageIter iter;
|
||||
DBusPendingCall *c;
|
||||
|
|
|
@ -69,7 +69,7 @@ int bt_ba2str(const bdaddr_t *ba, char *str);
|
|||
|
||||
int bt_bacmp(const bdaddr_t *ba1, const bdaddr_t *ba2);
|
||||
|
||||
int bluetooth_register_profile(DBusConnection *conn, const char *uuid,
|
||||
int bt_register_profile(DBusConnection *conn, const char *uuid,
|
||||
const char *name, const char *object);
|
||||
|
||||
void bluetooth_unregister_profile(DBusConnection *conn, const char *object);
|
||||
void bt_unregister_profile(DBusConnection *conn, const char *object);
|
||||
|
|
|
@ -163,7 +163,7 @@ static void sim_state_watch(enum ofono_sim_state new_state, void *data)
|
|||
if (modems != NULL)
|
||||
return;
|
||||
|
||||
bluetooth_unregister_profile(conn, HFP_AG_EXT_PROFILE_PATH);
|
||||
bt_unregister_profile(conn, HFP_AG_EXT_PROFILE_PATH);
|
||||
|
||||
return;
|
||||
}
|
||||
|
@ -176,7 +176,7 @@ static void sim_state_watch(enum ofono_sim_state new_state, void *data)
|
|||
if (modems->next != NULL)
|
||||
return;
|
||||
|
||||
bluetooth_register_profile(conn, HFP_AG_UUID, "hfp_ag",
|
||||
bt_register_profile(conn, HFP_AG_UUID, "hfp_ag",
|
||||
HFP_AG_EXT_PROFILE_PATH);
|
||||
}
|
||||
|
||||
|
|
|
@ -429,7 +429,7 @@ static void connect_handler(DBusConnection *conn, void *user_data)
|
|||
{
|
||||
DBG("Registering External Profile handler ...");
|
||||
|
||||
bluetooth_register_profile(conn, HFP_HS_UUID, "hfp_hf",
|
||||
bt_register_profile(conn, HFP_HS_UUID, "hfp_hf",
|
||||
HFP_EXT_PROFILE_PATH);
|
||||
}
|
||||
|
||||
|
@ -606,7 +606,7 @@ static void hfp_exit(void)
|
|||
{
|
||||
DBusConnection *conn = ofono_dbus_get_connection();
|
||||
|
||||
bluetooth_unregister_profile(conn, HFP_EXT_PROFILE_PATH);
|
||||
bt_unregister_profile(conn, HFP_EXT_PROFILE_PATH);
|
||||
g_dbus_unregister_interface(conn, HFP_EXT_PROFILE_PATH,
|
||||
BLUEZ_PROFILE_INTERFACE);
|
||||
ofono_modem_driver_unregister(&hfp_driver);
|
||||
|
|
Loading…
Reference in New Issue