ec: change usage of whitelist/blacklist

Google is working to change its source code to use more inclusive
language. To that end, replace the terms "whitelist", "blacklist",
and similar with inclusive alternatives.

BUG=b:162262297
BRANCH=None
TEST=`grep -Eirl "(white|black)[ _\-]*list" .`
The only results are in "private/nordic_keyboard/sdk8.0.0"
which is not our code.

Signed-off-by: Paul Fagerburg <pfagerburg@google.com>
Change-Id: Ie5210b98e1096c22d0e9284c101a42820bd3d79d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2321549
Tested-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>

4 files changed, 24 insertions, 24 deletions

diff --git a/include/bluetooth_le.h b/include/bluetooth_le.h
index 1842b57adc..286653dda6 100644
--- a/include/bluetooth_le.h
+++ b/include/bluetooth_le.h
@@ -382,11 +382,11 @@ void dump_ble_addr(uint8_t *mem, char *name);
 
 void dump_ble_packet(struct ble_pdu *ble_p);
 
-/* Radio-specific white list handling */
-int ble_radio_clear_white_list(void);
-int ble_radio_read_white_list_size(uint8_t *ret_size);
-int ble_radio_add_device_to_white_list(const uint8_t *addr_ptr, uint8_t rand);
-int ble_radio_remove_device_from_white_list(const uint8_t *addr_ptr,
+/* Radio-specific allow list handling */
+int ble_radio_clear_allow_list(void);
+int ble_radio_read_allow_list_size(uint8_t *ret_size);
+int ble_radio_add_device_to_allow_list(const uint8_t *addr_ptr, uint8_t rand);
+int ble_radio_remove_device_from_allow_list(const uint8_t *addr_ptr,
 					    uint8_t rand);
 
 #endif /* __CROS_EC_BLE_H */
diff --git a/include/bluetooth_le_ll.h b/include/bluetooth_le_ll.h
index dd1f9155fd..8e46f1dc22 100644
--- a/include/bluetooth_le_ll.h
+++ b/include/bluetooth_le_ll.h
@@ -137,11 +137,11 @@ uint8_t ll_set_random_address(uint8_t *params);
 uint8_t ll_set_scan_enable(uint8_t *params);
 uint8_t ll_set_scan_params(uint8_t *params);
 
-/* White List */
-uint8_t ll_clear_white_list(void);
-uint8_t ll_read_white_list_size(uint8_t *return_params);
-uint8_t ll_add_device_to_white_list(uint8_t *params);
-uint8_t ll_remove_device_from_white_list(uint8_t *params);
+/* Allow List */
+uint8_t ll_clear_allow_list(void);
+uint8_t ll_read_allow_list_size(uint8_t *return_params);
+uint8_t ll_add_device_to_allow_list(uint8_t *params);
+uint8_t ll_remove_device_from_allow_list(uint8_t *params);
 
 /* Connections */
 uint8_t ll_read_remote_used_features(uint8_t *params);
diff --git a/include/btle_hci_int.h b/include/btle_hci_int.h
index 32349eff61..ba0b3e6041 100644
--- a/include/btle_hci_int.h
+++ b/include/btle_hci_int.h
@@ -2236,7 +2236,7 @@ struct hciLeSetScanParams {
 	uint16_t scanInterval; /* in units of 0.625ms, 4..0x4000 */
 	uint16_t scanWindow; /* in units of 0.625ms, 4..0x4000 */
 	uint8_t useOwnRandomAddr;
-	uint8_t onlyWhitelist;
+	uint8_t onlyAllowlist;
 } __packed;
 struct hciCmplLeSetScanParams {
 	uint8_t status;
@@ -2255,7 +2255,7 @@ struct hciCmplLeSetScanEnable {
 struct hciLeCreateConnection {
 	uint16_t scanInterval; /* in units of 0.625ms, 4..0x4000 */
 	uint16_t scanWindow; /* in units of 0.625ms, 4..0x4000 */
-	uint8_t connectToAnyWhitelistedDevice; /* if so, ignore next 2 params */
+	uint8_t connectToAnyAllowlistedDevice; /* if so, ignore next 2 params */
 	uint8_t peerRandomAddr;
 	uint8_t peerMac[6];
 	uint8_t useOwnRandomAddr;
@@ -2272,32 +2272,32 @@ struct hciCmplLeCreateConnectionCancel {
 	uint8_t status;
 } __packed;
 
-#define HCI_CMD_LE_Read_White_List_Size                          0x000F /* complete */
-struct hciCmplLeReadWhiteListSize {
+#define HCI_CMD_LE_Read_Allow_List_Size                          0x000F /* complete */
+struct hciCmplLeReadAllowListSize {
 	uint8_t status;
-	uint8_t whitelistSize;
+	uint8_t allowlistSize;
 } __packed;
 
-#define HCI_CMD_LE_Clear_White_List                              0x0010 /* complete */
-struct hciCmplLeClearWhiteList {
+#define HCI_CMD_LE_Clear_Allow_List                              0x0010 /* complete */
+struct hciCmplLeClearAllowList {
 	uint8_t status;
 } __packed;
 
-#define HCI_CMD_LE_Add_Device_To_White_List                      0x0011 /* complete */
-struct hciLeAddDeviceToWhiteList {
+#define HCI_CMD_LE_Add_Device_To_Allow_List                      0x0011 /* complete */
+struct hciLeAddDeviceToAllowList {
 	uint8_t randomAddr;
 	uint8_t mac[6];
 } __packed;
-struct hciCmplLeAddDeviceToWhiteList {
+struct hciCmplLeAddDeviceToAllowList {
 	uint8_t status;
 } __packed;
 
-#define HCI_CMD_LE_Remove_Device_From_White_List                 0x0012 /* complete */
-struct hciLeRemoveDeviceFromWhiteList {
+#define HCI_CMD_LE_Remove_Device_From_Allow_List                 0x0012 /* complete */
+struct hciLeRemoveDeviceFromAllowList {
 	uint8_t randomAddr;
 	uint8_t mac[6];
 } __packed;
-struct hciCmplLeRemoveDeviceFromWhiteList {
+struct hciCmplLeRemoveDeviceFromAllowList {
 	uint8_t status;
 } __packed;
 
diff --git a/include/usb_pd.h b/include/usb_pd.h
index b37c557140..5d09b7ab6c 100644
--- a/include/usb_pd.h
+++ b/include/usb_pd.h
@@ -1540,7 +1540,7 @@ __override_proto void pd_try_execute_vconn_swap(int port, int flags);
 
 /**
  * Check if we should charge from this device. This is
- * basically a white-list for chargers that are dual-role,
+ * basically a allow-list for chargers that are dual-role,
  * don't set the unconstrained bit, but we should charge
  * from by default.
  *