[Bluez PATCH v5 07/13] plugins/sixaxis: Inclusive language changes

Archie Pusaka
2021-09-15T08:33:22Z

This CL uses "central" as it is deemed to be more appropriate.
---

(no changes since v1)

plugins/sixaxis.c | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
index 517cecc476..ddecbcccb3 100644
--- a/plugins/sixaxis.c
+++ b/plugins/sixaxis.c
@@ -139,7 +139,7 @@ static int get_device_bdaddr(int fd, bdaddr_t *bdaddr, CablePairingType type)
return -1;
}

-static int sixaxis_get_master_bdaddr(int fd, bdaddr_t *bdaddr)
+static int sixaxis_get_central_bdaddr(int fd, bdaddr_t *bdaddr)
{
uint8_t buf[8];
int ret;
@@ -150,7 +150,7 @@ static int sixaxis_get_master_bdaddr(int fd, bdaddr_t *bdaddr)

ret = ioctl(fd, HIDIOCGFEATURE(sizeof(buf)), buf);
if (ret < 0) {
- error("sixaxis: failed to read master address (%s)",
+ error("sixaxis: failed to read central address (%s)",
strerror(errno));
return ret;
}
@@ -160,7 +160,7 @@ static int sixaxis_get_master_bdaddr(int fd, bdaddr_t *bdaddr)
return 0;
}

-static int ds4_get_master_bdaddr(int fd, bdaddr_t *bdaddr)
+static int ds4_get_central_bdaddr(int fd, bdaddr_t *bdaddr)
{
uint8_t buf[16];
int ret;
@@ -171,7 +171,7 @@ static int ds4_get_master_bdaddr(int fd, bdaddr_t *bdaddr)

ret = ioctl(fd, HIDIOCGFEATURE(sizeof(buf)), buf);
if (ret < 0) {
- error("sixaxis: failed to read DS4 master address (%s)",
+ error("sixaxis: failed to read DS4 central address (%s)",
strerror(errno));
return ret;
}
@@ -182,16 +182,16 @@ static int ds4_get_master_bdaddr(int fd, bdaddr_t *bdaddr)
return 0;
}

-static int get_master_bdaddr(int fd, bdaddr_t *bdaddr, CablePairingType type)
+static int get_central_bdaddr(int fd, bdaddr_t *bdaddr, CablePairingType type)
{
if (type == CABLE_PAIRING_SIXAXIS)
- return sixaxis_get_master_bdaddr(fd, bdaddr);
+ return sixaxis_get_central_bdaddr(fd, bdaddr);
else if (type == CABLE_PAIRING_DS4)
- return ds4_get_master_bdaddr(fd, bdaddr);
+ return ds4_get_central_bdaddr(fd, bdaddr);
return -1;
}

-static int sixaxis_set_master_bdaddr(int fd, const bdaddr_t *bdaddr)
+static int sixaxis_set_central_bdaddr(int fd, const bdaddr_t *bdaddr)
{
uint8_t buf[8];
int ret;
@@ -203,13 +203,13 @@ static int sixaxis_set_master_bdaddr(int fd, const bdaddr_t *bdaddr)

ret = ioctl(fd, HIDIOCSFEATURE(sizeof(buf)), buf);
if (ret < 0)
- error("sixaxis: failed to write master address (%s)",
+ error("sixaxis: failed to write central address (%s)",
strerror(errno));

return ret;
}

-static int ds4_set_master_bdaddr(int fd, const bdaddr_t *bdaddr)
+static int ds4_set_central_bdaddr(int fd, const bdaddr_t *bdaddr)
{
uint8_t buf[23];
int ret;
@@ -223,19 +223,19 @@ static int ds4_set_master_bdaddr(int fd, const bdaddr_t *bdaddr)

ret = ioctl(fd, HIDIOCSFEATURE(sizeof(buf)), buf);
if (ret < 0)
- error("sixaxis: failed to write DS4 master address (%s)",
+ error("sixaxis: failed to write DS4 central address (%s)",
strerror(errno));

return ret;
}

-static int set_master_bdaddr(int fd, const bdaddr_t *bdaddr,
+static int set_central_bdaddr(int fd, const bdaddr_t *bdaddr,
CablePairingType type)
{
if (type == CABLE_PAIRING_SIXAXIS)
- return sixaxis_set_master_bdaddr(fd, bdaddr);
+ return sixaxis_set_central_bdaddr(fd, bdaddr);
else if (type == CABLE_PAIRING_DS4)
- return ds4_set_master_bdaddr(fd, bdaddr);
+ return ds4_set_central_bdaddr(fd, bdaddr);
return -1;
}

@@ -267,8 +267,8 @@ static void agent_auth_cb(DBusError *derr, void *user_data)
{
struct authentication_closure *closure = user_data;
struct authentication_destroy_closure *destroy;
- char master_addr[18], adapter_addr[18], device_addr[18];
- bdaddr_t master_bdaddr;
+ char central_addr[18], adapter_addr[18], device_addr[18];
+ bdaddr_t central_bdaddr;
const bdaddr_t *adapter_bdaddr;
bool remove_device = true;

@@ -283,12 +283,12 @@ static void agent_auth_cb(DBusError *derr, void *user_data)
goto out;
}

- if (get_master_bdaddr(closure->fd, &master_bdaddr, closure->type) < 0)
+ if (get_central_bdaddr(closure->fd, &central_bdaddr, closure->type) < 0)
goto out;

adapter_bdaddr = btd_adapter_get_address(closure->adapter);
- if (bacmp(adapter_bdaddr, &master_bdaddr)) {
- if (set_master_bdaddr(closure->fd, adapter_bdaddr,
+ if (bacmp(adapter_bdaddr, &central_bdaddr)) {
+ if (set_central_bdaddr(closure->fd, adapter_bdaddr,
closure->type) < 0)
goto out;
}
@@ -302,10 +302,10 @@ static void agent_auth_cb(DBusError *derr, void *user_data)
SIXAXIS_HID_SDP_RECORD);

ba2str(&closure->bdaddr, device_addr);
- ba2str(&master_bdaddr, master_addr);
+ ba2str(&central_bdaddr, central_addr);
ba2str(adapter_bdaddr, adapter_addr);
- DBG("remote %s old_master %s new_master %s",
- device_addr, master_addr, adapter_addr);
+ DBG("remote %s old_central %s new_central %s",
+ device_addr, central_addr, adapter_addr);

out:
g_hash_table_steal(pending_auths, closure->sysfs_path);
--
2.33.0.464.g1972c5931b-goog