From 10dc22867f8a81c2bf72d2a009b560064d5e1170 Mon Sep 17 00:00:00 2001 From: Alec Berg Date: Fri, 10 Jul 2015 16:08:57 -0700 Subject: cleanup: remove board function callback on charge override timeout Remove board function callback on charge override timeout, since the implementation should be common to all boards: send host event. This function is called when a power swap fails during an issued charge override and notifies the host so that it is aware that the power swap did not succeed. BUG=none BRANCH=smaug TEST=make -j buildall Change-Id: Ia2a078a17aef6b302fd2b9fd21a5a92c628fd7db Signed-off-by: Alec Berg Reviewed-on: https://chromium-review.googlesource.com/284923 Reviewed-by: Vincent Palatin --- board/glados/board.c | 7 ------- board/kunimitsu/board.c | 7 ------- board/lucid/board.c | 6 ------ board/oak/board.c | 7 ------- board/ryu/board.c | 7 ------- board/ryu_p4p5/board.c | 7 ------- board/samus_pd/board.c | 7 ------- common/charge_manager.c | 15 ++++++++++++--- include/charge_manager.h | 3 --- test/charge_manager.c | 5 +++++ 10 files changed, 17 insertions(+), 54 deletions(-) diff --git a/board/glados/board.c b/board/glados/board.c index 7537558266..843fbc9133 100644 --- a/board/glados/board.c +++ b/board/glados/board.c @@ -310,10 +310,3 @@ void board_set_charge_limit(int charge_ma) CONFIG_CHARGER_INPUT_CURRENT)); } -/* Charge manager callback function, called on delayed override timeout */ -void board_charge_manager_override_timeout(void) -{ - /* TODO: what to do here? */ -} -DECLARE_DEFERRED(board_charge_manager_override_timeout); - diff --git a/board/kunimitsu/board.c b/board/kunimitsu/board.c index 001a88059c..8784e331cb 100644 --- a/board/kunimitsu/board.c +++ b/board/kunimitsu/board.c @@ -401,10 +401,3 @@ void board_set_charge_limit(int charge_ma) CONFIG_CHARGER_INPUT_CURRENT)); } -/* Charge manager callback function, called on delayed override timeout */ -void board_charge_manager_override_timeout(void) -{ - /* TODO: what to do here? */ -} -DECLARE_DEFERRED(board_charge_manager_override_timeout); - diff --git a/board/lucid/board.c b/board/lucid/board.c index 4fadc6083c..fc83e71c7a 100644 --- a/board/lucid/board.c +++ b/board/lucid/board.c @@ -138,12 +138,6 @@ void board_set_charge_limit(int charge_ma) CPRINTS("Failed to set input current limit for PD"); } -/* Charge manager callback function, called on delayed override timeout */ -void board_charge_manager_override_timeout(void) -{ -} -DECLARE_DEFERRED(board_charge_manager_override_timeout); - /** * Custom physical check of battery presence. */ diff --git a/board/oak/board.c b/board/oak/board.c index 1fef68fb3c..e181b59e10 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -332,13 +332,6 @@ void board_set_charge_limit(int charge_ma) CONFIG_CHARGER_INPUT_CURRENT)); } -/* Charge manager callback function, called on delayed override timeout */ -void board_charge_manager_override_timeout(void) -{ - /* TODO: what to do here? */ -} -DECLARE_DEFERRED(board_charge_manager_override_timeout); - /** * Set type-C port USB2.0 switch state. * diff --git a/board/ryu/board.c b/board/ryu/board.c index f11d0c0763..fd76388d1d 100644 --- a/board/ryu/board.c +++ b/board/ryu/board.c @@ -367,13 +367,6 @@ void usb_board_disconnect(void) gpio_set_level(GPIO_USB_PU_EN_L, 1); } -/* Charge manager callback function, called on delayed override timeout */ -void board_charge_manager_override_timeout(void) -{ - /* TODO: Implement me! */ -} -DECLARE_DEFERRED(board_charge_manager_override_timeout); - /** * Set active charge port -- only one port can be active at a time. * diff --git a/board/ryu_p4p5/board.c b/board/ryu_p4p5/board.c index 7c1acf71e5..2063c068e4 100644 --- a/board/ryu_p4p5/board.c +++ b/board/ryu_p4p5/board.c @@ -320,13 +320,6 @@ void usb_board_disconnect(void) gpio_set_level(GPIO_USB_PU_EN_L, 1); } -/* Charge manager callback function, called on delayed override timeout */ -void board_charge_manager_override_timeout(void) -{ - /* TODO: Implement me! */ -} -DECLARE_DEFERRED(board_charge_manager_override_timeout); - /** * Set active charge port -- only one port can be active at a time. * diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c index 2325f7090d..d7c2c8b6e8 100644 --- a/board/samus_pd/board.c +++ b/board/samus_pd/board.c @@ -159,13 +159,6 @@ void vbus1_evt(enum gpio_signal signal) task_wake(TASK_ID_PD_C1); } -/* Charge manager callback function, called on delayed override timeout */ -void board_charge_manager_override_timeout(void) -{ - pd_send_host_event(PD_EVENT_POWER_CHANGE); -} -DECLARE_DEFERRED(board_charge_manager_override_timeout); - static void wake_usb_charger_task(int port) { task_wake(port ? TASK_ID_USB_CHG_P1 : TASK_ID_USB_CHG_P0); diff --git a/common/charge_manager.c b/common/charge_manager.c index ed47c8812a..da465d2d73 100644 --- a/common/charge_manager.c +++ b/common/charge_manager.c @@ -543,6 +543,15 @@ static void charge_manager_refresh(void) } DECLARE_DEFERRED(charge_manager_refresh); +/** + * Called when charge override times out waiting for power swap. + */ +static void charge_override_timeout(void) +{ + pd_send_host_event(PD_EVENT_POWER_CHANGE); +} +DECLARE_DEFERRED(charge_override_timeout); + static void charge_manager_make_change(enum charge_manager_change_type change, int supplier, int port, @@ -599,7 +608,7 @@ static void charge_manager_make_change(enum charge_manager_change_type change, delayed_override_port); delayed_override_port = OVERRIDE_OFF; hook_call_deferred( - board_charge_manager_override_timeout, + charge_override_timeout, -1); } } @@ -709,7 +718,7 @@ int charge_manager_set_override(int port) delayed_override_port = OVERRIDE_OFF; hook_call_deferred( - board_charge_manager_override_timeout, -1); + charge_override_timeout, -1); } /* Set the override port if it's a sink. */ @@ -731,7 +740,7 @@ int charge_manager_set_override(int port) POWER_SWAP_TIMEOUT; delayed_override_port = port; hook_call_deferred( - board_charge_manager_override_timeout, + charge_override_timeout, POWER_SWAP_TIMEOUT); pd_request_power_swap(port); /* Can't charge from requested port -- return error. */ diff --git a/include/charge_manager.h b/include/charge_manager.h index c13f0f5f06..8758c3a19c 100644 --- a/include/charge_manager.h +++ b/include/charge_manager.h @@ -77,7 +77,4 @@ int board_set_active_charge_port(int charge_port); /* Set the charge current limit. */ void board_set_charge_limit(int charge_ma); -/* Called on delayed override timeout */ -void board_charge_manager_override_timeout(void); - #endif /* __CROS_EC_CHARGE_MANAGER_H */ diff --git a/test/charge_manager.c b/test/charge_manager.c index 8bfa8e2646..1941af19c7 100644 --- a/test/charge_manager.c +++ b/test/charge_manager.c @@ -36,6 +36,11 @@ static unsigned int charge_port_to_reject = CHARGE_PORT_NONE; static int new_power_request[CONFIG_USB_PD_PORT_COUNT]; static int power_role[CONFIG_USB_PD_PORT_COUNT]; +/* Callback function from charge_manager to send host event */ +void pd_send_host_event(int mask) +{ +} + /* Callback functions called by CM on state change */ void board_set_charge_limit(int charge_ma) { -- cgit v1.2.1