From e05ed041cfe60db7d1bff5424d4579a52aea402f Mon Sep 17 00:00:00 2001 From: Shawn Nematbakhsh Date: Mon, 8 Jun 2015 13:58:47 -0700 Subject: charger: Move USB charger / BC1.2 task to common code Move the task responsible for detection of USB chargers to common code to reduce code duplication. BUG=chrome-os-partner:40920 TEST=Manual on samus_pd. Plug USB charger, verify detection is correct on both charge ports. BRANCH=None Change-Id: I362f8b5b51741509e459c66928131f1f6d2a3b1d Signed-off-by: Shawn Nematbakhsh Reviewed-on: https://chromium-review.googlesource.com/276210 Reviewed-by: Vincent Palatin Reviewed-by: Alec Berg --- board/samus_pd/board.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'board/samus_pd/board.h') diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h index dbcd97fec5..c3dcd49ca0 100644 --- a/board/samus_pd/board.h +++ b/board/samus_pd/board.h @@ -44,6 +44,7 @@ #undef CONFIG_PWM #define CONFIG_STM_HWTIMER32 #undef CONFIG_TASK_PROFILING +#define CONFIG_USB_CHARGER #define CONFIG_USB_POWER_DELIVERY #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP @@ -53,7 +54,6 @@ #define CONFIG_USB_PD_CUSTOM_VDM #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_FLASH_ERASE_CHECK -#define CONFIG_USB_PD_HOST_EVENT_ON_POWER_CHANGE #define CONFIG_USB_PD_INTERNAL_COMP #define CONFIG_USB_PD_LOGGING #define CONFIG_USB_PD_LOG_SIZE 512 @@ -114,22 +114,6 @@ enum pwm_channel { PWM_CH_COUNT }; -/* Charge suppliers */ -enum charge_supplier { - CHARGE_SUPPLIER_PD, - CHARGE_SUPPLIER_TYPEC, - CHARGE_SUPPLIER_BC12_DCP, - CHARGE_SUPPLIER_BC12_CDP, - CHARGE_SUPPLIER_BC12_SDP, - CHARGE_SUPPLIER_PROPRIETARY, - CHARGE_SUPPLIER_OTHER, - CHARGE_SUPPLIER_VBUS, - CHARGE_SUPPLIER_COUNT -}; - -/* supplier_priority table defined in board.c */ -extern const int supplier_priority[]; - /* Standard-current Rp */ #define PD_SRC_VNC PD_SRC_DEF_VNC_MV #define PD_SRC_RD_THRESHOLD PD_SRC_DEF_RD_THRESH_MV @@ -163,9 +147,6 @@ extern const int supplier_priority[]; /* Get the last received battery level. */ int board_get_battery_soc(void); -/* Send host event to AP */ -void pd_send_host_event(int mask); - #endif /* !__ASSEMBLER__ */ #endif /* __BOARD_H */ -- cgit v1.2.1