Commit 8550a02d authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

usb-core: usb3 streams 



This patch adds support for usb3 streams to the usb subsystem core.
This is just adding a streams field / parameter in a number of places.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 2e5df36d

hw/usb.h

+6 −4
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ struct USBPacket { 
    int pid;

    uint64_t id;

    USBEndpoint *ep;

    unsigned int stream;

    QEMUIOVector iov;

    uint64_t parameter; /* control transfers */

    bool short_not_ok;
@@ -383,8 +384,9 @@ struct USBCombinedPacket { 
void usb_packet_init(USBPacket *p);

void usb_packet_set_state(USBPacket *p, USBPacketState state);

void usb_packet_check_state(USBPacket *p, USBPacketState expected);

void usb_packet_setup(USBPacket *p, int pid, USBEndpoint *ep, uint64_t id,

                      bool short_not_ok, bool int_req);

void usb_packet_setup(USBPacket *p, int pid,

                      USBEndpoint *ep, unsigned int stream,

                      uint64_t id, bool short_not_ok, bool int_req);

void usb_packet_addbuf(USBPacket *p, void *ptr, size_t len);

int usb_packet_map(USBPacket *p, QEMUSGList *sgl);

void usb_packet_unmap(USBPacket *p, QEMUSGList *sgl);
@@ -430,7 +432,7 @@ void usb_attach(USBPort *port); 
void usb_detach(USBPort *port);

void usb_port_reset(USBPort *port);

void usb_device_reset(USBDevice *dev);

void usb_wakeup(USBEndpoint *ep);

void usb_wakeup(USBEndpoint *ep, unsigned int stream);

void usb_generic_async_ctrl_complete(USBDevice *s, USBPacket *p);

int set_usb_string(uint8_t *buf, const char *str);
@@ -489,7 +491,7 @@ struct USBBus { 
struct USBBusOps {

    int (*register_companion)(USBBus *bus, USBPort *ports[],

                              uint32_t portcount, uint32_t firstport);

    void (*wakeup_endpoint)(USBBus *bus, USBEndpoint *ep);

    void (*wakeup_endpoint)(USBBus *bus, USBEndpoint *ep, unsigned int stream);

};



void usb_bus_new(USBBus *bus, USBBusOps *ops, DeviceState *host);

hw/usb/core.c

+6 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void usb_device_reset(USBDevice *dev) 
    usb_device_handle_reset(dev);

}



void usb_wakeup(USBEndpoint *ep)

void usb_wakeup(USBEndpoint *ep, unsigned int stream)

{

    USBDevice *dev = ep->dev;

    USBBus *bus = usb_bus_from_device(dev);
@@ -80,7 +80,7 @@ void usb_wakeup(USBEndpoint *ep) 
        dev->port->ops->wakeup(dev->port);

    }

    if (bus->ops->wakeup_endpoint) {

        bus->ops->wakeup_endpoint(bus, ep);

        bus->ops->wakeup_endpoint(bus, ep, stream);

    }

}
@@ -545,14 +545,16 @@ void usb_packet_set_state(USBPacket *p, USBPacketState state) 
    p->state = state;

}



void usb_packet_setup(USBPacket *p, int pid, USBEndpoint *ep, uint64_t id,

                      bool short_not_ok, bool int_req)

void usb_packet_setup(USBPacket *p, int pid,

                      USBEndpoint *ep, unsigned int stream,

                      uint64_t id, bool short_not_ok, bool int_req)

{

    assert(!usb_packet_is_inflight(p));

    assert(p->iov.iov != NULL);

    p->id = id;

    p->pid = pid;

    p->ep = ep;

    p->stream = stream;

    p->status = USB_RET_SUCCESS;

    p->actual_length = 0;

    p->parameter = 0;

hw/usb/dev-bluetooth.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static void usb_bt_out_hci_packet_event(void *opaque, 
    struct USBBtState *s = (struct USBBtState *) opaque;



    if (s->evt.len == 0) {

        usb_wakeup(s->intr);

        usb_wakeup(s->intr, 0);

    }

    usb_bt_fifo_enqueue(&s->evt, data, len);

}

hw/usb/dev-hid.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static void usb_hid_changed(HIDState *hs) 
{

    USBHIDState *us = container_of(hs, USBHIDState, hid);



    usb_wakeup(us->intr);

    usb_wakeup(us->intr, 0);

}



static void usb_hid_handle_reset(USBDevice *dev)

hw/usb/dev-hub.c

+5 −5
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static void usb_hub_attach(USBPort *port1) 
    } else {

        port->wPortStatus &= ~PORT_STAT_LOW_SPEED;

    }

    usb_wakeup(s->intr);

    usb_wakeup(s->intr, 0);

}



static void usb_hub_detach(USBPort *port1)
@@ -173,7 +173,7 @@ static void usb_hub_detach(USBPort *port1) 
    USBHubPort *port = &s->ports[port1->index];



    trace_usb_hub_detach(s->dev.addr, port1->index + 1);

    usb_wakeup(s->intr);

    usb_wakeup(s->intr, 0);



    /* Let upstream know the device on this port is gone */

    s->dev.port->ops->child_detach(s->dev.port, port1->dev);
@@ -184,7 +184,7 @@ static void usb_hub_detach(USBPort *port1) 
        port->wPortStatus &= ~PORT_STAT_ENABLE;

        port->wPortChange |= PORT_STAT_C_ENABLE;

    }

    usb_wakeup(s->intr);

    usb_wakeup(s->intr, 0);

}



static void usb_hub_child_detach(USBPort *port1, USBDevice *child)
@@ -202,7 +202,7 @@ static void usb_hub_wakeup(USBPort *port1) 


    if (port->wPortStatus & PORT_STAT_SUSPEND) {

        port->wPortChange |= PORT_STAT_C_SUSPEND;

        usb_wakeup(s->intr);

        usb_wakeup(s->intr, 0);

    }

}
@@ -364,7 +364,7 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p, 
                    port->wPortChange |= PORT_STAT_C_RESET;

                    /* set enable bit */

                    port->wPortStatus |= PORT_STAT_ENABLE;

                    usb_wakeup(s->intr);

                    usb_wakeup(s->intr, 0);

                }

                break;

            case PORT_POWER: