ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/usb: Silence compiler warnings in USB code when compiling with -Wshadow 

Rename variables or remove nested definitions where it makes sense,
so that we can finally compile the USB code with "-Wshadow", too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231004130822.113343-1-thuth@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Thomas Huth 2023-10-04 15:08:22 +02:00 committed by Markus Armbruster
parent 0edc9e45f3
commit e7121b1541
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/usb/desc.c
View File

@ -227,7 +227,7 @@ int usb_desc_endpoint(const USBDescEndpoint *ep, int flags,
} }
if (superlen) { if (superlen) {
USBDescriptor *d = (void *)(dest + bLength); d = (void *)(dest + bLength);
d->bLength = 0x06; d->bLength = 0x06;
d->bDescriptorType = USB_DT_ENDPOINT_COMPANION; d->bDescriptorType = USB_DT_ENDPOINT_COMPANION;

8
hw/usb/dev-hub.c
View File

@ -402,7 +402,7 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
{ {
unsigned int n = index - 1; unsigned int n = index - 1;
USBHubPort *port; USBHubPort *port;
USBDevice *dev; USBDevice *pdev;
trace_usb_hub_set_port_feature(s->dev.addr, index, trace_usb_hub_set_port_feature(s->dev.addr, index,
feature_name(value)); feature_name(value));
@ -411,7 +411,7 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
goto fail; goto fail;
} }
port = &s->ports[n]; port = &s->ports[n];
dev = port->port.dev; pdev = port->port.dev;
switch(value) { switch(value) {
case PORT_SUSPEND: case PORT_SUSPEND:
port->wPortStatus |= PORT_STAT_SUSPEND; port->wPortStatus |= PORT_STAT_SUSPEND;
@ -419,8 +419,8 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p,
case PORT_RESET: case PORT_RESET:
usb_hub_port_set(port, PORT_STAT_RESET); usb_hub_port_set(port, PORT_STAT_RESET);
usb_hub_port_clear(port, PORT_STAT_RESET); usb_hub_port_clear(port, PORT_STAT_RESET);
if (dev && dev->attached) { if (pdev && pdev->attached) {
usb_device_reset(dev); usb_device_reset(pdev);
usb_hub_port_set(port, PORT_STAT_ENABLE); usb_hub_port_set(port, PORT_STAT_ENABLE);
} }
usb_wakeup(s->intr, 0); usb_wakeup(s->intr, 0);

6
hw/usb/dev-storage.c
View File

@ -403,7 +403,7 @@ static void usb_msd_handle_data(USBDevice *dev, USBPacket *p)
struct usb_msd_cbw cbw; struct usb_msd_cbw cbw;
uint8_t devep = p->ep->nr; uint8_t devep = p->ep->nr;
SCSIDevice *scsi_dev; SCSIDevice *scsi_dev;
uint32_t len; int len;
if (s->needs_reset) { if (s->needs_reset) {
p->status = USB_RET_STALL; p->status = USB_RET_STALL;
@ -465,7 +465,7 @@ static void usb_msd_handle_data(USBDevice *dev, USBPacket *p)
usb_msd_copy_data(s, p); usb_msd_copy_data(s, p);
} }
if (le32_to_cpu(s->csw.residue)) { if (le32_to_cpu(s->csw.residue)) {
int len = p->iov.size - p->actual_length; len = p->iov.size - p->actual_length;
if (len) { if (len) {
usb_packet_skip(p, len); usb_packet_skip(p, len);
if (len > s->data_len) { if (len > s->data_len) {
@ -526,7 +526,7 @@ static void usb_msd_handle_data(USBDevice *dev, USBPacket *p)
usb_msd_copy_data(s, p); usb_msd_copy_data(s, p);
} }
if (le32_to_cpu(s->csw.residue)) { if (le32_to_cpu(s->csw.residue)) {
int len = p->iov.size - p->actual_length; len = p->iov.size - p->actual_length;
if (len) { if (len) {
usb_packet_skip(p, len); usb_packet_skip(p, len);
if (len > s->data_len) { if (len > s->data_len) {

10
hw/usb/hcd-xhci.c
View File

@ -217,10 +217,10 @@ enum {
(((data) >> field##_SHIFT) & field##_MASK) (((data) >> field##_SHIFT) & field##_MASK)
#define set_field(data, newval, field) do { \ #define set_field(data, newval, field) do { \
uint32_t val = *data; \ uint32_t val_ = *data; \
val &= ~(field##_MASK << field##_SHIFT); \ val_ &= ~(field##_MASK << field##_SHIFT); \
val |= ((newval) & field##_MASK) << field##_SHIFT; \ val_ |= ((newval) & field##_MASK) << field##_SHIFT; \
*data = val; \ *data = val_; \
} while (0) } while (0)
typedef enum EPType { typedef enum EPType {
@ -1894,7 +1894,7 @@ static void xhci_kick_epctx(XHCIEPContext *epctx, unsigned int streamid)
} }
if (epctx->retry) { if (epctx->retry) {
XHCITransfer *xfer = epctx->retry; xfer = epctx->retry;
trace_usb_xhci_xfer_retry(xfer); trace_usb_xhci_xfer_retry(xfer);
assert(xfer->running_retry); assert(xfer->running_retry);

2
hw/usb/host-libusb.c
View File

@ -1010,7 +1010,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)
* Speeds are defined in linux/usb/ch9.h, file not included * Speeds are defined in linux/usb/ch9.h, file not included
* due to name conflicts. * due to name conflicts.
*/ */
int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL); rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL);
switch (rc) { switch (rc) {
case 1: /* low */ case 1: /* low */
libusb_speed = LIBUSB_SPEED_LOW; libusb_speed = LIBUSB_SPEED_LOW;