From 7acd08b38b03023046c44fd5f7035aa2c3ef0fb8 Mon Sep 17 00:00:00 2001
From: Caveh Jalali <caveh@chromium.org>
Date: Tue, 29 Oct 2019 18:01:15 -0700
Subject: usb_pd: use enum tcpc_rp_value instead of int
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this changes the declaration and definitions of
typec_set_source_current_limit() to take an enum tcpc_rp_value instead
of int.

BRANCH=firmware-atlas-11827.B
BUG=none
TEST=With other PD Policies patches, flash atlas and run faft_ec&pd

Change-Id: If633641a581eeb6085b94bc727e23fb57f7cd435
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1889117
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2296084
Tested-by: Dawid Niedźwiecki <dn@semihalf.com>
Commit-Queue: Dossym Nurmukhanov <dossym@chromium.org>
---
 baseboard/dragonegg/usb_pd_policy.c | 2 +-
 baseboard/hatch/usb_pd_policy.c     | 2 +-
 baseboard/octopus/usb_pd_policy.c   | 2 +-
 board/atlas/usb_pd_policy.c         | 2 +-
 board/cheza/usb_pd_policy.c         | 2 +-
 board/coral/usb_pd_policy.c         | 2 +-
 board/eve/usb_pd_policy.c           | 2 +-
 board/flapjack/usb_pd_policy.c      | 2 +-
 board/kukui/usb_pd_policy.c         | 2 +-
 board/nami/usb_pd_policy.c          | 2 +-
 board/nautilus/usb_pd_policy.c      | 2 +-
 board/nocturne/usb_pd_policy.c      | 2 +-
 board/poppy/usb_pd_policy.c         | 2 +-
 board/rainier/usb_pd_policy.c       | 2 +-
 board/rammus/usb_pd_policy.c        | 2 +-
 board/reef/usb_pd_policy.c          | 2 +-
 board/reef_it8320/usb_pd_policy.c   | 2 +-
 board/reef_mchp/usb_pd_policy.c     | 2 +-
 board/scarlet/usb_pd_policy.c       | 2 +-
 include/usb_pd.h                    | 3 ++-
 20 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/baseboard/dragonegg/usb_pd_policy.c b/baseboard/dragonegg/usb_pd_policy.c
index 1fe2b928d7..37a9b51dc9 100644
--- a/baseboard/dragonegg/usb_pd_policy.c
+++ b/baseboard/dragonegg/usb_pd_policy.c
@@ -194,7 +194,7 @@ int pd_snk_is_vbus_provided(int port)
 }
 #endif
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	ppc_set_vbus_source_current_limit(port, rp);
 }
diff --git a/baseboard/hatch/usb_pd_policy.c b/baseboard/hatch/usb_pd_policy.c
index 2eb1cb6f4d..2ad6401a08 100644
--- a/baseboard/hatch/usb_pd_policy.c
+++ b/baseboard/hatch/usb_pd_policy.c
@@ -176,7 +176,7 @@ int pd_snk_is_vbus_provided(int port)
 }
 #endif
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	ppc_set_vbus_source_current_limit(port, rp);
 }
diff --git a/baseboard/octopus/usb_pd_policy.c b/baseboard/octopus/usb_pd_policy.c
index 572b9fcdc5..76d96092ec 100644
--- a/baseboard/octopus/usb_pd_policy.c
+++ b/baseboard/octopus/usb_pd_policy.c
@@ -166,7 +166,7 @@ int pd_snk_is_vbus_provided(int port)
 }
 #endif
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	ppc_set_vbus_source_current_limit(port, rp);
 }
diff --git a/board/atlas/usb_pd_policy.c b/board/atlas/usb_pd_policy.c
index 7bcb28cdf0..1bb3c4604a 100644
--- a/board/atlas/usb_pd_policy.c
+++ b/board/atlas/usb_pd_policy.c
@@ -79,7 +79,7 @@ static void board_vbus_update_source_current(int port)
 	gpio_set_level(gpio_5v_en, vbus_en[port]);
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	vbus_rp[port] = rp;
 
diff --git a/board/cheza/usb_pd_policy.c b/board/cheza/usb_pd_policy.c
index bbc44a746e..d0ef297431 100644
--- a/board/cheza/usb_pd_policy.c
+++ b/board/cheza/usb_pd_policy.c
@@ -216,7 +216,7 @@ int board_vbus_source_enabled(int port)
 	return vbus_en[port];
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	vbus_rp[port] = rp;
 	board_vbus_update_source_current(port);
diff --git a/board/coral/usb_pd_policy.c b/board/coral/usb_pd_policy.c
index 60cbdd3276..d2ceecf074 100644
--- a/board/coral/usb_pd_policy.c
+++ b/board/coral/usb_pd_policy.c
@@ -81,7 +81,7 @@ static void board_vbus_update_source_current(int port)
 	gpio_set_flags(gpio, flags);
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	vbus_rp[port] = rp;
 
diff --git a/board/eve/usb_pd_policy.c b/board/eve/usb_pd_policy.c
index c27183510b..eda49eb08d 100644
--- a/board/eve/usb_pd_policy.c
+++ b/board/eve/usb_pd_policy.c
@@ -101,7 +101,7 @@ static void board_vbus_update_source_current(int port)
 	}
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	vbus_rp[port] = rp;
 
diff --git a/board/flapjack/usb_pd_policy.c b/board/flapjack/usb_pd_policy.c
index 249237734b..0128bdcacf 100644
--- a/board/flapjack/usb_pd_policy.c
+++ b/board/flapjack/usb_pd_policy.c
@@ -93,7 +93,7 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	/* No-operation */
 }
