summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTing Shen <phoenixshen@google.com>2022-04-12 14:50:13 +0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-04-13 05:54:06 +0000
commitd40ab6c07234e4df5b93745c80ae0b2a66800b29 (patch)
tree86f4d71953ac2a6403837a9c6e74aceb81a421c5
parent4b10063fd2f65a5060e795e748d2ddeb8c04b2af (diff)
downloadchrome-ec-d40ab6c07234e4df5b93745c80ae0b2a66800b29.tar.gz
corsola: add braces to single line block
Coding style fix according to review comment in https://crrev.com/c/3580113/2. Ref: https://docs.zephyrproject.org/latest/contribute/guidelines.html BUG=none TEST=1) code compilable: zmake build {krabby,kingler} 2) make sure not missing anything: ag '(if|for|while) \(.*[^{]$' BRANCH=none Signed-off-by: Ting Shen <phoenixshen@google.com> Change-Id: I277d00f34d61ea8a6a43a2482bb152d3835e2ae7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3582434 Reviewed-by: Eric Yilun Lin <yllin@google.com> Reviewed-by: Keith Short <keithshort@chromium.org> Commit-Queue: Ting Shen <phoenixshen@chromium.org> Tested-by: Ting Shen <phoenixshen@chromium.org>
-rw-r--r--zephyr/projects/corsola/src/kingler/button.c3
-rw-r--r--zephyr/projects/corsola/src/kingler/usb_pd_policy.c15
-rw-r--r--zephyr/projects/corsola/src/kingler/usbc_config.c28
-rw-r--r--zephyr/projects/corsola/src/krabby/charger_workaround.c3
-rw-r--r--zephyr/projects/corsola/src/krabby/hooks.c5
-rw-r--r--zephyr/projects/corsola/src/krabby/led.c12
-rw-r--r--zephyr/projects/corsola/src/krabby/usb_pd_policy.c17
-rw-r--r--zephyr/projects/corsola/src/krabby/usbc_config.c30
-rw-r--r--zephyr/projects/corsola/src/usb_pd_policy.c21
-rw-r--r--zephyr/projects/corsola/src/usbc_config.c34
-rw-r--r--zephyr/projects/corsola/src/variant_db_detection.c8
11 files changed, 114 insertions, 62 deletions
diff --git a/zephyr/projects/corsola/src/kingler/button.c b/zephyr/projects/corsola/src/kingler/button.c
index 0df87c7750..d10d771950 100644
--- a/zephyr/projects/corsola/src/kingler/button.c
+++ b/zephyr/projects/corsola/src/kingler/button.c
@@ -14,8 +14,9 @@ static void buttons_hook(void)
{
int version;
- if (cbi_get_board_version(&version))
+ if (cbi_get_board_version(&version)) {
return;
+ }
/* b:219891339: drop this workaround when we deprecate rev0 */
if (version == 0) {
diff --git a/zephyr/projects/corsola/src/kingler/usb_pd_policy.c b/zephyr/projects/corsola/src/kingler/usb_pd_policy.c
index c06f817ba1..51a05598b9 100644
--- a/zephyr/projects/corsola/src/kingler/usb_pd_policy.c
+++ b/zephyr/projects/corsola/src/kingler/usb_pd_policy.c
@@ -23,15 +23,17 @@ void pd_power_supply_reset(int port)
prev_en = ppc_is_sourcing_vbus(port);
- if (port == USBC_PORT_C1)
+ if (port == USBC_PORT_C1) {
rt1718s_gpio_set_level(port, GPIO_EN_USB_C1_SOURCE, 0);
+ }
/* Disable VBUS. */
ppc_vbus_source_enable(port, 0);
/* Enable discharge if we were previously sourcing 5V */
- if (prev_en)
+ if (prev_en) {
pd_set_vbus_discharge(port, 1);
+ }
/* Notify host of power info change. */
pd_send_host_event(PD_EVENT_POWER_CHANGE);
@@ -44,18 +46,21 @@ int pd_set_power_supply_ready(int port)
/* Disable charging. */
rv = ppc_vbus_sink_enable(port, 0);
- if (rv)
+ if (rv) {
return rv;
+ }
pd_set_vbus_discharge(port, 0);
/* Provide Vbus. */
- if (port == USBC_PORT_C1)
+ if (port == USBC_PORT_C1) {
rt1718s_gpio_set_level(port, GPIO_EN_USB_C1_SOURCE, 1);
+ }
rv = ppc_vbus_source_enable(port, 1);
- if (rv)
+ if (rv) {
return rv;
+ }
/* Notify host of power info change. */
pd_send_host_event(PD_EVENT_POWER_CHANGE);
diff --git a/zephyr/projects/corsola/src/kingler/usbc_config.c b/zephyr/projects/corsola/src/kingler/usbc_config.c
index 0fd22c0dba..bcb1bf70d5 100644
--- a/zephyr/projects/corsola/src/kingler/usbc_config.c
+++ b/zephyr/projects/corsola/src/kingler/usbc_config.c
@@ -150,9 +150,10 @@ void board_tcpc_init(void)
/* Enable TCPC interrupts */
gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_usb_c0_tcpc));
- if (corsola_get_db_type() == CORSOLA_DB_TYPEC)
+ if (corsola_get_db_type() == CORSOLA_DB_TYPEC) {
gpio_enable_dt_interrupt(
GPIO_INT_FROM_NODELABEL(int_usb_c1_tcpc));
+ }
/* Enable BC1.2 interrupts. */
gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_usb_c0_bc12));
@@ -161,9 +162,10 @@ void board_tcpc_init(void)
* Initialize HPD to low; after sysjump SOC needs to see
* HPD pulse to enable video path
*/
- for (int port = 0; port < CONFIG_USB_PD_PORT_MAX_COUNT; ++port)
+ for (int port = 0; port < CONFIG_USB_PD_PORT_MAX_COUNT; ++port) {
usb_mux_hpd_update(port, USB_PD_MUX_HPD_LVL_DEASSERTED |
USB_PD_MUX_HPD_IRQ_DEASSERTED);
+ }
}
DECLARE_HOOK(HOOK_INIT, board_tcpc_init, HOOK_PRIO_POST_I2C);
@@ -230,8 +232,9 @@ int board_vbus_source_enabled(int port)
__override int board_rt1718s_set_snk_enable(int port, int enable)
{
- if (port == USBC_PORT_C1)
+ if (port == USBC_PORT_C1) {
rt1718s_gpio_set_level(port, GPIO_EN_USB_C1_SINK, enable);
+ }
return EC_SUCCESS;
}
@@ -242,8 +245,9 @@ int board_set_active_charge_port(int port)
bool is_valid_port =
(port >= 0 && port < board_get_usb_pd_port_count());
- if (!is_valid_port && port != CHARGE_PORT_NONE)
+ if (!is_valid_port && port != CHARGE_PORT_NONE) {
return EC_ERROR_INVAL;
+ }
if (port == CHARGE_PORT_NONE) {
CPRINTS("Disabling all charger ports");
@@ -254,8 +258,9 @@ int board_set_active_charge_port(int port)
* Do not return early if one fails otherwise we can
* get into a boot loop assertion failure.
*/
- if (ppc_vbus_sink_enable(i, 0))
+ if (ppc_vbus_sink_enable(i, 0)) {
CPRINTS("Disabling C%d as sink failed.", i);
+ }
}
return EC_SUCCESS;
@@ -274,11 +279,13 @@ int board_set_active_charge_port(int port)
* requested charge port.
*/
for (i = 0; i < board_get_usb_pd_port_count(); i++) {
- if (i == port)
+ if (i == port) {
continue;
+ }
- if (ppc_vbus_sink_enable(i, 0))
+ if (ppc_vbus_sink_enable(i, 0)) {
CPRINTS("C%d: sink path disable failed.", i);
+ }
}
/* Enable requested charge port. */
@@ -297,12 +304,15 @@ uint16_t tcpc_get_alert_status(void)
if (!gpio_pin_get_dt(
GPIO_DT_FROM_NODELABEL(gpio_usb_c0_tcpc_int_odl))) {
if (!gpio_pin_get_dt(
- GPIO_DT_FROM_NODELABEL(gpio_usb_c0_tcpc_rst)))
+ GPIO_DT_FROM_NODELABEL(gpio_usb_c0_tcpc_rst))) {
status |= PD_STATUS_TCPC_ALERT_0;
+ }
}
- if (!gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_tcpc_int_odl)))
+ if (!gpio_pin_get_dt(
+ GPIO_DT_FROM_NODELABEL(gpio_usb_c1_tcpc_int_odl))) {
return status |= PD_STATUS_TCPC_ALERT_1;
+ }
return status;
}
diff --git a/zephyr/projects/corsola/src/krabby/charger_workaround.c b/zephyr/projects/corsola/src/krabby/charger_workaround.c
index 48cd541146..26bfac1bea 100644
--- a/zephyr/projects/corsola/src/krabby/charger_workaround.c
+++ b/zephyr/projects/corsola/src/krabby/charger_workaround.c
@@ -22,8 +22,9 @@ static void enter_hidden_mode(void)
/* b/194967754#comment5: work around for IBUS ADC unstable issue */
static void ibus_adc_workaround(void)
{
- if (system_get_board_version() != 0)
+ if (system_get_board_version() != 0) {
return;
+ }
i2c_update8(chg_chips[CHARGER_SOLO].i2c_port,
chg_chips[CHARGER_SOLO].i2c_addr_flags,
diff --git a/zephyr/projects/corsola/src/krabby/hooks.c b/zephyr/projects/corsola/src/krabby/hooks.c
index 70f3efe8e1..1cc9b82219 100644
--- a/zephyr/projects/corsola/src/krabby/hooks.c
+++ b/zephyr/projects/corsola/src/krabby/hooks.c
@@ -22,10 +22,11 @@ static void board_i2c3_ctrl(bool enable)
(struct gctrl_it8xxx2_regs *)
DT_REG_ADDR(DT_NODELABEL(gctrl));
- if (enable)
+ if (enable) {
gctrl_base->GCTRL_PMER3 |= IT8XXX2_GCTRL_SMB3PSEL;
- else
+ } else {
gctrl_base->GCTRL_PMER3 &= ~IT8XXX2_GCTRL_SMB3PSEL;
+ }
}
}
diff --git a/zephyr/projects/corsola/src/krabby/led.c b/zephyr/projects/corsola/src/krabby/led.c
index 812d693626..8e2cf10cd9 100644
--- a/zephyr/projects/corsola/src/krabby/led.c
+++ b/zephyr/projects/corsola/src/krabby/led.c
@@ -128,17 +128,19 @@ void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
{
if (led_id == EC_LED_ID_BATTERY_LED) {
- if (brightness[EC_LED_COLOR_AMBER] != 0)
+ if (brightness[EC_LED_COLOR_AMBER] != 0) {
led_set_color_battery(EC_LED_COLOR_AMBER);
- else if (brightness[EC_LED_COLOR_WHITE] != 0)
+ } else if (brightness[EC_LED_COLOR_WHITE] != 0) {
led_set_color_battery(EC_LED_COLOR_WHITE);
- else
+ } else {
led_set_color_battery(LED_OFF);
+ }
} else if (led_id == EC_LED_ID_POWER_LED) {
- if (brightness[EC_LED_COLOR_WHITE] != 0)
+ if (brightness[EC_LED_COLOR_WHITE] != 0) {
led_set_color_power(EC_LED_COLOR_WHITE);
- else
+ } else {
led_set_color_power(LED_OFF);
+ }
}
return EC_SUCCESS;
diff --git a/zephyr/projects/corsola/src/krabby/usb_pd_policy.c b/zephyr/projects/corsola/src/krabby/usb_pd_policy.c
index fbdeda89bc..5f9ae83a19 100644
--- a/zephyr/projects/corsola/src/krabby/usb_pd_policy.c
+++ b/zephyr/projects/corsola/src/krabby/usb_pd_policy.c
@@ -27,13 +27,15 @@ int pd_snk_is_vbus_provided(int port)
* There's no PPC to inform VBUS change for usb_charger, so inform
* the usb_charger now.
*/
- if (!!(vbus_prev[port] != vbus))
+ if (!!(vbus_prev[port] != vbus)) {
usb_charger_vbus_change(port, vbus);
+ }
- if (vbus)
+ if (vbus) {
atomic_or(&vbus_prev[port], 1);
- else
+ } else {
atomic_clear(&vbus_prev[port]);
+ }
#endif
return vbus;
}
@@ -48,8 +50,9 @@ void pd_power_supply_reset(int port)
ppc_vbus_source_enable(port, 0);
/* Enable discharge if we were previously sourcing 5V */
- if (prev_en)
+ if (prev_en) {
pd_set_vbus_discharge(port, 1);
+ }
/* Notify host of power info change. */
pd_send_host_event(PD_EVENT_POWER_CHANGE);
@@ -61,15 +64,17 @@ int pd_set_power_supply_ready(int port)
/* Disable charging. */
rv = ppc_vbus_sink_enable(port, 0);
- if (rv)
+ if (rv) {
return rv;
+ }
pd_set_vbus_discharge(port, 0);
/* Provide Vbus. */
rv = ppc_vbus_source_enable(port, 1);
- if (rv)
+ if (rv) {
return rv;
+ }
/* Notify host of power info change. */
pd_send_host_event(PD_EVENT_POWER_CHANGE);
diff --git a/zephyr/projects/corsola/src/krabby/usbc_config.c b/zephyr/projects/corsola/src/krabby/usbc_config.c
index 172fcef227..7ba0ca9e50 100644
--- a/zephyr/projects/corsola/src/krabby/usbc_config.c
+++ b/zephyr/projects/corsola/src/krabby/usbc_config.c
@@ -43,9 +43,10 @@ void c0_bc12_interrupt(enum gpio_signal signal)
static void board_sub_bc12_init(void)
{
- if (corsola_get_db_type() == CORSOLA_DB_HDMI)
+ if (corsola_get_db_type() == CORSOLA_DB_HDMI) {
/* If this is not a Type-C subboard, disable the task. */
task_disable_task(TASK_ID_USB_CHG_P1);
+ }
}
/* Must be done after I2C and subboard */
DECLARE_HOOK(HOOK_INIT, board_sub_bc12_init, HOOK_PRIO_POST_I2C);
@@ -58,18 +59,21 @@ DECLARE_HOOK(HOOK_INIT, board_usbc_init, HOOK_PRIO_POST_DEFAULT);
void ppc_interrupt(enum gpio_signal signal)
{
- if (signal == GPIO_SIGNAL(DT_ALIAS(gpio_usb_c1_ppc_int_odl)))
+ if (signal == GPIO_SIGNAL(DT_ALIAS(gpio_usb_c1_ppc_int_odl))) {
syv682x_interrupt(1);
+ }
}
int ppc_get_alert_status(int port)
{
- if (port == 0)
+ if (port == 0) {
return gpio_pin_get_dt(
GPIO_DT_FROM_NODELABEL(usb_c0_ppc_bc12_int_odl)) == 0;
- if (port == 1 && corsola_get_db_type() == CORSOLA_DB_TYPEC)
+ }
+ if (port == 1 && corsola_get_db_type() == CORSOLA_DB_TYPEC) {
return gpio_pin_get_dt(
GPIO_DT_FROM_ALIAS(gpio_usb_c1_ppc_int_odl)) == 0;
+ }
return 0;
}
@@ -118,8 +122,9 @@ int board_set_active_charge_port(int port)
int i;
int is_valid_port = (port >= 0 && port < board_get_usb_pd_port_count());
- if (!is_valid_port && port != CHARGE_PORT_NONE)
+ if (!is_valid_port && port != CHARGE_PORT_NONE) {
return EC_ERROR_INVAL;
+ }
if (port == CHARGE_PORT_NONE) {
CPRINTS("Disabling all charger ports");
@@ -130,8 +135,9 @@ int board_set_active_charge_port(int port)
* Do not return early if one fails otherwise we can
* get into a boot loop assertion failure.
*/
- if (ppc_vbus_sink_enable(i, 0))
+ if (ppc_vbus_sink_enable(i, 0)) {
CPRINTS("Disabling C%d as sink failed.", i);
+ }
}
return EC_SUCCESS;
@@ -150,11 +156,13 @@ int board_set_active_charge_port(int port)
* requested charge port.
*/
for (i = 0; i < ppc_cnt; i++) {
- if (i == port)
+ if (i == port) {
continue;
+ }
- if (ppc_vbus_sink_enable(i, 0))
+ if (ppc_vbus_sink_enable(i, 0)) {
CPRINTS("C%d: sink path disable failed.", i);
+ }
}
/* Enable requested charge port. */
@@ -198,10 +206,12 @@ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = {
#ifdef CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT
enum adc_channel board_get_vbus_adc(int port)
{
- if (port == 0)
+ if (port == 0) {
return ADC_VBUS_C0;
- if (port == 1)
+ }
+ if (port == 1) {
return ADC_VBUS_C1;
+ }
CPRINTSUSB("Unknown vbus adc port id: %d", port);
return ADC_VBUS_C0;
}
diff --git a/zephyr/projects/corsola/src/usb_pd_policy.c b/zephyr/projects/corsola/src/usb_pd_policy.c
index c8169e3877..f8795143ee 100644
--- a/zephyr/projects/corsola/src/usb_pd_policy.c
+++ b/zephyr/projects/corsola/src/usb_pd_policy.c
@@ -69,8 +69,9 @@ __override int svdm_dp_config(int port, uint32_t *payload)
mux_state_t mux_mode = svdm_dp_get_mux_mode(port);
int mf_pref = PD_VDO_DPSTS_MF_PREF(dp_status[port]);
- if (!pin_mode)
+ if (!pin_mode) {
return 0;
+ }
CPRINTS("pin_mode: %x, mf: %d, mux: %d", pin_mode, mf_pref, mux_mode);
/*
@@ -102,8 +103,9 @@ int corsola_is_dp_muxable(int port)
for (i = 0; i < board_get_usb_pd_port_count(); i++) {
if (i != port) {
- if (usb_mux_get(i) & USB_PD_MUX_DP_ENABLED)
+ if (usb_mux_get(i) & USB_PD_MUX_DP_ENABLED) {
return 0;
+ }
}
}
@@ -140,18 +142,21 @@ __override int svdm_dp_attention(int port, uint32_t *payload)
}
if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND) &&
- (irq || lvl))
+ (irq || lvl)) {
/*
* Wake up the AP. IRQ or level high indicates a DP sink is now
* present.
*/
- if (IS_ENABLED(CONFIG_MKBP_EVENT))
+ if (IS_ENABLED(CONFIG_MKBP_EVENT)) {
pd_notify_dp_alt_mode_entry(port);
+ }
+ }
/* Its initial DP status message prior to config */
if (!(dp_flags[port] & DP_FLAGS_DP_ON)) {
- if (lvl)
+ if (lvl) {
dp_flags[port] |= DP_FLAGS_HPD_HI_PENDING;
+ }
return 1;
}
@@ -168,8 +173,9 @@ __override int svdm_dp_attention(int port, uint32_t *payload)
if (irq && cur_lvl) {
uint64_t now = get_time().val;
/* wait for the minimum spacing between IRQ_HPD if needed */
- if (now < svdm_hpd_deadline[port])
+ if (now < svdm_hpd_deadline[port]) {
usleep(svdm_hpd_deadline[port] - now);
+ }
/* generate IRQ_HPD pulse */
svdm_set_hpd_gpio(port, 0);
@@ -193,8 +199,9 @@ __override int svdm_dp_attention(int port, uint32_t *payload)
usb_mux_hpd_update(port, mux_state);
#ifdef USB_PD_PORT_TCPC_MST
- if (port == USB_PD_PORT_TCPC_MST)
+ if (port == USB_PD_PORT_TCPC_MST) {
baseboard_mst_enable_control(port, lvl);
+ }
#endif
/* ack */
diff --git a/zephyr/projects/corsola/src/usbc_config.c b/zephyr/projects/corsola/src/usbc_config.c
index 54e5f48b25..5506e7fbe9 100644
--- a/zephyr/projects/corsola/src/usbc_config.c
+++ b/zephyr/projects/corsola/src/usbc_config.c
@@ -54,10 +54,11 @@ DECLARE_HOOK(HOOK_INIT, baseboard_init, HOOK_PRIO_PRE_DEFAULT);
__override uint8_t board_get_usb_pd_port_count(void)
{
if (corsola_get_db_type() == CORSOLA_DB_HDMI) {
- if (tasks_inited)
+ if (tasks_inited) {
return CONFIG_USB_PD_PORT_MAX_COUNT;
- else
+ } else {
return CONFIG_USB_PD_PORT_MAX_COUNT - 1;
+ }
}
return CONFIG_USB_PD_PORT_MAX_COUNT;
@@ -70,8 +71,9 @@ void usb_a0_interrupt(enum gpio_signal signal)
GPIO_DT_FROM_NODELABEL(gpio_ap_xhci_init_done)) ?
USB_CHARGE_MODE_ENABLED : USB_CHARGE_MODE_DISABLED;
- for (int i = 0; i < USB_PORT_COUNT; i++)
+ for (int i = 0; i < USB_PORT_COUNT; i++) {
usb_charge_set_mode(i, mode, USB_ALLOW_SUSPEND_CHARGE);
+ }
/*
* Trigger hard reset to cycle Vbus on Type-C ports, recommended by
@@ -79,8 +81,9 @@ void usb_a0_interrupt(enum gpio_signal signal)
*/
if (gpio_get_level(signal)) {
for (int i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) {
- if (tc_is_attached_src(i))
+ if (tc_is_attached_src(i)) {
pd_dpm_request(i, DPM_REQUEST_HARD_RESET_SEND);
+ }
}
}
}
@@ -112,14 +115,16 @@ static void ps185_hdmi_hpd_deferred(void)
GPIO_DT_FROM_ALIAS(gpio_ps185_ec_dp_hpd));
/* HPD status not changed, probably a glitch, just return. */
- if (debounced_hpd == new_hpd)
+ if (debounced_hpd == new_hpd) {
return;
+ }
debounced_hpd = new_hpd;
if (!corsola_is_dp_muxable(USBC_PORT_C1)) {
- if (debounced_hpd)
+ if (debounced_hpd) {
CPRINTS("C0 port is already muxed.");
+ }
return;
}
@@ -178,12 +183,13 @@ static void hdmi_hpd_interrupt(enum gpio_signal signal)
{
hook_call_deferred(&ps185_hdmi_hpd_deferred_data, PS185_HPD_DEBOUCE);
- if (!gpio_pin_get_dt(GPIO_DT_FROM_ALIAS(gpio_ps185_ec_dp_hpd)))
+ if (!gpio_pin_get_dt(GPIO_DT_FROM_ALIAS(gpio_ps185_ec_dp_hpd))) {
hook_call_deferred(&ps185_hdmi_hpd_disconnect_deferred_data,
HPD_SINK_ABSENCE_DEBOUNCE);
- else
+ } else {
hook_call_deferred(&ps185_hdmi_hpd_disconnect_deferred_data,
-1);
+ }
}
/* HDMI/TYPE-C function shared subboard interrupt */
@@ -191,13 +197,14 @@ void x_ec_interrupt(enum gpio_signal signal)
{
int sub = corsola_get_db_type();
- if (sub == CORSOLA_DB_TYPEC)
+ if (sub == CORSOLA_DB_TYPEC) {
/* C1: PPC interrupt */
ppc_interrupt(signal);
- else if (sub == CORSOLA_DB_HDMI)
+ } else if (sub == CORSOLA_DB_HDMI) {
hdmi_hpd_interrupt(signal);
- else
+ } else {
CPRINTS("Undetected subboard interrupt.");
+ }
}
static void board_hdmi_handler(struct ap_power_ev_callback *cb,
@@ -278,10 +285,11 @@ DECLARE_HOOK(HOOK_INIT, baseboard_x_ec_gpio2_init, HOOK_PRIO_DEFAULT);
__override uint8_t get_dp_pin_mode(int port)
{
if (corsola_get_db_type() == CORSOLA_DB_HDMI && port == USBC_PORT_C1) {
- if (usb_mux_get(USBC_PORT_C1) & USB_PD_MUX_DP_ENABLED)
+ if (usb_mux_get(USBC_PORT_C1) & USB_PD_MUX_DP_ENABLED) {
return MODE_DP_PIN_E;
- else
+ } else {
return 0;
+ }
}
return pd_dfp_dp_get_pin_mode(port, dp_status[port]);
diff --git a/zephyr/projects/corsola/src/variant_db_detection.c b/zephyr/projects/corsola/src/variant_db_detection.c
index 89741cce18..fc8427fbc7 100644
--- a/zephyr/projects/corsola/src/variant_db_detection.c
+++ b/zephyr/projects/corsola/src/variant_db_detection.c
@@ -55,13 +55,15 @@ enum corsola_db_type corsola_get_db_type(void)
{
static enum corsola_db_type db = CORSOLA_DB_NONE;
- if (db != CORSOLA_DB_NONE)
+ if (db != CORSOLA_DB_NONE) {
return db;
+ }
- if (!gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_hdmi_prsnt_odl)))
+ if (!gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_hdmi_prsnt_odl))) {
db = CORSOLA_DB_HDMI;
- else
+ } else {
db = CORSOLA_DB_TYPEC;
+ }
corsola_db_config(db);