michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: usb: rename shadow variables

Browse source 
Rename shadow variables found by -Wshadow.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2023-08-09 14:39:32 -07:00 • committed by Carles Cufí
commit dc0cec972d
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
samples/subsys/usb/hid-cdc/src/main.c
View file

@ -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(evt_sem, 0, 1); /* starts off "not available" */
static K_SEM_DEFINE(usb_sem, 1, 1); /* starts off "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 data_buf_mouse[64], data_buf_kbd[64];
static char string[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."); LOG_ERR("Failed configuring button 0 callback.");
return 0; return 0;
} }
#if DT_NODE_HAS_STATUS(SW1_NODE, okay) #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."); LOG_ERR("Failed configuring button 1 callback.");
return 0; return 0;
} }
#endif #endif
#if DT_NODE_HAS_STATUS(SW2_NODE, okay) #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."); LOG_ERR("Failed configuring button 2 callback.");
return 0; return 0;
} }
#endif #endif
#if DT_NODE_HAS_STATUS(SW3_NODE, okay) #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."); LOG_ERR("Failed configuring button 3 callback.");
return 0; return 0;
} }
@ -680,10 +680,10 @@ int main(void)
/* Send string on HID keyboard */ /* Send string on HID keyboard */
write_data(cdc_dev[1], gpio2, strlen(gpio2)); write_data(cdc_dev[1], gpio2, strlen(gpio2));
if (strlen(string) > 0) { 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, ev2->event_type = HID_KBD_STRING,
app_evt_put(ev); app_evt_put(ev2);
str_pointer = 0U; str_pointer = 0U;
k_sem_give(&evt_sem); k_sem_give(&evt_sem);
} }
@ -813,10 +813,10 @@ int main(void)
str_pointer++; str_pointer++;
if (strlen(string) > 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, ev2->event_type = HID_KBD_STRING,
app_evt_put(ev); app_evt_put(ev2);
k_sem_give(&evt_sem); k_sem_give(&evt_sem);
} else if (strlen(string) == str_pointer) { } else if (strlen(string) == str_pointer) {
clear_kbd_report(); clear_kbd_report();

32
samples/subsys/usb_c/sink/src/main.c
View file

@ -117,43 +117,43 @@ static void display_pdo(const int idx,
} }
break; break;
case PDO_BATTERY: { 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("\tType: BATTERY");
LOG_INF("\tMin Voltage: %d", 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", 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", 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; break;
case PDO_VARIABLE: { 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("\tType: VARIABLE");
LOG_INF("\tMin Voltage: %d", 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", 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", 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; break;
case PDO_AUGMENTED: { 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("\tType: AUGMENTED");
LOG_INF("\tMin Voltage: %d", 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", 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", LOG_INF("\tMax Current: %d",
PD_CONVERT_AUGMENTED_PDO_CURRENT_TO_MA(pdo.max_current)); PD_CONVERT_AUGMENTED_PDO_CURRENT_TO_MA(aug_pdo.max_current));
LOG_INF("\tPPS Power Limited: %d", pdo.pps_power_limited); LOG_INF("\tPPS Power Limited: %d", aug_pdo.pps_power_limited);
} }
break; break;
} }