diff options
| -rw-r--r-- | hw/bt-hid.c | 2 | ||||
| -rw-r--r-- | hw/usb-bus.c | 11 | ||||
| -rw-r--r-- | hw/usb-hid.c | 2 | ||||
| -rw-r--r-- | hw/usb.h | 2 | ||||
| -rw-r--r-- | usb-bsd.c | 4 | ||||
| -rw-r--r-- | usb-linux.c | 4 |
6 files changed, 13 insertions, 12 deletions
diff --git a/hw/bt-hid.c b/hw/bt-hid.c index 020176eacc..4a04bbd9bf 100644 --- a/hw/bt-hid.c +++ b/hw/bt-hid.c @@ -552,7 +552,7 @@ static struct bt_device_s *bt_hid_init(struct bt_scatternet_s *net, BT_HID_MTU, bt_hid_new_interrupt_ch); s->usbdev = dev; - s->btdev.device.lmp_name = s->usbdev->devname; + s->btdev.device.lmp_name = s->usbdev->product_desc; usb_hid_datain_cb(s->usbdev, s, bt_hid_datain); s->btdev.device.handle_destroy = bt_hid_destroy; diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 99d185e79a..ba1b6e30e9 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -43,7 +43,7 @@ static int usb_qdev_init(DeviceState *qdev, DeviceInfo *base) USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, base); int rc; - pstrcpy(dev->devname, sizeof(dev->devname), qdev->info->name); + pstrcpy(dev->product_desc, sizeof(dev->product_desc), qdev->info->name); dev->info = info; dev->auto_attach = 1; rc = dev->info->init(dev); @@ -131,7 +131,7 @@ static void do_attach(USBDevice *dev) if (dev->attached) { fprintf(stderr, "Warning: tried to attach usb device %s twice\n", - dev->devname); + dev->product_desc); return; } dev->attached++; @@ -166,7 +166,7 @@ int usb_device_detach(USBDevice *dev) if (!dev->attached) { fprintf(stderr, "Warning: tried to detach unattached usb device %s\n", - dev->devname); + dev->product_desc); return -1; } dev->attached--; @@ -228,7 +228,7 @@ static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent) monitor_printf(mon, "%*saddr %d.%d, speed %s, name %s%s\n", indent, "", bus->busnr, dev->addr, - usb_speed(dev->speed), dev->devname, + usb_speed(dev->speed), dev->product_desc, dev->attached ? ", attached" : ""); } @@ -249,7 +249,8 @@ void usb_info(Monitor *mon) if (!dev) continue; monitor_printf(mon, " Device %d.%d, Speed %s Mb/s, Product %s\n", - bus->busnr, dev->addr, usb_speed(dev->speed), dev->devname); + bus->busnr, dev->addr, usb_speed(dev->speed), + dev->product_desc); } } } diff --git a/hw/usb-hid.c b/hw/usb-hid.c index f4a2a481eb..6621f7227e 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -701,7 +701,7 @@ static int usb_hid_handle_control(USBDevice *dev, int request, int value, break; case 2: /* product description */ - ret = set_usb_string(data, s->dev.devname); + ret = set_usb_string(data, s->dev.product_desc); break; case 3: /* vendor description */ @@ -132,7 +132,7 @@ struct USBDevice { int speed; uint8_t addr; - char devname[32]; + char product_desc[32]; int auto_attach; int attached; @@ -370,10 +370,10 @@ USBDevice *usb_host_device_open(const char *devname) dev->dev.speed = USB_SPEED_FULL - 1; if (strncmp(dev_info.udi_product, "product", 7) != 0) - pstrcpy(dev->dev.devname, sizeof(dev->dev.devname), + pstrcpy(dev->dev.product_desc, sizeof(dev->dev.product_desc), dev_info.udi_product); else - snprintf(dev->dev.devname, sizeof(dev->dev.devname), + snprintf(dev->dev.product_desc, sizeof(dev->dev.product_desc), "host:%s", devname); pstrcpy(dev->devpath, sizeof(dev->devpath), "/dev/"); diff --git a/usb-linux.c b/usb-linux.c index 285ac227a3..67735d338c 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -933,10 +933,10 @@ static int usb_host_open(USBHostDevice *dev, int bus_num, dev->dev.speed = USB_SPEED_HIGH; if (!prod_name || prod_name[0] == '\0') - snprintf(dev->dev.devname, sizeof(dev->dev.devname), + snprintf(dev->dev.product_desc, sizeof(dev->dev.product_desc), "host:%d.%d", bus_num, addr); else - pstrcpy(dev->dev.devname, sizeof(dev->dev.devname), + pstrcpy(dev->dev.product_desc, sizeof(dev->dev.product_desc), prod_name); /* USB devio uses 'write' flag to check for async completions */ |