summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-06-26 21:00:51 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-06-26 21:00:51 +0000
commit1f6e24e73ccdca64864da009a21f5b7051d200a1 (patch)
tree864894ca89ebfaaa5ae6bc2332a588ae331ea554 /hw
parent3e382bc84ce93df505b48fc4e305fcc5f4ac4567 (diff)
display device identifier string for user with info usb (Lonnie Mendez)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2029 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/usb-hid.c4
-rw-r--r--hw/usb-hub.c2
-rw-r--r--hw/usb-msd.c3
-rw-r--r--hw/usb.h1
4 files changed, 10 insertions, 0 deletions
diff --git a/hw/usb-hid.c b/hw/usb-hid.c
index 883befcc3..93f46dbf9 100644
--- a/hw/usb-hid.c
+++ b/hw/usb-hid.c
@@ -521,6 +521,8 @@ USBDevice *usb_tablet_init(void)
s->dev.handle_data = usb_mouse_handle_data;
s->kind = USB_TABLET;
+ pstrcpy(s->dev.devname, sizeof(s->dev.devname), "QEMU USB Tablet");
+
return (USBDevice *)s;
}
@@ -539,5 +541,7 @@ USBDevice *usb_mouse_init(void)
s->dev.handle_data = usb_mouse_handle_data;
s->kind = USB_MOUSE;
+ pstrcpy(s->dev.devname, sizeof(s->dev.devname), "QEMU USB Mouse");
+
return (USBDevice *)s;
}
diff --git a/hw/usb-hub.c b/hw/usb-hub.c
index c69d69cc8..2eba905ff 100644
--- a/hw/usb-hub.c
+++ b/hw/usb-hub.c
@@ -544,6 +544,8 @@ USBDevice *usb_hub_init(int nb_ports)
s->dev.handle_control = usb_hub_handle_control;
s->dev.handle_data = usb_hub_handle_data;
+ pstrcpy(s->dev.devname, sizeof(s->dev.devname), "QEMU USB Hub");
+
s->nb_ports = nb_ports;
for(i = 0; i < s->nb_ports; i++) {
port = &s->ports[i];
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index bcca6d4ed..3dccfb955 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -389,6 +389,9 @@ USBDevice *usb_msd_init(const char *filename)
s->dev.handle_control = usb_msd_handle_control;
s->dev.handle_data = usb_msd_handle_data;
+ snprintf(s->dev.devname, sizeof(s->dev.devname), "QEMU USB MSD(%.16s)",
+ filename);
+
s->scsi_dev = scsi_disk_init(bdrv, usb_msd_command_complete, s);
usb_msd_handle_reset((USBDevice *)s, 0);
return (USBDevice *)s;
diff --git a/hw/usb.h b/hw/usb.h
index abdbb45d2..b0887d680 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -128,6 +128,7 @@ struct USBDevice {
int (*handle_data)(USBDevice *dev, int pid, uint8_t devep,
uint8_t *data, int len);
uint8_t addr;
+ char devname[32];
int state;
uint8_t setup_buf[8];