diff options
| author | Alec Berg <alecaberg@chromium.org> | 2015-05-11 17:31:16 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-27 02:39:41 +0000 |
| commit | 5b5f737d8f6f1be15d4ab5f42f290d20576307c4 (patch) | |
| tree | be384973f533436d9a53c46b742be35f5b377a4f /test/usb_pd.c | |
| parent | 25ce43fc3d35669500d74e44f3b7c96302ee2ade (diff) | |
| download | chrome-ec-5b5f737d8f6f1be15d4ab5f42f290d20576307c4.tar.gz | |
pd: move non-phy layer config out of usb_pd_config.h
Move parts of usb_pd_config.h that are not part of the phy layer
out of usb_pd_config.h and into board.h. This cleans up the
division between the TCPC and TCPM as only the TCPC needs to
use usb_pd_config.h.
Also cleans up the use of the CC detection voltage thresholds
by creating standard macros to use based on Rp strength for the
board.
BUG=none
BRANCH=none
TEST=make -j buildall
Change-Id: I946cceb38bea8233095b8a4b287102bb8a3a296d
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/270337
Reviewed-by: Todd Broch <tbroch@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'test/usb_pd.c')
| -rw-r--r-- | test/usb_pd.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/test/usb_pd.c b/test/usb_pd.c index 4fb38d1916..2a8f73a684 100644 --- a/test/usb_pd.c +++ b/test/usb_pd.c @@ -11,7 +11,6 @@ #include "test_util.h" #include "timer.h" #include "usb_pd.h" -#include "usb_pd_config.h" #include "usb_pd_test_util.h" #include "util.h" @@ -23,7 +22,7 @@ struct pd_port_t { int polarity; int partner_role; /* -1 for none */ int partner_polarity; -} pd_port[PD_PORT_COUNT]; +} pd_port[CONFIG_USB_PD_PORT_COUNT]; /* Mock functions */ @@ -86,7 +85,7 @@ static void init_ports(void) { int i; - for (i = 0; i < PD_PORT_COUNT; ++i) { + for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; ++i) { pd_port[i].host_mode = 0; pd_port[i].partner_role = -1; pd_port[i].has_vbus = 0; @@ -157,7 +156,7 @@ static void unplug(int port) { pd_port[port].has_vbus = 0; pd_port[port].partner_role = -1; - task_wake(PORT_TO_TASK_ID(port)); + task_wake(PD_PORT_TO_TASK_ID(port)); usleep(30 * MSEC); } @@ -166,7 +165,7 @@ static int test_request(void) uint32_t expected_rdo = RDO_FIXED(1, 900, 900, RDO_CAP_MISMATCH); plug_in_source(0, 0); - task_wake(PORT_TO_TASK_ID(0)); + task_wake(PD_PORT_TO_TASK_ID(0)); task_wait_event(2 * PD_T_CC_DEBOUNCE + 100 * MSEC); TEST_ASSERT(pd_port[0].polarity == 0); @@ -176,7 +175,7 @@ static int test_request(void) TEST_ASSERT(verify_goodcrc(0, PD_ROLE_SINK, pd_port[0].msg_rx_id)); /* Wait for the power request */ - task_wake(PORT_TO_TASK_ID(0)); + task_wake(PD_PORT_TO_TASK_ID(0)); task_wait_event(35 * MSEC); /* tSenderResponse: 24~30 ms */ inc_rx_id(0); @@ -200,7 +199,7 @@ static int test_sink(void) int i; plug_in_sink(1, 1); - task_wake(PORT_TO_TASK_ID(1)); + task_wake(PD_PORT_TO_TASK_ID(1)); task_wait_event(250 * MSEC); /* tTypeCSinkWaitCap: 210~250 ms */ TEST_ASSERT(pd_port[1].polarity == 1); @@ -217,7 +216,7 @@ static int test_sink(void) /* Looks good. Ack the source cap. */ simulate_goodcrc(1, PD_ROLE_SINK, pd_port[1].msg_tx_id); - task_wake(PORT_TO_TASK_ID(1)); + task_wake(PD_PORT_TO_TASK_ID(1)); usleep(30 * MSEC); inc_tx_id(1); |