usb_pd: Rename "Externally powered" to "Unconstrained Power"

This was changed in PD 2.0 years ago (via ECN authored by our own David
Schneider), but our codebase still refers to BIT 27 of the Fixed PDO as
"Externally powered" instead of "Unconstrained Power".

This will search and replace all instances of "Externally powered" when it
refers to BIT 27, as well as function names, other internal representations
of that property, strings, and comments.

seds:
s/PD_FLAGS_PARTNER_EXTPOWER/PD_FLAGS_PARTNER_UNCONSTR/g
s/partner_extpower/partner_unconstrained/g
s/externally powered/unconstrained/g

Some others too.

Signed-off-by: Benson Leung <bleung@chromium.org>

BUG=chromium:1030990
TEST=Codebase builds clean. No functional change, except for the property shows
up in ectool as "Unconstrained power" now.

Change-Id: I5ececa03f29eb31057be3d0ad5311117093bc6da
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1956147
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Benson Leung <bleung@google.com>
Tested-by: Benson Leung <bleung@google.com>

5 files changed, 28 insertions, 28 deletions

diff --git a/common/usb_common.c b/common/usb_common.c
index 65e686ac73..dc7a40a08e 100644
--- a/common/usb_common.c
+++ b/common/usb_common.c
@@ -556,14 +556,14 @@ __overridable void pd_check_pr_role(int port, int pr_role, int flags)
 	if ((flags & PD_FLAGS_PARTNER_DR_POWER) &&
 	    pd_get_dual_role(port) == PD_DRP_TOGGLE_ON) {
 		/*
-		 * If we are a sink and partner is not externally powered, then
+		 * If we are a sink and partner is not unconstrained, then
 		 * swap to become a source. If we are source and partner is
-		 * externally powered, swap to become a sink.
+		 * unconstrained, swap to become a sink.
 		 */
-		int partner_extpower = flags & PD_FLAGS_PARTNER_EXTPOWER;
+		int partner_unconstrained = flags & PD_FLAGS_PARTNER_UNCONSTR;
 
-		if ((!partner_extpower && pr_role == PD_ROLE_SINK) ||
-		     (partner_extpower && pr_role == PD_ROLE_SOURCE))
+		if ((!partner_unconstrained && pr_role == PD_ROLE_SINK) ||
+		     (partner_unconstrained && pr_role == PD_ROLE_SOURCE))
 			pd_request_power_swap(port);
 	}
 }
diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c
index 4b8fa85071..f31f859641 100644
--- a/common/usb_pd_policy.c
+++ b/common/usb_pd_policy.c
@@ -157,7 +157,7 @@ int pd_charge_from_device(uint16_t vid, uint16_t pid)
 	/* TODO: rewrite into table if we get more of these */
 	/*
 	 * White-list Apple charge-through accessory since it doesn't set
-	 * externally powered bit, but we still need to charge from it when
+	 * unconstrained bit, but we still need to charge from it when
 	 * we are a sink.
 	 */
 	return (vid == USB_VID_APPLE && (pid == 0x1012 || pid == 0x1013));
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c
index 37d9dafd86..5e7e181141 100644
--- a/common/usb_pd_protocol.c
+++ b/common/usb_pd_protocol.c
@@ -1575,10 +1575,10 @@ static void pd_update_pdo_flags(int port, uint32_t pdo)
 	else
 		pd[port].flags &= ~PD_FLAGS_PARTNER_DR_POWER;
 
-	if (pdo & PDO_FIXED_EXTERNAL)
-		pd[port].flags |= PD_FLAGS_PARTNER_EXTPOWER;
+	if (pdo & PDO_FIXED_UNCONSTRAINED)
+		pd[port].flags |= PD_FLAGS_PARTNER_UNCONSTR;
 	else
-		pd[port].flags &= ~PD_FLAGS_PARTNER_EXTPOWER;
+		pd[port].flags &= ~PD_FLAGS_PARTNER_UNCONSTR;
 
 	if (pdo & PDO_FIXED_COMM_CAP)
 		pd[port].flags |= PD_FLAGS_PARTNER_USB_COMM;
@@ -1594,12 +1594,12 @@ static void pd_update_pdo_flags(int port, uint32_t pdo)
 #ifdef CONFIG_CHARGE_MANAGER
 	/*
 	 * Treat device as a dedicated charger (meaning we should charge
-	 * from it) if it does not support power swap, or if it is externally
-	 * powered, or if we are a sink and the device identity matches a
+	 * from it) if it does not support power swap, or has unconstrained
+	 * power, or if we are a sink and the device identity matches a
 	 * charging white-list.
 	 */
 	if (!(pd[port].flags & PD_FLAGS_PARTNER_DR_POWER) ||
-	    (pd[port].flags & PD_FLAGS_PARTNER_EXTPOWER) ||
+	    (pd[port].flags & PD_FLAGS_PARTNER_UNCONSTR) ||
 	    charge_whitelisted)
 		charge_manager_update_dualrole(port, CAP_DEDICATED);
 	else
@@ -5390,8 +5390,8 @@ static enum ec_status hc_usb_pd_control(struct host_cmd_handler_args *args)
 				PD_CTRL_RESP_ROLE_DR_DATA : 0) |
 			((pd[p->port].flags & PD_FLAGS_PARTNER_USB_COMM) ?
 				PD_CTRL_RESP_ROLE_USB_COMM : 0) |
