usb: add attach callback

[qemu.git] / hw / usb.h

diff --git a/hw/usb.h b/hw/usb.h
index 997e69fa0eb994a6653835ac8f37bac025db136f..892ff724ff97698ead8aeeef948ec7d97f08db38 100644 (file)
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -21,6 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */

+
+#include "block.h"
+#include "qdev.h"
+#include "qemu-queue.h"
+

 #define USB_TOKEN_SETUP 0x2d
 #define USB_TOKEN_IN    0x69 /* device -> host */
 #define USB_TOKEN_OUT   0xe1 /* host -> device */
 #define USB_TOKEN_SETUP 0x2d
 #define USB_TOKEN_IN    0x69 /* device -> host */
 #define USB_TOKEN_OUT   0xe1 /* host -> device */


@@ -39,6 +44,12 @@
 #define USB_SPEED_LOW   0
 #define USB_SPEED_FULL  1
 #define USB_SPEED_HIGH  2
 #define USB_SPEED_LOW   0
 #define USB_SPEED_FULL  1
 #define USB_SPEED_HIGH  2

+#define USB_SPEED_SUPER 3
+
+#define USB_SPEED_MASK_LOW   (1 << USB_SPEED_LOW)
+#define USB_SPEED_MASK_FULL  (1 << USB_SPEED_FULL)
+#define USB_SPEED_MASK_HIGH  (1 << USB_SPEED_HIGH)
+#define USB_SPEED_MASK_SUPER (1 << USB_SPEED_SUPER)

 
 #define USB_STATE_NOTATTACHED 0
 #define USB_STATE_ATTACHED    1
 
 #define USB_STATE_NOTATTACHED 0
 #define USB_STATE_ATTACHED    1


