From dc0cec972db65cde54e36c9048fd84599f026d3a Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Wed, 9 Aug 2023 14:39:32 -0700 Subject: [PATCH] samples: usb: rename shadow variables Rename shadow variables found by -Wshadow. Signed-off-by: Daniel Leung --- samples/subsys/usb/hid-cdc/src/main.c | 22 +++++++++--------- samples/subsys/usb_c/sink/src/main.c | 32 +++++++++++++-------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/samples/subsys/usb/hid-cdc/src/main.c b/samples/subsys/usb/hid-cdc/src/main.c index 77550b541f..2873ca5b27 100644 --- a/samples/subsys/usb/hid-cdc/src/main.c +++ b/samples/subsys/usb/hid-cdc/src/main.c @@ -132,7 +132,7 @@ static const uint8_t hid_kbd_report_desc[] = HID_KEYBOARD_REPORT_DESC(); static K_SEM_DEFINE(evt_sem, 0, 1); /* starts off "not available" */ static K_SEM_DEFINE(usb_sem, 1, 1); /* starts off "available" */ -static struct gpio_callback callback[4]; +static struct gpio_callback gpio_callbacks[4]; static char data_buf_mouse[64], data_buf_kbd[64]; static char string[64]; @@ -567,27 +567,27 @@ int main(void) } } - if (callbacks_configure(&sw0_gpio, &btn0, &callback[0])) { + if (callbacks_configure(&sw0_gpio, &btn0, &gpio_callbacks[0])) { LOG_ERR("Failed configuring button 0 callback."); return 0; } #if DT_NODE_HAS_STATUS(SW1_NODE, okay) - if (callbacks_configure(&sw1_gpio, &btn1, &callback[1])) { + if (callbacks_configure(&sw1_gpio, &btn1, &gpio_callbacks[1])) { LOG_ERR("Failed configuring button 1 callback."); return 0; } #endif #if DT_NODE_HAS_STATUS(SW2_NODE, okay) - if (callbacks_configure(&sw2_gpio, &btn2, &callback[2])) { + if (callbacks_configure(&sw2_gpio, &btn2, &gpio_callbacks[2])) { LOG_ERR("Failed configuring button 2 callback."); return 0; } #endif #if DT_NODE_HAS_STATUS(SW3_NODE, okay) - if (callbacks_configure(&sw3_gpio, &btn3, &callback[3])) { + if (callbacks_configure(&sw3_gpio, &btn3, &gpio_callbacks[3])) { LOG_ERR("Failed configuring button 3 callback."); return 0; } @@ -680,10 +680,10 @@ int main(void) /* Send string on HID keyboard */ write_data(cdc_dev[1], gpio2, strlen(gpio2)); if (strlen(string) > 0) { - struct app_evt_t *ev = app_evt_alloc(); + struct app_evt_t *ev2 = app_evt_alloc(); - ev->event_type = HID_KBD_STRING, - app_evt_put(ev); + ev2->event_type = HID_KBD_STRING, + app_evt_put(ev2); str_pointer = 0U; k_sem_give(&evt_sem); } @@ -813,10 +813,10 @@ int main(void) str_pointer++; if (strlen(string) > str_pointer) { - struct app_evt_t *ev = app_evt_alloc(); + struct app_evt_t *ev2 = app_evt_alloc(); - ev->event_type = HID_KBD_STRING, - app_evt_put(ev); + ev2->event_type = HID_KBD_STRING, + app_evt_put(ev2); k_sem_give(&evt_sem); } else if (strlen(string) == str_pointer) { clear_kbd_report(); diff --git a/samples/subsys/usb_c/sink/src/main.c b/samples/subsys/usb_c/sink/src/main.c index e02da384a1..87ed511483 100644 --- a/samples/subsys/usb_c/sink/src/main.c +++ b/samples/subsys/usb_c/sink/src/main.c @@ -117,43 +117,43 @@ static void display_pdo(const int idx, } break; case PDO_BATTERY: { - union pd_battery_supply_pdo_source pdo; + union pd_battery_supply_pdo_source batt_pdo; - pdo.raw_value = pdo_value; + batt_pdo.raw_value = pdo_value; LOG_INF("\tType: BATTERY"); LOG_INF("\tMin Voltage: %d", - PD_CONVERT_BATTERY_PDO_VOLTAGE_TO_MV(pdo.min_voltage)); + PD_CONVERT_BATTERY_PDO_VOLTAGE_TO_MV(batt_pdo.min_voltage)); LOG_INF("\tMax Voltage: %d", - PD_CONVERT_BATTERY_PDO_VOLTAGE_TO_MV(pdo.max_voltage)); + PD_CONVERT_BATTERY_PDO_VOLTAGE_TO_MV(batt_pdo.max_voltage)); LOG_INF("\tMax Power: %d", - PD_CONVERT_BATTERY_PDO_POWER_TO_MW(pdo.max_power)); + PD_CONVERT_BATTERY_PDO_POWER_TO_MW(batt_pdo.max_power)); } break; case PDO_VARIABLE: { - union pd_variable_supply_pdo_source pdo; + union pd_variable_supply_pdo_source var_pdo; - pdo.raw_value = pdo_value; + var_pdo.raw_value = pdo_value; LOG_INF("\tType: VARIABLE"); LOG_INF("\tMin Voltage: %d", - PD_CONVERT_VARIABLE_PDO_VOLTAGE_TO_MV(pdo.min_voltage)); + PD_CONVERT_VARIABLE_PDO_VOLTAGE_TO_MV(var_pdo.min_voltage)); LOG_INF("\tMax Voltage: %d", - PD_CONVERT_VARIABLE_PDO_VOLTAGE_TO_MV(pdo.max_voltage)); + PD_CONVERT_VARIABLE_PDO_VOLTAGE_TO_MV(var_pdo.max_voltage)); LOG_INF("\tMax Current: %d", - PD_CONVERT_VARIABLE_PDO_CURRENT_TO_MA(pdo.max_current)); + PD_CONVERT_VARIABLE_PDO_CURRENT_TO_MA(var_pdo.max_current)); } break; case PDO_AUGMENTED: { - union pd_augmented_supply_pdo_source pdo; + union pd_augmented_supply_pdo_source aug_pdo; - pdo.raw_value = pdo_value; + aug_pdo.raw_value = pdo_value; LOG_INF("\tType: AUGMENTED"); LOG_INF("\tMin Voltage: %d", - PD_CONVERT_AUGMENTED_PDO_VOLTAGE_TO_MV(pdo.min_voltage)); + PD_CONVERT_AUGMENTED_PDO_VOLTAGE_TO_MV(aug_pdo.min_voltage)); LOG_INF("\tMax Voltage: %d", - PD_CONVERT_AUGMENTED_PDO_VOLTAGE_TO_MV(pdo.max_voltage)); + PD_CONVERT_AUGMENTED_PDO_VOLTAGE_TO_MV(aug_pdo.max_voltage)); LOG_INF("\tMax Current: %d", - PD_CONVERT_AUGMENTED_PDO_CURRENT_TO_MA(pdo.max_current)); - LOG_INF("\tPPS Power Limited: %d", pdo.pps_power_limited); + PD_CONVERT_AUGMENTED_PDO_CURRENT_TO_MA(aug_pdo.max_current)); + LOG_INF("\tPPS Power Limited: %d", aug_pdo.pps_power_limited); } break; }