-			((pd[p->port].flags & PD_FLAGS_PARTNER_EXTPOWER) ?
-				PD_CTRL_RESP_ROLE_EXT_POWERED : 0);
+			((pd[p->port].flags & PD_FLAGS_PARTNER_UNCONSTR) ?
+				PD_CTRL_RESP_ROLE_UNCONSTRAINED : 0);
 		r_v2->polarity = pd[p->port].polarity;
 
 		if (debug_level > 0)
diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c
index 8f68a5db3e..6c1d784467 100644
--- a/common/usbc/usb_pe_drp_sm.c
+++ b/common/usbc/usb_pe_drp_sm.c
@@ -898,10 +898,10 @@ static void pe_update_pdo_flags(int port, uint32_t pdo)
 	else
 		tc_partner_dr_power(port, 0);
 
-	if (pdo & PDO_FIXED_EXTERNAL)
-		tc_partner_extpower(port, 1);
+	if (pdo & PDO_FIXED_UNCONSTRAINED)
+		tc_partner_unconstrainedpower(port, 1);
 	else
-		tc_partner_extpower(port, 0);
+		tc_partner_unconstrainedpower(port, 0);
 
 	if (pdo & PDO_FIXED_COMM_CAP)
 		tc_partner_usb_comm(port, 1);
@@ -916,11 +916,11 @@ static void pe_update_pdo_flags(int port, uint32_t pdo)
 #ifdef CONFIG_CHARGE_MANAGER
 	/*
 	 * Treat device as a dedicated charger (meaning we should charge
-	 * from it) if it does not support power swap, or if it is externally
-	 * powered, or if we are a sink and the device identity matches a
+	 * from it) if it does not support power swap, or if it is unconstrained
+	 * power, or if we are a sink and the device identity matches a
 	 * charging white-list.
 	 */
-	if (!(pdo & PDO_FIXED_DUAL_ROLE) || (pdo & PDO_FIXED_EXTERNAL) ||
+	if (!(pdo & PDO_FIXED_DUAL_ROLE) || (pdo & PDO_FIXED_UNCONSTRAINED) ||
 		charge_whitelisted) {
 		PE_CLR_FLAG(port, PE_FLAGS_PORT_PARTNER_IS_DUALROLE);
 		charge_manager_update_dualrole(port, CAP_DEDICATED);
@@ -4451,7 +4451,7 @@ int pd_charge_from_device(uint16_t vid, uint16_t pid)
 	/* TODO: rewrite into table if we get more of these */
 	/*
 	 * White-list Apple charge-through accessory since it doesn't set
-	 * externally powered bit, but we still need to charge from it when
+	 * unconstrained bit, but we still need to charge from it when
 	 * we are a sink.
 	 */
 	return (vid == USB_VID_APPLE &&
diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
index 73b242272a..0bad15117f 100644
--- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c
+++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c
@@ -60,8 +60,8 @@
 #define TC_FLAGS_REQUEST_DR_SWAP        BIT(11)
 /* Flag to note request to power off sink */
 #define TC_FLAGS_POWER_OFF_SNK          BIT(12)
-/* Flag to note port partner has external power */
-#define TC_FLAGS_PARTNER_EXTPOWER       BIT(13)
+/* Flag to note port partner has unconstrained power */
+#define TC_FLAGS_PARTNER_UNCONSTRAINED  BIT(13)
 /* Flag to note port partner is Dual Role Data */
 #define TC_FLAGS_PARTNER_DR_DATA        BIT(14)
 /* Flag to note port partner is Dual Role Power */
@@ -506,12 +506,12 @@ void tc_partner_dr_power(int port, int en)
 		TC_CLR_FLAG(port, TC_FLAGS_PARTNER_DR_POWER);
 }
 
-void tc_partner_extpower(int port, int en)
+void tc_partner_unconstrainedpower(int port, int en)
 {
 	if (en)
-		TC_SET_FLAG(port, TC_FLAGS_PARTNER_EXTPOWER);
+		TC_SET_FLAG(port, TC_FLAGS_PARTNER_UNCONSTRAINED);
 	else
-		TC_CLR_FLAG(port, TC_FLAGS_PARTNER_EXTPOWER);
+		TC_CLR_FLAG(port, TC_FLAGS_PARTNER_UNCONSTRAINED);
 }
 
 void tc_partner_usb_comm(int port, int en)
@@ -1247,8 +1247,8 @@ static enum ec_status hc_usb_pd_control(struct host_cmd_handler_args *args)
 				PD_CTRL_RESP_ROLE_DR_DATA : 0) |
 			(TC_CHK_FLAG(p->port, TC_FLAGS_PARTNER_USB_COMM) ?
 				PD_CTRL_RESP_ROLE_USB_COMM : 0) |
-			(TC_CHK_FLAG(p->port, TC_FLAGS_PARTNER_EXTPOWER) ?
-				PD_CTRL_RESP_ROLE_EXT_POWERED : 0);
+			(TC_CHK_FLAG(p->port, TC_FLAGS_PARTNER_UNCONSTRAINED) ?
+				PD_CTRL_RESP_ROLE_UNCONSTRAINED : 0);
 		r_v2->polarity = tc[p->port].polarity;
 		r_v2->cc_state = tc[p->port].cc_state;