pd: cleanup pd_get_data_role

This is the second half of b/147290482
Cleaning up to use pd_data_role instead of int

BUG=b:147314832
BRANCH=none
TEST=make buildall -j

Change-Id: I2445b06f5f5469fb1f3a968034a83e3ee792e7c7
Signed-off-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1991845
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>

19 files changed, 78 insertions, 34 deletions

diff --git a/board/atlas/usb_pd_policy.c b/board/atlas/usb_pd_policy.c
index fb7bd79838..ffaa2cc04e 100644
--- a/board/atlas/usb_pd_policy.c
+++ b/board/atlas/usb_pd_policy.c
@@ -111,7 +111,8 @@ int pd_check_vconn_swap(int port)
 	return gpio_get_level(GPIO_PMIC_SLP_SUS_L);
 }
 
-__override void pd_execute_data_swap(int port, int data_role)
+__override void pd_execute_data_swap(int port,
+				     enum pd_data_role data_role)
 {
 	/* Only port 0 supports device mode. */
 	if (port != 0)
diff --git a/board/chell/usb_pd_policy.c b/board/chell/usb_pd_policy.c
index 6367b3bf38..f5af91a90c 100644
--- a/board/chell/usb_pd_policy.c
+++ b/board/chell/usb_pd_policy.c
@@ -93,7 +93,8 @@ int pd_check_power_swap(int port)
 	return pd_get_dual_role(port) == PD_DRP_TOGGLE_ON ? 1 : 0;
 }
 
-int pd_check_data_swap(int port, int data_role)
+int pd_check_data_swap(int port,
+		       enum pd_data_role data_role)
 {
 	/* Allow data swap if we are a UFP, otherwise don't allow */
 	return (data_role == PD_ROLE_UFP) ? 1 : 0;
@@ -105,7 +106,8 @@ int pd_check_vconn_swap(int port)
 	return gpio_get_level(GPIO_PMIC_SLP_SUS_L);
 }
 
-void pd_execute_data_swap(int port, int data_role)
+void pd_execute_data_swap(int port,
+			  enum pd_data_role data_role)
 {
 	/* Do nothing */
 }
@@ -133,7 +135,9 @@ void pd_check_pr_role(int port,
 	}
 }
 
-void pd_check_dr_role(int port, int dr_role, int flags)
+void pd_check_dr_role(int port,
+		      enum pd_data_role dr_role,
+		      int flags)
 {
 	/* If UFP, try to switch to DFP */
 	if ((flags & PD_FLAGS_PARTNER_DR_DATA) && dr_role == PD_ROLE_UFP)
diff --git a/board/cheza/usb_pd_policy.c b/board/cheza/usb_pd_policy.c
index d8e9c57dea..e56324dfec 100644
--- a/board/cheza/usb_pd_policy.c
+++ b/board/cheza/usb_pd_policy.c
@@ -21,7 +21,8 @@ int pd_check_vconn_swap(int port)
 	return 1;
 }
 
-__override void pd_execute_data_swap(int port, int data_role)
+__override void pd_execute_data_swap(int port,
+				     enum pd_data_role data_role)
 {
 	int enable = (data_role == PD_ROLE_UFP);
 	int type;
diff --git a/board/coffeecake/usb_pd_policy.c b/board/coffeecake/usb_pd_policy.c
index f263ca11ab..99a0faec83 100644
--- a/board/coffeecake/usb_pd_policy.c
+++ b/board/coffeecake/usb_pd_policy.c
@@ -123,13 +123,15 @@ int pd_check_power_swap(int port)
 	return 0;
 }
 
-int pd_check_data_swap(int port, int data_role)
+int pd_check_data_swap(int port,
+		       enum pd_data_role data_role)
 {
 	/* We can swap to UFP */
 	return data_role == PD_ROLE_DFP;
 }
 
-void pd_execute_data_swap(int port, int data_role)
+void pd_execute_data_swap(int port,
+			  enum pd_data_role data_role)
 {
 	/* TODO: turn on pp5000, pp3300 */
 }
@@ -143,7 +145,9 @@ void pd_check_pr_role(int port,
 
 }
 