@@ -86,6 +97,10 @@
 #define EndpointRequest ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8)
 #define EndpointOutRequest \
         ((USB_DIR_OUT|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8)
 #define EndpointRequest ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8)
 #define EndpointOutRequest \
         ((USB_DIR_OUT|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8)

+#define ClassInterfaceRequest \
+        ((USB_DIR_IN|USB_TYPE_CLASS|USB_RECIP_INTERFACE)<<8)
+#define ClassInterfaceOutRequest \
+        ((USB_DIR_OUT|USB_TYPE_CLASS|USB_RECIP_INTERFACE)<<8)

 
 #define USB_REQ_GET_STATUS             0x00
 #define USB_REQ_CLEAR_FEATURE          0x01
 
 #define USB_REQ_GET_STATUS             0x00
 #define USB_REQ_CLEAR_FEATURE          0x01


@@ -113,37 +128,79 @@
 #define USB_ENDPOINT_XFER_BULK         2
 #define USB_ENDPOINT_XFER_INT          3
 
 #define USB_ENDPOINT_XFER_BULK         2
 #define USB_ENDPOINT_XFER_INT          3
 

+typedef struct USBBus USBBus;

 typedef struct USBPort USBPort;
 typedef struct USBDevice USBDevice;
 typedef struct USBPort USBPort;
 typedef struct USBDevice USBDevice;

+typedef struct USBDeviceInfo USBDeviceInfo;

 typedef struct USBPacket USBPacket;
 
 typedef struct USBPacket USBPacket;
 

+typedef struct USBDesc USBDesc;
+typedef struct USBDescID USBDescID;
+typedef struct USBDescDevice USBDescDevice;
+typedef struct USBDescConfig USBDescConfig;
+typedef struct USBDescIface USBDescIface;
+typedef struct USBDescEndpoint USBDescEndpoint;
+typedef struct USBDescOther USBDescOther;
+typedef struct USBDescString USBDescString;
+
+struct USBDescString {
+    uint8_t index;
+    char *str;
+    QLIST_ENTRY(USBDescString) next;
+};
+

 /* definition of a USB device */
 struct USBDevice {
 /* definition of a USB device */
 struct USBDevice {

+    DeviceState qdev;
+    USBDeviceInfo *info;
+    USBPort *port;

     void *opaque;
 
     void *opaque;
 

-    /* 
-     * Process USB packet. 
+    int speed;
+    uint8_t addr;
+    char product_desc[32];
+    int auto_attach;
+    int attached;
+
+    int state;
+    uint8_t setup_buf[8];
+    uint8_t data_buf[1024];
+    int remote_wakeup;
+    int setup_state;
+    int setup_len;
+    int setup_index;
+
+    QLIST_HEAD(, USBDescString) strings;
+    const USBDescDevice *device;
+    const USBDescConfig *config;
+};
+
+struct USBDeviceInfo {
+    DeviceInfo qdev;
+    int (*init)(USBDevice *dev);
+
+    /*
+     * Process USB packet.

      * Called by the HC (Host Controller).
      *
      * Called by the HC (Host Controller).
      *

-     * Returns length of the transaction 
+     * Returns length of the transaction

      * or one of the USB_RET_XXX codes.
      * or one of the USB_RET_XXX codes.

-     */ 
+     */

     int (*handle_packet)(USBDevice *dev, USBPacket *p);
 
     int (*handle_packet)(USBDevice *dev, USBPacket *p);
 

-    /* 
+    /*

      * Called when device is destroyed.
      */
     void (*handle_destroy)(USBDevice *dev);
 
      * Called when device is destroyed.
      */
     void (*handle_destroy)(USBDevice *dev);
 

-    int speed;
-
-    /* The following fields are used by the generic USB device
-       layer. They are here just to avoid creating a new structure 
-       for them. */
+    /*
+     * Attach the device
+     */
+    void (*handle_attach)(USBDevice *dev);

 
     /*
      * Reset the device
 
     /*
      * Reset the device

-     */  
+     */

     void (*handle_reset)(USBDevice *dev);
 
     /*
     void (*handle_reset)(USBDevice *dev);
 
     /*


@@ -163,27 +220,29 @@ struct USBDevice {
      */
     int (*handle_data)(USBDevice *dev, USBPacket *p);
 
      */
     int (*handle_data)(USBDevice *dev, USBPacket *p);
 

-    uint8_t addr;
-    char devname[32];
+    const char *product_desc;
+    const USBDesc *usb_desc;

 
 

-    int state;
-    uint8_t setup_buf[8];
-    uint8_t data_buf[1024];
-    int remote_wakeup;
-    int setup_state;
-    int setup_len;
-    int setup_index;
+    /* handle legacy -usbdevice command line options */
+    const char *usbdevice_name;
+    USBDevice *(*usbdevice_init)(const char *params);

 };
 
 };
 

-typedef void (*usb_attachfn)(USBPort *port, USBDevice *dev);
+typedef struct USBPortOps {
+    void (*attach)(USBPort *port);
+    void (*detach)(USBPort *port);
+    void (*wakeup)(USBDevice *dev);
+} USBPortOps;

 
 /* USB port on which a device can be connected */
 struct USBPort {
     USBDevice *dev;
 
 /* USB port on which a device can be connected */
 struct USBPort {
     USBDevice *dev;

-    usb_attachfn attach;
+    int speedmask;
+    USBPortOps *ops;

     void *opaque;
     void *opaque;

+    USBDevice *pdev;

     int index; /* internal port index, may be used with the opaque */
     int index; /* internal port index, may be used with the opaque */

-    struct USBPort *next; /* Used internally by qemu.  */
+    QTAILQ_ENTRY(USBPort) next;

 };
 
 typedef void USBCallback(USBPacket * packet, void *opaque);
 };
 
 typedef void USBCallback(USBPacket * packet, void *opaque);


@@ -228,42 +287,25 @@ static inline void usb_cancel_packet(USBPacket * p)
     p->cancel_cb(p, p->cancel_opaque);
 }
 
     p->cancel_cb(p, p->cancel_opaque);
 }
 

-int usb_device_add_dev(USBDevice *dev);
-int usb_device_del_addr(int bus_num, int addr);

 void usb_attach(USBPort *port, USBDevice *dev);
 void usb_attach(USBPort *port, USBDevice *dev);

