summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaveh Jalali <caveh@chromium.org>2019-10-29 18:01:15 -0700
committerCommit Bot <commit-bot@chromium.org>2020-07-14 06:13:28 +0000
commit544f7915cc82321e37739ea4cc13c9e08e6c23b3 (patch)
tree33e4aa83c79911a6f220d3daa71d6475312ae6f9
parenta46c594678542b230c04709f537b5cdba590e8e4 (diff)
downloadchrome-ec-544f7915cc82321e37739ea4cc13c9e08e6c23b3.tar.gz
usb_pd: use enum tcpc_rp_value instead of int
this changes the declaration and definitions of typec_set_source_current_limit() to take an enum tcpc_rp_value instead of int. BRANCH=firmware-nami-10775.B BUG=none TEST=With other PD Policies patches, flash nami 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/+/2274385 Tested-by: Dawid Niedźwiecki <dn@semihalf.com> Commit-Queue: Dossym Nurmukhanov <dossym@chromium.org>
-rw-r--r--baseboard/dragonegg/usb_pd_policy.c2
-rw-r--r--baseboard/octopus/usb_pd_policy.c2
-rw-r--r--board/atlas/usb_pd_policy.c2
-rw-r--r--board/cheza/usb_pd_policy.c2
-rw-r--r--board/coral/usb_pd_policy.c2
-rw-r--r--board/eve/usb_pd_policy.c2
-rw-r--r--board/kukui/usb_pd_policy.c2
-rw-r--r--board/nami/usb_pd_policy.c2
-rw-r--r--board/nautilus/usb_pd_policy.c2
-rw-r--r--board/nocturne/usb_pd_policy.c2
-rw-r--r--board/poppy/usb_pd_policy.c2
-rw-r--r--board/rainier/usb_pd_policy.c2
-rw-r--r--board/rammus/usb_pd_policy.c2
-rw-r--r--board/reef/usb_pd_policy.c2
-rw-r--r--board/reef_it8320/usb_pd_policy.c2
-rw-r--r--board/reef_mchp/usb_pd_policy.c2
-rw-r--r--board/scarlet/usb_pd_policy.c2
-rw-r--r--board/zoombini/usb_pd_policy.c2
-rw-r--r--include/usb_pd.h3
19 files changed, 20 insertions, 19 deletions
diff --git a/baseboard/dragonegg/usb_pd_policy.c b/baseboard/dragonegg/usb_pd_policy.c
index e7def7fe71..60b6fcdd47 100644
--- a/baseboard/dragonegg/usb_pd_policy.c
+++ b/baseboard/dragonegg/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 0078a027cd..23e20be639 100644
--- a/baseboard/octopus/usb_pd_policy.c
+++ b/baseboard/octopus/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/board/atlas/usb_pd_policy.c b/board/atlas/usb_pd_policy.c
index fbf1f4d299..d02550a098 100644
--- a/board/atlas/usb_pd_policy.c
+++ b/board/atlas/usb_pd_policy.c
@@ -78,7 +78,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 5d35a41968..9e58357f24 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/kukui/usb_pd_policy.c b/board/kukui/usb_pd_policy.c
index c3bfa25760..92a05494d6 100644
--- a/board/kukui/usb_pd_policy.c
+++ b/board/kukui/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/board/nami/usb_pd_policy.c b/board/nami/usb_pd_policy.c
index 294cc9e159..120ffad93b 100644
--- a/board/nami/usb_pd_policy.c
+++ b/board/nami/usb_pd_policy.c
@@ -71,7 +71,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 92b2ed66cc..2eeff9b35f 100644
--- a/board/nocturne/usb_pd_policy.c
+++ b/board/nocturne/usb_pd_policy.c
@@ -154,7 +154,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/board/zoombini/usb_pd_policy.c b/board/zoombini/usb_pd_policy.c
index 09ac156425..f6fdb2ef62 100644
--- a/board/zoombini/usb_pd_policy.c
+++ b/board/zoombini/usb_pd_policy.c
@@ -155,7 +155,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/include/usb_pd.h b/include/usb_pd.h
index 9ac8c82cc2..553ad519aa 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
@@ -1180,7 +1181,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...