diff --git a/board/kukui/usb_pd_policy.c b/board/kukui/usb_pd_policy.c
index 38354dc148..e9d3d15cf4 100644
--- a/board/kukui/usb_pd_policy.c
+++ b/board/kukui/usb_pd_policy.c
@@ -107,7 +107,7 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	/* No-operation */
 }
diff --git a/board/nami/usb_pd_policy.c b/board/nami/usb_pd_policy.c
index 214dc226d9..2a6f6905a5 100644
--- a/board/nami/usb_pd_policy.c
+++ b/board/nami/usb_pd_policy.c
@@ -70,7 +70,7 @@ static void board_vbus_update_source_current(int port)
 		       vbus_en[port]);
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	vbus_rp[port] = rp;
 
diff --git a/board/nautilus/usb_pd_policy.c b/board/nautilus/usb_pd_policy.c
index aa1c185345..85cc85dd78 100644
--- a/board/nautilus/usb_pd_policy.c
+++ b/board/nautilus/usb_pd_policy.c
@@ -96,7 +96,7 @@ static void board_vbus_update_source_current(int port)
 	}
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	vbus_rp[port] = rp;
 
diff --git a/board/nocturne/usb_pd_policy.c b/board/nocturne/usb_pd_policy.c
index 0d264ce896..f6c9b680fe 100644
--- a/board/nocturne/usb_pd_policy.c
+++ b/board/nocturne/usb_pd_policy.c
@@ -169,7 +169,7 @@ void pd_transition_voltage(int idx)
 	/* No-operation: we are always 5V */
 }
 
-void typec_set_source_current_limit(int p, int rp)
+void typec_set_source_current_limit(int p, enum tcpc_rp_value rp)
 {
 	ppc_set_vbus_source_current_limit(p, rp);
 }
diff --git a/board/poppy/usb_pd_policy.c b/board/poppy/usb_pd_policy.c
index 19407900fb..678f547231 100644
--- a/board/poppy/usb_pd_policy.c
+++ b/board/poppy/usb_pd_policy.c
@@ -97,7 +97,7 @@ static void board_vbus_update_source_current(int port)
 	}
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	vbus_rp[port] = rp;
 
diff --git a/board/rainier/usb_pd_policy.c b/board/rainier/usb_pd_policy.c
index f5e2e267f2..3b5ceb2152 100644
--- a/board/rainier/usb_pd_policy.c
+++ b/board/rainier/usb_pd_policy.c
@@ -89,7 +89,7 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	/* No-operation */
 }
diff --git a/board/rammus/usb_pd_policy.c b/board/rammus/usb_pd_policy.c
index 5d6190f915..433d8d59c1 100644
--- a/board/rammus/usb_pd_policy.c
+++ b/board/rammus/usb_pd_policy.c
@@ -70,7 +70,7 @@ static void board_vbus_update_source_current(int port)
 		       vbus_en[port]);
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	vbus_rp[port] = rp;
 
diff --git a/board/reef/usb_pd_policy.c b/board/reef/usb_pd_policy.c
index 60cbdd3276..d2ceecf074 100644
--- a/board/reef/usb_pd_policy.c
+++ b/board/reef/usb_pd_policy.c
@@ -81,7 +81,7 @@ static void board_vbus_update_source_current(int port)
 	gpio_set_flags(gpio, flags);
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	vbus_rp[port] = rp;
 
diff --git a/board/reef_it8320/usb_pd_policy.c b/board/reef_it8320/usb_pd_policy.c
index 8fd92ca908..8dbbc04102 100644
--- a/board/reef_it8320/usb_pd_policy.c
+++ b/board/reef_it8320/usb_pd_policy.c
@@ -74,7 +74,7 @@ static void board_vbus_update_source_current(int port)
 	gpio_set_level(gpio, vbus_en[port]);
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	vbus_rp[port] = rp;
 
diff --git a/board/reef_mchp/usb_pd_policy.c b/board/reef_mchp/usb_pd_policy.c
index ba8195248f..230a8efee0 100644
--- a/board/reef_mchp/usb_pd_policy.c
+++ b/board/reef_mchp/usb_pd_policy.c
@@ -83,7 +83,7 @@ static void board_vbus_update_source_current(int port)
 	gpio_set_flags(gpio, flags);
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	vbus_rp[port] = rp;
 
diff --git a/board/scarlet/usb_pd_policy.c b/board/scarlet/usb_pd_policy.c
index e75e99f01c..75ddb97d8c 100644
--- a/board/scarlet/usb_pd_policy.c
+++ b/board/scarlet/usb_pd_policy.c
@@ -90,7 +90,7 @@ void pd_power_supply_reset(int port)
 	pd_send_host_event(PD_EVENT_POWER_CHANGE);
 }
 
-void typec_set_source_current_limit(int port, int rp)
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
 {
 	/* No-operation */
 }
diff --git a/include/usb_pd.h b/include/usb_pd.h
index fbe9d0ed1c..fdfd687a10 100644
--- a/include/usb_pd.h
+++ b/include/usb_pd.h
@@ -9,6 +9,7 @@
 #define __CROS_EC_USB_PD_H
 
 #include "common.h"
+#include "usb_pd_tcpm.h"
 
 /* PD Host command timeout */
 #define PD_HOST_COMMAND_TIMEOUT_US SECOND
@@ -1256,7 +1257,7 @@ void typec_set_input_current_limit(int port, typec_current_t max_ma,
  * @param port USB-C port number
  * @param rp One of enum tcpc_rp_value (eg TYPEC_RP_3A0) defining the limit.
  */
-void typec_set_source_current_limit(int port, int rp);
+void typec_set_source_current_limit(int port, enum tcpc_rp_value rp);
 
 /**
  * Verify board specific health status : current, voltages...
-- 
cgit v1.2.1