-void pd_check_dr_role(int port, int dr_role, int flags)
+void pd_check_dr_role(int port,
+		      enum pd_data_role dr_role,
+		      int flags)
 {
 	if ((flags & PD_FLAGS_PARTNER_DR_DATA) && dr_role == PD_ROLE_DFP)
 		pd_request_data_swap(port);
diff --git a/board/dingdong/usb_pd_policy.c b/board/dingdong/usb_pd_policy.c
index 9d2ddd4471..a4bfec541d 100644
--- a/board/dingdong/usb_pd_policy.c
+++ b/board/dingdong/usb_pd_policy.c
@@ -80,13 +80,15 @@ int pd_check_power_swap(int port)
 	return 0;
 }
 
-int pd_check_data_swap(int port, int data_role)
+int pd_check_data_swap(int port,
+		       enum pd_data_role data_role)
 {
 	/* Always refuse data swap */
 	return 0;
 }
 
-void pd_execute_data_swap(int port, int data_role)
+void pd_execute_data_swap(int port,
+			  enum pd_data_role data_role)
 {
 	/* Do nothing */
 }
@@ -97,7 +99,9 @@ void pd_check_pr_role(int port,
 {
 }
 
-void pd_check_dr_role(int port, int dr_role, int flags)
+void pd_check_dr_role(int port,
+		      enum pd_data_role dr_role,
+		      int flags)
 {
 }
 /* ----------------- Vendor Defined Messages ------------------ */
diff --git a/board/eve/usb_pd_policy.c b/board/eve/usb_pd_policy.c
index 3885ed6fc4..b4d0aeb857 100644
--- a/board/eve/usb_pd_policy.c
+++ b/board/eve/usb_pd_policy.c
@@ -132,7 +132,8 @@ int pd_check_vconn_swap(int port)
 	return gpio_get_level(GPIO_PMIC_SLP_SUS_L);
 }
 
-void pd_execute_data_swap(int port, int data_role)
+void pd_execute_data_swap(int port,
+			  enum pd_data_role data_role)
 {
 	/* Only port 0 supports device mode. */
 	if (port != 0)
diff --git a/board/glkrvp_ite/usb_pd_policy.c b/board/glkrvp_ite/usb_pd_policy.c
index 05d1c8285f..bfb395baf4 100644
--- a/board/glkrvp_ite/usb_pd_policy.c
+++ b/board/glkrvp_ite/usb_pd_policy.c
@@ -45,7 +45,8 @@ int pd_check_vconn_swap(int port)
 	return 1;
 }
 
-void pd_execute_data_swap(int port, int data_role)
+void pd_execute_data_swap(int port,
+			  enum pd_data_role data_role)
 {
 	/* Do nothing */
 }
diff --git a/board/hoho/usb_pd_policy.c b/board/hoho/usb_pd_policy.c
index a1bca1add0..9bc8d3aa2f 100644
--- a/board/hoho/usb_pd_policy.c
+++ b/board/hoho/usb_pd_policy.c
@@ -62,7 +62,8 @@ __override int pd_check_power_swap(int port)
 	return 0;
 }
 
