diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2011-08-29 12:57:48 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-01-17 09:44:50 +0100 |
| commit | 82f02fe96514605d0bb46f976871ec662193394a (patch) | |
| tree | 724473df6de2caf49f4f273b22623b421cbc1c8f | |
| parent | d8e17efdecaaa1a2d5c8f422fc44ae229e7f4fb4 (diff) | |
| download | qemu-82f02fe96514605d0bb46f976871ec662193394a.tar.gz | |
usb: add ifnum to USBEndpoint
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | hw/usb.c | 14 | ||||
| -rw-r--r-- | hw/usb.h | 3 | ||||
| -rw-r--r-- | usb-linux.c | 1 |
3 files changed, 18 insertions, 0 deletions
@@ -422,6 +422,8 @@ void usb_ep_init(USBDevice *dev) for (ep = 0; ep < USB_MAX_ENDPOINTS; ep++) { dev->ep_in[ep].type = USB_ENDPOINT_XFER_INVALID; dev->ep_out[ep].type = USB_ENDPOINT_XFER_INVALID; + dev->ep_in[ep].ifnum = 0; + dev->ep_out[ep].ifnum = 0; } } @@ -444,3 +446,15 @@ void usb_ep_set_type(USBDevice *dev, int pid, int ep, uint8_t type) struct USBEndpoint *uep = usb_ep_get(dev, pid, ep); uep->type = type; } + +uint8_t usb_ep_get_ifnum(USBDevice *dev, int pid, int ep) +{ + struct USBEndpoint *uep = usb_ep_get(dev, pid, ep); + return uep->ifnum; +} + +void usb_ep_set_ifnum(USBDevice *dev, int pid, int ep, uint8_t ifnum) +{ + struct USBEndpoint *uep = usb_ep_get(dev, pid, ep); + uep->ifnum = ifnum; +} @@ -175,6 +175,7 @@ struct USBDescString { struct USBEndpoint { uint8_t type; + uint8_t ifnum; }; /* definition of a USB device */ @@ -334,7 +335,9 @@ void usb_cancel_packet(USBPacket * p); void usb_ep_init(USBDevice *dev); struct USBEndpoint *usb_ep_get(USBDevice *dev, int pid, int ep); uint8_t usb_ep_get_type(USBDevice *dev, int pid, int ep); +uint8_t usb_ep_get_ifnum(USBDevice *dev, int pid, int ep); void usb_ep_set_type(USBDevice *dev, int pid, int ep, uint8_t type); +void usb_ep_set_ifnum(USBDevice *dev, int pid, int ep, uint8_t ifnum); void usb_attach(USBPort *port); void usb_detach(USBPort *port); diff --git a/usb-linux.c b/usb-linux.c index 9967975f2b..cb66ef3469 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -1206,6 +1206,7 @@ static int usb_linux_update_endp_table(USBHostDevice *s) assert(usb_ep_get_type(&s->dev, pid, ep) == USB_ENDPOINT_XFER_INVALID); usb_ep_set_type(&s->dev, pid, ep, type); + usb_ep_set_ifnum(&s->dev, pid, ep, interface); epd = get_endp(s, pid, ep); epd->halted = 0; |