diff options
Diffstat (limited to 'zephyr/test/drivers/default/src/usb_mux.c')
| -rw-r--r-- | zephyr/test/drivers/default/src/usb_mux.c | 58 |
1 files changed, 18 insertions, 40 deletions
diff --git a/zephyr/test/drivers/default/src/usb_mux.c b/zephyr/test/drivers/default/src/usb_mux.c index 0e89cf2398..62d39e28d4 100644 --- a/zephyr/test/drivers/default/src/usb_mux.c +++ b/zephyr/test/drivers/default/src/usb_mux.c @@ -3,33 +3,33 @@ * found in the LICENSE file. */ +#include <zephyr/kernel.h> +#include <zephyr/ztest.h> +#include <zephyr/drivers/gpio.h> +#include <zephyr/drivers/gpio/gpio_emul.h> +#include <zephyr/shell/shell.h> +#include <zephyr/shell/shell_uart.h> + #include "common.h" #include "ec_commands.h" #include "ec_tasks.h" +#include <zephyr/fff.h> #include "hooks.h" #include "host_command.h" #include "i2c.h" +#include "test/drivers/stubs.h" #include "task.h" #include "tcpm/ps8xxx_public.h" #include "tcpm/tcpci.h" -#include "test/drivers/stubs.h" -#include "test/drivers/test_state.h" -#include "test/drivers/utils.h" -#include "usb_mux.h" #include "usb_prl_sm.h" #include "usb_tc_sm.h" -#include <zephyr/drivers/gpio.h> -#include <zephyr/drivers/gpio/gpio_emul.h> -#include <zephyr/fff.h> -#include <zephyr/kernel.h> -#include <zephyr/shell/shell.h> -#include <zephyr/shell/shell_uart.h> -#include <zephyr/ztest.h> +#include "usb_mux.h" +#include "test/drivers/test_state.h" +#include "test/drivers/utils.h" /** Copy of original usb_muxes[USB_PORT_C1] */ -static struct usb_mux_chain usb_mux_c1; -static struct usb_mux *usbc1_virtual_usb_mux; +struct usb_mux_chain usb_mux_c1; /** Number of usb mux proxies in chain */ #define NUM_OF_PROXY 3 @@ -344,26 +344,6 @@ struct usb_mux_chain proxy_chain_0 = { .next = &proxy_chain_1, }; -static void find_virtual_mux(void) -{ - const struct usb_mux_chain *mux_chain; - - mux_chain = &usb_muxes[1]; - usbc1_virtual_usb_mux = NULL; - while (mux_chain) { - if (mux_chain->mux && - mux_chain->mux->driver == &virtual_usb_mux_driver) { - usbc1_virtual_usb_mux = - (struct usb_mux *)mux_chain->mux; - break; - } - mux_chain = mux_chain->next; - } - - __ASSERT(usbc1_virtual_usb_mux, - "USB-C port 1 must contain a virtual mux"); -} - /** Setup first 3 usb muxes of port 1 with proxy */ static void setup_usb_mux_proxy_chain(void) { @@ -713,13 +693,13 @@ ZTEST(usb_uninit_mux, test_usb_mux_hpd_update) mux_state_t exp_mode, mode, virt_mode; /* Get current state of virtual usb mux and set mock */ - usbc1_virtual_usb_mux->driver->get(usbc1_virtual_usb_mux, &virt_mode); + usbc1_virtual_usb_mux.driver->get(&usbc1_virtual_usb_mux, &virt_mode); /* Test no hpd level and no irq */ exp_mode = virt_mode; usb_mux_hpd_update(USBC_PORT_C1, exp_mode); /* Check if virtual usb mux mode is updated correctly */ - usbc1_virtual_usb_mux->driver->get(usbc1_virtual_usb_mux, &mode); + usbc1_virtual_usb_mux.driver->get(&usbc1_virtual_usb_mux, &mode); zassert_equal(exp_mode, mode, "virtual mux mode is 0x%x (!= 0x%x)", mode, exp_mode); CHECK_PROXY_FAKE_CALL_CNT(proxy_init, NUM_OF_PROXY); @@ -731,7 +711,7 @@ ZTEST(usb_uninit_mux, test_usb_mux_hpd_update) exp_mode = virt_mode | USB_PD_MUX_HPD_LVL | USB_PD_MUX_HPD_IRQ; usb_mux_hpd_update(USBC_PORT_C1, exp_mode); /* Check if virtual usb mux mode is updated correctly */ - usbc1_virtual_usb_mux->driver->get(usbc1_virtual_usb_mux, &mode); + usbc1_virtual_usb_mux.driver->get(&usbc1_virtual_usb_mux, &mode); zassert_equal(exp_mode, mode, "virtual mux mode is 0x%x (!= 0x%x)", mode, exp_mode); CHECK_PROXY_FAKE_CALL_CNT(proxy_init, 0); @@ -743,7 +723,7 @@ ZTEST(usb_uninit_mux, test_usb_mux_hpd_update) exp_mode = virt_mode | USB_PD_MUX_HPD_IRQ; usb_mux_hpd_update(USBC_PORT_C1, exp_mode); /* Check if virtual usb mux mode is updated correctly */ - usbc1_virtual_usb_mux->driver->get(usbc1_virtual_usb_mux, &mode); + usbc1_virtual_usb_mux.driver->get(&usbc1_virtual_usb_mux, &mode); zassert_equal(exp_mode, mode, "virtual mux mode is 0x%x (!= 0x%x)", mode, exp_mode); CHECK_PROXY_FAKE_CALL_CNT(proxy_init, 0); @@ -755,7 +735,7 @@ ZTEST(usb_uninit_mux, test_usb_mux_hpd_update) exp_mode = virt_mode | USB_PD_MUX_HPD_LVL; usb_mux_hpd_update(USBC_PORT_C1, exp_mode); /* Check if virtual usb mux mode is updated correctly */ - usbc1_virtual_usb_mux->driver->get(usbc1_virtual_usb_mux, &mode); + usbc1_virtual_usb_mux.driver->get(&usbc1_virtual_usb_mux, &mode); zassert_equal(exp_mode, mode, "virtual mux mode is 0x%x (!= 0x%x)", mode, exp_mode); CHECK_PROXY_FAKE_CALL_CNT(proxy_init, 0); @@ -936,7 +916,6 @@ ZTEST(usb_init_mux, test_usb_mux_typec_command) void usb_uninit_mux_before(void *state) { ARG_UNUSED(state); - find_virtual_mux(); setup_usb_mux_proxy_chain(); set_test_runner_tid(); @@ -956,7 +935,6 @@ void usb_uninit_mux_after(void *state) void usb_init_mux_before(void *state) { ARG_UNUSED(state); - find_virtual_mux(); setup_usb_mux_proxy_chain(); set_test_runner_tid(); |