+void usb_wakeup(USBDevice *dev);

 int usb_generic_handle_packet(USBDevice *s, USBPacket *p);
 int set_usb_string(uint8_t *buf, const char *str);
 void usb_send_msg(USBDevice *dev, int msg);
 
 int usb_generic_handle_packet(USBDevice *s, USBPacket *p);
 int set_usb_string(uint8_t *buf, const char *str);
 void usb_send_msg(USBDevice *dev, int msg);
 

-/* usb hub */
-USBDevice *usb_hub_init(int nb_ports);
-

 /* usb-linux.c */
 USBDevice *usb_host_device_open(const char *devname);
 /* usb-linux.c */
 USBDevice *usb_host_device_open(const char *devname);

-void usb_host_info(void);
+int usb_host_device_close(const char *devname);
+void usb_host_info(Monitor *mon);

 
 /* usb-hid.c */
 
 /* usb-hid.c */

-USBDevice *usb_mouse_init(void);
-USBDevice *usb_tablet_init(void);
-USBDevice *usb_keyboard_init(void);
-
-/* usb-msd.c */
-USBDevice *usb_msd_init(const char *filename);
-
-/* usb-net.c */
-USBDevice *usb_net_init(NICInfo *nd);
-
-/* usb-wacom.c */
-USBDevice *usb_wacom_init(void);
+void usb_hid_datain_cb(USBDevice *dev, void *opaque, void (*datain)(void *));

 
 

-/* usb-serial.c */
-USBDevice *usb_serial_init(const char *filename);
+/* usb-bt.c */
+USBDevice *usb_bt_init(HCIInfo *hci);

 
 /* usb ports of the VM */
 
 
 /* usb ports of the VM */
 

-void qemu_register_usb_port(USBPort *port, void *opaque, int index,
-                            usb_attachfn attach);
-

 #define VM_USB_HUB_SIZE 8
 
 /* usb-musb.c */
 #define VM_USB_HUB_SIZE 8
 
 /* usb-musb.c */


@@ -283,8 +325,39 @@ enum musb_irq_source_e {
     __musb_irq_max,
 };
 
     __musb_irq_max,
 };
 

-struct musb_s;
-struct musb_s *musb_init(qemu_irq *irqs);
-uint32_t musb_core_intr_get(struct musb_s *s);
-void musb_core_intr_clear(struct musb_s *s, uint32_t mask);
-void musb_set_size(struct musb_s *s, int epnum, int size, int is_tx);
+typedef struct MUSBState MUSBState;
+MUSBState *musb_init(qemu_irq *irqs);
+uint32_t musb_core_intr_get(MUSBState *s);
+void musb_core_intr_clear(MUSBState *s, uint32_t mask);
+void musb_set_size(MUSBState *s, int epnum, int size, int is_tx);
+
+/* usb-bus.c */
+
+struct USBBus {
+    BusState qbus;
+    int busnr;
+    int nfree;
+    int nused;
+    QTAILQ_HEAD(, USBPort) free;
+    QTAILQ_HEAD(, USBPort) used;
+    QTAILQ_ENTRY(USBBus) next;
+};
+
+void usb_bus_new(USBBus *bus, DeviceState *host);
+USBBus *usb_bus_find(int busnr);
+void usb_qdev_register(USBDeviceInfo *info);
+void usb_qdev_register_many(USBDeviceInfo *info);
+USBDevice *usb_create(USBBus *bus, const char *name);
+USBDevice *usb_create_simple(USBBus *bus, const char *name);
+USBDevice *usbdevice_create(const char *cmdline);
+void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index,
+                       USBDevice *pdev, USBPortOps *ops, int speedmask);
+void usb_unregister_port(USBBus *bus, USBPort *port);
+int usb_device_attach(USBDevice *dev);
+int usb_device_detach(USBDevice *dev);
+int usb_device_delete_addr(int busnr, int addr);
+
+static inline USBBus *usb_bus_from_device(USBDevice *d)
+{
+    return DO_UPCAST(USBBus, qbus, d->qdev.parent_bus);
+}