From 111b48b1ac52a4c1a0d84970b4c7ffcf6b76e156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Sat, 25 Nov 2023 14:54:32 +0100 Subject: [PATCH] Compact function --- esp-hal-common/src/rtc_cntl/sleep/esp32c6.rs | 55 ++++++-------------- 1 file changed, 17 insertions(+), 38 deletions(-) diff --git a/esp-hal-common/src/rtc_cntl/sleep/esp32c6.rs b/esp-hal-common/src/rtc_cntl/sleep/esp32c6.rs index d3dad63296..3505d014bf 100644 --- a/esp-hal-common/src/rtc_cntl/sleep/esp32c6.rs +++ b/esp-hal-common/src/rtc_cntl/sleep/esp32c6.rs @@ -1376,46 +1376,25 @@ fn modem_clock_hal_deselect_all_wifi_lpclk_source() { fn modem_clock_hal_select_wifi_lpclk_source(src: ModemClockLpclkSource) { unsafe { - match src { - ModemClockLpclkSource::RcSlow => modem_lpcon() - .coex_lp_clk_conf - .modify(|_, w| w.clk_coex_lp_sel_osc_slow().set_bit()), - - ModemClockLpclkSource::RcFast => modem_lpcon() - .coex_lp_clk_conf - .modify(|_, w| w.clk_coex_lp_sel_osc_fast().set_bit()), - - ModemClockLpclkSource::MainXtal => modem_lpcon() - .coex_lp_clk_conf - .modify(|_, w| w.clk_coex_lp_sel_xtal().set_bit()), - - ModemClockLpclkSource::RC32K => { - modem_lpcon() - .coex_lp_clk_conf - .modify(|_, w| w.clk_coex_lp_sel_xtal32k().set_bit()); - modem_lpcon() - .modem_32k_clk_conf - .modify(|_, w| w.clk_modem_32k_sel().variant(1)); - } + modem_lpcon().coex_lp_clk_conf.modify(|_, w| match src { + ModemClockLpclkSource::RcSlow => w.clk_coex_lp_sel_osc_slow().set_bit(), + ModemClockLpclkSource::RcFast => w.clk_coex_lp_sel_osc_fast().set_bit(), + ModemClockLpclkSource::MainXtal => w.clk_coex_lp_sel_xtal().set_bit(), + + ModemClockLpclkSource::RC32K + | ModemClockLpclkSource::XTAL32K + | ModemClockLpclkSource::EXT32K => w.clk_coex_lp_sel_xtal32k().set_bit(), + }); - ModemClockLpclkSource::XTAL32K => { - modem_lpcon() - .coex_lp_clk_conf - .modify(|_, w| w.clk_coex_lp_sel_xtal32k().set_bit()); - modem_lpcon() - .modem_32k_clk_conf - .modify(|_, w| w.clk_modem_32k_sel().variant(0)); - } + modem_lpcon().modem_32k_clk_conf.modify(|_, w| match src { + ModemClockLpclkSource::RcSlow + | ModemClockLpclkSource::RcFast + | ModemClockLpclkSource::MainXtal => {} - ModemClockLpclkSource::EXT32K => { - modem_lpcon() - .coex_lp_clk_conf - .modify(|_, w| w.clk_coex_lp_sel_xtal32k().set_bit()); - modem_lpcon() - .modem_32k_clk_conf - .modify(|_, w| w.clk_modem_32k_sel().variant(2)); - } - } + ModemClockLpclkSource::RC32K => w.clk_modem_32k_sel().variant(1), + ModemClockLpclkSource::XTAL32K => w.clk_modem_32k_sel().variant(0), + ModemClockLpclkSource::EXT32K => w.clk_modem_32k_sel().variant(2), + }); } }