summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-12-03 17:59:36 +0100
committerGerd Hoffmann <kraxel@redhat.com>2011-01-11 17:15:24 +0100
commitb6f77fbe230ad3e9ec5c9115a1535137d5e5d04b (patch)
tree23c3ba5a454b73e3e4254b6c8004911beb55049d
parent843d4e0c633824a11c4067d0e84bd683520b5d39 (diff)
downloadfocaccia-qemu-b6f77fbe230ad3e9ec5c9115a1535137d5e5d04b.tar.gz
focaccia-qemu-b6f77fbe230ad3e9ec5c9115a1535137d5e5d04b.zip
usb: add attach callback
Add handle_attach() callback to USBDeviceInfo which is called by the
generic package handler when the device is attached to the usb bus
(i.e. plugged into a port).

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/usb.c7
-rw-r--r--hw/usb.h5
2 files changed, 11 insertions, 1 deletions
diff --git a/hw/usb.c b/hw/usb.c
index ba720b48e0..82a6217a0b 100644
--- a/hw/usb.c
+++ b/hw/usb.c
@@ -194,6 +194,9 @@ int usb_generic_handle_packet(USBDevice *s, USBPacket *p)
     switch(p->pid) {
     case USB_MSG_ATTACH:
         s->state = USB_STATE_ATTACHED;
+        if (s->info->handle_attach) {
+            s->info->handle_attach(s);
+        }
         return 0;
 
     case USB_MSG_DETACH:
@@ -204,7 +207,9 @@ int usb_generic_handle_packet(USBDevice *s, USBPacket *p)
         s->remote_wakeup = 0;
         s->addr = 0;
         s->state = USB_STATE_DEFAULT;
-        s->info->handle_reset(s);
+        if (s->info->handle_reset) {
+            s->info->handle_reset(s);
+        }
         return 0;
     }
 
diff --git a/hw/usb.h b/hw/usb.h
index 407a11465a..892ff724ff 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -194,6 +194,11 @@ struct USBDeviceInfo {
     void (*handle_destroy)(USBDevice *dev);
 
     /*
+     * Attach the device
+     */
+    void (*handle_attach)(USBDevice *dev);
+
+    /*
      * Reset the device
      */
     void (*handle_reset)(USBDevice *dev);