-__override int pd_check_data_swap(int port, int data_role)
+__override int pd_check_data_swap(int port,
+				  enum pd_data_role data_role)
 {
 	/* Always refuse data swap */
 	return 0;
@@ -74,7 +75,9 @@ __override void pd_check_pr_role(int port,
 {
 }
 
-__override void pd_check_dr_role(int port, int dr_role, int flags)
+__override void pd_check_dr_role(int port,
+				 enum pd_data_role dr_role,
+				 int flags)
 {
 }
 /* ----------------- Vendor Defined Messages ------------------ */
diff --git a/board/host/usb_pd_policy.c b/board/host/usb_pd_policy.c
index a8b884e8cc..1ea28dcbe9 100644
--- a/board/host/usb_pd_policy.c
+++ b/board/host/usb_pd_policy.c
@@ -55,7 +55,8 @@ __override int pd_check_power_swap(int port)
 	return 1;
 }
 
-__override int pd_check_data_swap(int port, int data_role)
+__override int pd_check_data_swap(int port,
+				  enum pd_data_role data_role)
 {
 	/* Always allow data swap */
 	return 1;
@@ -67,7 +68,9 @@ __override void pd_check_pr_role(int port,
 {
 }
 
-__override void pd_check_dr_role(int port, int dr_role, int flags)
+__override void pd_check_dr_role(int port,
+				 enum pd_data_role dr_role,
+				 int flags)
 {
 }
 
diff --git a/board/nami/usb_pd_policy.c b/board/nami/usb_pd_policy.c
index e42d0ec5b4..c1d5591d7c 100644
--- a/board/nami/usb_pd_policy.c
+++ b/board/nami/usb_pd_policy.c
@@ -103,7 +103,8 @@ int pd_check_vconn_swap(int port)
 	return gpio_get_level(GPIO_PMIC_SLP_SUS_L);
 }
 
-__override void pd_execute_data_swap(int port, int data_role)
+__override void pd_execute_data_swap(int port,
+				     enum pd_data_role data_role)
 {
 	/* Only port 0 supports device mode. */
 	if (port != 0)
diff --git a/board/nautilus/usb_pd_policy.c b/board/nautilus/usb_pd_policy.c
index 7237b6b3da..be4716b860 100644
--- a/board/nautilus/usb_pd_policy.c
+++ b/board/nautilus/usb_pd_policy.c
@@ -131,7 +131,8 @@ int pd_check_vconn_swap(int port)
 	return gpio_get_level(GPIO_PMIC_SLP_SUS_L);
 }
 
-__override void pd_execute_data_swap(int port, int data_role)
+__override void pd_execute_data_swap(int port,
+				     enum pd_data_role data_role)
 {
 	/* Only port 0 supports device mode. */
 	if (port != 0)
diff --git a/board/nocturne/usb_pd_policy.c b/board/nocturne/usb_pd_policy.c
index 930be05af8..ed94e3eec8 100644
--- a/board/nocturne/usb_pd_policy.c
+++ b/board/nocturne/usb_pd_policy.c
@@ -25,7 +25,8 @@ int pd_check_vconn_swap(int port)
 	return gpio_get_level(GPIO_EN_5V);
 }
 
-__override void pd_execute_data_swap(int port, int data_role)
+__override void pd_execute_data_swap(int port,
+				     enum pd_data_role data_role)
 {
 	int level;
 
diff --git a/board/pdeval-stm32f072/usb_pd_policy.c b/board/pdeval-stm32f072/usb_pd_policy.c
index 59f30d424a..c8663ea12d 100644
--- a/board/pdeval-stm32f072/usb_pd_policy.c
+++ b/board/pdeval-stm32f072/usb_pd_policy.c
@@ -135,7 +135,8 @@ int pd_snk_is_vbus_provided(int port)
 	return vbus_present;
 }
 
-__override int pd_check_data_swap(int port, int data_role)
+__override int pd_check_data_swap(int port,
+				  enum pd_data_role data_role)
 {
 	/* Always allow data swap */
 	return 1;
@@ -159,7 +160,9 @@ __override void pd_check_pr_role(int port,
 {
 }
 
-__override void pd_check_dr_role(int port, int dr_role, int flags)
+__override void pd_check_dr_role(int port,
+				 enum pd_data_role dr_role,
+				 int flags)
 {
 }
 /* ----------------- Vendor Defined Messages ------------------ */
diff --git a/board/plankton/usb_pd_policy.c b/board/plankton/usb_pd_policy.c
index f538586eea..d575e29f83 100644
--- a/board/plankton/usb_pd_policy.c
+++ b/board/plankton/usb_pd_policy.c
@@ -119,7 +119,8 @@ __override int pd_check_power_swap(int port)
 	return 1;
 }
 
-__override int pd_check_data_swap(int port, int data_role)
+__override int pd_check_data_swap(int port,
+				  enum pd_data_role data_role)
 {
 	/* Always allow data swap */
 	return 1;
@@ -131,7 +132,9 @@ __override void pd_check_pr_role(int port,
 {
 }
 
-__override void pd_check_dr_role(int port, int dr_role, int flags)
+__override void pd_check_dr_role(int port,
+				 enum pd_data_role dr_role,
+				 int flags)
 {
 	/* If Plankton is in USB hub mode, always act as UFP */
 	if (board_in_hub_mode() && dr_role == PD_ROLE_DFP &&
diff --git a/board/poppy/usb_pd_policy.c b/board/poppy/usb_pd_policy.c
index 56fd4c657c..a32b77bbe7 100644
--- a/board/poppy/usb_pd_policy.c
+++ b/board/poppy/usb_pd_policy.c
@@ -131,7 +131,8 @@ int pd_check_vconn_swap(int port)
 	return gpio_get_level(GPIO_PMIC_SLP_SUS_L);
 }
 
-__override void pd_execute_data_swap(int port, int data_role)
+__override void pd_execute_data_swap(int port,
+				     enum pd_data_role data_role)
 {
 	/* Only port 0 supports device mode. */
 	if (port != 0)
diff --git a/board/rammus/usb_pd_policy.c b/board/rammus/usb_pd_policy.c
index 2e5fb868ad..652c9bb259 100644
--- a/board/rammus/usb_pd_policy.c
+++ b/board/rammus/usb_pd_policy.c
@@ -103,7 +103,8 @@ int pd_check_vconn_swap(int port)
 	return gpio_get_level(GPIO_SLP_SUS_L_PMIC);
 }
 
-__override void pd_execute_data_swap(int port, int data_role)
+__override void pd_execute_data_swap(int port,
+				     enum pd_data_role data_role)
 {
 	/* Only port 0 supports device mode. */
 	if (port != 0)
diff --git a/board/servo_v4/usb_pd_policy.c b/board/servo_v4/usb_pd_policy.c
index 862d2d9fdc..13d55231f5 100644
--- a/board/servo_v4/usb_pd_policy.c
+++ b/board/servo_v4/usb_pd_policy.c
@@ -709,7 +709,8 @@ __override int pd_check_power_swap(int port)
 	return 0;
 }
 
-__override int pd_check_data_swap(int port, int data_role)
+__override int pd_check_data_swap(int port,
+				  enum pd_data_role data_role)
 {
 	/*
 	 * Servo should allow data role swaps to let DUT see the USB hub, but
@@ -721,7 +722,8 @@ __override int pd_check_data_swap(int port, int data_role)
 	return 1;
 }
 
-__override void pd_execute_data_swap(int port, int data_role)
+__override void pd_execute_data_swap(int port,
+				     enum pd_data_role data_role)
 {
 	/*
 	 * TODO(b/137887386): Turn on the fastboot/DFU path when data swap to
@@ -741,7 +743,9 @@ __override void pd_check_pr_role(int port,
 	 */
 }
 
-__override void pd_check_dr_role(int port, int dr_role, int flags)
+__override void pd_check_dr_role(int port,
+				 enum pd_data_role dr_role,
+				 int flags)
 {
 	if (port == CHG)
 		return;
diff --git a/board/twinkie/usb_pd_policy.c b/board/twinkie/usb_pd_policy.c
index 0e044db840..62ecd6e0db 100644
--- a/board/twinkie/usb_pd_policy.c
+++ b/board/twinkie/usb_pd_policy.c
@@ -65,7 +65,8 @@ __override int pd_check_power_swap(int port)
 	return 0;
 }
 
-__override int pd_check_data_swap(int port, int data_role)
+__override int pd_check_data_swap(int port,
+				  enum pd_data_role data_role)
 {
 	/* Always allow data swap */
 	return 1;
@@ -77,7 +78,9 @@ __override void pd_check_pr_role(int port,
 {
 }
 
-__override void pd_check_dr_role(int port, int dr_role, int flags)
+__override void pd_check_dr_role(int port,
+				 enum pd_data_role dr_role,
+				 int flags)
 {
 }
 
diff --git a/board/zinger/usb_pd_policy.c b/board/zinger/usb_pd_policy.c
index 162037fd57..fba299c89b 100644
--- a/board/zinger/usb_pd_policy.c
+++ b/board/zinger/usb_pd_policy.c
@@ -273,13 +273,15 @@ void pd_power_supply_reset(int port)
 	}
 }
 
-int pd_check_data_swap(int port, int data_role)
+int pd_check_data_swap(int port,
+		       enum pd_data_role data_role)
 {
 	/* Allow data swap if we are a DFP, otherwise don't allow */
 	return (data_role == PD_ROLE_DFP) ? 1 : 0;
 }
 
-void pd_execute_data_swap(int port, int data_role)
+void pd_execute_data_swap(int port,
+			  enum pd_data_role data_role)
 {
 	/* Do nothing */
 }
@@ -290,7 +292,9 @@ void pd_check_pr_role(int port,
 {
 }
 
-void pd_check_dr_role(int port, int dr_role, int flags)
+void pd_check_dr_role(int port,
+		      enum pd_data_role dr_role,
+		      int flags)
 {
 	/* If DFP, try to switch to UFP */
 	if ((flags & PD_FLAGS_PARTNER_DR_DATA) && dr_role == PD_ROLE_DFP)