diff options
author | Vic Yang <victoryang@chromium.org> | 2014-08-15 16:47:10 +0000 |
---|---|---|
committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-08-15 21:13:09 +0000 |
commit | 9534a15cd73c674db8a0941793a2f24acb178c7a (patch) | |
tree | f896ed5a3a998c80eda0b5905e22cf877165fb8e /board/host | |
parent | 67281b98079458a2d2424bdbf2e6350a8042306f (diff) | |
download | chrome-ec-9534a15cd73c674db8a0941793a2f24acb178c7a.tar.gz |
Revert "Add back unit test for usb_pd"
This reverts commit cb7468744d8292590ddc4fb0a0b6ed7752b1490a.
Apparently this test fails when running on a heavily loaded
system. Revert this for now.
BUG=chromium:402335,chrome-os-partner:31200
TEST=make buildall
BRANCH=None
Change-Id: I8b616d3915ee5c2f524530897758871cc0375d35
Reviewed-on: https://chromium-review.googlesource.com/212582
Tested-by: Vic Yang <victoryang@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Vic Yang <victoryang@chromium.org>
Diffstat (limited to 'board/host')
-rw-r--r-- | board/host/build.mk | 1 | ||||
-rw-r--r-- | board/host/usb_pd_config.c | 35 | ||||
-rw-r--r-- | board/host/usb_pd_config.h | 41 | ||||
-rw-r--r-- | board/host/usb_pd_policy.c | 122 |
4 files changed, 0 insertions, 199 deletions
diff --git a/board/host/build.mk b/board/host/build.mk index 91451188a7..9b50c501ae 100644 --- a/board/host/build.mk +++ b/board/host/build.mk @@ -12,4 +12,3 @@ board-y=board.o board-$(HAS_TASK_CHIPSET)+=chipset.o board-$(CONFIG_BATTERY_MOCK)+=battery.o charger.o board-$(CONFIG_FANS)+=fan.o -board-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o usb_pd_config.o diff --git a/board/host/usb_pd_config.c b/board/host/usb_pd_config.c deleted file mode 100644 index aec495a0c9..0000000000 --- a/board/host/usb_pd_config.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (c) 2014 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* USB Power delivery board configuration */ - -#include "test_util.h" - -test_mockable void pd_select_polarity(int port, int polarity) -{ - /* Not implemented */ -} - -test_mockable void pd_tx_init(void) -{ - /* Not implemented */ -} - -test_mockable void pd_set_host_mode(int port, int enable) -{ - /* Not implemented */ -} - -test_mockable int pd_adc_read(int port, int cc) -{ - /* Not implemented */ - return 0; -} - -test_mockable int pd_snk_is_vbus_provided(int port) -{ - /* Not implemented */ - return 1; -} diff --git a/board/host/usb_pd_config.h b/board/host/usb_pd_config.h deleted file mode 100644 index 6770b8e11d..0000000000 --- a/board/host/usb_pd_config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (c) 2014 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* USB Power delivery board configuration */ - -#ifndef __USB_PD_CONFIG_H -#define __USB_PD_CONFIG_H - -/* Port and task configuration */ -#define PD_PORT_COUNT 2 -#define PORT_TO_TASK_ID(port) ((port) ? TASK_ID_PD_C1 : TASK_ID_PD_C0) -#define TASK_ID_TO_PORT(id) ((id) == TASK_ID_PD_C0 ? 0 : 1) - -/* Use software CRC */ -#define CONFIG_SW_CRC - -void pd_select_polarity(int port, int polarity); - -void pd_tx_init(void); - -void pd_set_host_mode(int port, int enable); - -int pd_adc_read(int port, int cc); - -int pd_snk_is_vbus_provided(int port); - -/* Standard-current DFP : no-connect voltage is 1.55V */ -#define PD_SRC_VNC 1550 /* mV */ - -/* UFP-side : threshold for DFP connection detection */ -#define PD_SNK_VA 200 /* mV */ - -/* start as a sink in case we have no other power supply/battery */ -#define PD_DEFAULT_STATE PD_STATE_SNK_DISCONNECTED - -/* delay necessary for the voltage transition on the power supply */ -#define PD_POWER_SUPPLY_TRANSITION_DELAY 50000 /* us */ - -#endif /* __USB_PD_CONFIG_H */ diff --git a/board/host/usb_pd_policy.c b/board/host/usb_pd_policy.c deleted file mode 100644 index ffa6d53be9..0000000000 --- a/board/host/usb_pd_policy.c +++ /dev/null @@ -1,122 +0,0 @@ -/* Copyright (c) 2014 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "common.h" -#include "console.h" -#include "usb_pd.h" -#include "util.h" - -const uint32_t pd_src_pdo[] = { - PDO_FIXED(5000, 500, PDO_FIXED_EXTERNAL), - PDO_FIXED(5000, 900, 0), -}; -const int pd_src_pdo_cnt = ARRAY_SIZE(pd_src_pdo); - -const uint32_t pd_snk_pdo[] = { - PDO_BATT(4500, 5500, 15000), - PDO_BATT(11500, 12500, 36000), -}; -const int pd_snk_pdo_cnt = ARRAY_SIZE(pd_snk_pdo); - -/* Cap on the max voltage requested as a sink (in millivolts) */ -static unsigned max_mv = -1; /* no cap */ - -int pd_choose_voltage(int cnt, uint32_t *src_caps, uint32_t *rdo) -{ - int i; - int sel_mv; - int max_uw = 0; - int max_i = -1; - - /* Get max power */ - for (i = 0; i < cnt; i++) { - int uw; - int mv = ((src_caps[i] >> 10) & 0x3FF) * 50; - if ((src_caps[i] & PDO_TYPE_MASK) == PDO_TYPE_BATTERY) { - uw = 250000 * (src_caps[i] & 0x3FF); - } else { - int ma = (src_caps[i] & 0x3FF) * 10; - uw = ma * mv; - } - if ((uw > max_uw) && (mv <= max_mv)) { - max_i = i; - max_uw = uw; - sel_mv = mv; - } - } - if (max_i < 0) - return -EC_ERROR_UNKNOWN; - - /* request all the power ... */ - if ((src_caps[max_i] & PDO_TYPE_MASK) == PDO_TYPE_BATTERY) { - int uw = 250000 * (src_caps[max_i] & 0x3FF); - *rdo = RDO_BATT(max_i + 1, uw/2, uw, 0); - ccprintf("Request [%d] %dV %d/%d mW\n", - max_i, sel_mv/1000, uw/1000, uw/1000); - } else { - int ma = 10 * (src_caps[max_i] & 0x3FF); - *rdo = RDO_FIXED(max_i + 1, ma / 2, ma, 0); - ccprintf("Request [%d] %dV %d/%d mA\n", - max_i, sel_mv/1000, max_i, ma/2, ma); - } - return EC_SUCCESS; -} - -void pd_set_max_voltage(unsigned mv) -{ - max_mv = mv; -} - -int pd_request_voltage(uint32_t rdo) -{ - int op_ma = rdo & 0x3FF; - int max_ma = (rdo >> 10) & 0x3FF; - int idx = rdo >> 28; - uint32_t pdo; - uint32_t pdo_ma; - - if (!idx || idx > pd_src_pdo_cnt) - return EC_ERROR_INVAL; /* Invalid index */ - - /* check current ... */ - pdo = pd_src_pdo[idx - 1]; - pdo_ma = (pdo & 0x3ff); - if (op_ma > pdo_ma) - return EC_ERROR_INVAL; /* too much op current */ - if (max_ma > pdo_ma) - return EC_ERROR_INVAL; /* too much max current */ - - ccprintf("Switch to %d V %d mA (for %d/%d mA)\n", - ((pdo >> 10) & 0x3ff) * 50, (pdo & 0x3ff) * 10, - ((rdo >> 10) & 0x3ff) * 10, (rdo & 0x3ff) * 10); - - return EC_SUCCESS; -} - -int pd_set_power_supply_ready(int port) -{ - /* Not implemented */ - return EC_SUCCESS; -} - -void pd_power_supply_reset(int port) -{ - /* Not implemented */ -} - -void pd_set_input_current_limit(uint32_t max_ma) -{ - /* Not implemented */ -} - -int pd_board_checks(void) -{ - return EC_SUCCESS; -} - -int pd_custom_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload) -{ - return 0; -} |