Hi Archie, On Fri, Aug 13, 2021 at 5:19 AM Archie Pusaka <apusaka@xxxxxxxxxx> wrote: > > From: Archie Pusaka <apusaka@xxxxxxxxxxxx> > > > Hi BlueZ maintainers, > > This series of patches promotes the usage of the more inclusive terms > such as central/peripheral, accept list/reject list, or their > equivalent where appropriate. > > This is also reflected on the changes to Core spec v5.3 and the > appropriate language mapping table by Bluetooth SIG > https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf > > I tried to make the changes for each patch as local as possible, > hopefully this could ease the adoption for downstream. As a side > effect, I ended up with more patches than I had hoped before. > > Do take note that some patches, most notably the ones ending with > "* storing LTK", will break the stored data, thus perhaps are not > suitable to be merged as is. I don't have the plan to write patch to > support both the old and the replacement version since that would > still left us the less inclusive terms on the code base, but with > additional complexity. > > Some other patches, mainly those on tools/* change the output or > input parameter to tools, this might come as a surprise for users who > uses another program that depends on the i/o parameter of those tools. > > I leave the discretion of choosing which patches are better to be left > out to you. > > Thanks, > Archie > > > Archie Pusaka (62): > lib: Inclusive language in HCI commands and events > lib: Inclusive language in consts and strings > tools/hciconfig: Inclusive language update > core: Inclusive language for l2cap > core: Inclusive language for rfcomm > lib: Inclusive language for filtering devices > lib/mgmt: Inclusive language for LTK > doc/mgmt: Inclusive language update > btio: Inclusive language changes > shared/ad: Inclusive language changes > shared/hfp: Inclusive language changes > monitor: Inclusive language in struct member > monitor: Inclusive language in SMP related things > monitor: Inclusive language in LE states > monitor: Inclusive language in LL feature > monitor: Inclusive language in link key transaction > monitor: Inclusive language in peripheral broadcast > monitor: Inclusive language in peripheral page response timeout > monitor: Inclusive language in consts and strings > monitor: Inclusive language in filtering devices > emulator: Inclusive language in naming > emulator: Inclusive language in strings > emulator: Inclusive language in filtering device > tools: Inclusive language in referring the central address > tools/parser/hci: Inclusive language changes > tools/parser/smp: Inclusive language changes > tools/3dsp: Inclusive language changes > tools/mgmt-tester: Inclusive language changes > tools/bdaddr: Inclusive language changes > tools/hciconfig: Inclusive language changes > tools/meshctl: Inclusive language changes > tools/mgmt-tester: Inclusive language changes > tools/parser: Inclusive language in struct member > tools/parser/lmp: Inclusive language changes > tools/parser/avdtp: Inclusive language changes > tools/parser/csr: Inclusive language changes > tools/btpclientctl: Inclusive language changes > tools/l2cap-tester: Inclusive language changes > tools/hci-tester: Inclusive language changes > tools/btiotest: Inclusive language changes > tools/hcitool: Inclusive language changes, central peripheral > tools/hcitool: Inclusive language changes, accept list > tools/l2test: Inclusive language changes > tools/rctest: Inclusive language changes > tools/rfcomm: Inclusive language changes > plugins/sixaxis: Inclusive language changes > profiles/audio: Inclusive language changes > profiles/health: Inclusive language changes > sdp: Inclusive language changes > adapter: Inclusive language for central and peripheral > adapter: Inclusive language for storing LTK > adapter: Inclusive language for device filtering > client: Inclusive language changes > mesh: Inclusive language changes > tools/mesh: Inclusive language changes > tools/mesh-gatt: Inclusive language changes > unit/mesh: Inclusive language changes > doc/mesh: Inclusive language changes > android: Inclusive language for volume control > android: Inclusive language for describing relation > android: Inclusive language for filtering devices > android: Inclusive language in storing LTK Can we perhaps group these changes on a one per directory? Also I wouldn't bother with Android it already considered deprecated and should be removed at some point, so only change things if it no longer builds but otherwise leave it alone. > android/a2dp.c | 2 +- > android/bluetooth.c | 62 ++--- > android/client/if-hf-client.c | 2 +- > android/hal-audio.c | 12 +- > android/hal-ipc-api.txt | 2 +- > android/hal-sco.c | 12 +- > android/handsfree-client.c | 2 +- > android/hardware/audio.h | 20 +- > android/hardware/bt_hf_client.h | 2 +- > android/tester-main.c | 8 +- > btio/btio.c | 62 ++--- > btio/btio.h | 2 +- > client/main.c | 6 +- > doc/mesh-api.txt | 2 +- > doc/mgmt-api.txt | 6 +- > doc/settings-storage.txt | 4 +- > emulator/btdev.c | 198 ++++++++-------- > emulator/hciemu.c | 21 +- > emulator/hciemu.h | 12 +- > emulator/le.c | 116 ++++----- > emulator/serial.c | 6 +- > emulator/smp.c | 8 +- > lib/hci.c | 52 ++-- > lib/hci.h | 44 ++-- > lib/hci_lib.h | 8 +- > lib/l2cap.h | 2 +- > lib/mgmt.h | 2 +- > lib/rfcomm.h | 2 +- > mesh/net-keys.c | 38 +-- > mesh/net-keys.h | 8 +- > mesh/net.h | 4 +- > monitor/broadcom.c | 8 +- > monitor/bt.h | 150 ++++++------ > monitor/control.c | 14 +- > monitor/l2cap.c | 10 +- > monitor/ll.c | 60 ++--- > monitor/lmp.c | 2 +- > monitor/packet.c | 407 ++++++++++++++++---------------- > plugins/sixaxis.c | 44 ++-- > profiles/audio/a2dp.c | 2 +- > profiles/audio/avctp.c | 10 +- > profiles/audio/avctp.h | 2 +- > profiles/health/mcap.c | 22 +- > profiles/health/mcap.h | 2 +- > profiles/sap/server.c | 2 +- > src/adapter.c | 117 ++++----- > src/adapter.h | 4 +- > src/device.c | 6 +- > src/sdpd-server.c | 10 +- > src/sdpd.h | 2 +- > src/shared/ad.c | 8 +- > src/shared/ad.h | 2 +- > src/shared/hfp.c | 4 +- > src/shared/hfp.h | 2 +- > tools/3dsp.c | 62 ++--- > tools/bdaddr.rst | 2 +- > tools/btiotest.c | 22 +- > tools/btpclientctl.c | 2 +- > tools/hci-tester.c | 16 +- > tools/hciconfig.c | 26 +- > tools/hciconfig.rst | 24 +- > tools/hcitool.c | 110 ++++----- > tools/hcitool.rst | 30 +-- > tools/l2cap-tester.c | 36 +-- > tools/l2test.c | 22 +- > tools/mesh-cfgclient.c | 4 +- > tools/mesh-gatt/mesh-net.h | 4 +- > tools/mesh-gatt/net.c | 60 ++--- > tools/mesh/mesh-db.c | 28 +-- > tools/mesh/mesh-db.h | 4 +- > tools/mesh/remote.c | 53 ++--- > tools/mesh/remote.h | 5 +- > tools/meshctl.c | 6 +- > tools/mgmt-tester.c | 138 +++++------ > tools/oobtest.c | 12 +- > tools/parser/avdtp.c | 4 +- > tools/parser/csr.c | 17 +- > tools/parser/ericsson.c | 2 +- > tools/parser/hci.c | 49 ++-- > tools/parser/lmp.c | 112 ++++----- > tools/parser/parser.h | 2 +- > tools/parser/smp.c | 12 +- > tools/rctest.c | 22 +- > tools/rctest.rst | 4 +- > tools/rfcomm-tester.c | 14 +- > tools/rfcomm.c | 16 +- > tools/rfcomm.rst | 2 +- > tools/sco-tester.c | 10 +- > tools/smp-tester.c | 16 +- > unit/test-mesh-crypto.c | 4 +- > 90 files changed, 1293 insertions(+), 1276 deletions(-) > > -- > 2.33.0.rc1.237.g0d66db33f3-goog > -- Luiz Augusto von Dentz
