diff options
120 files changed, 226 insertions, 222 deletions
diff --git a/baseboard/asurada/usbc_config.c b/baseboard/asurada/usbc_config.c index e552c97771..89cb24ff12 100644 --- a/baseboard/asurada/usbc_config.c +++ b/baseboard/asurada/usbc_config.c @@ -153,9 +153,9 @@ struct bc12_config bc12_ports[CONFIG_USB_PD_PORT_MAX_COUNT] = { void bc12_interrupt(enum gpio_signal signal) { if (signal == GPIO_USB_C0_BC12_INT_ODL) - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); else - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void board_sub_bc12_init(void) diff --git a/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c index 7ffcad974f..83c169c636 100644 --- a/baseboard/cherry/baseboard.c +++ b/baseboard/cherry/baseboard.c @@ -177,7 +177,7 @@ struct bc12_config bc12_ports[CONFIG_USB_PD_PORT_MAX_COUNT] = { static void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void ppc_interrupt(enum gpio_signal signal) diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c index b1c319b415..4f89a91e3e 100644 --- a/baseboard/guybrush/baseboard.c +++ b/baseboard/guybrush/baseboard.c @@ -679,11 +679,11 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/baseboard/volteer/usbc_config.c b/baseboard/volteer/usbc_config.c index 1e483eae34..36ca78d513 100644 --- a/baseboard/volteer/usbc_config.c +++ b/baseboard/volteer/usbc_config.c @@ -46,11 +46,11 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/baseboard/zork/variant_trembyle.c b/baseboard/zork/variant_trembyle.c index b39380db59..f9173df05a 100644 --- a/baseboard/zork/variant_trembyle.c +++ b/baseboard/zork/variant_trembyle.c @@ -354,11 +354,11 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/agah/usbc_config.c b/board/agah/usbc_config.c index 3253eee69c..d3d20c96c5 100644 --- a/board/agah/usbc_config.c +++ b/board/agah/usbc_config.c @@ -223,10 +223,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C2_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/akemi/board.c b/board/akemi/board.c index 79dd012190..de5438344e 100644 --- a/board/akemi/board.c +++ b/board/akemi/board.c @@ -89,11 +89,11 @@ static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/anahera/usbc_config.c b/board/anahera/usbc_config.c index 2c0cd85a67..52b6b498f0 100644 --- a/board/anahera/usbc_config.c +++ b/board/anahera/usbc_config.c @@ -267,10 +267,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/banshee/usbc_config.c b/board/banshee/usbc_config.c index d180eff1ef..93292873bc 100644 --- a/board/banshee/usbc_config.c +++ b/board/banshee/usbc_config.c @@ -403,16 +403,16 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; case GPIO_USB_C2_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P2, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(2, USB_CHG_EVENT_BC12); break; case GPIO_USB_C3_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P3, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(3, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/beadrix/board.c b/board/beadrix/board.c index 7e2e03629e..a08daf5177 100644 --- a/board/beadrix/board.c +++ b/board/beadrix/board.c @@ -57,7 +57,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -91,7 +91,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/beetley/board.c b/board/beetley/board.c index 096e590a70..0e6c88b24b 100644 --- a/board/beetley/board.c +++ b/board/beetley/board.c @@ -75,7 +75,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) diff --git a/board/bellis/board.c b/board/bellis/board.c index c0cddb1c61..7c7392e4d5 100644 --- a/board/bellis/board.c +++ b/board/bellis/board.c @@ -276,7 +276,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } #ifndef VARIANT_KUKUI_NO_SENSORS diff --git a/board/blipper/board.c b/board/blipper/board.c index 047e28f277..c980e3ce0f 100644 --- a/board/blipper/board.c +++ b/board/blipper/board.c @@ -80,7 +80,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) diff --git a/board/boten/board.c b/board/boten/board.c index f4c951a7c4..76ee055fe4 100644 --- a/board/boten/board.c +++ b/board/boten/board.c @@ -59,7 +59,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) diff --git a/board/brask/usbc_config.c b/board/brask/usbc_config.c index 6e5ac609f3..caae5437a9 100644 --- a/board/brask/usbc_config.c +++ b/board/brask/usbc_config.c @@ -345,13 +345,13 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; case GPIO_USB_C2_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P2, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(2, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/brya/usbc_config.c b/board/brya/usbc_config.c index cac3b80e7c..6f6ae0d84f 100644 --- a/board/brya/usbc_config.c +++ b/board/brya/usbc_config.c @@ -472,15 +472,15 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: if (ec_cfg_usb_db_type() == DB_USB_ABSENT) break; - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; case GPIO_USB_C2_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P2, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(2, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/bugzzy/board.c b/board/bugzzy/board.c index 64a24f0618..25fc04a20a 100644 --- a/board/bugzzy/board.c +++ b/board/bugzzy/board.c @@ -60,7 +60,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -95,7 +95,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/burnet/board.c b/board/burnet/board.c index 51cf4bc0db..23abc2dad9 100644 --- a/board/burnet/board.c +++ b/board/burnet/board.c @@ -262,7 +262,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } /* diff --git a/board/cappy2/board.c b/board/cappy2/board.c index ba0c4f04e9..c6f560b503 100644 --- a/board/cappy2/board.c +++ b/board/cappy2/board.c @@ -55,7 +55,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) diff --git a/board/cerise/board.c b/board/cerise/board.c index 79df4ed239..61722dd530 100644 --- a/board/cerise/board.c +++ b/board/cerise/board.c @@ -276,7 +276,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } #ifndef VARIANT_KUKUI_NO_SENSORS diff --git a/board/coachz/board.c b/board/coachz/board.c index 8b133d448d..088c958679 100644 --- a/board/coachz/board.c +++ b/board/coachz/board.c @@ -98,12 +98,12 @@ static void tcpc_alert_event(enum gpio_signal signal) static void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void ppc_interrupt(enum gpio_signal signal) diff --git a/board/corori/board.c b/board/corori/board.c index dc946fa4f9..3453fccef4 100644 --- a/board/corori/board.c +++ b/board/corori/board.c @@ -90,7 +90,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) diff --git a/board/corori2/board.c b/board/corori2/board.c index df2fac683f..0ccd3c3ebc 100644 --- a/board/corori2/board.c +++ b/board/corori2/board.c @@ -60,7 +60,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -95,7 +95,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/cret/board.c b/board/cret/board.c index b8deb52b10..57bddae55e 100644 --- a/board/cret/board.c +++ b/board/cret/board.c @@ -61,7 +61,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) diff --git a/board/crota/usbc_config.c b/board/crota/usbc_config.c index 1e9a1fc118..e0e575c78c 100644 --- a/board/crota/usbc_config.c +++ b/board/crota/usbc_config.c @@ -344,10 +344,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/dalboz/board.c b/board/dalboz/board.c index 45eb468b2e..e8690d5cc1 100644 --- a/board/dalboz/board.c +++ b/board/dalboz/board.c @@ -520,11 +520,11 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/damu/board.c b/board/damu/board.c index f2a54783bf..8a97e53afb 100644 --- a/board/damu/board.c +++ b/board/damu/board.c @@ -276,7 +276,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } #ifndef VARIANT_KUKUI_NO_SENSORS diff --git a/board/dirinboz/board.c b/board/dirinboz/board.c index 150c42fb17..d49f82773b 100644 --- a/board/dirinboz/board.c +++ b/board/dirinboz/board.c @@ -344,11 +344,11 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/dratini/board.c b/board/dratini/board.c index 8845f6d903..61634d3a7b 100644 --- a/board/dratini/board.c +++ b/board/dratini/board.c @@ -112,11 +112,11 @@ static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/drawcia/board.c b/board/drawcia/board.c index a6901b170a..ce6247e931 100644 --- a/board/drawcia/board.c +++ b/board/drawcia/board.c @@ -75,7 +75,7 @@ DECLARE_DEFERRED(check_c0_line); static void notify_c0_chips(void) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); sm5803_interrupt(0); } @@ -110,7 +110,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/drawcia_riscv/board.c b/board/drawcia_riscv/board.c index 0701eda9fe..e770d17818 100644 --- a/board/drawcia_riscv/board.c +++ b/board/drawcia_riscv/board.c @@ -74,7 +74,7 @@ DECLARE_DEFERRED(check_c0_line); static void notify_c0_chips(void) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); sm5803_interrupt(0); } @@ -109,7 +109,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/driblee/board.c b/board/driblee/board.c index e204632024..5cf9b686ac 100644 --- a/board/driblee/board.c +++ b/board/driblee/board.c @@ -94,7 +94,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) diff --git a/board/elm/board.c b/board/elm/board.c index 4e1a680659..1c7cc4b320 100644 --- a/board/elm/board.c +++ b/board/elm/board.c @@ -66,7 +66,7 @@ DECLARE_DEFERRED(deferred_reset_pd_mcu); void usb_evt(enum gpio_signal signal) { if (!gpio_get_level(GPIO_BC12_WAKE_L)) - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } #include "gpio_list.h" diff --git a/board/felwinter/usbc_config.c b/board/felwinter/usbc_config.c index 14eec1a145..3d39650ba8 100644 --- a/board/felwinter/usbc_config.c +++ b/board/felwinter/usbc_config.c @@ -347,10 +347,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C2_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/fennel/board.c b/board/fennel/board.c index 8347dc46c3..b9adcad237 100644 --- a/board/fennel/board.c +++ b/board/fennel/board.c @@ -277,7 +277,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } #ifndef VARIANT_KUKUI_NO_SENSORS diff --git a/board/galtic/board.c b/board/galtic/board.c index 47cf77202c..727e31508e 100644 --- a/board/galtic/board.c +++ b/board/galtic/board.c @@ -59,7 +59,7 @@ DECLARE_DEFERRED(check_c0_line); static void notify_c0_chips(void) { schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -93,7 +93,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/gelarshie/board.c b/board/gelarshie/board.c index 6dde95908f..b16e2f823f 100644 --- a/board/gelarshie/board.c +++ b/board/gelarshie/board.c @@ -74,12 +74,12 @@ static void tcpc_alert_event(enum gpio_signal signal) static void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void ppc_interrupt(enum gpio_signal signal) diff --git a/board/gimble/usbc_config.c b/board/gimble/usbc_config.c index 304c91e986..e747ab0df9 100644 --- a/board/gimble/usbc_config.c +++ b/board/gimble/usbc_config.c @@ -236,10 +236,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/gooey/board.c b/board/gooey/board.c index 0f610400b6..fe7e2c3792 100644 --- a/board/gooey/board.c +++ b/board/gooey/board.c @@ -59,7 +59,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) diff --git a/board/gumboz/board.c b/board/gumboz/board.c index fb4fdcee95..f90902f765 100644 --- a/board/gumboz/board.c +++ b/board/gumboz/board.c @@ -445,11 +445,11 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/haboki/board.c b/board/haboki/board.c index 387534499a..3a33787603 100644 --- a/board/haboki/board.c +++ b/board/haboki/board.c @@ -73,7 +73,7 @@ DECLARE_DEFERRED(check_c0_line); static void notify_c0_chips(void) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); sm5803_interrupt(0); } @@ -108,7 +108,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/hatch/board.c b/board/hatch/board.c index a10ef2d439..1cb3282299 100644 --- a/board/hatch/board.c +++ b/board/hatch/board.c @@ -93,11 +93,11 @@ static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/helios/board.c b/board/helios/board.c index 28db3f5f08..b4d2fb1ef8 100644 --- a/board/helios/board.c +++ b/board/helios/board.c @@ -85,11 +85,11 @@ static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/herobrine/usbc_config.c b/board/herobrine/usbc_config.c index 971ec4f006..93ec401171 100644 --- a/board/herobrine/usbc_config.c +++ b/board/herobrine/usbc_config.c @@ -47,12 +47,12 @@ void tcpc_alert_event(enum gpio_signal signal) void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void usba_oc_deferred(void) diff --git a/board/homestar/board.c b/board/homestar/board.c index bf7636aadb..05c9759355 100644 --- a/board/homestar/board.c +++ b/board/homestar/board.c @@ -75,12 +75,12 @@ static void tcpc_alert_event(enum gpio_signal signal) static void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void ppc_interrupt(enum gpio_signal signal) diff --git a/board/icarus/board.c b/board/icarus/board.c index a95b94c8c9..4dcb55d472 100644 --- a/board/icarus/board.c +++ b/board/icarus/board.c @@ -245,7 +245,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void board_init(void) diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c index c6bc2e7ef0..861c139fdf 100644 --- a/board/jacuzzi/board.c +++ b/board/jacuzzi/board.c @@ -286,7 +286,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } #ifndef VARIANT_KUKUI_NO_SENSORS diff --git a/board/jinlon/board.c b/board/jinlon/board.c index 8b0c06838e..58e7e1b427 100644 --- a/board/jinlon/board.c +++ b/board/jinlon/board.c @@ -98,11 +98,11 @@ static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/kano/usbc_config.c b/board/kano/usbc_config.c index 8f41a325b1..0167646790 100644 --- a/board/kano/usbc_config.c +++ b/board/kano/usbc_config.c @@ -254,10 +254,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/kappa/board.c b/board/kappa/board.c index 7676bf2162..a0d5fda409 100644 --- a/board/kappa/board.c +++ b/board/kappa/board.c @@ -258,7 +258,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void board_init(void) diff --git a/board/kindred/board.c b/board/kindred/board.c index 3a3f477c57..78ec2abf0c 100644 --- a/board/kindred/board.c +++ b/board/kindred/board.c @@ -121,11 +121,11 @@ static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/kingoftown/usbc_config.c b/board/kingoftown/usbc_config.c index 9aebfdddb4..9343fa2256 100644 --- a/board/kingoftown/usbc_config.c +++ b/board/kingoftown/usbc_config.c @@ -95,12 +95,12 @@ void tcpc_alert_event(enum gpio_signal signal) void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void usba_oc_deferred(void) diff --git a/board/kinox/usbc_config.c b/board/kinox/usbc_config.c index 207132fc9c..a5c171bede 100644 --- a/board/kinox/usbc_config.c +++ b/board/kinox/usbc_config.c @@ -152,7 +152,7 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/kohaku/board.c b/board/kohaku/board.c index b59da898e7..bf22dd6d41 100644 --- a/board/kohaku/board.c +++ b/board/kohaku/board.c @@ -82,11 +82,11 @@ static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/kracko/board.c b/board/kracko/board.c index 8b8d97c265..3458f91a98 100644 --- a/board/kracko/board.c +++ b/board/kracko/board.c @@ -75,7 +75,7 @@ DECLARE_DEFERRED(check_c0_line); static void notify_c0_chips(void) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); sm5803_interrupt(0); } @@ -110,7 +110,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/kuldax/usbc_config.c b/board/kuldax/usbc_config.c index a245fc96ae..fddc9a449c 100644 --- a/board/kuldax/usbc_config.c +++ b/board/kuldax/usbc_config.c @@ -345,13 +345,13 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; case GPIO_USB_C2_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P2, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(2, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/lalala/board.c b/board/lalala/board.c index 89383ed8eb..59eb9fd4a8 100644 --- a/board/lalala/board.c +++ b/board/lalala/board.c @@ -127,7 +127,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -162,7 +162,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/lantis/board.c b/board/lantis/board.c index 8c02c75ca1..44e117ee9a 100644 --- a/board/lantis/board.c +++ b/board/lantis/board.c @@ -91,7 +91,7 @@ DECLARE_DEFERRED(check_c0_line); static void notify_c0_chips(void) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); sm5803_interrupt(0); } @@ -126,7 +126,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/lazor/usbc_config.c b/board/lazor/usbc_config.c index dcfbcc7590..59951223ec 100644 --- a/board/lazor/usbc_config.c +++ b/board/lazor/usbc_config.c @@ -78,12 +78,12 @@ enum ec_status charger_profile_override_set_param(uint32_t param, void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void usba_oc_deferred(void) diff --git a/board/madoo/board.c b/board/madoo/board.c index 31b0c5309e..2f465a81f0 100644 --- a/board/madoo/board.c +++ b/board/madoo/board.c @@ -62,7 +62,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -97,7 +97,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/magolor/board.c b/board/magolor/board.c index 3b9bdce1af..710a94f54a 100644 --- a/board/magolor/board.c +++ b/board/magolor/board.c @@ -220,7 +220,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -255,7 +255,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/makomo/board.c b/board/makomo/board.c index 303554727c..e50f84f3fb 100644 --- a/board/makomo/board.c +++ b/board/makomo/board.c @@ -275,7 +275,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } #ifndef VARIANT_KUKUI_NO_SENSORS diff --git a/board/marzipan/board.c b/board/marzipan/board.c index 638859d1f4..e5e12a1afc 100644 --- a/board/marzipan/board.c +++ b/board/marzipan/board.c @@ -46,12 +46,12 @@ void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } void ppc_interrupt(enum gpio_signal signal) diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c index 99e3ac9328..2991b59299 100644 --- a/board/mchpevb1/board.c +++ b/board/mchpevb1/board.c @@ -189,12 +189,12 @@ void vbus1_evt(enum gpio_signal signal) void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } #endif diff --git a/board/metaknight/board.c b/board/metaknight/board.c index fc138bbbe2..bfff864b89 100644 --- a/board/metaknight/board.c +++ b/board/metaknight/board.c @@ -76,7 +76,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) diff --git a/board/mithrax/usbc_config.c b/board/mithrax/usbc_config.c index f0cd83f5e2..b1b28ab7c2 100644 --- a/board/mithrax/usbc_config.c +++ b/board/mithrax/usbc_config.c @@ -347,10 +347,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C2_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/moli/usbc_config.c b/board/moli/usbc_config.c index 9aad900ffb..a54564c34c 100644 --- a/board/moli/usbc_config.c +++ b/board/moli/usbc_config.c @@ -285,10 +285,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/mrbland/board.c b/board/mrbland/board.c index f7fbcf4f97..dd56bcd0cc 100644 --- a/board/mrbland/board.c +++ b/board/mrbland/board.c @@ -71,7 +71,7 @@ static void tcpc_alert_event(enum gpio_signal signal) static void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void ppc_interrupt(enum gpio_signal signal) diff --git a/board/munna/board.c b/board/munna/board.c index 25f62f2528..8eca3f61f1 100644 --- a/board/munna/board.c +++ b/board/munna/board.c @@ -276,7 +276,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } #ifndef VARIANT_KUKUI_NO_SENSORS diff --git a/board/mushu/board.c b/board/mushu/board.c index 4521fef7c1..8e46caa2ed 100644 --- a/board/mushu/board.c +++ b/board/mushu/board.c @@ -95,11 +95,11 @@ static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/nami/board.c b/board/nami/board.c index 9cad7a83e1..20882cff13 100644 --- a/board/nami/board.c +++ b/board/nami/board.c @@ -138,12 +138,12 @@ void vbus1_evt(enum gpio_signal signal) void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } #include "gpio_list.h" diff --git a/board/nautilus/board.c b/board/nautilus/board.c index a5fff79b3b..73a40b8433 100644 --- a/board/nautilus/board.c +++ b/board/nautilus/board.c @@ -102,12 +102,12 @@ void vbus1_evt(enum gpio_signal signal) void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } #include "gpio_list.h" diff --git a/board/nightfury/board.c b/board/nightfury/board.c index 1712e88fe1..faaea01042 100644 --- a/board/nightfury/board.c +++ b/board/nightfury/board.c @@ -85,11 +85,11 @@ static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/oak/board.c b/board/oak/board.c index 0275981446..1c2e65b12a 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -67,8 +67,8 @@ void pd_mcu_interrupt(enum gpio_signal signal) #if BOARD_REV >= OAK_REV4 void usb_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_INTR); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_INTR); + usb_charger_task_set_event(0, USB_CHG_EVENT_INTR); + usb_charger_task_set_event(1, USB_CHG_EVENT_INTR); } #endif /* BOARD_REV >= OAK_REV4 */ @@ -552,9 +552,8 @@ void vbus_task(void *u) } if (wake) - task_set_event(port ? TASK_ID_USB_CHG_P1 : - TASK_ID_USB_CHG_P0, - USB_CHG_EVENT_BC12); + usb_charger_task_set_event( + port, USB_CHG_EVENT_BC12); } task_wait_event(-1); } diff --git a/board/osiris/usbc_config.c b/board/osiris/usbc_config.c index 0917bc4116..21356ae3a3 100644 --- a/board/osiris/usbc_config.c +++ b/board/osiris/usbc_config.c @@ -276,10 +276,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/palkia/board.c b/board/palkia/board.c index 2ef1ee4ca1..cbf0e3178e 100644 --- a/board/palkia/board.c +++ b/board/palkia/board.c @@ -93,7 +93,7 @@ static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; default: diff --git a/board/pazquel/board.c b/board/pazquel/board.c index caf155b675..d3568a4bcb 100644 --- a/board/pazquel/board.c +++ b/board/pazquel/board.c @@ -67,12 +67,12 @@ static void tcpc_alert_event(enum gpio_signal signal) static void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void usba_oc_deferred(void) diff --git a/board/pico/board.c b/board/pico/board.c index 8482a5c635..093a34d54d 100644 --- a/board/pico/board.c +++ b/board/pico/board.c @@ -365,7 +365,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void board_init(void) diff --git a/board/pirika/board.c b/board/pirika/board.c index 04dc69d73c..7a21d632d2 100644 --- a/board/pirika/board.c +++ b/board/pirika/board.c @@ -116,7 +116,7 @@ __override const struct ec_response_keybd_config static void notify_c0_chips(void) { schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -150,7 +150,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/pompom/board.c b/board/pompom/board.c index b69a795f2c..56241083d3 100644 --- a/board/pompom/board.c +++ b/board/pompom/board.c @@ -64,7 +64,7 @@ static void tcpc_alert_event(enum gpio_signal signal) static void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void usba_oc_deferred(void) diff --git a/board/poppy/board.c b/board/poppy/board.c index af2bc1f695..3aa99c1161 100644 --- a/board/poppy/board.c +++ b/board/poppy/board.c @@ -107,12 +107,12 @@ void vbus1_evt(enum gpio_signal signal) void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } #ifdef CONFIG_USB_PD_TCPC_LOW_POWER diff --git a/board/primus/usbc_config.c b/board/primus/usbc_config.c index 44f58c184e..ecaac56b2d 100644 --- a/board/primus/usbc_config.c +++ b/board/primus/usbc_config.c @@ -239,10 +239,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/quackingstick/board.c b/board/quackingstick/board.c index 8806e8c845..9756eb0651 100644 --- a/board/quackingstick/board.c +++ b/board/quackingstick/board.c @@ -71,7 +71,7 @@ static void tcpc_alert_event(enum gpio_signal signal) static void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void ppc_interrupt(enum gpio_signal signal) diff --git a/board/rammus/board.c b/board/rammus/board.c index ed939dd5d3..a27828694d 100644 --- a/board/rammus/board.c +++ b/board/rammus/board.c @@ -109,12 +109,12 @@ void vbus1_evt(enum gpio_signal signal) void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } #include "gpio_list.h" diff --git a/board/redrix/usbc_config.c b/board/redrix/usbc_config.c index e0742edb85..e463c15da1 100644 --- a/board/redrix/usbc_config.c +++ b/board/redrix/usbc_config.c @@ -266,10 +266,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/sasuke/board.c b/board/sasuke/board.c index 21631c0323..830c92eb47 100644 --- a/board/sasuke/board.c +++ b/board/sasuke/board.c @@ -58,7 +58,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -93,7 +93,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/sasukette/board.c b/board/sasukette/board.c index a55967d816..cbc786b892 100644 --- a/board/sasukette/board.c +++ b/board/sasukette/board.c @@ -52,7 +52,7 @@ DECLARE_DEFERRED(check_c0_line); static void notify_c0_chips(void) { schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) diff --git a/board/shuboz/board.c b/board/shuboz/board.c index 615193b8f4..027a6ee634 100644 --- a/board/shuboz/board.c +++ b/board/shuboz/board.c @@ -527,11 +527,11 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/stern/board.c b/board/stern/board.c index 0874174058..fd3a95a987 100644 --- a/board/stern/board.c +++ b/board/stern/board.c @@ -276,7 +276,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } #ifndef VARIANT_KUKUI_NO_SENSORS diff --git a/board/storo/board.c b/board/storo/board.c index 763d317dba..d7e0305d1f 100644 --- a/board/storo/board.c +++ b/board/storo/board.c @@ -60,7 +60,7 @@ DECLARE_DEFERRED(check_c0_line); static void notify_c0_chips(void) { schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -94,7 +94,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/stryke/board.c b/board/stryke/board.c index f1c4608d3d..783f73a666 100644 --- a/board/stryke/board.c +++ b/board/stryke/board.c @@ -92,11 +92,11 @@ static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/board/taeko/usbc_config.c b/board/taeko/usbc_config.c index a013c6f7e0..0a1b7ff194 100644 --- a/board/taeko/usbc_config.c +++ b/board/taeko/usbc_config.c @@ -354,10 +354,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/taniks/usbc_config.c b/board/taniks/usbc_config.c index a013c6f7e0..0a1b7ff194 100644 --- a/board/taniks/usbc_config.c +++ b/board/taniks/usbc_config.c @@ -354,10 +354,10 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/trogdor/usbc_config.c b/board/trogdor/usbc_config.c index e8417e0758..a25b63bff9 100644 --- a/board/trogdor/usbc_config.c +++ b/board/trogdor/usbc_config.c @@ -95,12 +95,12 @@ void tcpc_alert_event(enum gpio_signal signal) void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void usba_oc_deferred(void) diff --git a/board/vell/usbc_config.c b/board/vell/usbc_config.c index 3831b13884..6da618b42e 100644 --- a/board/vell/usbc_config.c +++ b/board/vell/usbc_config.c @@ -407,16 +407,16 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; case GPIO_USB_C2_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P2, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(2, USB_CHG_EVENT_BC12); break; case GPIO_USB_C3_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P3, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(3, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/vilboz/board.c b/board/vilboz/board.c index 006ee57645..4e0461469d 100644 --- a/board/vilboz/board.c +++ b/board/vilboz/board.c @@ -378,7 +378,7 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; default: diff --git a/board/volmar/usbc_config.c b/board/volmar/usbc_config.c index 84eb749b13..5f70a16c21 100644 --- a/board/volmar/usbc_config.c +++ b/board/volmar/usbc_config.c @@ -268,12 +268,12 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: if (ec_cfg_usb_db_type() == DB_USB_ABSENT) break; - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: break; diff --git a/board/waddledee/board.c b/board/waddledee/board.c index 2e439de601..90d1f7f2bd 100644 --- a/board/waddledee/board.c +++ b/board/waddledee/board.c @@ -53,7 +53,7 @@ DECLARE_DEFERRED(check_c0_line); static void notify_c0_chips(void) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); sm5803_interrupt(0); } @@ -88,7 +88,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); sm5803_interrupt(1); } diff --git a/board/waddledoo/board.c b/board/waddledoo/board.c index f2eea52701..3dcfc29bdc 100644 --- a/board/waddledoo/board.c +++ b/board/waddledoo/board.c @@ -58,7 +58,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -93,7 +93,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/waddledoo2/board.c b/board/waddledoo2/board.c index 7a00064898..1f7ad2da92 100644 --- a/board/waddledoo2/board.c +++ b/board/waddledoo2/board.c @@ -127,7 +127,7 @@ static void notify_c0_chips(void) * chip. Therefore we'll need to check both ICs. */ schedule_deferred_pd_interrupt(0); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void check_c0_line(void) @@ -162,7 +162,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void check_c1_line(void) diff --git a/board/wheelie/board.c b/board/wheelie/board.c index 9740013ddd..0ad7590a31 100644 --- a/board/wheelie/board.c +++ b/board/wheelie/board.c @@ -45,7 +45,7 @@ /* C0 interrupt line shared by BC 1.2 and charger */ static void usb_c0_interrupt(enum gpio_signal s) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); sm5803_interrupt(0); } @@ -53,7 +53,7 @@ static void usb_c0_interrupt(enum gpio_signal s) static void usb_c1_interrupt(enum gpio_signal s) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); sm5803_interrupt(1); } diff --git a/board/willow/board.c b/board/willow/board.c index 44bb9b7352..fcf679f108 100644 --- a/board/willow/board.c +++ b/board/willow/board.c @@ -274,7 +274,7 @@ int pd_snk_is_vbus_provided(int port) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } #ifndef VARIANT_KUKUI_NO_SENSORS diff --git a/board/wormdingler/board.c b/board/wormdingler/board.c index 3f44200e44..4ece983255 100644 --- a/board/wormdingler/board.c +++ b/board/wormdingler/board.c @@ -75,12 +75,12 @@ static void tcpc_alert_event(enum gpio_signal signal) static void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } static void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } static void ppc_interrupt(enum gpio_signal signal) diff --git a/common/usb_charger.c b/common/usb_charger.c index 65c4539c6d..234b25e395 100644 --- a/common/usb_charger.c +++ b/common/usb_charger.c @@ -75,7 +75,7 @@ void usb_charger_vbus_change(int port, int vbus_level) #ifdef HAS_TASK_USB_CHG_P0 /* USB Charger task(s) */ - task_set_event(USB_CHG_PORT_TO_TASK_ID(port), USB_CHG_EVENT_VBUS); + usb_charger_task_set_event(port, USB_CHG_EVENT_VBUS); /* If we swapped to sourcing, drop any related charge suppliers */ if (usb_charger_port_is_sourcing_vbus(port)) @@ -116,6 +116,11 @@ void usb_charger_reset_charge(int port) } +uint32_t usb_charger_task_set_event(int port, uint32_t event) +{ + return task_set_event(USB_CHG_PORT_TO_TASK_ID(port), event); +} + static void usb_charger_init(void) { int i; diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index 62d3672bfd..5dc133cb45 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -808,8 +808,7 @@ static inline void set_state(int port, enum pd_states next_state) * detach events are used to notify BC1.2 that it can be powered * down. */ - task_set_event(USB_CHG_PORT_TO_TASK_ID(port), - USB_CHG_EVENT_CC_OPEN); + usb_charger_task_set_event(port, USB_CHG_EVENT_CC_OPEN); #endif /* CONFIG_BC12_DETECT_DATA_ROLE_TRIGGER */ #ifdef CONFIG_USBC_VCONN set_vconn(port, 0); @@ -1341,11 +1340,9 @@ static void pd_set_data_role(int port, enum pd_data_role role) * task and indicate the current data role. */ if (role == PD_ROLE_UFP) - task_set_event(USB_CHG_PORT_TO_TASK_ID(port), - USB_CHG_EVENT_DR_UFP); + usb_charger_task_set_event(port, USB_CHG_EVENT_DR_UFP); else if (role == PD_ROLE_DFP) - task_set_event(USB_CHG_PORT_TO_TASK_ID(port), - USB_CHG_EVENT_DR_DFP); + usb_charger_task_set_event(port, USB_CHG_EVENT_DR_DFP); #endif /* CONFIG_BC12_DETECT_DATA_ROLE_TRIGGER */ } diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index 5ed68b25ef..046461b7a8 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -1238,7 +1238,6 @@ static void bc12_role_change_handler(int port, enum pd_data_role prev_data_role, enum pd_data_role data_role) { int event = 0; - int task_id = USB_CHG_PORT_TO_TASK_ID(port); bool role_changed = (data_role != prev_data_role); if (!IS_ENABLED(CONFIG_BC12_DETECT_DATA_ROLE_TRIGGER)) @@ -1264,7 +1263,7 @@ static void bc12_role_change_handler(int port, enum pd_data_role prev_data_role, } if (event) - task_set_event(task_id, event); + usb_charger_task_set_event(port, event); } /* diff --git a/driver/bc12/max14637.c b/driver/bc12/max14637.c index b2e734e1c0..a176d79674 100644 --- a/driver/bc12/max14637.c +++ b/driver/bc12/max14637.c @@ -230,8 +230,7 @@ static void bc12_chipset_startup(void) * not drop even during the USB PD hard reset. */ for (port = 0; port < CONFIG_USB_PD_PORT_MAX_COUNT; port++) - task_set_event(USB_CHG_PORT_TO_TASK_ID(port), - USB_CHG_EVENT_VBUS); + usb_charger_task_set_event(port, USB_CHG_EVENT_VBUS); } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, bc12_chipset_startup, HOOK_PRIO_DEFAULT); DECLARE_HOOK(HOOK_CHIPSET_RESUME, bc12_chipset_startup, HOOK_PRIO_DEFAULT); diff --git a/driver/bc12/pi3usb9281.c b/driver/bc12/pi3usb9281.c index 9fc32e942b..912fb80764 100644 --- a/driver/bc12/pi3usb9281.c +++ b/driver/bc12/pi3usb9281.c @@ -287,7 +287,7 @@ static void pi3usb9281_set_switches(int port, enum usb_switch setting) if (setting != USB_SWITCH_RESTORE) usb_switch_state[port] = setting; CPRINTS("USB MUX %d", usb_switch_state[port]); - task_set_event(TASK_ID_USB_CHG_P0 + port, USB_CHG_EVENT_MUX); + usb_charger_task_set_event(port, USB_CHG_EVENT_MUX); } static int pc3usb9281_read_interrupt(int port) diff --git a/driver/charger/rt9490.c b/driver/charger/rt9490.c index 06df765be9..8543d73329 100644 --- a/driver/charger/rt9490.c +++ b/driver/charger/rt9490.c @@ -711,8 +711,7 @@ void rt9490_deferred_interrupt(void) return; if (irq_flag & RT9490_BC12_DONE_FLAG) - task_set_event(USB_CHG_PORT_TO_TASK_ID(port), - USB_CHG_EVENT_BC12); + usb_charger_task_set_event(port, USB_CHG_EVENT_BC12); } } DECLARE_DEFERRED(rt9490_deferred_interrupt); diff --git a/driver/ppc/rt1739.c b/driver/ppc/rt1739.c index ec5966b07c..cd968258d7 100644 --- a/driver/ppc/rt1739.c +++ b/driver/ppc/rt1739.c @@ -416,8 +416,7 @@ void rt1739_deferred_interrupt(void) continue; if (event5 & RT1739_BC12_SNK_DONE_INT) - task_set_event(USB_CHG_PORT_TO_TASK_ID(port), - USB_CHG_EVENT_BC12); + usb_charger_task_set_event(port, USB_CHG_EVENT_BC12); /* write to clear EVENT4 since FRS interrupt has been handled */ write_reg(port, RT1739_REG_INT_EVENT4, event4); diff --git a/driver/tcpm/rt1718s.c b/driver/tcpm/rt1718s.c index 2b5fb6068e..bf87478bf0 100644 --- a/driver/tcpm/rt1718s.c +++ b/driver/tcpm/rt1718s.c @@ -487,8 +487,7 @@ void rt1718s_vendor_defined_alert(int port) /* check snk done */ if (value & RT1718S_RT_INT6_INT_BC12_SNK_DONE) - task_set_event(USB_CHG_PORT_TO_TASK_ID(port), - USB_CHG_EVENT_BC12); + usb_charger_task_set_event(port, USB_CHG_EVENT_BC12); /* clear the alerts from rt1718s_workaround() */ rv = rt1718s_write8(port, RT1718S_RT_INT2, 0xFF); diff --git a/include/usb_charge.h b/include/usb_charge.h index a28e736efa..25fcb74314 100644 --- a/include/usb_charge.h +++ b/include/usb_charge.h @@ -167,6 +167,14 @@ static inline int usb_charger_ramp_max(int port, int supplier, int sup_curr) } /** + * Set a task event for a specific usb charger port + * + * @param port port number + * @param event event bits (USB_CHG_EVENT_*) + */ +uint32_t usb_charger_task_set_event(int port, uint32_t event); + +/** * Reset available BC 1.2 chargers on all ports * * @param port diff --git a/zephyr/projects/corsola/src/kingler/usbc_config.c b/zephyr/projects/corsola/src/kingler/usbc_config.c index f0beaf4370..d710e36187 100644 --- a/zephyr/projects/corsola/src/kingler/usbc_config.c +++ b/zephyr/projects/corsola/src/kingler/usbc_config.c @@ -369,7 +369,7 @@ void ppc_interrupt(enum gpio_signal signal) void bc12_interrupt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } __override int board_get_vbus_voltage(int port) diff --git a/zephyr/projects/nissa/src/craask/usbc.c b/zephyr/projects/nissa/src/craask/usbc.c index b5763b70d8..4f552c3dce 100644 --- a/zephyr/projects/nissa/src/craask/usbc.c +++ b/zephyr/projects/nissa/src/craask/usbc.c @@ -221,7 +221,7 @@ DECLARE_DEFERRED(poll_c1_int); static void usbc_interrupt_trigger(int port) { schedule_deferred_pd_interrupt(port); - task_set_event(USB_CHG_PORT_TO_TASK_ID(port), USB_CHG_EVENT_BC12); + usb_charger_task_set_event(port, USB_CHG_EVENT_BC12); } static inline void poll_usb_gpio(int port, diff --git a/zephyr/projects/nissa/src/nereid/usbc.c b/zephyr/projects/nissa/src/nereid/usbc.c index 3a28aa63fa..95bb1a5fdc 100644 --- a/zephyr/projects/nissa/src/nereid/usbc.c +++ b/zephyr/projects/nissa/src/nereid/usbc.c @@ -246,7 +246,7 @@ DECLARE_DEFERRED(check_c0_line); static void notify_c0_chips(void) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); sm5803_interrupt(0); } @@ -281,7 +281,7 @@ DECLARE_DEFERRED(check_c1_line); static void notify_c1_chips(void) { schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); /* Charger is handled in board_process_pd_alert */ } diff --git a/zephyr/projects/nissa/src/nivviks/usbc.c b/zephyr/projects/nissa/src/nivviks/usbc.c index 7184e86789..7a7576ae25 100644 --- a/zephyr/projects/nissa/src/nivviks/usbc.c +++ b/zephyr/projects/nissa/src/nivviks/usbc.c @@ -221,7 +221,7 @@ DECLARE_DEFERRED(poll_c1_int); static void usbc_interrupt_trigger(int port) { schedule_deferred_pd_interrupt(port); - task_set_event(USB_CHG_PORT_TO_TASK_ID(port), USB_CHG_EVENT_BC12); + usb_charger_task_set_event(port, USB_CHG_EVENT_BC12); } static inline void poll_usb_gpio(int port, diff --git a/zephyr/projects/skyrim/usbc_config.c b/zephyr/projects/skyrim/usbc_config.c index 60969a553d..7e3b6ba486 100644 --- a/zephyr/projects/skyrim/usbc_config.c +++ b/zephyr/projects/skyrim/usbc_config.c @@ -461,11 +461,11 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/zephyr/projects/skyrim/usbc_config_guybrush.c b/zephyr/projects/skyrim/usbc_config_guybrush.c index a8c0f5701c..1d7afcbbb4 100644 --- a/zephyr/projects/skyrim/usbc_config_guybrush.c +++ b/zephyr/projects/skyrim/usbc_config_guybrush.c @@ -428,11 +428,11 @@ void bc12_interrupt(enum gpio_signal signal) { switch (signal) { case GPIO_USB_C0_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); break; case GPIO_USB_C1_BC12_INT_ODL: - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); break; default: diff --git a/zephyr/shim/src/bc12_pi3usb9201.c b/zephyr/shim/src/bc12_pi3usb9201.c index aac8dcd0a0..3322e0770c 100644 --- a/zephyr/shim/src/bc12_pi3usb9201.c +++ b/zephyr/shim/src/bc12_pi3usb9201.c @@ -40,14 +40,14 @@ DECLARE_HOOK(HOOK_INIT, bc12_enable_irqs, HOOK_PRIO_DEFAULT); #if DT_INST_NODE_HAS_PROP(0, irq) void usb0_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); } #endif #if DT_INST_NODE_HAS_PROP(1, irq) void usb1_evt(enum gpio_signal signal) { - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(1, USB_CHG_EVENT_BC12); } #endif diff --git a/zephyr/test/drivers/src/bc12.c b/zephyr/test/drivers/src/bc12.c index 859f0c7405..d1a96131c1 100644 --- a/zephyr/test/drivers/src/bc12.c +++ b/zephyr/test/drivers/src/bc12.c @@ -105,7 +105,7 @@ static void test_bc12_pi3usb9201_host_mode(void) * Pretend that the USB-C Port Manager (TCPMv2) has set the port data * role to DFP. */ - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_DR_DFP); + usb_charger_task_set_event(0, USB_CHG_EVENT_DR_DFP); msleep(1); /* * Expect the pi3usb9201 driver to configure CDP host mode and unmask @@ -119,7 +119,7 @@ static void test_bc12_pi3usb9201_host_mode(void) msleep(500); pi3usb9201_emul_set_reg(emul, PI3USB9201_REG_HOST_STS, PI3USB9201_REG_HOST_STS_DEV_PLUG); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); msleep(1); /* Expect the pi3usb9201 driver to configure SDP host mode. */ pi3usb9201_emul_get_reg(emul, PI3USB9201_REG_CTRL_1, &a); @@ -131,7 +131,7 @@ static void test_bc12_pi3usb9201_host_mode(void) msleep(500); pi3usb9201_emul_set_reg(emul, PI3USB9201_REG_HOST_STS, PI3USB9201_REG_HOST_STS_DEV_UNPLUG); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); msleep(1); /* Expect the pi3usb9201 driver to configure CDP host mode. */ pi3usb9201_emul_get_reg(emul, PI3USB9201_REG_CTRL_1, &a); @@ -153,7 +153,7 @@ static void test_bc12_pi3usb9201_client_mode( * role to UFP and decided charging from the port is allowed. */ msleep(500); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_DR_UFP); + usb_charger_task_set_event(0, USB_CHG_EVENT_DR_UFP); charge_manager_update_dualrole(USBC_PORT_C0, CAP_DEDICATED); msleep(1); /* @@ -171,7 +171,7 @@ static void test_bc12_pi3usb9201_client_mode( msleep(500); pi3usb9201_emul_set_reg(emul, PI3USB9201_REG_CLIENT_STS, 1 << detect_result); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); + usb_charger_task_set_event(0, USB_CHG_EVENT_BC12); msleep(1); /* Expect the pi3usb9201 driver to clear the start bit. */ pi3usb9201_emul_get_reg(emul, PI3USB9201_REG_CTRL_2, &a); @@ -202,7 +202,7 @@ static void test_bc12_pi3usb9201_client_mode( * role to disconnected. */ msleep(500); - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_CC_OPEN); + usb_charger_task_set_event(0, USB_CHG_EVENT_CC_OPEN); msleep(1); /* * Expect the pi3usb9201 driver to configure power down mode and mask @@ -254,8 +254,8 @@ ZTEST_USER(bc12, test_bc12_pi3usb9201) * Pretend that the USB-C Port Manager (TCPMv2) has set the port data * role to disconnected. */ - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_CC_OPEN); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_CC_OPEN); + usb_charger_task_set_event(0, USB_CHG_EVENT_CC_OPEN); + usb_charger_task_set_event(1, USB_CHG_EVENT_CC_OPEN); msleep(1); /* * Expect the pi3usb9201 driver to configure power down mode and mask |