@@ -1614,7 +1614,7 @@ static void avctp_confirm_cb(GIOChannel *chan, gpointer data)
return;
}
-static GIOChannel *avctp_server_socket(const bdaddr_t *src, gboolean master,
+static GIOChannel *avctp_server_socket(const bdaddr_t *src, gboolean central,
uint8_t mode, uint16_t psm)
{
GError *err = NULL;
@@ -1625,7 +1625,7 @@ static GIOChannel *avctp_server_socket(const bdaddr_t *src, gboolean master,
BT_IO_OPT_SOURCE_BDADDR, src,
BT_IO_OPT_PSM, psm,
BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM,
- BT_IO_OPT_CENTRAL, master,
+ BT_IO_OPT_CENTRAL, central,
BT_IO_OPT_MODE, mode,
BT_IO_OPT_INVALID);
if (!io) {
@@ -1636,20 +1636,20 @@ static GIOChannel *avctp_server_socket(const bdaddr_t *src, gboolean master,
return io;
}
-int avctp_register(struct btd_adapter *adapter, gboolean master)
+int avctp_register(struct btd_adapter *adapter, gboolean central)
{
struct avctp_server *server;
const bdaddr_t *src = btd_adapter_get_address(adapter);
server = g_new0(struct avctp_server, 1);
- server->control_io = avctp_server_socket(src, master, BT_IO_MODE_BASIC,
+ server->control_io = avctp_server_socket(src, central, BT_IO_MODE_BASIC,
AVCTP_CONTROL_PSM);
if (!server->control_io) {
g_free(server);
return -1;
}
- server->browsing_io = avctp_server_socket(src, master, BT_IO_MODE_ERTM,
+ server->browsing_io = avctp_server_socket(src, central, BT_IO_MODE_ERTM,
AVCTP_BROWSING_PSM);
if (!server->browsing_io) {
if (server->control_io) {
@@ -145,7 +145,7 @@ unsigned int avctp_add_state_cb(struct btd_device *dev, avctp_state_cb cb,
void *user_data);
gboolean avctp_remove_state_cb(unsigned int id);
-int avctp_register(struct btd_adapter *adapter, gboolean master);
+int avctp_register(struct btd_adapter *adapter, gboolean central);
void avctp_unregister(struct btd_adapter *adapter);
struct avctp *avctp_connect(struct btd_device *device);
@@ -52,15 +52,15 @@
struct mcap_csp {
uint64_t base_tmstamp; /* CSP base timestamp */
struct timespec base_time; /* CSP base time when timestamp set */
- guint local_caps; /* CSP-Master: have got remote caps */
- guint remote_caps; /* CSP-Slave: remote master got caps */
- guint rem_req_acc; /* CSP-Slave: accuracy required by master */
- guint ind_expected; /* CSP-Master: indication expected */
- uint8_t csp_req; /* CSP-Master: Request control flag */
- guint ind_timer; /* CSP-Slave: indication timer */
- guint set_timer; /* CSP-Slave: delayed set timer */
- void *set_data; /* CSP-Slave: delayed set data */
- void *csp_priv_data; /* CSP-Master: In-flight request data */
+ guint local_caps; /* CSP-Central: have got remote caps */
+ guint remote_caps; /* CSP-Peripheral: remote central got caps */
+ guint rem_req_acc; /* CSP-Peripheral: accuracy required by central */
+ guint ind_expected; /* CSP-Central: indication expected */
+ uint8_t csp_req; /* CSP-Central: Request control flag */
+ guint ind_timer; /* CSP-Peripheral: indication timer */
+ guint set_timer; /* CSP-Peripheral: delayed set timer */
+ void *set_data; /* CSP-Peripheral: delayed set data */
+ void *csp_priv_data; /* CSP-Central: In-flight request data */
};
struct mcap_sync_cap_cbdata {
@@ -3139,7 +3139,7 @@ void mcap_sync_set_req(struct mcap_mcl *mcl, uint8_t update, uint32_t btclock,
g_set_error(err,
MCAP_CSP_ERROR,
MCAP_ERROR_RESOURCE_UNAVAILABLE,
- "Did not get CSP caps from slave yet");
+ "Did not get CSP caps from peripheral yet");
return;
}
@@ -270,7 +270,7 @@ struct mcap_instance {
mcap_mcl_event_cb mcl_reconnected_cb; /* Old MCL has been reconnected */
mcap_mcl_event_cb mcl_disconnected_cb; /* MCL disconnected */
mcap_mcl_event_cb mcl_uncached_cb; /* MCL has been removed from MCAP cache */
- mcap_info_ind_event_cb mcl_sync_infoind_cb; /* (CSP Master) Received info indication */
+ mcap_info_ind_event_cb mcl_sync_infoind_cb; /* (CSP Central) Received info indication */
gpointer user_data; /* Data to be provided in callbacks */
int ref; /* Reference counter */
From: Archie Pusaka <apusaka@chromium.org> BT core spec 5.3 promotes the usage of inclusive languages. This CL replaces some terms with the more appropriate counterparts, such as "central" and "peripheral". --- Changes in v2: * Merging several patches from the same directory into one profiles/audio/avctp.c | 10 +++++----- profiles/audio/avctp.h | 2 +- profiles/health/mcap.c | 20 ++++++++++---------- profiles/health/mcap.h | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-)